Commit Graph
100 Commits
Author SHA1 Message Date
Andrew Chin 464fecd256 Merge pull request #440 from Fenixin/pistons
Pistons + better glass.
2011-07-25 17:10:37 -07:00
Andrew Chin 173e662457 Adding ?debug=1 to a map URL enables debug mode 2011-07-14 22:22:58 -04:00
Andrew Chin f4636520dd Added new check_terrain command 2011-07-10 20:53:58 -04:00
Andrew Chin 65aecb9783 Purge pyc files on "setup.py clean" 2011-07-10 18:49:06 -04:00
Andrew Chin 410fdfb3a5 Provide a better error message when a Windows package fails to import c_overviewer 2011-07-09 11:29:23 -04:00
Andrew Chin 312624e96c Fix regression introduced by regression fix 2011-06-18 14:59:37 -04:00
Andrew Chin 6cf0cc5147 Fixed regionlist regression 2011-06-18 11:51:13 -04:00
Andrew Chin b1ee31bffa Proper fix for build issue (Fixes #395) 2011-06-09 11:50:09 -04:00
Andrew Chin 56a2e1f834 Move decl to top of block 2011-06-09 11:45:36 -04:00
Andrew Chin 65086b8509 Merge pull request #392 from Fenixin/update-settings
Update sample.settings.py with the new optimizeimg options.
2011-06-07 15:46:33 -07:00
Andrew Chin 91c3e74ef2 Updated sample settings file
* Causes Overviewer to exit if someone uses the sample settings file
   directly
 * Fixed up the regionlist example so it doesn't throw errors
2011-06-03 22:17:51 -04:00
Andrew Chin f47e7fe406 Fixed rerenderBlocks contrib script 2011-06-02 13:06:12 -04:00
Andrew Chin 5249aca936 Tweak fromLatLngToWorld to fix issue #381 2011-06-01 23:15:45 -04:00
Andrew Chin d3551324b7 --regionlist should be working now 2011-05-26 21:57:59 -04:00
Andrew Chin ed56b056e4 Merge pull request #376 from aheadley/comma-fix
fixed issue #374
2011-05-26 13:45:11 -07:00
Andrew Chin 4297e49f20 Add portal.png to data_files for py2exe 2011-05-08 12:05:04 -04:00
Andrew Chin e8a86cfdd3 Merge pull request #357 from Fenixin/new-blocks
Portals, beds, repeaters and TNT.
2011-05-08 09:03:12 -07:00
Andrew Chin a289ac2adc Better error reporting when the wrong number of arguments are used 2011-05-08 01:47:40 -04:00
Andrew Chin a68079de84 Fixed signpost regression from a09d7f3
a09d7f3 fixed issue #349, but introduced a new regression. This commit
reverts a09d7f3, and fixes #349 in a different way
2011-05-01 12:35:11 -04:00
Andrew Chin d04f8e8c54 Merge commit 'v0.1.3' 2011-04-29 19:16:09 -04:00
Andrew Chin 97c3ffc50a Merge branch 'dtt-c-render' into master 2011-04-29 18:33:44 -04:00
Andrew Chin 00a3285555 Fix for py2exe 2011-04-28 11:10:06 -04:00
Andrew Chin b19cc47e6d Merged pull request #342 from aheadley/html-js-improvements.
Html js improvements
2011-04-25 17:45:00 -07:00
Andrew Chin f9f98960a0 Don't let a missing markers.js or region.js foul up everything
Fixes #330
2011-04-22 23:24:57 -04:00
Andrew Chin ed5f3eaad4 Stronger support for setting a background color
Works by setting "bg_color='#rrggbb'" in settings.py.  Works for both
png and jpg imgformats
2011-04-17 14:10:27 -04:00
Andrew Chin 0e04becbe9 Fix missing path component in utils.py 2011-04-14 21:24:08 -04:00
Andrew Chin a2782a0499 MSVC is strict about variable declaration 2011-04-12 23:59:03 -04:00
Andrew Chin 3eec8143dd get PIL include dir from the environ 2011-04-10 22:13:24 -04:00
Andrew Chin be62a0b464 Added new sample settings file 2011-04-06 22:32:21 -04:00
Andrew Chin 4276176227 add support for a PIL_INCLUDE_DIR environment variable 2011-04-02 17:34:18 -04:00
Andrew Chin 9e24d87ba2 Started to update the README
Also added a dummy sample settings file (which needs to be expanded into
something useful)
2011-04-02 15:32:24 -04:00
Andrew Chin 6c1d85f699 Don't crash if a biome-chunk is missing 2011-04-02 14:30:44 -04:00
Andrew Chin 7cf8add231 Fix win86_32 build issues 2011-04-02 01:00:33 -04:00
Andrew Chin 50a0186b4f Bump extension version 2011-04-02 00:38:41 -04:00
Andrew Chin 2202e78b2e Merge branch 'edge_lines' into dtt-c-render 2011-04-02 00:37:57 -04:00
Andrew Chin a30e415597 Render edge lines 2011-04-02 00:37:16 -04:00
Andrew Chin dcdd2a9590 Merge branch 'import_help' into dtt-c-render
Conflicts:
	src/main.c
2011-03-30 21:48:36 -04:00
Andrew Chin 744a65f1e2 Provide some better errors messages to the user.
If the c_overviewer module is present but will not import, provide a
different error than if the modules doesn't exist at all.

Also, added a new mechanism to force users to re-build their extension
if needed (see the top of overviewer.h)
2011-03-30 21:47:06 -04:00
Andrew Chin 3f62beb1b0 Converted some print statements to logging statments 2011-03-30 20:49:27 -04:00
Andrew Chin 5e4383cd66 Print out the tilesets being rendered 2011-03-30 20:38:02 -04:00
Andrew Chin 1ff6783e35 Use a different Queue object
the multiprocessing module is a mystery to me
2011-03-28 19:26:48 -04:00
Andrew Chin d2252acfe6 Signs should be working again 2011-03-28 15:07:49 -04:00
Andrew Chin 38ce8681fd suppport win64 builds 2011-03-27 13:59:13 -04:00
Andrew Chin 0fe9c7c050 Fix status line typo 2011-03-26 19:28:32 -04:00
Andrew Chin 71a2a024cc Print tracebacks on error 2011-03-26 00:06:24 -04:00
Andrew Chin a6baf5b6e8 Added missing import 2011-03-25 20:45:25 -04:00
Andrew Chin 2be2a48d7c Merge remote-tracking branch 'origin/dtt-c-render' into dtt-c-render 2011-03-25 20:43:04 -04:00
Andrew Chin 82e0bf53b9 Added a new 'listify' parameter to the config file parser
Specifying listify on an option will cause it to be parsed as a list.
Use listdelim to specify the delimiter (defaults to ',')

Examples, assuming you had the following option:
add_option("--test","test", type="int", listify=True)

Command line:
  --test 1          results in [1]
  --test 1,2,3      results in [1,2,3]

Config file:
  test=1            results in [1]
  test="1,2,3"      results in [1,2,3]
  test=[1,4,9]      results in [1,4,9]
2011-03-25 20:42:05 -04:00
Andrew Chin 172198558a Moved helper function out of overviewer.py and into util.py
Solves a dependency problem where you can't import overviewer unless the extension is built
2011-03-24 22:45:26 -04:00
Andrew Chin 8dc66083e0 Merge branch 'version_stuff' into dtt-c-render 2011-03-24 22:30:49 -04:00
Andrew Chin c25e2cce0f Implement a --version option to overviewer
Should also work with py2exe binary kits
2011-03-24 22:27:50 -04:00
Andrew Chin df6124b425 Remove windows-style newlines 2011-03-24 19:51:33 -04:00
Andrew Chin 7daa1bac9d Now supports both MSVC and mingw32 2011-03-23 22:59:33 -04:00
Andrew Chin 57e99725df Removed noise leftover from last commit 2011-03-23 21:31:51 -04:00
Andrew Chin 977bf09a12 Bunch of changes to make VS happy
Mostly variable declarations moved to the top of blocks.
is_transparent can't be inline, since it's needed in several places
2011-03-23 20:34:49 -04:00
Andrew Chin a885568d4e Added missing DECREF
memory usage is stable and constant over a 7 minute execution
2011-03-21 23:23:35 -04:00
Andrew Chin 97d708106a Fixed typo preventing build 2011-03-21 23:18:34 -04:00
Andrew Chin 1872ccd690 remove swap files from repo, updated .gitingore to ignore them
how did they get there :/
2011-03-21 09:00:08 -04:00
Andrew Chin 61819a7f30 Merged in dtt-c-render
Conflicts:
	src/overviewer.h
2011-03-20 21:29:05 -04:00
Andrew Chin 329c7557f6 Move some code out of the render_loop function and into a 1-time init
routine
2011-03-20 21:13:17 -04:00
Andrew Chin 6f60439f14 accept callables in the configFile with type="function" 2011-03-20 00:37:34 -04:00
Andrew Chin 29dc98ce2a Fix a -p 1 regression 2011-03-19 23:49:56 -04:00
Andrew Chin e096eb45ff Initial version of C lighting code
Needs *lots* of performance work
2011-03-19 22:55:59 -04:00
Andrew Chin 26d781f249 declaration tweak to make some compilers happy 2011-03-19 14:37:48 -04:00
Andrew Chin 1ac922983f Use the list of transparent_blocks from chunk.py.
This fix is part 2 (of 2) of the graphical rendering glitch fix.
2011-03-19 00:38:30 -04:00
Andrew ChinandAaron Griffith f9ae158457 removed log message in iterate.c 2011-03-18 16:37:47 -04:00
Andrew Chin 9c7d6a184d Print error messages after print_help 2011-03-06 17:54:18 -05:00
Andrew Chin 66a9306a29 Experimental code to provide a C implementation of chunk_render
Please see the TODO comments in iterate.c

None of the lighting, spawning, night, or cave modes work with this
version.
2011-03-06 00:30:40 -05:00
Andrew Chin f4cd71a09b Fix region calc typo 2011-03-01 08:11:38 -05:00
Andrew Chin 5f2f098d40 Better cache checking, now uses chunk timestamps
and possibly fixed a bug in check_cache?
2011-02-28 22:10:36 -05:00
Andrew Chin caa1ef1f45 Catch proper exception in chunk.py
Also removed unnecessary check in world.py
2011-02-28 18:56:22 -05:00
Andrew Chin 1f8fb017a3 Check to ensure level.dat has been updated
Error out if level.dat has not been updated.  Also, cleaned up some
debugging print statements
2011-02-26 21:59:49 -05:00
Andrew Chin a690ebbce5 some caching work
hashchecking needs to be checked to see if it's still OK
timestamp checking should involved the timestamps from inside the region
file, not of the region file itself.
2011-02-24 23:29:58 -05:00
Andrew Chin 6f060633ad Running with -p should be OK now 2011-02-24 23:06:36 -05:00
Andrew Chin 05ea562060 Working rendering with the new McRegion format.
Notes:
 * Currently only works with -p 1
 * Caching is mostly compatible with existing caches, but not completly.
   This needs more testing and more code reviews
 * There are probably many code paths that will throw exceptions.
 * Not ready for general use yet, but is OK for testing
2011-02-23 22:13:35 -05:00
Andrew Chin 0372aea4ac New _find_regionfiles function 2011-02-23 17:49:34 -05:00
Andrew Chin 391ba50aea Provide a nice error message when run on McRegion'd worlds 2011-02-22 19:08:58 -05:00
Andrew Chin 409a66083e Merge branch 'master' of https://github.com/Evil-Code/Minecraft-Overviewer into Evil-Code-master
Conflicts:
	quadtree.py
2011-02-19 14:47:57 -05:00
Andrew Chin c9722af8a4 modified method to copy web_assets 2011-02-18 20:27:37 -05:00
Andrew Chin 12bc45f8c6 Merge branch 'master' of ../Minecraft-Overviewer into configfile 2011-02-17 22:34:26 -05:00
Andrew Chin 8e87e5571f Added new fire.png to the nightly kits 2011-02-08 19:45:34 -05:00
Andrew Chin d7bd365959 Merge branch 'master' of https://github.com/aheadley/Minecraft-Overviewer into aheadley-master 2011-02-04 21:01:24 -05:00
Andrew Chin 850f4fcf7d Removed debugging statement 2011-01-23 21:21:36 -05:00
Andrew Chin 5acd6a490c Merge remote branch 'upstream/master' 2011-01-22 14:29:38 -05:00
Andrew Chin f46d0ce4ad options with default args are now seeded in the globals dict 2011-01-22 14:23:20 -05:00
Andrew Chin 3db1953303 a signGroup can now have an optional icon URL 2011-01-21 21:11:39 -05:00
Andrew Chin ae993df2ae Merge branch 'minetracks' of https://github.com/Fenixin/Minecraft-Overviewer into Fenixin-minetracks 2011-01-10 21:54:03 -05:00
Andrew Chin 935d353ef1 Fix build regression on non-windows platforms 2011-01-10 21:42:33 -05:00
Andrew Chin 521a359139 changes for py2exe 2011-01-08 16:09:01 -05:00
Andrew Chin feeb3283e0 New benchmarking script
Useful for examining how a code change affects performance
2011-01-08 01:21:41 -05:00
Andrew Chin dc842874ed Merge remote branch 'upstream/master' 2011-01-08 01:03:58 -05:00
Andrew Chin 3d84e76d0e Merge branch 'grasscolor-fix' of https://github.com/agrif/Minecraft-Overviewer into agrif-grasscolor-fix 2011-01-01 20:57:24 -05:00
Andrew Chin 97aa81311c Fixed empty sign handling, updated findSigns.py 2010-12-31 23:35:18 -05:00
Andrew Chin 7b6bbbc267 Merge branch 'blanksigns' of https://github.com/TheMagistrate/Minecraft-Overviewer into TheMagistrate-blanksigns 2010-12-31 22:37:45 -05:00
Andrew Chin bbeb0d1359 Merge remote branch 'origin/master' 2010-12-31 00:56:05 -05:00
Andrew Chin e989e97c5e Added a new config file parser.
The new config file parser has an interface that's nearly identical to
the OptionParser of optparse.

Below is a sample settings.py config file:

$ cat settings.py
import multiprocessing

if 'rendermode' not in locals():
    rendermode="lighting"

cachedir = "cache.%s.cachedir" % rendermode

procs = multiprocessing.cpu_count() - 1
2010-12-31 00:53:57 -05:00
Andrew Chin 3ee93357b9 Check that level.dat exists before trying to nbt.load it 2010-12-30 21:04:36 -05:00
Andrew Chin fe8cd07c51 Fixed version check 2010-12-23 23:31:07 -05:00
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