Commit Graph

5056 Commits (879f1297031b308ec795188828f0218378ce746b)

Author SHA1 Message Date
Giel van Schijndel d871a85964 Add video playback support:
* Add support for decoding and displaying of OggTheora/Vorbis videos
 * Change all references to *.rpl files to *.ogg files (and lower case them)
 * Add a new menu (and config) option for selecting the size at which to display videos (1x (native), 2x, full screen)

This closes ticket:64 and ticket:46

Code changes are ticket:64 (patch by Gerard Krol, Giel van Schijndel and Buginator)

FMVs can be found at http://download.gna.org/warzone/videos/sequences_ogg.zip (for now at least)
Videos encoded by Angus Lees


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6119 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-08 18:24:19 +00:00
Freddie Witherden 8573255b29 Commit patch #94 by Zarel. This gives logical names to things such as Nexus resistance circuits and repair turrets.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6118 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-07 22:31:28 +00:00
Giel van Schijndel 58117a87c0 * Remove duplicate sound effect pcv483.ogg
* Rename pcv483.ogg to power-transferred.ogg


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6117 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-04 21:49:58 +00:00
Giel van Schijndel 74038caddc Mark some nasty piece of code for fixing
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6116 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-04 21:12:51 +00:00
Giel van Schijndel d8e0d93a5d * Initialise aHardPath at compile time to "sequences/" (the only value it was ever set to)
* Get rid of bCDPath and bHardPath which guarded the initialisation of aHardPath
 * Remove seq_SetVideoPath which performed the initialisation of aHardPath

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6113 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-04 19:28:41 +00:00
Giel van Schijndel df801f1b08 * Make seq_Play const correct
* Use "bool" instead of "BOOL" for the return types of lib/sequence functions

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6112 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-04 18:45:18 +00:00
Giel van Schijndel 77d7490ed3 Move all header content of math-help.h inside its header guards
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6111 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-04 12:34:42 +00:00
Giel van Schijndel a74c27019d Make sure to #define the [SU]BYTE_(MIN|MAX) and [SU]D?WORD_(MIN|MAX) constants in terms of the U?INT(8|16|32)_(MIN|MAX) constants
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6110 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-04 12:09:58 +00:00
Giel van Schijndel 953a3a998b Allow #including lib/framework/types.h without lib/framework/frame.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6109 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-04 12:09:53 +00:00
Buginator 4971f0cdcd Adds a message to the console when screenshot key is hit.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6108 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-04 03:31:18 +00:00
Buginator 897e480258 Found 'lost' patch.
Fixes bug #12399
Deletes FRONTEND_NOGAMESAVAILABLE button on game refresh.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6105 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-04 03:07:29 +00:00
Buginator 3fcdd7b00f Fixes issue with LASSAT not hitting droids.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6104 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-03 19:53:23 +00:00
Dennis Schridde 00c85bc2c8 Comparison against 0 is ... suboptimal for floats (imprecision). Compare against Epsilon instead.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6103 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-03 16:21:37 +00:00
Per Inge Mathisen 4a9c00e469 Revert tagfile changes in r6084, r6080 and r6079. Apparently not ready for the unwashed masses yet.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6102 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-02 21:50:05 +00:00
Giel van Schijndel 2c8a322504 * Don't manually maintain a line-count variable as Perl does this (I found out while reading the Camel book) automatically in the $. variable
* Include the filename of the currently being parsed file in error messages
 * Make sure to reset Perl's line counter ($.) when we start parsing a new file (when using <> as file handle)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6101 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-01 14:53:46 +00:00
Ari Johnson 9ba4510a7c Automatically copy Theora framework into .app bundle
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6100 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-01 02:37:02 +00:00
Freddie Witherden 31c5bf6f47 Commit patch #79 which improves the accuracy of the lassat and reduces the delay-time. Patch by Zarel.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6099 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-29 22:00:40 +00:00
Freddie Witherden 0d8a416f7f Eliminate the use of FindFolder on OS X, which was deprecated in 10.4, in favour of FSFindFolder.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6098 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-29 20:00:25 +00:00
Freddie Witherden 4a16da1eba Fix Theora.framework linker errors under OS X.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6097 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-29 18:41:37 +00:00
Freddie Witherden a36f4d4570 Make sure we copy Theora.framework into the Warzone.app bundle.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6096 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-29 17:51:57 +00:00
Freddie Witherden 7be01a4456 Make sure to export the Theora headers in the Xcode project.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6095 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-28 19:04:35 +00:00
Giel van Schijndel 73f4744912 Move the version checks for pkg-config, xgettext and msgfmt out of autogen.sh and into configure.ac
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6093 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-28 17:35:56 +00:00
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Per Inge Mathisen 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
Freddie Witherden 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Freddie Witherden 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
Freddie Witherden 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
Freddie Witherden 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
Freddie Witherden 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Giel van Schijndel 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
Buginator 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
Per Inge Mathisen 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
Giel van Schijndel 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
http://www.openasthra.com/c-tidbits/gettimeofday-function-for-windows/ 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
Buginator 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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