Commit graph

17971 commits

Author SHA1 Message Date
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
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
James R
0818be1b8a Tilt camera less quickly with more air time 2021-04-06 19:16:48 -07:00
James R
1fc942e47a Fix tilting on backward slopes 2021-04-06 18:17:04 -07:00
James R
46ba47785d Ease camera tilting quickly toward a steep angle, slowly toward a shallow angle 2021-04-06 17:52:03 -07:00
James R
0642e2206e Rotate sprite correctly in reverse gravity 2021-04-06 16:25:25 -07:00
James R
f1a2a0a20d Tilt 90 degrees off half pipe 2021-04-06 16:25:25 -07:00
James R
bdc4b50de2 Let viewrollangle be independent of camera tilting 2021-04-06 16:25:25 -07:00
James R
f313eece7e Use pitch/roll for camera tilting 2021-04-06 16:25:25 -07:00
James R
696e405038 Lift the wheels of your jart a little when sliptiding 2021-04-06 16:25:25 -07:00
James R
c74e02d9dc Tweak camera tilting
- Grow divisor with delta. Reduce divisor base from 32 to
  17. This makes small changes in tilt snappier, while
  larger ones ease in.
- Added tilting during quakes is subtler.
2021-04-06 16:25:25 -07:00
James R
1eca138b21 Revert "Rumble rumble"
This reverts commit c82ac33c0c.
2021-04-06 16:25:25 -07:00
James R
c4af0c2374 Merge remote-tracking branch 'srb2/next' into yet-another-next-merge 2021-04-06 16:20:44 -07:00
James R
a5c035b4ce Merge branch 'master' into next 2021-04-06 16:19:15 -07:00
toaster
b19372944c * Add a new feature - "-nodoubles", which shows only double-defined entries without needing to specify a range (but you still can, afterwards).
* Resolve Sryder's comment about confusing unlabeled iteration variables.
* Fix an issue with out-of-range printing for the end of the range failing.
2021-04-06 17:08:34 +01:00
toaster
15c2d75199 listmapthings
Introduces a new command that lists all mapthings by their doomednum and MT_ constant string.
* Can distinguish between hardcode and freeslots.
* Can detect double definition.
* With single argument, returns messages relating to that single doomednum.
* With two arguments, returns messages for that doomednum range inclusive (can swap if wrong way around).

The below image does not include what happens when it is called without any arguments, as that is long enough to only be legible in the logfile.
https://cdn.discordapp.com/attachments/369137273700089867/829007068333342720/unknown.png
2021-04-06 16:08:54 +01:00
James R
e9b305c0b0 Makefile: fix object file not depending on headers
BRUH MOMENT
2021-04-06 03:55:57 -07:00
Sally Coolatta
72dc88c043 Attempt at a non-controller dependent compromise for turn easing
Values are subject to tweaking.

(AngleDelta stuff is a leftover of the previous attempt, but I think the code's useful so I kept it in this commit anyway)
2021-04-05 23:52:56 -04:00
Lach
26a5c5d41a Merge branch 'dashmode-crash' into 'next'
Fix jet fume crash when dashmode is above DASHMODE_MAX

See merge request STJr/SRB2!1450
2021-04-05 21:30:16 -04:00
James R
a5d7bc3fd2 Brackets 2021-04-05 18:10:34 -07:00
James R
79e4ca6d13 Revert "Add PlayerHeight and PlayerCanEnterSpinGaps Lua hooks"
This reverts commit b5c61a8a2a.
2021-04-05 17:03:31 -07:00
Sally Coolatta
68c3ab8f68 Fix jet fume crash when dashmode is above DASHMODE_MAX
I would like to use higher dashmode values for extra leniency, the jet fume kicks and screams when this happens.
2021-04-05 16:59:02 -04:00
LJ Sonic
a048a3023f Merge branch 'uppercase-tty' into 'next'
Let uppercase letters thru dedicated console

See merge request STJr/SRB2!1449
2021-04-05 07:33:42 -04:00
James R
22eb12c6a8 Drop nospin changes
Revert 35cecad868 & fdd02e35c8
2021-04-05 01:42:01 -07:00
James R
08348fcd43 Merge remote-tracking branch 'srb2/next' 2021-04-05 01:26:17 -07:00
James R
e5c2ec2992 Merge branch '22-merge-again' into 'master'
2.2 merge again

Closes #150, #147, #136, #145, and #139

See merge request KartKrew/Kart!409
2021-04-05 03:57:38 -04:00