Sally Cochenour
a322f4efd4
Merge branch 'driftspark-update' into air-spark-experiment
2020-03-16 00:54:48 -04:00
Sally Cochenour
48e69f7c91
Air sparks, start on drift boosts
2020-03-16 00:53:33 -04:00
Sally Cochenour
4026344ad3
Minor yellow-spark related cleanup
...
Sound plays when you go to yellow sparks & back, and Red transition uses Tangerine instead of Raspberry
2020-03-15 23:21:46 -04:00
Sally Cochenour
4174d9a23e
Add a function for retrieving drift spark color, to simplify a lot of code & add transition colors to everything
2020-03-15 23:02:43 -04:00
Sally Cochenour
3093a3078e
Scale dust properly
2020-03-15 22:05:43 -04:00
Sally Cochenour
c4dd88bbae
Turn sparkles that warn you when you're about to hit a new drift spark!
2020-03-15 21:59:22 -04:00
Sally Cochenour
7d1c132ca2
Fix drift spark camera when you go to yellow sparks
2020-03-15 21:21:07 -04:00
Sally Cochenour
01885c5166
Revert "Actually, might've reintroduced more lawnmower problems; let's play it safe"
...
This reverts commit 219d4aebf2
2020-03-15 20:52:41 -04:00
Sally Cochenour
1e10ec00d7
Merge branch 'waypoints' into sal-waypoints
2020-03-15 20:23:24 -04:00
Sally Cochenour
fa34e4eee4
Merge branch 'master' into sal-waypoints
2020-03-15 20:21:17 -04:00
Sryder
c268313f0a
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/Makefile
# src/k_kart.c
# src/p_map.c
# src/p_setup.c
# src/p_spec.c
2020-03-16 00:13:42 +00:00
Sally Cochenour
084901a8b1
Add warnings for old map setups
...
We probably don't want to keep these for release, but we need reminders to get rid of them ourselves :V
2020-03-15 19:21:06 -04:00
Sally Cochenour
e3d50862c0
Using sparks in air experiment
2020-03-15 18:38:25 -04:00
Monster Iestyn
f3bfa2b1db
Merge branch 'master' into next
2020-03-15 20:32:43 +00:00
LJ Sonic
21cb05b1f7
Merge branch 'fix-playernode-crash' into 'next'
...
Fix buffer overrun with players with no associated node
See merge request STJr/SRB2!810
2020-03-15 15:36:45 -04:00
Monster Iestyn
c0b85396e0
Merge branch 'skins-refactor' into 'master'
...
Skins refactor
See merge request STJr/SRB2!843
2020-03-15 15:31:49 -04:00
Steel Titanium
d50a0914b3
Merge branch 'master' into next
2020-03-14 22:21:12 -04:00
SteelT
d62229a25f
Merge branch 'nadraw-fix' into 'master'
...
Fix NiGHTS Attack crash after render mode change
See merge request STJr/SRB2!837
2020-03-14 22:19:35 -04:00
SteelT
f9912eaad5
Merge branch 'hwrflipcolchromakey' into 'master'
...
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF
See merge request STJr/SRB2!826
2020-03-14 22:13:19 -04:00
SteelT
6fa5ec298c
Merge branch 'tex' into 'master'
...
Replace NextTexAvail with glGenTextures
See merge request STJr/SRB2!828
2020-03-14 22:12:02 -04:00
SteelT
84d5b72735
Merge branch 'acz-fence' into 'master'
...
Fix ASTBlendPixel blending with nothing
See merge request STJr/SRB2!827
2020-03-14 22:11:23 -04:00
Sally Cochenour
69cc03a434
This line broke yellow sparks entirely
2020-03-14 19:01:34 -04:00
Sally Cochenour
f235a50d2e
Blue sparks trail longer
2020-03-14 18:46:22 -04:00
Sally Cochenour
ed9919d47c
Remove drift when hitting 0 speed
...
Prevents silliness like this: https://cdn.discordapp.com/attachments/275750804227489794/688515983471804455/kart0027.gif
2020-03-14 18:38:01 -04:00
Sally Cochenour
219d4aebf2
Actually, might've reintroduced more lawnmower problems; let's play it safe
2020-03-14 18:31:53 -04:00
Sally Cochenour
9dfbd918a4
Don't forcefully remove drift when bumping walls
2020-03-14 18:14:21 -04:00
Sally Cochenour
f37b1268b4
Slight adjustments to yellow spark nuances
...
Instead of setting you to yellow sparks when before you could keep red sparks, it keeps your previous "state". When going below 20 speed when you have sparks, you no longer stop charging sparks, but you have to break above 20 speed once you have yellow sparks to get normal sparks again.
2020-03-14 18:12:36 -04:00
Sally Cochenour
c6f3ac651e
Switch red & blue sparks, add yellow sparks, add big spark sprites
2020-03-14 01:43:54 -04:00
Latapostrophe
b6bc575a70
Merge branch 'spb-blockmap-fix' of git.magicalgirl.moe:KartKrew/Kart-Public into awful-mix
2020-03-13 22:38:20 +01:00
sphere
db26ce5139
Check if emblem hints are actually unlocked.
2020-03-13 10:46:57 -04:00
Latapostrophe
f55f889fbd
Merge branch 'fix-double-bombs' into awful-mix
2020-03-13 13:52:37 +01:00
Latapostrophe
bcca38d014
This flag shouldn't have been applied there
2020-03-13 13:50:22 +01:00
Latapostrophe
d2f1b83a09
Merge branch 'awful-mix' of git.magicalgirl.moe:SinnamonLat/Kart-Public into awful-mix
2020-03-12 16:04:49 +01:00
Latapostrophe
6fe54eafba
Fix Lua crashes when loading without addons
2020-03-12 16:03:12 +01:00
Latapostrophe
9abbd2d1b3
Fix Demo lua archive crash for real this time
2020-03-12 15:31:58 +01:00
Latapostrophe
4c367a9b5a
What the fuck how did this get here
2020-03-11 15:03:12 -04:00
Latapostrophe
ba8b962f61
Fix tiny conflict because I forgot to merge
2020-03-11 19:55:56 +01:00
Latapostrophe
5f11f7b8df
Remove debug prints
2020-03-11 19:53:52 +01:00
Latapostrophe
778ab0a2bb
Attempt to fix replay loading crash
2020-03-11 19:33:22 +01:00
lachwright
49f9d830ed
Attempt to make splitscreen's camtilt better
2020-03-12 01:23:09 +08:00
Latapostrophe
14a26c412a
Merge branch 'too-many-files' into awful-mix
2020-03-11 12:34:54 +01:00
Latapostrophe
8ed53d1aaa
don't set MAX_WADFILES to 256, worst mistake of my life
2020-03-11 12:34:35 +01:00
Latapostrophe
1f5bbb2c3d
Merge branch 'push-more-lua' into awful-mix
2020-03-11 07:37:47 +01:00
Latapostrophe
f98a74638f
More explicit var names for countdown and countdown2
2020-03-11 07:37:33 +01:00
Latapostrophe
eca292dae0
Merge branch 'too-many-files' into awful-mix
2020-03-11 07:21:41 +01:00
Latapostrophe
4fcefbc48b
Bump MAX_WADFILES to 256
2020-03-11 07:20:11 +01:00
Latapostrophe
b7702f5ff5
Merge branch 'antifreeze' of https://gitlab.com/fickleheart/srb2kart-mods into awful-mix
2020-03-10 21:46:12 +01:00
Latapostrophe
8ca1571c78
Merge branch 'damned-springpads' into v1.2-frankeinstein
2020-03-10 20:39:35 +01:00
Latapostrophe
e75f98b5e8
Merge branch 'push-more-lua' into v1.2-frankeinstein
2020-03-10 20:35:29 +01:00
Latapostrophe
3d74bc2ebc
Merge branch 'fix-orbit-shield' into v1.2-frankeinstein
2020-03-10 20:35:19 +01:00
