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
chief1983
e1650f1255
Trunk sync r9508.
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9509 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:14 +10:00
Zacam
3fdae2e3c1
Trunk Sync: r9386
2012-12-02 02:24:53 +00:00
Zacam
5dc5f82e43
Trunk Sync r8897
2012-06-18 00:44:03 +00:00
Zacam
6e648f5205
Trunk Sync r8013
2011-11-19 16:32:50 +00:00
Zacam
c607d9844e
Part One: Synchronization pass of Antipodes and Trunk Differences.
...
Whitespace/tab mostly and to catch any drift.
2011-09-09 09:38:52 +00:00
Zacam
e9e29e3ae6
Trunk Sync r7674
2011-09-08 05:05:01 +00:00
Zacam
6e6aa1975c
Trunk Sync r7665
2011-09-07 10:20:10 +00:00
The_E
60758c5e82
And a few things that went wrong while merging
2011-09-06 21:44:54 +00:00
The_E
b725ff7e21
trunk sync r7657
2011-09-06 21:22:39 +00:00
The_E
86e99817a4
Ooops, messed up the merge here
2011-08-31 19:44:14 +00:00
The_E
75f66ee174
Trunk sync r7607
2011-08-31 19:36:54 +00:00
The_E
d8a728d5f1
Trunk sync r7593
2011-08-30 18:17:09 +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
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
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
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
karajorma
8bdc2c1a9f
Portej05's second set of preFAST fixes.
2009-05-24 21:38:22 +00:00
taylor
966ec358e9
fix bogus ml_printf strings
...
use ml_string over ml_printf where possible
remove newlines from ml_* calls, since it gets added already
2008-10-23 13:26:35 +00:00
taylor
fcb28b51f1
better error handling for when TCP socket is already in use (Mantis #1626 )
...
fix missing protocol XSTR that used the wrong tstring for display
2008-10-05 01:17:45 +00:00
taylor
f89a173548
we do actually pass invalid socket ids during init stuff so don't complain about such things in the log
2008-03-20 18:11:52 +00:00
taylor
c5235c6428
FS2NetD v.2 (still a work in progress, but is ~98% complete)
2007-10-15 06:43:23 +00:00
taylor
a0d3cf64d0
add custom IP option to maybe help get around NAT issues (I haven't heard whether this actually works or not yet though, but it's been out for testing all week)
2006-08-19 04:28:22 +00:00
taylor
09c9a73ca9
try to allow RAS VPN connects since they probably aren't dial-up and shouldn't be seen as such
2006-06-12 03:38:15 +00:00
taylor
d3481714d0
remove NO_NETWORK
2005-10-10 17:21:11 +00:00
taylor
af1df76849
merge of OSX tree
...
a lot of byte swaps were still missing, will hopefully be fully network compatible now
2005-09-05 09:38:19 +00:00
Goober5000
2394e9801b
remove PreProcDefine #includes in FS2
...
--Goober5000
2005-07-13 03:35:36 +00:00
taylor
92b8c2d6ed
various compiler warning fixes (some of these from dizzy)
2005-07-07 16:36:58 +00:00
taylor
3f6e13d20b
use vm_malloc(), vm_free(), vm_realloc(), vm_strdup() rather than system named macros
...
fixes various problems and is past time to make the switch
2005-05-12 17:49:18 +00:00
taylor
476a96e47e
(re)move some uneeded variables to fix compiler warnings
2005-03-24 23:29:33 +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
09167fa382
merge with Linux/OSX tree - p0204-2
2005-02-04 20:06:10 +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
4b7700f317
commented out an unneeded variable (int ret) in psnet_socket_options
2002-12-02 23:18:53 +00:00
penguin
0c503be8d1
The big include file move
2002-08-01 01:41:11 +00:00
unknownplayer
d8c81cd2a3
Started work on DX8.1 implementation. Updated the project files to encompass
...
the new files. Disable the compiler tag to use old DX code (THERE IS NO
NEW CODE YET!)
2002-07-30 14:29:15 +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
The_E