Commit Graph
8708 Commits
Author SHA1 Message Date
Fabian Woltermann eab9fab9ca Further, non-multi-breaking changes as suggested by MageKing17. 2015-10-13 09:11:36 +02:00
Fabian Woltermann 92ace8e983 Further comment tweaks 2015-10-08 09:49:48 +02:00
Fabian Woltermann d3df7ef2b1 Adds explanatory comments and applies the same logic to the net signature overload. 2015-10-05 08:08:46 +02:00
The E 99306be6cf Amendment based on Kara's feedback. Should allow same behaviour in both SP and MP. 2015-10-04 12:23:35 +02:00
The E 6835d2bf9f Only remove the player ship from the arrival list in singleplayer 2015-10-03 22:15:57 +02:00
MageKing17 415f113f4d Merge pull request #366 from The-E/ciws
Fixes the logic surrounding the ciws flag
2015-10-02 13:54:52 -07:00
The E 9f94568d2f Slightly increases the length limit for tech descriptions. 2015-10-02 20:37:04 +02:00
The E ad4fed744e Normalizes the logic to work the same way in both cases 2015-10-02 20:22:51 +02:00
The E 0a081fb292 Fixes the logic surrounding the ciws flag 2015-10-02 19:33:09 +02:00
Fabian Woltermann efa5dc9620 Merge pull request #364 from Goober5000/background_bitmaps_tweak
made background sexp errors less fatal
2015-10-01 18:18:24 +02:00
Goober5000 bfb4db1dd4 made background sexp errors less fatal 2015-09-30 23:36:47 -04:00
DahBlount d52e27dcc4 Move debug warnings to optional_string()
Only check if we actually set a value for min or max damage.
2015-09-30 13:54:18 -06:00
DahBlount 3bbabea978 Add additional checks to min/max damage code
This checks the damage attenuation code for have a parameter being set
to 0.0f before hand to prevent debug warnings.
2015-09-30 13:19:10 -06:00
Goober5000 edc806897f cfclose() will hit an assertion if we try to close a null pointer 2015-09-30 15:03:00 -04:00
MageKing17 f32a6e7ab9 Merge pull request #359 from ln-zookeeper/fotg_to_master
Make the array bounds check actually work
2015-09-25 12:30:14 -07:00
Lari Nieminen 2e9b2de40a Make the array bounds check actually work 2015-09-24 09:25:59 +03:00
MageKing17 69ab8c179d Merge pull request #357 from Goober5000/fiction_viewer_conditional_support
Fiction viewer conditional support
2015-09-23 16:14:46 -07:00
Goober5000 37657fc537 oh rubbish 2015-09-23 18:39:51 -04:00
Goober5000 1a5a0d6a7f change an Error to an Assertion, and made Fiction_viewer_text use nullptr instead of NULL 2015-09-23 18:38:34 -04:00
MageKing17 89a6d69e08 Voice recognition cleanup based on Mantis #2373 patch.
* Frees cpAudio pointer in VOICEREC_deinit()
* Validates that the ship/wing can actually take orders, and validates that it can take the specific order in question before trying to send it.
* Reports the confidence of the voice match if DEBUG_ON is set.
* Various commenting changes based on the patch.

Not included: using confidence to discard voice matches that fall below a certain confidence level. I haven't noticed a tendency towards spurious matches, and I didn't want to introduce this without additional data, especially when it might cause problems for people with different accents (and ESPECIALLY without a setting to tweak the threshold value, which the original patch did not have; it was hardcoded at 90%).
2015-09-23 14:10:02 -07:00
Goober5000 b59c015df2 fix a subtle bug caught by Travis 2015-09-22 21:32:19 -04:00
Goober5000 c90db8c498 Merge pull request #314 from MageKing17/cleanup/fred-save-refactor
Refactor mission saving to avoid duplicate code.
2015-09-22 21:19:23 -04:00
Goober5000 cc79554f7a keep track of the active stage via index rather than via pointer because the vector may be resized 2015-09-22 20:39:37 -04:00
Goober5000 3df6bb82db add basic conditional support to fiction viewer stages 2015-09-22 20:17:31 -04:00
Goober5000 56a9391e31 some const-correctness 2015-09-22 19:02:10 -04:00
niffiwan bc5b7e6906 Merge pull request #355 from ln-zookeeper/l_cf_get_path_id_buf_fix
Fix possible out of bounds array access
2015-09-22 19:13:01 +10:00
Lari Nieminen 6dc3d67905 Fix possible out of bounds array access
If the input string is "/", then buf[-1] would get accessed and in rare cases also modified.
2015-09-22 11:43:20 +03:00
Goober5000 0d1764d42e Merge pull request #353 from Yarn366/per_mission_ui_backgrounds
Per-mission UI backgrounds
2015-09-21 17:02:03 -04:00
Goober5000 5fb98551c9 collision optimization: two objects which do not move will never collide with one another 2015-09-21 16:30:19 -04:00
Yarn366 5f58aaa392 Merge branch 'master' into per_mission_ui_backgrounds 2015-09-20 21:05:46 -04:00
Yarn366 484be09275 Added support for custom fiction viewer backgrounds. Also moved the $UI parameter so it occurs just before the $File parameter. 2015-09-20 15:59:29 -04:00
m!m 26e65cc9e5 Merge pull request #350 from niffiwan/headzlessIII
Reduce bmpslot usage by headz
2015-09-19 12:49:11 +02:00
niffiwan 0132e2a320 Fix comment for HudGaugeTalkingHead::render 2015-09-19 18:55:30 +10:00
Yarn366 873694eae2 Added unified functions for loading and saving custom UI backgrounds 2015-09-19 04:47:11 -04:00
MageKing17 835c4a7d0e Make script_state::UnloadImages() call bm_release instead of bm_unload.
Should result in reduced BMPMAN slot usage with certain scripts as bm_unload() unloads the image data but holds on to the slot, while bm_release() releases the slot.
2015-09-18 21:22:07 -07:00
Yarn366 f0c0d60a11 Fiction viewer UI can now be set in mission files and game_settings.tbl 2015-09-18 21:51:24 -04:00
niffiwan 12f4bcfd9b Reduce bmpslot usage by headz
As headani's (both ANI & EFF) are streamed there's no need to have
the anim data in bmpman, the streaming code does that with only two
slots, rather than one slot per ani frame
Also fix a "leak" in the streaming code use of bmpman slots. i.e. each
time a message was played another slot would be used & not released
2015-09-18 19:34:28 +10:00
niffiwan 30c8d09c55 Merge pull request #349 from MageKing17/bugfix/for-counter-double-free
Fix double-free with for-counter (introduced by myself).
2015-09-17 13:06:06 +10:00
MageKing17 53f7f493cf Merge pull request #335 from ln-zookeeper/fotg_to_master
Fixed the $On Ship Arrive hook code as per issue #334 and PR #333
2015-09-16 19:58:01 -07:00
MageKing17 24b0b28f6a Fix double-free with for-counter (introduced by myself).
In 9ec10dd I thought I was fixing a memory leak, but the actual scenario was that the freeing was just delayed until later. This removes the freeing added by 9ec10dd and changes the free() calls into vm_free() calls.
2015-09-16 19:55:24 -07:00
Yarn366 0af93bcceb Fixed attempts to access current debriefing as an array when saving the debriefing background 2015-09-16 14:24:59 -04:00
Yarn366 9cb1af00aa Added support for custom command briefing backgrounds 2015-09-16 14:06:15 -04:00
Yarn366 4ef212157a Briefing backgrounds are now set with $briefing_background_xxx instead of $background_xxx 2015-09-16 02:17:53 -04:00
Yarn366 3bb9b0068c Added support for custom debriefing backgrounds 2015-09-16 01:32:57 -04:00
Yarn366 09aa01db6b Added support for custom weapon select backgrounds 2015-09-16 00:14:54 -04:00
Yarn366 36cc228527 Added support for custom ship select backgrounds 2015-09-15 23:49:43 -04:00
Yarn366 f41c5a2a65 Added support for custom red-alert backgrounds 2015-09-15 21:08:25 -04:00
MageKing17 d672ee885f Stop calling popup() during gr_init().
While investigating issue #345, it was discovered that `popup()` is getting called during `gr_init()` (and since this is before `gamesnd_parse_soundstbl()` gets called, the eventual call to `gamesnd_play_iface()` results in reading invalid memory). Given that this is basically relying on a feature in the middle of the function initializing it, and given that both lines are preceded by `mprintf()` calls saying basically the same thing, it seems the best solution is to just remove the troublesome lines altogether.
2015-09-15 17:59:16 -07:00
MageKing17 3329285192 Refactor mission saving to avoid duplicate code.
Makes save_mission_file() and autosave_mission_file() delegate to a new save_mission_internal() function. Tested and works with both manual and automatic saves.

As an aside, this fixes a slight inconsistency between manual and automatic saving (which inspired this refactor in the first place): when the order of save_fiction() and save_cutscenes() was swapped (in r10886 a.k.a. d6e0a73), autosave_mission_file() wasn't also changed, so autosaves of missions with "#Cutscenes" sections can't actually be loaded.
2015-09-10 13:34:57 -07:00
Echelon9 d7eca39338 Refactor bm_load_and_parse_eff() return type to bool, thereby removing a TODO 2015-09-08 22:14:43 +08:00