Commit Graph
212 Commits
Author SHA1 Message Date
Zacam 4b6bfbc980 Trunk Sync r7496 for GREAT JUSTICE! 2011-08-20 22:25:04 +00:00
Zacam 33d3a759e3 Trunk Sync r7494 2011-08-20 19:15:54 +00:00
Zacam 0ba0aa44e3 Resolves MSVC Errors from the sync of Hallecks Bomb code. "&& !(Game_mode & GM_DEMO_PLAYBACK)", error being that "GM_DEMO_PLAYBACK" is not available in Antipodes. 2011-08-19 02:57:40 +00:00
Zacam 037a418a62 Trunk Sync r7483 2011-08-18 20:22:52 +00:00
Zacam dcde3e4270 Trunk Sync r7420 2011-08-04 13:27:14 +00:00
The_E 1159c2111c Trunk sync r7391 2011-07-30 21:49:42 +00:00
Zacam 4d5e94bf35 Trunk Sync r7372 2011-07-22 17:07:42 +00:00
The_E 08063525c7 trunk sync r7363 2011-07-20 18:07:56 +00:00
Zacam 5f0c4ad2a7 Trunk Sync - r7328 2011-07-06 05:23:54 +00:00
The_E a6a3e1900c Trunk sync r7280 2011-06-28 08:38:40 +00:00
Zacam ce2b01f20c Trunk Sync -r7141 2011-04-20 18:07:38 +00:00
Zacam 732de3d7b3 Trunk Sync - r7051 2011-03-11 09:57:38 +00:00
Zacam 4ab313e1b6 Trunk Sync - r7014 2011-02-14 17:03:01 +00:00
The_E 400383f901 Removing the nonfunctional demo code, part 2 2011-02-13 20:42:20 +00:00
Zacam 0349ed6db6 Trunk Sync - r6988 2011-01-30 17:56:40 +00:00
The_E 419592d706 Trunk sync r6959 2011-01-22 18:34:12 +00:00
Zacam 6eccb00b38 Trunk Sync - r6952 2011-01-19 10:33:07 +00:00
Zacam 1aab2c261e Trunk Sync - r6898 2010-12-27 13:01:43 +00:00
The_E f05fcfade1 Trunk synk r6876 2010-12-22 14:48:44 +00:00
Zacam a50f6a7a10 The E cleaned house on a slew of unused #IFDEFs, such as FS2_DEMO, MULTIPLAYER_BETA, OEM_BUILD, commented out code, etc. 2010-12-13 02:44:27 +00:00
Zacam 5357113acd Trunk Sync - r6774 2010-11-24 02:59:12 +00:00
Zacam fc0d8b53c8 Trunk Sync - r6760 2010-11-21 20:29:01 +00:00
chief1983 48d5472738 Initial commit of HUD/Dradis code from Swifty's branch for Antipodes 7 2010-10-19 23:17:26 +00:00
Zacam dabd73e5e1 Trunk Sync - r6545. 2010-10-01 04:25:38 +00:00
Zacam 2a6e9c8662 Trunk Sync - r6543. 2010-10-01 04:13:00 +00:00
Zacam 1752bcaee8 Trunk Sync - r6537. 2010-09-30 06:10:56 +00:00
taylor d387a4644e re-comment debug message 2010-09-26 21:16:07 +00:00
Zacam f9a5615c64 Trunk Sync - r6515 (6506, 6507, 6508, 6511, 6512, 5614 actually committed, 5613/6515 ignored) 2010-09-26 01:44:56 +00:00
Zacam 9dac4b2bc4 From taylor: go_faster 2010-09-23 02:19:27 +00:00
Zacam 585281635d Trunk Sync - r4290 2010-09-22 22:39:29 +00:00
Zacam 3bebbbbcd0 Trunk Sync r6269. I hope this works. This is supposed to be a Trunk overlay merge into Antipodes, which should mean that Antipodes is now a copy of Trunk in all respects. 2010-06-29 22:09:34 +00:00
Zacam d283dfd832 Trunk Sync - r5961 2010-03-01 18:22:26 +00:00
Zacam f969eb52a2 taylors Sound Code. Linux, MSVC 6, 2005 & 2008 compiling.
(Mac OS-X Compiling still needs setup for the file changes)
2010-02-23 00:15:32 +00:00
Zacam 7a399e1db3 Trunk Sync - r5931. Updated build output filenames to 6, MSVC 6 project also outputs _ant (instead of _trunk) so as not to over-write Trunk build compiles. 2010-02-22 21:37:43 +00:00
Zacam c6c23bbd00 Trunk Sync - r5888
Special notes: MSVC_6_Release was corrected by hand, but none of the changes made to MSVC_6 were carried over.
2010-02-06 02:27:21 +00:00
Flaming_Sword 06ce9f76f6 Trunk sync to 5779 2010-01-06 08:24:54 +00:00
Hery b725a5e8bb Trunk sync (pending PostProcessing patch) 2009-11-24 15:31:34 +00:00
portej05 963d965699 Trunk Sync pending Zacams changes 2009-10-26 09:16:42 +00:00
portej05 763dc6f25c Trunk sync after Antipodes #3 2009-09-26 05:54:19 +00:00
portej05 8eb87b45b9 Trunk Sync for FS' EFF code 2009-09-03 14:20:46 +00:00
portej05 c1ef2b9f61 Trunk Sync 2009-08-28 11:58:32 +00:00
portej05 aaf3a9bf09 safe_strings changes 2009-07-26 05:15:24 +00:00
karajorma 31d6469fde Can't say for certain this will cause a speed up but it definitely places the faster check first. 2009-07-06 13:28:33 +00:00
portej05 719825f80d The big CVS comment removal. This chops approx. 3.5mb off a full checkout.
I've tested this through compiling and through hand checking. 
Normalises line endings in ALL files to \n.
2009-06-20 08:08:20 +00:00
Wanderer e05276ea1e merge from wanderer branch.
option to allow all hitpointed weapons to be hit.
allow 'safe from weapons' time of bombs be set.
2009-05-20 20:11:15 +00:00
Wanderer cb3085e58c merge from wanderer branch - subsys/turret sounds 2009-05-20 12:24:45 +00:00
karajorma a4e623db23 Portej05's preFAST warning fixes. 2009-05-17 11:50:48 +00:00
karajorma 7c70f212ba More minor fixes. 2009-05-16 16:20:45 +00:00
Wanderer c695230883 Fix for mantis 1915 and related collision detection issues 2009-05-09 10:45:04 +00:00
Goober5000 6e4021888d add apostrophes to contractions, lol 2009-04-10 07:49:12 +00:00