Commit Graph
59 Commits
Author SHA1 Message Date
Zacam 5dc5f82e43 Trunk Sync r8897 2012-06-18 00:44:03 +00:00
The_E af9261af10 Trunk sync r8575 2012-03-05 11:53:22 +00:00
Zacam a068ae82f2 From Eli2: Corrects some issues with the last changes to the Main Hall code to allow compilation under linux. 2012-02-19 05:23:23 +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
Zacam f51b68afc3 Trunk Sync r7447 2011-08-10 14:14:07 +00:00
The_E 5e82657bf8 Fix issue with the tips popup popping up _every goddamn time, EVEN THOUGH I TOLD YOU NOT TO!_ 2011-04-16 09:19:51 +00:00
The_E ba09ace833 Okay, this one needs to be done properly at some point. For now, let us just assume that using Single-player mode by default is the right thing to do. 2011-04-13 14:51:40 +00:00
Zacam 35c7cf3514 Fixes the index for Player Main Hall. Still not saving (or being read) by CSG properly despite tripping breakpoints set on the cfread/cfwrite on the flags for main_hall. 2010-12-27 22:54:50 +00:00
Zacam 0edd54cf19 Potential fix for reported mainhall issues. Caused by my own commit 6677 and only partly corrected for in 6692. (note: I'm unable to reproduce the reported issues, so it's anybodies guess) 2010-12-16 23:52:39 +00:00
Zacam 1a7298e0d5 Mantis 2354: Barracks can now be used to switch between Single/Multi Gameplay. 2010-12-16 05:58:50 +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 cbd55626f4 Quick fix. (Would have helped if I had saved the file prior to commit) 2010-12-12 23:55:29 +00:00
Zacam d86f450c55 Antipodes 8: New Pilot code, from taylor. 2010-12-12 23:53:05 +00:00
Zacam 89a8c659d1 Trunk Sync -r6694 2010-10-27 18:33:32 +00:00
Zacam b33234ab29 Trunk Sync - r6677 2010-10-25 00:25:52 +00:00
Zacam 585281635d Trunk Sync - r4290 2010-09-22 22:39:29 +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
Goober5000 47060c5c9b add warning system for mods with bad data files 2009-04-08 04:58:12 +00:00
taylor 36ac0cb908 make sure that we don't re-save a deleted pilot in the barracks (Mantis #1794)
fix pilot deletion proceedure to not provide useless failure handling (if it fails to delete once, it will fail every time)
2008-10-16 00:41:35 +00:00
taylor 0253d298e9 only load tbls from tables/ (Mantis #1725) 2008-10-13 06:34:48 +00:00
Goober5000 05769b3ffe fixed "bastion" debug console command to work for all main halls
added "medals" debug console command for testing
2008-10-12 19:44:06 +00:00
WMCoolmon 48d8f030b3 Better compatibility with avoiding the main hall 2008-08-30 10:57:27 +00:00
taylor 79575d02be fix a bug that would crash after hitting ESC and trying to load a pilot (Mantis #1513)
some minor formatting cleanup
2007-10-28 16:38:13 +00:00
Goober5000 6ab0b17acc added fixes for #1415 and #1483, made sure every read_file_text had a corresponding setjmp, and sync'd the parse error messages between HEAD and stable 2007-09-02 02:10:29 +00:00
taylor 5bd646efd7 re-fix this crap that I managed to break last time (was Mantis bug 1066 I think) 2006-10-01 19:22:15 +00:00
taylor 70641cc958 fix for deletion of multiplayer pilots (Mantis bug #1066) 2006-09-24 13:32:11 +00:00
Goober5000 7e41877b7b proper capitalization according to Volition 2006-04-20 06:32:30 +00:00
taylor e35065bc0d remove all of the *_ex() parsing functions added for use by EFFs
add a pause/unpause for parsing so that we can safely start parsing something new then continue parsing something old
make Mission_text and Mission_text_raw only use the memory needed, and free it when it doesn't need to parse anymore
  (should work ok with FRED2, but I wasn't able to test it)
2006-04-14 18:44:16 +00:00
taylor c6274f2ffc fix for string overwrites with get_version_string() 2005-12-06 03:14:45 +00:00
taylor d3481714d0 remove NO_NETWORK 2005-10-10 17:21:11 +00:00
taylor dc87987f6f well that was rather stupid of me, this would crash if old + new pilots went over MAX_PILOTS 2005-08-09 10:06:47 +00:00
Goober5000 2a307d099a CVS header tweaks
--Goober5000
2005-07-22 10:18:41 +00:00
Goober5000 c17c11b651 remove PreProcDefine #includes in FS2
--Goober5000
2005-07-13 03:26:00 +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
taylor 57473d6996 more demo support (Jens Granseuer) 2005-04-12 19:22:48 +00:00
taylor 7f786136a6 s/vector/vec3d/g, better support for different compilers (Jens Granseuer) 2005-04-05 05:53:25 +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
taylor 0bf7ee01dc merge with Linux/OSX tree - p0131-2 2005-01-31 23:27:55 +00:00
taylor 984b747cb9 add a popup to make sure people know about pilot upgrade 2004-12-22 21:49:05 +00:00
taylor 4ee06b9d79 fix old V bug when cancelling the pilot select screen 2004-12-05 23:47:18 +00:00
taylor c9e0491b23 new pilot code support, no-multiplayer and compiler warning fixes, center mouse cursor for redalert missions 2004-10-31 21:53:24 +00:00
Kazan 864e1b5922 remove MCD complete 2004-07-26 20:47:56 +00:00
taylor e574e9f732 various OGL and memory leak fixes 2004-07-17 18:46:09 +00:00
Kazan 428b3dcbc9 MCD - define _MCD_CHECK to use memory tracking 2004-07-12 16:33:09 +00:00
taylor 780c43a94e runtime language selection, mantis:0000133 2004-03-28 17:49:55 +00:00
Goober5000 7ef2ab2e39 Uber pass at reducing #includes
--Goober5000
2004-03-05 09:02:13 +00:00
bobboau e050aa42c3 pluged memory leaks,
3D HTL lasers (they work perfictly)
and posably fixed Turnsky's shinemap bug
2004-02-20 04:29:57 +00:00