Commit graph

2114 commits

Author SHA1 Message Date
AJ Martinez
6173ca47aa SPB Attack: emblems/medals preliminary 2023-03-03 12:15:00 -08:00
toaster
002de8c948 G_LoadGameData: Regenerate challengegrid from previous minor versions 2023-03-03 16:00:45 +00:00
toaster
db52c22a83 More NULL handling for gamedata
Partial duplicate of MR 1010, but 1) wanted to guarantee no merge conflicts before I forgot and 2) I added things in previous commits which needed stronger guarding
2023-03-03 13:59:59 +00:00
toaster
53ce2e4287 Gamedata-related changes + Crash tracking
- Combine multiple adjacent saves
    - Generally could happen during game ticking, combined via gamedata->deferredstate
    - DEFINITELY happened in splitscreen PWR handling, adjust those loops directly
- Write "dirty" state via gamedata->crashflags on everything except safe, intentful unloads
    - Add UC_CRASH, which unlocks dependent on the above "dirty" state being present at gamedata load
    - We can use this for something more useful and less funny later.
- Play "O_LOSERC" on the menu, starting with the Challenges screen, if a UC_CRASH condition has been met.
2023-03-03 13:38:31 +00:00
AJ Martinez
3c69739e0a Fix chasecam desyncs during hitlag/death/FAULT 2023-03-02 12:57:04 -07:00
Oni
e79d419d25 Merge branch 'hwr2-twodee' into 'master'
hwr2: Add hardware 2D rendering

See merge request KartKrew/Kart!914
2023-03-02 01:42:26 +00:00
James R
e4885aab47 Add a short help instruction to "Game data is from the future!" error
Game data is from the future! (expected 69, got 420)
Rename or delete developringdata.dat (maybe in the Ring Racers folder) and try again.
2023-03-01 10:19:09 -08:00
toaster
35ae8f01f4 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into hwr2-twodee 2023-03-01 18:10:44 +00:00
James R
eab22f645c Merge branch 'titlecard-cecho' into 'master'
Titlecard CEcho

See merge request KartKrew/Kart!952
2023-03-01 17:21:13 +00:00
toaster
739d81f403 G_BuildTiccmd: Fix not being able to use item button to toggle PF_WANTSTOJOIN 2023-03-01 15:00:35 +00:00
toaster
40271cd128 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into hwr2-twodee 2023-03-01 12:30:58 +00:00
Oni
85f3d66f2c Merge branch 'spectator-rework' into 'master'
Rework spectator mode

See merge request KartKrew/Kart!980
2023-02-28 05:08:50 +00:00
Eidolon
98ce714614 hwr2: integrate avrecorder with RHI and legacy GL 2023-02-27 19:49:45 -06:00
toaster
95a1cb7108 Merge branch 'viewpoint-and-director-fixes' into 'master'
Fixes for F12 and Director Cam

See merge request KartKrew/Kart!979
2023-02-27 11:45:06 +00:00
James R
a19b476d3d hwr2: do GIF recording in screenshot pass 2023-02-26 20:28:05 -06:00
Eidolon
e875c8e20d hw2: add screenshot pass 2023-02-26 18:47:42 -06:00
AJ Martinez
7788fa116f Review fixes 2023-02-26 14:55:41 -07:00
James R
898cac9515 Replace F12 with standard button controls
- Removes the function of the F12 key.
- 'A' button to view next player, 'X' button to view
  previous player.
- Pressing the A or X buttons temporarily disables
  director cam, meaning your view stays on that player.
- R button to reenable director cam.
- You can no longer use spectator movement to shake your
  viewpoint off of another player.
2023-02-26 05:55:45 -08:00
James R
7a67aa2f35 Let viewpoints underwrap
This means that if you're currently viewing the first
player in game and try to switch view to the player before
them, it will wrap around and view the last player in
game.
2023-02-26 05:53:44 -08:00
James R
5fe55f54a1 Reset camera interpolation when switching viewpoints
Fixes a 1-frame jitter of the camera moving across the
level and turning around to match the new viewpoint.
2023-02-26 04:08:20 -08:00
James R
9578f5e05d Reset viewpoint to local player if last viewed player spectates or leaves 2023-02-26 04:08:19 -08:00
AJ Martinez
9cd6257012 Merge remote-tracking branch 'origin/master' into local-camera-fudge 2023-02-25 17:45:20 -07:00
Oni
912e062efa Merge branch 'battle-points' into 'master'
Battle points changes

See merge request KartKrew/Kart!962
2023-02-26 00:08:25 +00:00
AJ Martinez
6647ed4b14 Final cleanup of old experiments 2023-02-25 15:56:38 -07:00
AJ Martinez
a3831ccf48 Disable local driftend snap for testing 2023-02-25 00:55:25 -07:00
James R
e6da831e36 HUD target player with most points
- Replace battlewanted global with g_hiscore, keeps track
  of the current highest number of points.
- Adds HUD tracking for player(s) with the hiscore.
- Should target both players in a tie.
2023-02-24 23:21:47 -08:00
AJ Martinez
e2cc6abacc Merge remote-tracking branch 'origin/master' into local-camera-fudge 2023-02-24 22:36:06 -07:00
Oni
e1fd7bce99 Merge branch 'challenges-continued' into 'master'
Updated Challenges Menu

See merge request KartKrew/Kart!971
2023-02-25 04:37:02 +00:00
AJ Martinez
c17f5c22ff Suspend local camera during DRIFTEND kickout 2023-02-24 21:16:53 -07:00
AJ Martinez
432be46a2f Please god just fucking work 2023-02-24 20:04:36 -07:00
AJ Martinez
7c08634f7e WIP: Turn towards local camera (midgame join broken right now) 2023-02-24 16:59:22 -07:00
AJ Martinez
560050cf2c Remove old anglepredict debug print 2023-02-23 15:21:54 -07:00
AJ Martinez
4062447ee7 Debounce cmd latency in local camera prediction 2023-02-23 15:19:11 -07:00
toaster
97612ba26e Challenge Grid: set height to 4
- In anticipation of next steps of menu redesign
- g_game.c: Increment GD_VERSIONMINOR and burn old challenge grid data
2023-02-23 17:57:01 +00:00
Lat
d755d6edb9 Titlecard CEcho 2023-02-21 16:16:34 +01:00
toaster
d69e92d70f Fix changing kickstartaccel from the profile menu
- M_ProfileControlSaveResponse: Set without stealth (ie, call command which sends XD_WEAPONPREF netxcmd)
- weaponPrefChange (and its splitscreen ilk): Only build/send XD_WEAPONPREF command when Playing()
2023-02-18 14:15:58 +00:00
Oni
a1cd780a14 Merge branch 'matchrace-restore' into 'master'
Match Race menu restoring

See merge request KartKrew/Kart!913
2023-02-17 04:37:55 +00:00
James R
f05f040cea Fix faulty assertions 2023-02-14 00:46:54 -08:00
wolfy852
b76557045f Change mapmusrng to UINT8 2023-02-11 08:23:57 -06:00
wolfy852
2c162b50a3 mapmusrng variable, proper sync, cleanup 2023-02-11 08:16:37 -06:00
toaster
c9535796ab G_GetNextMap: Return to menu after one Match Race is completed 2023-02-09 22:58:47 +00:00
toaster
dc5f6eb991 G_UpdateRecords: Remove console print on RA Medal get as per textual request (UI now communicates this) 2023-02-06 22:38:32 +00:00
toaster
75ee5d1c0b G_UpdateTimeStickerMedals: Fixes for issues with invalid ghost-Medal combinations.
- Only set timetoreach from Medal's var in valid cases
- Shorter invalid phrases to fit in 9-long buffer
2023-02-06 00:28:14 +00:00
toaster
d1c7a90a7c G_UpdateTimeStickerMedals: Put an actual message on the sticker where an invalid medal ghost tag is handled
Fixes a function reshuffling error that would have put control flow back in a loop with invalid properties
2023-02-05 19:25:23 +00:00
toaster
e7b63a5fad G_UpdateTimeStickerMedals, M_StartTimeAttack: If you've beaten all game-provided times, show your personal best record on the in-level HUD instead. 2023-02-05 19:17:07 +00:00
toaster
eab22e73a6 G_UpdateRecords: Play Medal-get sound on successful ET_TIME Medal get 2023-02-05 18:45:02 +00:00
toaster
55b7d21051 G_TickTimeStickerMedals, G_UpdateRecords, K_drawTimestamp: Jitter HUD on both Medal-earning success and general failure to reach desired time 2023-02-05 18:44:25 +00:00
toaster
eb16f9d5a9 G_TickTimeStickerMedals: Move the failed-record sound handling out of K_drawKartTimestamp 2023-02-05 18:31:59 +00:00
toaster
9c95d2d975 G_UpdateTimeStickerMedals: Use a memset to initialise the struct, rather than relying on manual pick-outs 2023-02-05 18:02:21 +00:00
toaster
4522ba3b4d stickermedalinfo, UpdateTimeStickerMedals: A centralised struct for Medal info attached to the time sticker.
- K_drawKartTimestamp: Significantly less messy, no longer dependent on static variables, and no longer iterates over M_GetLevelEmblems every rendered frame(!!)
    - TODO: Still handles playing sound in the drawer
- K_PrepareTimeAttack: Initial generation of a struct of emblems/text is handled on the menu
- G_UpdateRecords: Updated in-game if you unlock the next medal there
This commit was amended to centralise the new material in g_game.c and reduce the number of header additions required.
2023-02-05 17:42:28 +00:00