Commit graph

26391 commits

Author SHA1 Message Date
Oni
159c41425b Merge branch 'const-netxcmd-buffer' into 'fix-lua-command-exploit'
Pass const pointer to all netxcmd handlers

See merge request KartKrew/Kart!1918
2024-02-18 03:21:38 +00:00
Oni
e9af71faf0 Merge branch 'dont-clear-demo-attract' into 'master'
Don't reset demo.attract in D_ClearState

Closes #1053

See merge request KartKrew/Kart!1928
2024-02-18 03:17:24 +00:00
Eidolon
0a0179e1df Merge branch 'fix-7th-place-game-over' into 'master'
Lose player life before P_CheckRacers on exit

Closes #1022

See merge request KartKrew/Kart!1924
2024-02-18 01:48:34 +00:00
Eidolon
d30cdbd479 Merge branch 'fix-mt-sscandle' into 'master'
Fix MT_SSCANDLE initialization

Closes #1052

See merge request KartKrew/Kart!1925
2024-02-18 01:48:00 +00:00
Oni
674a5e8c7a Merge branch 'limited-footfix' into 'master'
GL: Don't pull papersprites towards camera

Closes #988

See merge request KartKrew/Kart!1923
2024-02-18 01:22:14 +00:00
Oni
8649e34ccd Merge branch 'no-explosion-thrust' into 'master'
Battle polish mk.420

Closes #1041 and #1050

See merge request KartKrew/Kart!1922
2024-02-18 01:22:01 +00:00
James R
cc240600e9 M_CheckCondition: fix UCRP_PODIUMCUP GP grade
- PodiumCup grade condition was completely broken and
  checked against the cup ID instead of the grade letter
2024-02-17 16:39:07 -08:00
James R
2e60465638 debugchallenges: unset conditionset achieved
If you undo an unlock, fixes that unlock automatically
unlocking itself the next time conditions are evaluated.
2024-02-17 16:38:13 -08:00
Eidolon
4cab794932 Don't reset demo.attract in D_ClearState
Fixes KartKrew/Kart#1053 allowing credits to continue after demo is
exited.
2024-02-17 17:59:20 -06:00
toaster
d87fba3f57 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into separate-spb-attack-records 2024-02-17 23:13:06 +00:00
toaster
8033417551 Y_CalculateMatchData: Only use player tally if data is valid 2024-02-17 23:12:31 +00:00
toaster
b70e59755f Tie SPB Attack and Encore together
- A method to access Encore in Time Attack
    - so we have SOME Encore singleplayer content on launch
- Also available for Versus mode (in Special Attack)
    - Finally, Encore rematches have a way to access them!
    - Obviously will not spawn a chasing SPB, it's just a signal for "hard mode"
- Relevant gametype + unlock checks have been abstracted into M_EncoreAttackTogglePermitted
2024-02-17 23:11:58 +00:00
Eidolon
9c14c59929 Fix MT_SSCANDLE initialization 2024-02-17 16:35:46 -06:00
Eidolon
d917a7f394 Ignore no-contest antigrief if no humans left
Allows all-bots races to continue to intermission and advance to next
level. Fixes KartKrew/Kart#1018
2024-02-17 16:23:08 -06:00
Oni
793e56b66d Merge branch 'gp-egg-tv' into 'master'
Grand Prix support for replays

Closes #1042, #993, and #1044

See merge request KartKrew/Kart!1921
2024-02-17 22:04:13 +00:00
Eidolon
ad0ced4da0 Save config to temp file and move into place
Fixes KartKrew/Kart#1020 by not trying to write over ringconfig until
we have successfully written the whole config out, then atomically
replacing the old config with the new one using C++17 FS.
2024-02-17 15:41:32 -06:00
Eidolon
d3783dec11 Lose player life before P_CheckRacers on exit
Fixes KartKrew/Kart#1022 by ensuring the player has 0 lives by the time
P_CheckRacers indirectly calls G_BeginLevelExit.
2024-02-17 15:12:04 -06:00
AJ Martinez
25ea0bf743 Exclude all "3D Geometry" sprites from sprite-clip hack 2024-02-14 04:14:28 -07:00
AJ Martinez
77617c9d31 GL: Don't pull papersprites towards camera 2024-02-13 18:19:52 -07:00
AJ Martinez
c1c31c28ef Use proper sound for periodic bufo reminder 2024-02-13 00:29:40 -07:00
James R
8bf2343a5d Egg TV: Prisons, Sealed Star and Versus icons 2024-02-12 18:22:59 -08:00
James R
822d67e422 Egg TV: rename "Special" mode to "Sealed Star" 2024-02-12 18:22:59 -08:00
James R
b275a14ec2 Egg TV: detect Prisons mode 2024-02-12 18:22:59 -08:00
James R
aa4ff315b7 Replays: bump demo version 7 -> 8 2024-02-12 18:14:33 -08:00
James R
b2ce6aebe7 Replays: save Grand Prix info
- grandprixinfo
  - gp
  - gamespeed
  - masterbots
  - eventmode
- player_t
  - lives
  - totalring
2024-02-12 18:14:32 -08:00
James R
6dc8f45df6 Replays: flags UINT8 -> UINT16 2024-02-12 18:14:32 -08:00
James R
5650dde2ac G_DoPlayDemo: fix encoremode boolean on demo playback
Fixes the Title Card using the wrong sound effect
2024-02-12 18:14:32 -08:00
AJ Martinez
0a5baa5d39 UFO polish 2024-02-12 18:12:17 -07:00
Oni
796e2b9517 Merge branch 'bumper-boats' into 'master'
Improved combo escape mechanics in Battle

See merge request KartKrew/Kart!1914
2024-02-12 18:50:20 +00:00
Oni
524b63ad8f Merge branch 'pit-blame' into 'master'
Credit players for deathpits that result from their hits ("pit blame")

Closes #1040

See merge request KartKrew/Kart!1920
2024-02-12 18:49:30 +00:00
AJ Martinez
11f7eb4b26 Guard against out-of-range pitblame, reset pitblame when triggered 2024-02-11 23:43:42 -07:00
AJ Martinez
c0598610e9 Credit players for deathpits that result from their hits 2024-02-11 21:40:53 -07:00
Oni
7a54b3eb3b Merge branch 'debug-holy-textures' into 'master'
Debugging for holey textures on walls

Closes #1038

See merge request KartKrew/Kart!1919
2024-02-12 01:40:59 +00:00
James R
3e225f97a2 Render errored holey textures as TRANSERx 2024-02-11 17:10:09 -08:00
James R
38c9c5f9a7 devmode render: show a list of errored holey textures on the HUD
Holey textures (textures with transparent pixels) cannot
be used on upper/lower textures or on 1-sided linedefs. If
the game tries to render this, the texture name will
appear on the HUD if devmode render is turned on.
2024-02-11 17:10:09 -08:00
James R
c0a6d20cec Got_Luacmd: always read netxcmd data, even if command is not executed 2024-02-11 15:48:00 -08:00
Eidolon
63ff2f3f66 Check Lua stack before pushing cons args
Prevents a Lua stack overrun when executing absurd console commands for
local-only lua commands.
2024-02-11 15:48:00 -08:00
toaster
3f78c9d2e6 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into separate-spb-attack-records
# Conflicts:
#	src/menus/play-local-race-time-attack.c
#	src/p_setup.cpp
2024-02-11 23:27:33 +00:00
James R
10800f307c promote, demote: bounds checking, remove intermediate buffer
- Check playernum is in range [0, MAXPLAYERS-1]
- Do not copy string to intermediate buffer
2024-02-11 05:48:06 -08:00
James R
4ee00d4333 Pass const pointer to all netxcmd handlers
Ensure buffer data is read-only and not modified by
handler
2024-02-11 05:42:07 -08:00
James R
c0b823fe6a Let READ macros be used with const pointers 2024-02-11 05:41:50 -08:00
James R
6d64d15216 Got_Saycmd: copy message content into intermediate buffer
This prevents modifying the original buffer at the cleanup
step as well as potentially writing out of bounds.
2024-02-11 05:38:12 -08:00
James R
42bca87c9a Got_Luacmd: ensure lua stack is large enough for command arguments 2024-02-11 05:33:20 -08:00
AJ Martinez
09b5cb5020 MAXCOMBOTIME 6s -> 4s 2024-02-10 15:50:15 -07:00
AJ Martinez
8f2989a8a9 Don't inflate bumpers you're going to lose 2024-02-10 15:28:26 -07:00
AJ Martinez
b55d236733 Scale bumper size to combo length when hit 2024-02-10 15:16:48 -07:00
AJ Martinez
18ee3ad73d Battle bumpers: 3x progressivethrust decay 2024-02-10 14:38:04 -07:00
AJ Martinez
e0494d5576 Merge remote-tracking branch 'origin/master' into bumper-boats 2024-02-09 22:32:25 -07:00
Oni
da84a94362 Merge branch 'hyu-feedback' into 'master'
Add Hyudoro sounds

Closes #1030

See merge request KartKrew/Kart!1912
2024-02-10 04:42:29 +00:00
Oni
83183b53cf Merge branch 'fix-column-fix' into 'master'
R_DrawColumn_Template: fix non-po2 column drawing

Closes #1033

See merge request KartKrew/Kart!1913
2024-02-10 04:41:25 +00:00