Commit graph

18023 commits

Author SHA1 Message Date
Sal
ae3cfc690b Merge branch 'orbfterimages' into 'master'
Orbfterimages.

Closes #173

See merge request KartKrew/Kart!435
2021-04-27 17:08:56 -04:00
toaster
53806d41e0 Orbfterimages.
Fixes mistakes made in !408 and !418, resolving #173.
2021-04-27 20:29:30 +01:00
Sal
faed3170be Merge branch 'afterimg-fix' into 'master'
Fix Advance 2 afterimages conflicting with fade-out afterimages

See merge request KartKrew/Kart!431
2021-04-26 04:20:35 -04:00
Sally Coolatta
0bc19152ca Fix Advance 2 afterimages conflicting with fade-out afterimages 2021-04-23 19:17:29 -04: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
Sal
7e842735a3 Merge branch 'party-fix' into 'master'
Fix parties becoming black upon map load

See merge request KartKrew/Kart!428
2021-04-23 12:57:33 -04:00
Sally Coolatta
e5d899412c FIX PARTIES 2021-04-23 03:53:35 -04:00
Sal
42420eabc2 Merge branch 'more-mace-sound' into 'master'
More mace sound

See merge request KartKrew/Kart!421
2021-04-23 01:15:33 -04:00
Sal
6a159cc3ab Merge branch 'stair-janking' into 'master'
Yes, punish me more Stairs

See merge request KartKrew/Kart!417
2021-04-22 21:07:52 -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
Sally Coolatta
dcee9269dd FLAGS IS NOT LATENCY
UH OH STINKY COPY PASTE!!!!
2021-04-21 20:51:57 -04:00
SteelT
55bcfe48f4 Merge branch 'purple-spark' into 'master'
Purple sparks

See merge request KartKrew/Kart!424
2021-04-21 05:51:32 -04:00
lachablock
80977e1d1f Change red-to-blue spark transition color to SKINCOLOR_NOVA 2021-04-21 16:58:16 +10:00
lachablock
5e001a43ef Bump to 33% 2021-04-21 14:55:09 +10:00
lachablock
aeaf6c94f5 Give purple & rainbow driftboosts a 30% speed boost 2021-04-21 14:40:13 +10:00
Sally Coolatta
80ff9f2203 Some fixes
- Use SKINCOLOR_PURPLE instead of SKINCOLOR_THISTLE for the drift boost explosion.
- Use steering instead of cmd.turning in a few places. I dunno if I forgot to change these, or if it was accidentally reverted, or what. (Anything with a specific reason to use cmd.turning over steering will have a comment near it saying why.)
2021-04-20 13:21:26 -04:00
Sally Coolatta
5827c0c0b2 Original timings 2021-04-20 13:04:39 -04:00
toaster
905eb41778 Fix some compile-time errors. 2021-04-20 10:13:50 +01:00
toaster
c08c716682 Merge branch 'master' into purple-spark
# Conflicts:
#	src/k_kart.c
#	src/p_spec.c
2021-04-20 09:59:22 +01:00
lachablock
19b453f7fb Reduce purple spark time even more 2021-04-20 17:40:23 +10:00
lachablock
bd79169f48 Reduce time it takes to get purple sparks 2021-04-20 17:33:20 +10:00
lachablock
1b02e90fec Fix typo from merge 2021-04-20 16:47:34 +10:00
lachablock
b96394415b Spawn electric sparks on first blood 2021-04-20 16:25:43 +10:00
lachablock
5e327e09c6 Merge master (resolve structgunch conflicts) 2021-04-20 16:09:59 +10:00
lachablock
6e9c3cd864 Lightning sparks when releasing purple/rainbow drifts 2021-04-20 15:57:45 +10:00
SteelT
1b9c43e687 Merge branch 'structgunch' into 'master'
Structs gunched

Closes #167

See merge request KartKrew/Kart!422
2021-04-20 01:40:10 -04:00
toaster
6a55eb2f04 Resolve #167 - Rocket Sneakers now properly die if you rush their timer to 0. 2021-04-19 18:08:01 +01:00
lachablock
d0a3447ad4 Merge remote-tracking branch 'origin/master' into structgunch 2021-04-19 15:42:43 +10:00
SteelT
c2f00d1a30 Merge branch 'invinc-state-crash' into 'master'
Fix invincibility related crash accessing array index out of bounds

See merge request KartKrew/Kart!423
2021-04-19 01:41:57 -04:00
SteelT
a58a2dc58b Fix crash accessing array index out of bounds 2021-04-19 01:21:06 -04:00
lachablock
5aa2dd4cf0 Archive player->rings as SINT8 2021-04-19 14:28:41 +10:00
lachablock
9552dd4f80 Shift drift electricity scales with input direction 2021-04-18 00:25:31 +10:00
toaster
d9c9456798 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into structgunch
# Conflicts:
#	src/k_bot.c
2021-04-17 12:51:25 +01:00
toaster
00972a83d2 remove the prefix since everything seems to function 2021-04-17 11:30:08 +01:00
toaster
2ead3f7ee5 forgot to commit 2021-04-17 10:58:58 +01:00
lachablock
ed91279391 Add electricity sparks & change purple spark colors 2021-04-17 17:21:18 +10:00
Sally Coolatta
0e2b36e484 Purple sparks 2021-04-16 23:00:58 -04:00
Sal
2cbd0d0dcc Merge branch 'bots-stop-spindashing' into 'master'
Make spindashing bots work better

See merge request KartKrew/Kart!419
2021-04-16 20:34:15 -04:00
Sal
f131cda6e6 Merge branch 'swingstuff' into 'master'
Maces now have their fadeytrails again

See merge request KartKrew/Kart!418
2021-04-16 20:34:04 -04:00
toaster
b3d006b093 structs gunched 2021-04-17 00:27:13 +01:00
Sally Coolatta
7167b16378 Update mace sound flags
- SF_X2AWAYSOUND to hear them farther away
- SF_TOTALLYSINGLE cuz it makes fast maces sound cool
2021-04-13 04:31:38 -04:00
Sally Coolatta
49d99e3a31 Do the spinning mace sound every half spin, instead of every full swing
This matches how Marble Garden maces worked in Sonic 3 more closely, and also just makes it plain easier to hear them in a fast-paced race.
2021-04-13 04:28:41 -04: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
toaster
2d88026cdf Maces now have their fadeytrails again. 2021-04-11 14:53:28 +01: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
786dec30ad Tweak stair janking physics a bit
- Fuck up turning for half the duration of the animation.
- Treat drift the same as turning (just ignore it).
2021-04-11 02:09: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