[Warzone-commits] r6960 - /branches/2.2/src/multigifts.c

2009-04-07 Thread Gerard Krol
Author: gerard_ Date: Tue Apr 7 12:50:57 2009 New Revision: 6960 URL: http://svn.gna.org/viewcvs/warzone?rev=6960view=rev Log: Backport r6969: fix for array out of bounds when picking up an artifact in multiplayer. Modified: branches/2.2/src/multigifts.c

[Warzone-commits] r6928 - /branches/terrain/

2009-03-30 Thread Gerard Krol
Author: gerard_ Date: Mon Mar 30 15:54:52 2009 New Revision: 6928 URL: http://svn.gna.org/viewcvs/warzone?rev=6928view=rev Log: Remove the terrain branch as it has been merged into trunk. Removed: branches/terrain/ ___ Warzone-commits mailing

[Warzone-commits] r6831 - in /trunk: data/base/wrf/cam2/cam2change.wrf data/base/wrf/cam3/cam3change.wrf data/base/wrf/vidmem2.wrf data/base/wrf/vidmem3.wrf src/init.c

2009-03-11 Thread Gerard Krol
Author: gerard_ Date: Wed Mar 11 12:50:55 2009 New Revision: 6831 URL: http://svn.gna.org/viewcvs/warzone?rev=6831view=rev Log: Load the new terrain textures when going from cam1-cam2 or cam2-cam3. This fixes bug #299. Modified: trunk/data/base/wrf/cam2/cam2change.wrf

[Warzone-commits] r6832 - in /trunk: build_tools/code-generators/ data/base/sequenceaudio/cam3/ data/mods/global/aivolution/multiplay/skirmish/ data/mods/multiplay/ntw/multiplay/skirmish/ lib/betawidg

2009-03-11 Thread Gerard Krol
Author: gerard_ Date: Wed Mar 11 12:51:40 2009 New Revision: 6832 URL: http://svn.gna.org/viewcvs/warzone?rev=6832view=rev Log: Fix some spelling errors in debug messages and comments. Patch by Paul Wise pabs3. Modified: trunk/build_tools/code-generators/c_sqliteload_cg.pm

[Warzone-commits] r6833 - in /trunk/src: display3d.c terrain.c

2009-03-11 Thread Gerard Krol
Author: gerard_ Date: Wed Mar 11 13:44:04 2009 New Revision: 6833 URL: http://svn.gna.org/viewcvs/warzone?rev=6833view=rev Log: Give a detailed error message when glDrawRangeElements is not supported and shut down. This fixes #294. Modified: trunk/src/display3d.c trunk/src/terrain.c

[Warzone-commits] r6834 - /trunk/lib/ivis_opengl/tex.c

2009-03-11 Thread Gerard Krol
Author: gerard_ Date: Wed Mar 11 14:03:48 2009 New Revision: 6834 URL: http://svn.gna.org/viewcvs/warzone?rev=6834view=rev Log: Do not use texture compression for interface textures. This makes the interface look better and fixes bug #74. Modified: trunk/lib/ivis_opengl/tex.c

[Warzone-commits] r6838 - /trunk/src/map.c

2009-03-11 Thread Gerard Krol
Author: gerard_ Date: Wed Mar 11 23:39:56 2009 New Revision: 6838 URL: http://svn.gna.org/viewcvs/warzone?rev=6838view=rev Log: Rewrite map_Height so that the height it reports matches with what the terrain renderer shows. Modified: trunk/src/map.c

[Warzone-commits] r6840 - in /trunk: lib/ivis_common/piepalette.h lib/ivis_opengl/piepalette.c src/bucket3d.c src/display.c src/display.h src/display3d.c src/display3d.h src/structure.c src/structure.

2009-03-11 Thread Gerard Krol
Author: gerard_ Date: Wed Mar 11 23:55:41 2009 New Revision: 6840 URL: http://svn.gna.org/viewcvs/warzone?rev=6840view=rev Log: Place buildings using blueprints (green) instead of highlighting the ground. The blueprint is a green transparent version of the building you want to build. It is

[Warzone-commits] r6823 - /trunk/src/scriptai.c

2009-03-09 Thread Gerard Krol
Author: gerard_ Date: Mon Mar 9 18:15:44 2009 New Revision: 6823 URL: http://svn.gna.org/viewcvs/warzone?rev=6823view=rev Log: Accept DORDER_NONE as a valid order to the orderDroid script function, needed for the BecomePrey AI. (committed for Buginator) Modified: trunk/src/scriptai.c

[Warzone-commits] r6808 - /branches/lua2/tools/wz2lua/wz2lua.py

2009-03-08 Thread Gerard Krol
Author: gerard_ Date: Sun Mar 8 13:09:09 2009 New Revision: 6808 URL: http://svn.gna.org/viewcvs/warzone?rev=6808view=rev Log: wz2lua no longer chokes on a=b-1, which it did because it treated -1 as a number instead of - 1. Modified: branches/lua2/tools/wz2lua/wz2lua.py

[Warzone-commits] r6809 - in /branches/lua2/data/mods/global/aivolution/multiplay/skirmish: player0.slo player1.slo player2.slo player3.slo player4.slo player5.slo player6.slo player7.slo

2009-03-08 Thread Gerard Krol
Author: gerard_ Date: Sun Mar 8 13:09:17 2009 New Revision: 6809 URL: http://svn.gna.org/viewcvs/warzone?rev=6809view=rev Log: Fix a bug in AIV where it would try to access an array out of bounds when checking wether to repair defenses. Modified:

[Warzone-commits] r6810 - /branches/lua2/tools/wz2lua/wz2lua.py

2009-03-08 Thread Gerard Krol
Author: gerard_ Date: Sun Mar 8 13:09:23 2009 New Revision: 6810 URL: http://svn.gna.org/viewcvs/warzone?rev=6810view=rev Log: Add support for removing obsolete arguments from functions to wz2lua. Modified: branches/lua2/tools/wz2lua/wz2lua.py

[Warzone-commits] r6811 - /branches/lua2/src/scriptfuncs.c

2009-03-08 Thread Gerard Krol
Author: gerard_ Date: Sun Mar 8 13:09:28 2009 New Revision: 6811 URL: http://svn.gna.org/viewcvs/warzone?rev=6811view=rev Log: Convert the chooseValidLoc script function. Modified: branches/lua2/src/scriptfuncs.c ___ Warzone-commits mailing list

[Warzone-commits] r6812 - in /trunk/src: design.c intelmap.c

2009-03-08 Thread Gerard Krol
Author: gerard_ Date: Sun Mar 8 13:40:42 2009 New Revision: 6812 URL: http://svn.gna.org/viewcvs/warzone?rev=6812view=rev Log: Only enable the backdrop when pausing the game for both the design screen and the intelligence screen. This fixes bug 295. Modified: trunk/src/design.c

[Warzone-commits] r6771 - /branches/lua2/src/scriptfuncs.c

2009-03-06 Thread Gerard Krol
Author: gerard_ Date: Fri Mar 6 14:47:34 2009 New Revision: 6771 URL: http://svn.gna.org/viewcvs/warzone?rev=6771view=rev Log: Use checkname so that the player will receive the machinegun in the first level. Modified: branches/lua2/src/scriptfuncs.c

[Warzone-commits] r6772 - in /branches/lua2: lib/lua/warzone.c src/scriptai.c src/scriptextern.c src/scriptfuncs.c src/scriptobj.c

2009-03-06 Thread Gerard Krol
Author: gerard_ Date: Fri Mar 6 14:47:39 2009 New Revision: 6772 URL: http://svn.gna.org/viewcvs/warzone?rev=6772view=rev Log: Use return luaL_error(...) everywhere so that it is clear that this function does not return. Modified: branches/lua2/lib/lua/warzone.c

[Warzone-commits] r6773 - in /branches/lua2: lib/script/script.c lib/script/script.h src/data.c

2009-03-06 Thread Gerard Krol
Author: gerard_ Date: Fri Mar 6 14:47:44 2009 New Revision: 6773 URL: http://svn.gna.org/viewcvs/warzone?rev=6773view=rev Log: Deregister and free scripts at the end of a level. Modified: branches/lua2/lib/script/script.c branches/lua2/lib/script/script.h branches/lua2/src/data.c

[Warzone-commits] r6774 - /branches/lua2/src/scriptfuncs.c

2009-03-06 Thread Gerard Krol
Author: gerard_ Date: Fri Mar 6 14:47:49 2009 New Revision: 6774 URL: http://svn.gna.org/viewcvs/warzone?rev=6774view=rev Log: Allow nil to be passed to testStructureModule (again) to check for any module on any structure. Modified: branches/lua2/src/scriptfuncs.c

[Warzone-commits] r6747 - in /branches/2.2: ./ src/intdisplay.c src/radar.c

2009-02-28 Thread Gerard Krol
Author: gerard_ Date: Sat Feb 28 17:06:16 2009 New Revision: 6747 URL: http://svn.gna.org/viewcvs/warzone?rev=6747view=rev Log: Merged revisions 6723-6724 via svnmerge from trunk: Fix bug 278 (On C2M3 the map overlays are offset the terrain map). The scroll limits were not being taken into

[Warzone-commits] r6715 - /trunk/src/map.c

2009-02-23 Thread Gerard Krol
Author: gerard_ Date: Mon Feb 23 13:00:17 2009 New Revision: 6715 URL: http://svn.gna.org/viewcvs/warzone?rev=6715view=rev Log: When the tileset is not set, default to Arizona (this fixes the map preview). Modified: trunk/src/map.c ___

[Warzone-commits] r6719 - /trunk/src/terrain.c

2009-02-23 Thread Gerard Krol
Author: gerard_ Date: Mon Feb 23 15:03:34 2009 New Revision: 6719 URL: http://svn.gna.org/viewcvs/warzone?rev=6719view=rev Log: Clean up the glDrawRangeElements code and respect GL_MAX_ELEMENTS_VERTICES and GL_MAX_ELEMENTS_INDICES by reducing the sector size and not appending calls when the

[Warzone-commits] r6720 - in /trunk: lib/ivis_common/bitimage.c lib/ivis_common/tex.h lib/ivis_opengl/tex.c src/data.c src/frontend.c src/terrain.c src/texture.c

2009-02-23 Thread Gerard Krol
Author: gerard_ Date: Mon Feb 23 19:56:41 2009 New Revision: 6720 URL: http://svn.gna.org/viewcvs/warzone?rev=6720view=rev Log: Scale down textures used for 3D when they exceed the size specified with the textureSize option. Also add two assert statements to check for the correct handling of

[Warzone-commits] r6721 - /trunk/src/terrain.c

2009-02-23 Thread Gerard Krol
Author: gerard_ Date: Mon Feb 23 20:19:22 2009 New Revision: 6721 URL: http://svn.gna.org/viewcvs/warzone?rev=6721view=rev Log: Fix a bug introduced in r6719 that caused an attempt to draw an off-map sector, which resulted in an assert. Modified: trunk/src/terrain.c

[Warzone-commits] r6722 - /trunk/src/terrain.c

2009-02-23 Thread Gerard Krol
Author: gerard_ Date: Mon Feb 23 21:05:42 2009 New Revision: 6722 URL: http://svn.gna.org/viewcvs/warzone?rev=6722view=rev Log: Shift the lightmap half a tile so the red light will be centered on the landing lights again. Modified: trunk/src/terrain.c

[Warzone-commits] r6723 - in /trunk/src: intdisplay.c radar.c

2009-02-23 Thread Gerard Krol
Author: gerard_ Date: Mon Feb 23 23:04:03 2009 New Revision: 6723 URL: http://svn.gna.org/viewcvs/warzone?rev=6723view=rev Log: Fix bug 278 (On C2M3 the map overlays are offset the terrain map). The scroll limits were not being taken into account for drawing the viewing window and the radar

[Warzone-commits] r6724 - /trunk/src/radar.c

2009-02-23 Thread Gerard Krol
Author: gerard_ Date: Mon Feb 23 23:31:31 2009 New Revision: 6724 URL: http://svn.gna.org/viewcvs/warzone?rev=6724view=rev Log: Make sure that the left edge of the radar stays a fixed distance from the edge of the screen when increasing the size of the radar. Modified: trunk/src/radar.c

[Warzone-commits] r6725 - /trunk/src/map.c

2009-02-23 Thread Gerard Krol
Author: gerard_ Date: Mon Feb 23 23:44:54 2009 New Revision: 6725 URL: http://svn.gna.org/viewcvs/warzone?rev=6725view=rev Log: Close the file when an error occurs while loading a map. PhysFS likes that. Gotoified from a patch by Buginator. Modified: trunk/src/map.c

[Warzone-commits] r6676 - in /branches/terrain: build_tools/code-generators/ data/ data/base/images/ data/base/stats-sql/ data/base/stats/ data/mp/messages/strings/ data/mp/stats/ lib/betawidget/src/

2009-02-21 Thread Gerard Krol
Author: gerard_ Date: Sat Feb 21 23:04:51 2009 New Revision: 6676 URL: http://svn.gna.org/viewcvs/warzone?rev=6676view=rev Log: Merge r6623 through r6675 from trunk (except po/it.po) in preparation for merging the terrain branch back into trunk. Removed:

[Warzone-commits] r6682 - in /trunk: ./ data/base/texpages/tertilesc1hw-128/ data/base/texpages/tertilesc1hw-16/ data/base/texpages/tertilesc1hw-32/ data/base/texpages/tertilesc1hw-64/ data/base/wrf/

2009-02-21 Thread Gerard Krol
Author: gerard_ Date: Sun Feb 22 00:35:21 2009 New Revision: 6682 URL: http://svn.gna.org/viewcvs/warzone?rev=6682view=rev Log: Brace for impact, this is the new terrain renderer! Added: trunk/src/terrain.c - copied, changed from r6406, branches/terrain/src/terrain.c

[Warzone-commits] r6537 - /branches/terrain/src/terrain.c

2009-01-04 Thread Gerard Krol
Author: gerard_ Date: Sun Jan 4 13:05:59 2009 New Revision: 6537 URL: http://svn.gna.org/viewcvs/warzone?rev=6537view=rev Log: OpenGL performance optimisations. There are now less state switches, and multiple calls to glDrawRangeElements and glDrawArrays are combined into fewer ones.

[Warzone-commits] r6510 - in /branches/terrain: lib/ivis_common/piestate.h lib/ivis_opengl/piestate.c src/terrain.c

2008-12-27 Thread Gerard Krol
Author: gerard_ Date: Sat Dec 27 22:56:41 2008 New Revision: 6510 URL: http://svn.gna.org/viewcvs/warzone?rev=6510view=rev Log: Fog is working now. Modified: branches/terrain/lib/ivis_common/piestate.h branches/terrain/lib/ivis_opengl/piestate.c branches/terrain/src/terrain.c

[Warzone-commits] r6511 - /branches/terrain/src/terrain.c

2008-12-27 Thread Gerard Krol
Author: gerard_ Date: Sat Dec 27 23:53:30 2008 New Revision: 6511 URL: http://svn.gna.org/viewcvs/warzone?rev=6511view=rev Log: Fix the Z-fighting that occurred for elio. He tuned the values to glPolygonOffset from this commit to obtain the optimal result. Modified:

[Warzone-commits] r6490 - /trunk/src/scriptfuncs.c

2008-12-25 Thread Gerard Krol
Author: gerard_ Date: Thu Dec 25 15:27:19 2008 New Revision: 6490 URL: http://svn.gna.org/viewcvs/warzone?rev=6490view=rev Log: Fix scrCheckTemplateExists so that it doesn't try to break out of an outer loop using a break statement. The function would quite often report an already existing

[Warzone-commits] r6493 - /trunk/ChangeLog

2008-12-25 Thread Gerard Krol
Author: gerard_ Date: Thu Dec 25 23:21:46 2008 New Revision: 6493 URL: http://svn.gna.org/viewcvs/warzone?rev=6493view=rev Log: Add a lot of stuff from the SVN log. As I also added some changes by others, please check if I did this correctly. Modified: trunk/ChangeLog

[Warzone-commits] r6454 - in /branches/lua2: data/base/script/glue.lua lib/lua/warzone.c lib/lua/warzone.h src/scriptai.c src/scriptfuncs.c src/scriptobj.c src/scriptobj.h tools/wz2lua/generate_all.py

2008-12-11 Thread Gerard Krol
Author: gerard_ Date: Thu Dec 11 18:13:34 2008 New Revision: 6454 URL: http://svn.gna.org/viewcvs/warzone?rev=6454view=rev Log: AIV now can now again design his own droids. generate_all.py now also converts the directory with skirmish rules. Modified: branches/lua2/data/base/script/glue.lua

[Warzone-commits] r6448 - in /branches/lua2: data/base/script/glue.lua src/scriptai.c src/scriptfuncs.c src/scriptobj.c src/scriptobj.h tools/wz2lua/wz2lua.py

2008-12-10 Thread Gerard Krol
Author: gerard_ Date: Wed Dec 10 16:14:02 2008 New Revision: 6448 URL: http://svn.gna.org/viewcvs/warzone?rev=6448view=rev Log: 1) Add script functions used by AIV 2) Allow booleans to be concatenated to strings 3) Support for weapon objects Modified: branches/lua2/data/base/script/glue.lua

[Warzone-commits] r6449 - /branches/lua2/src/scriptai.c

2008-12-10 Thread Gerard Krol
Author: gerard_ Date: Wed Dec 10 16:24:25 2008 New Revision: 6449 URL: http://svn.gna.org/viewcvs/warzone?rev=6449view=rev Log: Oops, r6448 broke the build. Modified: branches/lua2/src/scriptai.c ___ Warzone-commits mailing list

[Warzone-commits] r6450 - in /branches/lua2: src/scriptai.c src/scriptfuncs.c src/scriptobj.c src/scriptobj.h src/stats.c src/stats.h tools/wz2lua/wz2lua.py

2008-12-10 Thread Gerard Krol
Author: gerard_ Date: Wed Dec 10 21:19:16 2008 New Revision: 6450 URL: http://svn.gna.org/viewcvs/warzone?rev=6450view=rev Log: 1) Script functions 2) Now add the correct parameters to inactive events Modified: branches/lua2/src/scriptai.c branches/lua2/src/scriptfuncs.c

[Warzone-commits] r6453 - /branches/lua2/tools/wz2lua/wz2lua.py

2008-12-10 Thread Gerard Krol
Author: gerard_ Date: Thu Dec 11 00:01:57 2008 New Revision: 6453 URL: http://svn.gna.org/viewcvs/warzone?rev=6453view=rev Log: Use a second pass to get those inactive events right in all cases. Modified: branches/lua2/tools/wz2lua/wz2lua.py ___

[Warzone-commits] r6445 - in /branches/lua2: data/base/script/event.lua data/base/script/glue.lua src/scriptai.c src/scriptfuncs.c src/scriptobj.c tools/wz2lua/wz2lua.py

2008-12-09 Thread Gerard Krol
Author: gerard_ Date: Tue Dec 9 16:20:52 2008 New Revision: 6445 URL: http://svn.gna.org/viewcvs/warzone?rev=6445view=rev Log: 1) Add some script functions 2) Slight change to the event system that will prevent events getting removed while there is still an iterator iterating over them. 3) Do

[Warzone-commits] r6443 - in /branches/lua2/tools/wz2lua: generate_all.py wz2lua.py

2008-12-08 Thread Gerard Krol
Author: gerard_ Date: Mon Dec 8 17:36:57 2008 New Revision: 6443 URL: http://svn.gna.org/viewcvs/warzone?rev=6443view=rev Log: 1) Make sure that the .slo files from the current directory are used for converting a script if those are available. 2) Fix the macro support for wz2lua. These two

[Warzone-commits] r6444 - in /branches/lua2: data/base/script/glue.lua src/scriptfuncs.c tools/wz2lua/wz2lua.py

2008-12-08 Thread Gerard Krol
Author: gerard_ Date: Mon Dec 8 19:24:39 2008 New Revision: 6444 URL: http://svn.gna.org/viewcvs/warzone?rev=6444view=rev Log: Correctly initialise 2D arrays and local variables. This commit also converts 2 droid iteration functions. Modified: branches/lua2/data/base/script/glue.lua

[Warzone-commits] r6434 - /trunk/src/display3d.c

2008-12-04 Thread Gerard Krol
Author: gerard_ Date: Thu Dec 4 21:56:16 2008 New Revision: 6434 URL: http://svn.gna.org/viewcvs/warzone?rev=6434view=rev Log: Remove duplicate code responsible for drawing the health and construction progress of buildings. Modified: trunk/src/display3d.c

[Warzone-commits] r6435 - in /trunk/src: droid.c structure.c

2008-12-04 Thread Gerard Krol
Author: gerard_ Date: Thu Dec 4 23:21:10 2008 New Revision: 6435 URL: http://svn.gna.org/viewcvs/warzone?rev=6435view=rev Log: Remove some code duplication from the getProduction* functions and a lot of code duplication from the pickATile* functions. Modified: trunk/src/droid.c

[Warzone-commits] r6423 - /branches/terrain/src/terrain.c

2008-12-02 Thread Gerard Krol
Author: gerard_ Date: Tue Dec 2 13:58:52 2008 New Revision: 6423 URL: http://svn.gna.org/viewcvs/warzone?rev=6423view=rev Log: The terrain renderer now respects visibleTiles.[xy] by dividing the terrain into sectors and only drawing those which are close to the player. This should result in a

[Warzone-commits] r6426 - in /branches/terrain/m4: ax_compare_version.m4 ax_prog_perl_version.m4

2008-12-02 Thread Gerard Krol
Author: gerard_ Date: Tue Dec 2 23:50:44 2008 New Revision: 6426 URL: http://svn.gna.org/viewcvs/warzone?rev=6426view=rev Log: Merge r6386 from trunk. Somehow these files were not added when doing the previous merge. Added: branches/terrain/m4/ax_compare_version.m4 (with props)

[Warzone-commits] r6410 - in /trunk: lib/ivis_common/pieblitfunc.h lib/ivis_common/pievector.h lib/ivis_opengl/pieblitfunc.c src/configuration.c src/radar.c src/radar.h

2008-11-30 Thread Gerard Krol
Author: gerard_ Date: Sun Nov 30 16:10:49 2008 New Revision: 6410 URL: http://svn.gna.org/viewcvs/warzone?rev=6410view=rev Log: Add an option to rotate the radar when the player rotates the camera. The viewing window on the radar is thus always facing upwards. This option is now enabled by

[Warzone-commits] r6417 - in /branches/terrain: ./ build_tools/code-generators/ lib/betawidget/ lib/betawidget/platform/ lib/betawidget/src/ lib/betawidget/src/platform/ lib/betawidget/src/platform/sd

2008-11-30 Thread Gerard Krol
Author: gerard_ Date: Sun Nov 30 21:10:47 2008 New Revision: 6417 URL: http://svn.gna.org/viewcvs/warzone?rev=6417view=rev Log: Merge r6350:6416 from trunk. Added: branches/terrain/lib/betawidget/Makefile.am branches/terrain/lib/betawidget/src/ (with props)

[Warzone-commits] r6419 - /branches/terrain/src/radar.c

2008-11-30 Thread Gerard Krol
Author: gerard_ Date: Sun Nov 30 23:48:49 2008 New Revision: 6419 URL: http://svn.gna.org/viewcvs/warzone?rev=6419view=rev Log: Merge r6418 (fix for assert from rotating radar) from trunk. Modified: branches/terrain/src/radar.c ___

[Warzone-commits] r6401 - in /branches/terrain/src: display3d.c terrain.c terrain.h

2008-11-27 Thread Gerard Krol
Author: gerard_ Date: Thu Nov 27 14:43:30 2008 New Revision: 6401 URL: http://svn.gna.org/viewcvs/warzone?rev=6401view=rev Log: Draw the lightmap and the water using multitextures (2 texture units used only). For most levels this gives a nice speedup in fps. Modified:

[Warzone-commits] r6402 - /branches/terrain/src/terrain.c

2008-11-27 Thread Gerard Krol
Author: gerard_ Date: Thu Nov 27 14:47:05 2008 New Revision: 6402 URL: http://svn.gna.org/viewcvs/warzone?rev=6402view=rev Log: Disable blending after drawing the water so oil derricks get drawn correctly. Modified: branches/terrain/src/terrain.c

[Warzone-commits] r6403 - in /branches/terrain/src: environ.c map.c terrain.c

2008-11-27 Thread Gerard Krol
Author: gerard_ Date: Thu Nov 27 18:16:00 2008 New Revision: 6403 URL: http://svn.gna.org/viewcvs/warzone?rev=6403view=rev Log: Fix crash when loading a map preview when starting a level for the second time, clean up some VBO stuff that is no longer needed and fix the lights in campaign level 1

[Warzone-commits] r6404 - /branches/terrain/src/map.c

2008-11-27 Thread Gerard Krol
Author: gerard_ Date: Thu Nov 27 18:49:47 2008 New Revision: 6404 URL: http://svn.gna.org/viewcvs/warzone?rev=6404view=rev Log: Prevent complete flooding of certain maps which was the result of r6403. Modified: branches/terrain/src/map.c ___

[Warzone-commits] r6406 - in /branches/terrain/src: map.c terrain.c

2008-11-27 Thread Gerard Krol
Author: gerard_ Date: Thu Nov 27 22:44:36 2008 New Revision: 6406 URL: http://svn.gna.org/viewcvs/warzone?rev=6406view=rev Log: 1) Fix another/the same water level bug 2) Fix the landing lights/derricks. This OpenGL state machine is a formidable foe... Modified: branches/terrain/src/map.c

[Warzone-commits] r6388 - in /branches/terrain: data/base/texpages/page-80-water-1.png data/base/texpages/page-81-water-2.png data/base/wrf/vidmem.wrf data/mp/wrf/vidmem.wrf src/component.c src/displa

2008-11-26 Thread Gerard Krol
Author: gerard_ Date: Wed Nov 26 09:44:47 2008 New Revision: 6388 URL: http://svn.gna.org/viewcvs/warzone?rev=6388view=rev Log: Some tweaks to the water, it is now darker and addapts better to the texture for the bottom. The water is now drawn as last object in the scene, and naval droids are

[Warzone-commits] r6389 - /branches/terrain/src/makefile.win32

2008-11-26 Thread Gerard Krol
Author: gerard_ Date: Wed Nov 26 10:20:42 2008 New Revision: 6389 URL: http://svn.gna.org/viewcvs/warzone?rev=6389view=rev Log: Add terrain.c to the makefile.win32 for the people who use MinGW. Modified: branches/terrain/src/makefile.win32 ___

[Warzone-commits] r6390 - in /branches/terrain/src: component.c display3d.c map.c map.h radar.c terrain.c

2008-11-26 Thread Gerard Krol
Author: gerard_ Date: Wed Nov 26 14:17:44 2008 New Revision: 6390 URL: http://svn.gna.org/viewcvs/warzone?rev=6390view=rev Log: Now draw the water as a giant quad at a certain water level. This reduces the amount of polygons drawn. A field height_new is also added to the terrain data which

[Warzone-commits] r6391 - /branches/terrain/src/display3d.c

2008-11-26 Thread Gerard Krol
Author: gerard_ Date: Wed Nov 26 18:52:27 2008 New Revision: 6391 URL: http://svn.gna.org/viewcvs/warzone?rev=6391view=rev Log: Change the drawing order for the water+shadowmap once again. It is now drawn after droids and buildings, but before particles that may write to the depth buffer. The

[Warzone-commits] r6381 - /branches/terrain/src/terrain.c

2008-11-25 Thread Gerard Krol
Author: gerard_ Date: Tue Nov 25 11:52:21 2008 New Revision: 6381 URL: http://svn.gna.org/viewcvs/warzone?rev=6381view=rev Log: Make sure we use a Power of Two texture for the lightmap, and that we do glDisableClientState( GL_TEXTURE_COORD_ARRAY) even when the map doesn't have any decals.

[Warzone-commits] r6382 - /branches/terrain/src/terrain.c

2008-11-25 Thread Gerard Krol
Author: gerard_ Date: Tue Nov 25 15:10:12 2008 New Revision: 6382 URL: http://svn.gna.org/viewcvs/warzone?rev=6382view=rev Log: Specify the correct range to glDrawRangeElements and add some debug output. Modified: branches/terrain/src/terrain.c

[Warzone-commits] r6384 - in /branches/terrain: data/base/texpages/ data/base/wrf/ data/mp/wrf/ src/

2008-11-25 Thread Gerard Krol
Author: gerard_ Date: Tue Nov 25 21:49:16 2008 New Revision: 6384 URL: http://svn.gna.org/viewcvs/warzone?rev=6384view=rev Log: Water! This will use some more fillrate from your graphics card. The water is drawn using two additive wave textures which move in opposite direction. Added:

[Warzone-commits] r6377 - /branches/terrain/src/terrain.c

2008-11-24 Thread Gerard Krol
Author: gerard_ Date: Mon Nov 24 17:50:45 2008 New Revision: 6377 URL: http://svn.gna.org/viewcvs/warzone?rev=6377view=rev Log: Use additive blending to draw the terrain so 3-way and 4-way blends work as expected. Also clean up the drawing code, add lots of comments and fix an OpenGL error for

[Warzone-commits] r6378 - in /branches/terrain: ./ data/base/texpages/ data/base/texpages/source/ data/base/wrf/ data/mp/wrf/ src/

2008-11-24 Thread Gerard Krol
Author: gerard_ Date: Mon Nov 24 21:44:26 2008 New Revision: 6378 URL: http://svn.gna.org/viewcvs/warzone?rev=6378view=rev Log: Conversion logic and textures for the Rocky Mountains. Added: branches/terrain/data/base/texpages/page-54-snow-grass.png (with props)

[Warzone-commits] r6362 - in /branches/terrain: ./ data/base/texpages/ data/mp/wrf/ src/

2008-11-22 Thread Gerard Krol
Author: gerard_ Date: Sat Nov 22 18:53:25 2008 New Revision: 6362 URL: http://svn.gna.org/viewcvs/warzone?rev=6362view=rev Log: Conversion logic textures for the urban tileset. The textures 48-rubble and 50-rocks are currently not used but might be useful for future mapmakers. Added:

[Warzone-commits] r6364 - in /branches/terrain/data/base/texpages: page-40-ground-plants.png page-41-slightly-cracked-concrete.png page-42-rock.png page-43-mud.png page-53-cracked-concrete.png

2008-11-22 Thread Gerard Krol
Author: gerard_ Date: Sat Nov 22 22:21:19 2008 New Revision: 6364 URL: http://svn.gna.org/viewcvs/warzone?rev=6364view=rev Log: Tristan Bethe of imageafter.com just licensed the source images for these as GPL version 2. Added: branches/terrain/data/base/texpages/page-40-ground-plants.png

[Warzone-commits] r6355 - in /branches/terrain: lib/framework/debug.c lib/framework/debug.h src/Makefile.am src/display3d.c src/display3d.h src/init.c src/lighting.c src/map.c src/terrain.c src/terrai

2008-11-21 Thread Gerard Krol
Author: gerard_ Date: Fri Nov 21 18:51:25 2008 New Revision: 6355 URL: http://svn.gna.org/viewcvs/warzone?rev=6355view=rev Log: Now render the terrain using Vertex Buffer Objects. The lighting is done using a light map. The lightmap is expensive to update so this is not done every frame.

[Warzone-commits] r6358 - in /branches/terrain: ./ data/base/texpages/ data/base/wrf/ data/mp/wrf/ src/

2008-11-21 Thread Gerard Krol
Author: gerard_ Date: Fri Nov 21 19:11:44 2008 New Revision: 6358 URL: http://svn.gna.org/viewcvs/warzone?rev=6358view=rev Log: Replace the non-free textures with the ones freed by CGTextures.com. Thanks, Marcel! There was some discussion about the license on IRC, but I suggest we wait for

[Warzone-commits] r6359 - in /branches/terrain/data/base/texpages: page-44-mud.png page-45-yellow-sand.png page-46-cliff.png page-47-tiles.png

2008-11-21 Thread Gerard Krol
Author: gerard_ Date: Fri Nov 21 19:16:03 2008 New Revision: 6359 URL: http://svn.gna.org/viewcvs/warzone?rev=6359view=rev Log: Goes with commit 6353, these are the free textures. Added: branches/terrain/data/base/texpages/page-44-mud.png (with props)

[Warzone-commits] r6350 - /branches/terrain/

2008-11-19 Thread Gerard Krol
Author: gerard_ Date: Wed Nov 19 15:01:55 2008 New Revision: 6350 URL: http://svn.gna.org/viewcvs/warzone?rev=6350view=rev Log: Create the terrain branch, which be home to the new terrain renderer. Added: branches/terrain/ - copied from r6349, trunk/

[Warzone-commits] r6351 - in /branches/terrain: data/base/texpages/ data/base/wrf/ data/mp/wrf/ src/

2008-11-19 Thread Gerard Krol
Author: gerard_ Date: Wed Nov 19 16:23:59 2008 New Revision: 6351 URL: http://svn.gna.org/viewcvs/warzone?rev=6351view=rev Log: Initial commit. This is the rendering code, code to convert tiles to ground types and 4 textures for the Arizona tileset. Added:

[Warzone-commits] r6352 - /branches/terrain/src/display3d.c

2008-11-19 Thread Gerard Krol
Author: gerard_ Date: Thu Nov 20 08:03:57 2008 New Revision: 6352 URL: http://svn.gna.org/viewcvs/warzone?rev=6352view=rev Log: Make sure that the tile highlighting is not reset after drawing the first terrain layer. The building placement will highlight show up again. Modified:

[Warzone-commits] r6345 - in /trunk: data/base/texpages/ data/base/wrf/ data/mods/global/grim/wrf/ data/mods/multiplay/ntw/wrf/ data/mp/wrf/ src/

2008-11-17 Thread Gerard Krol
Author: gerard_ Date: Mon Nov 17 09:06:49 2008 New Revision: 6345 URL: http://svn.gna.org/viewcvs/warzone?rev=6345view=rev Log: Rename the current skybox texture page to page-25-sky-arizona and use the entire texture, instead of only the bottom half of it. This will make it easier to change the

[Warzone-commits] r6347 - in /trunk: ./ data/base/texpages/ data/base/wrf/ data/mods/global/grim/wrf/ data/mods/multiplay/ntw/wrf/ data/mp/wrf/

2008-11-17 Thread Gerard Krol
Author: gerard_ Date: Mon Nov 17 11:02:28 2008 New Revision: 6347 URL: http://svn.gna.org/viewcvs/warzone?rev=6347view=rev Log: Add an urban sky and (for now) also use it for the Rockies. Added: trunk/data/base/texpages/page-25-sky-urban.png (with props) Modified: trunk/COPYING.NONGPL

[Warzone-commits] r6348 - /trunk/src/display3d.c

2008-11-17 Thread Gerard Krol
Author: gerard_ Date: Mon Nov 17 11:39:44 2008 New Revision: 6348 URL: http://svn.gna.org/viewcvs/warzone?rev=6348view=rev Log: Change the way the edges of the map fade. With fog of war enabled they fade to transparency so that mountains in the distance will fade in instead of pop in. The

[Warzone-commits] r6304 - /trunk/src/wrappers.c

2008-11-15 Thread Gerard Krol
Author: gerard_ Date: Sat Nov 15 10:06:12 2008 New Revision: 6304 URL: http://svn.gna.org/viewcvs/warzone?rev=6304view=rev Log: Actually draw the software cursor when enabled in the main menu. This fixes #146 (no mouse cursor in main menu with coloured cursors enabled). Modified:

[Warzone-commits] r6305 - in /branches/lua2: ChangeLog Doxyfile lib/framework/printf_ext.c lib/framework/printf_ext.h po/makefile.win32 src/ai.c src/map.c src/multijoin.c src/multimenu.c src/multiplay

2008-11-15 Thread Gerard Krol
Author: gerard_ Date: Sat Nov 15 10:20:48 2008 New Revision: 6305 URL: http://svn.gna.org/viewcvs/warzone?rev=6305view=rev Log: Merge r6277:6304 from trunk into lua2. Modified: branches/lua2/ChangeLog branches/lua2/Doxyfile branches/lua2/lib/framework/printf_ext.c

[Warzone-commits] r6306 - in /trunk/data/base/multiplay/skirmish: player0.slo player1.slo player2.slo player3.slo player4.slo player5.slo player6.slo player7.slo

2008-11-15 Thread Gerard Krol
Author: gerard_ Date: Sat Nov 15 14:00:27 2008 New Revision: 6306 URL: http://svn.gna.org/viewcvs/warzone?rev=6306view=rev Log: Fix a bug in the Skirmish AI that caused it to build loads of bunkers at oil derricks. Also change the type of a variable from PUBLIC to PRIVATE, as it is not defined

[Warzone-commits] r6308 - in /trunk/src: keybind.c visibility.c

2008-11-15 Thread Gerard Krol
Author: gerard_ Date: Sat Nov 15 16:43:18 2008 New Revision: 6308 URL: http://svn.gna.org/viewcvs/warzone?rev=6308view=rev Log: Add the possibility to disable God Mode back in, on request from Giel. It should even look nice. Modified: trunk/src/keybind.c trunk/src/visibility.c

[Warzone-commits] r6292 - in /branches/lua2: data/base/script/glue.lua lib/lua/warzone.c src/scriptfuncs.c

2008-11-14 Thread Gerard Krol
Author: gerard_ Date: Fri Nov 14 15:54:32 2008 New Revision: 6292 URL: http://svn.gna.org/viewcvs/warzone?rev=6292view=rev Log: Make the num*Weap*InRange functions available to the Lua scripts. Modified: branches/lua2/data/base/script/glue.lua branches/lua2/lib/lua/warzone.c

[Warzone-commits] r6296 - in /branches/lua2: data/base/script/glue.lua src/scriptai.c src/scriptfuncs.c src/scriptobj.c

2008-11-14 Thread Gerard Krol
Author: gerard_ Date: Fri Nov 14 18:42:17 2008 New Revision: 6296 URL: http://svn.gna.org/viewcvs/warzone?rev=6296view=rev Log: Convert some functions for skirmish; the AI now researches new technologies. Modified: branches/lua2/data/base/script/glue.lua branches/lua2/src/scriptai.c

[Warzone-commits] r6301 - in /branches/lua2: lib/script/script.c src/scriptai.c src/scriptcb.c src/scriptfuncs.c src/scriptfuncs.h

2008-11-14 Thread Gerard Krol
Author: gerard_ Date: Fri Nov 14 22:16:29 2008 New Revision: 6301 URL: http://svn.gna.org/viewcvs/warzone?rev=6301view=rev Log: Fix all warnings that prevented compiling with --enable-debug Modified: branches/lua2/lib/script/script.c branches/lua2/src/scriptai.c

[Warzone-commits] r6302 - in /branches/lua2: data/base/script/glue.lua src/scriptobj.c

2008-11-14 Thread Gerard Krol
Author: gerard_ Date: Fri Nov 14 22:58:03 2008 New Revision: 6302 URL: http://svn.gna.org/viewcvs/warzone?rev=6302view=rev Log: Raise a Lua error when accessing non-existent members of a baseobject struct. Modified: branches/lua2/data/base/script/glue.lua branches/lua2/src/scriptobj.c

[Warzone-commits] r6303 - in /branches/lua2: data/base/script/glue.lua src/scriptcb.c src/scriptobj.c src/scriptobj.h tools/wz2lua/generate_all.py tools/wz2lua/wz2lua.py

2008-11-14 Thread Gerard Krol
Author: gerard_ Date: Sat Nov 15 03:20:24 2008 New Revision: 6303 URL: http://svn.gna.org/viewcvs/warzone?rev=6303view=rev Log: Add a lot of callbacks, add some members to the droid and struct lua objects and fix an issue with the converter. The first 10 minutes of a skirmish game now run

[Warzone-commits] r6281 - in /branches/lua2: lib/framework/frameresource.c src/game.c src/scriptai.c

2008-11-13 Thread Gerard Krol
Author: gerard_ Date: Thu Nov 13 21:51:13 2008 New Revision: 6281 URL: http://svn.gna.org/viewcvs/warzone?rev=6281view=rev Log: Fix saving and loading: the script save and load functions are now actually used, and tranlslated names are used for looking up templates, as the untranslated names

[Warzone-commits] r6278 - in /branches/lua2: ./ data/base/script/ lib/ lib/lua/ lib/script/ src/ tools/wz2lua/

2008-11-12 Thread Gerard Krol
Author: gerard_ Date: Wed Nov 12 16:00:42 2008 New Revision: 6278 URL: http://svn.gna.org/viewcvs/warzone?rev=6278view=rev Log: The Lua changes until now. The first few levels of the campaign work and the ai builds structures and droids in skirmish and attacks with them. Added:

[Warzone-commits] r6279 - /branches/lua/

2008-11-12 Thread Gerard Krol
Author: gerard_ Date: Wed Nov 12 16:18:55 2008 New Revision: 6279 URL: http://svn.gna.org/viewcvs/warzone?rev=6279view=rev Log: Delete the messed up lua branch. Develoment will continue in the lua2 branch. Removed: branches/lua/ ___

[Warzone-commits] r6276 - in /branches/lua/src: scriptai.c scriptcb.c scriptfuncs.c scriptobj.c scriptobj.h

2008-11-12 Thread Gerard Krol
Author: gerard_ Date: Wed Nov 12 13:52:42 2008 New Revision: 6276 URL: http://svn.gna.org/viewcvs/warzone?rev=6276view=rev Log: The computer now builds units and builings in skirmish, and uses them to attack. Modified: branches/lua/src/scriptai.c branches/lua/src/scriptcb.c

[Warzone-commits] r6277 - /branches/lua2/

2008-11-12 Thread Gerard Krol
Author: gerard_ Date: Wed Nov 12 14:54:53 2008 New Revision: 6277 URL: http://svn.gna.org/viewcvs/warzone?rev=6277view=rev Log: Create a new Lua branch as the old one is messed up. Added: branches/lua2/ - copied from r6276, trunk/ ___

[Warzone-commits] r6273 - in /branches/lua/data/mp/stats: assignweapons.txt ecm.txt templates.txt

2008-11-11 Thread Gerard Krol
Author: gerard_ Date: Tue Nov 11 21:45:48 2008 New Revision: 6273 URL: http://svn.gna.org/viewcvs/warzone?rev=6273view=rev Log: Copy the stats over from TRUNK to prevent an assert about not finding a string. Modified: branches/lua/data/mp/stats/assignweapons.txt

[Warzone-commits] r6271 - /branches/lua/src/

2008-11-11 Thread Gerard Krol
Author: gerard_ Date: Tue Nov 11 15:03:04 2008 New Revision: 6271 URL: http://svn.gna.org/viewcvs/warzone?rev=6271view=rev Log: TRUE,FALSE - true,false This will hopefully make merging in the changes from trunk easier. Modified: branches/lua/src/action.c branches/lua/src/advvis.c

[Warzone-commits] r6274 - in /branches/lua: data/script/glue.lua tools/conversion_tools/wz2lua/wz2lua.py updatelua.py

2008-11-11 Thread Gerard Krol
Author: gerard_ Date: Tue Nov 11 22:45:02 2008 New Revision: 6274 URL: http://svn.gna.org/viewcvs/warzone?rev=6274view=rev Log: Minor changes to the wz2lua conversion script. Modified: branches/lua/data/script/glue.lua branches/lua/tools/conversion_tools/wz2lua/wz2lua.py

[Warzone-commits] r6268 - /branches/2.1/src/ai.c

2008-11-10 Thread Gerard Krol
Author: gerard_ Date: Mon Nov 10 23:15:01 2008 New Revision: 6268 URL: http://svn.gna.org/viewcvs/warzone?rev=6268view=rev Log: Backport of r6267: Allow a droid to pick a new target while auto-repairing. This fixes #35 and gna bug 12217 where droids would just let themselves be shot to death

[Warzone-commits] r6269 - in /trunk/src: display3d.c display3d.h

2008-11-10 Thread Gerard Krol
Author: gerard_ Date: Mon Nov 10 23:50:08 2008 New Revision: 6269 URL: http://svn.gna.org/viewcvs/warzone?rev=6269view=rev Log: Add lots of Doxygen comments to display3d.c and clean it up a little. Modified: trunk/src/display3d.c trunk/src/display3d.h

[Warzone-commits] r6270 - /trunk/src/display3d.c

2008-11-10 Thread Gerard Krol
Author: gerard_ Date: Tue Nov 11 01:05:44 2008 New Revision: 6270 URL: http://svn.gna.org/viewcvs/warzone?rev=6270view=rev Log: The tile drawer now properly caps mountains at the edge of the map so you can no longer look through them. This patch also reduces the vertex array in size. The tile

[Warzone-commits] r6252 - in /trunk: lib/ivis_common/piestate.h lib/ivis_opengl/piestate.c src/loop.c src/wrappers.c

2008-11-08 Thread Gerard Krol
Author: gerard_ Date: Sat Nov 8 22:37:32 2008 New Revision: 6252 URL: http://svn.gna.org/viewcvs/warzone?rev=6252view=rev Log: Hide the mouse cursor during loading screens and movies. Modified: trunk/lib/ivis_common/piestate.h trunk/lib/ivis_opengl/piestate.c trunk/src/loop.c

[Warzone-commits] r6253 - /trunk/src/intelmap.c

2008-11-08 Thread Gerard Krol
Author: gerard_ Date: Sat Nov 8 23:47:49 2008 New Revision: 6253 URL: http://svn.gna.org/viewcvs/warzone?rev=6253view=rev Log: Do not show the intelligence screen after playing a mission update FMV anymore. This was previously done because the FMV's were missing. A message New Intelligence

[Warzone-commits] r3856 - /branches/2.1/src/intelmap.c

2008-02-22 Thread Gerard Krol
Author: gerard_ Date: Fri Feb 22 21:51:34 2008 New Revision: 3856 URL: http://svn.gna.org/viewcvs/warzone?rev=3856view=rev Log: Backport r3855 from trunk (Fix bug #11121, Briefings not displayed at high resolutions.). Modified: branches/2.1/src/intelmap.c

[Warzone-commits] r3801 - /trunk/src/display3d.c

2008-02-16 Thread Gerard Krol
Author: gerard_ Date: Sat Feb 16 17:37:24 2008 New Revision: 3801 URL: http://svn.gna.org/viewcvs/warzone?rev=3801view=rev Log: Fix the smearing caused by not enough of the terrain being drawn when the map is smaller than the amount of visible tiles. This fixes bug #11026 and bug #11026.

[Warzone-commits] r3802 - /trunk/src/display3d.c

2008-02-16 Thread Gerard Krol
Author: gerard_ Date: Sat Feb 16 18:06:51 2008 New Revision: 3802 URL: http://svn.gna.org/viewcvs/warzone?rev=3802view=rev Log: Prevent a sharp edge to the drawn tiles by fading them to black. Modified: trunk/src/display3d.c ___ Warzone-commits

[Warzone-commits] r3712 - /trunk/src/intelmap.c

2008-02-07 Thread Gerard Krol
Author: gerard_ Date: Thu Feb 7 20:19:15 2008 New Revision: 3712 URL: http://svn.gna.org/viewcvs/warzone?rev=3712view=rev Log: Make sure that long lines of text are correctly drawn and wrapped for the intelligence display. This also works for larger fonts. This fixes bug #10913, and makes

  1   2   >