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
88dce29920
Trunk sync r10550
...
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10551 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-11 19:22:12 +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
ac44f7c59d
Trunk Sync: r9193
2012-09-13 15:14:56 +00:00
The_E
fcbc4362b9
TRunk sync r8615
2012-03-15 12:11:58 +00:00
The_E
af9261af10
Trunk sync r8575
2012-03-05 11:53:22 +00:00
The_E
02d8bd64c4
Trunk sync r8545
2012-03-02 16:05:44 +00:00
Zacam
cb2e53c6c0
Trunk Sync: r8222-8225
2012-01-15 08:31:47 +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
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
1159c2111c
Trunk sync r7391
2011-07-30 21:49:42 +00:00
Zacam
34e02ce943
Trunk Sync - r6865
2010-12-19 06:05:54 +00:00
Zacam
76a427daae
Not changing anything here, but it is making this mess a whole lot easier to read. (feel free to disagree if you want)
2010-12-15 11:36:45 +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
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
Backslash
46fb02fb92
Backslash's "let's get this stuff into 3_6_9 as well" commit.
...
-gliding with thruster adjustments and speed cap
-glide_when_pressed control (right above bank_when_pressed)
-fixes to the thrusters sound and visuals while gliding
-don't show muzzle flashes in 1st person
-quick reticle for multitarget and asteroids
2007-12-28 02:10:38 +00:00
taylor
1180236c5a
remove NO_NETWORK
...
fix controlconfig so that axes can be set to joystick/mouse using the mouse (required when no joystick attached)
2005-10-10 17:14:31 +00:00
Goober5000
2a307d099a
CVS header tweaks
...
--Goober5000
2005-07-22 10:18:41 +00:00
Goober5000
12c90e780d
remove PreProcDefine #includes in FS2
...
--Goober5000
2005-07-13 02:50:53 +00:00
taylor
92b8c2d6ed
various compiler warning fixes (some of these from dizzy)
2005-07-07 16:36:58 +00:00
taylor
fbb630aa2d
ton of non-standard resolution fixes
2005-07-02 19:45:02 +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
wmcoolmon
a0a5b6261a
Removed FS2_DEMO defines that looked like they wouldn't cause the universe to collapse
2005-04-28 05:29:30 +00:00
taylor
14e7f76c3a
updated Linux joystick code that's a bit less insane speed wise
...
remove ability to build without joystick support, no reason to keep it around
fix unusable warning flag with libjpeg building
2005-04-17 05:38:29 +00:00
taylor
91e9fb4433
more NO_NETWORK/INF_BUILD goodness for Windows, takes care of a few warnings too
2005-03-02 21:24:48 +00:00
Kazan
3ed360e5b2
unbug the JS bug i caused --- kazan
2004-07-29 19:37:50 +00:00
Kazan
864e1b5922
remove MCD complete
2004-07-26 20:47:56 +00:00
Kazan
d00cd1bda7
i have absolutely nothing to say about that subject
2004-07-25 00:31:31 +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
401967dd9d
ubercommit - basically spelling and language fixes with some additional
...
warnings disabled
--Goober5000
2003-11-11 02:15:47 +00:00
Goober5000
7ba034c182
fixed some fiddly bits with scrolling and ui stuff
...
--Goober5000
2003-04-05 11:09:22 +00:00
unknownplayer
3a7cc9cc63
The big DX/main line merge. This has been uploaded to the main CVS since I can't manage to get it to upload to the DX branch. Apologies to all who may be affected adversely, but I'll work to debug it as fast as I can.
2003-03-18 10:07:06 +00:00
penguin
0c503be8d1
The big include file move
2002-08-01 01:41:11 +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
Zacam