Commit Graph

5210 Commits (6986905a6576f42019e6668f027b40222bd59831)

Author SHA1 Message Date
Gerard Krol be9e1706cd Do not show the intelligence screen after playing a mission update FMV anymore. This was previously done because the
FMV's were missing. A message "New Intelligence Report" is shown to remind people who abort the movie that they can see 
it again in the intelligence screen.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6253 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-08 22:47:49 +00:00
Gerard Krol 03c11abefb Hide the mouse cursor during loading screens and movies.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6252 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-08 21:37:32 +00:00
Giel van Schijndel 7c0b953c34 Add some more translated strings for the French translation:
* About 96% is translated now

This closes ticket:134, patch by Cassarin-Grand Arthur <Zoloom>

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6251 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-08 21:26:02 +00:00
Giel van Schijndel 4d066be1ca * Merged revision r6249 via svnmerge from trunk
* Update the Debian changelog as well

........
  r6249 | muggenhor | 2008-11-08 20:30:18 +0100 (za, 08 nov 2008) | 4 lines
  
  Allow the initialisation function of the debug callback to fail and report its failure through its return value:
   * If initialisation of the debug callback failed, do ''not'' add it to the list of debug callbacks to use
  
  This fixes ticket:136
........

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6250 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-08 20:46:40 +00:00
Giel van Schijndel 03353e833e Allow the initialisation function of the debug callback to fail and report its failure through its return value:
* If initialisation of the debug callback failed, do ''not'' add it to the list of debug callbacks to use

This fixes ticket:136

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6249 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-08 19:30:18 +00:00
Giel van Schijndel d0cae6d040 Bump the version numbers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6248 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-08 19:03:53 +00:00
Giel van Schijndel 94a800d9bf Update the ChangeLog in preparation of releasing the first release candidate for 2.1
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6247 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-08 18:50:57 +00:00
Giel van Schijndel bb64ebc231 Build depend on libgl-dev (for the Debian pkg)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6246 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-07 14:43:39 +00:00
Per Inge Mathisen 1e257d38c1 Fix two warnings, reported by forum user jaakan.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6245 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-04 23:09:31 +00:00
Per Inge Mathisen 541335f18e I forgot one file...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6244 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-04 22:07:24 +00:00
Giel van Schijndel 0f2bd00dfa Ignore built files for qwzm
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6243 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-04 19:54:59 +00:00
Per Inge Mathisen f714179393 qwzm: Refactor model loading functions to save code lines and remove duplicate code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6242 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 21:31:51 +00:00
Per Inge Mathisen 3d34a03813 qwzm: Move conversion functions into their own file. Add TODO messages to stdout for stuff that doesn't work.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6241 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 21:07:17 +00:00
Per Inge Mathisen 753bc5ac03 qwzm: Add import from PIE feature.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6240 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 20:52:00 +00:00
Per Inge Mathisen 28d9734e8f pie2wzm: Remove two bad TODO items
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6239 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 20:49:26 +00:00
Per Inge Mathisen 07c1245e01 qwzm: Add 3DS import feature.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6238 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 19:50:54 +00:00
Per Inge Mathisen 632b539aea wzmutils: Add WZM save model function.
qwzm: Add more dummy GUI stubs. Implement save and save as.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6237 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 17:47:10 +00:00
Per Inge Mathisen 615520bc59 wzmviewer/qwzm: Unify animation code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6236 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 15:16:03 +00:00
Per Inge Mathisen ecb8208534 qwzm: Brute force fix for infinitely extrapolating interpolation in no animation case.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6235 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 23:47:35 +00:00
Per Inge Mathisen d7c9a522c9 qwzm: Fix animation bug due to using different timers for drawing and animating.
However, introduces new bug, when animation is not on, interpolation function will 
extrapolate into infinity, creating really funny non-animation animation.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6234 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 23:10:10 +00:00
Per Inge Mathisen a2031b9fd3 wzmviewer: Refactor more code for sharing with qwzm
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6233 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 22:24:09 +00:00
Per Inge Mathisen 232629a685 qwzm: Add more error reporting
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6232 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 20:57:43 +00:00
Per Inge Mathisen b32d3eaa76 Fix valgrind warning
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6231 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 20:35:55 +00:00
Freddie Witherden d7413b0caf Commit the first part of patch #1088 (Gna!), which should fix the out-of-sync issues in multiplayer games.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6230 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 11:09:11 +00:00
Per Inge Mathisen 797701f42b Add WZM editor written in Qt. Be warned that it is still buggy and incomplete.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6228 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-29 17:56:58 +00:00
Per Inge Mathisen 5ae79df9e3 Attempt a fix for recent out of map crashes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6227 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-29 16:42:20 +00:00
Per Inge Mathisen bc4a850c94 wzmviewer: More refactoring to ease code sharing between programs.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6226 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-29 16:33:37 +00:00
Per Inge Mathisen 3345cb2180 Refactor wzmviewer for easier code sharing with other programs.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6225 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-29 13:22:51 +00:00
Giel van Schijndel 07e0f2abc8 Russian translation: 260 new translated messages, 6 less fuzzy messages, 254 less untranslated messages
Closes #129, patch by Azamat H. Hackimov <winterheart>

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6224 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-26 22:54:00 +00:00
Buginator c5c02052d6 Add Hack from ticket:115
Forces window XP users to also use a software device for openAL.  (already the default for the other platforms & vista).  This allows 256 sources, instead of 16.
Note: *this is windows specific* and will not affect the other platforms.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6223 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-26 17:10:42 +00:00
Giel van Schijndel 0cf8df8f3f Copy latest 2.1 ChangeLog entry into trunk ChangeLog and move the exceptionhandler fix (r6214, r6217 and r6218) into that entry
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6219 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-25 22:21:35 +00:00
Giel van Schijndel a47f0e94a7 Oops, need to copy filename template into template buffer (see r6214, r6217)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6218 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-25 22:16:13 +00:00
Giel van Schijndel a5c5328609 Make sure we take sizeof(array), not sizeof(pointer)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6217 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-25 22:11:43 +00:00
Giel van Schijndel 0269d11d16 In the exception handler:
* use mkstemp(3) to create a temporary file that's guaranteed not to exist already

Prevents a potential symlink attack (e.g. where /tmp/warzone2100.gdmp is symlinked by user A to a file owned by user B, then having user B crash warzone)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6214 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-25 21:47:00 +00:00
Giel van Schijndel d141c834e5 Ignore po/remove-potcdate.sed
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6213 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-25 20:52:29 +00:00
Buginator 6f3419da73 Modify scrOutputCallTrace() to dump the stack on script errors, and act normally whenever it is called normally.
(Normally, it dumps only when LOG_SCRIPT is defined, but we can't determine where the script errors are when LOG_SCRIPT isn't used)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6212 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-25 17:56:43 +00:00
Buginator 11b627c5b4 Another fix for r6187
setGameMode() correctly also.

Part of ticket:121

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6204 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-23 02:50:54 +00:00
Giel van Schijndel 7ab0ef51ce Clean up:
* Lets ''not'' save on the characters required to have function names make sense
 * Make DeleteButtonData a static function (because it's only used in the source file where it's defined)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6203 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-22 20:04:16 +00:00
Giel van Schijndel 962445e5fc Fix a bug that prevent proper loading of save games:
* Make sure to stop the title loop ''before'' attempting to load a save game
 * Restart the title loop only ''after'' we've determined that loading of the save game was unsuccessful

Stopping the title loop (stopTitleLoop()) causes resReleaseAllData to be called, which is required to make sure that the "frontend" (aka main menu) data doesn't conflict with the game data.

This fixes #121

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6202 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-22 20:04:10 +00:00
Per Inge Mathisen 6140e091d6 Improve assert messages. Related to bug #12474.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6201 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-22 18:47:39 +00:00
Giel van Schijndel ceeb8780c7 Explain the "funny" iteration used to iterate over OpenAL devices
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6199 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-22 17:19:43 +00:00
Buginator 48eacfbc3d Dump out available devices available for openAL in the PrintOpenALVersion() function.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6196 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-21 18:40:05 +00:00
Buginator 54aecf520e fixes r6183 and closes ticket:119
Buildings couldn't fire at anything.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6193 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-19 04:45:38 +00:00
Buginator fedbd6e1fa Fixes & closes ticket:114
We do not exit() on a bad savegame file.
Instead, we go back to the title menu. (Since we have no easy way to make a pop-up requester with the current GUI code)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6187 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-18 18:57:54 +00:00
Buginator 03990706e6 Disables the AI from executing the reassignAI() routine, which is broken, and it instead took control of a human player, and not the dropped player (which doesn't make sense to do, since we nuke all that player's stuff.)
See ticket:105 for more info.
Fixes bug #12398 , bug  #12443


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6186 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-18 18:38:25 +00:00
Per Inge Mathisen e33161cda1 Ran astyle over validTarget(), a hideously looking function!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6185 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-18 18:28:26 +00:00
Buginator 40795ec7b8 Fixes and closes ticket:104
Prevents allowing player from having everyone on the same team.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6184 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-18 18:27:32 +00:00
Per Inge Mathisen 64b8634b35 Make structures not try to target anything from outside weapons range. From patch
by Zarel in ticket #97.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6183 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-18 18:04:49 +00:00
Per Inge Mathisen 2d02726753 Restrict direct fire to weapons range only instead of minimum of sensor range and
weapon range. Patch by myself and Zarel with input from the forums. From ticket #97.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6182 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-18 17:59:09 +00:00
Per Inge Mathisen ee5f151162 Add the purely cosmetic changes from trac ticket #97 to minimize patch size.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6181 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-18 17:27:27 +00:00