Commit Graph
100 Commits
Author SHA1 Message Date
Aaron Griffith 4e3a92874c watercolor will now be used if it can be loaded
Right now the Biome Extractor does not extract this with the other
biome colors, so making it *required* would lead to a lot of errors
for people running servers that don't have the client jar.

Once the Biome Extractor has been changed, this should also.
2011-09-19 21:05:20 -04:00
Aaron Griffith 14b639d5dc fixed running overviewer.py when --changelist isn't given 2011-09-19 20:33:59 -04:00
Aaron Griffith e45cd373d0 Merge remote-tracking branch 'tswsl1989/issue478' 2011-09-19 19:37:28 -04:00
Aaron Griffith 33a0860d9f put quotes around terrain SHA so github doesn't auto-link it by mistake 2011-09-19 16:21:41 -04:00
Aaron Griffith b640b6dc2d updated contrib scripts to work with latest code 2011-09-16 15:59:43 -04:00
Aaron Griffith 8c4dd10824 Revert "small findSigns.py fix -- loading regions with north_direction pre-rotates"
This reverts commit 085d400337.
2011-09-16 14:27:03 -04:00
Aaron Griffith 085d400337 small findSigns.py fix -- loading regions with north_direction pre-rotates
What we want in findSigns.py is the raw map data.
2011-09-16 13:43:20 -04:00
Aaron Griffith 308460e251 all loaded images are now converted to RGBA before use
This fixes Issue #484.
2011-09-15 20:02:51 -04:00
Aaron Griffith 6bb79c5994 Merge remote-tracking branch 'counterpillow/updated-readme' 2011-09-15 16:04:36 -04:00
Aaron Griffith 1f9bef14e6 --version now understands vX.X.X tags 2011-09-14 19:01:16 -04:00
Aaron Griffith 130ad8085f earlier '~' expansion, and partial fix for Issue #460 2011-09-14 18:56:55 -04:00
Aaron Griffith 5ca6305837 fence gates 2011-09-14 18:00:59 -04:00
Aaron Griffith 309db05924 all biome tinting is now handled in rendermode-normal.c.
Note that the case when there isn't any biome data available is not
yet properly handled.
2011-09-14 15:04:18 -04:00
Aaron Griffith c6525fb529 Merge branch 'counterpillow/18prep' into 18prep
Conflicts:
	overviewer_core/textures.py
2011-09-11 15:43:19 -04:00
Aaron Griffith dc81561c8f Merge branch 'rendermode-options' 2011-09-09 14:30:55 -04:00
Aaron Griffith e67dd9ba6e incremented extension version for RMO 2011-09-08 07:49:09 -04:00
Aaron Griffith fb45fb3dff added label metadata to rendermodes (no more ugly map labels) 2011-09-08 07:34:35 -04:00
Aaron Griffith bbb2a3943e re-fixed cave mode lighting problems (no longer slows down lighting mode itself!) 2011-09-08 07:07:43 -04:00
Aaron Griffith bc138ac859 created a distinct 'hidden' function 2011-09-07 17:16:43 -04:00
Aaron Griffith 7b634cc434 overviewer.py no longer loops forever if it can't find terrain.png
There's also a more helpful error if any texture can't be found.
Closes #475.
2011-09-07 09:15:21 -04:00
Aaron Griffith 43629e928b Merge branch 'master' into rendermode-options
Conflicts:
	overviewer.py
2011-09-06 10:29:15 -04:00
Aaron Griffith e3fb3f4a66 fixed testRender.py to work with newer overviewer.py 2011-09-04 08:24:15 -04:00
Aaron Griffith c0dcda3d84 fixed clearOldCache.py contrib script to work with new python package 2011-08-30 02:37:08 -04:00
Aaron Griffith 40231598d8 command-line rendermodes can now be separated by ',', ':', or '/'
This should fix Issue #472.
2011-08-27 17:20:58 -04:00
Aaron Griffith e800138079 Merge remote branch 'brownan/master' into rendermode-options 2011-08-26 21:06:14 -04:00
Aaron Griffith 1594fc5465 fixed mistake on last merge that caused custom modes to be ignored 2011-08-26 21:05:27 -04:00
Aaron Griffith 85e8a1e889 added more stern warnings about sample.settings.py and the --zoom option 2011-08-22 23:20:17 -04:00
Aaron Griffith fe0d28630b Merge branch 'master' into rendermode-options
Conflicts:
	overviewer.py
2011-08-18 11:40:26 -04:00
Aaron Griffith d19ee7d280 --skip-js no longer skips writing overviewer.dat 2011-08-18 11:34:16 -04:00
Aaron Griffith 5c37bf1801 having both a world/overviewer.dat and a output/overviewer.dat now warns about the world version
old behaviour was to replace the output dat with the world dat
2011-08-18 11:24:06 -04:00
Aaron Griffith 42cb4b7756 updated CONTRIBUTORS.rst with tswsl1989 and rmrector 2011-08-17 18:30:43 -04:00
Aaron Griffith 60649c85fd now defaults to the map's current north direction unless otherwise specified 2011-08-17 18:22:50 -04:00
Aaron Griffith 087d597ed0 Merge remote branch 'rmrector/configurable-north' into configurable-north
Conflicts:
	overviewer.py
	overviewer_core/world.py
2011-08-17 17:35:37 -04:00
Aaron Griffith 409c44ff86 Merge branch 'master' of github.com:brownan/Minecraft-Overviewer 2011-08-17 17:12:22 -04:00
Aaron Griffith 3e2828a3d9 fixed bug when overviewer.dat exists in world dir, but output dir does not exist 2011-08-16 15:07:21 -04:00
Aaron Griffith 79680203a5 fixed forcerender not being used while rendering innertiles 2011-08-16 15:02:09 -04:00
Aaron Griffith 3958100f0b mobs can't spawn on water!?!?! whoah. 2011-08-16 14:35:07 -04:00
Aaron Griffith e808007b11 Merge remote-tracking branch 'tswsl1989/brownan' 2011-08-16 11:27:54 -04:00
Aaron Griffith 04310ab71d helpful error on Python 3, and removed --delete 2011-08-16 10:28:58 -04:00
Aaron Griffith e618e949c9 more indentation fixes 2011-08-15 15:48:05 -04:00
Aaron Griffith 74d935686d changed --list-rendermodes to be tree-based 2011-08-05 16:40:48 -04:00
Aaron Griffith c3a323570d Merge branch 'master' into rendermode-options 2011-08-04 19:30:52 -04:00
Aaron Griffith 1ac89cabd9 Merge remote branches 'tswsl1989/brownan' and 'fenixin/texture-improvements' 2011-08-02 20:07:03 -04:00
Aaron Griffith 4ecb370b9c Merge branch 'master' into rendermode-options
Conflicts:
	overviewer_core/chunk.py
	overviewer_core/src/iterate.c
2011-07-31 22:46:19 -04:00
Aaron Griffith 6a5eb517d6 tallgrass now appears in the same place, no matter what mode is used 2011-07-31 22:33:49 -04:00
Aaron Griffith 91b3010db3 fixed lighting bug introduced by tall grass fix 2011-07-31 22:28:28 -04:00
Aaron Griffith 69bb23b74c fixed tallgrass offsets affecting blocks above 2011-07-31 22:18:01 -04:00
Aaron Griffith 142c621cc8 added but2002 to CONTRIBUTORS.rst 2011-07-31 20:47:25 -04:00
Aaron Griffith 30a8b851b6 added separate 'zoomLevels' JS config var for marker positioning use (closes #401) 2011-07-31 12:50:41 -04:00
Aaron Griffith ebd3497a5f made forcerender and regionlist work together (closes #444) 2011-07-31 12:50:41 -04:00
Aaron Griffith f0a1a1c03d Merge pull request #445 from but2002/master
Remove location marker with click
2011-07-29 15:25:25 -07:00
Aaron Griffith 85a55c25c3 more helpful error if given worlddir does not contain level.dat 2011-07-25 11:05:21 -04:00
Aaron Griffith ef6ad96080 fixed region group handling to actually use matcher, and to show non-matched regions 2011-07-22 08:19:18 -04:00
Aaron Griffith 0a119202f6 Merge pull request #438 from Fenixin/fix-beds
Fix beds, cakes and adds an option to resize al textures.
2011-07-22 02:23:01 -07:00
Aaron Griffith 931d71103c possible (hopeful) fix for the garbage collection bug 2011-07-18 23:56:51 -04:00
Aaron Griffith 546fe5c39e Merge pull request #434 from Xon/master
Permit overviewer to keep running even if the chunk the spawn is in is corrupt.
2011-07-15 10:44:30 -07:00
Aaron Griffith f7015396ab added options to overviewerConfig.js for search box, coords box, overlay menu 2011-07-14 23:07:32 -04:00
Aaron Griffith cbd48fa2eb fixed typo in setup.py 2011-07-14 22:52:13 -04:00
Aaron Griffith af63ff9992 fixed recursive web_assets handling (closes issue #430) 2011-07-12 18:41:08 -04:00
Aaron Griffith a7753486dc Merge branch 'master' into rendermode-options 2011-07-12 12:20:09 -04:00
Aaron Griffith 482ccd3dd8 updated CONTRIBUTORS.rst 2011-07-10 20:43:43 -04:00
Aaron Griffith fde647bfdf Merge branch 'py-package'
Conflicts:
	setup.py
2011-07-10 18:14:20 -04:00
Aaron Griffith 082e91fca3 Merge remote-tracking branch 'orospakr/master' 2011-07-10 17:58:21 -04:00
Aaron Griffith da421a29a2 added --forcerender to the readme 2011-07-09 09:37:06 -04:00
Aaron Griffith 0c63bcb5fe changed setup.py to copy web_assets recursively for py2exe 2011-07-07 16:35:48 -04:00
Aaron Griffith 62119c37ef bumped extension version for fix that closes #414 2011-06-23 15:21:46 -07:00
Aaron Griffith 79944d4f90 fixed out-of-bounds index segfault 2011-06-23 17:44:04 -04:00
Aaron Griffith aed6938d22 now fails correctly if --settings is given but file does not exist 2011-06-22 14:19:50 -04:00
Aaron Griffith 96fb3accb5 Merge branch 'master' into rendermode-options
Conflicts:
	src/rendermode-lighting.c
	src/rendermodes.h
2011-06-19 14:00:56 -04:00
Aaron Griffith d5ceec6e8b fixed custom mode option inheritance bug + another bug
Render mode "self" structs are now guaranteed to start zero'd out.
2011-06-19 13:50:55 -04:00
Aaron Griffith 7e5f518958 normal mode height fading (a la Fenixin's formula, Issue #147) 2011-06-19 13:34:16 -04:00
Aaron Griffith f8b005d079 added render_mode_parse_option helper function 2011-06-19 13:06:12 -04:00
Aaron Griffith 6aab671857 Merge pull request #410 from Fenixin/stairs-new-lighting
This is a new way to handle lighting for stairs and other half-block type.
2011-06-18 17:31:00 -07:00
Aaron Griffith b1a386cae9 fixed sample.settings.py typo 2011-06-16 06:26:58 -07:00
Aaron Griffith 091a76fe60 added sans-serif font styling to whole page, in line with other controls 2011-06-15 10:26:58 -04:00
Aaron Griffith 57100c1912 fix small bug when parent option merging fails 2011-06-15 00:42:41 -04:00
Aaron Griffith c3e79459d4 fix for running on PIL 1.1.5 and earlier 2011-06-15 00:28:32 -04:00
Aaron Griffith 7d587ecc6d changed mineral overlay to highlight even if the block is just above the color 2011-06-14 21:13:53 -04:00
Aaron Griffith a50cd315ef added 'minerals' option to mineral overlay 2011-06-14 20:56:21 -04:00
Aaron Griffith 65690eea68 Merge branch 'mineral-overlay' into rendermode-options 2011-06-14 20:10:26 -04:00
Aaron Griffith 98562b6f4a windows build fixes 2011-06-12 22:29:28 -04:00
Aaron Griffith a0d1cd45d9 Merge branch 'master' into rendermode-options 2011-06-12 22:25:59 -04:00
Aaron Griffith bdee438060 added 'lighting' option to cave mode 2011-06-12 22:03:42 -04:00
Aaron Griffith 3d6042260c added 'only_lit' option to cave mode 2011-06-12 20:49:54 -04:00
Aaron Griffith 13c9750a43 fixed crash when spawn point does not have an associated region file (closes issue #399) 2011-06-11 05:01:19 -04:00
Aaron Griffith 5ae843aa80 fixed --list-rendermodes bug, and made sure custom modes show up 2011-06-11 04:38:38 -04:00
Aaron Griffith f5a187dad0 bumped extension version, and added in a few new rendermode options 2011-06-11 04:27:04 -04:00
Aaron Griffith bd9b1873e3 added support for "custom" rendermodes created in python 2011-06-11 04:01:40 -04:00
Aaron Griffith bfb92de7b7 provided options are now checked against the available options 2011-06-11 00:01:12 -04:00
Aaron Griffith da706287c8 added a couple of simple options to the 'normal' rendermode 2011-06-10 23:15:24 -04:00
Aaron Griffith a37d0ce9bc added options metadata (and python accessor) 2011-06-10 22:27:46 -04:00
Aaron Griffith 6d667cb262 added (currently unchecked) global rendermode option support 2011-06-09 23:28:29 -04:00
Aaron Griffith b654f3169f cleaned up rendermode interface 2011-06-09 21:00:24 -04:00
Aaron Griffith 5b25b3c597 Merge branch 'styled-controls', remote-tracking branch 'fenixin/improve-tall-grass2' 2011-06-08 20:16:54 -04:00
Aaron Griffith 512b2032b2 finished styling controls 2011-06-08 19:58:18 -04:00
Aaron Griffith 6bb39a87ca basic styling for custom control buttons 2011-06-08 16:48:29 -04:00
Aaron Griffith 71bd38a8aa Merge branch 'master' into py-package
Conflicts:
	overviewer_core/googlemap.py
2011-06-08 15:59:09 -04:00
Aaron Griffith 454c1537a6 sign drop-down now only shows rules that actually match something 2011-06-08 15:29:54 -04:00
Aaron Griffith c2bf7ff34e added --no-signs option 2011-06-08 15:29:54 -04:00
Aaron Griffith 03094b1af9 Merge branch 'master' into mineral-overlay
Conflicts:
	src/overviewer.h
2011-06-06 22:18:23 -04:00