Commit graph

25746 commits

Author SHA1 Message Date
James R
26b03a810c HUD: fix GOAL not turning rainbow if point limit is less than 5 2024-01-13 22:56:18 -08:00
James R
99a2a3fb74 Let Bubble blow-up destroy any MF_SHOOTABLE object 2024-01-13 22:56:18 -08:00
James R
dd1db7cd4a Reset viewpoint to self when you spawn 2024-01-13 22:56:17 -08:00
James R
3c85a9a436 Director: let it switch to splitscreen players 2024-01-13 22:56:17 -08:00
James R
5ec2e156ab Battle: fix viewpoint switching to eliminated player 2024-01-13 22:56:17 -08:00
James R
db4e2e692b Add LobbySize option to level headers, controls whether the map appears in vote, based on player count
- Prevents a map from appearing on the vote screen if
  there are too many players
- LobbySize
  - Duel - 2 players max
  - Small - 5 players max
  - Medium - 10 players max
  - Large - 16 players max (default if not set)
- Future proofing
  - Doesn't count bot players in gametypes that don't
    support bots
2024-01-13 22:56:17 -08:00
James R
fd7eb42e9d Vote: fix Encore appearing on Battle, if gametype was changed 2024-01-13 22:56:16 -08:00
James R
9fa7cb096b P_DamageMobj: items and PvP damage bypass flashing tics if the victim is in a damage state 2024-01-13 22:56:16 -08:00
James R
92cd95311c Add P_IsKartItem: true for anything the player can hold or throw (except shield overlays) 2024-01-13 22:56:16 -08:00
James R
57c501f6ee Revert "0 flashtics in Battle"
This reverts commit 79eb400f49.
2024-01-13 22:56:16 -08:00
James R
a349b1acf0 Revert "Add K_UpdateDamageFlashing, refactor Battle 0-flashing tics"
This reverts commit 3856fbf1c6.
2024-01-13 22:56:16 -08:00
James R
da2e6f1bfe battlebumpers: let minimum be 0
Useful for testing.
2024-01-13 22:56:15 -08:00
James R
4bcdd22e2c HUD: Battle GOAL uses leading player's color by default 2024-01-13 12:34:28 -08:00
Oni
4e2373cdc0 Merge branch 'quiet-rings-2' into 'master'
3x slower ring volume regen

Closes #878

See merge request KartKrew/Kart!1830
2024-01-13 06:23:51 +00:00
Oni
0464f46cd3 Merge branch 'independent-master-gain' into 'master'
Make master volume an independent gain control

See merge request KartKrew/Kart!1835
2024-01-13 06:23:35 +00:00
Oni
1aaac393c1 Merge branch 'battle-fixes-friday' into 'master'
Battle Fixes Friday

Closes #901, #890, #865, #891, #883, #887, #885, and #888

See merge request KartKrew/Kart!1829
2024-01-13 02:21:19 +00:00
James R
f2f2b41034 K_PlayerGuard: always disable if player is in damage state
- Fixes Barrier power-up not being interrupted by damage
  state
2024-01-12 17:56:46 -08:00
James R
b6a725ad7b HUD tracking: fix Super Flicky crash if owner died 2024-01-12 17:54:30 -08:00
James R
92acc80975 Battle: fix Overtime 1v1 sound playing when last player is eliminated
- It should only play when a 3rd player dies, and leaves
  2 remaining
2024-01-12 17:42:24 -08:00
James R
64e2b77819 Menus/Sound Options: unmute if slider is adjusted
- Master volume: unmutes both SFX and music (if both were
  muted)
- SFX, music: unmutes the individual channels
2024-01-12 17:34:02 -08:00
James R
1c00d3d9c7 Menus/Sound Options: do not draw master volume differently
Now that master volume is actually a separate volume, this
distinction makes no sense.
2024-01-12 17:33:12 -08:00
James R
f12d4c275e music, sounds: toggle based on cvar's actual value 2024-01-12 17:32:25 -08:00
Eidolon
448b54c41c Make master volume an independent gain control
Master volume should control after-mixing gain; the idea is the mixed
output of sfx and music's amplitude should never exceed
`cv_mastervolume`. Setting each submixer's gain independently will
still allow the master mixer to exceed that preferred volume, which was
the main issue with the SDL_Mixer backend. So, instead we use a separate
gain control that is applied after everything is mixed.
2024-01-12 19:06:19 -06:00
James R
eb8741b481 Barrier power-up: fix insta-whip
- Fix being unable to insta-whip
- Fix insta-whip interrupting Barrier
2024-01-12 17:03:10 -08:00
Oni
ff6f3d0c7e Merge branch 'remove-gamma-slider' into 'master'
Remove gamma slider from menus

Closes #889

See merge request KartKrew/Kart!1833
2024-01-13 01:01:42 +00:00
Oni
ec8be4de63 Merge branch 'help-me-connect' into 'master'
Add help text when failing to connect

Closes #599

See merge request KartKrew/Kart!1832
2024-01-13 00:54:12 +00:00
AJ Martinez
3b610b140c Merge branch 'modify-throw-threshold' into 'master'
Make ticcmd throwdir -1, 0, or 1, add deadzone

See merge request KartKrew/Kart!1802
2024-01-13 00:39:07 +00:00
James R
711ffbef0a Guard Break: fix Guard not being broken 2024-01-12 16:35:05 -08:00
Oni
4168c9ccaf Merge branch 'templated-drawing' into 'master'
Use C++ templates for DrawColumn/Span

See merge request KartKrew/Kart!1728
2024-01-13 00:33:50 +00:00
Eidolon
26017c4fdd Clamp patch column post drawing bounds
Prevents segfaults when drawing patches in certain configurations
2024-01-12 18:32:06 -06:00
Oni
41f7bd195c Merge branch 'native-footfix' into 'master'
Offset sprites towards camera in Legacy GL

See merge request KartKrew/Kart!1834
2024-01-13 00:18:26 +00:00
SteelT
7eb4d7fff1 Fix could not implicitly convert operands to arithmetic operator
idk why my shader compiler trips up on this but not others
2024-01-12 19:14:51 -05:00
AJ Martinez
3378a03d79 Offset sprites towards camera in Legacy GL 2024-01-12 16:41:04 -07:00
AJ Martinez
b56a202cc6 Remove gamma slider from menus 2024-01-12 16:28:30 -07:00
AJ Martinez
74ab21ecee Add help text when failing to connect for a while 2024-01-12 16:20:12 -07:00
AJ Martinez
a271942ab7 3x slower ring volume regen 2024-01-12 15:10:09 -07:00
Oni
352fd87537 Merge branch 'fix-splitscreen-tally-lives' into 'master'
Tally: adjust lives icon in splitscreen

See merge request KartKrew/Kart!1828
2024-01-12 20:28:55 +00:00
Oni
6d641f8be8 Merge branch 'fix-respawn-explosion' into 'master'
Let last-place explosion kill respawning player

Closes #507

See merge request KartKrew/Kart!1824
2024-01-12 20:28:22 +00:00
Oni
afa257f0e5 Merge branch 'battle-charge' into 'master'
In Battle, gain spheres for tricks instead of rings

Closes #808

See merge request KartKrew/Kart!1827
2024-01-12 20:27:56 +00:00
Eidolon
0e30dcc38e Merge branch 'fix-wipe-key-repeat' into 'master'
Reset all gamekeydown arrays for all devices

Closes #513

See merge request KartKrew/Kart!1825
2024-01-12 17:45:26 +00:00
James R
4694cb79ff HUD: Battle rankings and GOAL (2P version) + 2P minimap tweak
- 2P version just reuses 4P version
- Minimap shifted over slightly to make room
2024-01-12 07:30:34 -08:00
James R
02719ef2bf HUD: Battle GOAL cycles colors when someone comes within 5 points of winning
- Colors cycle at a speed of 4 tics
- Adjusted "KO" flashing rate from 6/12 -> 8/16
2024-01-12 06:54:19 -08:00
James R
f232647868 HUD: Battle rankings and GOAL (4P version) + 4P timer tweak
- 4P version only displays top 2 players
- Compared to 1P version, local player is not required to
  be on the list
- Skull is displayed if any of the party members have
  reached the point limit
- 4P timers reduced to just digits, in order to make space
  for rankings
2024-01-12 06:53:42 -08:00
James R
c3a6f6b77d K_drawKartPositionFaces: refactor into class so splitscreen drawing methods can be added 2024-01-12 05:25:27 -08:00
James R
a14adfa410 HUD: Battle rankings and GOAL (1P version only)
Battle-specific HUD:

- 3 players in rankings
- Display player always appears on rankings (even if they
  are not in the top 3)
- GOAL icon at the top of the rankings
  - Normally displays point limit
  - Becomes a skull when display player has reached point limit
  - "KO" flashes over the skull, at a rate of 6/12 tics
2024-01-12 05:06:51 -08:00
James R
45ef00fb63 HUD: load Battle GOAL graphics 2024-01-12 05:02:14 -08:00
James R
76b0639d78 v_draw.hpp: fix r_draw.h being included inside srb2 namespace 2024-01-12 05:01:12 -08:00
James R
69c3aaf4f2 Gachabom Rebound: fix crash after owner object is removed 2024-01-12 02:05:56 -08:00
James R
f7970bcd68 Tally: adjust lives icon in splitscreen 2024-01-12 01:32:02 -08:00
James R
e26a95af6e Battle: show rank number on Tally screen 2024-01-12 01:10:37 -08:00