Commit graph

14187 commits

Author SHA1 Message Date
spherallic
4a1e99729b Merge branch 'next' into public_next 2023-01-31 15:47:11 +01:00
sphere
337a94eb99 Merge branch '2211-gamepaddefaults' into 'next'
Change gamepad defaults for 2.2.11

Closes #813

See merge request STJr/SRB2!1928
2023-01-31 14:43:30 +00:00
MascaraSnake
efca1eccca Merge branch 'floormover-tag-fix' into 'next'
EV_DoFloor: Set dummy tag correctly for chained linedef executing

Closes #932

See merge request STJr/SRB2!1898
2023-01-28 06:33:11 +00:00
MascaraSnake
02fa860c46 Merge branch 'thingonspecial3dfloor' into 'next'
Re-add P_ThingOnSpecial3DFloor for Lua backwards compatibility

See merge request STJr/SRB2!1905
2023-01-28 06:32:42 +00:00
MascaraSnake
6055b1490b Merge branch 'udmf-triggerer' into 'next'
UDMF: Use string values for the sector "triggerer" field

See merge request STJr/SRB2!1902
2023-01-28 06:32:29 +00:00
MascaraSnake
c25cb5732d Merge branch 'specialstagepit-fix' into 'next'
Disable exit sectors in non-NiGHTS special stages because they interfere with the pits

Closes #930

See merge request STJr/SRB2!1900
2023-01-28 06:32:16 +00:00
Jaime Ita Passos
b64dac714f Fix -Wnon-literal-null-conversion and -Wconstant-conversion warnings 2023-01-28 00:18:55 -03:00
spherallic
a6599c176d Change gamepad defaults for 2.2.11 2023-01-27 16:49:53 +01:00
Arthur
20724ad70b Also retain PF_CANCARRY 2023-01-27 09:46:02 -05:00
spherallic
3bc519ed65 Merge branch 'next' into bbox 2023-01-27 14:59:39 +01:00
MascaraSnake
f94695390e Merge branch 'revert-gamepads' into 'next'
Revert Gamepads for now

See merge request STJr/SRB2!1926
2023-01-27 13:53:45 +00:00
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
MascaraSnake
32183d1e82 Merge branch 'uncap-fixes' into 'next'
Minor interpolation fixes

Closes #900, #906, and #916

See merge request STJr/SRB2!1923
2023-01-27 13:51:02 +00:00
Eidolon
e5dea805fa Revert "Merge branch 'gamepad-refactor' into next"
This reverts commit 696e2ab909, reversing
changes made to d98d59494f.
2023-01-26 19:26:28 -06:00
Eidolon
366ee4ad92 Revert "Merge branch 'gamepad-refactor-lua-features' into 'next'"
This reverts commit 7f1cafcd3d, reversing
changes made to 696e2ab909.
2023-01-26 19:26:24 -06:00
Eidolon
6cc48a6e89 Revert "Merge branch 'gamepad-refactor-lua-rumble' into 'next'"
This reverts commit 7d8e8e20b7, reversing
changes made to 7f1cafcd3d.
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 71736f358f, reversing
changes made to 4e3f78784a.
2023-01-26 19:24:52 -06:00
Eidolon
bbd4cff75c Revert "Merge branch 'gamepadtweaks' into 'next'"
This reverts commit 96bfd8cea7, reversing
changes made to 24f9ec4ec4.
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