Giel van Schijndel
8049b7fbba
Merge r4019 from the 2.1 branch into trunk:
...
Remove ABOUT-NLS and INSTALL
ABOUT-NLS contained unrelated information about the gettext project and INSTALL was just the standard file, with duplicated info in COMPILE.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4617 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 22:56:20 +00:00
Roman C
faeb2c05c8
Weapon Balance:
...
-Cyborg Grenadier: decrease short range accuracy, increased long range accuracy, increased damage by 50%.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4616 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 22:07:10 +00:00
Giel van Schijndel
c6a0ad011e
restrict is not a keyword to C++, so don't use it when compiling as C++
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4615 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 21:39:14 +00:00
Roman C
89fc6d5edd
Allow a script to have more than strings at a time.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4614 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 20:12:27 +00:00
Giel van Schijndel
78612ffe4f
Lets not bother users by telling users the download failed because it was succesfull (no, that's not fuzzy logic, it isn't logic at all)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4613 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 19:28:57 +00:00
Giel van Schijndel
c29591c6c7
Use "correct" filenames for the music modpack
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4612 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 19:23:06 +00:00
Roman C
3cc53501a0
Aivolution AI:
...
-thank the player who gifted a unit
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4611 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 19:22:29 +00:00
Roman C
d63a021184
Stock AI:
...
-make use of trucks gifted by other players
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4610 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 19:21:34 +00:00
Roman C
467d88158c
-make sure AI receives gifted droids, this fixes bug #11442 .
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4609 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 19:19:16 +00:00
Giel van Schijndel
f70cadb837
During installation (NSIS) provide the option to download and install the new music modpack
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4608 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 18:33:31 +00:00
Giel van Schijndel
f23ef17e7d
During uninstall (Windows - NSIS installer) also remove Aivolution
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4607 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 17:41:30 +00:00
Roman C
7c5c437e9e
-make sure the last AI player doesn't get restored when a client joins an mp game
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4606 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 17:25:49 +00:00
Giel van Schijndel
26c2c50036
Add the ability for auto-loading of mods
...
Automatically load all mods found in:
* "mods/global/autoload" in both campaign as well as multiplayer
* "mods/campaign/autoload" in campaign only
* "mods/multiplay/autoload" in multiplayer only
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4604 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 16:15:29 +00:00
Giel van Schijndel
a6d84b7c16
Pass NULL to addSubdirs and removeSubdirs, not false (as the target type is a char* pointer)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4603 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 16:15:20 +00:00
Roman C
49a6050b07
-don't apply game difficulty setting during multiplayer games, since it can negatively affect syncing.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4602 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 15:48:56 +00:00
Giel van Schijndel
11c5df9783
Dang, I should go to bed... r4600 contained yet another stupid error
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4601 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 02:19:28 +00:00
Giel van Schijndel
fd0b4b56af
Fix small error from r4599
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4600 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 02:15:07 +00:00
Giel van Schijndel
f1ac1acad0
Use file __BUILD_CONFIG.USER for user specific configurations
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4599 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 02:09:33 +00:00
Giel van Schijndel
cc46c9c737
Use ${PREFIX} as installer-extdir instead of ${PREFIX}/bin
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4598 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 02:00:36 +00:00
Giel van Schijndel
e7a54e8ca3
Keep debug disabled when building an installer...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4597 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 01:51:16 +00:00
Giel van Schijndel
826dd585f3
Use ${CONF_EXTRA_FLAGS} for disabling/enabling debug builds
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4596 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 01:46:54 +00:00
Giel van Schijndel
42f7e913b3
Also check for Libiberty and BFD when crosscompiling for Windows
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4595 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 01:09:51 +00:00
Giel van Schijndel
150d50a6ae
* --disable-debug (i.e. do a "release build") when crosscompiling for Windows
...
* Change directory to the root of the working copy when crossbuilding
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4594 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 00:35:06 +00:00
Giel van Schijndel
da987a28dd
Don't use DEBUG-only member variables in an NDEBUG build
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4593 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 00:25:48 +00:00
Giel van Schijndel
b7c92bd0a1
GLC depends on FontConfig and FreeType, so link against that as well when crosscompiling for Windows
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4592 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 00:09:32 +00:00
Giel van Schijndel
0de6dfd9b3
* When checking for libraries Popt and PhysicsFS make sure to link against ${WIN32_LIBS} as well
...
* Expand ${WIN32_LIBS} to include -lz which PhysicsFS depends on and -lintl and -liconv which Popt depends on
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4591 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 00:02:36 +00:00
Giel van Schijndel
7ed537a019
Pass the ${PREFIX} variable from the crossbuild script to pkg-config
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4590 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 23:53:30 +00:00
Giel van Schijndel
2e758ba89d
add an --enable-static parameter to the configure script which tells pkg-config to pass libraries required for static linking
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4589 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 23:42:04 +00:00
Giel van Schijndel
6f0a6c4988
Also use a CPPFLAGS_FOR_BUILD (alongside CC and CXX) and pass it to the configure script as well
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4588 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 23:00:40 +00:00
Giel van Schijndel
ff663196a3
* Forward declare debug_callback_win32debug when compiling for Windows
...
* Don't define windowsExceptionHandler when compiling with MinGW (as we don't use it on MinGW)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4587 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 22:54:58 +00:00
Giel van Schijndel
247b8b9747
Pass the --build (as in buildsystem) compilers to the configure script
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4586 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 22:50:43 +00:00
Giel van Schijndel
a0c3f42e5b
export the PKG_CONFIG_PATH variable so that it gets to pkg-config
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4585 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 22:46:41 +00:00
Giel van Schijndel
22925948a5
Make the used crosscompiler configurable
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4584 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 22:30:33 +00:00
Giel van Schijndel
2ac679060c
Revert accidental commit of __BUILD_CONFIG in r4582
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4583 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 22:29:01 +00:00
Giel van Schijndel
af308831e8
when one of the crossbuild commands fail, terminate execution (exit 1)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4582 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 22:25:15 +00:00
Giel van Schijndel
31bf8a371b
Revive the crossbuild scripts
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4581 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 18:48:18 +00:00
Giel van Schijndel
465bf14202
Only attempt ot match one string against the DROID's componentName and stop matching when succesfull
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4580 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 18:25:45 +00:00
Roman C
5ec11ada07
Flamer Balance:
...
-all flamers can fire while moving
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4579 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 14:02:33 +00:00
Giel van Schijndel
8e4baea1bf
Slight style fix
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4578 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 12:32:22 +00:00
Per Inge Mathisen
e04da6e653
Make currentGameFrame static
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4577 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 09:41:48 +00:00
Giel van Schijndel
85d51e6a32
Rather than pretending that our UserMusicPath isn't hardcoded, lets just admit it and make it a `static const char`
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4576 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-12 21:31:29 +00:00
Roman C
f030d2944b
Aivolution AI:
...
-build light cyborgs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4575 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-12 15:44:58 +00:00
Roman C
daf4a00039
Get rid of some unnecessary MSVC warnings.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4574 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-12 15:17:47 +00:00
Roman C
7605a8bf10
Get rid of an unnecessary extern.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4573 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-12 15:13:58 +00:00
Giel van Schijndel
348eed0cab
INTINGAMEOP_.* apparently enumerates values, so lets make it an enum!
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4572 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-12 15:07:24 +00:00
Giel van Schijndel
c217ebb788
Use static inline functions instead of macros (type checking!)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4571 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-12 13:39:47 +00:00
Giel van Schijndel
921726c260
* Const correctness
...
* Merge the conditions of nested commits
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4570 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-12 13:26:26 +00:00
Giel van Schijndel
7fa6ce0c65
Restructure function visGetBlockingWall:
...
* return a pointer instead of a BOOL (will be a NULL pointer on failure)
* don't `goto` the end of the function when we've found a blocking wall, just return the pointer instead
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4569 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-12 13:26:08 +00:00
Giel van Schijndel
cfbb1aa1ac
Backport r4567 from the 2.1 branch to trunk:
...
* ASSERT that we have non-NULL pointers
Patch from bug #11444 by Paul Wise
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4568 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-12 11:00:53 +00:00
Giel van Schijndel
d78c51050d
Slight restructuring to increase readability of if-statements
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4566 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-12 10:52:16 +00:00