Commit graph

12351 commits

Author SHA1 Message Date
LJ Sonic
530a03cc7d Fix function name 2023-01-14 15:14:09 +01:00
LJ Sonic
aa18d5c3ff Move net command sending to a new function 2023-01-14 14:53:27 +01:00
LJ Sonic
4081dd8edf Move net command copying to a new function 2023-01-14 14:52:13 +01:00
LJ Sonic
a7a3f97c7b Split PT_ClientCmd into functions 2023-01-14 14:49:33 +01:00
LJ Sonic
0859a1597f Add missing include directive 2023-01-13 22:28:03 +01:00
LJ Sonic
2a360a4201 Reorder functions in d_clisrv.c 2023-01-13 22:05:57 +01:00
spherallic
207053a023 Prevent A_LobShot from dividing by 0 2023-01-13 17:10:50 +01:00
LJ Sonic
ab23b445b0 Move netgame commands to a new file 2023-01-12 19:40:31 +01:00
sphere
96bfd8cea7 Merge branch 'gamepadtweaks' into 'next'
Gamepad fixes & changes

Closes #813

See merge request STJr/SRB2!1899
2023-01-11 12:54:24 +00:00
LJ Sonic
18bfc3266a Remove reboundstore timeout hack 2023-01-09 22:14:58 +01:00
LJ Sonic
62cfb0eb81 Fix clients not being able to join servers 2023-01-09 21:39:33 +01:00
LJ Sonic
1eb801399b Move comment to an appropriate place 2023-01-08 16:33:21 +01:00
LJ Sonic
5a608120ff Simplify convoluted code 2023-01-08 16:28:41 +01:00
LJ Sonic
62986da9da Remove useless variable 2023-01-08 13:27:08 +01:00
MascaraSnake
24f9ec4ec4 Merge branch 'fffff' into 'next'
Fix fox follower's flickering flindicator (fixes #819)

Closes #819

See merge request STJr/SRB2!1918
2023-01-08 10:28:48 +00:00
LJ Sonic
75b52171d2 Call all packet handlers from the same place 2023-01-08 00:47:33 +01:00
LJ Sonic
db85e956c9 Rename packet handlers to match their associated PT_ constants 2023-01-08 00:46:12 +01:00
LJ Sonic
fef13b630c Remove outdated or misleading comments 2023-01-08 00:43:18 +01:00
LJ Sonic
4a2fd43aff Add missing _pak suffix to a few packet structures 2023-01-07 16:14:41 +01:00
LJ Sonic
7240ed22de Add missing PT_ prefix to a few packet handlers 2023-01-07 15:57:17 +01:00
LJ Sonic
dfdbdee0a8 Move netcode console variables to appropriate files 2023-01-07 15:57:04 +01:00
LJ Sonic
94ba47a950 Remove unused stuff 2023-01-07 13:37:33 +01:00
LJ Sonic
d1c5f7adcc Move gamestate handling to a new file 2023-01-07 13:01:48 +01:00
MascaraSnake
f50e7f2515 Merge branch 'more-use-afters-frees' into 'next'
Fix use after free bug

See merge request STJr/SRB2!1867
2023-01-07 10:37:32 +00:00
MascaraSnake
6ece0f1a00 Merge branch 'fix-hurtmsg-hook' into 'next'
Fix HurtMsg inflictor mobj type discriminator

Closes #874

See merge request STJr/SRB2!1903
2023-01-07 10:32:58 +00:00
MascaraSnake
71d10ec579 Merge branch 'fishjump-fix' into 'next'
Fix scaling mistake in A_FishJump

Closes #939

See merge request STJr/SRB2!1915
2023-01-07 10:32:43 +00:00
katsy
20cd8cefd1 fix flickering flight indicator 2023-01-06 18:41:35 -06:00
sphere
cdf896b22f Merge branch 'nightshoopsanity' into 'next'
Allow setting NiGHTS hoop pitch & yaw in degrees (in binary map format)

See merge request STJr/SRB2!1892
2023-01-06 23:54:26 +00:00
LJ Sonic
f1ad1bf13e Declare data exchanged through the network to a new file 2023-01-05 23:48:44 +01:00
LJ Sonic
7c2fe20cd5 Move tic and net command handling to new files 2023-01-05 22:51:17 +01:00
katsy
3a04e11743 allow targeting invulnerable bosses 2023-01-05 14:11:54 -06:00
spherallic
ca8842fa45 Merge branch 'next' into gamepadtweaks 2023-01-04 09:01:55 +01:00
MascaraSnake
5bbfb1840a Fix scaling mistake in A_FishJump 2023-01-04 08:58:40 +01:00
Eidolon
c270cca55f Always swallow pad axis events when menu is active
This prevents axis events from trickling out of the menu and taking
effect in G_Responder when they aren't hitting the digital deadzone
needed to be mapped into internal menu key events.
2023-01-03 14:39:15 -06:00
Eidolon
eeff182abb Reverse axis event mapping in G_RemapGamepadEvent
Was erroneously mapping events inside the deadzone as key down and vice
versa.
2023-01-03 14:09:12 -06:00
Arthur
28f97dcd0b Also fix STJr/SRB2#618 since it is highly related. 2023-01-02 08:07:13 -05:00
Arthur
af146071d8 Check for spindash ability and dashspeed being > 0 before indiscriminately setting roll animation. 2023-01-02 07:34:33 -05:00
Arthur
7d53e4647b Fixes issue #568 2023-01-01 21:07:15 -05:00
Arthur
bd89b97e0a Fixes issue #704 2023-01-01 20:59:11 -05:00
Eidolon
4e3f78784a Merge branch 'MSVC-fix' into 'next'
MSVC project file works again! Supports Visual Studio 2022.

See merge request STJr/SRB2!1904
2023-01-01 19:19:13 +00:00
Ashnal
7800c9e5c9 Fix use after free bug 2023-01-01 12:31:12 -06:00
Eidolon
fdff419818 Merge branch 'hms-useragent' into 'next'
http-mserv: add SRB2-specific user agent string

See merge request STJr/SRB2!1893
2023-01-01 18:21:01 +00:00
LJ Sonic
b461cb919b Move server-side connection handling to a new file 2023-01-01 11:45:09 +01:00
MascaraSnake
e472c551e1 Re-add P_ThingOnSpecial3DFloor for Lua backwards compatibility 2023-01-01 11:31:44 +01:00
Arthur
52384053ce When attaching to a wall to do a climb, the second sidedef wasn't be handled properly. 2022-12-31 22:46:08 -05:00
Arthur
e909f8ec12 Fixes Issue #711 2022-12-31 21:06:39 -05:00
Arthur
449d27749f Fixes Issue #912 2022-12-31 20:30:39 -05:00
Arthur
636e6d8c14 MSVC project file works again! Supports Visual Studio 2022.
Also fixed issues with the d_netcmd.c file/folder adding logic.
2022-12-31 19:35:07 -05:00
LJ Sonic
4660d3cab6 Move client connection handling to a new file 2022-12-31 21:37:35 +01:00
LJ Sonic
717e0d5a17 Move netcode files to a new folder 2022-12-31 14:10:19 +01:00
James R
fbcdaa6f4d hooklib: move HurtMsg to mobj hooks
Fixes regression of mobj type discriminator not working
for this hook.

blame 8d382e49fb
2022-12-31 04:26:13 -08:00
James R
a895a5c374 hooklib: pass NULL mobj to only run mobj hooks with no type discriminator 2022-12-31 04:20:31 -08:00
sphere
060b79452a Merge branch 'remove-spinning' into 'next'
Remove PF_SPINNING upon use of any jump ability, so that directionchar works properly

See merge request STJr/SRB2!1429
2022-12-31 09:39:06 +00:00
MascaraSnake
193a592d46 Merge branch 'dyn-alloc-action-name' into 'next'
Dynamically allocate space for a state's action field

See merge request STJr/SRB2!1478
2022-12-31 09:35:15 +00:00
sphere
e401f77524 Merge branch 'extend-ip-textbox' into 'next'
Extend the length of the Connect via IP textbox.

See merge request STJr/SRB2!1410
2022-12-31 09:06:28 +00:00
sphere
e301268af7 Merge branch 'nodepthset' into 'next'
Don't force bit depth to 8-bit when setting default video mode

See merge request STJr/SRB2!1733
2022-12-31 09:01:27 +00:00
MascaraSnake
eac31dbac0 Merge branch 'metal-sonic-fixes' into 'next'
Metal Sonic boss fight fixes

Closes #93 and #931

See merge request STJr/SRB2!1896
2022-12-31 08:55:05 +00:00
MascaraSnake
ca039ad49b Merge branch 'node-shit' into 'next'
Fix a few rendering errors

See merge request STJr/SRB2!1901
2022-12-31 08:52:36 +00:00
LJ Sonic
05d232c029 Delete netcode
Just kidding, I just deleted NONET
2022-12-30 15:07:57 +01:00
LJ Sonic
e519f306fb Ignore duplicate PT_CLIENTJOIN packets 2022-12-30 14:03:32 +01:00
LJ Sonic
6ae44fe91d Rename ConnectionRefused to be more descriptive 2022-12-30 14:01:37 +01:00
LJ Sonic
c9dc44c2f6 Cleanup HandleConnect 2022-12-30 14:01:03 +01:00
LJ Sonic
d561b5a0bf Remove broken joinnextround console variable 2022-12-30 13:10:01 +01:00
MascaraSnake
6bbb032581 UDMF: Use string values for the sector "triggerer" field 2022-12-30 11:19:29 +01:00
MascaraSnake
0a0da81007 Fix typo 2022-12-30 07:52:19 +01:00
LJ Sonic
388505db62 Remove unneeded numplayerswaiting field 2022-12-30 02:46:59 +01:00
LJ Sonic
f27de6c324 Remove useless condition 2022-12-30 01:48:26 +01:00
LJ Sonic
ba91520eab Remove useless return value for SV_AddWaitingPlayers 2022-12-30 00:24:06 +01:00
LJ Sonic
36613d58e9 Cleanup sphere redistribution 2022-12-29 22:30:26 +01:00
LJ Sonic
6806fbce45 Fix sphere redistribution 2022-12-29 22:16:08 +01:00
LJ Sonic
dc39957539 Move sphere redistribution to its own function 2022-12-29 21:28:53 +01:00
LJ Sonic
2b2797ec66 Move player-node unlinking to a function 2022-12-29 20:48:17 +01:00
LJ Sonic
dc716d9ece Cleanup ResetNode 2022-12-29 20:45:56 +01:00
LJ Sonic
e6e9eef0e2 Merge node arrays into a structure 2022-12-29 15:52:45 +01:00
LJ Sonic
262ed6b7f3 Split packet handling switch into functions 2022-12-29 10:23:12 +01:00
LJ Sonic
33c76453e1 Remove snake_ prefix 2022-12-28 18:50:00 +01:00
LJ Sonic
ffbe140af5 Move snake minigame to its own files 2022-12-28 16:12:05 +01:00
LJ Sonic
d03ef0a441 Fix HOMs in large rooms
Credits go to Lactozilla
2022-12-27 20:31:55 +01:00
LJ Sonic
c8e579618a Fix maps with more than 65535 segs not working correctly
This renders the "quadrant hack" and ZenNode largely useless
2022-12-27 20:29:15 +01:00
LJ Sonic
58e5473c9e Fix integer overflow with diagonal node splits
Fixes random invisible walls and possibly more errors
2022-12-27 20:26:38 +01:00
MascaraSnake
937127e987 Disable exit sectors in non-NiGHTS special stages because they interfere with the pits 2022-12-27 16:49:52 +01:00
spherallic
d7606fd85a { 2022-12-27 13:48:42 +01:00
spherallic
f5ede24775 Fix gamepad being unable to skip tutorial prompt 2022-12-27 11:44:56 +01:00
MascaraSnake
3b9ed3e802 EV_DoFloor: Set dummy tag correctly for chained linedef executing 2022-12-27 10:54:24 +01:00
MIDIManNoah
98d544b459 Make some fixes for Metal Sonic's boss fight 2022-12-23 22:19:09 -05:00
spherallic
f3988231d4 Convert old joy## constants 2022-12-22 14:40:35 +01:00
spherallic
1964869c69 Remove redundant control axes & cleanup 2022-12-22 01:40:33 +01:00
spherallic
b772c3a00d Remove "controls per key" option 2022-12-22 00:02:30 +01:00
spherallic
7abdab09bd Check double usage per-player, remove 2.1 code 2022-12-21 23:51:24 +01:00
Lamibe
c1b85b212d Increased maxsend to 200MB 2022-12-19 10:38:17 +01:00
spherallic
a85876d0c2 Change gamepad defaults again, post-refactor 2022-12-16 01:25:54 +01:00
Eidolon
003ee55ccd http-mserv: add SRB2-specific user agent string 2022-12-13 11:44:27 -06:00
Eidolon
ba2a4f06d4 Merge branch 'next' into public_next 2022-12-10 22:04:41 -06:00
Eidolon
30df486dac Update zones.pk3 hash for pre3 (oops) 2022-12-10 15:32:06 -06:00
Eidolon
fdb6f2aff9 sdl: I can't believe it's more version-guards 2022-12-10 02:47:53 -06:00
Eidolon
df28ffd72e sdl: Yet more SDL rumble version-guards 2022-12-10 02:42:14 -06:00
Eidolon
f5f224136b sdl: Version-guard rumble and extended buttons 2022-12-10 02:34:33 -06:00
Eidolon
ec58b1504d sdl: SDL version-guard controller type and hidapi 2022-12-10 02:19:05 -06:00
Eidolon
9e191d0748 Bump SRB2VERSION and MODVERSION for 2.2.11 pre3 2022-12-08 21:27:24 -06:00
Eidolon
4c72154d4f Merge remote-tracking branch 'local-SRB2/next' into public_next 2022-12-08 21:26:28 -06:00
Eidolon
6428d6fc61 Fix axis inversion and camera look inversion 2022-12-08 21:25:10 -06:00
Eidolon
7d8e8e20b7 Merge branch 'gamepad-refactor-lua-rumble' into 'next'
Add haptic functions for Lua scripting

See merge request STJr/SRB2!1872
2022-12-09 02:17:17 +00:00
Eidolon
7f1cafcd3d Merge branch 'gamepad-refactor-lua-features' into 'next'
Add gamepad library and hooks for Lua scripting

See merge request STJr/SRB2!1871
2022-12-09 02:17:03 +00:00
Eidolon
696e2ab909 Merge branch 'gamepad-refactor' into next
Some hacks from the snake minigame patch have been removed as they are
no longer needed.

See STJr/SRB2!1870

# Conflicts:
#	src/g_game.c
#	src/g_input.c
2022-12-08 20:00:41 -06:00
Eidolon
d98d59494f Add missing level-load view reset from RR 2022-12-08 18:21:37 -06:00
sphere
b9c677e537 Merge branch 'triggerafterxcalls' into 'next'
Fix callcount typo

Closes #922

See merge request STJr/SRB2!1890
2022-12-08 12:25:03 +00:00
spherallic
d0a91646ef Allow setting hoop pitch/yaw in degrees (binary) 2022-12-07 12:34:35 +01:00
Eidolon
df131ef131 Bump SRB2VERSION and MODVERSION for 2.2.11 pre2 2022-12-06 18:43:59 -06:00
Eidolon
aac04b818c Merge branch '22-safe-addfolder' into 'public_next'
Path security checks for addfile, addfolder and exec

See merge request STJr/SRB2Internal!633
2022-12-07 00:43:31 +00:00
Eidolon
5cb13f9d1c Bump SRB2VERSION and MODVERSION for 2.2.11 pre1 2022-12-06 18:39:32 -06:00
Eidolon
cf699f23f9 Merge branch 'next' into public_next 2022-12-06 18:39:06 -06:00
Eidolon
9a7d15761d Merge branch '22-exec-files-only' into 'public_next'
Fix exec crashing with out of memory if opening a directory

See merge request STJr/SRB2Internal!634
2022-12-06 08:42:04 +00:00
Eidolon
6d44eb8016 Revert previous RemoveMobjInterpolator move
Matching Ring Racers. Previous move was actually a mistake on the Kart
port. Done so there is never a condition where the interpolator isn't
removed.
2022-12-05 17:22:01 -06:00
Eidolon
5bb7a527a1 Remove mobj interp. on early-free in P_RemoveMobj
Fixes a crash that occurred frequently in special stages/NiGHTS.
2022-12-04 22:25:23 -06:00
MascaraSnake
2cc7fe2bf0 Fix callcount typo 2022-12-04 09:14:55 +01:00
sphere
153def463f Merge branch 'fix-downloadsnakeconcent' into 'next'
[Snake Controller Fix] fix NONET builds

See merge request STJr/SRB2!1888
2022-11-29 12:07:57 +00:00
sphere
2e3253592a Merge branch 'polyvisiblefix' into 'next'
Fix PolyObject visibility/tangibility constants

See merge request STJr/SRB2!1886
2022-11-29 11:28:57 +00:00
sphere
cef1cc3fdc Merge branch 'dynslope-fix' into 'next'
Dynamic slope vertices: Allow untagged vertices which don't move

Closes #917

See merge request STJr/SRB2!1885
2022-11-29 11:28:55 +00:00
Zwip-Zwap Zapony
4e303ec59d better ifdef 2022-11-26 20:46:25 +00:00
ashifolfi
9cec9fbe97 fix NONET builds 2022-11-26 15:34:32 -05:00
LJ Sonic
c025c3408b Merge branch 'reverse-viewpoint-switch' into 'next'
Better viewpoint switching

See merge request STJr/SRB2!1875
2022-11-26 15:17:56 +00:00
LJ Sonic
5a38bbbbf5 Merge branch 'fix-downloadsnakeconcent' into 'next'
Fix Download Consent/Snake minigame not having controller support

Closes #836 and #835

See merge request STJr/SRB2!1883
2022-11-26 15:14:35 +00:00
LJ Sonic
ddc708ac87 Remove shift+F12 shortcut
This would conflict if your shift key is bound to a control =((
2022-11-25 22:40:28 +01:00
sphere
0218f9c2fa Merge branch 'fix-suspicious-statue' into 'next'
Fix suspicious statue still being tangible for ~40 tics after spawning lance-a-bot

Closes #856

See merge request STJr/SRB2!1882
2022-11-25 19:51:15 +00:00
MascaraSnake
4de3ed0ab1 Fix PolyObject visibility/tangibility constants 2022-11-25 18:03:58 +01:00
MascaraSnake
1e6150e7fe Dynamic slope vertices: Allow untagged vertices which don't move 2022-11-24 22:20:54 +01:00
LJ Sonic
28dba7f3c1 Add a separate control for switching to the previous viewpoint 2022-11-23 18:44:58 +01:00
ashifolfi
29aad5b7d5 WOW ITS A GOOD THING I DIDNT FORGET THIS HUH? 2022-11-23 12:27:01 -05:00
ashifolfi
8f5f5c1e22 hack and a half but joystick works now 2022-11-23 12:23:51 -05:00
ashi
1fb6adf390 change |= to &= 2022-11-23 16:22:52 +00:00
ashifolfi
741b1f415d very cool of vscode to not save when I told it to 2022-11-23 11:18:33 -05:00
LJ Sonic
7454235882 Merge branch 'mapmusname-fix' into 'next'
Fix mapmusname not overwriting Lua-provided strings (resolves #880)

Closes #880

See merge request STJr/SRB2!1803
2022-11-23 09:40:43 +00:00
Radicalicious
31520a1a5d Revert usage warning to an error 2022-11-22 16:21:13 +00:00
ashifolfi
7e2dee8796 attempt to get joystick support in snake 2022-11-20 20:17:13 -05:00
ashifolfi
d7b96df07b fix controller not working in download consent menu 2022-11-20 19:00:36 -05:00
ashifolfi
33b5f76045 fix controllers not working in snake game 2022-11-20 18:56:16 -05:00
ashifolfi
aa8410c612 fix statue being tangible for ~40 tics post burst mobj spawn 2022-11-20 18:46:41 -05:00
Zwip-Zwap Zapony
396db189e7 Draw the input prompt while the console is moving 2022-11-20 11:51:40 +01:00
Zwip-Zwap Zapony
435e1f6e7e Make con_height adjustable on the fly 2022-11-20 11:50:57 +01:00
Zwip-Zwap Zapony
256d9b5fdb Uncap console opening/closing animation 2022-11-20 11:50:01 +01:00
Zwip-Zwap Zapony
969dc4813a Allow cosmetic add-ons mid-save 2022-11-19 19:57:08 +01:00
Sally Coolatta
5103253e0b Allow unlockable executors again 2022-11-16 11:14:33 -05:00
Sally Coolatta
d3ff5342dd Minor adjustments 2022-11-16 11:14:32 -05:00
Sally Coolatta
947dbda045 Use savemoddata for ultimate file check 2022-11-16 11:14:32 -05:00
Sally Coolatta
f082acbbdb Don't allow Record Attack in cheated games 2022-11-16 11:14:31 -05:00
Sally Coolatta
a22fa1c455 Compromise on cheats setting modified game
Instead of modifying the game, cheats now set a separate "cheats were used in this session" variable, which returns some of the old behavior.

HOWEVER, cheats will STILL allow spawning / collecting emblems & unlocking unlockables. Cheats will purely prevent saving progress. (It was always frustrating that devmode would make debugging unlockable features harder...)

Lastly, the function to set no-saving was exposed to Lua (`G_SetUsedCheats(silent)`). Just thought it'd be useful for large-scale gamedata-using mods that want to add their own cheat commands.
2022-11-16 11:14:31 -05:00
Sally Coolatta
4a520e63c6 Don't allow a gamedata named the same as the default time attack folder
That'd be kinda scary!
2022-11-16 11:14:30 -05:00
Sally Coolatta
bcfe0da8fc Use old modded behavior when loading old files, instead of ignoring
Let's not pretend script-kiddie edited old files are now perfectly A-OK :p
2022-11-16 11:14:30 -05:00
Sally Coolatta
1b43cdddd5 Allow saving in modified games. 2022-11-16 11:14:29 -05:00
LJ Sonic
98d2dc4b71 No longer spam the console with viewpoint switching notices 2022-11-16 10:21:59 +01:00
LJ Sonic
d34d90b78b Enable reverse-iterating through viewpoints with shift+F12 2022-11-16 10:21:39 +01:00
LJ Sonic
aba5b953b2 Move viewpoint switching to its own function 2022-11-16 10:11:39 +01:00
Eidolon
e6780f2bee Merge branch 'comptime-no-fail' into 'master'
Minor comptime refactoring.

See merge request STJr/SRB2!1776

(cherry picked from commit dc02339cc9)

9bfc82a1 Prevent comptime.* from failing compilation
a614865d Make comptime.sh conform to POSIX and less redundant, among other improvements
b7711b2b Pass argument list directly to functions that use them; quote arguments when used.
2022-11-15 21:48:47 -05:00
Jaime Ita Passos
4a19294ca8 Merge these two loops together in Controller_GetFromID 2022-11-15 23:45:14 -03:00
Eidolon
dc02339cc9 Merge branch 'comptime-no-fail' into 'master'
Minor comptime refactoring.

See merge request STJr/SRB2!1776
2022-11-16 02:38:04 +00:00
Jaime Ita Passos
14065fb23f Properly make padrumble and padrumble2 CV_OnOff toggles 2022-11-15 23:37:57 -03:00
Jaime Ita Passos
3e088e4e78 Use displayplayer instead of consoleplayer in G_GetInputPlayer 2022-11-15 23:36:32 -03:00
Eidolon
84bc03d24e Merge branch 'po2-32x32-fix' into 'next'
Add PO2 flat cases for sizes smaller than 32x32 (resolves #624)

Closes #624

See merge request STJr/SRB2!1873
2022-11-16 01:40:54 +00:00
Lactozilla
86a052537e Add PO2 flat cases for sizes smaller than 32x32 2022-11-16 01:40:54 +00:00
Eidolon
8109514b73 Merge branch 'fix-udmf-boss3' into 'next'
Use udmf mt arg 4 for pinch phase LE in boss 3

Closes #910

See merge request STJr/SRB2!1869
2022-11-15 10:00:07 +00:00
Lactozilla
4558cc1c1f Fix HWR_SplitWall and sloped midtextures
- Fix bugs with HWR_SplitWall and sloped midtextures
- Clean up HWR_ProcessSeg and HWR_SplitWall
- Determine if the midtexture is visible earlier
- Ensure opaque midtextures always use PF_Masked
2022-11-15 09:55:59 +00:00
Jaime Ita Passos
f0c3de6976 Add gamepad library and hooks for Lua scripting 2022-11-14 02:18:24 -03:00
Jaime Ita Passos
0516350bb4 Add haptic functions for Lua scripting 2022-11-14 01:52:20 -03:00
Jaime Ita Passos
46f7fa406f Refactor gamepad code
Implements the SDL Game Controller API, haptics, and axis bindings.
2022-11-14 00:37:08 -03:00
Eidolon
47ed0567b1 Use udmf mt arg 4 for pinch phase LE in boss 3 2022-11-13 21:28:36 -06:00
Eidolon
c582d73e4c Merge branch 'slowball' into 'next'
Make CA_SLOWFALL Account for Scale

See merge request STJr/SRB2!1806
2022-11-14 02:23:39 +00:00
Eidolon
e0477a86b9 Merge branch 'multi-linkdraw' into 'next'
Improve multiple MF2_LINKDRAW objects in Software

See merge request STJr/SRB2!1843
2022-11-13 23:47:52 +00:00
Eidolon
c5527f9470 Merge branch 'pterabyte-tweaks' into 'next'
Fix Pterabyte spawns (+ behavior tweaks)

See merge request STJr/SRB2!1839
2022-11-13 23:40:56 +00:00
Eidolon
eac8a54a55 Merge branch 'uncap-water-ripples' into 'next'
Uncapped Water Ripples

See merge request STJr/SRB2!1868
2022-11-13 23:29:10 +00:00
Eidolon
b93ae5a144 Merge branch 'fix-addfolder' into 'next'
Fixed folder mods

Closes #889

See merge request STJr/SRB2!1820
2022-11-13 23:21:19 +00:00
Eidolon
90489de517 Merge branch 'slope-fog-fix' into 'next'
Fix slope planes not being able to render fog (fixes #664)

Closes #664

See merge request STJr/SRB2!1637
2022-11-13 20:17:07 +00:00
Zwip-Zwap Zapony
59399e9fcf Uncap water ripples 2022-11-13 16:15:15 +01:00
Eidolon
6709100997 Merge branch 'emblem-drawing-hud' into 'next'
Various changes to emblem drawing (menu changes only)

See merge request STJr/SRB2!1810
2022-11-12 23:37:22 +00:00
Eidolon
9a88c9ea47 Merge branch 'gravityflipping' into 'next'
Gravity flip bugfixes & additions

Closes #378, #661, and #430

See merge request STJr/SRB2!1808
2022-11-12 23:33:07 +00:00
Eidolon
d6640391e4 Merge branch 'very-lethal-lava-land' into 'next'
Only interpolate shadowcasters if they exist

Closes #899

See merge request STJr/SRB2!1864
2022-11-12 23:23:26 +00:00
Eidolon
3ff6c210db Merge branch 'fix-removed-mobj-interp-crash' into 'next'
Remove mobj interpolator only after thinker

See merge request STJr/SRB2!1863
2022-11-12 23:23:06 +00:00
X.organic
b03ef98753 Fix use-after-frees around mobjs
# Conflicts:
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_mobj.c
#	src/p_saveg.c
#	src/p_tick.c
2022-11-12 17:04:25 -06:00
Eidolon
b2fa9e4bd7 Don't sleep w/ fpscap 0 and vsync enabled 2022-11-12 17:18:04 -05:00
Sally Coolatta
fa10530d37 Handle sorting against water FOFs properly 2022-11-12 17:00:45 -05:00
Sally Coolatta
ee9ebe6c54 Improve LINKDRAW with multiple objects
Multiple objects with MF2_LINKDRAW will get sorted between each other, instead of purely done with dispoffset.
2022-11-12 17:00:45 -05:00
Eidolon
e32b8a41e5 Only interpolate shadowcasters if they exist 2022-11-12 15:14:04 -06:00
Eidolon
88667400ee Merge branch 'fix-splat-interp' into 'next'
Fix splat interp and sprite angle

See merge request STJr/SRB2!1858
2022-11-12 21:05:44 +00:00
Eidolon
3bdfa3b9f4 Remove mobj interpolator only after thinker 2022-11-12 14:59:31 -06:00
Eidolon
147b3c925e Ensure st_time does not exceed 2.0 2022-11-12 11:45:10 -06:00
Eidolon
e59684b1a2 Merge branch 'bustablesoundz' into 'next'
Start bustable FOF sounds at the correct height

Closes #846

See merge request STJr/SRB2!1818
2022-11-11 23:15:26 -06:00
Eidolon
2aa9a92e7e Merge branch 'nodoublecrumble' into 'next'
Prevent floating crumbling platforms from being triggered twice

Closes #797 and #594

See merge request STJr/SRB2!1817
2022-11-11 23:13:16 -06:00
Eidolon
24ab858684 Merge branch 'fix-negative-lives-crash' into 'next'
Fix a crash when scrolling away from a save file with a negative lives count.

See merge request STJr/SRB2!1822
2022-11-11 23:11:44 -06:00
Eidolon
c489b8e2fe Merge branch 'udmf-splat-cut' into 'next'
Cut inner walls of splat FOFs

Closes #891

See merge request STJr/SRB2!1829
2022-11-11 23:03:08 -06:00
Eidolon
f3830b2934 Merge branch 'pandoras-letter' into 'next'
Fix hidden 100% completion reward actually being obtained at 50% completion

See merge request STJr/SRB2!1842
2022-11-11 23:00:24 -06:00
ashifolfi
60ab28c1ab improved down arrow check + t->b/b->t looping 2022-11-11 22:57:17 -06:00
ashifolfi
4c08daa01f remove down arrow at bottom of addon list 2022-11-11 22:57:17 -06:00
ashifolfi
e12db019d6 fix addon menu down arrow always being visible 2022-11-11 22:57:17 -06:00
Alam Ed Arias
f5e1d9722f Merge branch 'master' into next 2022-11-11 22:03:58 -05:00
Alam Ed Arias
c008dc4d1f Merge branch 'master' into 'master'
Fix Typo

See merge request STJr/SRB2!1860
2022-11-12 02:49:43 +00:00
Alam Ed Arias
9b4d6a2109 Fix Typo 2022-11-11 21:46:28 -05:00
Alam Ed Arias
bd2bfe462c Merge branch 'master' into 'master'
Cleanup whitespaces and ignore build folders

See merge request STJr/SRB2!1859
2022-11-12 02:35:53 +00:00
Alam Ed Arias
e1fd0dfca3 Cleanup whitespace changes from SRB2_release_2.1.23 2022-11-11 21:19:29 -05:00
Alam Ed Arias
4e1976839b Cleanup whitespace changes from SRB2_release_2.1.25 2022-11-11 21:19:28 -05:00
Alam Ed Arias
46186d7632 Cleanup whitespace changes from SRB2_release_2.2.2 2022-11-11 21:19:26 -05:00
Alam Ed Arias
7e0fa2d34c Cleanup whitespace changes from SRB2_release_2.2.9 2022-11-11 21:19:25 -05:00