725e72e79a
* Change the autoconf macro AC_PROG_VERSION_CHECK such that it can check the version of multiple programs with a single invocation
...
* Matching them against the same version though
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6092 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-28 17:35:53 +00:00
5ad2a63ae1
Update changelogs to include the addition of the New Team War (NTW) mod to 2.1
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6091 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-28 14:14:10 +00:00
3833da4719
Tag of the `2.1 beta 5` release
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6090 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-28 13:50:23 +00:00
6109556e05
* Add a new autoconf macro: AC_PROG_VERSION_CHECK
...
- This macro can be used to check the version of the given program
* Move the version checks for Flex and Bison aut of autogen.sh and into configure.ac
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6088 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-28 13:23:01 +00:00
e052a1474c
Sync 2.1 and trunk's ChangeLogs
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6087 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-28 11:28:46 +00:00
b66897f058
Port to trunk the fix for virtual group recursion from tagfile branch. Add unit test to ensure
...
it never comes back.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6084 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-26 19:14:56 +00:00
3e69cb5235
Fix a typo in configure.ac regarding the minimum system SQLite version.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6082 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-26 18:46:51 +00:00
87bf67480e
Also port over the required fixes for tagfile.c, or previous commit will not work.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6080 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-26 17:48:33 +00:00
6fc021819c
Do a dummy load of basic object data from tagfile to stress test tagfile system. Ported from work in tagfile branch.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6079 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-26 17:45:18 +00:00
68ca9bef81
Fix tagfile type definition
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6078 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-26 17:39:10 +00:00
f71e63860f
Make sure the Theora-Info.plist file for the Xcode project uses relative as opposed to absolute paths.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6076 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-26 12:41:27 +00:00
25def7520f
Clean up the Xcode project somewhat. This may or may not fix the issues reported on the forums regarding Theora.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6075 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-26 10:14:57 +00:00
f920eb7348
Add Theora support to the Xcode project. (Compiles but *untested* with the FMV patch.)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6073 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-25 20:06:15 +00:00
723638a47b
Commit patch #76 by stiv which fixes two compiler warnings in projectile.c. The patch is of similar ilk to that of r6071.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6072 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-24 18:35:23 +00:00
4ca418215e
Fix bug #12348 : r6070 will not build
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6071 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-24 15:53:35 +00:00
4aaf63015f
patch #1104 : New turret management code: Part 2: Cleanup actionTargetTurret(). Reduces number of input parameters from 7 to 3.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6070 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-23 20:40:15 +00:00
c413354ea2
Ignore /ltmain.sh
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6069 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-23 11:13:14 +00:00
472e047078
Fixes & closes ticket #75 ( http://developer.wz2100.net/ticket/75 )
...
r5199 broke command turrets for SP game, by not allowing them to be designed.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6068 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-22 02:59:20 +00:00
b551fb842b
Fix ticket #73 , buffer overruns in radar code making CAM_2A unplayable. Reported by Buginator.
...
There is still some issues with the radar code when scroll limits are being used, but it should
now at least be playable again.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6065 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-21 08:47:47 +00:00
2cea275cb5
* Fully define struct timeval (not just forward declare)
...
* Forward declare struct timezone
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6063 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-20 23:42:48 +00:00
05f7761bab
Add a gettimeofday() implementation for Windows
...
Epoch and hint to use GetSystemTimeAsFileTime taken from: http://www.openasthra.com/c-tidbits/gettimeofday-function-for-windows/
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6062 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-20 23:24:17 +00:00
ba11b3444a
Slight fix for non C99 compilers.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6061 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-20 20:53:28 +00:00
6d202e4327
Revert the change of po/*.po in r6059
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6060 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-20 15:55:54 +00:00
becaf21060
Revert r6058: I stupidly used "git svn dcommit" instead of "git stash pop" (yes I know they don't even look the same...)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6059 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-20 15:54:41 +00:00
53d6990a55
Initial FMV support
...
patch: http://developer.wz2100.net/attachment/ticket/64/FMV5c.patch
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6058 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-20 15:52:01 +00:00
6c8a33cde5
* Use sstrcpy and ssprintf instead of strcpy and snprintf respectively
...
* Use ssprintf's return value to determine whether string truncation has occurred rather than manually recreating the condition with strlen
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6057 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-20 15:17:01 +00:00
93137150eb
Put braces on a line of their own (reduces diff-size of attachment 🎫 64:FMV5c.patch)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6056 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-20 14:25:58 +00:00
4a63c3106f
Proper constness
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6055 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-20 14:17:06 +00:00
8ab4875818
Simplify the droid-onscreen check in multisync.c.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6053 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-20 10:37:04 +00:00
784b40d2a0
Slight cosmetic improvement to the window alignment code (factoring out a / 2).
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6049 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-18 22:56:36 +00:00
ba9c453857
Make sure we correctly enable double buffering for SDL.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6048 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-18 22:21:08 +00:00
6e3ff77160
Vsync for the win, also enable double-buffering.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6047 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-18 22:10:40 +00:00
f499f08a49
Use glPushMatrix and glPopMatrix when compositing as opposed to manually restoring it.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6046 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-18 21:56:02 +00:00
22eacc8210
Increment the version number for the ZONEMAP_SAVEHEADER structure to 3 (should have been done in in r4637 already)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6044 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-18 18:49:40 +00:00
372851ea71
Fix typo that prevented the multiplayer mod from being installed
...
Patch by Paul Wise <pabs>, this closes bug #12313
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6043 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-18 18:31:15 +00:00
994e2d3938
Fix radar corruption under nVidia/Intel cards. This closes ticket #72 .
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6042 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-18 17:45:16 +00:00
85ac0d8ae0
Minor buildsystem cleanups
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6040 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-18 16:08:37 +00:00
dc878823c2
Fix the inclusion of GLEE in betawidget; this fixes the blending problems under nVidia Linux. Plus some minor indentation fixes.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6037 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-18 11:24:36 +00:00
7af67f65e0
Update the Xcode project so that trunk builds. (Broken as a result of the PhysFS VFS files being moved.) Textures are still corrupt.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6036 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-17 19:09:27 +00:00
409eebce0e
Make sure to #include <sqlite3.h> instead of "lib/sqlite3/sqlite3.h"
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6035 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-16 20:21:50 +00:00
10ac89541a
Update our SQLite copy from 3.5.9 to 3.6.2
...
* 3.6.0 introduced an interface change to the VFS layer
* Updated physfs_vfs.c for the interface change in 3.6.0, breaking compatibility with SQLite < 3.6.0
* Change the configure script to require sqlite3 >= 3.6
This closes ticket:66
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6034 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-16 20:02:16 +00:00
5774017c25
From patch #1104 : New turret management code: Minor change the API for actionInsideMinRange() to pass pointer
...
to weapon stats directly.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6033 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-16 19:21:25 +00:00
be491b38f5
* Fix weird naming of research upgrade path
...
- e.g. Sensor Upgrade -> Sensor Upgrade (note the lack of an Mk2)
* Fix several naming inconsistencies
This closes ticket:56, patch by <Zarel>
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6032 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-15 20:34:46 +00:00
73bd4b81f9
Don't #define DATADIR when compiling SQLite as it causes conflicts with some Windows headers (objidl.h:95)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6029 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-15 06:06:59 +00:00
2c616f323e
Trunk is currently broken when playing music and switching between the "base" and "mp" mods, see ticket:57.
...
This revision fixes ticket:57. We (Buginator, EvilGuru and Giel) decided to use the fix suggested in ticket:57 for now and to use [wiki:Proposal:ModMounting] on a later date. I.e. fix the problem now (however dirty the solution may be), and implement a properly designed one later on, instead of letting trunk remain broken until said proposal is worked out in enough detail.
This revision fixes bug #11847 , bug #11875 , bug #11898 , bug #11976 , bug #11989 , bug #12017 , bug #12250 and bug #12280 .
Patch by Buginator and myself
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6028 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 20:36:50 +00:00
043cc9d278
Fix a spelling error in the MSVC project files causing problems with the #include path
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6027 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 19:47:56 +00:00
430f621b9e
Commit patch #67 which removes the long-dead LOADBARCALLBACK macro. Approved by Giel. This closes ticket #67 .
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6026 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 17:01:22 +00:00
afd15e3dc5
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6023 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 15:40:13 +00:00
ec42455709
test
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6022 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 15:39:49 +00:00
ff507b13f0
* Don't use "if USE_SYSTEM_SQLITE" sections in all Makefiles
...
* Use the pkg-config variables SQLITE_CFLAGS and SQLITE_LIBS to compile and link with instead
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6021 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 14:41:44 +00:00
Giel van Schijndel
Per Inge Mathisen
Freddie Witherden
Buginator
http://www.openasthra.com/c-tidbits/gettimeofday-function-for-windows/
Dennis Schridde
René Jürgens