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

22528 commits

Author SHA1 Message Date
toaster
21a4e7ae43 Remove last vestiges of Emerald Hunt behaviour from vanilla SRB2 
Was in places the author of this commit needed to look
 2023-10-05 22:57:39 +01:00
toaster
8bb41b787b Fix SECRET_SKIN locks preventing Rivals from showing up 
Previously, there was a permanent exception for Eggrobo (the default bot skin).
Now that exception is generalised for the specific skin the bot is being assigned, which we assume is intentful and correct.

In addition, the randomclass PR_BOTS now controls K_RetireBots as well, matching the other two random calls done for bot skins.
 2023-10-05 18:12:32 +01:00
toaster
b937b1a7bc Add UCRP_MAKERETIRE 
- `Condition1 = MakeRetire Eggrobo`
- Fires when:
    - Not a cooperative context
    - You've finished in good standing
    - Another player has both
        - PF_NOCONTEST
        - The skin specified in the condition
Also makes rivalname-handling for K_InitGrandPrixBots `const char *`, since the author of this commit had to reference that code.
 2023-10-05 14:36:00 +01:00
toaster
764141946d M_GetConditionString cleanup 
- Remove pointless "BUILDCONDITIONTITLE" macro for M_BuildConditionTitle
- Replace simple R_SkinUsable checks with M_GetConditionCharacter
    - Supports knowing a character's name via them being the Rival for a currently unlocked character, if that Challenge doesn't require them unlocked to interact
 2023-10-05 14:23:46 +01:00
toaster
caa8d66035 G_DoCompleted: Refactor in anticipation of new Challenge conditions 
- Stop sounds first, as before.
- Do most player updates before M_UpdateUnlockablesAndExtraEmblems is called
    - Allows us to make Challenges dependent on end-of-round Standings
- Then Challenges and gamedata...
- Then, group all important game state updates together.
- THEN, finally assign PF_NOCONTEST when exitlevel occours.
    - Prevents No Contest-based Challenges from firing cheesily
- Finally, Intermission-related material (also as before).
 2023-10-05 14:19:46 +01:00
James R
5415674034 debugfinishline: highlight deathpits and instakill planes 2023-10-04 20:17:31 -07:00
James R
e4fde7735e Revert "HUD: slide in position numbers if race starts immediately" 
This reverts commit a8d0bad4b0.
 2023-10-04 00:06:21 -07:00
James R
dc4c66322f K_drawKartNameTags: crop HUD tracking to splitscreen viewports 2023-10-03 22:05:48 -07:00
James R
0019e74604 HUD: fix nametag position for P2 in 2P splitscreen 2023-10-03 21:51:35 -07:00
James R
35cb0e4c5c HUD: do not show position number in splitscreen FREE PLAY 2023-10-03 21:28:35 -07:00
James R
8284aff4f1 HUD: realign 1P ping counter and FPS counter positions 2023-10-03 21:28:35 -07:00
James R.
62503b244a Add give2, give3, give4 commands 2023-10-03 21:28:35 -07:00
James R.
ff11166f30 setviews command: let outside of replays 2023-10-03 21:28:34 -07:00
James R.
0b7a6ed7f5 P_DemoCameraMovement: use splitscreen ticcmd 2023-10-03 21:28:34 -07:00
James R.
989ee48ef8 SCR_DisplayLocalPing: show, even in splitscreen, in gamestates where player HUD is not drawn or when menu is opened 2023-10-03 21:28:34 -07:00
James R.
dd1b0255f8 SCR_DisplayTicRate: do not say "FPS" 
Obscurs less of the position number in splitscreen.
 2023-10-03 21:28:34 -07:00
James R.
a11e8d793a finish_legacy_ogl_update: merge with temp_legacy_finishupdate_draws, draw avrecorder stats in opengl 2023-10-03 21:28:34 -07:00
James R.
56775e721f HUD: fix FREE PLAY 4P position 
Centered at bottom of each screen.
 2023-10-03 21:28:34 -07:00
James R.
1935fdcdc3 HUD: remove fade in from ping counters 2023-10-03 21:28:34 -07:00
James R.
54f2882bc9 HUD: fix 4P negative ring counter alignment 2023-10-03 21:28:34 -07:00
James R.
a8d0bad4b0 HUD: slide in position numbers if race starts immediately 2023-10-03 21:28:34 -07:00
James R.
f426a136d5 HUD: fix 4P position numbers 2023-10-03 21:28:34 -07:00
James R.
bf20db1e5e HUD: draw item box over everything else 2023-10-03 21:28:34 -07:00
James R.
4631af55c4 HUD: do not include starting Battle Bumper count, "x/y" -> "x" 
- 1P/2P:
  - Resize sticker with number of digits
- 3P/4P:
  - Pad to 2 digits
  - Use larger font
 2023-10-03 21:28:34 -07:00
James R.
da2f083e2c HUD: fit bumpers, prisons, spheres, speedometer, rankings, item box HUD without overlapping 2023-10-03 21:28:34 -07:00
James R.
36bbf08ab0 HUD: fix alignment of 2P level timer and power-ups 2023-10-03 21:28:34 -07:00
James R.
454850d349 ST_CalculateFadeIn: do not interpolate at very beginning or end of fade 2023-10-03 21:28:34 -07:00
James R.
90d8a9643f G_CanView: unconditionally let view a player already viewed on a different splitscreen 2023-10-03 21:28:33 -07:00
James R.
8b79689d81 Add K_DirectorIsAvailable 
Fixes director not working correctly if there are
duplicates in displayplayers.
 2023-10-03 21:28:33 -07:00
James R.
d020c9faaa Add G_FixCamera, reset camera, angle and view interpolation 2023-10-03 21:28:33 -07:00
James R.
f2cc5ce36a R_ResetViewInterpolation: wait an extra tic if R_UpdateViewInterpolation has not run yet, do not add extra time for subsequent calls 2023-10-03 21:28:33 -07:00
James R.
7b3010c93d Fix many instances of splitscreen view number if there are duplicate displayplayers 
- Avoid iterating displayplayers to find view number and
  prefer R_GetViewNumber.
- Iterate over all matching displayplayers if necessary,
  instead of stopping at the first match.
 2023-10-03 21:28:33 -07:00
James R.
d5bac57409 Ring sting indicator: show for owner player as well 2023-10-03 21:28:33 -07:00
James R.
bcd4963f2e Always set starting bumpers in P_SpawnPlayer 2023-10-03 21:28:33 -07:00
Oni
f195b9742a Merge branch 'hardcode-chaos-chute' into 'master' 
Hardcode Chaos Chute objects

See merge request KartKrew/Kart!1526
 2023-10-04 03:50:56 +00:00
James R
035b6cca8f Merge branch 'reduce-tester-build-cope' into 'master' 
Make making TESTERS builds simpler

See merge request KartKrew/Kart!1535
 2023-10-04 03:40:15 +00:00
James R
6b18563549 Merge branch 'precip-height-random-crash' into 'master' 
Conditionally randomize precip height

Closes #528

See merge request KartKrew/Kart!1536
 2023-10-04 00:12:10 +00:00
Eidolon
f13871ddbf Conditionally randomize precip height 2023-10-03 19:07:25 -05:00
James R
99f816f34b Merge branch 'window-resolution-fixes' into 'master' 
Fixes to HWR2 window, framebuffer resizing; scr_scale, scr_x, scr_y cvars for my personal use

See merge request KartKrew/Kart!1537
 2023-10-03 23:43:20 +00:00
Gustaf Alhäll
2f01c6fa16 Avoid branch prediction slowdowns in R_PointOnSide 
# Conflicts:
#	src/r_main.c
 2023-10-02 19:35:53 -05:00
Oni
bcc8fc6438 Merge branch 'freeze' into 'master' 
Mobj thinker freeze condition rework

Closes #690

See merge request KartKrew/Kart!1505
 2023-10-02 05:42:19 +00:00
Oni
1387fa81a8 Merge branch 'ballz-activation' into 'master' 
Ball Switch

See merge request KartKrew/Kart!1534
 2023-10-02 05:41:46 +00:00
James R.
7c4bb65380 MT_SUNBEAMPALM_STEM, MT_SUNBEAMPALM_LEAF: add MF_DRAWFROMFARAWAY 2023-10-01 18:08:18 -07:00
James R.
a7382ca9d0 UpscaleBackbuffer::begin_pass: use separate renderpass to clear framebuffer if texture was recreated 
Fixes wipes potentially reading invalid data from the
framebuffer if the texture was recreated but not yet
rendered to.
 2023-09-30 19:23:14 -07:00
James R.
2ec5d3e6b0 Add scr_scale, scr_x, scr_y cvars to scale and adjust viewport position 2023-09-30 16:50:41 -07:00
James R.
37dc1189bb srb2::hwr2::BlitRectPass::set_output: set x/y as well 2023-09-30 16:38:56 -07:00
James R.
2d9d06e267 Let window be resizable 2023-09-30 16:09:10 -07:00
James R.
18efb35602 SDLSetMode: render immediately after resolution change to avoid 1-frame of texture presented at wrong size 2023-09-30 16:07:53 -07:00
Lach
7cd059dfb3 Merge remote-tracking branch 'origin/master' into hardcode-chaos-chute 2023-09-29 22:41:31 +10:00
Lach
2bdc055139 Scale Chaos Chute objects 2023-09-29 20:27:13 +10:00