thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
21485 commits 1 branch 12 tags 205 MiB
Commit graph

21485 commits

This branch
This branch
All branches
Author SHA1 Message Date
AJ Martinez
065111af86 Use Super Ring 'assistance' only in 1st 2023-02-11 19:47:41 -07:00
AJ Martinez
de268b744b Beam fault cleanup, make non-circuit death faults respawn at wp behind finish 2023-02-11 19:09:52 -07:00
Oni
3d625b533a Merge branch 'alt-music' into 'master' 
Alt Music

See merge request KartKrew/Kart!915
 2023-02-11 21:50:15 +00: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
wolfy852
116d8d8f99 Sanity checking and cleanup 2023-02-11 03:08:46 -06:00
James R
a9469c8ffb Check return value of png_get_tRNS before using trans 
png_get_tRNS may not set pointers if it fails.
 2023-02-10 18:37:49 -08:00
wolfy852
4dbb7707e7 Have musname actually use MAXMUSNAMES 
dunno how I forgot this
 2023-02-10 13:26:54 -06:00
wolfy852
b089696021 Add MAXMUSNAMES constant 2023-02-10 13:22:39 -06:00
wolfy852
504788195e Remove crusty unused metatable code 
Forgot to nix this in my last commit
 2023-02-10 05:07:55 -06:00
wolfy852
3ad0b6fd96 Push musname_size and musname to Lua (correctly, this time) 2023-02-10 01:03:57 -06:00
wolfy852
79a921f59b Merge remote-tracking branch 'remotes/origin/master' into alt-music 2023-02-10 00:16:01 -06:00
toaster
78c6d10661 Y_IntermissionDrawer: Tidy up final text drawing conditions 
- Do not say "vote starts in %d" in Match Race, since it will not actually be doing so
- Show demo recording information in GP, since demos can currently be recorded there (even if info is currently incorrect on playback)
 2023-02-09 23:06:41 +00:00
toaster
c9535796ab G_GetNextMap: Return to menu after one Match Race is completed 2023-02-09 22:58:47 +00:00
toaster
df4d1fb10a M_SetupDifficultyOptions: Only show Encore on Difficulty select in Match Race 
We have our own plans for Encore GP that I will definitely be addressing before release.
 2023-02-09 22:40:13 +00:00
toaster
a154b1a565 restoreMenu: Go to Difficulty select after Match Race, instead of the level selection menu 
- Splits M_SetupDifficultyOptions out of M_SetupDifficultySelect.
    - Permits Encore to be handled on Difficulty menu if unlocked after a Match Race.
- Fixes an issue where the in-game Pause menu could be accessed in the menu
    - The prevMenu that was set was overriden with in-game Pause.
    - The assumption made - that the levelsearch/levellist struct would not be touched - is pretty transparently violated.
- I made it go back to the Difficulty select instead of fixing the issue because:
    - Match Race is more dependent on the rules you configure for that particular round
    - This mode of play will be modified in future to not be literally offline MP with things like voting, but instead return to the menu
    - It was easier relative to the amount of work to properly restore (this is the biggest reason)
 2023-02-09 22:38:04 +00:00
wolfy852
a46ba7ab92 UNIT lmfao 2023-02-08 23:16:34 -06:00
wolfy852
53d301112e musname_size variable 
Should prevent errors when only 2 music entries are defined
 2023-02-08 23:12:41 -06:00
wolfy852
4af4a4e59f Correct a blatant lie in m_random.c, fix RNG range 2023-02-08 22:38:51 -06:00
Oni
1aa9e01419 Merge branch 'cmake-presets' into 'master' 
Add CMakePresets.json and Git CLI aliases for CMake

See merge request KartKrew/Kart!871
 2023-02-09 04:27:04 +00:00
wolfy852
e1927b693f Correct shadowed declaration and missing include 2023-02-08 22:23:54 -06:00
wolfy852
276cba4641 Basic alt music 
mapheaderinfo's musname field is now a 2 dimensional array, it can take up to 3 tracks and will randomly select between them on level load.
 2023-02-08 22:11:37 -06:00
Eidolon
c9ab4105da Merge branch 'v_video_cpp' into 'master' 
Convert v_video.c to v_video.cpp

See merge request KartKrew/Kart!892
 2023-02-08 15:26:00 +00:00
Eidolon
d6aecd2a91 Convert v_video.c to v_video.cpp 2023-02-08 08:06:46 -06:00
Eidolon
cb421eeb06 Merge branch 'r_patch_cpp' into 'master' 
Convert r_patch.c to cpp

See merge request KartKrew/Kart!894
 2023-02-08 00:43:45 +00:00
Oni
7884bbfed8 Merge branch 'staffghost-repair' into 'master' 
Staffghost Repair

See merge request KartKrew/Kart!912
 2023-02-07 08:09:22 +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
4ebc42d438 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into staffghost-repair 2023-02-06 22:29:24 +00:00
toaster
5a97dab6d4 Merge branch 'minor-cherrypicks-270123' into 'master' 
Minor cherrypicks 270123

Closes STJr/SRB2#900

See merge request KartKrew/Kart!905
 2023-02-06 22:19:32 +00:00
toaster
45e02b67be Merge branch 'stumble-repair' into 'master' 
Stumble damage type repair

Closes #425 and #424

See merge request KartKrew/Kart!909
 2023-02-06 22:18:07 +00:00
toaster
3dcc0c038f Merge branch 'bottrack-crash' into 'master' 
K_BuildBotTiccmd: Catch NULL track predictions

See merge request KartKrew/Kart!904
 2023-02-06 22:16:52 +00:00
toaster
c192acf9a2 Merge branch 'third-page-problems' into 'master' 
Third Page Problems

See merge request KartKrew/Kart!911
 2023-02-06 22:15:51 +00:00
toaster
daf11a1407 M_LevelListFromGametype: Z_Malloc instead of Z_Calloc for initialisation of cupgrid.builtgrid 
A memset is already guaranteed to follow this initialisation.
 2023-02-06 20:47:48 +00:00
toaster
8b7faa10c1 M_LevelListFromGametype: Remove memory-corrupting memset 
- firstlen was in units of raw UINT8 address (pre-multiplied by sizeof(cupheader_t*)) to permit being used in Z_Realloc. However, it was being added onto the cupgrid.builtgrid pointer BEFORE it was cast into UINT8* for memset, leading to an offset, when considered in terms of UINT8 address.
- Z_Realloc2 is always guaranteed to memset any appended memory so this wasn't even required
 2023-02-06 20:46:47 +00:00
James R
f0ea20d54d Merge branch 'move-acsvm-cmake' into 'master' 
cmake: move ACSVM fetch to cpm-acsvm.cmake

See merge request KartKrew/Kart!902
 2023-02-06 00:35:21 +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
31dcb3346e K_drawKartTimestamp: Still draw your best record even if the map has no ET_TIME medals 2023-02-05 19:48:25 +00:00
toaster
1df3da8379 G_TickTimeStickerMedals: Do not call in demo.playback 2023-02-05 19:26:18 +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
toaster
63fbdcfbc0 M_StartControlPanel: Do not activate if map change is pending 
Prevents restoreMenu being burned when pressing start during long GP/Match Race fade.
 2023-02-05 14:09:30 +00:00
toaster
de526a7889 D_ClearState: Prevent opportunities for double-wipes 2023-02-05 13:35:15 +00:00
toaster
e874b5ba18 G_DoLoadLevel: do not apply profile if demo is played from titlescreen 2023-02-05 13:33:31 +00:00
toaster
ac2255572a K_drawKartTimestamp: Do not update visible emblems on level completion unless you got more than one on completion 
TODO: this code relies heavily on static variables. It has always done so, but the extent to which they're currently employed is worth a fresh look
 2023-02-05 00:35:22 +00:00
toaster
2207115424 Time Attack: Update Medals on player exit, not on intermission 
- M_UpdateRecordReplays: Split out M_UpdateRecords
- P_DoPlayerExit: Call M_UpdateRecords in modeattacking
 2023-02-05 00:21:08 +00:00