 The_E
|
2f46cbe8a3
|
sync to trunk 10046
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10047 387891d4-d844-0410-90c0-e4c51a9137d3
|
2013-11-25 18:40:16 +10:00 |
|
|
Zacam
|
ba68ceca3f
|
Trunk Sync: r9326 and set revision properties to this commit, tagged as 3.6.17 to eliminate any later fiddling or missing it for merge to Trunk.
|
2012-11-11 00:50:47 +00:00 |
|
|
The_E
|
ca9d09cc39
|
Trunk sync - r6818
|
2010-12-09 23:25:11 +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 |
|
|
Flaming_Sword
|
2ccdcbc0fe
|
Trunk sync
|
2009-11-19 12:14:17 +00:00 |
|
|
portej05
|
d8b132d846
|
Antipodes3 from Flaming_Sword
|
2009-09-12 16:03:52 +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 |
|
|
Wanderer
|
2ccbedd071
|
added +noreplace to ships flags to allow adding flags
added +override to muzzleflash.tbl
added +override to weapon flags
|
2008-10-20 18:51:51 +00:00 |
|
|
taylor
|
0253d298e9
|
only load tbls from tables/ (Mantis #1725)
|
2008-10-13 06:34:48 +00:00 |
|
|
Goober5000
|
6ab0b17acc
|
added fixes for #1415 and #1483, made sure every read_file_text had a corresponding setjmp, and sync'd the parse error messages between HEAD and stable
|
2007-09-02 02:10:29 +00:00 |
|
|
taylor
|
6ab6cd71ce
|
fixes for stuff_string() bounds checking
|
2006-09-11 01:17:07 +00:00 |
|
|
taylor
|
7727992e21
|
make muzzle flash info dynamic
add support for modular mflash tables (*-mfl.tbm)
|
2006-08-22 05:50:12 +00:00 |
|
|
wmcoolmon
|
78fab0c331
|
Codebase commit - nebula.tbl, scripting, new dinky explosion/shockwave stuff, moving muzzle flashes
|
2005-10-30 06:45:00 +00:00 |
|
|
taylor
|
7f786136a6
|
s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
|
2005-04-05 05:53:25 +00:00 |
|
|
Kazan
|
864e1b5922
|
remove MCD complete
|
2004-07-26 20:47:56 +00:00 |
|
|
Kazan
|
428b3dcbc9
|
MCD - define _MCD_CHECK to use memory tracking
|
2004-07-12 16:33:09 +00:00 |
|
|
Goober5000
|
7ef2ab2e39
|
Uber pass at reducing #includes
--Goober5000
|
2004-03-05 09:02:13 +00:00 |
|
|
unknownplayer
|
3a7cc9cc63
|
The big DX/main line merge. This has been uploaded to the main CVS since I can't manage to get it to upload to the DX branch. Apologies to all who may be affected adversely, but I'll work to debug it as fast as I can.
|
2003-03-18 10:07:06 +00:00 |
|
|
penguin
|
0c503be8d1
|
The big include file move
|
2002-08-01 01:41:11 +00:00 |
|
|
penguin
|
8f92eebd34
|
Warpcore CVS sync
|
2002-06-03 04:10:40 +00:00 |
|
|
penguin
|
663b3471b9
|
Volition sources -- warpcore CVS import
|
2002-06-03 03:26:03 +00:00 |
|