Commit graph

13618 commits

Author SHA1 Message Date
spherallic
77f7374b98 Merge branch 'next' into font_drawer 2023-01-11 22:59:06 +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
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
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
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
71736f358f Merge branch 'controller-fixes' into 'next'
Various controller fixes

Closes #936 and #937

See merge request STJr/SRB2!1914
2023-01-04 01:39:40 +00: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
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
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
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
MascaraSnake
0a0da81007 Fix typo 2022-12-30 07:52:19 +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
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
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
LJ Sonic
29b9fec85d Merge branch 'increase_maxsend' into 'next'
Increased maxsend

See merge request STJr/SRB2!1895
2022-12-21 11:35:33 +00: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
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
fcf69001ad 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.
2022-12-10 01:53:23 -06:00
Eidolon
fb0f0c5e6c cmake: Use MAME YM2612 emu in GME 2022-12-10 01:46:42 -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