Commit Graph
160 Commits
Author SHA1 Message Date
Goober5000 dd438fb032 recognize a Vasudan main hall even when it isn't the second one; play the appropriate music as soon as the main hall switches
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4325 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:07 +10:00
phreak c4ce741093 'phreak' is now all lowercase (and has been for some time now)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4292 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:06 +10:00
Goober5000 d68a225582 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
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4251 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:04 +10:00
Goober5000 ef8aaa498f fixed up some error messages
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4095 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:56 +10:00
taylor 8ea4793841 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
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4077 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:55 +10:00
taylor 2f0bd47bae fix simroom crash bug from Goober's rencent change add NULL handling to make sure we don't crap out on sorting
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3978 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:51 +10:00
taylor 1aa75f7edd remove NO_SOUND
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3962 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:50 +10:00
wmcoolmon fb94960327 WMC codebase commit. See pre-commit build thread for details on changes.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3821 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:42 +10:00
Goober5000 d4242fee13 improve error message
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3685 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:38 +10:00
taylor b6ee2a4f82 fix for the "branch" bug (still a minor usability issue however, see Mantis bug for details) add a popup to the loopbrief screen when you press ESC, so that we can either accept or decline the loop offer
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3616 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:36 +10:00
taylor d7d5107a86 re-fix this crap that I managed to break last time (was Mantis bug 1066 I think)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3614 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:36 +10:00
taylor de2fbfb48d fix for deletion of multiplayer pilots (Mantis bug #1066)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3591 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:35 +10:00
taylor 471b758539 fixes for stuff_string() bounds checking
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3549 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:34 +10:00
taylor baa43c4331 fixes for stuff_string() bounds checking make sure that default entries always get used in techroom if they don't otherwise have the techroom visibility flag fix crash bug where the first entry in the various lists wasn't ever initialized if there is no ship/weapon/intel info to show
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3543 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:33 +10:00
taylor 01dd0cf6d3 crap, there was supposed to be a multi check there
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3539 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:33 +10:00
taylor 6ed629949b 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
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3535 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:33 +10:00
wmcoolmon f2ebe77471 Allow use of the techroom, even if no current campaign exists.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3484 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:31 +10:00
taylor 9522e2fbba remove -allslev make CTRL-SHIFT-S hotkey work in mission simulator (it's a toggle, so you can turn it on or off while on the screen) fix a bug where blank lines would show up in the campaign list for branch/alternate type missions that are otherwise marked as not completed
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3315 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:25 +10:00
Goober5000 2018c5eb3f unremove the storybook for now, but it will probably be replaced with a more complete version in a week --Goober5000
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3280 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:23 +10:00
Goober5000 0e9983d8ef remove the storybook for now
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3278 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:23 +10:00
taylor cb7ca8e3f0 fix various compiler warnings and things that Valgrind complained about
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3269 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:22 +10:00
karajorma 2dfa7cb8aa Should be here too
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3236 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:21 +10:00
Goober5000 eb62ad1738 update credits
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3189 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:20 +10:00
taylor 554197fc30 comment out some code which used only if neither D3D nor OGL 2006-05-27 16:59:05 +00:00
Goober5000 edf5648e70 fix for Mantis #750
--Goober5000
2006-05-21 22:57:30 +00:00
taylor a39e8900e1 minor cleanup and a couple extra error checks
get rid of some wasteful math from the gr_set_proj_matrix() calls
2006-05-13 07:09:25 +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 6930e3eb6a make sure the mission log doesn't modify stuff in Cargo_names[], since it shouldn't
have split_str_once() be sure to not split a word in half, it should end up on the second line instead
2006-03-19 05:05:59 +00:00
Goober5000 cbc8ae14ca not needed... and just an annoyance with > 2 main halls 2006-03-01 04:01:15 +00:00
Goober5000 53e55777f7 cool stuff with main hall music tracks 2006-02-28 06:59:28 +00:00
Goober5000 b52b6b1e00 spelling 2006-02-25 21:47:19 +00:00
taylor d0f071692f swap order of pilot read and reset-to-defaults so that the various entries in the pilot file don't get clobbered needlessly 2006-01-13 08:27:43 +00:00
wmcoolmon 246cfcfa65 Codebase commit, most notably including objecttypes.tbl 2005-12-29 08:08:42 +00:00
taylor 4c906966a3 allow the show-all hotkey to work on all techroom tabs
address a couple of possible memory leak issues that could have come up in the future
2005-12-21 08:24:51 +00:00
taylor 4fd616b2c5 cleanup some debug log messages:
note that a nprintf() with "Warning" or "General" is basically the same thing as mprintf()
  make sure that OpenAL init failures always get to the debug log
2005-12-06 03:17:48 +00:00
taylor c6274f2ffc fix for string overwrites with get_version_string() 2005-12-06 03:14:45 +00:00
wmcoolmon 15b30e3177 Final commit of codebase 2005-12-04 19:07:49 +00:00
wmcoolmon 9e9afefeb8 Slightly better main hall error handling 2005-12-04 19:06:01 +00:00
wmcoolmon 416bfa7372 Better weapon handling for techroom (more dynamic-limits friendly) 2005-12-04 19:05:06 +00:00
wmcoolmon 4c50d3de10 no message 2005-11-27 23:54:13 +00:00
taylor 3c2f9cd4c2 add a bunch of Assert()'s and NULL checks to either help debug or avoid errors
fix Mantis bug #381
fix a small issue with the starfield bitmap removal sexp since it would read one past the array size
2005-10-30 20:03:40 +00:00
wmcoolmon 07cd84e050 Display a special dialog if the player tries to continue a campaign with no missions 2005-10-30 19:22:31 +00:00
wmcoolmon b00f5f9a55 Hardened cfile against array overflows 2005-10-16 23:15:47 +00:00
taylor d3481714d0 remove NO_NETWORK 2005-10-10 17:21:11 +00:00
taylor dca7e3f5a9 fix screen update of pilot list when you delete one of them 2005-09-22 19:16:48 +00:00
wmcoolmon b413343c63 Fixed techroom crash if there are no entries to display; removed
unneeded MULTIPLAYER_BETA_BUILD define that disallowed supercaps
2005-09-20 04:37:01 +00:00
taylor 1f505cdbdb when changing a campaign in the campaign room make sure that the mainhall is properly set without having to play a mission first 2005-09-16 02:51:54 +00:00
taylor def6915ae6 fix mouse position setting in non-standard resolutions 2005-09-06 17:26:39 +00:00
taylor 63f6c54661 Address a couple of pilot code issues
- make the same MAX_PILOTS in the barracks that the playerselect screen has since it's a problem here too
 - add a -1 check for ship/weapon name lookups to avoid bounds issues.  NOTE: this can empty the techroom of entries if ithits this check, but it won't crash :)
2005-08-18 01:15:41 +00:00