Commit graph

16993 commits

Author SHA1 Message Date
Sally Coolatta
13285d0ca4 OpenGL shader updated to be subtractive
Not a big fan of how it separately checks each channel but grumble grumble
2021-02-12 00:55:41 -05:00
James R
e49d4a4cee Use fabs 2021-02-10 23:47:09 -08:00
SteelT
8f220382f6 Merge branch 'add-sub-colormaps' into 'master'
Additive/subtractive colormaps

See merge request KartKrew/Kart!370
2021-02-11 00:33:38 -05:00
Sally Coolatta
d5d8697efa Fix bug causing fog to be dull in some maps 2021-02-10 18:10:12 -05:00
Sally Coolatta
c3c9025b27 Minor cleanup 2021-02-10 17:20:16 -05:00
Sally Coolatta
c95684198d Add/sub fog
Makes it consistent with the subtractive lighting I was working on... the big benefit is that no saturation is lost when blending to white or black.
Has a few maps this looks worse on, though.
2021-02-10 15:43:58 -05:00
James R
c7783945ca Merge branch 'funny-spikes' into 'master'
Funny Debt Spikes

See merge request KartKrew/Kart!366
2021-02-07 05:51:57 -05:00
James R
e603c4d48d Merge branch 'spindash-rebalance' into 'master'
Spindash rebalance

See merge request KartKrew/Kart!365
2021-02-07 05:51:44 -05:00
Sally Coolatta
4535a642d6 Merge branch 'master' into spindash-rebalance 2021-02-07 02:35:55 -05:00
James R
e9572232de Fine, int32 2021-02-06 20:24:39 -08:00
James R
75ee9b465b Drop spikes once ring burst puts you into debt 2021-02-06 20:22:15 -08:00
James R
44ec94f287 Merge remote-tracking branch 'origin/master' into funny-spikes 2021-02-06 03:00:50 -08:00
James R
caa7fe1b47 Merge branch 'player-new-frames' into 'master'
New player frames: Glancing and death

See merge request KartKrew/Kart!362
2021-02-06 05:57:11 -05:00
Sally Coolatta
0a950df133 Reset k_spindash when hurt 2021-02-06 05:46:53 -05:00
James R
45b98298d9 Ring burst adjustment
Explosions and Tumble - 10 rings
SPB - 20 rings
2021-02-06 02:45:23 -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
5e098cddcd This comment is extremely funny 2021-02-06 05:22:30 -05:00
Sally Coolatta
ee68862d1f Drift protection
Before, doing a spindash input while turning, but not being at a low enough speed, would make you start drifting.

Now, it checks if you're trying to E-Brake first before interpreting it as a drift input.

If you were already drifting, then attempting accel+brake will still be brake-drift, so that technique is unaffected.
2021-02-06 00:08:28 -05:00
Sally Coolatta
fea9cd2ad0 Make spindash strength curve exponential instead of linear
Heavily encourages full charge instead of tapping
2021-02-05 23:29:51 -05:00
Sally Coolatta
af7adf76c4 Make spindash speed differences x2 stronger 2021-02-05 23:28:47 -05:00
Sally Coolatta
7584274636 Spring/spindash grease & invincibility gives you slope resistence 2021-02-05 23:28:22 -05:00
Sally Coolatta
e8774cf7b2 Charging nothing for no time now actually gives you nothing 2021-02-05 22:50:33 -05:00
Sal
053ecf203f Merge branch 'pos-hud-tweaks' into 'master'
Position number uses additive/subtractive

See merge request KartKrew/Kart!361
2021-02-05 17:53:11 -05:00
Sally Coolatta
8e041e7d0b Re-add const 2021-02-05 17:51:23 -05:00
Sal
64d6453331 Merge branch 'respawn-line' into 'master'
Respawn when crossing a line

See merge request KartKrew/Kart!363
2021-02-05 17:49:50 -05:00
Sal
6a2c5368ee Merge branch 'finish-beam-in-sprints' into 'master'
Finish line beam for sprint maps

See merge request KartKrew/Kart!364
2021-02-05 17:48:37 -05:00
Sally Coolatta
75dd970adc Beam objects
Place 2 to arbritrarily place the line anywhere. For sprint maps.
2021-02-05 01:58:34 -05:00
Sally Coolatta
90ca38acb0 Store where the finish line beam should be displayed
Instead of figuring out where it should be every tick while it's visible, store where it'll be at the start of the map.

Also moved finish line beam into a new file, k_race.c/h, for any Race-specific code.

A few unused variables for sprint map support later too
2021-02-05 01:24:23 -05:00
James R
eabb97ea93 Line special 2003: No Climb - only respawn when crossing front side 2021-02-04 18:51:32 -08:00
James R
8c047372a6 Line special 2003: respawn player if crossing this line 2021-02-04 18:40:50 -08:00
Sally Coolatta
efeab5e80e Allow lookback/glancing in the air, glance back while braking 2021-02-04 21:11:27 -05:00
Sally Coolatta
73c61b1010 Prioritize lookback frames over turn frames if you're pressing lookback 2021-02-04 20:18:14 -05:00
Sally Coolatta
b7e578b82b Keep look backwards direction in a variable, so it can smoothly rotate 2021-02-04 00:26:59 -05:00
Sally Coolatta
e2e342f3f7 Update panim for the new states 2021-02-03 19:29:13 -05:00
Sally Coolatta
480e32d369 Properly add states to the tables...
Mind's been split everywhere tonight
2021-02-03 19:20:27 -05:00
Sally Coolatta
05838acc3d Big look frames
No sheets support this yet, but it will default to glance frames, so no functionality loss without them.
2021-02-03 18:28:23 -05:00
Sally Coolatta
8849d25e8a Merge branch 'master' into pos-hud-tweaks 2021-02-03 16:55:26 -05:00
Sal
090daaac02 Merge branch 'admins' into 'master'
Everyone has access to admin commands in development builds

See merge request KartKrew/Kart!353
2021-02-03 02:23:28 -05:00
Sal
fe0c9cef65 Merge branch 'lua-karthud-bruh' into 'master'
Lua: Expose p.karthud and p.respawn

See merge request KartKrew/Kart!354
2021-02-03 02:19:27 -05:00
Sally Coolatta
bea2724a86 Glance frames
When someone is about to pass you, you'll take a glance at 'em!
2021-02-03 01:24:00 -05:00
Sally Coolatta
c178ca6c1a Fix CHECK in splitscreen 2021-02-02 22:47:22 -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
Sally Coolatta
4d108930a9 Update position nums to use additive
Looks far more colorful this way! By default it is additive... but like SMK, there is a map header option for subtractive, intended for maps with white roads.
2021-02-02 19:58:07 -05:00
Sal
60745502f2 Merge branch 'additive-subtractive-hud' into 'master'
Additive and subtractive for the HUD

See merge request KartKrew/Kart!360
2021-02-02 18:23:49 -05:00
Sally Coolatta
ec1bcd73dc Merge branch 'additive-subtractive-hud' into pos-hud-tweaks 2021-02-02 18:23:07 -05:00
Sal
8c83cfa77f Merge branch 'tumble-no-last-bounce' into 'master'
Remove 1 bounce from tumble

See merge request KartKrew/Kart!359
2021-02-02 02:21:15 -05:00
Sally Coolatta
8de53f909b Merge branch 'master' into tumble-no-last-bounce 2021-02-02 01:30:20 -05:00
Sal
df2a2b3b46 Merge branch 'lap-executor-edit' into 'master'
Lap executor edit

See merge request KartKrew/Kart!356
2021-02-02 01:30:07 -05:00
Sally Coolatta
f57651e51f Removed a bounce from tumble 2021-02-02 01:29:44 -05:00