Commit Graph
65 Commits
Author SHA1 Message Date
Zacam bda6e7b7e3 Sync Drift: Apparently still some lingering ifdefs for OEM/Multiplayer_Beta and non-AP specific things not having made it to trunk for some reason. 2011-09-25 08:26:45 +00:00
Zacam 6b122a7973 Karajorma's "Clean up" code. (Not for credit, but because I'm trying to reduce the "open" number of "Code Reviews" so that we don't get too backlogged with them)
http://www.hard-light.net/forums/index.php?topic=74066.0
2011-02-03 07:41:16 +00:00
Zacam 08c0adfd8b Resolves LNK4221 under MSVC. multi_oo and psnet are not actually linked/used, so references pointing to them now go to multi_obj and psnet2 respectively. (Same as Antipodes 6881)
http://www.hard-light.net/forums/index.php?topic=73147.0
2011-01-30 05:59:36 +00:00
taylor 1e4b0665d2 various FS2NetD fixes:
- increase sleep time during reconnect
 - better handling of disconnects from connection errors
 - proper disconnect in case of login failure
 - log stats request calls
 - don't try to read stats from packet when there aren't any to read
 - allow proper connection resetting with standalone
 - change auto-reconnect timeout from 30 minutes to 5
 - count server traffic among activity instead of just client traffic
 - reduce uneccessary client->server traffic
2010-08-03 08:22:02 +00:00
portej05 aeab521d02 Fix for issues caused by memset and _HAS_ITERATOR_DEBUGGING.
Some ugliness involved (placement new - yuck!), however given that a lot of our structures are allocated with vm_malloc, I haven't got a better way around this at present.
2009-11-13 18:06:27 +00:00
portej05 6bc7f30d78 safe_strings - from Antipodes build #1 2009-07-27 16:06:24 +00:00
portej05 2a09ecc89b 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 eeb30aa582 Bobboau's Skybox flags code (via Wanderer then me) 2009-05-21 14:57:33 +00:00
Wanderer 78aedf81ae merge from wanderer branch - alt iff colors 2009-05-19 21:17:48 +00:00
karajorma a6cab00337 Commit Wanderer's Salvo Fire mode changes. 2009-05-16 19:41:05 +00:00
karajorma 4136560308 Commit the SEXP packet code.
Add the set-respawns SEXP.
2009-05-15 18:32:46 +00:00
Goober5000 57cab322b4 add apostrophes to contractions, lol 2009-04-10 07:49:12 +00:00
karajorma 0f8d554369 Fix Mantis 1838 (Latency information obscures the messaging menu) 2009-03-15 17:19:45 +00:00
Wanderer 9597b33967 add 'missing' casts 2009-03-06 15:08:16 +00:00
karajorma 557f32bf20 Get rid of the ping message when the HUD is turned off 2009-01-15 21:33:32 +00:00
taylor 74ffc7face 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 1379b79ccd no magic numbers 2008-10-05 13:19:13 +00:00
taylor 6167768616 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 f1f4084de1 Final scripting, camera code updates. 2008-08-30 11:05:48 +00:00
taylor 68293d8c96 some minor mprintf() cleanup 2008-03-28 03:32:38 +00:00
taylor 11ca1ef4a8 move stable branch to the primary under trunk 2008-03-16 16:25:19 +00:00
taylor eb8c44c2a0 move HEAD to it's own dir under trunk 2008-03-16 16:21:11 +00:00
WMCoolmon 7ac8ccf326 Camera code 2008-03-15 20:31:57 +00:00
Goober5000 4811257f31 revert the directory move 2008-02-09 21:33:46 +00:00
Goober5000 8909d048b3 remove extraneous fs2_open folder from all branches and tags 2008-02-09 19:21:05 +00:00
karajorma 97fa6218d3 Hmmm. Forgot to commit changes to support network variables and setting ammo/weapons to HEAD as well as 3.6.9.
Also add Juke's bug fix for streaming weapons.
2007-01-15 13:40:38 +00:00
taylor fe803ffa25 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 9f77c108e7 Fix bug where end-mission SEXP only resulting in the mission ending for the server 2006-08-04 11:45:21 +00:00
karajorma 4bed1abc2e Added the VARIABLE_UPDATE packet to send sexp variable value changes to client machines. 2006-06-02 09:10:02 +00:00
Goober5000 67e8f94a93 proper capitalization according to Volition 2006-04-20 06:32:30 +00:00
Goober5000 acf908dc58 those were some bugs just waiting to happen 2006-03-30 04:18:40 +00:00
Goober5000 e77da0c908 hehe, grammar
--Goober5000
2006-03-30 04:15:20 +00:00
taylor d04ee2f2e0 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 2f9af7b19c pare down the pragmas some more
--Goober5000
2006-01-26 03:23:30 +00:00
taylor 95e056f6fd remove NO_NETWORK 2005-10-10 17:21:11 +00:00
Goober5000 d62d659bf4 remove PreProcDefine #includes in FS2
--Goober5000
2005-07-13 03:26:00 +00:00
taylor 9ce18ac6e5 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 b1128630e4 merge with Linux/OSX tree - p0204-2 2005-02-04 20:06:10 +00:00
Goober5000 6e5ee3312d #pragma'd a bunch of warnings
--Goober5000
2004-11-18 00:05:37 +00:00
Kazan 89e6af4fb5 remove MCD complete 2004-07-26 20:47:56 +00:00
Kazan e9a29ac2e6 nothing major 2004-07-18 04:07:26 +00:00
Kazan f7dd512ba8 MCD - define _MCD_CHECK to use memory tracking 2004-07-12 16:33:09 +00:00
Kazan e2b8ce4d5d 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 13ee198069 FS2NetD: C2S Ping/Pong, C2S Ping/Pong, Global IP Banlist, Global Network Messages 2004-07-07 21:00:08 +00:00
Kazan a1903268ad small multifix 2004-07-06 19:59:37 +00:00
Goober5000 f43da62c3e 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 685880a7b6 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 9010d21b32 more fs2netd stuff 2004-03-09 00:02:16 +00:00
Kazan 04e34810e0 Lobby GUI screen restored 2004-03-08 22:02:39 +00:00
Kazan 30ae2da9cd Did, undo 2004-03-08 15:06:24 +00:00