Commit graph

114 commits

Author SHA1 Message Date
Lactozilla
5fd606ead3 Fix #1324 2024-12-13 15:18:27 -03:00
Lactozilla
e7b4beba20 Update dates in copyright notices of all files modified in 2024 2024-09-21 21:35:01 -03:00
Hanicef
7061c30744 Pass save_t to NetVar save/load function 2024-08-25 12:24:03 +02:00
sphere
02ee3382da Merge branch 'demolition' into 'next'
Fix exitgame-ing a demo crashing the game (resolves #1237)

Closes #1237

See merge request STJr/SRB2!2419
2024-06-03 14:47:28 +00:00
pastel
4840310f1a Fix exitgame-ing a demo crashing the game (resolves #1237) 2024-06-03 14:47:27 +00:00
sphere
6b8f4ab398 Merge branch 'allowdesync' into 'next'
Add a console variable that will allow individual demos to desync....

See merge request STJr/SRB2!2361
2024-06-03 13:45:37 +00:00
sphere
ee96ed12a4 Merge branch 'more-sprite2' into 'next'
Add 'sprite2' field to states

See merge request STJr/SRB2!2211
2024-03-07 12:06:48 +00:00
Logan Aerl Arias
89620dbd9e Merge branch 'shield-button-touchups' into 'next'
Shield Button Touchups

See merge request STJr/SRB2!2257
2024-03-03 23:37:05 +00:00
Logan Aerl Arias
ba35849b5a Merge branch SRB2:next into shield-button-touchups 2024-03-03 16:17:08 +00:00
Logan Aerl Arias
5dd82cb7db Merge branch 'next' into more-sprite2 2024-03-03 11:16:35 -05:00
Logan Aerl Arias
93a191efa9 Merge branch SRB2:next into instant-setscale 2024-03-03 16:15:59 +00:00
Alam Ed Arias
a9ef21aa50 Clang: clean up conditional-uninitialized warnings 2024-03-01 19:35:04 +00:00
spherallic
dbc1fe8c0e Merge branch 'next' into more-sprite2 2024-02-27 12:23:14 +01:00
Zwip-Zwap Zapony
90958614f3 Shield button touchups 2024-02-24 15:41:36 +01:00
Arthur
a407ff8899 Zwip Zwap Zapony's suggestion to use a consvar 2024-02-21 16:22:00 -05:00
Arthur
716b9527bf Add a -allowdesync parameter that will allow individual demos to desync. Warning is still shown, but player position will not be modified. 2024-02-21 14:38:11 -05:00
Logan Aerl Arias
cf5520b275 Merge branch SRB2:next into instant-setscale 2024-02-17 03:25:41 +00:00
sphere
5a00859baa Merge branch 'bouncy-nights-fixes' into 'next'
General NiGHTS Fixes

See merge request STJr/SRB2!2199
2024-01-29 13:55:25 +00:00
Lactozilla
0ffcf89c85 Merge branch 'next' into more-sprite2 2024-01-08 02:55:19 -03:00
Zwip-Zwap Zapony
564d18b1ea Add and use an "instant" parameter for P_SetScale 2024-01-03 14:04:40 +01:00
Logan Aerl Arias
3992e83e8f Revert "Merge branch 'thokking-hell' into 'next'"
This reverts merge request !1551
2024-01-03 03:46:26 +00:00
Lactozilla
7fbd8f7025 Merge branch 'next' into more-sprite2 2024-01-02 22:09:17 -03:00
Lactozilla
31f7616d3a Fix #1166 2024-01-02 20:58:55 -03:00
Logan Aerl Arias
487b0d22ed Merge branch 'next' into raise-skin-limit 2024-01-01 16:55:04 -05:00
Logan Aerl Arias
a0bd81d09a Merge branch SRB2:next into bouncy-nights-fixes 2023-12-31 17:07:22 +00:00
Logan Aerl Arias
091a874514 Merge branch 'thokking-hell' into 'next'
New CA_THOK effect

See merge request STJr/SRB2!1551
2023-12-31 14:16:27 +00:00
Zwip-Zwap Zapony
c361b732db General NiGHTS fixes 2023-12-29 16:04:03 +01:00
Lactozilla
70e9e2bdb0 Merge branch 'next' into more-sprite2 2023-12-27 23:48:20 -03:00
Logan Aerl Arias
b5a4f227f6 Merge branch 'fix-segfault-removemobj-spawn' into 'next'
Fix segfaults when P_RemoveMobj is called from MobjSpawn hook

See merge request STJr/SRB2!1973
2023-12-25 23:58:26 +00:00
Lactozilla
a3e6b5e0fb Merge remote-tracking branch 'stjr/next' into raise-skin-limit 2023-11-23 13:48:18 -03:00
Lactozilla
90ac57562f Skip sizeof(UINT16) bytes in the stream instead of sizeof(UINT8) 2023-11-13 13:09:25 -03:00
Lactozilla
0df7ded6be Fix typos 2023-11-13 11:52:12 -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
Lactozilla
4408f4462e Add 'sprite2' field to states 2023-11-12 21:46:49 -03:00
Lactozilla
e9637322f9 Simplify fix
pickedchar doesn't need to be set in these two places, since G_DeferedInitNew already does that.
2023-10-31 16:45:47 -03:00
Lactozilla
4e446d22d6 Fix pickedchar not being set when it should have been 2023-10-31 04:04:01 -03:00
Alam Ed Arias
a2e288a4dc Merge branch 'master' into fix-segfault-removemobj-spawn 2023-10-28 20:40:07 -04:00
Alam Ed Arias
49d9619192 Merge branch 'master' into raise-skin-limit 2023-10-28 18:09:42 -04:00
Alam Ed Arias
d0cb7707e3 Merge branch SRB2:next into thokking-hell 2023-10-25 19:40:02 +00:00
Zwip-Zwap Zapony
fb9e6c9c6d Use if-range instead of switch for demo versions 2023-09-22 18:16:54 +02: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
062af20628 Don't change cv_skin or cv_playercolor if there is no need to 2023-08-15 04:29:50 -03:00
SteelT
6780f89574 Add missing param to G_CheckDemoExtraFiles in G_CheckDemoForError 2023-08-04 15:59:47 -04:00
Sally Coolatta
39175c6c70 Improved version checks for demo file lists
No longer relies on the demoversion global variable (which was incorrect for a couple instances, like ghosts), now we pass the version to the file list functions. Also don't set any demo global variables when checking a demo for valid files before playback. Also also, exit said file check function asap if its a title demo instead of doing it after we've already opened the file.
2023-08-04 14:36:56 -04:00
LJ Sonic
b2441114e8 Reapply recent netcode changes 2023-08-01 18:24:07 +02:00
LJ Sonic
0b17e3c418 Move netcode files to a new folder 2023-07-27 15:38:42 +02:00
Sally Coolatta
dc9346a45d Add forwardmove rng backwards compat with demos 2023-07-26 07:50:47 -04:00
Sal
6a0be65315 Merge branch 'brokenrecord' into 'next'
Make reading and writing of all player stats to record attack demos precise (resolves #1048)

Closes #1048

See merge request STJr/SRB2!2045
2023-07-26 11:43:32 +00:00
Sally Coolatta
dded352293 Harsher replay menu
Don't allow loading demos with invalid file lists at all. If you insist on doing this, it has to be done from the command line now.
2023-07-25 09:43:10 -04:00
Sally Coolatta
f99cf91d3d Promote file count to UINT16 2023-07-25 09:29:09 -04:00