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
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
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
Oni
bfe3e72d3c
Merge branch 'fix-super-flicky-hud-crash' into 'master'
...
Obj_SuperFlickyOwner: check valid before returning source
Closes #696
See merge request KartKrew/Kart!1623
2023-11-15 03:30:12 +00:00
Oni
1c4b568ad9
Merge branch 'time-attack-refinement' into 'master'
...
Time attack refinement
See merge request KartKrew/Kart!1593
2023-11-14 19:12:52 +00:00
Oni
f01a0f62f3
Merge branch 'fix-generous-lap-reset' into 'master'
...
Don't allow respawn lap reset to increase lap
See merge request KartKrew/Kart!1612
2023-11-14 19:12:40 +00:00
Oni
ac2bd65b74
Merge branch 'fix-post-race-camera-follow' into 'master'
...
Revert smoother camera turning
Closes #764 and #763
See merge request KartKrew/Kart!1621
2023-11-14 19:12:21 +00:00
James R
cbe42f969b
Obj_SuperFlickyOwner: check valid before returning source
...
- Flicky::source() dereferences a pointer
2023-11-14 01:05:06 -08:00
Oni
469c85377d
Merge branch 'hazard-punting' into 'master'
...
Hazard punting; fixes to flame jets and item clash VFX
Closes #755 and #732
See merge request KartKrew/Kart!1620
2023-11-14 07:13:01 +00:00
VelocitOni
ed13705ff8
Don't punt super flicky
...
Don't punt the Super Flicky
2023-11-14 02:11:22 -05:00
James R
97ea2eadc5
Apply MF_DONTPUNT to MT_PLAYER, MT_INSTAWHIP and all items
...
- MT_PLAYER
- MT_INSTAWHIP
- MT_BANANA
- MT_BANANA_SHIELD
- MT_ORBINAUT
- MT_ORBINAUT_SHIELD
- MT_JAWZ
- MT_JAWZ_SHIELD
- MT_SSMINE
- MT_SSMINE_SHIELD
- MT_LANDMINE
- MT_DROPTARGET
- MT_DROPTARGET_SHIELD
- MT_BALLHOG
- MT_SPB
- MT_GARDENTOP
- MT_SINK
- MT_SINK_SHIELD
- MT_GACHABOM
- MT_DUELBOMB
2023-11-13 22:18:35 -08:00
James R
9b86dbf8e0
MT_DAYTONAPINETREE_SIDE: set punt_ref to center object
2023-11-13 22:18:35 -08:00
James R
a0c791706e
MT_FLAMEJETFLAME: apply MF_ELEMENTAL
2023-11-13 22:18:35 -08:00
James R
61cad641bb
Invincible player punts hazardous/solid things, unless MF_ELEMENTAL
...
If player is in one of these states:
- Invincibility
- Grow (K_IsBigger)
- Flame Shield dash
- Over 200% speed
And the other object:
- Does not have MF_DONTPUNT
Then, touching a solid object:
- Punts the object, unless the object has MF_ELEMENTAL
- Fizzles the object, if the object has MF_ELEMENTAL
Or, when an object damages the player:
- That object is punted, unless it has MF_ELEMENTAL
- The object fizzles, if it has MF_ELEMENTAL
Punting means:
- A copy of the object is made
- Both the player and copy receive 5 tics of hitlag
- The copy is thrust away from the player at a minimum of
60 FU, or 2x either the player's or object's momentum,
whichever is ultimately greater
- The copy despawns after 2 seconds
- The copy flickers constantly, while thrust away
Fizzling means:
- The object disappears completely
- A puff of smoke is spawned in place of the object
- No hitlag is applied to the player
Both punting and fizzling:
- Hide the original object (intangible and invisible)
- The original object reppears after 30 seconds
- For 2 seconds before reappearing, the object flickers
back in, but is still intangible
2023-11-13 22:18:35 -08:00
James R
a8a1c14580
mobj_t: add reappear and punt_ref members, add to savegame and Lua
2023-11-13 19:39:52 -08:00
James R
b11f340dab
Add MF_ELEMENTAL
2023-11-13 19:39:52 -08:00
James R
74d1f1bfb7
Add MF_DONTPUNT
2023-11-13 19:39:52 -08:00
James R
b81b932ba9
MF_MISSILE: do not run collision against other object, if MF_PAIN was evaluated
2023-11-13 19:24:20 -08:00
James R
21e870726d
Flame jets: do not receive hitlag
2023-11-13 19:24:19 -08:00
James R
9783c6760d
Flame jets: bigger hitbox, do not squash and stretch, 3x scale
2023-11-13 19:23:57 -08:00
James R
e1e5c304bc
Flame jets: scale momentum to map scale
2023-11-13 19:23:57 -08:00
James R
b4d7740dab
MT_ITEMCLASH: additive and 2x scale
2023-11-13 19:23:57 -08:00
James R
39a7c3b3ad
Remove MF_MONITOR
2023-11-13 19:23:54 -08:00
James R
3033c6928b
Remove MF_STICKY
2023-11-13 17:27:40 -08:00
James R
c7972f27a0
Revert "Try to correctly interpolate chase camera viewpoint as angle changes"
...
This reverts commit c758a8ad27 .
2023-11-13 17:10:11 -08:00
AJ Martinez
aad6795ba7
Trickpanels: I don't even know who I am anymore
2023-11-13 16:41:09 -07:00
Oni
c0241f27b2
Merge branch 'fix-invisible-grow' into 'master'
...
Fix invisible Grow (resolves #757 )
Closes #757
See merge request KartKrew/Kart!1614
2023-11-13 13:31:17 +00:00
Oni
9134e6a4e7
Merge branch 'bot-muffler' into 'master'
...
Don't force player sounds to full volume when exiting
See merge request KartKrew/Kart!1615
2023-11-13 13:30:51 +00:00
Oni
790d26d29c
Merge branch 'prisons-polish' into 'master'
...
Prison Egg polish: Spawn three Followers on hit
See merge request KartKrew/Kart!1595
2023-11-13 13:29:43 +00:00