Commit Graph

5721 Commits (37d3b9535fd374071f45682459a6e980b1301888)

Author SHA1 Message Date
Per Inge Mathisen 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
Per Inge Mathisen 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Buginator 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
Per Inge Mathisen 7dfe082475 Fix ticket #293: Crashes in netlog code. 2009-03-21 08:19:49 +01:00
Gerard Krol 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
Buginator ba5fc9d56f Updates .gitignore with lots of files to ignore from windows builds 2009-03-20 20:16:34 -04:00
Buginator 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
Git SVN Gateway 2ad4d5518f Merge branch 'master' of git@gitorious.org:warzone2100/gerard_ 2009-03-20 20:41:17 +01:00
Buginator 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
Per Inge Mathisen 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
Gerard Krol 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
Gerard Krol 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
Per Inge Mathisen 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
Git SVN Gateway 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
Gerard Krol 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
Gerard Krol 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
Gerard Krol 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
Gerard Krol 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
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
Git SVN Gateway ca9804de3e Merge branch 'master' of git@gitorious.org:warzone2100/gerard_ 2009-03-17 16:52:45 +01:00
Gerard Krol 0a3467af02 Small cleanup of gitsvngateway, the code should be more robust now. 2009-03-17 16:50:18 +01:00
Git SVN Gateway 548344050a Merge branch 'master' of git@gitorious.org:warzone2100/gerard_ 2009-03-17 16:25:21 +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
Git SVN Gateway 6302e4c415 Merge branch 'master' of git@gitorious.org:warzone2100/gerard_ 2009-03-17 14:20:51 +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
Git SVN Gateway 6b469f1e96 Merge branch 'master' of git@gitorious.org:warzone2100/gerard_ 2009-03-17 11:21:36 +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
Elio Gubser 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
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