Commit Graph
64 Commits
Author SHA1 Message Date
Zacam 8afa55a716 Trunk Sync - r6993 2011-02-04 03:50:54 +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
Zacam d86f450c55 Antipodes 8: New Pilot code, from taylor. 2010-12-12 23:53:05 +00:00
Zacam 585281635d Trunk Sync - r4290 2010-09-22 22:39:29 +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
karajorma 24de2cb225 Bobboau's Skybox flags code (via Wanderer then me) 2009-05-21 14:57:33 +00:00
Wanderer 9c7b1a1292 merge from wanderer branch - alt iff colors 2009-05-19 21:17:48 +00:00
karajorma d599cc1d6b Commit Wanderer's Salvo Fire mode changes. 2009-05-16 19:41:05 +00:00
karajorma b67289e52a Commit the SEXP packet code.
Add the set-respawns SEXP.
2009-05-15 18:32:46 +00:00
Goober5000 6e4021888d add apostrophes to contractions, lol 2009-04-10 07:49:12 +00:00
karajorma fff260ae8e Fix Mantis 1838 (Latency information obscures the messaging menu) 2009-03-15 17:19:45 +00:00
Wanderer e302a90a1e add 'missing' casts 2009-03-06 15:08:16 +00:00
karajorma 2f0c86dd01 Get rid of the ping message when the HUD is turned off 2009-01-15 21:33:32 +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 9a3a1b051e no magic numbers 2008-10-05 13:19:13 +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
WMCoolmon ddf75fc7e0 Final scripting, camera code updates. 2008-08-30 11:05:48 +00:00
taylor 461922f046 some minor mprintf() cleanup 2008-03-28 03:32:38 +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 42d2986655 Fix ammo and weapon SEXP changes not being passed on to the clients 2006-11-21 23:07:27 +00:00
taylor 75409481d0 more standalone server fixes:
- add some basic bmpman functionality to grstub, since it needs to do something at least
 - add missing gr_* function ptrs to grstrub
 - (re-)enable radar and hud setup functions that used to crash (problems are fixed now)
 - deal with default pilot file properly (also caused a bmpman headache)
 - don't bother with Multi_common_icons[] in standalone mode (they don't load, so don't let them unload either)
2006-09-24 22:55:17 +00:00
karajorma c819405ec8 Fix TvT problem with scores appearing incorrectly.
Fix a CVS issue
2006-08-25 21:15:31 +00:00
karajorma 483657b858 Let's try this again. - Added new packed to deal with a bug in multiplayer where using end-mission would only end the mission for the server and then force the clients to jump out. 2006-08-03 16:22:24 +00:00
karajorma e0303d36cf *** empty log message *** 2006-08-03 16:03:54 +00:00
(no author) 62cebe8069 This commit was manufactured by cvs2svn to create branch
'fs2_open_3_6_9'.
2006-06-02 09:17:10 +00:00
Goober5000 7e41877b7b proper capitalization according to Volition 2006-04-20 06:32:30 +00:00
Goober5000 c635560a1c those were some bugs just waiting to happen 2006-03-30 04:18:40 +00:00
Goober5000 c8029346cd hehe, grammar
--Goober5000
2006-03-30 04:15:20 +00:00
taylor db8d3c01bb some FS2NetD fixes
- timer/timeout issues
 - keep server heartbeats to a minimum in order to save some bandwidth
 - clean up some debug message a little
2006-02-16 05:39:13 +00:00
Goober5000 64e86452d0 pare down the pragmas some more
--Goober5000
2006-01-26 03:23:30 +00:00
taylor d3481714d0 remove NO_NETWORK 2005-10-10 17:21:11 +00:00
Goober5000 c17c11b651 remove PreProcDefine #includes in FS2
--Goober5000
2005-07-13 03:26:00 +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
Goober5000 16a19c165c #pragma'd a bunch of warnings
--Goober5000
2004-11-18 00:05:37 +00:00
Kazan 864e1b5922 remove MCD complete 2004-07-26 20:47:56 +00:00
Kazan ca8d5ac051 nothing major 2004-07-18 04:07:26 +00:00
Kazan 428b3dcbc9 MCD - define _MCD_CHECK to use memory tracking 2004-07-12 16:33:09 +00:00
Kazan 8c4f1d075a fixed a typo in one of the fs2netd strings
played with WMCoolmon's hacked up escort list
2004-07-07 23:34:08 +00:00
Kazan 5e64177b98 FS2NetD: C2S Ping/Pong, C2S Ping/Pong, Global IP Banlist, Global Network Messages 2004-07-07 21:00:08 +00:00
Kazan 5f998b51b1 small multifix 2004-07-06 19:59:37 +00:00
Goober5000 c7e9c9934d got rid of all those nasty warnings from xlocale and so forth; also added comments
for #pragma warning disable to indicate the message being disabled
--Goober5000
2004-03-31 05:42:29 +00:00
Kazan 36fe0fdcd7 Disabled multithreaded TCP_Socket in favor of safer single threaded
FS2NetD doesn't kill the game on connection failure now - just gives warning message and effectively dsiables itself until they try to connect again
2004-03-09 17:59:01 +00:00
Kazan cf9e49bd01 more fs2netd stuff 2004-03-09 00:02:16 +00:00
Kazan d1be81e41b Lobby GUI screen restored 2004-03-08 22:02:39 +00:00
Kazan 275bc85169 Did, undo 2004-03-08 15:06:24 +00:00
Goober5000 7ef2ab2e39 Uber pass at reducing #includes
--Goober5000
2004-03-05 09:02:13 +00:00