Commit graph

27273 commits

Author SHA1 Message Date
Sal
aa3499bcbd Merge branch 'desc-final' into 'master'
Challenge Conditions: BONUS ROUND --> GRAND PRIX

See merge request KartKrew/Kart!2250
2024-04-10 00:58:46 +00:00
Sal
5cec579f50 Merge branch 'cup-preview-final' into 'master'
Show Prison Break in GP cup preview

See merge request KartKrew/Kart!2251
2024-04-10 00:57:21 +00:00
Sal
5dd38a4e88 Merge branch 'last-minute-hud-fixes' into 'master'
Last Sealed Star GAME OVER HUD fixes; fix Save Replay prompt displaying the wrong button

Closes #1256 and #1253

See merge request KartKrew/Kart!2248
2024-04-10 00:56:31 +00:00
SteelT
cd9d8d59db Merge branch 'fix-gl-blend-modes' into 'master'
gl: Treat PF_Masked as lower priority than other modes

Closes #512

See merge request KartKrew/Kart!2253
2024-04-09 20:02:32 +00:00
Sal
b8981b46bc Merge branch 'fix-missing-evaluation' into 'master'
Fix missing evaluation screen at end of GP credits

Closes #1261

See merge request KartKrew/Kart!2247
2024-04-09 18:41:53 +00:00
Eidolon
3c881597c9 gl: Treat PF_Masked as lower priority than other modes 2024-04-09 13:41:32 -05:00
toaster
1034dd7ec9 Grand Prix course preview adjustment: Show Prison Break stages too, just like on Challenges Board preview
- All gametypes will be shown in the drawer, as opposed to just Race
- However, don't attempt to add the preview pic for CUPCACHE_SPECIAL (the Sealed Star)
2024-04-09 17:47:30 +01:00
toaster
595c1ff9c8 BONUS ROUND --> GRAND PRIX
Also, slightly clearer phrasing for "Grab a certain prize"
2024-04-09 16:55:57 +01:00
Sal
38274046a9 Merge branch 'all-prisons-finish-conditions' into 'master'
FinishTime conditions: Guarantee all Prison Eggs broken before award

See merge request KartKrew/Kart!2244
2024-04-09 07:40:54 +00:00
James R
bb5297c780 Fix wrong button on Save Replay prompt
- Y -> X
2024-04-08 23:24:15 -07:00
James R
041fd67ab0 Tally: only show GAME OVER in Sealed Stars if a player entered with 0 lives, not if they die in that round
- This is only relevant for splitscreen
2024-04-08 23:24:08 -07:00
James R
ca9fbed974 Podium: fix time for failed Sealed Star
- Displays as --'--"--
2024-04-08 23:21:17 -07:00
James R
a18cfeb58d Init evaluation screen at start of credits, to circumvent clobbered grandprixinfo
- Credits demos will erase grandprixinfo
- Call F_InitGameEvaluation (new function) at the
  beginning of the credits to cache the needed data from
  grandprixinfo
- Fixes the evaluation screen not showing up for GP
  credits
2024-04-08 22:06:58 -07:00
James R.
f4ea9cf8ca Merge branch 'fix-credits-demo-rec-crash' into 'master'
Reset demobuf even when not saving a demo

Closes #1254

See merge request KartKrew/Kart!2246
2024-04-09 01:33:19 +00:00
Eidolon
3348c571b1 Reset demobuf even when not saving a demo 2024-04-08 19:26:02 -05:00
James R
307fe7b1e4 git-build: ring bell after build completes 2024-04-08 17:16:23 -07:00
toaster
4794440eea FinishTime, FinishTimeExact, FinishTimeLeft conditions: Guarantee all Prison Eggs are broken before awarding
Fixes how running out of time activated the Death Egg's Eye challenge
Done this way to avoid extensive last minute unlocks.pk3 update
2024-04-08 23:11:12 +01:00
James R
ddc91276cd README.md: fix git repo domain 2024-04-07 16:44:01 -07:00
toaster
acafb938e3 Update bios.pk3 hash (again) 2024-04-07 23:23:39 +01:00
James R.
0b02de4d77 Merge branch 'update-readme' into 'master'
Update readme

See merge request KartKrew/Kart!2243
2024-04-07 21:25:16 +00:00
Eidolon
480209f695 Adjust readme disclaimer, add logo 2024-04-07 16:11:58 -05:00
toaster
75fe511fa7 Merge branch 'disclamer-zfree-fix' into 'master'
Fix double free in F_DisclaimerDrawScene

See merge request KartKrew/Kart!2242
2024-04-07 20:59:11 +00:00
Eidolon
9d8f2d5916 Update readme 2024-04-07 15:56:05 -05:00
SteelT
2bc281b278 Fix double free in F_DisclaimerDrawScene 2024-04-07 16:34:47 -04:00
Eidolon
8dfd59e8d0 Update win32 resource strings to refer to KKD 2024-04-07 15:29:04 -05:00
Eidolon
730817437f Update bios.pk3 hash 2024-04-07 14:40:37 -05:00
toaster
737e750170 Compilation fix for release build 2024-04-07 20:34:43 +01:00
Eidolon
423037796f Update asset hashes 2024-04-07 14:25:26 -05:00
toaster
5afa8834ed Merge branch 'fix-splitscreen-gp-tidy' into 'master'
Fix remaining bugs with splitscreen GP GAME OVER

Closes #1251

See merge request KartKrew/Kart!2241
2024-04-07 19:23:50 +00:00
James R
e8c84cb013 Splitscreen GP: timer is considered 000 for GAME OVERed players 2024-04-07 02:20:59 -07:00
James R.
c0b4fedd2c Merge branch 'fix-lua-karthud-constant-array' into 'master'
Fix mismatched Lua lookup array for karthud constants

See merge request KartKrew/Kart!2240
2024-04-07 05:32:31 +00:00
James R
44ea14104e Add G_GametypeAllowsRetrying, split away from G_GametypeUsesLives
- Cases for lives specifically and not retrying use
  G_GametypeUsesLives
  - Such as HUD elements and GAME OVER

- Cases for retrying and losing lives use
  G_GametypeAllowsRetrying
  - Such as GP bonus rounds
2024-04-06 22:19:34 -07:00
James R
b7a3d4e508 Splitscreen GP: fix player positions if GAME OVERed player is present
- If splitscreen player spawns GAME OVERed, make absolute
  certain they appear in last place and don't affect any
  higher positions
2024-04-06 21:52:57 -07:00
Ashnal
023c09ccda Fix mismatched Lua lookup array for karthud constants 2024-04-06 23:32:03 -04:00
Sal
16f6988454 Merge branch 'splitscreen-game-over-fix' into 'master'
Fix splitscreen GP GAME OVER visual bugs

Closes #1247

See merge request KartKrew/Kart!2239
2024-04-07 03:14:05 +00:00
James R
7a49be028a Splitscreen GP: do not switch away viewpoint on death in Prisons mode 2024-04-06 18:33:59 -07:00
James R
d9a1baa9f1 K_drawKartMinimap: fix minor typo 2024-04-06 17:49:22 -07:00
James R
93e444c0d9 HUD: fade-in instead of slide-in 2P minimap
- Slide-in is always based off of player 1, who may have
  GAME OVERED before the race even started thus hiding the
  minimap
2024-04-06 17:49:22 -07:00
James R
0d76746a95 GP: show GAME OVER tally in Sealed Stars 2024-04-06 17:49:22 -07:00
James R
01016ceee9 Splitscreen GP: hide GAME OVERED player sprite and VFX
- Does not interfere with destroyed kart explosion
2024-04-06 17:49:22 -07:00
Sal
1ff321d375 Merge branch 'retry-end-demo' into 'master'
Simpler solution to #1225: If a retry flag occurs in a demo, stop playback immediately!

See merge request KartKrew/Kart!2230
2024-04-06 23:27:08 +00:00
toaster
d618802abc Additional hack for Sealed Star game over: In demo.playback, do a retry flag anyways, just to guarantee it ends
Also guarantee it uses demo.netgame status where relevant
2024-04-06 23:57:25 +01:00
toaster
f06e6e8d26 Podium HUD: Use player's skin for minimap rank icon, not the overall best skin (Resolves #1246) 2024-04-06 23:14:10 +01:00
toaster
5b466527e8 Merge branch 'throw-more-dots' into 'master'
Add a bunch more statistics

See merge request KartKrew/Kart!1973
2024-04-06 22:08:30 +00:00
toaster
4a937936b7 load_ng_gamedata: In DEVELOP, if a skin's wins exceeds a skin's rounds, set rounds to wins
Basically just for testing this branch, at this rate
2024-04-06 22:54:08 +01:00
toaster
cea9a80b2a M_StatisticsChars: Sort for descending rounds completed 2024-04-06 22:52:59 +01:00
toaster
96b784defd Convert menus/extras-statistics to cpp 2024-04-06 22:50:44 +01:00
toaster
1f6038be65 Add "Time Tracked" page to Statistics
Ugly but releasable
2024-04-06 22:19:51 +01:00
toaster
825eda9861 Statistics "Characters & Engine Classes" page: Show Wins/Rounds, not just Wins 2024-04-06 22:16:51 +01:00
toaster
f1c9f54727 Count SPB Attack as a subset of Time Attack, not seperate 2024-04-06 21:47:28 +01:00