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
21604 commits 1 branch 12 tags 205 MiB
Commit graph

21604 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
f05f040cea Fix faulty assertions 2023-02-14 00:46:54 -08:00
toaster
b2bd5ecccd Merge branch 'blackhole-fault' into 'master' 
Fault rework

See merge request KartKrew/Kart!910
 2023-02-13 23:23:07 +00:00
AJ Martinez
9c3bcd44c7 Update positiondelay during hitlag 2023-02-13 16:01:19 -07:00
AJ Martinez
14fedef403 Revert line fault punish duration (Oni) 2023-02-13 15:54:35 -07:00
AJ Martinez
6996f06ceb Fix line faults doing pflag nonsense 2023-02-13 15:50:00 -07:00
AJ Martinez
c7374c6a91 Increase line fault penalty for similar punishment to old method 2023-02-13 15:32:27 -07:00
AJ Martinez
32ea795639 Fault rework cleanup for merge 2023-02-13 15:31:39 -07:00
toaster
98c333e313 Per discussion, always use short, FINISHless exit for special stage failure. 2023-02-13 18:18:54 +00:00
toaster
0d8ada50bf Merge branch 'fix-setlinetexture' into 'master' 
Fix off-by-one in CallFunc_SetLineTexture

See merge request KartKrew/Kart!919
 2023-02-13 18:05:13 +00:00
toaster
c2b0cca735 K_HandleLapIncrement: Do not spawn Finish Sign if player who crosses finish line is PF_NOCONTESTing. 2023-02-13 18:04:44 +00:00
toaster
8b14d10506 Special Stages: Distinguish between failures with and without lives. 
- With lives remaining: No FINISH text, 1 second before restart
- With no lives remaining: Yes FINISH text, 2 and a half seconds before return to menu(/emeraldless podium when implemented)
 2023-02-13 18:03:56 +00:00
toaster
61de5367d7 P_KillPlayer: In special stages, falling off the stage means immediate no contest and life loss. 2023-02-13 18:00:02 +00:00
Sal
95434e91b2 Merge branch '404-not-found' into 'master' 
Repair Linedef types 403 and 404 (Resolves #429)

Closes #429

See merge request KartKrew/Kart!920
 2023-02-13 17:41:50 +00:00
toaster
24ae5ff65a Repair Linedef types 403 and 404 
- P_ProcessSpecial: Correct likely copypaste error in desired plane height and texture
    - Was using sector floor's height and texture instead of ceiling's.
- P_ConvertBinaryLinedefTypes:  assign affected plane in a saner way
- Resolves issue #429
 2023-02-13 15:12:53 +00:00
Sally Coolatta
8932ab4e91 Fix off-by-one in CallFunc_SetLineTexture 2023-02-12 17:04:51 -05:00
James R
437944927e Merge branch 'fix-png-get-trns' into 'master' 
Fix potential crash in PNG_Read

See merge request KartKrew/Kart!917
 2023-02-12 14:22:24 +00:00
Oni
c050e1c340 Merge branch 'unhelpful-super-ring' into 'master' 
Use Super Ring 'assistance' only in 1st (fixes #433)

Closes #433

See merge request KartKrew/Kart!918
 2023-02-12 03:13:21 +00:00
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
James R
6e79e0b92e clang-format: really avoid return type alone on line 
Should fix some instances of very long lines doing the
following:

    void
    fn( ...really long parameter list... )
 2023-02-10 07:17:38 -08:00
James R
730ac5e3e9 clang-format: constructor member initiailizer list breaks with trailing colon/commas 
Compare before / after:

    A()               B() :
        : a(0)            a(0),
        , b(1)            b(1)
 2023-02-10 07:17:31 -08: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