Commit Graph
15314 Commits
Author SHA1 Message Date
Birk Magnussen 3f227e7eeb Incorporate Feedback 2022-05-29 10:48:10 +02:00
Birk Magnussen 13d245a101 fix builtin 2022-05-24 21:04:36 +02:00
BMagnu c06007bcac Fred and clang tidy 2022-05-24 14:46:25 +02:00
BMagnu 7dbb16bf06 Fix Warning 2022-05-24 13:56:07 +02:00
BMagnu ca3207de47 Tidyup 2022-05-24 13:50:22 +02:00
BMagnu 00078b9c77 Multi Bump 2022-05-24 13:42:18 +02:00
BMagnu 7155163223 Remove bitfield indexed player orders 2022-05-24 13:38:56 +02:00
BMagnu cfb5a04aa9 Activate LuaAI custom message parsing (#4303)
* Add parsing for specifying order accept messages

* Write out acknowledge in comment
2022-05-23 20:44:54 +00:00
Joshua Glatt c8ace18317 Add copy-container SEXP (#4291) 2022-05-23 08:55:27 -07:00
BMagnu 48baf8c0af Fix HUD squad menu PageDown (#4283)
* Fix HUD squad menu PageDown

* Clang Tidy
2022-05-22 05:57:59 +09:00
Goober5000 805e858123 Merge pull request #4277 from Goober5000/hud_target_distance
add hu.getTargetDistance()
2022-05-20 14:18:06 -04:00
Goober5000 260526cbd6 add hu.getTargetDistance()
Add a scripting function to return the distance as seen on the HUD.
2022-05-19 21:03:45 -04:00
Goober5000 7222c8a398 resolve FIXME for AIM_GET_BEHIND
This mode was never actually implemented, even in retail, so there is no FIXME as such.  Tweak the code to reflect this.  Fixes #4270.
2022-05-18 21:27:20 -04:00
Goober5000 48d5211e68 Merge pull request #4275 from naomimyselfandi/scpui-stage-hooks
Allow SCPUI to run `$On Briefing Stage:` hooks
2022-05-18 18:47:24 -04:00
BMagnu f707d471da Replace +Orders Accepted: Bitfield with flag list (#4282)
* Deprecate '+Orders Accepted:' Bitfield

* Add retail compat mode
2022-05-19 06:24:02 +09:00
Taylor Richards 5e79021da3 use SCP_string for constructing multi/event log lines (#4284) 2022-05-18 13:56:37 -04:00
EatThePath 4d66740f7a Merge pull request #4279 from qazwsxal/image-based-lighting
Lab Environment-Map Export
2022-05-17 22:12:14 -05:00
Taylor Richards b4f95c3b0c Merge pull request #4266 from notimaginative/fix_multi_timestamps
address multiple timestamp issues with multi
2022-05-17 20:07:09 -04:00
Naomi Coffman 0f9fee8d7c Lua indexes start at 1 2022-05-17 18:59:28 -04:00
Taylor Richards df6cf572ac convert multi timestamp()'s to ui_timestamp() where appropriate
A bit overkill for some of this but just covering the bases.

 * fix issues with in-game join
 * fix multi messaging and multi pause screen
 * make sure maintenance stuff (pings, voice, file xfer, etc.) isn't
   affected by pausing or time compression
2022-05-17 07:50:50 -04:00
Adam Leach 1d16bb28a4 Keep clang tidy happy (NULL->nullptr) 2022-05-17 11:11:47 +01:00
Adam Leach 862cf0d82c Keep clang -Werror=unused-but-set-variable happy. 2022-05-17 09:05:20 +01:00
Taylor Richards ead4376f47 fix unittests when non-interactive is used 2022-05-16 16:23:34 -04:00
Taylor Richards a8618a569c add improvements to aid in multi troubleshooting:
- report when multi.cfg is missing
 - add game version, multi version, cmdline, and PXO status
   to multi.log
 - use non-interactive mode by default on standalone and
   enable it as soon as possible
2022-05-16 15:47:30 -04:00
Adam Leach 98846a3f88 Clean up comments 2022-05-16 19:51:23 +01:00
Adam Leach dbd7b2f49a Update usage info in lab with M key 2022-05-16 19:23:24 +01:00
Adam Leach 743cd5035d Flip Y coord 2022-05-16 19:05:43 +01:00
Adam Leach 22b1f08592 Cleanup render target and don't produce cubemap images 2022-05-16 19:05:43 +01:00
Adam Leach 530118785a spherical environment map generation 2022-05-16 19:05:43 +01:00
Adam Leach d84486c357 remove superfluous filepath format 2022-05-16 19:05:43 +01:00
Adam Leach 2744af109a Dump Environment maps with "M" key in lab 2022-05-16 19:05:43 +01:00
BMagnu 5c4be3d392 LuaAI (#4198)
* Basic LuaAI

* LuaAI Player Order Support

* Add Player Order Target Restricts

* Fix init order

* Add AI helper API

* Fix subcategory stuff

* Fix Compiler Warnings

* Remove AI Mode switch Int3's

* Fix Lua docs

* Compiler warnings 2

* Clang Tidy

* Incorporate Feedback

* Incorporate Feedback 2

* Incorporate Feedback 3

* Incorporate Feedback 4

* Clang Tidy
2022-05-16 18:36:34 +09:00
Naomi Coffman 701a8de527 Allow SCPUI to run $On Briefing Stage: hooks 2022-05-15 19:44:48 -04:00
Goober5000 f9aad01349 Merge pull request #4267 from naomimyselfandi/cancel-future-waves
Add cancel-future-waves
2022-05-15 12:34:05 -04:00
Goober5000 1269feae44 Merge pull request #4271 from Goober5000/maybePlayCutscene_fix
fix maybePlayCutscene arguments
2022-05-15 12:33:04 -04:00
Goober5000 3c22bf9c49 Merge pull request #4268 from Goober5000/clean_up_wing_waves
some wing wave cleanup
2022-05-14 14:31:25 -04:00
Goober5000 fa52bf747d fix maybePlayCutscene arguments
This must have been coded as `ui:maybePlayCutscene` when it should be `ui.maybePlayCutscene`
2022-05-14 14:30:04 -04:00
Naomi Coffman 2ffa4ca982 Document how cancelling interacts with is-destroyed-delay and friends 2022-05-14 07:46:56 -04:00
Goober5000 833326aa76 some wing wave cleanup
In the process of looking through `num_waves` and `current_wave` for #4267, I found a couple of confusing bits of code.  This clarifies things.
2022-05-14 01:34:42 -04:00
Goober5000 ba225dcf20 Merge pull request #4265 from notimaginative/standalone_crash_fix
fix a standalone crash from disabled uniform buffer manager
2022-05-14 00:06:27 -04:00
naomimyselfandi 0d461c1fc4 Replace "Always_show_goals" with "Toggle_showing_goals" (#4263)
* Replace "Always_show_goals" with "Toggle_showing_goals"

The "Always_show_goals" flag is a no-op on anything other than a
training mission. This replaces it with a new flag which toggles
whether the goals are shown instead, in keeping with the existing
"Toggle_debriefing" flag.

* Rename other occurrences of Always_show_goals

* Update stale comment

* Update stale member names

* Remove unused #define
2022-05-13 22:19:59 -05:00
Naomi Coffman f8fdda34a6 Fix shadowing 2022-05-13 22:19:01 -04:00
Naomi Coffman 798f1c8c2f Fix documentation typo 2022-05-13 21:50:01 -04:00
Naomi Coffman 1228a56e42 Add cancel-future-waves 2022-05-13 21:46:39 -04:00
Taylor Richards ab483eeea8 fix a standalone crash from disabled uniform buffer manager 2022-05-13 04:00:25 -04:00
Goober5000 3d646e591d Merge pull request #4258 from Baezon/fix-sun-position-compensation-math
Correct sun position compensation math
2022-05-12 20:02:05 -04:00
Goober5000 7bece7a946 guard against negative turret_enemy_objnum 2022-05-12 01:50:09 -04:00
Goober5000 7606df6082 miscellaneous fixes related to old Coverity fixes
1) Remove the extra branch in `check_ok_to_fire` that was added in SVN revision 10392, or commit 0d54630e83.  If there was an actual Coverity error, this does not fix it at the proper location.  More importantly, this breaks certain turret firing behavior.
2) Fix a couple of bounds checks.
3) Remove an incorrect stale comment.

This fixes the broken turret swarm weapons that were uncovered by the fixes in #2959.
2022-05-12 01:03:50 -04:00
Goober5000 e534adf107 Merge pull request #4159 from Goober5000/test_replace
guard against off-by-one errors in replace_one and replace_all
2022-05-11 22:11:39 -04:00
JohnAFernandez 1acd763e4d Limit all MP client collisions to prevent bugs (#4209)
Players are still affected by collisions locally, but other ships will literally pass through each other until updated by the server.  A timestamp controls the frequency of collisions with the player ship.
2022-05-11 19:11:09 -07:00