Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,441 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

5441 Commits (0abfe13c4cd8c4ff629e5c21bd15cbc84e91f82c)

Author SHA1 Message Date
Gerard Krol 0abfe13c4c Use the _gitsvngateway prefix for internally used branches. 2009-03-18 15:19:58 +01:00
Gerard Krol e58d41d67a gitsvngateway no longer uses a file to store its state but instead determines it by checking if certain branches exist. 2009-03-18 14:44:35 +01:00
Gerard Krol b43712ec75 Add some checks to gitsvngateway to speed up execution when there are no changes. 2009-03-18 14:01:04 +01:00
Gerard Krol 799ce310e1 Small changes to make gitsvngateway work with Git 1.6.0.6. 2009-03-18 13:17:52 +01:00
Gerard Krol 64d4b710c2 Use a slightly more robust way of detecting merges. It still is ugly though. 2009-03-17 20:16:05 +01:00
Gerard Krol 0a3467af02 Small cleanup of gitsvngateway, the code should be more robust now. 2009-03-17 16:50:18 +01:00
Gerard Krol bd0d42dcc0 The gitsvngateway now uses git cherry-pick instead of git merge --squash to prevent merge conflicts. 2009-03-17 16:23:45 +01:00
Gerard Krol 0f53e9ecf0 Use colour to print the messages from gitsvngateway to better separate them from the output from the Git commands. 2009-03-17 14:20:12 +01:00
Gerard Krol f52d181826 The gitsvngateway script now allows you to check what it is about to commit. It also tries to unravel a merge and commit the individual changes to SVN. 2009-03-17 13:53:31 +01:00
Gerard Krol 1b5816f89b Add "gitsvngateway", a script to pass commits from Git to SVN and from SVN to Git. 2009-03-17 11:20:25 +01:00
Gerard Krol a3b1bbf2c7 Add a check if deliveryPointToMove == NULL in the blueprint code and ASSERT. 2009-03-17 02:51:21 +01:00
Per Inge Mathisen e06f58695e Fix SQL stats build for 'make dist' 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6855 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-15 23:42:28 +00:00
Per Inge Mathisen f15c0292e8 Fix some issues with 'make dist'. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6853 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-15 23:30:57 +00:00
Dennis Schridde 205e3da43a Create the Windows installer in builddir instead of srcdir 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6852 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-14 23:32:49 +00:00
Dennis Schridde 8ea3af5271 Remove grim-mod, as it is no longer included in the sources 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6851 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-14 23:32:45 +00:00
Dennis Schridde 4a10ae6465 update-po 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6850 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-14 23:32:39 +00:00
Dennis Schridde 529d9f6574 Make gettext output its stuff into builddir, instead of srcdir. 
I have no clue why GNU decided that it wants to generate GMO files
 inside srcdir...

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6849 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-14 23:32:31 +00:00
Dennis Schridde 852b81ea8b Replace C99 style variable declarations inside for() header with C89 style decls 
Fixes #313

Author: Buginator
Signed-off-by: Dennis Schridde <devurandom@gna.org>

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6848 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-14 23:32:23 +00:00
Dennis Schridde 1199b1e03b Possibly uninitialised variable says GCC 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6847 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-14 19:49:43 +00:00
Giel van Schijndel 4dc0520846 Add a FIXME note regarding the maxPlayers config setting (that setting is only required due to a design flaw). 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6846 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-14 16:56:32 +00:00
Elio Gubser 3e993b6eb8 new wheels propulsion graphics by Mysteryem. including a slight change to the texturing on the light wheels 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6845 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-14 09:20:23 +00:00
Guangcong Luo a7674f82f2 Fix bug #309 - display.c errors can't compile 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6843 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-13 03:32:37 +00:00
Guangcong Luo 2340b9e81d Commit patch #291: Add option for right-click ordering. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6841 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-12 09:25:29 +00:00
Gerard Krol dc834b2a3a 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 bright green when the build location is valid and red when it is not. After the building is placed a darker version of the green building will remain until a droid starts construction.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6840 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 22:55:41 +00:00
Elio Gubser 9b76a1480e fixed some nasty bugs in the svgManager 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6839 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 22:50:30 +00:00
Gerard Krol 380c32bb33 Rewrite map_Height so that the height it reports matches with what the terrain renderer shows. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6838 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 22:39:56 +00:00
Per Inge Mathisen da04dd5173 map2lnd: Use the right edge brush set for each tileset. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6837 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 21:30:36 +00:00
Per Inge Mathisen aa7509fc84 Fix silly indentation. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6836 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 16:21:22 +00:00
Per Inge Mathisen 4028c9f48f Remove dead code 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6835 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 14:19:46 +00:00
Gerard Krol 5f288925db Do not use texture compression for interface textures. This makes the interface look better and fixes bug #74. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6834 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 13:03:48 +00:00
Gerard Krol 652701af56 Give a detailed error message when glDrawRangeElements is not supported and shut down. This fixes #294. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6833 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 12:44:04 +00:00
Gerard Krol 71bc279c9e Fix some spelling errors in debug messages and comments. Patch by Paul Wise <pabs3>. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6832 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 11:51:40 +00:00
Gerard Krol 73d4569733 Load the new terrain textures when going from cam1->cam2 or cam2->cam3. This fixes bug #299. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6831 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 11:50:55 +00:00
Per Inge Mathisen 811bb12786 map2png: Little utility to create PNG previews from map files. Very basic at the moment. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6830 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-09 23:05:54 +00:00
Per Inge Mathisen a223d5598d New map 4c-Urban-Chaos by Mysteryem. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6827 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-09 18:30:41 +00:00
Per Inge Mathisen 73ba9f3a1a Correct water edges on little egypt map. Fix by Mysteryem. Closes gna.org bug #9658. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6826 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-09 18:28:17 +00:00
Gerard Krol 21011fd176 Accept DORDER_NONE as a valid order to the orderDroid script function, needed for the BecomePrey AI. (committed for Buginator) 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6823 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-09 17:15:44 +00:00
Per Inge Mathisen 571d7e0329 make check: Also test included mod maps. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6821 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-08 18:02:39 +00:00
Per Inge Mathisen 3905de35cb When playing Mayhem mode, burning scavengers can crash (or rather, lead to assert failure) 
the game because they may have nowhere to run when burning, and may trigger checks because 
they die while doing orders ("burn out"). The former should be properly fixed in scripts 
by always setting retreat coordinates, and the latter is rather bad design, but not 
changing it now.  Close bug #296. Reviewed by Gerard.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6820 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-08 17:57:44 +00:00
Per Inge Mathisen 7a9da735e2 map2lnd: Fix bug in setting the number of objects in the exported map. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6818 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-08 17:15:14 +00:00
Per Inge Mathisen b8268b2370 mapinfo: Correct for structure padding. Now we can parse savegame structures, too. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6817 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-08 17:06:11 +00:00
Per Inge Mathisen 48ff63c9d1 map2lnd: Export structures as well. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6816 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-08 16:52:17 +00:00
Per Inge Mathisen eb14b8753d map2lnd: Support exporting droids. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6815 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-08 15:11:54 +00:00
Per Inge Mathisen eb8329e481 mapinfo: Read droid data for editworld maps (not savegames). 
mapinfo: Calculate number of players by checking construction droids.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6814 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-08 14:19:28 +00:00
Dennis Schridde c18c426c73 Fix a crash when loading savegames by loading effects earlier 
This works around a crash discovered when loading the savegame attached
 to #196 by loading effects earlier, which will initialise the effects
 system before we try to add new effects.
This is by no means an optimal fix, but given the messed-up state of game.c
 it was the fastest and most simple solution for the given issue.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6813 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-08 13:34:26 +00:00
Gerard Krol ab549ac68d Only enable the backdrop when pausing the game for both the design screen and the intelligence screen. This fixes bug 295. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6812 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-08 12:40:42 +00:00
Dennis Schridde d655d548f4 Effect memory pool cleanup 
I played a bit with implementing a better memory pool for effects and this
 is what came out.

Major changes:
Allocates in chunks of 10k effects, uses free/used lists to speed up search
 for free and updates of active effects.

Benefits:
 * Unlimited number of effects possible.
 * Faster
   Not (yet) benchmarked, but logic dictates that iterating over MAX_EFFECTS
   is slower than iterating over just the number of active effects.

(Patch as posted to mailinglist.)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6807 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-08 11:45:08 +00:00
Per Inge Mathisen 4f27904b35 Remove two unused files 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6806 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-07 22:15:37 +00:00
Guangcong Luo ba8608f40d Spelling corrections. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6804 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-07 22:03:22 +00:00
Per Inge Mathisen 3fd2879d6a mapinfo: Fix crash on some failures upon trying to close already closed file. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6803 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-07 21:52:34 +00:00