Commit graph

1824 commits

Author SHA1 Message Date
SteelT
b3cee8b8fc Merge branch 'master' into trick-panels-changes 2021-06-10 23:45:35 -04:00
toaster
53806d41e0 Orbfterimages.
Fixes mistakes made in !408 and !418, resolving #173.
2021-04-27 20:29:30 +01:00
Sally Coolatta
0bc19152ca Fix Advance 2 afterimages conflicting with fade-out afterimages 2021-04-23 19:17:29 -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
Latapostrophe
29e11a0378 changes to the delay, boost when doing upwards trick 2021-04-22 15:11:15 +02:00
Sally Coolatta
48c8843feb Merge branch 'master' into stair-janking 2021-04-21 21:44:23 -04: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
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
Sally Coolatta
0e2b36e484 Purple sparks 2021-04-16 23:00:58 -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
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
1fc942e47a Fix tilting on backward slopes 2021-04-06 18:17:04 -07:00
James R
f1a2a0a20d Tilt 90 degrees off half pipe 2021-04-06 16:25:25 -07:00
Sally Coolatta
8bb1fa57d4 Merge branch 'master' into 22-merge-again 2021-04-05 01:11:26 -04:00
toaster
cf59809852 Fixed some of the worst of it, but still has inconsistencies with the lookup tables we generated for main.kart - will provide evidence on Discord.
(side note, it's weird as hell that code we inherited from vanilla next - and i checked, it wasn't mangled in the merge - has bugs that straight up prevent it from functioning properly...)
2021-04-01 00:05:05 +01:00
toaster
40cbc30bff Mammoth commit, sorry.
All my work thus far on solving the drawflag/renderflag/additive/subtractive conundrum.

Outstandng problems:
* Bad additive/subtractive tables means that they appear opaque except under certain conditions.
* No support for FOFs, Polyobjects, or linedefs in OpenGL yet.
* All OpenGL support mostly done blind, may or may not function in practice.

If nothing else, the hard engineering problems are solved and it's just bug hammering...
2021-03-31 22:46:23 +01:00
toaster
a4cf9932f0 Fixed flashingtics being set on subsequent maploads. 2021-03-29 18:40:18 +01:00
toaster
45c0e48e16 Resolve #147 by making players not have flashingtics if they spawn before the end of the intro. 2021-03-29 00:03:33 +01:00
toaster
4e3b4a82f9 Resolve #136 - mapobjectscale is working again. 2021-03-28 22:33:43 +01:00
Sally Coolatta
420a6ccccb Fix Dehacked loading 2021-02-28 22:39:47 -05: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
Sally Coolatta
cbe14d74c8 Increase default hint weight 2021-02-26 22:56:59 -05:00
toaster
a43a762b46 Instead of hacking ticcmd generation, add/modify helper functions acting as intermediaries that add the necessary changes.
* Introducing K_GetKartButtons(player_t), for adding false presses to.
* K_GetForwardMove(player_t) takes kickstarting into account, and is now applied to engine sound generation too.
* BT_REALACCELERATE has been deleted.
2021-02-22 12:21:48 +00:00
toaster
f71741f557 MT_BRAKEDRIFT appears to be broken, and self-removing if BT_ACCELERATE ISN'T there, as opposed to if it is as the comment suggests. Fix that here. 2021-02-21 16:58:37 +00:00
Sal
8853a4b8e3 Merge branch 'jumping-finish-line-distance' into 'master'
Finish line waypoint issues

See merge request KartKrew/Kart!384
2021-02-18 18:23:08 -05:00
Sal
db46507b81 Merge branch 'respawnstuff' into 'master'
Respawning, FAULTing and spectators

Closes #108

See merge request KartKrew/Kart!392
2021-02-18 18:15:27 -05:00
toaster
5310acc84e * As predicted, remove FAULTing from simply becoming a spectator at the start of the race - only apply it if you attempt to rejoin!
* Mark FAULTing players as in pain, preventing you from using your rings in mid-air (which is especially egregrious when re-entering the race from being a spectator uses the item button).
2021-02-18 11:11:50 +00:00
toaster
2ec943a214 Several changes to respawning and race start.
* Becoming a spectator is now instant, and leaves no bumpable corpse behind.
* Players will now FAULT if they:
    * change from a spectator into a player after the initial camera turnaround but before the end of POSITION.
    * touch an instant kill FOF or get crushed during POSITION.
    * become a spectator during POSITION. (I might change this later, seems overkill)
* If you respawn during POSITION, the jingle will not restart from the beginning.
* Change the FAULT animation to match spinout/currents.
* Clean up some of the spawning code to not place spectators on the ground.
2021-02-17 21:48:09 +00:00
James R
49bbdd537b Move the debt spike fuse initialization from P_ZMovement to P_MobjThinker
slopes + upward momentum = no upward momentum haha
2021-02-16 04:43:20 -08:00
James R
81d162d19c Add some helper functions for objects in reverse gravity 2021-02-16 04:42:27 -08:00
James R
0cf41dade0 Improve P_SpawnMobjFromMobj by factoring the scale from P_SpawnMobj in
This will copy the parent object's scale to the child, but scale it by the
child's original scale relative to the map scale. Also uses the child's actual
height, instead of the mobjinfo version. Might be useful if either the scale
or height was changed in P_SpawnMobj. Say, from a Lua hook.
2021-02-16 03:55:37 -08:00
James R
9fae8dbb41 Don't respawn on the finish line waypoint
This causes you to respawn at the waypoint before the finish line waypoint,
which I think looks a bit nicer.
2021-02-15 23:17:55 -08:00
James R
82718216cc Respawn slightly before a waypoint, in the direction you came from, if the waypoint is exactly on a line
See notably the finish line. Basically respawning exactly on a line can let you
cross it twice, if you crossed it before respawning, or NOT cross it, depending
on which direction you drive after landing. So this just respawns very slightly
before the line so you can cross (or not cross) it normally.
2021-02-15 23:01:13 -08:00
James R
4f96fead3a Search entire map, not just waypoint's sector, for finish line 2021-02-15 01:46:29 -08:00
James R
29d9bafb9e Snap finish line waypoints to the nearest point of the finish line
Finish line waypoints must be exactly on the finish line to avoid erroneous
finish line distance from crossing the waypoint before/after the line. This
is only a problem in circuit maps and on laps before the last, due to the
multiplied circuit length.
2021-02-14 23:04:17 -08: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
f7fd39402a Float flag for rings and horizontal springs no longer scales twice in mobjscaled maps 2021-02-12 16:20:18 -08:00
Sal
4b556ef114 Merge branch 'air-failsafe' into 'master'
Air failsafe boost

See merge request KartKrew/Kart!367
2021-02-12 13:57:55 -05:00
Sally Coolatta
038dd17de3 Debt spikes set their fuse when they land
Another request from oni
2021-02-07 15:44:43 -05:00
Sally Coolatta
233d257791 Give fling rings shadows, remove afterimages
Both oni requests
2021-02-07 15:30:45 -05:00
Sally Coolatta
93c5942ceb Air failsafe boost
While in the air: release accelerate while at nearly-still speeds, and you'll preform a minisucle air drift boost. This mechanic is meant to fix the long-standing issue where you can get stuck in 0 speed in the air and not be able to do anything.
2021-02-07 14:07:27 -05:00
James R
44ec94f287 Merge remote-tracking branch 'origin/master' into funny-spikes 2021-02-06 03:00:50 -08:00
James R
f9c6a5e8b5 Drop Funny Spikes when getting stung
DEBTA0-DEBTH0

Instead of dropping rings, drop non collectable spikes!
2021-02-06 02:31:24 -08:00
Sally Coolatta
e2e342f3f7 Update panim for the new states 2021-02-03 19:29:13 -05:00
Sally Coolatta
c698ddaa6c Balloons by default will randomly pick CNZ colors
Would like this actually for CNZ instead of manually picking them by number & then the numbers get desynced... :v
2021-02-02 22:44:53 -05: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
LJ Sonic
05a75758ab Merge branch 'redundant-hypot' into 'next'
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's

See merge request STJr/SRB2!1320
2021-01-25 18:08:25 -05:00
LJ Sonic
9a2a1d25d6 Merge branch 'jimita-why-you-done-this!!!' into 'next'
Fix mobj unarchiving code

See merge request STJr/SRB2!1384
2021-01-22 18:26:26 -05:00