scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-10 04:31:34 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity
10,347 Commits 63 Branches 1,530 Tags
032c19e8894069ffbf4be2bc4e731455238beb19
Commit Graph
50 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 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 47f3829aa4 Sync whitespace/formatting/comment purge differences from trunk to Antipodes. 
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@9568 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-11-25 18:40:14 +10:00
Zacam dc82a0c7f8 Trunk Sync: r9351 
You may see other sync's, but none have taken place during a live Feed Dump on Desert Bus!
 2012-11-17 23:47:11 +00:00
The_E 444fccf77a Make sure we actually have a valid campaign file before trying to do stuff with invalid pointers 2012-06-24 14:36:04 +00:00
The_E f02c973621 From eli2: Patch for Mantis 2608 (Adds "$Always Viewable:" setting to cutscenes.tbl) 2012-02-20 14:53:30 +00:00
Zacam 3a62c1bb23 From CommanderDJ: 
Introduces +Name identifiers for mainhall.tbl entries:
-	+Name identifiers only need to be added to the lo-res (640x480) entry of the mainhall. If you really must add a +Name to both res versions, the two resolutions must have the exact same name.
-	+Name identifiers are added immediately under the $Main Hall string
Vectorises Main_hall_defines, thus removing the MAIN_HALLS_MAX limit.
Main halls are now loaded based purely on campaign files. Hall indexes are no longer stored in the player struct, and thus this patch changes the pilot file version.
 2012-02-09 12:56:10 +00:00
Goober5000 06d3ba08be assigning an empty string is functionally equivalent to clearing the string, and is also compatible with MSVC6 2011-11-23 05:30:00 +00:00
The_E 8cf61ad24b Fixes possible null pointer issues when not using FS2 2011-10-28 13:41:22 +00:00
Echelon9 67eb406443 PVS-Studio: Fix V805. Decreased performance. It is inefficient to identify an empty string by using 'strlen(str) > 0' construct 2011-08-14 13:14:35 +00:00
The_E ac1b4951f2 Minor patch to address issue with custom mainhalls not loading for fresh pilots. I hate this one. 2011-03-26 13:29:35 +00:00
The_E c323582583 Fix for bug encountered in BP, From now on "0" is no longer a valid handle for bmpman slots 2011-02-18 15:22:28 +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
karajorma 466d3a2811 Couple of small changes to make the Standalone work again. 2008-07-07 08:46:17 +00:00
turey d5aa9ccba8 Bunch of stuff already in HEAD. Shouldn't break anything. 2007-12-20 01:57:45 +00:00
taylor 3f95d5d175 fix anothing something that Valgrind complained about 2007-10-28 16:45:05 +00:00
taylor 4dc5960af3 get rid of stale NO_JOYSTICK define 2007-04-11 14:59:35 +00:00
taylor a6eb16ec4c some CFILE cleanup and slight directory order reorg 
add cfopen_special() for quickly opening files that have already been found with cf_find_file_location_ext()
remove NO_SOUND
 2007-02-11 09:25:42 +00:00
taylor 75409481d0 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
Goober5000 7e41877b7b proper capitalization according to Volition 2006-04-20 06:32:30 +00:00
Goober5000 a9642a2a86 more tweaks, plus clarification of checks for the existence of files 
--Goober5000
 2006-02-13 00:20:46 +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 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
wmcoolmon 4e9bf0998a Dynamically allocated medals 2005-05-08 20:28:57 +00:00
taylor 2be5cedfa2 fix source/dest memory overwrite that Valgrind was complaining about 2005-04-21 15:51:40 +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
Goober5000 eac7c7ff45 brought weapon loadout banks into agreement with ship info banks 
improved error reporting on apply-to-all
--Goober5000
 2005-04-03 08:48:31 +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
taylor c70142a0c8 even more bm_unload() -> bm_release() changes 2005-02-23 04:57:29 +00:00
taylor 6f643adee8 don't use cfopen() for upgrade check, it was giving strange results 2004-12-30 16:25:22 +00:00
taylor 490a528103 make sure the file gets closed in pilot_file_upgrade_check() 2004-12-28 16:20:33 +00:00
taylor 984b747cb9 add a popup to make sure people know about pilot upgrade 2004-12-22 21:49:05 +00:00
taylor af97948745 new pilot code 2004-10-31 22:07:27 +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 86d041d581 well, let's see here... 
* persistent variables
* rotating gun barrels
* positive/negative numbers fixed
* sexps to trigger whether the player is controlled by AI
* sexp for force a subspace jump

I think that's it :)
--Goober5000
 2003-09-05 04:25:29 +00:00
wmcoolmon 13be53d104 Added error screens to the barracks and start screens when a pilot file can't be deleted 2003-08-20 08:11:28 +00:00
Goober5000 4e8174b0e8 fixed the tech room bug! yay! 
--Goober5000
 2003-03-03 04:28:37 +00:00
phreak cbc3f3fb09 fixed typecasting warnings 2003-02-16 18:55:59 +00:00
Goober5000 89d54e88db allowed for up to 256 main halls 
--Goober5000
 2003-01-14 04:00:16 +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 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