Aaron Griffith
bca7867b86
pushed exception setting into the relevant function, removed redundant exceptions
...
The following functions set exceptions automatically:
PyImport_ImportModule, PyObject_GetAttrString, PyArg_ParseTuple. All
the exception setting functions in c_overviewer should act the same
way and set their own exceptions before returning.
Notably, PyDict_GetItemString does *not* set exceptions, so it is
handled specially in render_mode_find_interface.
2011-11-22 17:32:47 -05:00
Aaron Griffith
e500a1ab26
Merge branch '19prep'
...
Conflicts:
overviewer_core/src/overviewer.h
overviewer_core/textures.py
2011-11-18 17:25:01 -05:00
Aaron Griffith
f6651cd759
bumped extension number to prepare for likely merge tomorrow
2011-11-17 09:33:22 -05:00
Aaron Griffith
eac7561ed1
redirecting output to a log file now works on Python 2.6 (Issue #535 )
2011-11-15 15:47:33 -05:00
Aaron Griffith
944edf4ef8
changed material property lookups to use a bit table, not python sets
2011-11-11 20:05:29 -05:00
Aaron Griffith
afd3ad639b
textures are now stored in a continuous array in memory, instead of a dict
2011-11-11 15:49:08 -05:00
Aaron Griffith
bb55547b0d
Merge textures rewrite into 19prep
2011-11-11 14:05:05 -05:00
Aaron Griffith
dc0110ee73
unknown blocks are no longer assumed to be transparent
2011-11-10 09:51:25 -05:00
Aaron Griffith
74e0ef2ad6
brought solid_blocks (etc.) sets back in line with old values
2011-11-10 09:42:21 -05:00
Aaron Griffith
ae651b87ec
Merge branch 'texture-packs'
2011-11-09 13:59:11 -05:00
Aaron Griffith
acbf87db3f
bumped extension version for new smooth-lighting mode
2011-11-07 19:50:55 -05:00
Aaron Griffith
9b39a96fef
Merge branch 'smooth-lighting'
2011-11-07 19:46:10 -05:00
Aaron Griffith
c0d37004cc
now using MCPatcher animated water/lava textures, if present
2011-11-07 16:57:34 -05:00
Aaron Griffith
bca4b9b011
added support for loading textures directly out of texture packs
2011-11-07 16:57:34 -05:00
Aaron Griffith
0d656e274f
added Jason Scheirer to CONTRIBUTORS.rst
2011-11-07 16:57:34 -05:00
Aaron Griffith
4de9ba3b6e
added docs for lighting and smooth-lighting
2011-11-06 20:34:06 -05:00
Aaron Griffith
53dbdc98c6
added special smooth-lighting exception for water
2011-11-05 23:29:51 -04:00
Aaron Griffith
c1fdcffad7
fixed rendering error in snow and half-steps
2011-11-03 16:07:56 -04:00
Aaron Griffith
acb2d159f5
filled in simpler blocks between id 50 and 85
2011-11-03 16:05:25 -04:00
Aaron Griffith
cc4877f149
fixed stochastic_render and regionlists working together
2011-11-01 23:43:05 -04:00
Aaron Griffith
4d5f19b081
Merge branch 'agrif-stochastic'
2011-11-01 23:20:05 -04:00
Aaron Griffith
d8455804e9
added docs for --stochastic-render (woops)
2011-11-01 23:19:27 -04:00
Aaron Griffith
c9fc7eba62
textures added back for blocks up to id 50
2011-11-01 21:10:11 -04:00
Aaron Griffith
da142dfb7a
textures re-implemented for blocks up to id 25
2011-11-01 18:18:29 -04:00
Aaron Griffith
670a458ec1
made sure smooth-lighting honors the shade_strength option
2011-11-01 15:59:03 -04:00
Aaron Griffith
7a92343bb8
@material and block have been made more verbose (Issue #516 )
2011-11-01 15:51:10 -04:00
Aaron Griffith
4b905685eb
major textures.py restructuring, not all textures implemented (Issue #516 )
...
Be careful -- the build_* and transform_* functions no longer have a
blockID argument, because that made no sense.
2011-10-31 20:57:05 -04:00
Aaron Griffith
8e0a82ba62
unified blockmap and specialblockmap (Issue #516 )
2011-10-31 13:58:25 -04:00
Aaron Griffith
75858f2df8
removed historical, seperate mask from texture tuples (Issue #516 )
2011-10-31 13:40:38 -04:00
Aaron Griffith
69c109fc05
moved trasparent_blocks, etc. into textures.py (Issue #516 )
2011-10-31 13:28:28 -04:00
Aaron Griffith
64e67cc827
fixed crash when SpawnY wasn't in [0, 128)
2011-10-30 18:06:28 -04:00
Aaron Griffith
03ce98df29
added stochastic render option for incrementally updating maps
2011-10-30 00:09:57 -04:00
Aaron Griffith
a3653d429f
fixed typo in configParser.py when parsing float values
2011-10-30 00:08:48 -04:00
Aaron Griffith
92b8cd33ed
Merge branch 'master' into smooth-lighting
2011-10-28 13:07:01 -04:00
Aaron Griffith
85da19b1a0
turned night into a lighting mode option, added 'night' builtin custom mode
2011-10-26 22:19:27 -04:00
Aaron Griffith
00f06e0499
last of the obvious smooth-lighting render issues fixed
2011-10-26 21:50:23 -04:00
Aaron Griffith
4fb0dac3fd
the position anchor tag now uses rendermode name, not label
2011-10-26 17:08:35 -04:00
Aaron Griffith
da92ffb9ca
Merge branch 'master' into 19prep
2011-10-26 15:17:04 -04:00
Aaron Griffith
aa7a837043
fixed segfault involving redstone on the edge of the map (Issue #519 )
2011-10-26 15:14:48 -04:00
Aaron Griffith
f8d43ca470
region file mtimes are no longer used, to fix a bug on windows
2011-10-24 23:14:23 -04:00
Aaron Griffith
a8d5fd829e
Merge branch 'master' into smooth-lighting
2011-10-24 21:03:31 -04:00
Aaron Griffith
d48d1da493
Merge branch 'master' into 19prep
2011-10-24 21:03:14 -04:00
Aaron Griffith
79a3e0d795
the "waay to big" error now gives an upper bound on zoom level
2011-10-24 07:52:02 -04:00
Aaron Griffith
4bddf2c78a
fixed top smooth lighting tesselation error
2011-10-18 09:56:01 -04:00
Aaron Griffith
0fa734d0c5
fixed smooth lighting errors on chunk boundaries
2011-10-17 10:09:59 -04:00
Aaron Griffith
2705a1efe8
smooth-lighting triangles now pull lighting data correctly for each vertex
2011-10-16 17:18:24 -04:00
Aaron Griffith
b984185f0c
smooth lighting mode now covers every block with 6 triangles
2011-10-11 21:27:20 -04:00
Aaron Griffith
80a3849a6c
added a triangle drawing function, with interpolated color
2011-10-11 21:17:10 -04:00
Aaron Griffith
3a090f77f5
stub smooth-lighting mode (does nothing special, for now)
2011-10-11 19:59:33 -04:00
Aaron Griffith
e7e0f526ea
renamed "Signposts" button to "Markers" to be more generic
2011-10-10 15:17:11 -04:00
Aaron Griffith
19c564670c
updated the web_assets_hook help text to be correct
2011-10-10 14:23:57 -04:00
Aaron Griffith
2836c66548
converted explicit documentation links into implicit :doc: references
2011-10-02 11:53:32 -04:00
Aaron Griffith
426c4e9c05
added 'color_light' option to lighting mode
2011-09-19 23:36:21 -04:00
Aaron Griffith
b5c86b6bca
birch and pine leaves now look different from each other
2011-09-19 21:19:08 -04:00
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