LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity
2,875 Commits 3 Branches 0 Tags
d362e1512dc30a23f72f29e55c44093d3911198d
Commit Graph

80 Commits

Author SHA1 Message Date
Nicolas F
27eabb08a5 web_assets: make poi control icons look less bad 
using rem here is probably wrong because we want to be the height
of the line in the span we're inside of, not of some global thing.

Also, add a margin to the left.
 2020-07-01 18:59:34 +02:00
Nicolas F
a424744762 Merge PR #1734 by DragonDev1906 2020-06-29 18:49:34 +02:00
Nicolas F
cadb24a015 assetmanager: rename icons dir to markers, symlink 
This fixes a name collision with Apache's default config.

Closes #1773. Install nginx already.
 2020-06-24 17:57:12 +02:00
Jens
2a22d25f7a Add Icons to POI Legend 2020-03-02 13:45:01 +01:00
Nikita Litvin
a3b9493c57 genPOI: support polylines and filled-in polygons 
Add support for polyline POIs just like in the good ol'
Google Maps days. See #883.

The format after this commit is:
{ id, x, y, z, text, color, polyline/polygon: [{ x, y, z }, ...] }

Optional properties:
- common ones like "icon" and "hovertext"
- "strokeColor" (string),
- "fill" (boolean)
- "weight" (integer)

Docs not included.

Largely based on PR #1536 by @jsmienk.
Closes #1456, closes #1536, closes #1643.
 2019-12-24 01:23:00 +03:00
Nicolas F
b6a3c18b65 web_assets: update leaflet to 1.5.1 2019-06-25 19:40:42 +02:00
Nicolas F
bc71ad7a8f web: fix white rectangle behind markers 2019-02-21 18:25:50 +01:00
Nicolas F
2918637539 web: fix marker icon position 
Shoutouts to 14mRh4X0r for finding the right CSS properties that
work for centering the marker icons.

Fixes #1481.
 2018-11-18 09:10:54 +01:00
Willem Mulder
4efb9f2d89 Make JSObserver work with Leaflet. Fixes #1451. 2018-10-08 19:45:57 +02:00
Richard Kuhnt
c6e674e6ce Remove jQuery and underscore dependencies 
- replace $.each with .forEach
- replace _.each with .forEach
- replace _.isFunction with typeof comparison
 2018-06-13 20:11:46 +02:00
Richard Kuhnt
f58e5bd626 Use <noscript> to display message when JavaScript is disabled 2018-06-13 18:57:37 +02:00
Nicolas F
a129274aa1 Remove broken marker centreing code 
Apparently, having an image's origin be in the center is too
advanced of a concept for The Web™. I guess we can't do this then.
 2018-05-09 16:22:21 +02:00
Nicolas F
6fbced79bf Fix custom icons not showing up properly 
Individual POIs such as player POIs can have their own icon per
POI, so we should respect that.
 2018-05-09 15:45:31 +02:00
Nicolas F
23ea1918ea Update leaflet to 1.3.1 2018-05-06 17:11:46 +02:00
Nicolas F
84b52326dc leaflet: Reimplement coordinate box on bottom left 
I'd move the event setup into addTo, but JS is utter garbage and thinks
"this" in a function callback like that should be whatever, not where you
actually define it.
 2017-03-13 14:04:37 +01:00
Nicolas F
7af5375df9 Actually add the high-dpi icons, durr 
Oops I forgot
 2017-02-19 11:37:02 -05:00
Nicolas F
3093a07dc2 Remove old junk in web_assets 2017-02-19 11:36:53 -05:00
Andrew Chin
91a571d628 WIP marker stuff 2017-02-19 11:30:28 -05:00
Andrew Chin
806ad92b6f Style fixes for the world selector control 2016-12-10 17:56:00 -05:00
Andrew Chin
d249515915 Update to latest version of leaflet 1.0.2 2016-12-10 17:19:37 -05:00
Nicolas F
c0875a9ceb Add replacement for the location marker 2016-12-10 14:56:17 -05:00
Nicolas F
2e07acc422 Add replacement for home marker, add icon_src dir 
I added the icon_src dir to textures so that it doesn't get copied
over automatically like web_assets do.
 2016-12-10 14:56:17 -05:00
Andrew Chin
4f33d9087e Include licnese information into jquery and leafjet js files 2016-12-10 14:56:17 -05:00
Andrew Chin
e58d23b1a0 Initial commit to drop gmaps and to add support for leaflet 
Many things do not work at the moment:
* Missing world selector
* Missing overlays (overlay tilesets and markers)
* Missing urlhash code
* Probably other stuff
 2016-12-10 14:56:17 -05:00
Nicolas F
0aef9b436c [webassets] Updated jQuery version 2015-05-04 14:59:18 +02:00
Koza
f1af25799e Fixed rendering regions. genPOI.py: add new line to baseMakers.js; views.js: add polygons, with all the features that Google provides, polylines work fine; regions.js: example of usage 2014-12-13 17:17:11 +01:00
Andrew Chin
defa37252b Add warning to index.html that should hopefully be visible when there is 
an error loading the JS components
 2013-10-07 19:48:37 -04:00
CounterPillow
dc40dce59a Moved icons to subdirectory, adjusted docs 
I also added one of the icons to the manualpois example, so people
have an exmaple of how they can use these in their configurations.
 2013-09-23 16:02:06 +02:00
CounterPillow
b9298243b2 Added some icons for people to use in their POIs. 2013-09-19 01:10:42 +02:00
Andrew Chin
ce419042e5 Use https to load external JS 
This fixes an annoying problem where browsers generally ignore http javascript on https html
 2013-08-29 10:00:00 -04:00
Andrew Chin
f072281a9c Revert "Use protocol-relative scripts in index.html" 
This reverts commit fabc244c91.
Using protocol-relative scripts broken users who don't use webservers
(i.e. file:/// )
 2013-05-26 02:05:06 -04:00
Andrew Chin
fabc244c91 Use protocol-relative scripts in index.html 2013-05-21 20:01:29 -04:00
CounterPillow
ccf99fb61d Fixed POI infowindow image scaling for FireFox 2012-09-09 17:09:41 +02:00
Andrew Chin
5d43227edf Merge remote branch 'origin/master' into JSObserver 2012-06-10 14:59:17 -04:00
Andrew Chin
5f1bf1851d Merge pull request #669 
Merge branch 'player_marker' of https://github.com/JonnyJD/Minecraft-Overviewer into devel

Conflicts:
	genPOI.py
	overviewer_core/data/js_src/views.js
 2012-04-14 22:46:25 -04:00
Thomas Lake
55df1bcf78 Add new Javascript observer 
Output render progress onto the rendered map using Javascript
A minimum period between updates can be specified
 2012-04-08 23:03:26 +01:00
Andrew Chin
f4d43d544a Styling for the worldselector control 2012-04-07 17:56:30 -04:00
Johannes Dewender
122eaee37d add bed marker icon from faithful pack 
Taken from the Faithful 32 texture pack:
http://www.minecraftforum.net/viewtopic.php?f=25&t=77442
 2012-03-27 03:04:09 +02:00
Andrew Chin
6b77d54555 Reimplement signs/POIs 2012-03-11 11:44:38 -04:00
Andrew Chin
19fcee24f7 Split up overviewer.js into several files 2012-02-08 21:07:53 -05:00
Aaron Griffith
302e1d592a Merge branch 'master' into rewrite 2012-02-06 21:41:11 -05:00
Andrew Chin
728351f9a3 Display the coord box on index.html 2012-01-16 19:50:50 -05:00
Andrew Chin
514e99dcd2 overviewer.js now uses backbone.js for much of it's multiworld handling 2012-01-14 23:33:34 -05:00
Carter Charbonneau
2003267f35 optimize the images used in the UI an otherwise bundled 2012-01-11 22:35:01 -07:00
Andrew Chin
9f6a4ee698 More updates to overviewer.js 2012-01-08 15:12:40 -05:00
Andrew Chin
4255b26fc7 Fixed some crashes in assetManager 
Copy in the rest of the web assets
 2012-01-07 23:56:08 -05:00
Andrew Chin
25db39463f The AssetManager will now create a kinda working html output 2012-01-07 23:04:42 -05:00
Aaron Griffith
d0032ac9ff Merge remote-tracking branch 'ion1/master' 2011-12-30 13:22:54 -05:00
Andrew Brown
e5fed90d04 fixed up comments in googlemap.py, moved region.js to web_assets 2011-12-17 21:49:08 -05:00
Aaron Griffith
6fb96ca8ab fixed crash when strftime returns non-ascii characters 
also generally better unicode handling on web_assets (all files are UTF-8)
 2011-12-16 19:48:46 -05:00