0
Commit Graph

263 Commits

Author SHA1 Message Date
Andrew Chin
2bf7566b5a Ignore cache images that don't start with "img."
This fixes a bug introduced by the cache-checking changes
2010-12-23 02:21:54 -05:00
Andrew Chin
1a526bbba0 Merged in rmccue's cache checking changes
Conflicts:
	chunk.py
2010-12-23 02:01:58 -05:00
Andrew Chin
e9aa4b6228 Merge branch 'master' of https://github.com/jennytoo/Minecraft-Overviewer into jennytoo-master 2010-12-18 20:13:11 -05:00
Andrew Chin
334385951c Merge branch 'fences' of https://github.com/Fenixin/Minecraft-Overviewer into Fenixin-fences 2010-12-18 18:27:06 -05:00
Andrew Chin
ad5fa9b208 Merge branch 'master' of https://github.com/rmccue/Minecraft-Overviewer into rmccue-master 2010-12-18 15:30:12 -05:00
Andrew Chin
d08730eefb Merge branch 'optimization2' of https://github.com/Fenixin/Minecraft-Overviewer into Fenixin-optimization2 2010-12-18 13:50:35 -05:00
Andrew Chin
774e9ff1bd Merged in .gitignore changes 2010-12-18 13:21:43 -05:00
Alejandro Aguilera
dc7307af56 Darken both sides of the fence 2010-12-17 15:30:00 +01:00
Alejandro Aguilera
1d31cd7e9a Add a special case in generate_special_texture for fences, and add his blockid to special_blocks set. 2010-12-17 13:21:24 +01:00
Alejandro Aguilera
daf7a68d38 Make chunk.py check for blocks that need pseudo ancil data and call generate_pseudo_ancildata. 2010-12-17 12:57:56 +01:00
Alejandro Aguilera
1ad82cf4b1 New function in chunk.py that generates false ancillary data for fence like blocks. 2010-12-17 12:52:47 +01:00
Alejandro Aguilera
598050ddf4 Chunk.pi now loads the 4 adjacent chunks (only blocks data). 2010-12-17 12:51:07 +01:00
Jenny
62a7ee5a50 Fixed missing comma. 2010-12-16 06:46:53 -08:00
Jenny
d210076479 Adds spawn output rendering (variant of night which shows dark areas in red) and support for multiple map types with buttons to switch between them. 2010-12-14 02:39:01 -08:00
Alejandro Aguilera
c5f21ba94a Don't render blocks of half covered chunks. 2010-12-14 09:30:23 +01:00
Ryan McCue
ae0b3dfedf check_cache() wants a full tuple, not just part 2010-12-14 11:54:26 +10:00
Andrew Chin
5819ab60e0 Fix for optimize-img with spaces in the output_dir 2010-12-13 19:49:24 -05:00
Alejandro Aguilera
07383f6d5d Optimization: Chunk.py checks in adjacents chunks to render or not blocks. 2010-12-13 23:17:56 +01:00
Ryan McCue
b3abb072c8 Use chunk.check_cache 2010-12-13 22:16:35 +10:00
Ryan McCue
72ec5469fa Fix order and naming of parameters 2010-12-13 22:04:52 +10:00
Ryan McCue
439231d280 Pretend a string is an AsyncResult 2010-12-13 21:57:35 +10:00
Ryan McCue
810ecaf6db Use the proper find_oldimage() 2010-12-13 21:38:19 +10:00
Ryan McCue
fcfaffffbb Check if the key exists first 2010-12-13 21:21:24 +10:00
Ryan McCue
8def0ffaef Check cache synchronously, to avoid async overhead.
This is starting to do my head in. Apologies if these don't make any
sense, but they do to me. :)
2010-12-13 21:16:21 +10:00
Ryan McCue
c14c6d2bcc My typing is horrible tonight, use the proper variable name 2010-12-13 20:40:58 +10:00
Ryan McCue
ead41141bb Use a tuple properly, oops 2010-12-13 20:39:34 +10:00
Ryan McCue
ef82e657ee Use the right name 2010-12-13 20:38:11 +10:00
Ryan McCue
8ec7986353 Only pass the part of the dict we need to the chunk renderer 2010-12-13 20:34:17 +10:00
Andrew Chin
e70bafb453 Tweaked the viewstate link GUI
Moved it to the bottom of the screen, as it was in the way of the
existing controls on the top-right.  Added it as a map conrol instead of
a simple div.  Improved the styling a bit
2010-12-11 23:15:02 -05:00
Andrew Chin
33a03213c4 Merged in arrai's viewstate link code
Merge commit 'ffe92f7db84789436f53769df1099cd8a68e6097' into arrai-master

Conflicts:
	template.html
2010-12-11 22:19:28 -05:00
Andrew Chin
fcbff8af2a Improved marker titles and newlines
Primarily for browsers that don't render newlines in tooltips.
Thanks to ben0x539
2010-12-11 20:15:12 -05:00
Andrew Chin
97c58212c3 Check for the optimization programs at the start of execution.
This prevents the annoying case where MCO will fail hours into a run if
pngcrush and friends are missing.
2010-12-11 19:44:59 -05:00
Andrew Chin
cebbf4b1b4 Added info on biome tinting to the README 2010-12-11 18:12:36 -05:00
Ryan McCue
211f489f66 Add logging regarding whether cached image is used or not 2010-12-11 21:32:36 +10:00
Ryan McCue
b7f4855ec6 Use logging instead of print statement 2010-12-11 21:31:20 +10:00
Ryan McCue
dff4f4aea8 Add debugging info 2010-12-11 21:22:58 +10:00
Ryan McCue
b94daab5a0 Use self.dirbits instead of dirbits 2010-12-11 21:21:08 +10:00
Ryan McCue
2eb85ae946 Use the proper directory to walk 2010-12-11 21:18:02 +10:00
Ryan McCue
e7c19f9309 Use a more efficient checker for cached images 2010-12-11 21:10:59 +10:00
Andrew Chin
9bc7c10bd1 Improved flexibilty when specifying signGroups
Group membership is now determined with a function.  See config.js for
some examples.  If we want to include more information about markers in
markers.js, this model should be useful.
2010-12-08 22:04:53 -05:00
Andrew Chin
65264407f9 Merge branch 'signpost_ui' of git://github.com/eminence/Minecraft-Overviewer into signpost_ui 2010-12-06 20:23:55 -05:00
Andrew Chin
e96bb91b82 Better handling of the biome tinting images.
If they're not found with _find_file, then look in the EXTRACTEDBIOME
folder in the worlddir.
2010-12-05 01:35:12 -05:00
Andrew Chin
251a89b7dc Merged in agrif's blending fixes
Merge branch 'blending-fixes' of https://github.com/agrif/Minecraft-Overviewer
2010-12-04 20:33:56 -05:00
Andrew Chin
9125919d3e Give a more useful error if the biome color png files can't be found 2010-12-04 19:31:21 -05:00
Andrew Chin
c60180f793 Biome data from Biome Extractor is now used if it is present.
If the BIOMEEXTRACTOR data is not available, then non-biome aware
tinting will be used

Open biome data in binary mode (Windows requires this)
2010-11-23 00:48:39 -05:00
Alex Jurkiewicz
22db7bb3cd clean up biome code 2010-11-23 00:31:35 -05:00
Alex Jurkiewicz
89d8e3653a Ignore cachedirs
Remove old Biiome.java file
2010-11-23 00:29:04 -05:00
Andrew Chin
dc80c88e94 Biome tinting uses now uses the Biome Extractor data files.
See:
http://www.minecraftforum.net/viewtopic.php?f=25&t=80902&view=unread
2010-11-23 00:26:07 -05:00
Andrew Chin
210e65730f Hacky work on biome tinting
Currently this requires python-gearman, gearman-java, and a java SDK.

This code will probably be all thrown away, but if you really want to
play, first compile Biome.java, then run the resulting Biome.class.
Note you'll probably need to hack the signatures out of minecraft.jar to
get it to run.

Then copy grasscolor.png into the cwd, and run gmap.py as usual.

It is slowwwww.  Perhaps running Biome.class on multiple machines might
speed things up?

Here's the kind of output produced: http://smp.em32.net/biome_test/
2010-11-23 00:26:07 -05:00
Andrew Chin
859341008a Some minor signpost UI improvements
* Opening a sign infowindow will close the previously opened window.
 * The use of "Other" and "All" signpost categories are now more
   reasonable.
2010-11-20 18:20:20 -05:00