Commit graph

806 commits

Author SHA1 Message Date
Lactozilla
fffc142d67 Merge branch 'fix-1258' into 'next'
Fix #1258

Closes #1258

See merge request STJr/SRB2!2508
2024-09-12 21:05:48 +00:00
Hanicef
f34476bf0a Merge remote-tracking branch 'origin/next' into lift-savebuffer-limits 2024-09-07 12:57:58 +02:00
Lactozilla
417bd0b000 Fix #1258 2024-08-24 19:18:28 -03:00
Hanicef
8e337487ea Fix players being unmuted after respawning 2024-08-02 21:42:27 +02:00
Hanicef
792b80cddb Lift savebuffer limits 2024-07-07 17:02:48 +02:00
spherallic
88fa2eb776 Set player height to skin height instead of default height in G_AddPlayer 2024-07-01 19:53:12 +02:00
pastel
712414817b also fix ticcmd intro crash 2024-05-28 13:51:29 -05:00
katsy
92cccd682c Fix automatic mode z-target bugs and crashes 2024-04-17 18:00:30 -05:00
Logan Aerl Arias
ba35849b5a Merge branch SRB2:next into shield-button-touchups 2024-03-03 16:17:08 +00:00
Alam Ed Arias
a9ef21aa50 Clang: clean up conditional-uninitialized warnings 2024-03-01 19:35:04 +00:00
Zwip-Zwap Zapony
90958614f3 Shield button touchups 2024-02-24 15:41:36 +01:00
SteelT
97afd18e96 Fix G_SaveGameData crash if quit early
Fixes a crash that can occur if data struct is passed to G_SaveGameData before it is allocated.
2024-02-14 02:27:58 -05:00
Logan Aerl Arias
2df90ec96b Merge branch SRB2:next into emblemexitfix 2024-02-12 05:09:04 +00:00
Lactozilla
053a9fc2e2 Fix netgame joining
Regression introduced by !2279.
2024-02-04 02:43:28 -03:00
Logan Aerl Arias
4dd2415262 Merge branch 'exitfix' into 'next'
Only Consider ExitLevel a Cheat When Used to Cheat

See merge request STJr/SRB2!2159
2024-01-02 03:05:24 +00:00
Logan Aerl Arias
487b0d22ed Merge branch 'next' into raise-skin-limit 2024-01-01 16:55:04 -05:00
Logan Aerl Arias
82f37ccadd Merge branch SRB2:next into emblemexitfix 2023-12-31 17:03:43 +00:00
Logan Aerl Arias
8c3d590730 Merge branch SRB2:next into exitfix 2023-12-31 17:03:12 +00:00
Logan Aerl Arias
8e86cf6a5c Merge branch 'configurable-spam-protection' into 'next'
Make chat spam protection more configurable

See merge request STJr/SRB2!2127
2023-12-25 23:59:07 +00:00
spherallic
7893d08407 Fix realmapnamep not being set with map * and + 2023-12-22 14:23:24 +01:00
sphere
37ecb6b48e Merge branch 'mapcommand' into 'next'
Add shortcuts for current/next map to map command

See merge request STJr/SRB2!2169
2023-12-22 10:54:01 +00:00
Lactozilla
0498c16cb6 Merge branch 'next' into raise-skin-limit 2023-11-26 23:08:13 -03:00
SMS Alfredo
e50993861e Dedicated Shield / Super Transformation Button 2023-11-26 20:38:49 +00:00
Lactozilla
a3e6b5e0fb Merge remote-tracking branch 'stjr/next' into raise-skin-limit 2023-11-23 13:48:18 -03:00
Alam Ed Arias
49d9619192 Merge branch 'master' into raise-skin-limit 2023-10-28 18:09:42 -04:00
LJ Sonic
c0146744b7 Normalise 2.3-related TODO comments 2023-10-28 14:46:10 +02:00
LJ Sonic
4fa4d6e076 Implement input.ignoregameinputs 2023-10-27 17:34:29 +02:00
Alam Ed Arias
d1fb9e191a Merge branch SRB2:next into configurable-spam-protection 2023-10-23 18:29:32 +00:00
spherallic
4fc5c9af34 Simplify single-character checks 2023-10-10 16:36:52 +02:00
spherallic
d2996a308c Add shortcuts for current/next map to map command 2023-10-07 00:55:29 +02:00
SMS Alfredo
7bcad024f8 Only Award Bonuses / RA Emblems from Physically Beating a Level 2023-09-19 21:48:01 -05:00
SMS Alfredo
71b0f002c9 Only Consider ExitLevel a Cheat When Used to Cheat 2023-09-19 17:17:00 -05: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
Lactozilla
69df136e2b Merge remote-tracking branch 'stjr/next' into team-gametype-keep-player-color 2023-09-12 19:17:07 -03:00
sphere
fefdd7987c Merge branch 'title-animation-skip' into 'next'
Allow input during title animation after the first time

See merge request STJr/SRB2!2122
2023-09-05 22:23:57 +00:00
spherallic
85fc55bfc1 Prevent title input during negative finalecount 2023-09-05 19:38:45 +02:00
sphere
b7b1e0b1e5 Add toggle for instant retry in Record Attack 2023-09-05 17:24:03 +00:00
Gustaf Alhäll
e0ea677ca4
Make chat spam protection more configurable 2023-08-30 19:32:13 +02:00
sphere
4bd296f98f Merge branch 'issue933' into 'next'
Fix for issue #933 - special stage tokens should divert player until after the...

See merge request STJr/SRB2!1910
2023-08-21 08:20:43 +00:00
spherallic
ce721f9f78 Allow input during title animation after 1st play 2023-08-20 23:40:13 +02:00
Lactozilla
976b9b862d Restore player skins if forced skin restrictions are lifted 2023-08-15 13:51:12 -03:00
Lactozilla
062af20628 Don't change cv_skin or cv_playercolor if there is no need to 2023-08-15 04:29:50 -03:00
SteelT
3fbdaa61b7 Merge branch 'cherry-pick-86367e4e' into 'next'
Add gametype parameter to G_SetCustomExitVars and G_ExitLevel

See merge request STJr/SRB2!2101
2023-08-10 00:01:24 +00:00
Sal
492fe94597 Warp cheat adjustments 2023-08-07 18:35:20 +00:00
Lactozilla
b92dc42848 Add gametype parameter to G_SetCustomExitVars and G_ExitLevel
(cherry picked from commit 86367e4ec1)
2023-08-07 13:23:57 -04:00
Lactozilla
3377fa986a Remember the player's color after a team gametype 2023-08-07 13:37:07 -03:00
SteelT
fd4c50589d Don't set recordscore to 0 in G_PlayerFinishLevel
Fixes the recordscore being reset on intermission start
2023-08-01 15:23:14 -04:00
LJ Sonic
df0c8e0557 Merge remote-tracking branch 'origin/next' into netcode-rerefactor 2023-08-01 19:00:52 +02:00
Sal
1ddc04abc6 Merge branch 'cmake-rr-ports' into 'next'
Ring Racers CMake + Debug build improvements

See merge request STJr/SRB2!2075
2023-08-01 02:29:45 +00:00
Sal
26583a9845 Ring Racers CMake + Debug build improvements 2023-08-01 02:29:45 +00:00