Commit graph

25595 commits

Author SHA1 Message Date
James R.
10789819c0 Merge branch 'map-icon-flingerdinger' into 'master'
Map icon issues

Closes #832

See merge request KartKrew/Kart!1793
2024-01-08 10:00:56 +00:00
Oni
b064d133f1 Merge branch 'lat-fix' into 'master'
Address DLZ and turbine issues

See merge request KartKrew/Kart!1791
2024-01-07 19:22:41 +00:00
Oni
74298b3abf Merge branch 'final-failsafe' into 'master'
Final failsafe, for when Ring Shooter fails

See merge request KartKrew/Kart!1794
2024-01-07 19:22:28 +00:00
AJ Martinez
97d58b7d29 Final failsafe, for when Ring Shooter fails 2024-01-07 02:49:26 -07:00
Oni
bc60668f27 Merge branch 'turbine-dash-ring-unfuck' into 'master'
What the fuck are turbines (resolves #724 probably)

Closes #724

See merge request KartKrew/Kart!1789
2024-01-07 08:52:51 +00:00
Oni
db421b68e8 Merge branch 'battle-unfuck-xiv-special' into 'master'
BATTLE UNFUCK XIV SPECIAL

Closes #866, #849, #847, #853, #856, #861, #850, #863, and #864

See merge request KartKrew/Kart!1790
2024-01-07 08:49:46 +00:00
AJ Martinez
85b0c41308 Fix typo breaking multiplayer whip sphere decay 2024-01-06 16:30:37 -07:00
AJ Martinez
d807921489 Allow fastfall whip 2024-01-06 15:05:25 -07:00
AJ Martinez
064757c450 Don't black flash after ebrake in Race 2024-01-06 15:03:01 -07:00
AJ Martinez
71b9c5358e Disable Rhythm Badge in painstates 2024-01-06 14:59:09 -07:00
toaster
9e3ca7a59b M_PickMenuBGMap: Change to work off map ID
Guarantees successful update when invalidated by level replacement
2024-01-06 16:56:44 +00:00
AJ Martinez
79eb400f49 0 flashtics in Battle 2024-01-06 06:38:04 -07:00
AJ Martinez
f092e9283c Fix Invincibility extensions, uh, 2024-01-06 06:06:59 -07:00
AJ Martinez
0a9787054f Increase sphere pity when hit (5->10) 2024-01-06 05:25:55 -07:00
AJ Martinez
e8617c8893 Don't decay below 5 spheres (1/2 bar) 2024-01-06 05:18:49 -07:00
AJ Martinez
0529b740d9 Use guard input, not state, to cancel whip charge (barrier fix) 2024-01-06 05:15:51 -07:00
Lat
94e7a8e897 Change respawn check on turbines, unset tracer if respawnstate is set mid-turbine somehow 2024-01-06 13:09:01 +01:00
Lat
8c525621c8 Fix wrong variable assignment and literally decrementing the wrong variable on dlz rockets 2024-01-06 13:04:11 +01:00
AJ Martinez
bc4859cf75 Also tumble on guarding whip 2024-01-06 05:00:09 -07:00
James R
670b3995f1 Monitor: extend death state so sound doesn't cut off
see a982b3bf6
2024-01-06 02:08:07 -08:00
James R
1666047f30 HUD tracking: only display Super Flicky tracker if Flicky can be whipped 2024-01-06 01:41:36 -08:00
James R
2188338a7e HUD tracking: refactor visibility checks
- Completely invisible trackers should not appear in
  tracker list, because they would occlude
- Add Visibility::kFlicker, so frame check is not
  duplicated
2024-01-06 01:41:36 -08:00
James R
e58253a2b2 Battle: do not spawn UFO during Overtime 2024-01-06 01:41:36 -08:00
James R
4d334a2bb9 Battle: fix alternate Overtime music not playing 2024-01-06 01:41:36 -08:00
James R
08dc00ea88 Battle: add battlespawn cheat, spawn every player at the same spawnpoint 2024-01-06 01:41:36 -08:00
James R
db0175a94d Battle: add barriertime cheat, change Overtime Barrier shrink speed for testing 2024-01-06 01:41:36 -08:00
AJ Martinez
bb8b308312 Block Rhythm Badge activation when holding items 2024-01-06 02:19:30 -07:00
AJ Martinez
aad37bbfbb Put whip on cooldown when inputting guard/ebrake 2024-01-06 02:14:28 -07:00
AJ Martinez
a982b3bf63 Monitor damage sounds 2024-01-06 02:03:40 -07:00
AJ Martinez
dd71c81b24 Battle: reduce damage hitlag + monitor hitlag 2024-01-06 01:56:27 -07:00
AJ Martinez
76a42ca44f Lower speed increase from spheres (100%->66%) 2024-01-06 01:45:30 -07:00
AJ Martinez
b74cecff59 Drain spheres when charging instawhip 2024-01-06 01:41:33 -07:00
AJ Martinez
ad48d3ac2c Directly tumble players when guard breaking 2024-01-06 01:37:06 -07:00
AJ Martinez
0cd3c26b8b Don't show item box preview holograms if they aren't going to spawn 2024-01-06 01:08:26 -07:00
AJ Martinez
cb11627bb5 Half screenshake in Battle 2024-01-06 00:50:47 -07:00
Oni
10f8bb5a3f Merge branch 'battle-release' into 'master'
Battle is (almost) ready for release

Closes #681

See merge request KartKrew/Kart!1788
2024-01-06 06:08:28 +00:00
James R
967cb65124 Battle UFO: extend hitbox down by 1/4 2024-01-05 21:00:42 -08:00
James R
2bdb7d4349 Battle UFO: power-up drops take player momz, pick up immediately 2024-01-05 20:59:18 -08:00
James R
e07fbd9a6e Do not spawn digits for overhead item display
This fixes desyncs in Battle when picking up stacks of
items :D
2024-01-05 19:39:25 -08:00
James R
d0259b0896 Super Flicky: speed changes
- Slows down when close to its target
- Slow when stunned (whipped or blocked)
- Stun time increased
  - Whip: 5s -> 10s
  - Block: 1s -> 5s
- Blocking launches the Flicky into the air
2024-01-05 18:34:46 -08:00
James R
07e53b7b50 Battle: lose 5 spheres on guard instead of 10 2024-01-05 18:34:02 -08:00
James R
19d9d1e318 Battle: use Easing_OutSine to shrink Overtime Barrier
Modifies netsave.
2024-01-05 18:05:41 -08:00
James R
8d2327c5c9 Battle UFO: do not suck up into tractor beam if player is fast-falling 2024-01-05 17:48:44 -08:00
James R
fe60216559 Battle UFO: slow down horizontal player momentum in tractor beam 2024-01-05 17:44:58 -08:00
James R
cd405290c1 HUD tracking: hide text for overlapping trackers 2024-01-05 17:30:10 -08:00
James R
5c3783bf62 HUD tracking: trackers behind walls are transparent, instead of flickering 2024-01-05 17:23:29 -08:00
Oni
0e854b5340 Merge branch 'bad-ghost-crash-fix' into 'master'
Defer ghost deallocation til FreeGhosts

Closes #824

See merge request KartKrew/Kart!1769
2024-01-06 00:51:37 +00:00
AJ Martinez
c854a3262b What the fuck are turbines 2024-01-05 17:45:37 -07:00
Eidolon
79c7fe848e Fix sector specialflags typo in p_setup.cpp 2024-01-05 18:42:57 -06:00
Oni
483e45c3bf Merge branch 'o-joyous-mulch-balloons' into 'master'
Hardcode Joypolis trick balloons

See merge request KartKrew/Kart!1787
2024-01-06 00:40:46 +00:00