scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-11 04:31:35 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity
10,061 Commits 62 Branches 1,531 Tags
67cf5c31ee4e60c1fa33aed27e2bde55ba65152e
Commit Graph
62 Commits
Author SHA1 Message Date
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 05283a3cfa Trunk sync r8742 2012-05-03 08:26:41 +00:00
The_E 3c38ce4737 Trunk sync r 8066 2011-12-04 17:42:52 +00:00
Zacam 17b3c8be17 Trunk Sync r7677 2011-09-08 05:47:44 +00:00
The_E b725ff7e21 trunk sync r7657 2011-09-06 21:22:39 +00:00
Zacam 80e9420172 Trunk Sync - r7235 2011-06-07 02:33:03 +00:00
Zacam 5abaa37b7f Trunk Sync -r7002 2011-02-06 03:26:41 +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 88377709f3 This is more like it. These files diff'd as different than Trunk versions, so I over-rode them with Trunk versions so that Antipodes and Trunk can finally have some 1:1 parity. 2010-09-23 02:14:26 +00:00
Zacam 585281635d Trunk Sync - r4290 2010-09-22 22:39:29 +00:00
portej05 d8b132d846 Antipodes3 from Flaming_Sword 2009-09-12 16:03:52 +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 c2f5d325aa little bit of cleanup 2008-03-20 18:37:16 +00:00
WMCoolmon 7e7d77c8d7 *Drumroll* The official scripting system commit to the stable branch! 2008-03-15 08:56:43 +00:00
Goober5000 3c3416fa3b the great big duplicate model removal commit 2007-02-20 04:20:38 +00:00
Goober5000 321130465c remove obsolete and unused shield flag 2007-02-06 01:27:34 +00:00
taylor 806027e4e8 various small compiler warning and strict compiling fixes 2006-09-11 01:00:28 +00:00
taylor 8a9d540c4c make Species_info[] and Asteroid_info[] dynamic 2006-08-27 18:12:42 +00:00
taylor eda1a26a94 comment out some pointless checks which look for not using either D3D or OGL 
don't run through ships on level load setting up the sound environment if sound is disabled
minor cleanup
 2006-05-27 16:49:05 +00:00
Goober5000 7e41877b7b proper capitalization according to Volition 2006-04-20 06:32:30 +00:00
taylor a4bc040ddd various small cleanups, fixes, error checks 2006-03-05 21:45:12 +00:00
Goober5000 b52b6b1e00 spelling 2006-02-25 21:47:19 +00:00
wmcoolmon 246cfcfa65 Codebase commit, most notably including objecttypes.tbl 2005-12-29 08:08:42 +00:00
taylor d3481714d0 remove NO_NETWORK 2005-10-10 17:21:11 +00:00
Goober5000 374b2b21a0 another species overhaul 
--Goober5000
 2005-09-24 07:07:17 +00:00
taylor ab15d95854 gah, revert that since it was never going to work (not sure what I was drinking that day) 2005-09-18 23:06:17 +00:00
taylor 2a97e46c9b basic cleaning, removing old/useless code, sanity stuff, etc: 
- very minor performance boost from not doing stupid things :)
 - minor change to 3d shockwave sizing to better approximate 2d effect movements
 - for shields, Gobal_tris was only holding half as many as the game can/will use, buffer is now set to full size to avoid possible rendering issues
 - removed extra tcache_set on OGL spec map code, not sure how that slipped in
 2005-08-25 22:40:04 +00:00
Goober5000 2a307d099a CVS header tweaks 
--Goober5000
 2005-07-22 10:18:41 +00:00
Goober5000 2394e9801b remove PreProcDefine #includes in FS2 
--Goober5000
 2005-07-13 03:35:36 +00:00
Goober5000 5c6738a534 fixed a bunch of "issues" caused by me with the species stuff 
--Goober5000
 2005-07-13 02:01:30 +00:00
Goober5000 76d05268fd improved species support and removed need for #define 
--Goober5000
 2005-07-13 00:44:24 +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 405ba066b9 change min/max to MIN/MAX to fix GCC problems 
add lab stuff to Makefile
build unbreakage for everything that's not MSVC++ 6
lots of warning fixes
fix OpenGL rendering problem with ship insignias
no Warnings() in non-debug mode for Linux (like Windows)
some campaign savefile fixage to stop reverting everyones data
 2005-03-10 08:00:18 +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
Goober5000 cc85c92369 changed a bunch of transpose-rotate sequences to use unrotate instead 
--Goober5000
 2005-01-28 11:06:23 +00:00
taylor f21fcc0332 s/OGL_inited/OGL_enabled/g 2004-10-31 22:05:30 +00:00
taylor 1194082507 safer handling of missing shield ani 2004-10-09 17:51:23 +00:00
Kazan fa7c2dad07 wakka wakka - fix minor booboo 2004-08-20 05:13:08 +00:00
et1 3b9995c3d7 Disabled ship shield load check for TBP 2004-07-31 08:51:47 +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
phreak 8834f7297b really fixed opengl shields this time 2004-03-16 17:41:12 +00:00
randomtiger 8371056cc0 Commented out shield fix that broke shield rendering for D3D. 
Fix didnt appear to work for OGL so I didnt bother to if(OGL) it.
 2004-03-16 11:52:17 +00:00
phreak b3b539399d fixed a bug so that shields now render in Opengl HT&L 2004-03-08 22:01:29 +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 ffbbe7aff8 whew - I just went through all the code I ever added (or at least, that I could 
find that I commented with a Goober5000 tag) and added a bunch of Asserts
and error-checking
--Goober5000
 2004-01-30 07:39:09 +00:00
Goober5000 401967dd9d ubercommit - basically spelling and language fixes with some additional 
warnings disabled
--Goober5000
 2003-11-11 02:15:47 +00:00