0
Commit Graph

1208 Commits

Author SHA1 Message Date
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
8e883f47f5 Add support for concrete powder
aheadley is a pleb, and I can call him names in this commit message
because he doesn't look at them anyway lol
2017-03-10 07:35:39 +01:00
Nicolas F
d76a22e020 Fix deprecated NumPy API warnings 2017-03-09 17:28:18 +01:00
Nicolas F
13d5fb7642 Add terracotta and concrete blocks
Fixes #1367
2017-03-09 16:51:17 +01:00
Andrew Chin
7a6b9973c2 Protect against optional marker variable 2017-02-19 11:46:44 -05: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
Nicolas F
843d9ddb00 Carpet-bombing code style fixes 2017-02-19 11:36:46 -05:00
Nicolas F
99817f786f Re-implement map compass 2017-02-19 11:36:37 -05:00
Nicolas F
e0b36fa9e4 Move icon anchor to tip of icons
The spawn and location icons should now have the tip of the icon
image point at the actual location. Previously, the icons were
centred onto it, which was slightly off in the vertical direction.
2017-02-19 11:36:24 -05:00
Nicolas F
6426182c1e Add retina size icons for spawn and location
Unfortunately we need to explicitly tell leaflet not to scale them
weirdly but to make them perceptually equivalent to the normal ones,
which means we have hardcoded icon sizes for those two right now.
2017-02-19 11:36:15 -05:00
Nicolas F
ebfd40c995 Centre map view on spawn marker if left-clicked 2017-02-19 11:35:34 -05:00
Nicolas F
9bcf2d5542 Re-implement location marker
Click to centre, right-click to dismiss.
2017-02-19 11:35:24 -05:00
Andrew Chin
91a571d628 WIP marker stuff 2017-02-19 11:30:28 -05:00
Andrew Chin
6f237179e4 Allow debug import 2017-02-12 12:47:47 -05:00
Andrew Chin
884f8548e7 Work on windows build with gitlab CI 2017-02-12 12:47:47 -05:00
Andrew Chin
faa8d8f75c Replace python with python2
A continuation of c7d86eca76
2016-12-24 14:43:52 -05:00
Thomas Lake
1803178bc8 Need to catch CorruptNBTError in both paths 2016-12-20 12:23:41 +00:00
Andrew Chin
3938d1889c Better error handling of errors when a world fails to open.
A common case is a corrupt (or empty) level.dat file.  This condition
wasn't properly caught, yielding a less-than-useful stack trace.  Even
more concerning is that this could happen when a user is just running
"overviewer.py" to get a world listing.

This has been fixed to improve the user experience
2016-12-19 10:50:01 -05:00
Andrew Chin
5047655bb7 Fix for IE11 2016-12-10 17:56:12 -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
Andrew Chin
ad85b3ff6a Initial reimplementation of url hash updating 2016-12-10 14:56:18 -05:00
Nicolas F
0731ea65cd Re-implement configurable bgcolor 2016-12-10 14:56:18 -05:00
Nicolas F
003fc9cb47 Fix errorTileUrl for JPEG tilesets 2016-12-10 14:56:18 -05:00
Nicolas F
044c65f922 Get rid of overviewer.gmap, move code into util 2016-12-10 14:56:17 -05:00
Nicolas F
2cfa3e8731 Add tset config to leaflet layer, refactor marker
Instead of stuffing specialised values into overviewer.collections,
put a reference to the overviewerConfig tileset entry into the leaflet
layer, so that we can access it from callbacks easily.
2016-12-10 14:56:17 -05:00
Nicolas F
cfa2a9f39b Re-implement spawn marker
Let's hope this works, any bugs are totally my fault.
2016-12-10 14:56:17 -05:00
Nicolas F
64598e9c01 Set errorTileUrl to blank.png
Hopefully this code is correct, I have not tried with a different
"base" variable, but I don't even know what that thing is.
2016-12-10 14:56:17 -05:00
Andrew Chin
6d3062fade Misc leaflet fixes 2016-12-10 14:56:17 -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
d593a4e974 Added world switcher control 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
6ea2758c31 optimizeimages: support pngnq-s9
pngnq-s9 is essentially just a more recently dead version of pngnq,
however, due to not being able to specify multiple binary names in
the past, we've not supported it. Refactor the code to allow specifying
multiple binary names, and add pngnq-s9 to it.
2016-12-06 16:11:45 +01:00
Nicolas F
c49990f18b genPOI: expose uuid value for filter functions
Fixes #1345.
2016-12-06 15:28:53 +01:00
Nicolas F
54b93754c7 genPOI/docs: Handle new sign id values
Minecraft now uses minecraft:sign as its id for signs, but also uses
Sign for older versions or chunks that have not yet been updated.

Change the genPOI sign wrangling code and the documentation to reflect
this change.

Fixes #1340.
2016-12-06 15:17:39 +01:00
Nicolas F
c7d86eca76 Change shebang to python2 instead of python 2016-12-06 15:01:20 +01:00
Mark Vander Stel
d92f00d97d Update strings and items to 1.11
Update all strings and vars to 1.11.
Add new items and blocks to items.py.
2016-11-29 09:13:42 -05:00
Mark Vander Stel
23c00eaf1f Add new 1.11 blocks
Add observer, with 4 textures and 6 orientations.
Add shulker box, with 16 block IDs, an entity texture, and 6
orientations.
2016-11-29 09:13:35 -05:00
Nicolas F
4287fc5f0b Add -q alias for --quiet to genPOI
This brings it in line with the syntax of the main overviewer.py
script.
2016-06-30 09:04:49 +02:00
Aaron Griffith
1a41d8d195 bump overviewer.h version, textures.py version 2016-06-11 16:38:19 -04:00
Aaron Griffith
24e9f9e6e8 Merge remote-tracking branch 'dbergl/1.10-blocks' 2016-06-10 20:44:37 -04:00
Aaron Griffith
7bbc3bd4d4 Merge branch 'patch-3' of git://github.com/tazorax/Minecraft-Overviewer 2016-06-10 20:43:14 -04:00
Aaron Griffith
125c87b195 Merge remote-tracking branch 'Socolin/patch-3' 2016-06-10 20:37:30 -04:00
Aaron Griffith
11c10972e2 Merge remote-tracking branch 'kevinwchang/filter-id' 2016-06-10 20:31:28 -04:00
Aaron Griffith
5571f4eb54 Merge remote-tracking branch 'CounterPillow/corrupt-region-warning' 2016-06-10 20:22:40 -04:00
Aaron Griffith
5665beb43f Merge remote-tracking branch 'mc680x0/master' 2016-06-10 20:21:03 -04:00
Aaron Griffith
1c25b16ec6 fixed typo in biomes.h 2016-06-10 20:15:18 -04:00