Commit graph

21226 commits

Author SHA1 Message Date
toaster
a75a7039d6 HU_DrawRankings: Do not fade screen while automap is visible. 2023-01-23 11:47:34 +00:00
toaster
a602a90a8c m_cheat.c: Permit singleplayer-only cheats in offline match race 2023-01-23 11:47:00 +00:00
toaster
f47d818698 Merge branch 'fix-window-icon' into 'master'
Fix XPM window icon not being used

See merge request KartKrew/Kart!897
2023-01-22 15:50:32 +00:00
Oni
8a771521c2 Merge branch 'spectator-look' into 'master'
Re-implement spectator vertical look

See merge request KartKrew/Kart!898
2023-01-22 03:33:37 +00:00
Oni
13563ce922 Merge branch 'acs' into 'master'
Action Code Script

See merge request KartKrew/Kart!728
2023-01-22 03:22:32 +00:00
Oni
584b714e72 Merge branch 'fix-z-movement-discard-mom' into 'master'
Let P_ZMovement use momentum changes from P_CheckPosition call

Closes #365

See merge request KartKrew/Kart!869
2023-01-22 03:15:42 +00:00
Oni
5664c8addc Merge branch 'title-profile-tweaks' into 'master'
Small fixes for profile selection and skipping title screen

See merge request KartKrew/Kart!895
2023-01-22 02:51:28 +00:00
Oni
90274359db Merge branch 'magician-spectator' into 'master'
Heavy Magician adjustment

See merge request KartKrew/Kart!876
2023-01-22 01:59:48 +00:00
SteelT
aef982c8d5 Fix XPM window icon not being used 2023-01-21 18:47:29 -05:00
toaster
e6e1d6b042 Re-implement spectator vertical look
- Hold lookback to pivot the spectator's vertical aiming angle
    - Forward/backwards item throw/trick input aims up/down
    - Overrides forwards/backwards movement while lookback is held
    - Changes the spectator text to indicate that it's in aiming mode
2023-01-21 23:46:14 +00:00
James R
dfd13b5a7a Merge branch 'fix-nosound' into 'master'
Fix -nosound command line option not disabling sound effects

Closes #405

See merge request KartKrew/Kart!883
2023-01-21 20:26:51 +00:00
James R
65eedaa9ee Merge branch 'overlay-offsets' into 'master'
MT_OVERLAY exception flags

See merge request KartKrew/Kart!878
2023-01-21 20:26:23 +00:00
James R
6e058d66e1 Merge branch 'capsuletest' into 'master'
Add capsuletest cvar

See merge request KartKrew/Kart!884
2023-01-21 20:26:06 +00:00
James R
66c2d36646 Merge branch 'scale-drop-target' into 'master'
Fix Drop Target knockback for large Drop Targets and non 1/4 scale maps

See merge request KartKrew/Kart!868
2023-01-21 20:25:35 +00:00
James R
d4c27bb2a7 Merge branch 'song-credit-level-only' into 'master'
Don't draw song credit outside on results or vote screens

Closes #390

See merge request KartKrew/Kart!867
2023-01-21 20:25:19 +00:00
James R
d7d365f1e4 P_ZMovement: take object's momentum after P_CheckPosition 2023-01-21 17:24:16 +00:00
toaster
65c0860a9d P_PushSpecialLine: It's possible for tm.blockingline to be NULL but the player be blocked. 2023-01-21 16:52:25 +00:00
toaster
d2d7421072 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into acs
# Conflicts:
#	src/CMakeLists.txt
2023-01-21 15:32:13 +00:00
toaster
52ce1d95fd Additional spectator checks
- P_DamageMobj
- P_PlayerThink
2023-01-21 14:57:54 +00:00
toaster
2e35a40b80 SF_IRONMAN: handle randomised skin and hurt/death states differently
- P_DamageMobj
    - Become skin temporarily to show off the hurt frames
    - Sets charflags, so P_PlayerThink can handle reversion
    - Add sparkles for losing disguise
- P_KillPlayer
    - Sets charflags, so P_PlayerThink can handle reversion
    - Add extra sound for losing disguise
- G_PlayerReborn
    - Sets charflags in not-betweenmaps case as well, so P_PlayerThink can handle reversion
- P_SpawnPlayer
    - Use set skin for spawn again (partial revert of previously committed code)
- P_PlayerThink
    - More specific conditions for fakeskin reversion
        - Not hurt, dead, or respawning (except for last part of drop)
    - Add sound and sparkles for reapplying disguise
2023-01-21 14:43:54 +00:00
toaster
0606fb50ba S_StartSoundAtVolume, K_PlayPainSound, K_PlayHitEmSound: Use user skin for sounds instead of mobj skin
So we'll always hear the clips we pick for Heavy Magician
2023-01-21 12:58:06 +00:00
toaster
3c79e32516 P_KillPlayer: Use death frames from SF_IRONMAN skin, not those of the randomised skin
Currently invisible for Heavy Magician, but a lot about her is nonfinal.
2023-01-21 12:30:01 +00:00
toaster
1ae8a6dec5 P_SpawnPlayer: Guarantee correct fake skin on player object at spawn 2023-01-21 12:30:01 +00:00
toaster
c18e7e6c3c K_SpawnMagicianParticles: NULL check on mo->target 2023-01-21 12:30:00 +00:00
toaster
a4a74a7d2f Do not continue to run thinker for MT_MAGICIANBOX if removed by running out of lifespan 2023-01-21 12:30:00 +00:00
toaster
79401a888f Do not spawn Heavy Magician box/particles, or play associated sounds, if the player is a spectator 2023-01-21 12:30:00 +00:00
James R
63bed732f2 G_Responder: remove check to finalecount before opening menu from title screen
This is handled by M_StartControlPanel anyway and the
condition did not match anymore.
2023-01-19 21:28:03 -08:00
James R
e8bc7035f5 Always select current profile in profile options menu
Fixes Guest profile being selected if opening the game
from command line (without going to title screen) and
opening the profile select from the options menu.
2023-01-19 21:27:16 -08:00
James R
83a6acd5c8 Do not force Guest profile when selecting profile for first time
This lets ttlprofilen persist if backing out of profile
select.
2023-01-19 21:26:21 -08:00
James R
ddb55c95c7 Merge branch 'split-menufunc' into 'master'
Move all specialized code out of k_menufunc.c

See merge request KartKrew/Kart!888
2023-01-20 03:16:00 +00:00
Oni
5488f723e1 Merge branch 'loud-ufo' into 'master'
Add UFO hum + hit reaction SFX

See merge request KartKrew/Kart!893
2023-01-20 01:59:58 +00:00
AJ Martinez
0eba5c5a74 Fix UFO hum level clamping 2023-01-19 15:56:36 -07:00
AJ Martinez
3165deb43b Clamp UFO hum SFX to safe values 2023-01-19 15:41:10 -07:00
AJ Martinez
eebce28b7e Fix bad loop on UFO pinch hit hums 2023-01-18 02:59:46 -07:00
AJ Martinez
5837f983e8 Add UFO hum + hit reaction SFX 2023-01-18 02:15:18 -07:00
Oni
892a19c85f Merge branch 'adjust-garden-top' into 'master'
Adjust Garden Top physics

See merge request KartKrew/Kart!890
2023-01-17 06:24:10 +00:00
Eidolon
128c3b063a Merge branch 'hwr2' into 'master'
Render Hardware Interface Part 1: A New Hope

See merge request KartKrew/Kart!891
2023-01-15 19:39:11 +00:00
toaster
8555c66d61 activator_t: Before Z_Freeing, consistently decrement refcount for activator->mo per review 2023-01-15 15:12:30 +00:00
toaster
083d3df96f d_main.c: Adjust shaders.pk3 handling per my comments 2023-01-15 14:00:43 +00:00
toaster
ad50e67ae9 r_data.c: Resolve defined-but-unused function warning intefering with compilation
Removes `R_Init8to16` and its inline helper, `makecol15`, the last bastion of an abandoned 16-bit drawer rework
2023-01-15 13:10:09 +00:00
James R
1ba7842068 hwr2 legacy opengl: restore fps counter etc 2023-01-14 18:57:45 -08:00
James R
8ff95af61d Disable Drop Dashing while on the Garden Top 2023-01-14 18:35:49 -08:00
Eidolon
7db8b7d20c hwr2 gl3core: Fix FBO depth attachment 2023-01-14 20:30:52 -06:00
Eidolon
095aa635b0 hwr: Store T in Slab directly 2023-01-14 20:27:56 -06:00
James R
610e2c66be Adjust Garden Top physics
- 110% -> 150% top speed
- no friction decrease if grinding
- 250% -> 300% gravity when grinding (for slope sliding)
- 275% -> 325% max boost when releasing grind
- 60% minimum boost speed when relasing grind
2023-01-14 18:11:46 -08:00
Eidolon
ccc10eadd0 hwr2: Reformat C++ code 2023-01-14 19:59:41 -06:00
Eidolon
fcb4dfe3d7 hwr2: Restore legacy OpenGL temporarily 2023-01-14 19:52:33 -06:00
Eidolon
b932607359 hwr2: Remove sw testing state from sdl video 2023-01-14 19:52:10 -06:00
Eidolon
286c96173a hwr2 gl3core: Implement render pass FBOs 2023-01-14 19:29:19 -06:00
Eidolon
01ddbf6dcf (WIP) hardware: add render hardware interface 2023-01-14 18:40:26 -06:00