Commit Graph

494 Commits (2ce52672c7a8162531e173dfdb1fe7824ec9a07e)

Author SHA1 Message Date
Giel van Schijndel 810fac209b * Wrap all file lists in the automake and win32 makefiles across lines such that there's only one file on each line
* Alphabetically sort the file lists

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6144 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-13 13:04:37 +00:00
Per Inge Mathisen 36f3ec168c From ticket #97: Change height of some buildings so that they can fire over walls as they should. Patch by Zarel.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6130 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-11 15:09:35 +00:00
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
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
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
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
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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
René Jürgens 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
René Jürgens 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
Giel van Schijndel 5daf3d8035 Simplify the automake processed makefiles in data/
* Getting rid of the custom crafted installation rules
 * Replace them with a single automake primary build rule: nodist_<instdir>_DATA

This closes ticket:62

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5995 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-12 08:19:57 +00:00
Giel van Schijndel c2f0855e00 NTW is a multiplay mod, not a global mod. So move it to data/mods/multiplay.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5989 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-11 09:12:38 +00:00
Steven Koenig d755c30648 * Set power generator output boost for Gas Turbine Generator to +30%
* This fixes bug #12262
* Added myself to the AUTHORS file


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5955 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 17:59:16 +00:00
Per Inge Mathisen 77f057bd08 Fix team colours in naval PIE propulsion file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5813 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-14 20:13:18 +00:00
Elio Gubser 1465f18367 reversed first line because order green, orange, grey... is hardcoded
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5812 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-14 20:07:11 +00:00
Per Inge Mathisen 44861ebd89 Add naval propulsion PIE model and texture.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5803 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-13 19:15:55 +00:00
Giel van Schijndel 77404123a6 Update player[1-7].[sv]lo so that they're "generated" from the last version of player0.[sv]lo r5726 didn't use the latest version somehow
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5783 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-08 14:45:11 +00:00
Elio Gubser f7e29e9709 new data directory for svg-icons, there's no naming specification yet
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5780 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-07 13:50:33 +00:00
Elio Gubser fce4029e9d small changes in intfac1(hammer modified), intfac2(new weapon icon) and frontend2(nicer computer-ai)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5779 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-07 12:37:46 +00:00
Dennis Schridde 87f127c146 Do not autogenerate aivolution scripts
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5726 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 17:39:10 +00:00
Giel van Schijndel 068d2d3174 Move the last translatable string that's used by the scripts into the scripts themselves: _("Return to LZ")
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5708 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 18:28:40 +00:00
Giel van Schijndel e48619f9eb Convert data/base/messages/resmessagesall.txt to the new research message format
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5702 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 00:26:41 +00:00
Giel van Schijndel 1c22e4e314 I forgot to commit the changes to data/mp/messages/resmessagesall.rmsg in r5700
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5701 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 00:15:33 +00:00
Giel van Schijndel a2a08db52e Convert data/mp/messages/resmessagesall.txt to the new research message format
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5700 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 00:12:07 +00:00
Giel van Schijndel b122c5a07c Convert resmessages1.txt and resmessages3.txt to the new research message format
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5699 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 23:48:49 +00:00
Giel van Schijndel aaf666d026 Convert resmessages2.txt and resmessages23.txt to the new research message format
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5698 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 23:27:15 +00:00
Giel van Schijndel e5ca53e2ec Convert resmessages12.txt and messages.txt to the new research message format
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5697 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 22:49:28 +00:00
Giel van Schijndel 090c069f5e Remove data/mp/messages/multiplay.txt as it's ''exactly'' the same as data/base/messages/multiplay.txt (and base depends on this one as well)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5696 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 21:47:45 +00:00
Per Inge Mathisen 7f768ba83e Add naval propulsion, appropriating the unused 'Propellor'
propulsion for this purpose. To test, use 'give all' cheat
before design, and the ctrl+o menu to place.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5691 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 09:15:20 +00:00
Giel van Schijndel 49944c6e3b * Remove several unused strings
* Move some strings to scripts

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5690 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 02:46:36 +00:00
Giel van Schijndel 40a8a0c1ff Remove several unused strings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5688 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 02:12:52 +00:00
Giel van Schijndel 8175833f5b * Move all translatable strings used by the tutorial into the tutorial's script file and out of the string resource file (`tutstrings.txt`)
* make -C po update-po

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5687 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 02:12:42 +00:00
Giel van Schijndel 04f5392dd2 Fix stock AI's `takeover` trigger:
* Called upon receiving a CALL_UNITTAKEOVER event, which is sent when handing over droids or "stealing" them using the NEXUS turret
 * Prevent it from trying to add command or transporter droids to any groups, as these droids cannot be added to a group

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5678 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-26 21:48:15 +00:00
Roman C 2eba906351 Aivolution AI builds bunker buster tanks again.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5671 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-26 16:09:55 +00:00
Per Inge Mathisen f0fd48673d Add the 4c-cockpit map by zydonk.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5567 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-16 13:00:45 +00:00
Per Inge Mathisen e827d8e580 Update of the 8c-cockate map by zydonk.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5566 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-16 12:55:01 +00:00
Per Inge Mathisen eb3ac2e356 Fix bug #11911: two patrol buttons. Patrol now has a new icon, drawn by
elio. Circle now has correct tooltip and uses old patrol icon. Some
spelling issues also fixed.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5565 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-16 12:06:26 +00:00
Giel van Schijndel b7f1b4aae1 Read some scripts using their __lower-case__ name (as these file's names are lower-case)
This might fix bug #12011

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5539 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 22:25:44 +00:00
Dennis Schridde 022315eef0 Hardcode top_srcdir to make building from non-topdir possible, dont depend on the touch command, fix LDFLAGS to not depend on the removed TARGET variable
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5476 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-10 20:10:16 +00:00
Giel van Schijndel 6fcbc73c2c Merge the DATA build option (for the win32 makefile build system) into INSTALLER as the data packages are only required when building an installer
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5473 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-10 17:51:31 +00:00
Giel van Schijndel 0d997d617f Remove `hitPoints` from the code as it's never used.
It's loaded in from the stats files and copied all over a dozen places, but never actually __used__.

NOTE: This __shouldn't__ break savegames, I've checked it quite thoroughly, but game.c is evil & large enough that the chance exists I made a mistake in this department.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5454 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-09 19:02:19 +00:00
Dennis Schridde 302a557478 Rename "raw" Makefiles to "win32" Makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5402 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-06 14:29:04 +00:00
Elio Gubser 3695f6258b minor change of the power bar gradient
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5394 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-06 09:14:36 +00:00
Elio Gubser 147d658ade completed intfac1.svg
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5393 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-06 08:57:49 +00:00
Elio Gubser 7372b84341 Working on intfac2.svg, colours aren't correct in this version
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5392 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-06 08:42:19 +00:00
Dennis Schridde 45f23a4926 Merge commit 'HEAD@{3}'
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5347 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-28 22:32:44 +00:00