Commit graph

947 commits

Author SHA1 Message Date
SteelT
002e07dceb Merge branch 'mergeladder' into 'master'
Merge Ladder

See merge request KartKrew/Kart!558
2022-03-22 03:34:08 +00:00
toaster
52d2472ed7 "Drop Target" item initial commit.
Most of the way there, but still a bit left to do.
2022-03-21 23:40:30 +00:00
toaster
3c83508646 add sprung flag to steam
# Conflicts:
#	src/p_map.c
2022-03-18 13:39:19 +00:00
toaster
a3eab3099e Solve the concern about potential tiregrease overwriting. Let the video resume at once 2022-03-12 23:18:55 +00:00
James R
c58d789a07 Always reset tiregrease 2022-02-24 22:51:01 -08:00
James R
8f303f03d2 Merge branch 'iamnobump' into 'master'
I am no bump

See merge request KartKrew/Kart!548
2022-02-17 05:05:24 +00:00
toaster
93e4ef0ef1 Permit players to not bounce when colliding with ML_NOTBOUNCY walls (imperfect but better than the LITERALLY NO SUPPORT that was there beforehand) 2022-02-10 00:06:47 +00:00
toaster
766fce5857 Make some adjustments to the damage combo system for players.
* Prevent a player that is moving upwards from being DMG_TUMBLE'd again (resolves #212).
* Instead of having a special case for missiles there, make PIT_CheckThing toggle DMG_WOMBO instead.
* Allow hard hits (DMG_TUMBLE, DMG_EXPLODE, and DMG_KARMA) to have combos toggled off with DMG_WOMBO, too.
2022-02-03 19:51:17 +00:00
SinnamonLat
fafcf307d2 Add combo to bubble shield 2022-01-23 18:02:56 +01:00
toaster
93dfbf382c The "free" changes from framezero - the crash fixes that have no complexity and therefore no negative consequence to introduce 2022-01-20 19:27:02 +00:00
toaster
ef6ee928ac After I experienced a few consistent crashes for invalid subsector references in P_BounceMove/P_SlideMove, add a few extra checks for whether the mobj is removed. 2022-01-16 22:03:27 +00:00
Sally Coolatta
ef5a4f01d4 Merge branch 'master' into terrain-lump 2022-01-04 12:34:47 -05:00
Sal
20b1ddb4d3 Merge branch 'dont-scale-gravity' into 'master'
Scale gravity with map scale instead of object scale

See merge request KartKrew/Kart!513
2022-01-04 04:22:42 +00:00
Sally Coolatta
c4385166e5 Scale gravity with map scale instead of object scale 2022-01-03 20:02:22 -05:00
Sally Coolatta
6c13ddca01 Rename PitchRoll stuff back
I did a find+replace because I realized the functions I added were named too similar to other ones & to make the purpose more obvious ... but it ended up changing them too anyway! Gah!
2021-12-24 13:00:12 -05:00
Sally Coolatta
cc250afd45 P_InitAngle, to fix angle interpolation on spawning objects 2021-12-24 12:45:51 -05:00
Sally Coolatta
0cd3efc76d Merge branch 'master' into terrain-lump 2021-12-18 18:36:05 -05:00
Sally Coolatta
2a9f2214cb Merge branch 'master' into terrain-lump 2021-12-12 04:15:53 -05:00
Sally Coolatta
5f4e4f8cb5 Merge branch 'master' into bot-maint 2021-12-11 14:13:27 -05:00
Sally Coolatta
19463d6b20 New bot prediction wall detection
Instead of searching for walls around the player, and then deciding to make the radius tighter if it found anyway, it instead checks if the waypoint it's trying to predict towards was blocked by any walls / hazards.

Needs adjusted some, I think its being pulled back too hard sometimes, but I am optimistic about some of the improvements I already saw.
2021-12-10 17:42:00 -05:00
SteelT
e009f1ebab Merge branch 'super-upside-down-spring' into 'master'
2x vertical speed for downward springs

See merge request KartKrew/Kart!483
2021-12-10 04:11:17 +00:00
Sally Coolatta
bf4b47a2cf Merge branch 'master' into terrain-lump 2021-12-09 03:46:01 -05:00
Sally Coolatta
150faf9de6 Add terrain pointer to mobj_t 2021-12-09 00:56:05 -05:00
James R
f2e8d7d469 Increase step up with water-running just like water-skipping 2021-12-07 16:26:52 -08:00
James R
0cbd24e589 2x vertical speed for downward springs 2021-12-06 21:30:35 -08:00
James R
9bde266f9f Water running
You can run on water in any case where you would have
slope resistance AND your speed is over 100%. You may run
on water regardless if you're speed is above 200%.
2021-12-05 22:41:25 -08:00
James R
7180027c9f Merge branch 'ceiling-bump' into 'master'
Ceiling clipping is satisfying

See merge request KartKrew/Kart!466
2021-11-30 04:09:19 +00:00
Sally Coolatta
c43f8da5e6 P_SetOrigin & P_MoveOrigin to replace P_TeleportMove 2021-11-29 08:20:27 -05:00
James R
72ded01ac8 Smoother ceiling clipping
- Apply some gravity immediately.
- Play the bump (like against walls) effect.
2021-11-28 21:45:31 -08:00
James R
332d3bfa12 Fix passing tripwire not triggering SOMETIMES 2021-11-28 18:48:27 -08:00
James R
0e6bb75230 Check TRIPWIRE texture at map load
So it can be animated.
2021-11-28 04:08:38 -08:00
James R
8e20ca4c04 TRIPWIRE
Set a sidedef's midtexture to "TRIPWIRE" to turn that line
into a tripwire.

Players can't drive through a tripwire and will bounce
back at high speed if they're in one of the following
states:

1. Invincibility / Grow
2. Sneakers
3. Flame Shield dash
4. >200% on the speedometer

Hitting a tripwire plays a sound, sends you into hitlag,
then plays another sound when the hitlag is over. The
sounds used depend on whether you can drive through the
tripwire.
2021-11-28 03:03:43 -08:00
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