18870edfd6
Revert r6921. The newline character on OS X is \n, only OS 9 used \r, which we do not target.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6922 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:59 +02:00
12eccf9d4c
An end of line character is "\r" on the Mac
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6921 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:59 +02:00
f179b6f092
Allow compiling and linking with lib/framework/stdio_ext.h and src/version.h from C++ code
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6920 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:59 +02:00
7781fe6ab4
Fix problem that prevented information about enemy research to be shared between hosts.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6914 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:58 +02:00
eb8fc6ce26
Add new --enable-debug option "g++" which compiles Warzone code using g++ compiler.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6913 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:58 +02:00
82a97e938e
Various fixes to be able to compile (but not yet link) Warzone with g++
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6912 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:58 +02:00
1b4559cb98
Remove dead code in intResearchFinished()
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6911 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:58 +02:00
1f89497235
Prevent leaking memory in mapFree by deallocating all memory we allocated
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6910 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:58 +02:00
0698f8424d
Slightly better documenting of code and error messages
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6909 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:57 +02:00
40dcefc574
Remove the C++ implementation of the lobby server since it isn't used nor is it being maintained
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6907 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:57 +02:00
60fe79b68f
Fix ticket 342 - out of range path node crashes game
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6905 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:57 +02:00
2ad693b643
Ticket 340 - implement basic support for partial visibility and radar power that diminishes by range.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6904 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:57 +02:00
18ae6c42da
Don't crash if some tech takes zero research points to finish. Problem found by Buginator. Also fix NTW sky texture names.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6903 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:57 +02:00
e7d6676599
Document the meaning and purpose of BODY_UPGRADE's member variables
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6897 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:57 +02:00
9b8f292073
* Access arrays with array-indexing syntax
...
- i.e. array[index] instead of *(array + index)
* Access a variable's size using sizeof(variable)
- Instead of sizeof(typeof(variable)) * ARRAY_SIZE
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6896 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:56 +02:00
0c178e51d9
Add a document describing design decisions and the current status of the SQLization of the stats
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6895 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:56 +02:00
2d6b971336
Remove dead code. Move variables into closer scope.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6894 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:56 +02:00
34769c53f3
Wrap changes to cached sensor and ecm stats for objects into two new functions to clean up the code. Reviewed by stiv.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6893 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:56 +02:00
264fc0d450
Remove dead code. One less unnecessary global.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6892 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:56 +02:00
9d6734c767
Wrap access to psGateways behind an accessor. One global down, so many to go...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6891 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:55 +02:00
93bae75382
Fix a few Asserts to give more info, and correct spelling.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6887 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:55 +02:00
7dfe082475
Fix ticket #293 : Crashes in netlog code.
2009-03-21 08:19:49 +01:00
107f634977
Set svn:eol-style native and convert the line endings to \n.
...
This is to make sure Git on Windows does not complain when autocrlf and safecrlf are set.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6886 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-21 01:53:25 +01:00
ba5fc9d56f
Updates .gitignore with lots of files to ignore from windows builds
2009-03-20 20:16:34 -04:00
6dc7ff51bb
Allow F10 to *always* be the screenshot key.
...
This also allows you to take screenshots of anything now. (main menus / game menus, FMVs*, and of course, in game)
*While it can do screencaps of a FMV, right now, it is setup to abort the sequence when you hit a key. So that means only 1 frame from the FMV.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6884 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-20 21:22:47 +01:00
2ad4d5518f
Merge branch 'master' of git@gitorious.org:warzone2100/gerard_
2009-03-20 20:41:17 +01:00
e1e42928ee
Players no longer drop from game after too much data has been sent to them. (Usually happens in longer games, when there is more data that needs to be sent)
...
Closes ticket:315
Fixes ticket:218
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6881 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-20 20:40:49 +01:00
95ff68f350
Improve error message on failed PIE texture flag load
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6879 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-20 20:40:48 +01:00
68a623a6f0
No longer assert when the thing we want to display a blueprint of is not a building, it might be a droid or a feature from the debug menu.
2009-03-20 20:30:15 +01:00
3000958bca
Swap the order of the arguments when calling same_commit to check if we need to push, because only old..new seems to work correctly.
2009-03-19 00:57:29 +01:00
3ea41a0b2d
Restrict private messages to 0..7 instead of 0..8, which can be more than the
...
maximum 8 number of players. Bug found by Buginator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6876 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-18 23:57:48 +01:00
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
Freddie Witherden
Giel van Schijndel
Per Inge Mathisen
Buginator
Gerard Krol
Git SVN Gateway