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
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
ba68ceca3f
Trunk Sync: r9326 and set revision properties to this commit, tagged as 3.6.17 to eliminate any later fiddling or missing it for merge to Trunk.
2012-11-11 00:50:47 +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
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
4ab313e1b6
Trunk Sync - r7014
2011-02-14 17:03:01 +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
7a399e1db3
Trunk Sync - r5931. Updated build output filenames to 6, MSVC 6 project also outputs _ant (instead of _trunk) so as not to over-write Trunk build compiles.
2010-02-22 21:37:43 +00:00
portej05
8eb87b45b9
Trunk Sync for FS' EFF code
2009-09-03 14:20:46 +00:00
portej05
c1ef2b9f61
Trunk Sync
2009-08-28 11:58:32 +00:00
taylor
570e4cb1e6
make sure that a positive hull precentage doesn't hit 0 due to rounding error (Mantis #1720 )
2008-11-11 00:59:19 +00:00
turey
d5aa9ccba8
Bunch of stuff already in HEAD. Shouldn't break anything.
2007-12-20 01:57:45 +00:00
taylor
54e820b01c
cleanup of chcksum stuff (works properly on 64-bit systems now)
...
add chksum support for VPs, both a startup in debug builds, and via cmdline option (-verify_vps)
little cleanup in cmdline.cpp (get rid of the remaining "fix bugs" crap)
2007-04-11 18:21:23 +00:00
karajorma
1ef884683c
Fix bug whereby clients who were gliding can't jump out at the end of the mission. Remove a couple of magic numbers that looked at me the wrong way.
2007-04-05 16:49:21 +00:00
taylor
186bd01305
fix for network afterburner support, this one should be compatible with all previous versions
2006-07-13 22:08:10 +00:00
karajorma
270b84981e
Fix afterburner trails in multiplayer (Mantis 895)
2006-07-11 23:17:03 +00:00
taylor
f7e4a683a8
more big-endian fixage (seriously hope this is the last of it)
2006-07-06 21:54:59 +00:00
wmcoolmon
246cfcfa65
Codebase commit, most notably including objecttypes.tbl
2005-12-29 08:08:42 +00:00
taylor
819c13f658
more big-endian fixes
...
fix the totally retarded check I made for multi fighter beams (they really don't work right yet anyway) since it broke normal beams for clients
2005-12-22 04:35:04 +00:00
taylor
d3481714d0
remove NO_NETWORK
2005-10-10 17:21:11 +00:00
Goober5000
5fb5c7faf7
various code cleanups, tweaks, and fixes; most notably the MISSION_FLAG_USE_NEW_AI
...
should now be added to all places where it is needed (except the turret code, which I still
have to to review)
--Goober5000
2005-07-25 03:13:26 +00:00
Goober5000
c17c11b651
remove PreProcDefine #includes in FS2
...
--Goober5000
2005-07-13 03:26:00 +00:00
taylor
7f786136a6
s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
2005-04-05 05:53:25 +00:00
Goober5000
6c17ef09ab
clarified max hull/shield strength names and added ship guardian thresholds
...
--Goober5000
2005-03-27 12:28:35 +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
Goober5000
099d2700d0
multiple ship docking :)
...
don't tell anyone yet... check the SCP internal
--Goober500
2005-01-11 21:38:51 +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
Goober5000
1f27a82d03
made code more uniform and simplified some things,
...
specifically shield percentage and quadrant stuff
--Goober5000
2004-02-04 08:41:04 +00:00
Goober5000
458634292a
implemented the custom hitpoints mod
...
--Goober5000
2003-04-29 01:03:24 +00:00
Goober5000
c9ea61c266
fixed bug I inadvertently introduced by modifying SIF_ flags with sexps rather
...
than SF_ flags
--Goober5000
2003-01-18 09:25:42 +00:00
penguin
0c503be8d1
The big include file move
2002-08-01 01:41:11 +00:00
penguin
3463682f1a
Back-port to MSVC
2002-07-07 19:56:00 +00:00
penguin
663b3471b9
Volition sources -- warpcore CVS import
2002-06-03 03:26:03 +00:00
Zacam