Commit graph

715 commits

Author SHA1 Message Date
James R
17b3cd205e Merge branch 'snapify-hitlag' into 'master'
Snap da sentinel like hitlag

See merge request KartKrew/Kart!458
2021-11-28 00:29:29 +00:00
Sally Coolatta
a17f11e6c5 Ignore collisions between 2 objects that are BOTH in hitlag
Still allows it if a new object interferes to add more hitlag, but this should hooopefully prevent super big knockback stacking from 1 object?
2021-11-27 13:45:23 -05:00
James R
0d3a1b72cb Apply grease to vertical only springs too 2021-11-27 03:05:04 -08:00
Sally Coolatta
eb9e3d3e1b Snap da sentinel like hitlag
- Added a hitlag cap of 18 frames (can be decreased to 12 if it's too much)
- Hitlag amount can't be reduced, only increased
- Hitlag added is the same between both objects, instead of being different between the two
- Objects in hitlag can be interacted with again with TryMove (I was too nervous of it but it's fine in Snap lol)
- Rebalanced the damage hitlag lengths to make it feel relatively the same with all of the above considered
2021-11-27 03:24:29 -05:00
SteelT
db4bb74c42 All springs give spring grease 2021-11-26 23:42:25 -05:00
Sal
be91f05393 Merge branch 'object-bumping' into 'master'
New solid object bouncing, and updated player bouncing

See merge request KartKrew/Kart!426
2021-04-23 12:58:30 -04:00
Sally Coolatta
5ac5ca89d0 New solid object bouncing, and updated player bouncing
- Solid objects have new bouncing physics, it's a mix of the object bumping and wall bumping. It replaces the "solid" option on K_KartBouncing.
- Goomba stomp momentum is decided in K_KartBouncing itself instead of needing to be manually passed in as a boolean, so you'll be able to goomba stomp all objects instead of just players.
- Fixed bumping not carrying all of its intended momentum, due to a bug making friction apply very strongly.
2021-04-22 20:29:59 -04:00
Sally Coolatta
48c8843feb Merge branch 'master' into stair-janking 2021-04-21 21:44:23 -04:00
toaster
00972a83d2 remove the prefix since everything seems to function 2021-04-17 11:30:08 +01:00
toaster
b3d006b093 structs gunched 2021-04-17 00:27:13 +01:00
James R
92e61d82d9 Don't stair jank in spectator mode 2021-04-11 20:19:38 -07:00
James R
81e43245a8 Don't stair jank if crossing from/onto a slope
Also don't do it on ceilings unless standing on it.
2021-04-11 19:31:10 -07:00
James R
3f09cd4f2b Stair janking VFX
Little sparks spawn on one side of your jart while
stepping, plays for 4 frames on each side.
Loops if 10 tics of the janking animation remain.
2021-04-11 18:57:31 -07:00
James R
7badb5d925 Stair jank sound effects
Big meaty sfx, or a shorter one when quickly stepping.
2021-04-11 02:32:26 -07:00
James R
b3293aa122 Don't stair jank on really small steps
Also don't do it off slope launches.
2021-04-11 02:07:23 -07:00
James R
2b173f1ec0 Rumble the jart when stepping on staircases
- Sprite tilts back and forth 5.625 degrees, two tics each
  side, for 17 tics (half a second).
- Turning is ignored--as if in the air--every other tic
  during those 17 tics.
2021-04-10 03:22:23 -07:00
Sryder
8344ac3489 Actually just get rid of seenplayer and NAMECHECK altogether. 2021-03-03 18:03:41 +00:00
Sally Coolatta
9d7ec0ab8f Merge SRB2 next
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
LJ Sonic
85cd429d1d Revert "Replace all instances of P_AproxDistance with FixedHypot"
This reverts commit 498ff708bb.
2021-02-13 17:45:20 +01:00
James R
caa7fe1b47 Merge branch 'player-new-frames' into 'master'
New player frames: Glancing and death

See merge request KartKrew/Kart!362
2021-02-06 05:57:11 -05:00
James R
8c047372a6 Line special 2003: respawn player if crossing this line 2021-02-04 18:40:50 -08:00
Sally Coolatta
cc2704bc87 Death animation
Art is missing, but functionality is complete.

The kart corpse is also placeable as type 4095. No way to set its color currently, it simply defaults to SKINCOLOR_RED.
2021-02-02 22:36:56 -05:00
James R
fa696de12d Merge branch 'fix-mobj-slidemove' into 'next'
Make sliding against objects actually work (Fixes #400)

Closes #400

See merge request STJr/SRB2!1348
2021-01-26 20:43:17 -05:00
Sally Coolatta
94b8f97115 Keep trick when bonking walls 2021-01-13 02:42:55 -05:00
Sally Coolatta
03149d7810 Only do touch damage when confirming a bump
Should fix the mcdonalds rings
2021-01-06 23:16:02 -05:00
Sally Coolatta
cfda66103d Merge branch 'master' into just-tumble 2021-01-06 23:02:51 -05:00
Sal
25264d2634 Merge branch 'no-waypoint-sight-check' into 'master'
Waypoints use trace for blocking lines, instead of a sight check

See merge request KartKrew/Kart!342
2021-01-06 20:44:07 -05:00
Sally Coolatta
56fba410ee Waypoints use trace for blocking lines, instead of a sight check 2021-01-06 16:21:57 -05:00
Latapostrophe
fe4d9ce889 New trick panel shit (but only the gameplay part) 2021-01-06 21:20:28 +01:00
Latapostrophe
74a39837bb Merge conflicts 2021-01-06 18:33:42 +01:00
James R
c76ae9a4fd Actually put it on line type 81 2021-01-04 18:55:33 -08:00
James R
6070d14fa5 Line special 11: block monsters for this line 2021-01-04 17:40:06 -08:00
James R
90507126e4 Move block line checks to a single function 2021-01-04 17:34:10 -08:00
GoldenTails
becb2faa01 Make sliding against objects actually work 2020-12-21 02:03:44 -06:00
James R
498ff708bb Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
James R
956fd338f0 Merge branch 'oldguards' into 'next'
Kill remaining HAVE_BLUA and SEENAMES

See merge request STJr/SRB2!1319
2020-12-12 17:34:04 -05:00
James R
887f4a0919 Merge branch 'master' into next 2020-12-12 02:38:51 -08:00
James R
19af2b9afe Remove trailing whitespace 2020-12-12 02:37:03 -08:00
James R
41f1b3b97c Kill SEENAMES 2020-12-12 02:11:23 -08:00
James R
8cc312a16d Merge branch 'saloondoor-revengeance' into 'next'
Saloon door fixes (closes #394)

Closes #394

See merge request STJr/SRB2!1296
2020-12-10 15:43:31 -05:00
Tatsuru
0e92f1818c Kill saloon doors without a tracer, add height check for non-blocking doors 2020-12-06 14:11:08 -03:00
SMS Alfredo
12f36719b4 Allow player.lastlinehit and player.lastsidehit to be used outside of Knuckles' climbing ability 2020-11-25 14:31:24 -06:00
Sally Coolatta
d0ca3b78c1 Merge branch 'master' into battle-rethink 2020-11-18 17:49:06 -05:00
Sal
b2eb64ac09 Merge branch 'roll-and-tilt' into 'master'
Roll & pitch replace modeltilt

See merge request KartKrew/Kart!326
2020-11-17 20:03:48 -05:00
Sally Coolatta
e16c7d722f Cherry-pick e1b265df2 2020-11-16 19:55:28 -05:00
Sally Coolatta
14b379fd27 Cherry-pick 4eb69a664 2020-11-16 19:52:26 -05:00
Sally Coolatta
56a20d05df Merge branch 'master' into battle-rethink 2020-11-11 00:11:18 -05:00
Sally Coolatta
8b5a78114e Hitlag occurs on registered damage instead of being before damage calls 2020-11-09 21:35:08 -05:00
James R
6d665a856d Merge branch 'step-up-goofs-2' into 'next'
Fix disabling step up/down not working

See merge request STJr/SRB2!1219
2020-11-09 17:52:41 -05:00
Sally Coolatta
0e28470228 Merge master 2020-11-08 02:34:24 -05:00