Commit Graph
92 Commits
Author SHA1 Message Date
The_E 0c222afeb0 Trunk sync r9353 2012-11-18 12:34:24 +00:00
CommanderDJ 1d30cfd0bb Trunk rev 8768: Patch for Mantis 2650 (Allow 0 door animations in mainhall.tbls/tbms) 2012-05-11 17:06:33 +00:00
The_E cc7a648fac Trunk sync r8766 2012-05-10 10:03:39 +00:00
The_E 05283a3cfa Trunk sync r8742 2012-05-03 08:26:41 +00:00
The_E 45bd1d1d99 Trunk sync r8679 2012-04-15 11:41:31 +00:00
The_E 49819d2f4f Remove two unused function stubs 2012-03-31 14:29:38 +00:00
The_E fcbc4362b9 TRunk sync r8615 2012-03-15 12:11:58 +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 35e8ea59b0 Anomalous whitespace/tab and alignment cleanup. 2012-02-11 01:42:28 +00:00
Zacam 0f5843860b From CommanderDJ: The Pièce de résistance, MainHall.tbl is now modular. 2012-02-11 01:36:21 +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 4236636365 Trunk Sync: r8287, r8291-8295 2012-01-22 02:09:35 +00:00
Zacam 0ff43753cf Trunk Sync: r8265-8267 2012-01-20 02:26:25 +00:00
The_E 4da4d0f682 Trun 8117 - 8120 need to be here as well 2012-01-05 22:57:00 +00:00
The_E 9f209d5d5d Trunk sync r8131 2012-01-05 22:49:11 +00:00
The_E 8e06b279f9 Trunk sync r8112 2011-12-24 16:22:50 +00:00
Zacam 832999fbbd Trunk Sync r8104 2011-12-21 08:52:59 +00:00
The_E ffc14f5d9e Trunk sync r8082 2011-12-13 16:23:01 +00:00
The_E 400383f901 Removing the nonfunctional demo code, part 2 2011-02-13 20:42:20 +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
Zacam 1e6030d5a1 Trunk 6789 - Goober5000 - bump number of misc anims to 32 2010-11-27 00:14:23 +00:00
Zacam 44ba6b9306 Trunk Sync - r6787 2010-11-26 01:52:39 +00:00
portej05 d1a1f39974 Trunk Sync 2009-11-03 08:21:16 +00:00
portej05 d8b132d846 Antipodes3 from Flaming_Sword 2009-09-12 16:03:52 +00:00
portej05 b981f4147f Trunk Sync 2009-09-12 15:18:09 +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 6e4021888d add apostrophes to contractions, lol 2009-04-10 07:49:12 +00:00
taylor 0253d298e9 only load tbls from tables/ (Mantis #1725) 2008-10-13 06:34:48 +00:00
taylor fcb28b51f1 better error handling for when TCP socket is already in use (Mantis #1626)
fix missing protocol XSTR that used the wrong tstring for display
2008-10-05 01:17:45 +00:00
WMCoolmon 48d8f030b3 Better compatibility with avoiding the main hall 2008-08-30 10:57:27 +00:00
taylor 4404a3bfd6 remove storybook, since the fiction viewer makes it obsolete 2008-03-20 18:55:16 +00:00
taylor 8bf5f5b86a enable PXO lobby by default 2008-02-23 19:59:33 +00:00
taylor c4601e8bb1 fix campaign is missing then give player choice to switch campaigns, switch pilots, or exit 2007-11-22 05:23:44 +00:00
Goober5000 c4cbd89641 recognize a Vasudan main hall even when it isn't the second one; play the appropriate music as soon as the main hall switches 2007-11-20 01:11:13 +00:00
taylor c5235c6428 FS2NetD v.2 (still a work in progress, but is ~98% complete) 2007-10-15 06:43:23 +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
Goober5000 11982ffc72 fixed up some error messages 2007-04-03 01:39:31 +00:00
taylor 32361c79ee be sure to page in textures for change ship class sexp preload
add a ASF_MENUMUSIC type for things that aren't mission-based event music (since that is handled differently now)
make event music keep extension if it exists, so that the special data will be accurate
bits of cleanup from old MS code that we don't need
2007-03-22 20:35:45 +00:00
taylor d1aab3866a remove NO_SOUND 2007-02-10 00:18:22 +00:00
Goober5000 a5135b1d7a improve error message 2006-11-05 18:41:40 +00:00
karajorma a710004cde Fixing some ugliness when the popup appears 2006-10-01 08:34:43 +00:00
taylor 6ab6cd71ce fixes for stuff_string() bounds checking 2006-09-11 01:17:07 +00:00
taylor 72b358630f crap, there was supposed to be a multi check there 2006-08-29 21:32:25 +00:00
taylor 3fcf521f96 quite a few fixes to handle missing campaigns better
change load order for campaign loading to a full check: Player-specified -> BUILTIN_CAMPAIGN -> First Avaiable.
clean up the getting of a list of available campaigns
fix simroom issue where single missions, with the [V] icon, would display wrong (this was a retail bug, but it doesn't show normally)
fix bug where, if a campaign failed to load, it would still appear available for savefile useage
fix bug where, when resetting the campaign info, the num_missions var wasn't 0'd and it could cause a sexp Assert() during reset
2006-08-27 18:11:37 +00:00
Goober5000 edf5648e70 fix for Mantis #750
--Goober5000
2006-05-21 22:57:30 +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
Goober5000 cbc8ae14ca not needed... and just an annoyance with > 2 main halls 2006-03-01 04:01:15 +00:00