sphere
fcd4c8334c
Merge branch 'playersetup-and-continue-lua' into 'next'
...
Add "continue" and "playersetup" Lua HUD hooks & draw followitems in the Player Setup menu
See merge request STJr/SRB2!2227
2024-03-13 11:11:36 +00:00
Logan Aerl Arias
084f7bc4f7
Merge branch SRB2:next into playersetup-and-continue-lua
2024-03-04 17:21:26 +00:00
Logan Aerl Arias
5dd82cb7db
Merge branch 'next' into more-sprite2
2024-03-03 11:16:35 -05:00
Alam Ed Arias
a0c27b22c3
Merge branch 'next' into stringop
2024-02-28 13:14:11 -05:00
spherallic
7f51bb3001
Fix build errors & fix F_DrawContinueCharacter somehow becoming unused
2024-02-27 14:22:57 +01:00
spherallic
9fb4b4cfbb
Merge branch 'next' into playersetup-and-continue-lua
2024-02-27 12:31:12 +01:00
spherallic
dbc1fe8c0e
Merge branch 'next' into more-sprite2
2024-02-27 12:23:14 +01:00
sphere
f804ae42c1
Merge branch 'fix-credit-text-disappear' into 'next'
...
Fix credit sequence not compensating for non-green resolutions
Closes #1184
See merge request STJr/SRB2!2320
2024-02-24 00:28:28 +00:00
Alam Ed Arias
53d74e7f89
Clean up stringop-overflow=4 warnings
2024-02-20 13:17:50 -05:00
Arthur
a9b003d35c
If somebody's gonna watch the intro 50+ times, it's gonna be me. :)
2024-02-19 16:59:20 -05:00
Logan Aerl Arias
a7d1d53778
Merge branch 'next' into playersetup-and-continue-lua
2024-02-17 22:17:50 -05:00
Hanicef
e74a819b68
Fix overshoot on credit text rendering
2024-02-15 23:05:03 +01:00
Hanicef
71ce173a0d
Fix credit sequence not compensating for non-green resolutions
2024-02-15 22:03:28 +01:00
Lactozilla
7fbd8f7025
Merge branch 'next' into more-sprite2
2024-01-02 22:09:17 -03:00
Logan Aerl Arias
487b0d22ed
Merge branch 'next' into raise-skin-limit
2024-01-01 16:55:04 -05:00
Logan Aerl Arias
56325399cc
Merge branch SRB2:next into playersetup-and-continue-lua
2023-12-31 17:10:47 +00:00
Lactozilla
70e9e2bdb0
Merge branch 'next' into more-sprite2
2023-12-27 23:48:20 -03:00
Gustaf Alhäll
ddba6e80f7
Handle player state is P_MobjSetState
2023-12-23 13:45:16 +01:00
Lach
e412230ba9
Add "continue" and "playersetup" Lua HUD hooks & draw followitems in the Player Setup menu
2023-11-29 19:27:52 +11:00
Lactozilla
a3e6b5e0fb
Merge remote-tracking branch 'stjr/next' into raise-skin-limit
2023-11-23 13:48:18 -03:00
Lactozilla
5f5f8053fe
Update sprite2 serialize
...
Increase demo version
Fix code not using P_GetSkinSpritedef
Fix code not using correct data type for player sprite
2023-11-13 11:46:55 -03:00
Zwip-Zwap Zapony
cd6cd53959
Combine vid.dupx and vid.dupy
2023-10-30 04:38:51 +00:00
Alam Ed Arias
49d9619192
Merge branch 'master' into raise-skin-limit
2023-10-28 18:09:42 -04:00
LJ Sonic
2a896538d9
Merge branch 'netcode-rerefactor' into 'next'
...
Re-delete netcode
See merge request STJr/SRB2!2083
2023-09-18 16:47:28 +00:00
Zwip-Zwap Zapony
3faa29ded9
Fix the Record Attack background jumping
2023-09-01 22:36:15 +02:00
spherallic
25c220d363
Some credits updates
2023-08-31 16:25:14 +02:00
Sal
492fe94597
Warp cheat adjustments
2023-08-07 18:35:20 +00:00
LJ Sonic
0b17e3c418
Move netcode files to a new folder
2023-07-27 15:38:42 +02:00
Sally Coolatta
77576c3c5d
Allow Record Attack in modified games
...
Replays now store & validate the add-on list before loading them. Custom characters can now be allowed in Record Attack.
2023-07-25 08:45:42 -04:00
Sal
3a52e6deb2
Merge branch 'waiting-players-intermission' into 'next'
...
SRB2Kart netcode ports
See merge request STJr/SRB2!2019
2023-07-24 18:03:45 +00:00
sphere
a752e6c8e4
Merge branch 'kredits' into 'next'
...
Fix inconsistency with title card patch coloring (color the title card patch used in the credits to skin)
See merge request STJr/SRB2!1746
2023-07-19 19:43:15 +00:00
katsy
8cf65e8301
Fix inconsistency with title card patch coloring (color the title card patch used in the credits to skin)
2023-07-19 19:43:15 +00:00
Sally Coolatta
80bf4d6c2d
Port SRB2Kart join on intermission fix
...
All gamestates besides GS_LEVEL are unsupported by the save game functions. This commit forces players joining during these gamestates into GS_WAITINGPLAYERS, which is a basic gamestate that just maintains the connection until we can enter the start of a new one. Also provides an extremely simple drawer for GS_WAITINGPLAYERS so the joining player knows what's going on.
2023-07-16 20:53:28 -04:00
Sally Coolatta
5c3f66dc36
Remove "singletics" code in F_WriteText
...
This was added in 2.1 for whatever reason. All instances of F_WriteText are already capped to the framerate properly by other means; so this code being present just makes timing differences between different netgame clients / other inaccuracies cause the text speed to slow down more than intended.
2023-06-13 21:26:40 -04:00
sphere
0dea372336
Merge branch 'the_elder_skyscroll' into 'next'
...
Rewrite F_SkyScroll to fix overflows
Closes #1008
See merge request STJr/SRB2!1985
2023-06-12 23:36:37 +00:00
Sally Coolatta
d751ad5cf2
Remove "Multiplayer games can't unlock extras!"
2023-06-02 16:06:49 -04:00
Sally Coolatta
49fa46d80e
Online emblems
...
Currently, emblems share with everyone. Will add an option to toggle this.
2023-06-02 16:06:43 -04:00
Zwip-Zwap Zapony
b2313aa4bd
Rewrite F_SkyScroll to fix overflows
2023-05-25 14:55:21 +02:00
MascaraSnake
e4933b3e94
Merge branch 'allow-modified-saving' into 'next'
...
[SUGOI] Allow saving in modified games.
See merge request STJr/SRB2!1749
2023-05-24 05:04:26 +00:00
spherallic
d6cafea571
Don't force FLS to false after a pre-map cutscene
2023-04-28 15:30:02 +02:00
MascaraSnake
846cf71e6a
F_StartTitleScreen: Make sure the level header for gamemap always exists
2023-04-11 18:48:23 +02:00
spherallic
1470d099e3
Update copyright year & credits
2023-03-31 14:53:31 +02:00
Eidolon
e5dea805fa
Revert "Merge branch 'gamepad-refactor' into next"
...
This reverts commit 696e2ab909d98d59494f
2023-01-26 19:26:28 -06: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
717e0d5a17
Move netcode files to a new folder
2022-12-31 14:10:19 +01:00
Sally Coolatta
1b43cdddd5
Allow saving in modified games.
2022-11-16 11:14:29 -05: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
Monster Iestyn
6a6d92a824
Update credits
2022-11-10 14:08:11 +00:00
Eidolon
12c2ddb115
Merge branch 'uncappedrevengeance' into next
...
Uncapped
See merge request STJr/SRB2!1856
# Conflicts:
# src/dummy/i_system.c
# src/win32/win_sys.c
2022-11-08 21:13:50 -06:00
Monster Iestyn
67fb09ec0d
removed a name from credits by request
2022-11-05 21:20:53 +00:00
