8821cb624f
Merge branch 'master' of git://gitorious.org/warzone2100/gerard_
...
* 'master' of git://gitorious.org/warzone2100/gerard_:
Replace slashes by underscores for the gitsvngateway merge filename, and don't make it return a non-zero exit code when the --dry-run was successful.
Add a --no-fetch option to gitsvngateway to increase the speed of running it over a lot of branches.
Add an --automatic switch to gitsvngateway, where it will not ask to merge changes but instead abort.
Use getopt to parse options for gitsvngateway and add the --dry-run, --prefix and --remote options.
Use the _gitsvngateway prefix for internally used branches.
gitsvngateway no longer uses a file to store its state but instead determines it by checking if certain branches exist.
Add some checks to gitsvngateway to speed up execution when there are no changes.
Small changes to make gitsvngateway work with Git 1.6.0.6.
Use a slightly more robust way of detecting merges. It still is ugly though.
2009-03-18 18:38:55 +01:00
31d09e583c
Replace slashes by underscores for the gitsvngateway merge filename, and don't make it return a non-zero exit code when the --dry-run was successful.
2009-03-18 18:37:17 +01:00
596f6c38a1
Add a --no-fetch option to gitsvngateway to increase the speed of running it over a lot of branches.
2009-03-18 18:13:41 +01:00
4d230332a1
Add an --automatic switch to gitsvngateway, where it will not ask to merge changes but instead abort.
2009-03-18 17:58:42 +01:00
c11e05a058
Use getopt to parse options for gitsvngateway and add the --dry-run, --prefix and --remote options.
2009-03-18 17:58:33 +01:00
0abfe13c4c
Use the _gitsvngateway prefix for internally used branches.
2009-03-18 15:19:58 +01:00
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
b43712ec75
Add some checks to gitsvngateway to speed up execution when there are no changes.
2009-03-18 14:01:04 +01:00
799ce310e1
Small changes to make gitsvngateway work with Git 1.6.0.6.
2009-03-18 13:17:52 +01:00
64d4b710c2
Use a slightly more robust way of detecting merges. It still is ugly though.
2009-03-17 20:16:05 +01:00
ca9804de3e
Merge branch 'master' of git@gitorious.org:warzone2100/gerard_
2009-03-17 16:52:45 +01:00
0a3467af02
Small cleanup of gitsvngateway, the code should be more robust now.
2009-03-17 16:50:18 +01:00
548344050a
Merge branch 'master' of git@gitorious.org:warzone2100/gerard_
2009-03-17 16:25:21 +01:00
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
6302e4c415
Merge branch 'master' of git@gitorious.org:warzone2100/gerard_
2009-03-17 14:20:51 +01:00
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
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
6b469f1e96
Merge branch 'master' of git@gitorious.org:warzone2100/gerard_
2009-03-17 11:21:36 +01:00
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
b3d3a57b98
accidentally changed the python body pie when I commited the new wheels
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6861 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-17 11:09:28 +01:00
a3b1bbf2c7
Add a check if deliveryPointToMove == NULL in the blueprint code and ASSERT.
2009-03-17 02:51:21 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Git SVN Gateway
Gerard Krol
Elio Gubser
Per Inge Mathisen
Dennis Schridde
Giel van Schijndel
Guangcong Luo