0
Commit Graph

79 Commits

Author SHA1 Message Date
Andrew Chin
20f9f92abd Clean up some build warnings
Removed some unused code, and quelled some warnings via GCC
2012-03-02 13:40:58 -05:00
Andrew Chin
c019d7e8d8 use -Wdeclaration-after-statement
This makes gcc's behavior match MSVC's behavior, reducing the chances of
code not building on Windows
2012-03-02 13:40:57 -05:00
Andrew Chin
9d814bf653 Pack up js_src to fix issue with .exe builds 2012-02-19 18:06:43 -05:00
Richard Pastrick
298e0d4222 Change sample.settings.py to sample_config.py 2012-02-16 09:38:08 -08:00
Aaron Griffith
7cacc59428 setup.py now auto-discovers available render primitives 2012-01-08 00:52:30 -05:00
Aaron Griffith
a682b8a689 broke out nether, heightfading, depth, and edgelines from base primitive 2012-01-08 00:08:16 -05:00
Aaron Griffith
e3610f8ac5 moved to a layer-based rendermode system, moved normal mode to base primitive
options are now handled partially in the python side, in rendermodes.py
2012-01-08 00:08:16 -05:00
Aaron Griffith
1f2c1a281e the rest of the render modes are now working 2012-01-06 20:38:50 -05:00
Aaron Griffith
4eaf103213 fixes to get lighting mode working again 2012-01-06 20:23:15 -05:00
Aaron Griffith
a69a78f412 c_overviewer.render_loop now works with normal render mode 2012-01-01 23:02:30 -05:00
Aaron Griffith
92b8cd33ed Merge branch 'master' into smooth-lighting 2011-10-28 13:07:01 -04:00
Andrew Brown
f5ae4b3451 changed bare exceptions to except Exception 2011-10-26 22:36:23 -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
3a090f77f5 stub smooth-lighting mode (does nothing special, for now) 2011-10-11 19:59:33 -04:00
Andrew Chin
12a81a2b47 Fixed the contribManager in windows binaries 2011-10-04 23:27:30 -04:00
Aaron Griffith
43629e928b Merge branch 'master' into rendermode-options
Conflicts:
	overviewer.py
2011-09-06 10:29:15 -04:00
Andrew Chin
f880f01b46 Moved --check-terrain command from setup.py and overviewer.py
Also, let textures_path work for minecraft.jar files
2011-09-05 22:35:13 -04:00
Aaron Griffith
e800138079 Merge remote branch 'brownan/master' into rendermode-options 2011-08-26 21:06:14 -04:00
Andrew Chin
48bc9da527 Merge remote-tracking branch 'upstream/master' into contribs
Conflicts:
	setup.py
2011-08-24 21:00:27 -04:00
Aaron Griffith
fe0d28630b Merge branch 'master' into rendermode-options
Conflicts:
	overviewer.py
2011-08-18 11:40:26 -04:00
Andrew Chin
8ab2dea906 Py2exe executables now have a valid version number and description 2011-08-16 21:27:19 -04:00
Andrew Chin
cd2a2bdf2c initial version of the contribManager 2011-08-16 21:07:39 -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
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
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
Aaron Griffith
fde647bfdf Merge branch 'py-package'
Conflicts:
	setup.py
2011-07-10 18:14:20 -04:00
Aaron Griffith
0c63bcb5fe changed setup.py to copy web_assets recursively for py2exe 2011-07-07 16:35:48 -04:00
Maciej Małecki
c1f13775d9 setup.py now checks for Imaging directory in Python include path. Appears to fix #402 2011-07-04 12:54:34 +02:00
Aaron Griffith
03094b1af9 Merge branch 'master' into mineral-overlay
Conflicts:
	src/overviewer.h
2011-06-06 22:18:23 -04:00
Aaron Griffith
387f97d64d initial work on py2app for OSX 2011-05-28 19:07:05 -04:00
Aaron Griffith
561bb64c7c fixes for py2exe/windows 2011-05-28 15:05:52 -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
6c5e578220 Merge branch 'master' into mineral-overlay 2011-05-10 20:22:44 -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
Andrew Chin
4297e49f20 Add portal.png to data_files for py2exe 2011-05-08 12:05:04 -04:00
Aaron Griffith
f5f99e34e4 added basic mineral overlay
right now, it only highlights diamond ore
2011-05-02 18:30:19 -04:00
Andrew Chin
00a3285555 Fix for py2exe 2011-04-28 11:10:06 -04:00
Aaron Griffith
5f69b78c75 Merge branch 'dtt-c-render' into overlays
Conflicts:
	setup.py
2011-04-16 11:25:04 -04:00
Alejandro Aguilera
b89ea8db8c Working cave rendermode without tinting. 2011-04-14 00:33:41 +02: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