Sal
aa29ac5ada
Merge branch 'enable-cxx' into 'master'
...
Enable C++17 additionally with Catch2 unit testing
See merge request KartKrew/Kart!807
2022-12-15 22:54:27 +00:00
James R
7f569fe168
Rename K_SpawnBrolyKi to Obj_SpawnBrolyKi, move to objects/broly.c, spawn MT_BROLY
2022-12-15 04:14:38 -08:00
James R
c32134849f
Merge branch 'clipping-rectangle' into 'master'
...
Clipping rectangle
See merge request KartKrew/Kart!806
2022-12-15 04:11:56 +00:00
Oni
f4ab4d753d
Merge branch 'broly' into 'master'
...
Broly's ki on explosions
See merge request KartKrew/Kart!809
2022-12-15 03:56:39 +00:00
James R
b97c8cd176
Make explosions louder from a distance
2022-12-14 19:54:33 -08:00
James R
130953fc7e
Add sfx to Broly ki
2022-12-14 19:54:33 -08:00
James R
9017ca1c20
Delay mine explosion sound until after Broly ki
2022-12-14 19:54:33 -08:00
James R
2d52e4a047
Colorize Broly ki to player color
2022-12-14 19:54:33 -08:00
James R
2ec29b2586
Adjust mine and explosion to center Broly ki
2022-12-14 19:54:33 -08:00
James R
34dec00539
Add K_SpawnBrolyKi, green circle shrinks during explosion hitlag
2022-12-14 19:54:31 -08:00
Eidolon
51e0bed20a
c++: add finally RAII utility
...
This mirrors the `finally` utility in Guidelines Support Library for
ensuring that a cleanup function is always called when the utility
object leaves scope, even when unwinding the stack from an exception.
This is to aid in transitioning malloc/free pairs in function bodies to
be more exception-safe.
2022-12-12 16:40:56 -06:00
Eidolon
15acefcc33
c++: Make some defines C++-valid
2022-12-12 16:38:25 -06:00
Eidolon
dceeadd3aa
Don't preproc. define inline in C++
2022-12-12 16:34:26 -06:00
Eidolon
7423b05f46
Redefine boolean for C++ compatibility
2022-12-12 16:34:25 -06:00
Eidolon
5139d1276b
cmake: Add Catch2 unit testing
2022-12-12 16:31:45 -06:00
Eidolon
7bdcb5883d
cmake: Enable C++ 17 and C11
2022-12-12 16:31:35 -06:00
Eidolon
b9f277df66
cmake: Fix png and openmpt builds in clean envs
...
In environments without zlib installed, png would fail to build since
it can't find zlib.h. The zlib build's generated public include dir
needs zlib.h to work.
openmpt fails to build because it can't find Rpcrt4, which is not a
necessary link under mingw, but exists in some mingw-w64 toolchains.
It is only needed for MSVC.
(cherry picked from commit fcf69001ada08077f82d3fc8510dcd24b4433e64)
2022-12-12 13:27:09 -06:00
Eidolon
1f9b97a0a8
cmake: Use MAME YM2612 emu in GME
...
(cherry picked from commit fb0f0c5e6c161b4b88439cda84c8b6cae9d236cc)
2022-12-12 13:27:09 -06:00
Eidolon
0d49cc1768
Cherry-pick internal zlib MR from SRB2/next
...
cmake: build zlib manually in internal build
See merge request STJr/SRB2!1856
(cherry picked from commit 3597957af13878854c02305a0aec5ca744209ef2)
# Conflicts:
# thirdparty/CMakeLists.txt
2022-12-12 13:18:17 -06:00
James R
db062fd0bb
OpenGL: clipping support for HWR_DrawStretchyFixedPatch
2022-12-11 17:45:15 -08:00
James R
09c55858b7
Fix off-by-one when clipping rectangle bottom
2022-12-11 17:43:11 -08:00
Sally Coolatta
8cdfcea319
Prevent modifying cliprect, wordier vars
2022-12-11 16:47:25 -05:00
Sally Coolatta
b50fbce5ee
Clear clipping rectangle before each hook call
...
Prevents Lua from being able to make a mess.
2022-12-11 14:14:12 -05:00
Sally Coolatta
3a8b1ea8e6
Comment out test case
2022-12-11 14:02:48 -05:00
Sally Coolatta
b95a18676f
Clipping rectangle
...
Instead of the absolute insanity that is V_DrawCroppedPatch, which makes you specify the number of pixels to crop off the top/left and then the number of pixels to show after the crop ... you just use V_SetClipRect to create a rectangle for any future draws to be cropped down to, and V_ClearClipRect afterwards to clear it.
Currently only supported by V_DrawStretchyFixedPatch. Ideally other drawing functions should also receive clipping rectangle support too.
2022-12-11 13:53:51 -05:00
James R
32f747fd5a
Merge branch 'voltage-damage' into 'master'
...
Add voltage damage type, for Lightning Shield
See merge request KartKrew/Kart!804
2022-12-09 04:14:31 +00:00
James R
f4a7aa487c
Merge branch 'scale-smoldering-momz' into 'master'
...
Mobj scale explosions smoldering rising momentum
See merge request KartKrew/Kart!803
2022-12-09 04:14:15 +00:00
James R
70cf67bd15
Merge branch 'scale-speed-to-weight-buff' into 'master'
...
Mobj scale weight buff from moving above top speed
See merge request KartKrew/Kart!802
2022-12-09 04:13:54 +00:00
Sal
697daba74b
Merge branch 'testrun-develop' into 'master'
...
Start on Test Run by default, only in DEVELOP builds
See merge request KartKrew/Kart!797
2022-12-06 10:22:44 +00:00
Sal
c5472a23f6
Merge branch 'spring-reset' into 'master'
...
Reset pitch/roll on springs + trick panels
Closes #348
See merge request KartKrew/Kart!798
2022-12-06 10:22:29 +00:00
Sal
b51769c015
Merge branch 'fix-solid-midtex' into 'master'
...
Fix solid midtextures
Closes #349
See merge request KartKrew/Kart!799
2022-12-06 10:22:16 +00:00
Sal
aa44e7682a
Merge branch 'egg-capsules-solid-fix' into 'master'
...
Egg Capsule fixes
See merge request KartKrew/Kart!800
2022-12-06 10:22:00 +00:00
James R
90a4159acd
Add IMON sprite definition
2022-12-05 13:45:26 -08:00
James R
cbb1f3c714
Fix NULL lump name guard for W_CheckNumForName
2022-12-05 13:06:52 -08:00
James R
3bc359e298
Mobj scale explosions smoldering rising momentum
2022-12-05 13:06:23 -08:00
James R
abdb2e3ac3
Set Lightning Shield attack to DMG_VOLTAGE
2022-12-05 13:04:47 -08:00
James R
7b2095f6a5
Scale player weight buff from speed to mobjscale
2022-12-05 13:03:46 -08:00
James R
5f42692b8f
Merge branch 'S_ReducedFXSoundAtVolume-player_t-owner' into 'master'
...
Use player_t parameter in S_ReducedVFXSoundAtVolume
See merge request KartKrew/Kart!790
2022-12-05 21:00:36 +00:00
James R
c7ad1e659e
Merge branch 'universal-typedef' into 'master'
...
Move all typedef into one file
See merge request KartKrew/Kart!791
2022-12-05 20:59:43 +00:00
Sally Coolatta
2140c2f616
Use P1-4 starts in Capsules Attack / Bonus Stage
...
Rather than randomized Battle starts.
2022-12-03 04:45:59 -05:00
Sally Coolatta
226cb7d736
Update capsule parts
...
- The pieces do the positioning, instead of the capsule itself. This makes it so that the parts update after the capsule has applied its momentum.
- Use proper inradius instead, so the sides line up.
- Because of the above change, the capsule as a whole is bigger. This means...
- Increased hitbox again
- Changed a few of the sprites
2022-12-03 04:25:34 -05:00
Sally Coolatta
d6bd869b92
Give Egg Capsules drop shadows
2022-12-03 03:08:44 -05:00
Sally Coolatta
e8e02058ef
Bigger Egg Capsule hitbox
2022-12-02 04:21:23 -05:00
Sally Coolatta
bdbd79dd41
Fix Egg Capsule interp
2022-12-02 04:15:56 -05:00
Sally Coolatta
b62ed33655
Fix Battle mode Egg Capsules bumping
...
Old vanilla-ass code for platform-like objects that is conflicting super hard with bumping / horizontal momentum. If we ever have a moving platform object this code should be brought back only for that object, and not solid objects as a whole.
2022-12-02 03:56:15 -05:00
Sally Coolatta
dbedd66259
Fix solid midtextures
...
UDMF's ML_MIDPEG == Binary's (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_MIDPEG)). This is converted in P_ConvertBinaryLinedefFlags
2022-12-02 02:01:02 -05:00
Sally Coolatta
7794f0956e
Reset pitch/roll on springs + trick panels
2022-12-02 00:27:34 -05:00
Sal
dbf11e228d
Merge branch 'vsync-default-off' into 'master'
...
Make vsync default to off
See merge request KartKrew/Kart!794
2022-12-02 05:06:25 +00:00
Sal
4ae1309fd7
Merge branch 'cmake-fix-override-exe-name' into 'master'
...
cmake: let SRB2_SDL2_EXE_NAME override git branch
See merge request KartKrew/Kart!796
2022-11-30 00:55:45 +00:00
James R
3d500148cd
Make Test Run the default map in DEVELOP builds
...
This makes testing easy by starting the game with -server
2022-11-29 16:54:31 -08:00
