MascaraSnake
c84a71dcf5
Merge branch 'splitscreen-hooks' into 'next'
...
Handle splitscreen lua hud lists separately
Closes #935
See merge request STJr/SRB2!1925
2023-01-27 13:53:23 +00:00
MascaraSnake
5c91d78fcb
Merge branch 'rollangle-parity' into 'next'
...
Invert OpenGL rollangle for papersprites to match software renderer behaviour
Closes #849
See merge request STJr/SRB2!1924
2023-01-27 13:52:00 +00:00
Eidolon
e5dea805fa
Revert "Merge branch 'gamepad-refactor' into next"
...
This reverts commit 696e2ab909d98d59494f
2023-01-26 19:26:28 -06:00
Eidolon
366ee4ad92
Revert "Merge branch 'gamepad-refactor-lua-features' into 'next'"
...
This reverts commit 7f1cafcd3d696e2ab909
2023-01-26 19:26:24 -06:00
Eidolon
6cc48a6e89
Revert "Merge branch 'gamepad-refactor-lua-rumble' into 'next'"
...
This reverts commit 7d8e8e20b77f1cafcd3d
2023-01-26 19:26:21 -06:00
Eidolon
7ad54af89f
Revert "Fix axis inversion and camera look inversion"
...
This reverts commit 6428d6fc61
2023-01-26 19:26:17 -06:00
Eidolon
bbf6e8ccce
Revert "sdl: SDL version-guard controller type and hidapi"
...
This reverts commit ec58b1504d
2023-01-26 19:26:02 -06:00
Eidolon
2810a46095
Revert "sdl: Version-guard rumble and extended buttons"
...
This reverts commit f5f224136b
2023-01-26 19:25:59 -06:00
Eidolon
40a5580e65
Revert "sdl: Yet more SDL rumble version-guards"
...
This reverts commit df28ffd72e
2023-01-26 19:25:56 -06:00
Eidolon
f9c9e0829a
Revert "sdl: I can't believe it's more version-guards"
...
This reverts commit fdb6f2aff9
2023-01-26 19:25:53 -06:00
Eidolon
5827a19b89
Revert "Merge branch 'controller-fixes' into 'next'"
...
This reverts commit 71736f358f4e3f78784a
2023-01-26 19:24:52 -06:00
Eidolon
bbd4cff75c
Revert "Merge branch 'gamepadtweaks' into 'next'"
...
This reverts commit 96bfd8cea724f9ec4ec4
2023-01-26 19:24:21 -06:00
Eidolon
f1a7494a31
Handle splitscreen lua hud lists separately
...
Fixes STJr/SRB2#935 by ensuring each drawlist is drawn separately while
stplyr is set correctly.
2023-01-26 08:59:51 -06:00
Lach
42fa7f4723
Invert OpenGL rollangle for papersprites to match software renderer behaviour
2023-01-26 15:29:35 +11:00
Eidolon
b02707a4ee
Adjust caption pop-in by tics instead of frames
...
Fixes STJr/SRB2#900 pop-in animation being affected by framerate
2023-01-25 21:09:50 -06:00
Eidolon
add018cb83
Interpolate minecart marks
...
Fixes STJr/SRB2#906
Uses the old displacement of the minecart to position the mark relative
to its destination. It's not completely correct, but it works.
2023-01-25 21:09:50 -06:00
Eidolon
6c54af3774
Fix precip interpolation
...
Fixes STJr/SRB2#916
2023-01-25 21:09:50 -06:00
Alam Ed Arias
43eb7526c0
Update http-mserv.c
2023-01-20 19:00:50 +00:00
LJ Sonic
379cc4207a
Revert "Merge branch 'netcode-refactor' into merging"
...
This reverts merge request !1920
2023-01-15 17:57:23 +00:00
LJ Sonic
41fb0c8943
Merge branch 'netcode-refactor' into merging
2023-01-15 17:45:06 +01:00
LJ Sonic
fe304ae2db
Cleanup comments
2023-01-15 13:10:23 +01:00
LJ Sonic
d1ba9e0afd
Cleanup
2023-01-15 13:08:31 +01:00
LJ Sonic
425fce69c9
Add missing include directive
2023-01-14 20:02:20 +01:00
LJ Sonic
823fa5d27b
Cleanup
2023-01-14 20:02:06 +01:00
LJ Sonic
9291416a90
Split SV_SendTics into functions
2023-01-14 19:01:36 +01:00
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
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
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
