Commit Graph
147 Commits
Author SHA1 Message Date
Zacam 3fdae2e3c1 Trunk Sync: r9386 2012-12-02 02:24:53 +00:00
chief1983 ac44f7c59d Trunk Sync: r9193 2012-09-13 15:14:56 +00:00
chief1983 10eb2def8a Trunk Sync: r9149 2012-08-29 18:00:11 +00:00
The_E 05d5744477 TRunk sync r9104 2012-08-12 07:44:05 +00:00
Zacam 5dc5f82e43 Trunk Sync r8897 2012-06-18 00:44:03 +00:00
The_E 05283a3cfa Trunk sync r8742 2012-05-03 08:26:41 +00:00
The_E 45bd1d1d99 Trunk sync r8679 2012-04-15 11:41:31 +00:00
Zacam 7eb3b95751 Trunk Sync r8028 2011-11-23 01:23:54 +00:00
Zacam 9f8c2061c8 Trunk Sync r7986 2011-11-13 10:15:32 +00:00
Zacam 657182c001 Trunk Sync r7936 2011-11-01 04:16:18 +00:00
Zacam d495ef5ca9 Trunk Sync r7926 2011-10-23 19:04:29 +00:00
Zacam d380153ed9 Trunk Sync r7895 2011-10-11 20:33:05 +00:00
Zacam 6c6849405d Trunk Sync r7891 2011-10-11 09:04:55 +00:00
Zacam da8f806a10 Trunk Sync r7680 2011-09-08 11:33:58 +00:00
The_E b725ff7e21 trunk sync r7657 2011-09-06 21:22:39 +00:00
The_E d8a728d5f1 Trunk sync r7593 2011-08-30 18:17:09 +00:00
Zacam 037a418a62 Trunk Sync r7483 2011-08-18 20:22:52 +00:00
Zacam 78e2500d9e Some additional PVS-Studio fixes as placed in the thread on Aug 10th:
http://www.hard-light.net/forums/index.php?topic=77590.msg1538811#msg1538811
2011-08-14 14:08:09 +00:00
The_E 1159c2111c Trunk sync r7391 2011-07-30 21:49:42 +00:00
Zacam 80e9420172 Trunk Sync - r7235 2011-06-07 02:33:03 +00:00
Zacam 00741a4206 Trunk 7190 - Fix BSG warp effect shockwave 2011-05-19 10:49:41 +00:00
The_E 2f3f8abb4b Trunk sync r7133 2011-04-17 18:18:36 +00:00
The_E 58464ff04c Trunk sync r7080 2011-03-20 18:15:11 +00:00
The_E 400383f901 Removing the nonfunctional demo code, part 2 2011-02-13 20:42:20 +00:00
Zacam a5400e8e86 Trunk Sync - r6975 2011-01-25 16:49: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
Zacam a40d0abf52 Trunk Sync - r6581. 2010-10-08 23:10:53 +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 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
Zacam ba66cee720 Trunk Sync - r5825 2010-01-17 23:13:55 +00:00
Flaming_Sword 849506485f Trunk sync to 5771 2010-01-05 10:13:32 +00:00
portej05 31e620931e Trunk Sync 2009-12-14 13:34:13 +00:00
Flaming_Sword 2ccdcbc0fe Trunk sync 2009-11-19 12:14:17 +00:00
portej05 d1a1f39974 Trunk Sync 2009-11-03 08:21:16 +00:00
portej05 763dc6f25c Trunk sync after Antipodes #3 2009-09-26 05:54:19 +00:00
portej05 d8b132d846 Antipodes3 from Flaming_Sword 2009-09-12 16:03:52 +00:00
portej05 302f615cff Trunk sync 2009-08-03 16:15:44 +00:00
portej05 6a8d45c93d Replace most instances of std::vector with SCP_vector. Memory is now all run through vm_malloc and vm_free.
Watch it go up AND down in mission.
2009-07-11 07:07:57 +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
karajorma 8bdc2c1a9f Portej05's second set of preFAST fixes. 2009-05-24 21:38:22 +00:00
Wanderer 943969aac1 merge from wanderer branch - fix inconsistencies with subobj_name and name 2009-05-21 08:19:51 +00:00
Wanderer ea1cc6ca27 quick jury rigging to prevent stream of null vec warnings caused by r5261 2009-05-19 16:53:05 +00:00
karajorma 3ac6b9aa80 WMC's shipFX changes. Some other minor fixes. 2009-05-16 18:01:08 +00:00
chief1983 4f18bbd624 Nobody here but us chickens (really I don't think anyone uses this but FotG) 2009-05-01 16:14:32 +00:00
Goober5000 6e4021888d add apostrophes to contractions, lol 2009-04-10 07:49:12 +00:00