Commit Graph
604 Commits
Author SHA1 Message Date
Zacam 8d700fa600 From Trunk 7295: Swifty's collision detection improvements. 2011-07-01 18:08:54 +00:00
Zacam f8883ce805 Trunk Sync - r7274 2011-06-27 20:36:05 +00:00
Zacam 53b5dd43bd Trunk Sync - r7255 2011-06-18 19:40:53 +00:00
Zacam baa1b95549 Trunk Sync - r7240 2011-06-13 21:52:07 +00:00
Zacam db4a193eba Trunk Sync - r7201 2011-05-23 16:49:43 +00:00
Zacam 80ba7361a8 Trunk Sync - r7197 2011-05-19 21:34:28 +00:00
Zacam 51dbc52d4a Trunk Sync -r7171 2011-05-01 15:13:24 +00:00
Zacam 8467ad4a01 Trunk Sync -r7153 2011-04-28 22:57:45 +00:00
Zacam ce2b01f20c Trunk Sync -r7141 2011-04-20 18:07:38 +00:00
The_E 2f3f8abb4b Trunk sync r7133 2011-04-17 18:18:36 +00:00
Zacam cb85530ac8 Trunk Sync - r7099 2011-03-30 13:40:30 +00:00
The_E 58464ff04c Trunk sync r7080 2011-03-20 18:15:11 +00:00
Zacam 732de3d7b3 Trunk Sync - r7051 2011-03-11 09:57:38 +00:00
Zacam c60578f338 Trunk Sync - r7036 2011-03-03 03:49:54 +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 a79c2d8390 Trunk Sync - r7005
Some modification to list "no-ets" above "immobile"
2011-02-07 09:45:15 +00:00
Zacam 5abaa37b7f Trunk Sync -r7002 2011-02-06 03:26:41 +00:00
Zacam 8afa55a716 Trunk Sync - r6993 2011-02-04 03:50:54 +00:00
The_E f028c7a5f1 Trunk sync r6964 2011-01-23 16:25:29 +00:00
The_E 419592d706 Trunk sync r6959 2011-01-22 18:34:12 +00:00
The_E 4cba1ccb03 Trunk sync r6949 2011-01-18 16:26:37 +00:00
Zacam fa908e72a8 Trunk 6921 - "Add flag that applies damage to subsystem as if it were the hull." 2011-01-05 17:36:39 +00:00
The_E f8674a1515 Trunk sync r6917 2011-01-01 13:41:57 +00:00
Zacam 5078462321 Dynamic Primary Linking, from chief1983. 2010-12-30 19:28:52 +00:00
Zacam 1aab2c261e Trunk Sync - r6898 2010-12-27 13:01:43 +00:00
Zacam 727c65d095 From Trunk: Fix for Mantis 2350 (Sound assignments get lost/become bogus when changing ship class) 2010-12-25 15:18:47 +00:00
The_E f05fcfade1 Trunk synk r6876 2010-12-22 14:48:44 +00:00
Zacam 8c2e8ca45a Trunk Sync - r6875 2010-12-21 06:51:15 +00:00
Zacam 24ff53937d Trunk Sync - r6847 2010-12-13 20:44:27 +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 6d9dedb2f8 Trunk Sync - r6830 2010-12-12 01:29:12 +00:00
The_E 0e64e47bfe Trunk sync r6820 2010-12-09 23:49:32 +00:00
The_E ca9d09cc39 Trunk sync - r6818 2010-12-09 23:25:11 +00:00
Zacam 065878be49 Trunk Sync - r6804 2010-12-06 20:11:49 +00:00
The_E ef61f16857 Fixes for build warnings 2010-10-22 20:33:35 +00:00
chief1983 19e491c4fc Fix compiling errors on VC6 2010-10-20 19:24:59 +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 a40d0abf52 Trunk Sync - r6581. 2010-10-08 23:10:53 +00:00
Zacam 3b9443d380 Trunk Sync - r6575. 2010-10-06 20:22:00 +00:00
Zacam 2360d36072 Trunk Sync - r6571. 2010-10-06 09:56:50 +00:00
Zacam 2edf65dfe0 Trunk Sync - r6556. 2010-10-02 00:51:18 +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
Zacam a4f09bf1b5 Trunk Sync - r6532. 2010-09-27 19:04:53 +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 88377709f3 This is more like it. These files diff'd as different than Trunk versions, so I over-rode them with Trunk versions so that Antipodes and Trunk can finally have some 1:1 parity. 2010-09-23 02:14:26 +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 d340940da9 Oh ffs. No more Trunk syncs while at work anymore. Somewhere, a } got lost. 2010-03-02 22:11:53 +00:00