Zacam
4952b70488
Trunk Sync - r10911
...
There are a lot of changes here that should probably be examined, namely the Debug Console (which had conflicts) and Yarn's "any resolution" mainhalls code (Which also had conflicts) but for the most part this should be fairly clean.
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10912 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-11 19:22:13 +10:00
Zacam
5dc5f82e43
Trunk Sync r8897
2012-06-18 00:44:03 +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
a05b1ef11f
Allow the player to score from assists and kills in a variety of new ways.
2008-07-24 20:23:52 +00:00
karajorma
c819405ec8
Fix TvT problem with scores appearing incorrectly.
...
Fix a CVS issue
2006-08-25 21:15:31 +00:00
wmcoolmon
0571df5719
Compiler warning fix
2006-01-31 06:44:48 +00:00
Goober5000
23a63ff8d5
oops
...
--Goober5000
2006-01-13 04:12:23 +00:00
Goober5000
4d5a477f71
übercommit of custom IFF stuff :)
2006-01-13 03:31:20 +00:00
taylor
d3481714d0
remove NO_NETWORK
2005-10-10 17:21:11 +00:00
Goober5000
2394e9801b
remove PreProcDefine #includes in FS2
...
--Goober5000
2005-07-13 03:35:36 +00:00
taylor
3f9ffbc393
better support for Inferno builds (in PreProcDefines.h now, no networking support)
...
make sure NO_NETWORK builds are as friendly on Windows as it is on Linux/OSX
revert a timeout in Client.h back to the original value before Linux merge
2005-03-02 21:18:20 +00:00
taylor
a2232be0c7
merge with Linux/OSX tree - p0204
2005-02-04 10:12:33 +00:00
Goober5000
0c48b587a1
allow different wing names than ABGDEZ
...
--Goober5000
2004-12-14 14:46:13 +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
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
Zacam