Commit graph

25876 commits

Author SHA1 Message Date
James R.
a4c6b3a077 Merge branch 'battle-fuckers-thursday' into 'master'
Battle Fuckers Thursday Night Funkin' (but it's Monday-Sunday)

Closes #941, #950, #928, #951, #953, and #948

See merge request KartKrew/Kart!1863
2024-01-23 00:46:16 +00:00
James R
1f4bebe6da HUD: Battle points HUD (1P and 4P versions), displays right next to bumpers 2024-01-22 16:43:00 -08:00
James R
1cb306ac87 HUD: replace 4P bumpers/prisons sticker with srb2::Draw version
The color is one shade off, but we'll see if it matters.
2024-01-22 16:42:31 -08:00
James R
3a8a7f3cf5 Add thin timer font 2024-01-22 16:42:30 -08:00
James R
892d2c73a8 srb2::Draw: add sticker and small_sticker methods
- Can be aligned to place a wing on only the left or right
  sides, or both
- Width is adjustable
- Custom sticker support
2024-01-22 16:42:30 -08:00
James R
6347afb63f srb2::Draw: add cache_patch static class method 2024-01-22 16:42:30 -08:00
James R
311cf5ceea Battle: darken map for players who die during Overtime 2024-01-22 16:42:30 -08:00
James R
6b27a656e8 Polish player corpse physics
- Flung a little higher into the air
- Takes momentum of whatever killed the player
- Bounces off walls
- Bounces off the floor once
- After bouncing off the floor once, corpse noclips
  through walls and floors
2024-01-22 16:42:30 -08:00
James R
255552d141 Battle: make battle bumper burst animation fly a little lower 2024-01-22 16:42:30 -08:00
James R
6f89dd9cc9 End camera: darken level while spinning 2024-01-22 16:42:30 -08:00
James R
d0057126e6 Battle: make level darkness more dark by default 2024-01-22 16:42:30 -08:00
James R
8f53d34325 Battle: make sure Overtime lasers are visible during round end camera 2024-01-22 16:42:30 -08:00
James R
418f2a14c4 Battle: delay Tally a little bit to let round end camera finish beforehand 2024-01-22 16:42:29 -08:00
James R
a012b90c89 Battle: use round end camera when player wins with emeralds 2024-01-22 16:42:29 -08:00
James R
b1c9de32c6 Battle: use round end camera when player wins with final KO 2024-01-22 16:42:29 -08:00
James R
3cfd50ef2b Battle: don't let players respawn after round ends 2024-01-22 16:42:29 -08:00
James R
7d6239e06c Add round end camera system
- Spins and zooms around a center point
- Freezes the level while spinning
- Pans over to follow and object after spinning ends
- Timing and speed completely customizable
2024-01-22 16:42:29 -08:00
James R
446f5d23f3 Add srb2::ArchiveWrapper and srb2::UnArchiveWrapper, helper class to simplify p_saveg I/O 2024-01-22 16:42:29 -08:00
James R
8a882c55e5 Battle: have 6 emeralds and touch the 7th to win instantly
Win instantly instead of waiting for the emerald to finish
swirling into your body.
2024-01-22 16:42:29 -08:00
James R
e06e0dcb3a Battle: emerald win HUD polish
- Bigger
- Aligned to the Tally boxes
- Each emerald slides in one-by-one over the duration of
  the Tally
- Flash after the final emerald slides into place
2024-01-22 16:42:29 -08:00
James R
eccc0a6924 Fix battlespawn cheat 2024-01-22 16:42:28 -08:00
Sal
4fb287f47b Merge branch 'fat-demos' into 'master'
Double demo buffer size

See merge request KartKrew/Kart!1862
2024-01-22 21:11:31 +00:00
James R
8baf3cd28e Battle: number of monitors that can spawn scales with lobby size
- Duel: 1
- Small: 3
- Medium: 5
- Large: 8
2024-01-21 15:58:30 -08:00
James R
20bd1ddf35 Guard Break: fix knockback direction 2024-01-21 15:58:30 -08:00
James R
fd175f4a5c Insta-Whip: scale knockback to map scale 2024-01-21 15:58:30 -08:00
James R
ab575deaa2 Bubble blow-up: hitlag is based on player's speed, not Bubble's speed 2024-01-21 15:58:30 -08:00
James R
4dc1a404f6 Battle UFO: fix Bubble blow-up collision 2024-01-21 15:58:30 -08:00
James R
07ecf94999 Bubble: refactor collision code, goes in k_collide 2024-01-21 15:58:30 -08:00
James R
30d7e94ece Fix rare Bubble Shield crash
Just NULL-checking
2024-01-21 15:58:30 -08:00
James R
f7e3ea76d1 Fix Mine omega combo (instant death) 2024-01-21 15:58:29 -08:00
Oni
89d1c29c80 Merge branch 'ring-dump-fade' into 'master'
Ring dump transparency

See merge request KartKrew/Kart!1861
2024-01-21 02:52:11 +00:00
AJ Martinez
e6f265c762 Double demo buffer size 2024-01-20 19:49:13 -07:00
AJ Martinez
e867a9ee41 Ring dump transparency 2024-01-20 19:15:09 -07:00
AJ Martinez
8f320b6ac2 Merge branch 'fix-battle-replay-desync' into 'master'
Replay consistency: sync bumper count correctly

See merge request KartKrew/Kart!1852
2024-01-20 01:25:51 +00:00
Oni
973d5ba658 Merge branch 'objective-hud' into 'master'
Add persistent objective messages via K_AddMessage, expose to ACS

See merge request KartKrew/Kart!1843
2024-01-20 00:19:17 +00:00
AJ Martinez
fb20f7b036 Merge branch 'opengl-brightmaps' into 'master'
OpenGL BRIGHTMAPs + sprite/model directional lighting

See merge request KartKrew/Kart!1485
2024-01-19 05:14:41 +00:00
James R.
d20ef561b9 Merge branch 'button-drawer' into 'master'
Embed button prompts in string drawers (ACS Dialogue support)

Closes #943

See merge request KartKrew/Kart!1847
2024-01-18 23:03:12 +00:00
AJ Martinez
c5bafc7b4c Clear HUD messages on level transition 2024-01-18 14:55:10 -07:00
James R
b903da899e Objective text ACS: return false
I think these are only supposed to return true if they
suspend thread execution, but I'm not sure.
2024-01-17 20:13:16 -08:00
AJ Martinez
a6b1710a7e Merge branch 'blend-fast' into 'master'
Use the old faster luminance calc for HWR blends

Closes #516

See merge request KartKrew/Kart!1853
2024-01-18 03:35:30 +00:00
James R
014cbdb3bb OpenGL: fix BRIGHTMAP sneaking into textures where it doesn't belong and creating artifacts 2024-01-17 18:21:46 -08:00
Sal
9382031337 OpenGL sprite+model directional light 2024-01-17 12:05:12 -08:00
Sally Coolatta
83e3401806 Don't use colormap tint on OGL brightmap 2024-01-17 12:05:12 -08:00
Sally Coolatta
d03eb9e9cd Add batching support to OGL brightmaps 2024-01-17 12:05:12 -08:00
James R.
e4a2461faf WIP - brightmaps in opengl, artifacts may occur, batching is super broken 2024-01-17 12:05:11 -08:00
Sally Coolatta
0f695e203f Use old faster luminance calc for HWR blends
Not accurate to Software's look but can't be assed to fuck around with legacy HWR to implement this as shader.
2024-01-17 13:27:32 -05:00
James R
dffc48849c Replay consistency: sync bumper count correctly 2024-01-17 03:00:20 -08:00
Oni
3aace4f777 Merge branch 'battle-whis-wednesday' into 'master'
Battle: Monitor drops, Overtime elimination, point cap

See merge request KartKrew/Kart!1851
2024-01-17 08:44:32 +00:00
James R
97e5d7404a Battle: final KO gives the winner 100 points 2024-01-17 00:22:22 -08:00
James R
54cf037eff Battle: point limit cap 20 -> 16 2024-01-17 00:22:22 -08:00