Commit graph

26652 commits

Author SHA1 Message Date
Oni
4de4c9e57d Merge branch 'pre-podium-music' into 'master'
Add pre-Podium intermission music

Closes #1084

See merge request KartKrew/Kart!2075
2024-03-10 21:08:11 +00:00
Gunla
20ecc22ccf Merge branch 'blend-end' into 'master'
Blend End

See merge request KartKrew/Kart!2039
2024-03-10 20:30:38 +00:00
Gunla
c65decc539 Merge branch 'jartha-last-replay-fixes' into 'master'
Fix freecam not being reset when restarting a replay

Closes #1114

See merge request KartKrew/Kart!2043
2024-03-10 20:29:17 +00:00
Gunla
55870bddb7 Merge branch 'fix-shrink-death' into 'master'
Fix Pohbee's forgetting their owner if the player dies

Closes #454

See merge request KartKrew/Kart!2071
2024-03-10 20:28:33 +00:00
Oni
3c2786e8a1 Merge branch 'ringbox-ta-fudge' into 'master'
Use alternate Ring Box award calculations in TA

See merge request KartKrew/Kart!2072
2024-03-10 20:02:56 +00:00
Gunla
30685b650f Merge branch 'last-sealed-tweak' into 'master'
UFO Catcher Tripwire Boost damage, and slow down the player less after hitting it with a boost while waterskiing

Closes #619

See merge request KartKrew/Kart!2074
2024-03-10 18:14:13 +00:00
Sally Coolatta
9b93f56111 Add pre-Podium intermission music 2024-03-10 14:08:59 -04:00
James R.
e43106ce00 Merge branch 'rhi-shader-safety' into 'master'
Force rhi to only load shaders from shaders.pk3

See merge request KartKrew/Kart!2066
2024-03-10 14:40:18 +00:00
James R
328b2c78f9 UFO Catcher: use a specialized speed cut function for boost damage while waterskiing
- Do not send the player backward, simply reduce their
  forward momentum
- Below 67%, divide speed by 4
- Above 67%, remove a flat 50% top speed
- The goal here is to basically stop the player at low
  speeds, like it did before, but cut a smaller amount at
  high speeds so players can remain water skiing after
  a highly boosted collision
2024-03-10 07:30:15 -07:00
Oni
6924b3a785 Merge branch 'fix-boss-ta-music' into 'master'
Time Attack: fix music stopping when retrying bosses

Closes #1129

See merge request KartKrew/Kart!2064
2024-03-10 14:23:09 +00:00
Oni
0a5b476a9f Merge branch 'ark-arrow-model-lighting' into 'master'
Disable directional lighting on Ark Arrow models

Closes #1061

See merge request KartKrew/Kart!2059
2024-03-10 14:22:59 +00:00
James R
80756e7f97 UFO Catcher: damage with Tripwire Boost state 2024-03-10 06:59:57 -07:00
AJ Martinez
c2963b6299 Use alternate Ring Box award calculations in TA 2024-03-10 04:25:36 -07:00
James R.
d1c537723e Merge branch 'restart-after-gametype-change' into 'master'
Restart Map returns to the correct gametype, even if you changed the gametype through the menu

Closes #916

See merge request KartKrew/Kart!2063
2024-03-10 08:51:09 +00:00
James R
7a7ef7857a Shrink: store player ID on Pohbees, instead of mobj pointer
- Fixes owner being forgetten when they die (fly out of
  the kart)
2024-03-10 00:46:57 -08:00
James R.
f4ab9b0be7 Merge branch 'gasp' into 'master'
Tweak underwater VFX

Closes #1125

See merge request KartKrew/Kart!2058
2024-03-10 08:24:57 +00:00
Oni
08ef66d52e Merge branch 'beam-sounds' into 'master'
Finish Beam: play sound when nearby

Closes #1082

See merge request KartKrew/Kart!2070
2024-03-10 08:11:36 +00:00
AJ Martinez
bd2573cfa9 Merge branch 'my-son-is-still-useless' into 'master'
Stat rebalance nightmare vortex

See merge request KartKrew/Kart!2053
2024-03-10 07:20:04 +00:00
AJ Martinez
8763ecb1d8 TA rebalance: Mecha too 2024-03-09 22:45:14 -07:00
AJ Martinez
c8083b88a0 TA rebalance: reduce crack 2024-03-09 22:41:49 -07:00
James R
02699d72a7 Finish Beam: play sound when nearby
- Loudest 320 FU away from the beam
- Quietest 1280 FU away
2024-03-09 20:42:00 -08:00
Gunla
c00acff8f7 Merge branch 'fix-underwater-strafing' into 'master'
Fix underwater strafing activating below minimum speed and pushing you backward

Closes #1001

See merge request KartKrew/Kart!2048
2024-03-10 03:58:48 +00:00
Oni
bcd0cf8138 Merge branch 'fix-jawz-reticle' into 'master'
Fix multiple Jawz reticles spawning on top of each other while player is in hitlag

Closes #1036

See merge request KartKrew/Kart!2062
2024-03-10 03:42:34 +00:00
James R.
92b1e2c7e9 Merge branch 'player-fault-sound' into 'master'
Play sound on player FAULT

See merge request KartKrew/Kart!2068
2024-03-10 02:35:00 +00:00
James R
161125fc83 mainwads is inclusive 2024-03-09 13:56:03 -08:00
SteelT
9e434dbc3c Play sound s3kb2 on player FAULT 2024-03-09 15:56:51 -05:00
toaster
4bc21875c6 If g_pointlimit is 0, don't stringdance points on the HUD
Fixes Versus HUD
2024-03-09 20:33:24 +00:00
toaster
a96e39b22f G_UpdateVisited, G_DoCompleted: Clean up tutorialchallenge behaviour
- Permit saving "this map has been beaten" for the Tutorial Challenge map if you conquered it
    - This was previously short circuited because it wasn't a dedicated course
- Only trigger an extra UpdateUnlockablesAndExtraEmblems check if you haven't yet completed it
2024-03-09 20:33:24 +00:00
toaster
4fd95a3060 M_DrawChallengePreview: Fix being able to see SECRET_MAP stages that don't have necessary mapvisited
Applies to our Round Stars AND Tutorial Challenge
2024-03-09 20:33:24 +00:00
toaster
55cbf07a28 Patch over MapWarp not meshing with Time Attack
Prints a message saying your time wasn't recorded and you should try a different mode
2024-03-09 20:33:24 +00:00
toaster
fc3a0683ba Got_Mapcmd: Don't promote GTR_BOSS|GTR_SPECIAL to GPEVENT_SPECIAL unless the roundqueue size is 0
The original purpose was to make using the map command allow for multiple tries, ala standard console testing, but the condition was way too permissive and was promoting all esoteric map overrides to undue importance for the end of the Cup's evaluation.
2024-03-09 20:33:24 +00:00
toaster
4aa13105c4 Fix problems exposed by a Round Star potentially being the first entry in a Cup
- Don't assume that the first Round in a Cup defines the default gametype for it
    - Now consistently uses GT_RACE
    - It was written this way to try and permit non-Race cups in future...
    - But there are much more solid ways to approach this down the line, instead of overloading this pre-existing data.
- cup-select.c: Don't assume `roundqueue.position == 1` means starting a fresh Cup from scratch
- G_HandleSaveLevel: Allow saving GP backups for overridden Courses at the front of the roundqueue
2024-03-09 20:33:24 +00:00
toaster
161b46f3aa Store gametype string in gpringsav.bkp for overridden Rounds, too 2024-03-09 20:33:24 +00:00
toaster
e5964f862a Rejigger Grand Prix rank-related oversight exacerbated by MapWarp
If a stage is taken out of the running for Grand Prix mode and replaced with another, the rank data wasn't corrected. We were merely getting lucky that the one Round Star regularly accessible had the same number of laps as the course it replaced.
Now, Laps, Rings, and Prisons can be adjusted up or down depending on the number of each element you're expected to have with a perfect GP tally.

Related: To make it more friendly to call in multiple places, RankCapsules_CountFromMap has now been adjusted to take a course ID instead of a virtres_t.
2024-03-09 20:33:24 +00:00
toaster
c1fadac0a5 Permit gametype to be changed by MapWarp
- Simplest possible solution for the time remaining: If the current gametype doesn't overlap with the nextmapoverride's TOL, do G_GuessGametypeByTOL.
    - Future work: Allow an optional extra parameter to MapWarp to specify a specific Gametype by name.
- Fixes for tutorialchallenge
    - NEXTMAP_TUTORIALCHALLENGE is integrated into the above, to reduce duplicate code
    - Call D_GametypeChanged, which was previously missing
2024-03-09 20:33:24 +00:00
toaster
6f0710818f Add VSENT jingle to successful Versus conclusion 2024-03-09 20:33:24 +00:00
toaster
8180033ae1 Since Versus intros have special behaviour in time attack, also allow them to avoid the white fade/warp sound of MapWarp 2024-03-09 20:33:24 +00:00
toaster
4a36d5f947 MT_SPIKEDTARGET: Don't encoremap 2024-03-09 20:33:24 +00:00
toaster
748ef17cf7 Merge branch 'fix-challenge-grid-load-again' into 'master'
Use correct type for unlock IDs in loading

Closes #1134

See merge request KartKrew/Kart!2065
2024-03-09 20:32:31 +00:00
Oni
abe8963295 Merge branch 'limit-tumble-height' into 'master'
Limit added tumble height

Closes #1130

See merge request KartKrew/Kart!2060
2024-03-09 19:56:09 +00:00
Eidolon
161d4480e6 Force rhi to only load shaders from shaders.pk3
Loading custom shaders is dangerous and error-prone and I don't want to
implicitly allow this to occur without having good barriers in place.
2024-03-09 13:51:49 -06:00
Eidolon
49f644d5e9 Use correct type for unlock IDs in loading 2024-03-09 12:41:03 -06:00
James R
556035687c Versus: always reset music, even in Time Attack 2024-03-09 06:35:53 -08:00
James R
9e99efc08c Refactor level music playing code
- Use one function so we don't duplicate the checks for
  music that isn't supposed to be interrupted by a restart
2024-03-09 06:32:37 -08:00
AJ Martinez
9538979e2b Merge remote-tracking branch 'origin/master' into my-son-is-still-useless 2024-03-09 06:46:22 -07:00
AJ Martinez
07fa2296b1 Tripwire speed threshold 200 -> 220% 2024-03-09 06:44:17 -07:00
James R
717dcf0209 restartlevel: preserve last map's gametype
- gametype can be changed without changing gamemap,
  through the pause menu option
2024-03-09 05:20:49 -08:00
James R
d2d57a774b Fix multiple Jawz reticles spawning on top of each other while player is in hitlag 2024-03-09 04:56:33 -08:00
AJ Martinez
8c46258ba9 Promote driftboost vars to UINT16 2024-03-09 04:30:05 -08:00
James R
b12dba0393 Underwater: SF_MACHINE characters play a different sound effect when resurfacing 2024-03-09 01:10:14 -08:00