0
Commit Graph

1414 Commits

Author SHA1 Message Date
Andrew Brown
d1f13cadc5 Revert "Picks the right protocal based on what is being used. This fixes ssl errors on sites that use https."
Reason: breaks local viewing. Tries to access file://maps.google.com
etc.

This reverts commit da663dadb3.
2012-02-25 19:23:47 -05:00
Andrew Chin
abc1b4f8cb Merge branch 'oneworld' of git://github.com/duckman/Minecraft-Overviewer into rewrite 2012-02-25 18:22:59 -05:00
Andrew Chin
997ec58161 Only copy real js files (not silly editor swap files) 2012-02-25 15:57:29 -05:00
Andrew Brown
e4ab4696c9 Merge pull request #620 from duckman/https
Https
2012-02-23 18:55:13 -08:00
Andrew Brown
b98dcab2d9 Merge master changes into rewrite 2012-02-23 19:42:50 -05:00
Lucas Hereld
da663dadb3 Picks the right protocal based on what is being used. This fixes ssl errors on sites that use https. 2012-02-23 11:46:26 -08:00
Lucas Hereld
4654595238 if there is only one world, shouldnt show the world selector 2012-02-23 09:10:17 -08:00
Andrew Brown
ae820079d1 Updated example to be more correct 2012-02-22 23:20:16 -05:00
Andrew Chin
1a1e975793 Detect poorly escaped paths 2012-02-20 21:38:00 -05:00
Andrew Chin
54f511ec3d Hide the " - default" suffix on worlds that use the default dimension 2012-02-20 14:27:30 -05:00
Aaron Griffith
d17931c112 blog links now point to overviewer.org blog 2012-02-19 21:40:56 -05:00
Andrew Chin
9d18b0cacd fixed --version on 64-bit windows builds 2012-02-19 21:39:03 -05:00
Andrew Chin
c5c45363e3 Remove debug console logging from js
This caused problems on browsers that didn't know what to do with
the 'console' object (like IE, and older versions of Firefox)
2012-02-19 18:11:44 -05:00
Andrew Chin
9d814bf653 Pack up js_src to fix issue with .exe builds 2012-02-19 18:06:43 -05:00
Andrew Chin
2621997ecc Made multiprocessing work on windows \o/ 2012-02-18 01:19:45 -05:00
Andrew Chin
ff6425d358 Normalize paths to fix issues on Windows 2012-02-17 21:16:47 -05:00
Andrew Brown
d669034c4c corrected y to z in functions in nbt.py 2012-02-17 20:11:02 -05:00
Andrew Brown
5e0d0df719 Merge pull request #616 from contre/rewrite
Setup.py calls for wrong sample config file
2012-02-16 09:40:42 -08:00
Richard Pastrick
298e0d4222 Change sample.settings.py to sample_config.py 2012-02-16 09:38:08 -08:00
Andrew Brown
f8769c0a0d --forcerender, --check-tiles, and --no-tile-checks now work 2012-02-16 11:36:31 -05:00
Andrew Brown
1457bf1564 Added a good sample config that actually works 2012-02-15 22:41:22 -05:00
Andrew Brown
6c22e306ba removed texture_path global option from docs 2012-02-15 22:16:17 -05:00
Andrew Brown
b99b2230be Merge branch 'rewrite' of github.com:overviewer/Minecraft-Overviewer into rewrite 2012-02-15 22:07:53 -05:00
Andrew Brown
2c412c3917 Added global defaults to config file which set renderdict defaults 2012-02-15 22:07:36 -05:00
Aaron Griffith
e33241a973 fixed leaking block data for each rendered chunk 2012-02-15 21:38:45 -05:00
Andrew Brown
9c0a8c01ee re-arranged config docs, relaxed validator for north direction 2012-02-15 19:18:51 -05:00
Andrew Brown
6b449da966 added int array support to nbt.py
(untested) Also removed an extra import that I forgot about earlier.
2012-02-15 18:20:57 -05:00
Andrew Brown
0b7e42110c Merge commit 'b2c3759' into rewrite 2012-02-15 18:13:01 -05:00
Andrew Brown
f5d07fa597 Added a "did you mean" feature for config parsing 2012-02-14 21:12:15 -05:00
Andrew Brown
aaf8e1d7cb Changed "worldname" to "world" in configfile
Also brought tests up to date. All tests pass now.
2012-02-14 20:39:05 -05:00
Andrew Chin
f3b434a327 Fixed doc typo 2012-02-14 19:51:19 -05:00
Richard Pastrick
b2c37593c6 Update documentation with a few more of the configuration options and removed stochasticrender options since it seems to have been replaced with rerenderprob. 2012-02-14 11:11:47 -08:00
Andrew Brown
3868728eb8 fixed links related to the windows guide 2012-02-12 21:11:18 -05:00
Andrew Brown
8ec401fcf7 finished windows noob guide. 2012-02-12 21:08:16 -05:00
Andrew Brown
2796daf943 Added Michael Fallows to contributer list. Thanks for your contributions! 2012-02-12 17:49:26 -05:00
Andrew Brown
8edf2edfcd Merge remote-tracking branch 'redorkulated/patch-1' into rewrite 2012-02-12 17:22:25 -05:00
redorkulated
6f0c2c467a Reading tile file ext from settings per tileset 2012-02-12 22:18:16 +00:00
Andrew Brown
9c4de64a62 added the image extension to the outputted json metadata 2012-02-12 17:15:50 -05:00
Andrew Chin
1703b4952b Fix print_status to not crash if total tiles is unknown 2012-02-12 16:35:56 -05:00
Andrew Brown
5e2956f101 fixed error message raising an error of its own 2012-02-12 16:11:06 -05:00
Andrew Brown
adc9151f44 fixed jpg rendering 2012-02-12 15:57:53 -05:00
Andrew Brown
9fc9c2a781 set a default image quality 2012-02-12 15:55:03 -05:00
Andrew Brown
c94cc079c1 Merge remote-tracking branch 'origin/rewrite' into rewrite
Conflicts:
	overviewer.py
2012-02-12 15:35:37 -05:00
Andrew Brown
ec2ae2ebfc added --rendermodes option 2012-02-12 15:30:05 -05:00
Andrew Brown
607bb329cf tileset objects now accept "jpg" or "jpeg" for jpeg format 2012-02-12 15:28:09 -05:00
Andrew Chin
14306f7e8a Bring docs and code in sync 2012-02-12 13:45:43 -05:00
Aaron Griffith
6cf38d08b6 --processes=1 now correctly uses the vanilla dispatcher 2012-02-12 01:20:32 -05:00
Andrew Chin
9b419a8995 Nicer looking status messages 2012-02-11 16:30:36 -05:00
Andrew Brown
e7995e19b2 config parser ignores extra items in config files now 2012-02-11 16:02:15 -05:00
Andrew Chin
c60936efbd Remove development/debug output 2012-02-11 15:57:38 -05:00