Commit Graph
100 Commits
Author SHA1 Message Date
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 f8457957f8 Merge pull request #389 from Fenixin/opti-new
Change the optimizing programs. Add new value for the option optimizeimg.
2011-06-05 16:58:04 -07:00
Aaron Griffith c10074e87f Merge branch 'master' into py-package 2011-06-04 20:05:31 -04:00
Aaron Griffith ac91268c66 added --forcerender option 2011-06-04 20:05:09 -04:00
Aaron Griffith 9cdfe0e626 Merge pull request #383 from Fenixin/opti-fix
Fix optimizeimg=2 transparency issue.
2011-06-02 10:16:38 -07:00
Aaron Griffith 317f7794fe Merge branch 'master' into py-package 2011-05-31 20:26:00 -04:00
Aaron Griffith 733e816dbc fixed biome loading order 2011-05-31 20:06:54 -04:00
Aaron Griffith 8565919c89 fixed uninitialized texture pointer, and bumped extension version 2011-05-31 20:05:45 -04:00
Aaron Griffith 387f97d64d initial work on py2app for OSX 2011-05-28 19:07:05 -04:00
Aaron Griffith 2b7fce9bce Merge branch 'master' into py-package 2011-05-28 15:15:06 -04:00
Aaron Griffith 561bb64c7c fixes for py2exe/windows 2011-05-28 15:05:52 -04:00
Aaron Griffith a2a84161be Merge pull request #370 from CounterPillow/master
maptype live hash updating
2011-05-26 14:56:41 -07:00
Aaron Griffith f82911e04e added overview map control (tiny, zoomed out map in corner) (hidden by default) 2011-05-24 18:22:08 -04:00
Aaron Griffith 0104847c04 changed extra file install location to something more sane 2011-05-14 15:34:26 -04:00
Aaron Griffith c12f95b0a1 nice version numbers, and metadata update 2011-05-13 23:39:44 -04:00
Aaron Griffith 8aafd34769 --version now works with sdist 2011-05-13 22:40:18 -04:00
Aaron Griffith 4ec1b4c971 working versions, data files, and package metadata 2011-05-13 22:24:49 -04:00
Aaron Griffith e84ef2c1d2 Merge branch 'master' into py-package
Conflicts:
	overviewerConfig.js
	overviewer_core/data/overviewerConfig.js
	setup.py
	web_assets/overviewerConfig.js
2011-05-13 21:37:35 -04:00
Aaron Griffith 6dd3ac067c fixed setup.py info to account for overviewerConfig.js move 2011-05-13 21:30:26 -04:00
Aaron Griffith 21de6222ca renamed --config-file to --settings, updated README with new options 2011-05-13 18:22:00 -04:00
Aaron Griffith dacd45e5d3 configurable settings.py, web_assets, textures paths 2011-05-13 18:04:05 -04:00
Aaron Griffith 93424c296d textures are now only generated when actual *rendering* is done 2011-05-13 12:30:13 -04:00
Aaron Griffith e64af5baef Merge branch 'master' into py-package 2011-05-12 19:21:46 -04:00
Aaron Griffith d2c9b80239 live hash Spawn button fix, negative zoom, and markers 2011-05-12 19:15:44 -04:00
Aaron Griffith 2bca2b6db3 added generator meta tag 2011-05-12 17:53:13 -04:00
Aaron Griffith 63d387c280 added Jeffrey Warren and CounterPillow to CONTRIBUTORS.rst 2011-05-12 14:14:27 -04:00
Aaron Griffith 873c798f2d Merge remote branches 'counterpillow/master', 'pironic/click-fix' and 'fenixin/signposts' 2011-05-12 13:57:30 -04:00
Aaron Griffith 3d293a37d9 Merge remote branch 'jywarren/master' 2011-05-12 13:55:06 -04:00
Aaron Griffith 5a483ba4cc added pironic to CONTRIBUTORS.rst 2011-05-10 20:34:09 -04:00
Aaron Griffith e8f9a8bf3e added CONTRIBUTORS.rst to dist stuff, capitalized package name 2011-05-10 20:22:00 -04:00
Aaron Griffith 383b01859f Merge branch 'master' into py-package
Conflicts:
	overviewer_core/data/config.js
	overviewer_core/data/web_assets/functions.js
	overviewer_core/data/web_assets/style.css
	setup.py
	web_assets/overviewer.css
	web_assets/style.css
2011-05-10 20:19:10 -04:00
Aaron Griffith cc91808036 Merge pull request #360 from pironic/region-opacity
allowed for opacity of fill/stroke to be defined independently
2011-05-09 08:48:02 -07:00
Aaron Griffith 6e03cebb50 Merge pull request #359 from Fenixin/more-blocks
Few more texture things.
2011-05-09 05:54:40 -07:00
Aaron Griffith a379a731df Merge pull request #354 from Fenixin/diamond-ore-textures.
Fix diamond-ore textures.
2011-05-03 05:34:41 -07:00
Aaron Griffith 4a82e749ca added imgquality config file option for setting JPG quality
Original code by alexjurkiewicz, ported to new DTT code.
This closes #83.
2011-05-02 18:02:46 -04:00
Aaron Griffith c1e71f0fda grass now has snowy sides when covered in snow 2011-05-01 19:42:27 -04:00
Aaron Griffith e110fe735d Merge pull request #353 from Fenixin/more-textures.
More textures.
2011-05-01 15:29:41 -07:00
Aaron Griffith 9a537e76e2 some config file clarifications 2011-04-30 23:11:54 -04:00
Aaron Griffith d163e7c527 support for biome coloring on side grass (closes issue #341) 2011-04-30 23:11:53 -04:00
Aaron Griffith f3591c0e51 Merged pull request #345 from Fenixin/graphic-improvement.
Graphic improvement using other filter to scale down images.
2011-04-28 13:49:38 -07:00
Aaron Griffith 2d25d74bd7 moved quadtree preprocessing out of RenderNode, fixes issue #326 2011-04-18 20:16:06 -04:00
Aaron Griffith a6e8de484d Merge branch 'overlays' into dtt-c-render
Conflicts:
	quadtree.py
	web_assets/functions.js
2011-04-18 18:29:51 -04:00
Aaron Griffith 82aa172dcc Merge branch 'master' into dtt-c-render
Conflicts:
	setup.py
2011-04-18 18:14:41 -04:00
Aaron Griffith 3edc152ea3 Merge remote branch 'rfinnie/master' 2011-04-18 18:12:00 -04:00
Aaron Griffith 5f6ceebc81 fixed MIN/MAX mixup that prevented spawn overlay from working 2011-04-18 11:02:39 -07:00
Aaron Griffith c790ad5102 windows build fixes 2011-04-18 11:03:29 -04:00
Aaron Griffith 5c3b3be418 basic rendermode inheritance introspection (no more hacky overlay list) 2011-04-16 20:08:38 -04:00
Aaron Griffith 5294b88df9 more fixes for spawn overlay at z == 127 2011-04-16 19:33:21 -04:00
Aaron Griffith 05c4083b7e support for mixed png/jpg tilesets, and overlays with imgformat=jpg 2011-04-16 19:25:40 -04:00
Aaron Griffith 26b35906a4 fix for cave mode merge 2011-04-16 19:20:21 -04:00
Aaron Griffith 558ebe0899 fixed for-loop scoping on createDropDown() closures 2011-04-16 12:03:12 -04:00
Aaron Griffith 5f69b78c75 Merge branch 'dtt-c-render' into overlays
Conflicts:
	setup.py
2011-04-16 11:25:04 -04:00
Aaron Griffith f30a5db2a1 destination directory will now be created recursively, if needed 2011-04-16 11:20:35 -04:00
Aaron Griffith ad358fa7fd fixed spawn mode for chunk tops 2011-04-15 21:44:59 -04:00
Aaron Griffith 9cc01ddc21 removed some blocks from solid_blocks, fixed overlays on snow, half-steps 2011-04-15 21:36:31 -04:00
Aaron Griffith af559f6b88 bumped extension version for cave mode 2011-04-15 09:02:39 -07:00
Aaron Griffith 8fa515fa59 fixes for building cave mode on windows 2011-04-14 15:12:18 -04:00
Aaron Griffith bbf52a77ae added CONTRIBUTORS.rst 2011-04-13 11:15:19 -04:00
Aaron Griffith 70bf8a7fb2 README update for settings.py, --rendermodes 2011-04-13 09:14:27 -04:00
Aaron Griffith e950cebb04 Merge branch 'dtt-c-render' into overlays 2011-04-13 02:47:03 -04:00
Aaron Griffith 299f15a312 Merge branch 'dtt-c-render' into py-package 2011-04-13 02:42:22 -04:00
Aaron Griffith 485db7ef73 Merge branch 'master' into dtt-c-render 2011-04-10 05:57:39 -04:00
Aaron Griffith b9a21b98e0 fixed dumb boolean logic in optimizeimg check 2011-04-10 05:57:15 -04:00
Aaron Griffith cc6b4bc022 Merge branch 'master' into dtt-c-render 2011-04-10 04:43:02 -04:00
Aaron Griffith a2b1f238d9 changed markers.js to output one marker per line
this has been requested *many* times, because it makes it easier to
(1) learn what format markers.js uses, and
(2) write shell scripts that process markers.js.

It shouldn't break existing processors that use json loaders, and does
not drastically increase file size (just one extra byte per ~70).
2011-04-10 04:38:42 -04:00
Aaron Griffith dfe30a0d0f now checks for optimize-img programs with '.exe' as well as no suffix
fix for issue #314
<https://github.com/brownan/Minecraft-Overviewer/issues/314>
2011-04-10 04:11:33 -04:00
Aaron Griffith 22fc77308e fixed minor inlining error in commit d547727
fixes regression in issue #320
<https://github.com/brownan/Minecraft-Overviewer/issues/320>
2011-04-10 03:44:06 -04:00
Aaron Griffith b75fb04719 Merge branch 'dtt-c-render' of git@github.com:brownan/Minecraft-Overviewer into HEAD 2011-04-10 03:28:58 -04:00
Aaron Griffith cb8a17c448 fixed bug in sign groups js, for checked: true
related to issue #321
<https://github.com/brownan/Minecraft-Overviewer/issues/321>
2011-04-10 03:25:16 -04:00
Aaron Griffith c428fcbd70 changed testRender.py to work with ./overviewer.py and ./gmap.py (sorta) 2011-04-04 02:13:12 -04:00
Aaron Griffith 66145e374a Merge branch 'dtt-c-render' into py-package
Conflicts:
	setup.py
2011-04-03 22:47:11 -04:00
Aaron Griffith ab40d980af Merge branch 'dtt-c-render' into overlays
Conflicts:
	setup.py
2011-04-03 22:44:44 -04:00
Aaron Griffith e5660bf925 fixed snow/half-step edge lines 2011-04-03 00:15:48 -04:00
Aaron Griffith 115c36ad5e Merge branch 'dtt-c-render' into py-package
Conflicts:
	overviewer.py
2011-04-01 22:00:45 -04:00
Aaron Griffith 298cdb2281 Merge branch 'dtt-c-render' into overlays 2011-04-01 21:54:05 -04:00
Aaron Griffith 3d78e21af7 fixed contrib/testRender.py crashing when -l isn't specified 2011-04-01 21:47:50 -04:00
Aaron Griffith 42596416d9 sdist and install now work
next step is using a custom data dir, and falling back on the package
data dir. Also, fixing --version.
2011-03-29 13:49:50 -04:00
Aaron Griffith 3fa54aff26 initial work at reorganizing source tree 2011-03-29 11:10:24 -04:00
Aaron Griffith 7955092e66 Merge branch 'dtt-c-render' into overlays
Conflicts:
	overviewer.py
	setup.py
2011-03-29 05:57:56 -04:00
Aaron Griffith 9c25c6259c added center to config.js, lets you set map center in world coords
By default, it is set to spawn. Also I changed defaultZoom to 2, which
looks better (the world used to show up as *tiny* by default).
2011-03-29 05:48:40 -04:00
Aaron Griffith 9b36d21c37 moved non-config, global variables out of config.js 2011-03-29 05:29:37 -04:00
Aaron Griffith 88d4ebe5ae added --list-rendermodes option 2011-03-29 05:24:25 -04:00
Aaron Griffith 5f0766839e added metadata to rendermodes, and python bindings for them 2011-03-29 05:13:25 -04:00
Aaron Griffith 862ee62cb9 fixed warning during compile about endian.c 2011-03-29 04:46:40 -04:00
Aaron Griffith d7af3d437b changing the C header files now correctly rebuilds whole extension 2011-03-29 04:33:41 -04:00
Aaron Griffith 0a64c00859 Merge remote branch 'xon/dtt-c-render' into dtt-c-render
Conflicts:
	rendernode.py
2011-03-29 04:20:17 -04:00
Aaron Griffith b24ae6c00a signposts controls no longer toggle overlays 2011-03-28 05:18:41 -04:00
Aaron Griffith f23d3ddac9 converted spawn into a overlay-based rendermode 2011-03-28 03:40:02 -04:00
Aaron Griffith 83db528d81 added callback for derived rendermodes to easily provide overlay color 2011-03-28 03:20:16 -04:00
Aaron Griffith d4bd1d713c overlay mode now only considers blocks where overlays make sense 2011-03-28 03:09:00 -04:00
Aaron Griffith 9f69f099ad initial support for map overlays 2011-03-28 02:50:36 -04:00
Aaron Griffith 4977ae8767 added exceptions for .DS_Store and Thumbs.db in mirror_dir 2011-03-27 21:24:25 -04:00
Aaron Griffith c738777839 Merge commit 'fenixin/dtt-c-render-newblocks' into dtt-c-render 2011-03-27 18:49:18 -04:00
Aaron Griffith e0e571971a added endianness helper functions, and reading biome data directly 2011-03-27 06:07:43 -04:00
Aaron Griffith fc176206ff initial C biome code 2011-03-27 05:49:57 -04:00
Aaron Griffith 310cb8a1f6 Merge commit 'fenixin/dtt-c-render-water-redstone' into dtt-c-render
Changed 0b0000 constants into 0x00 equivalents.
2011-03-26 23:34:42 -04:00
Aaron Griffith 1f27ccb9be added overall_alpha parameter to alpha_over, speeding up lighting 2011-03-26 21:52:16 -04:00
Aaron Griffith 0465787e6a fixed accidental revert of fenixin's fix 2011-03-26 02:03:13 -04:00