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
The_E
edeb8768af
Trunk sync r10257
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10259 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:14 +10:00
The_E
09d039fd42
sync to trunk 10223
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10228 387891d4-d844-0410-90c0-e4c51a9137d3
2014-03-06 19:24:13 +10:00
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
3fdae2e3c1
Trunk Sync: r9386
2012-12-02 02:24:53 +00:00
chief1983
73ab64e3da
Trunk sync r9300 (last was actually synced with 9284, skipped 9296 since we don't have an Xcode4 project in Antipodes yet).
2012-11-02 20:28:04 +00:00
The_E
d8a728d5f1
Trunk sync r7593
2011-08-30 18:17:09 +00:00
Zacam
61d7289888
Trunk Sync r7458
2011-08-12 12:48:38 +00:00
Zacam
2c5f54c319
MSVC LNK4221 Resolution.
...
multi_oo.cpp/.h and psnet.cpp/.h are not being used and have been removed.
Headers updated to point to multi_obj or psnet2 as appropriate.
Multi.cpp #ifdef PSNET2 made default. vecmat.h added to multi_obj.h.
2010-12-24 09:35:09 +00:00
Flaming_Sword
2ccdcbc0fe
Trunk sync
2009-11-19 12:14:17 +00:00
portej05
aaf3a9bf09
safe_strings changes
2009-07-26 05:15:24 +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
phreak
be97108d6c
Fix a bad memset
2008-12-14 21:33:53 +00:00
taylor
3abccfa76c
sync up to current FS2NetD code (fixes so many little problems/issues that it's not even funny)
2008-11-09 05:08:19 +00:00
taylor
18b2922455
a fix/workaround for Mantis #1692
...
bunch of standalone fixage for error reporting and various little signon issues
fix heartbeats for standalone servers
make proper use of +pxo in multi.cfg for standalone so that games can show up in the lobby
client-side fix for getting pilot stats in lobby (Mantis #1652 )
2008-10-05 13:31:35 +00:00
taylor
de28613166
add separate standalone options for setting FS2NetD login/password (gets around FS2NetD server game listing issue)
2008-10-05 13:24:06 +00:00
taylor
c5235c6428
FS2NetD v.2 (still a work in progress, but is ~98% complete)
2007-10-15 06:43:23 +00:00
karajorma
73baf41622
Add the -cap_object_update command line to force multiplayer clients to a more server friendly object update setting.
2007-04-06 12:55:57 +00:00
Goober5000
7e41877b7b
proper capitalization according to Volition
2006-04-20 06:32:30 +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
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
72db48921a
Linux port -- added NO_STANDALONE ifdefs
2002-07-22 01:22:26 +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