Commit graph

18095 commits

Author SHA1 Message Date
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
Sally Coolatta
e006cfa287 Make spindashing bots work better
They will no longer do it on a whim after getting bumped out of position of hitting walls, instead checks if they're trying to accelerate and they physically can't.
2021-04-11 04:54:27 -04:00
James R
50c198cc0f Fuck up turning even more
- Lose control of turning for 2 tics instead of 1.
- Drift angle is also increased (less inward).
2021-04-10 04:22:44 -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
James R
a77ed63c5f Merge branch 'sliptide-tweak' 2021-04-10 03:21:09 -07:00
James R
96d49730df Don't tilt according to slope while spectating 2021-04-09 19:06:56 -07:00
James R
1e97e92be0 Use lookback frames for sliptides 2021-04-09 18:22:15 -07:00
Sal
526b3c3b57 Merge branch 'listmapthings' into 'master'
listmapthings

See merge request KartKrew/Kart!411
2021-04-09 19:39:51 -04:00
Sal
fcc1090f47 Merge branch 'mine-no-fullbright' into 'master'
Proximity mines all lost their fullbright?!

See merge request KartKrew/Kart!416
2021-04-09 19:39:04 -04:00
Sal
b833907020 Merge branch 'fix-avgpwrlvl' into 'master'
Fix avgpwrlvl

Closes #156

See merge request KartKrew/Kart!414
2021-04-09 19:38:33 -04:00
Sal
973ed55170 Merge branch 'turn-in-air' into 'master'
Allow players to turn when they're in the air at 0 speed

See merge request KartKrew/Kart!403
2021-04-07 18:03:42 -04:00
Sally Coolatta
55ee8545b4 Merge branch 'master' into turn-in-air 2021-04-07 18:00:32 -04:00
James R
2f3e7723cb rejointimeout default -> Off 2021-04-07 00:11:39 -07:00
Sally Coolatta
2d202d748e Proximity mines all lost their fullbright?! 2021-04-07 03:05:01 -04:00
Sal
22c3dae600 Merge branch 'invinc-changes' into 'master'
Invincibility changes

See merge request KartKrew/Kart!412
2021-04-07 02:46:32 -04:00
Sal
0d09827284 Merge branch 'turn-mom' into 'master'
Turn easing that *doesn't* give specific controllers an advantage

See merge request KartKrew/Kart!415
2021-04-07 02:17:53 -04:00
Sally Coolatta
05915e641c Merge branch 'master' into turn-mom 2021-04-07 01:25:34 -04:00
SteelT
3545836ea1 Merge branch 'master' into invinc-changes 2021-04-07 01:20:12 -04:00
James R
69eb874a9e Merge branch 'yet-another-next-merge' into 'master'
I merged srb2 next again because of a dumb compile warning

See merge request KartKrew/Kart!410
2021-04-07 01:19:02 -04:00
James R
b6568d82da Merge branch 'tilting-tweaks' into 'yet-another-next-merge'
Tilting Tweaks

See merge request KartKrew/Kart!413
2021-04-07 01:18:43 -04:00
James R
d5e4fb6bfa Turn sprite less while sliptiding 2021-04-06 21:56:37 -07:00
James R
7e74a1d823 Cap camera tilt at 45 degrees; remove excess airborne easing 2021-04-06 21:53:14 -07:00
Sally Coolatta
0e7460811e Fix avgpwrlvl 2021-04-06 23:56:22 -04:00
James R
a8c443f2aa Stop lifting the jart when sliptides end due to drift 2021-04-06 20:54:30 -07:00
James R
5660cac3ad Stronger tilt on sliptiding + turn to face the camera
Oni's Sick Nasty
2021-04-06 20:45:47 -07:00
James R
9dcce02e5e Don't add tumble/sliptide rollangle to camera tilt 2021-04-06 20:43:31 -07:00
SteelT
411fa4a6d8 Only extend the invinc time for the player if the hit was direct 2021-04-06 23:41:54 -04:00
SteelT
6d4a544fd5 Scale the speedlines based on how much is left on the timer 2021-04-06 23:18:59 -04:00
SteelT
fc8bd429f3 Merge branch 'master' into invinc-changes
Also made changes to sparkles, invincibility speedlines now replaces the sparkles if boosting.
2021-04-06 22:40:02 -04:00