Commit graph

24897 commits

Author SHA1 Message Date
Oni
162aba5a95 Merge branch 'char-sel-tooltips' into 'master'
Character Select: add button prompts for R and C buttons

See merge request KartKrew/Kart!1640
2023-11-17 09:01:54 +00:00
Oni
f54ad00662 Merge branch 'mega-barrier' into 'master'
Mega Barrier

See merge request KartKrew/Kart!1636
2023-11-17 08:53:41 +00:00
Oni
87bcebb547 Merge branch 'no-midair-wavedash' into 'master'
Stop sliptides midair (resolves #768)

Closes #768

See merge request KartKrew/Kart!1635
2023-11-17 08:33:17 +00:00
Oni
94327e8056 Merge branch 'lua-hook-timing' into 'master'
Add basic profiling for Lua hooks (except HUD hooks)

See merge request KartKrew/Kart!1616
2023-11-17 08:32:20 +00:00
Oni
1a43b5873f Merge branch 'sliptide-jumpscare' into 'master'
Don't draw 1 tic of indicators on dying players

See merge request KartKrew/Kart!1634
2023-11-17 08:26:57 +00:00
Oni
f400a4a236 Merge branch 'fix-permanent-tournament-mode' into 'master'
Fix tournament mode cheat saving (resolves #749)

Closes #749

See merge request KartKrew/Kart!1637
2023-11-17 08:26:24 +00:00
Oni
3a36263296 Merge branch 'fix-gravflip-shields' into 'master'
Fix Thunder/Flame shield in gravity flip (resolves #754)

Closes #754

See merge request KartKrew/Kart!1609
2023-11-17 08:25:59 +00:00
Oni
6f37e4340f Merge branch 'death-visibility' into 'master'
Try to keep death frames on-screen

See merge request KartKrew/Kart!1638
2023-11-17 08:25:11 +00:00
James R
28f1fc7175 Character Select: add button prompts for info and default buttons 2023-11-16 22:30:11 -08:00
James R
5788ea574c Power-up Aura: hide if Mega Barrier is the only power-up 2023-11-16 21:08:30 -08:00
James R
6aa6b8c939 K_AnyPowerUpRemaining: return bit mask 2023-11-16 21:08:30 -08:00
James R
8e23d66540 CL_ClearPlayer, G_PlayerReborn: clear powerup.barrier 2023-11-16 21:08:30 -08:00
James R
1df4094c65 Mega Barrier for Barrier power-up -- just a visual object 2023-11-16 21:08:30 -08:00
James R
9f088f40bb Add Mega Barrier states 2023-11-16 21:08:29 -08:00
James R
254df6bf7e powerupvars_t: add barrier member 2023-11-16 21:08:29 -08:00
AJ Martinez
5e92177262 Try to keep death frames on-screen 2023-11-16 14:42:15 -07:00
AJ Martinez
c4e1a98e6b Fix tournament mode cheat saving 2023-11-16 13:58:06 -07:00
AJ Martinez
46f6f29e32 Nix experimental debug print 2023-11-16 12:55:21 -07:00
toaster
b772a66541 Merge branch 'seesaw-grease' into 'master'
3 secs springgrease on DLZ seeesaw (resolves #720)

Closes #720

See merge request KartKrew/Kart!1632
2023-11-16 12:23:56 +00:00
toaster
13b83e3f09 Merge branch 'fix-director-prank' into 'master'
Fix viewpoint switching to bot in Tutorials (could have been a rare bug in netgames too!)

Closes #758

See merge request KartKrew/Kart!1630
2023-11-16 10:05:23 +00:00
toaster
323975f329 Merge branch 'tutorial-capsules' into 'master'
Allow all capsule spawns in Tutorial (resolves #725)

Closes #725

See merge request KartKrew/Kart!1633
2023-11-16 10:04:13 +00:00
AJ Martinez
fc821b7e8f Stop sliptides midair 2023-11-16 00:35:24 -07:00
AJ Martinez
06ce085e75 Lightning shield too 2023-11-16 00:06:39 -07:00
AJ Martinez
fa4aaaa7cc Zero shield height (they're player-centered now) 2023-11-16 00:06:27 -07:00
AJ Martinez
d6dc6e3541 Merge remote-tracking branch 'origin/master' into fix-gravflip-shields 2023-11-15 23:58:21 -07:00
AJ Martinez
d08170ecea Don't draw 1 tic of indicators on dying players 2023-11-15 23:55:45 -07:00
AJ Martinez
f2b364fd48 Allow all capsule spawns in Tutorial 2023-11-15 23:19:13 -07:00
AJ Martinez
903ed414b8 3 secs springgrease on DLZ seeesaw 2023-11-15 22:55:33 -07:00
Oni
9ed05b5c21 Merge branch 'spike-fixes' into 'master'
Bigger wall spikes hitbox, improved collision; entire spike hitbox hurts player, tumbles airborne; renderhitbox papercollision

See merge request KartKrew/Kart!1629
2023-11-16 03:12:44 +00:00
James R
7de237dfd3 P_SpawnPlayer: do not turn on director if another player spectates and you are alone 2023-11-15 18:55:57 -08:00
James R
d6fb8eb036 MT_SPIKE: taller hitbox, matches sprite 2023-11-15 17:53:34 -08:00
James R
c4e4c9e9b0 MT_SPIKE, MT_WALLSPIKE: entire hitbox hurts, hurt all objects, tumbles objects that fall onto spikes 2023-11-15 17:53:24 -08:00
Oni
4c500748fb Merge branch 'harder-spb-attack' into 'master'
Use more realistic practice conditions for SPB Attack

See merge request KartKrew/Kart!1628
2023-11-16 00:32:09 +00:00
Oni
38a6ac33f0 Merge branch 'fix-shield-ring-spill' into 'master'
Fix losing rings even with a shield out; fix losing Garden Top before you even activate it

See merge request KartKrew/Kart!1625
2023-11-16 00:32:05 +00:00
James R
4065f56b98 MT_WALLSPIKE: always bounce toward tip 2023-11-15 15:36:49 -08:00
James R
d9bf6119a3 MT_WALLSPIKE: increase hitbox size to match sprite 2023-11-15 14:51:46 -08:00
James R
2ebbfe3e7a MT_WALLSPIKE: let radius be increased without requiring map/HVR adjustment 2023-11-15 14:51:16 -08:00
James R
600aec3449 renderhitbox: shown MF_PAPERCOLLISION correctly 2023-11-15 14:48:53 -08:00
AJ Martinez
eb394ec5f8 Use more realistic practice conditions for SPB Attack 2023-11-15 15:41:33 -07:00
Oni
a51b889444 Merge branch 'fix-super-flicky-whip' into 'master'
Fix Super Flickys not being whippable

See merge request KartKrew/Kart!1627
2023-11-15 21:26:31 +00:00
Oni
658cd7c170 Merge branch 'catholic-vfx' into 'master'
Trick Panel FX/gameplay pass

See merge request KartKrew/Kart!1626
2023-11-15 21:25:19 +00:00
AJ Martinez
f0ddb79156 Allow bubblebounce from trick, but disable trick handling 2023-11-15 01:03:55 -07:00
AJ Martinez
0301847339 Fix double offset scale on charge sparks 2023-11-15 00:54:01 -07:00
James R
b1c0f6647e Obj_IsSuperFlickyWhippable: pass target
- Old behavior: if flicky is chasing itself. What? Why did
  I write this??
2023-11-14 21:01:53 -08:00
AJ Martinez
d54d2f6d04 Merge remote-tracking branch 'origin/master' into catholic-vfx 2023-11-14 21:47:51 -07:00
James R
a7e6ed7607 K_PopPlayerShield: do not destroy Garden Top before it is deployed 2023-11-14 20:33:33 -08:00
AJ Martinez
d29d09ac94 Merge branch 'fix-sector-savegame' into 'master'
Fix crash when joining servers on maps with bot controllers

Closes #744

See merge request KartKrew/Kart!1624
2023-11-15 04:33:33 +00:00
James R
19cd35a10f P_DamageMobj: do not spill rings if player has shield 2023-11-14 20:33:09 -08:00
James R
cd2219f605 P_PlayerRingBurst: check player->curshield directly, handles Garden Top correctly 2023-11-14 20:32:22 -08:00
James R
b08ae70559 ArchiveSectors: send diff5 2023-11-14 20:00:19 -08:00