Commit graph

23383 commits

Author SHA1 Message Date
Oni
56b5090a18 Merge branch 'stop-enabling-bad-people' into 'master'
Instawhip nerfs galore

See merge request KartKrew/Kart!1274
2023-06-07 05:22:31 +00:00
AJ Martinez
5be40749d4 Only do whip cooldown tether suppress if you could actually whip 2023-06-06 20:21:49 -07:00
AJ Martinez
5b39142661 Instawhip start of race cooldown 2023-06-06 20:18:01 -07:00
AJ Martinez
4f11fd783d Don't try bot ringshooter postrace 2023-06-06 19:54:48 -07:00
AJ Martinez
50eab03fc0 Instawhip nerfs galore 2023-06-06 19:28:08 -07:00
Oni
e0e09073a7 Merge branch 'charsel-softlock' into 'master'
M_CharacterSelectInit: Fix a heaping of bugs

See merge request KartKrew/Kart!1273
2023-06-06 20:45:28 +00:00
toaster
533433d41f play-char-select.c: We haven't had problems with devices for a while, so #define away all the device handling messages to reduce the spurious console noise. 2023-06-06 16:48:18 +01:00
toaster
2aa36b5d32 M_CharacterSelectInit: Fix a heaping of bugs
- Fix a softlock caused by commit 8d9b42e4 (!!)
- If your profile's skin was locked, fix a softlock where control was never restored
- If your profile's skin didn't exist, fix an invalid skin id set
- Just straight up flatten out the nested complexity of this function
2023-06-06 16:47:59 +01:00
James R
e6e8bf8c96 Darken player sprite every other frame of instawhip cooldown 2023-06-05 20:01:12 -07:00
James R
018f6f3410 Add lightlevel field to mobj_t
Adds r_spritefx.cpp

lightlevel should be -255 to 255, relative offset to
normal sector lightlevel.

If RF_ABSOLUTELIGHTLEVEL, mobj_t.lightlevel becomes an
absolute lightlevel in the range 0 to 255.
2023-06-05 20:00:35 -07:00
James R
50a6896cce Merge branch 'reversed-rotation-gl' into 'master'
HWR_ProjectSprite: Invert spriterotangle for the sake of rotsprite in GL

See merge request KartKrew/Kart!1271
2023-06-05 21:32:58 +00:00
toaster
4f3751bf59 HWR_ProjectSprite: Invert spriterotangle for the sake of rotsprite in GL 2023-06-05 16:12:12 +01:00
toaster
4dfa74796a Merge branch 'podium-music' into 'master'
Podium Music + rank fixes

See merge request KartKrew/Kart!1270
2023-06-05 14:41:42 +00:00
Sal
2fc7e80915 Merge branch 'level-change' into 'master'
ACS: MapWarp

See merge request KartKrew/Kart!1268
2023-06-04 03:26:44 +00:00
toaster
a682c4a9ad Add sfx_endwrp
Dummy sound to be implemented later for the end of a skipstats warp, but the thok actually sounds kind of fun.
Requires skipstats (and nextmapoverride, for cleanliness) to be unset in P_PostLoadLevel instead of P_LoadLevel.
2023-06-03 20:55:00 +01:00
toaster
deca3cb911 Add mid-fade warp sound per suggestion 2023-06-03 20:40:01 +01:00
toaster
ce6737aa67 S_SoundTestPlay: Set MINIMUM looping of ~4 seconds, for the sake the extremely short votepick song. 2023-06-03 15:41:52 +01:00
toaster
6cebb267bb Merge branch 'fix-papersprite-perspective-overflow' into 'master'
Fix papersprites sometimes disappearing from far distances

See merge request KartKrew/Kart!1269
2023-06-03 14:11:21 +00:00
toaster
1f48d0b4ec K_ResetCeremony: Adjust music set
- Qualified/alt 1 is used if there's not enough music for unique First
- Loser Club/alt 0 is used if position is invalid
2023-06-03 15:01:14 +01:00
toaster
ddde841194 K_GetPodiumPosition: For consistent results, don't skip over a spectator if it's a bot.
This is not ideal and I made an entire branch about avoiding making this change... but actually, this is necessary for consistent results in K_UpdateGPRank after both normal and GPEVENT rounds, and there's nothing we can do about it.
2023-06-03 14:27:33 +01:00
toaster
1d619d10f2 Add Podium level to Stereo Mode
- LF2_HIDEINMENU is considered equivalent to LF2_FINISHNEEDED for:
    - S_SoundTestDefLocked
        - So you don't see podium stuff without having beaten a GP
    - MV_FINISHNEEDED
        - So the status is saved to gamedata and persists between launches if custom
- G_UpdateVisited is now called in K_FinishCeremony, so level is marked as beaten
2023-06-03 14:24:46 +01:00
toaster
10c18fe3fa Podium Music
Uses the multiple alt music options of the podium map's level header in a specific sequence, so it can slot in to the Stereo Mode music list natively, and so custom Podiums don't have to replace existing tracks to function.
2023-06-03 14:20:48 +01:00
toaster
5a3ed5464e P_Ticker: Do not start position music or play noises if gametype has no time between intro and start 2023-06-03 14:18:01 +01:00
toaster
3c505e2676 K_UpdateGPRank
- The previous location for updating grandprixinfo.rank.position and grandprixinfo.rank.skin was too early.
    - K_GetPodiumPosition checks player->score
    - Y_StartIntermission calls Y_CalculateMatchData
    - Y_CalculateMatchData checks K_CalculateGPGrade... which uses invalid position info to determine grade!
    - Y_CalculateMatchData updates player score
- To this end, rearrange Y_CalculateMatchData to accomodate.
    - Calls K_UpdateGPRank.
    - Then, calls K_CalculateGPGrade.
- Also called after G_UpdateVisited if no intermission occours, for general consistency.
- In addition, adjust so earlier players have port priority for skin saved to gamedata.
2023-06-03 14:11:14 +01:00
toaster
117a45422a G_SaveGameData: Fix an issue where if you somehow saved a skin with no wins as the most recent skin on GP, it'd be assigned to the first skin with any wins on your gamedata on the next load, instead of the correct question mark. 2023-06-03 14:02:46 +01:00
toaster
a2902ab1ff Use to-white fade when entering a map via skipstats 2023-06-03 00:51:51 +01:00
James R
54b3aff09f R_ProjectSprite: fix overflow in sideways perspective clipping
Multiplications of perspective values can easily overflow
and flip sign bit at far distances. Instead, divide the
left operand.
2023-06-02 16:12:54 -07:00
James R
80584c9d2f Merge branch 'infinite-draw-flag' into 'master'
MF_DRAWFROMFARAWAY: draw sprites from infinitely far away

See merge request KartKrew/Kart!1267
2023-06-02 23:12:43 +00:00
toaster
f8dd63609a On second thoughts, tie the never-force-a-retry onto skipstats, which is for direct warps. We probably want to force retries for poor performance if intermission is relevant. 2023-06-02 21:07:55 +01:00
toaster
d75ebd5453 If a nextmapoverride is used in GP, do not take a life and restart the level when exiting without having properly won. It may be some sort of secret. 2023-06-02 20:56:49 +01:00
toaster
f91f075a0d ACS: void MapWarp(str mapname, bool showintermission)
An immediate level change on command, to the specified level (via string).
Utilises the existing nextmapoverride and skipstats system, but with skipstats assumed to be the default.
2023-06-02 20:56:27 +01:00
toaster
0bec8317f3 Y_DetermineIntermissionType: Make this function the sole authority on whether an intermission occours or not.
A return to cleanliness in G_DoCompleted.
2023-06-02 20:51:48 +01:00
toaster
82b60cc585 Map types: Make more map ID types consistent as UINT16
- nextmap
- prevmap
- nextmapoverride
- G_GetFirstMapOfGametype
2023-06-02 20:27:38 +01:00
James R
4ebbabc6f5 MF_DRAWFROMFARAWAY: draw sprites from infinitely far away 2023-06-02 04:17:34 -07:00
toaster
b195d43577 Merge branch 'fix-pwr-buffer' into 'master'
Don't trash memory when reading saved PWR

See merge request KartKrew/Kart!1266
2023-06-02 09:08:50 +00:00
AJ Martinez
c716a27454 Don't trash memory when reading saved PWR 2023-06-01 21:46:54 -07:00
Oni
1ee6d196aa Merge branch 'ultra-die' into 'master'
When hit at -20 rings, die

See merge request KartKrew/Kart!1261
2023-06-02 04:44:59 +00:00
Oni
9724144e99 Merge branch 'gamedata-extension' into 'master'
Gamedata Extensions

See merge request KartKrew/Kart!1262
2023-06-02 03:40:57 +00:00
Oni
957453d02f Merge branch 'raise-textcmd-limit-dumb-version' into 'master'
Expand textcmd size byte to 16-bit word, raise MAXTEXTCMD

See merge request KartKrew/Kart!1265
2023-06-02 03:19:44 +00:00
James R
801deafa96 MAXTEXTCMD -> 512
Fixes 4P XD_ADDPLAYER
2023-06-01 20:03:23 -07:00
James R
039a73ce64 Expand textcmd size byte to 16-bit word
Raises hard limit from 255 to 65535
2023-06-01 20:03:23 -07:00
AJ Martinez
4791789bd7 Merge branch 'smooth-gentleman' into 'master'
Smooth out gentleman delay

See merge request KartKrew/Kart!1256
2023-06-01 21:54:56 +00:00
toaster
f86cf71aca Merge branch 'invalid-settargets' into 'master'
P_InitThinkers: Centralise/tidy global mobj pointer handling

See merge request KartKrew/Kart!1263
2023-06-01 12:37:29 +00:00
Eidolon
a57caf443d Merge branch 'fix-nv-ogl-crash' into 'master'
Fix a few bugs in the palette manager

See merge request KartKrew/Kart!1264
2023-06-01 11:07:05 +00:00
Eidolon
3dbd9720da Include missing algorithm header in k_collide.cpp 2023-06-01 05:15:38 -05:00
Eidolon
6d94de494e hwr2: Only upload lighttable if currently valid 2023-06-01 05:12:04 -05:00
Eidolon
99bc417978 hwr2: Upload encore lighttable to correct texture 2023-06-01 05:12:04 -05:00
Eidolon
79a01789b8 hwr2: Reset extra lighttable textures 2023-06-01 05:12:04 -05:00
Eidolon
e40b3ac1e3 hwr2: Track colormaps and lighttables tex globally 2023-06-01 05:11:48 -05:00
Sal
3a1103b7f3 Merge branch 'drop-dash-boost-type' into 'master'
Slower Drop Dash boost type (resolves #548)

Closes #548

See merge request KartKrew/Kart!1255
2023-05-31 16:44:08 +00:00