Commit Graph
42 Commits
Author SHA1 Message Date
asarium 2d47bcd9ad Replace Sleep with os_sleep 2015-06-03 16:20:39 +02:00
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
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
chief1983 31f014ed5c Trunk sync r9456 2012-12-21 21:02:47 +00:00
Valathil 501d62db8b From Eli2: Replaced memset of player struct with reset(). Fixes random multi crashes. 2012-12-15 18:31:58 +00:00
Zacam 31ccffef1c Trunk Sync r7853 2011-10-03 11:28:19 +00:00
The_E b725ff7e21 trunk sync r7657 2011-09-06 21:22:39 +00:00
Zacam ad3b01c2f2 Trunk Sync r7563 2011-08-29 00:21:43 +00:00
Zacam f51b68afc3 Trunk Sync r7447 2011-08-10 14:14:07 +00:00
The_E 08063525c7 trunk sync r7363 2011-07-20 18:07:56 +00:00
The_E cb2a15ad1a Trunk sync r6711 2010-11-05 00:47:58 +00:00
Zacam 1e4b61547c Trunk Sync - r6684 2010-10-25 04:09:33 +00:00
Zacam 585281635d Trunk Sync - r4290 2010-09-22 22:39:29 +00:00
portej05 963d965699 Trunk Sync pending Zacams changes 2009-10-26 09:16:42 +00:00
portej05 c1ef2b9f61 Trunk Sync 2009-08-28 11:58:32 +00:00
portej05 aaf3a9bf09 safe_strings changes 2009-07-26 05:15:24 +00:00
taylor 737496d65c bump buffer to allow for more tables (99 minimum) during validation 2009-07-22 02:21:24 +00:00
portej05 6a8d45c93d Replace most instances of std::vector with SCP_vector. Memory is now all run through vm_malloc and vm_free.
Watch it go up AND down in mission.
2009-07-11 07:07:57 +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
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 ee57fa59ca make sure that we reset the state properly after an ident failure (Mantis #1735) 2008-10-07 16:28:22 +00:00
taylor 27f2f168dc fix fs2netd shutdown/cleanup code to work better (gets rid of various little issues) 2008-10-06 05:52:25 +00:00
taylor beafe688bb don't really need to bother with MAX_SERVERS any longer since it's ultimately dynamic 2008-10-06 05:51:20 +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 6c255cf1c9 fix HB being sent after server disconnect (made games show up for up to 10 minutes after they had ended)
make the chat channel count update more than once, since that didn't appear to work very well
fix compile error with GCC 4.3
2008-07-10 05:10:31 +00:00
taylor 0c1d218fb4 fix compiling on F9 (per the standard, limits.h isn't implicitly included) 2008-06-19 04:36:26 +00:00
taylor 14d88eef33 make table crc spew use the proper table list 2008-05-03 04:46:42 +00:00
taylor f7422e1aee add missing break statement to get rid of unidentified packet message 2008-05-03 04:45:17 +00:00
taylor 8103398fbf some stats fixage 2008-05-03 04:44:22 +00:00
taylor 2899799bfa add a timeout for getting pilot info (part of Mantis #1652) 2008-04-03 03:35:26 +00:00
taylor acae6f5c18 bah, that wasn't supposed to hit just yet 2008-03-21 04:47:13 +00:00
taylor 6aa46ca8d2 update to newest FS2NetD client code 2008-03-20 21:29:41 +00:00
taylor 5dd83bf9b4 better checks for connect() errors, since the select() test can pass by mistake 2008-03-20 17:47:02 +00:00
karajorma 143395f9d9 Don't output the password in the multi.log 2008-03-08 15:32:10 +00:00
taylor 14dfe07f77 re-enable support for multi.cfg options
fix bug where a ping/pong issue would create a bad state loop due to static vars not getting reset
clean up ADD/GET_STRING to work a bit better/safer
2008-02-23 20:16:18 +00:00
taylor e1a896fa88 use the less dumb method 2007-11-22 05:04:07 +00:00
taylor 210e5162a7 Oops, forgot that the v.2 daemon is still on the secondary IP :) 2007-10-15 08:18:33 +00:00
taylor c5235c6428 FS2NetD v.2 (still a work in progress, but is ~98% complete) 2007-10-15 06:43:23 +00:00