z64555
9a2d996b53
Fixes #2844 where mouse buttons X1 and X2 were not detected.
2020-10-29 10:58:34 -05:00
Goober5000
4546c8784d
Merge pull request #2842 from Goober5000/fix_debris_expiration
...
fix debris expiration
2020-10-28 23:18:06 -04:00
Goober5000
2aed10ee7f
Merge pull request #2839 from Goober5000/fix_lock_indicator
...
redo the locking animations for multilock
2020-10-28 21:17:08 -04:00
Goober5000
b989492ef4
fix debris expiration
...
Fixes #2834 , a bug where non-capital ships did not generate debris pieces from their hull. It turns out this bug was introduced in #2416 . If the `DoesNotExpire` flag is substituted for the `lifeleft` variable , it should be done in all locations.
2020-10-28 19:35:50 -04:00
wookieejedi
fea8086647
Merge pull request #2838 from Baezon/reset-burst-flag
...
Add "resets" burst flag
2020-10-28 15:54:05 -04:00
wookieejedi
97c801f7cc
Merge pull request #2836 from wookieejedi/add-choose-random-bitmap-particle-effects
...
Add 'Choose Random Bitmap' for particle effects
2020-10-28 09:24:32 -04:00
wookieejedi
d23f995a58
optimize
2020-10-27 16:57:44 -04:00
wookieejedi
482b691f76
more appeasement
2020-10-27 14:49:27 -04:00
wookieejedi
04dc2aef57
appease travis
2020-10-27 08:07:08 -04:00
Goober5000
9eaa7bf024
redo the locking animations for multilock
...
The multilock patch did not handle `Lock_anim` in the best way, and handled `Lock_gauge` in a very bizarre way, despite the fact that they are two simple hud animations. This changes the `lock_info` struct to track the correct `time_elapsed` value for both, and changes the locking code to use the values in the correct way.
Additionally, this properly loops the lock triangles on the FS1 lock indicator. Strangely, even prior to the multilock merge it appears that the triangles wouldn't have animated more than a quarter turn.
Finally, this prevents the FS1 lock indicator from blinking, since in retail FS1 it didn't blink.
Tested with FSPort and no-mods. Fixes #2826 .
2020-10-27 02:55:36 -04:00
Goober5000
af83eda19a
Merge pull request #2837 from Goober5000/fix_typo
...
fix typo and elaborate sexp help
2020-10-27 02:32:47 -04:00
Baezon
3db3dade77
implement "resets" burst flag
2020-10-27 01:39:35 -04:00
wookieejedi
34d6f5e44e
and one more unit type fix
2020-10-26 23:18:06 -04:00
wookieejedi
20e65c0dbb
remove unneeded int conversion
2020-10-26 22:55:13 -04:00
wookieejedi
d762578fe0
incorporate feedback
2020-10-26 22:38:15 -04:00
Goober5000
283bcaf607
fix typo and elaborate sexp help
2020-10-26 20:51:00 -04:00
wookieejedi
032430d126
specify size_t type
2020-10-26 16:31:51 -04:00
wookieejedi
4b39f50b84
fix up
2020-10-26 16:05:58 -04:00
wookieejedi
879e7119d5
clean up redundancies
2020-10-26 15:54:40 -04:00
wookieejedi
8bc1c4c797
use pushback function
2020-10-26 14:08:14 -04:00
wookieejedi
01cc444836
Add 'Choose Random Bitmap' for Particle Effects
2020-10-26 13:47:26 -04:00
m!m
a819d1860f
Merge pull request #2827 from asarium/graphics/typesafeBufferHandles
...
Add type safe handle for graphics buffers
2020-10-26 17:59:18 +01:00
Goober5000
a8e1f02984
Merge pull request #2833 from Baezon/remote-detonate-fix
...
Fix `remote_detonaters_active` decrementing
2020-10-26 10:34:24 -04:00
Baezon
c93c8e0bd7
fix remote_detonaters_active decrementing
2020-10-25 16:14:43 -04:00
Fabian Woltermann
33ce3f96f5
Remove material editor, add exit button
2020-10-25 13:03:38 +01:00
asarium
9da5cc17a3
Add type safe handle for graphics buffers
...
This converts the previous plain-int type for a buffer handle to an
instance of our ID class which provides type safety.
2020-10-25 12:16:05 +01:00
Tyler Blount
45417a0093
Merge pull request #2830 from PhantomHoover/fix/missile-locked-sexp
...
Avoid resetting player_has_lock unless they've actually lost their lock
2020-10-24 16:43:48 -06:00
Fabian Woltermann
0e5fbb1396
Fix a number of crash issues
2020-10-25 00:08:52 +02:00
Phantom Hoover
9a5186f637
Avoid resetting player_has_lock unless they've actually lost their lock
2020-10-24 20:26:55 +01:00
asarium
633d13a02e
Make removing non-existent hook-vars a no-op
...
There are some usages where a hook variable is removed blindly which
caused issues in multi.
This fixes #2824 .
2020-10-24 13:39:04 +02:00
wookieejedi
369f902d41
Merge pull request #2814 from bangstk/bugfix-hud-bg
...
Fix missing background color in paletted HUD gauges
2020-10-23 17:01:29 -04:00
Fabian Woltermann
23ea4eca43
Merge pull request #2517 from The-E/feature/lab_v2
...
Rewrite the lab
2020-10-23 18:01:47 +02:00
Fabian Woltermann
fff5207d6c
Disable the readability-non-const-parameter check on this line
2020-10-23 15:40:39 +02:00
Fabian Woltermann
4ad8f257bf
Remove circular dependency
2020-10-23 08:18:23 +02:00
JohnAFernandez
2235a62cda
Merge pull request #2810 from Baezon/better-collide-avoid
...
Improved collision avoidance for fighters
2020-10-22 22:06:34 -04:00
JohnAFernandez
4bd827f248
Merge pull request #2819 from notimaginative/fix_psnet_init
...
Address issues that can arise if psnet fails to init properly
2020-10-22 21:24:21 -04:00
JohnAFernandez
c2b6a35196
Merge pull request #2813 from Baezon/fix-to-the-fix
...
Fix to the fix to initial missile physics set-up
2020-10-22 21:21:00 -04:00
Fabian Woltermann
4e455913b9
Use a getter for the labmanager
2020-10-22 19:26:00 +02:00
m!m
51c8b22905
Merge pull request #2809 from asarium/graphics/2dFuncObs
...
Change graphics interface to function objects
2020-10-22 19:24:09 +02:00
Goober5000
6d8ab32971
Merge pull request #2822 from Baezon/bracket-deathroll-bug
...
Fix a bug with hud brackets during target deathroll
2020-10-22 11:22:09 -04:00
Fabian Woltermann
30436568f2
I don't even know
2020-10-22 08:04:01 +02:00
Baezon
7b6488aba2
array safety
2020-10-21 23:23:23 -04:00
Baezon
6808101e4a
much cleaner this way
2020-10-21 23:10:35 -04:00
Baezon
eae514a269
v1
2020-10-21 22:57:08 -04:00
Goober5000
f32f227db0
Merge pull request #2815 from Baezon/better-remote-detonate
...
Fix some inconsistencies with remote detonation
2020-10-21 14:21:16 -04:00
Fabian Woltermann
d93d8e0e5e
More CI fixes
2020-10-21 17:13:30 +02:00
JohnAFernandez
afc4fad4db
And related comments
2020-10-20 23:48:08 -04:00
JohnAFernandez
1257396a1b
Add Missing Entries to Submode_text array
2020-10-20 23:32:46 -04:00
Fabian Woltermann
52f0b7dbc6
Merge pull request #2802 from PhantomHoover/feature/screenshake-flag
...
Add -no_screenshake flag to optionally disable screen shaking effects…
2020-10-20 17:51:28 +02:00
Baezon
ef65914129
v1
2020-10-19 13:40:25 -04:00