Commit graph

973 commits

Author SHA1 Message Date
toaster
6835b17f69 Just realised the inputwheel jittering in Sryder's videos was my fault, so fix this even better 2018-09-25 22:37:04 +01:00
toaster
79639c1104 Merge branch 'minimap_in_demos' into 'master'
Show minimap in demo playback

See merge request KartKrew/Kart!16
2018-09-23 18:14:09 -04:00
toaster
b7a62b9625 smoll to tiny 2018-09-23 23:07:38 +01:00
toaster
54234ba8d9 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into thundershield-hell
# Conflicts:
#	src/info.c
#	src/info.h
#	src/sounds.c
#	src/sounds.h
2018-09-23 23:07:16 +01:00
toaster
7f9052add0 You're right, this works fine 2018-09-23 22:34:59 +01:00
toaster
9a94a43fc3 Turns out Playing() evaluates to false when playing back demos. Who knew? 2018-09-23 19:58:15 +01:00
toaster
b12c2516ec Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
2018-09-23 11:47:29 +01:00
Sal
1d1705d4e7 Merge branch 'new-voices' into 'master'
New voices

See merge request KartKrew/Kart!15
2018-09-22 20:22:59 -04:00
toaster
ae002fa578 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
#	src/sounds.c
#	src/sounds.h
2018-09-22 23:11:14 +01:00
TehRealSalt
2e0365645e Merge branch 'master' into this-is-a-sign 2018-09-22 17:58:35 -04:00
toaster
ba9df6d0d5 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into thundershield-hell
# Conflicts:
#	src/info.c
2018-09-22 14:57:33 +01:00
TehRealSalt
6a8fa59277 Merge branch 'master' into new-voices 2018-09-21 21:13:46 -04:00
TehRealSalt
6ecf752273 Slightly darker green backgrounds 2018-09-21 19:51:31 -04:00
Latapostrophe
428ab9896d Did everything toaster suggested 2018-09-22 01:47:13 +02:00
Latapostrophe
213911fa11 Changed thundershield sound 2018-09-22 01:15:04 +02:00
TehRealSalt
b6e60d2a63 Minor adjustments to the endsign color back table 2018-09-21 16:54:29 -04:00
toaster
15491fa809 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
#	src/info.c
#	src/k_kart.c
2018-09-21 21:05:47 +01:00
toaster
9ab42d91cb Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into encore
# Conflicts:
#	src/info.c
#	src/m_menu.c
#	src/y_inter.c
2018-09-21 20:54:38 +01:00
TehRealSalt
c3c39182fb Address review
(for anything code I did, anyway)
2018-09-20 17:11:11 -04:00
Latapostrophe
45888ad593 Spark radius now follows players 2018-09-20 18:31:38 +02:00
TehRealSalt
a3089a546f Spindash boost dust, pogo spring sfx 2018-09-19 20:13:48 -04:00
TehRealSalt
43f8b46ba0 Merge remote-tracking branch 'origin/misc_plus_menustuffs' into sal-misc 2018-09-19 18:45:47 -04:00
TehRealSalt
c043c79fd2 Spark fix
(please don't spread these fixes out across different branches :boi:)
2018-09-18 15:51:27 -04:00
toaster
5d496f43c6 :boi:
(fix driftsparks, and subsequently sliptides because i copypasted most of the code for them, disappearing underwater)
2018-09-18 17:40:39 +01:00
TehRealSalt
1a80dd13ee Booster+wipeout fix 2018-09-17 20:24:03 -04:00
toaster
a14829207a correct oversight in merge 2018-09-17 11:36:22 +01:00
toaster
cb98c0c3f8 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into misc_plus_menustuffs
# Conflicts:
#	src/k_kart.c
2018-09-17 11:19:17 +01:00
TehRealSalt
f319046d82 Updated Dream 2018-09-17 02:48:10 -04:00
TehRealSalt
0a4a8b1236 More color tweaks
- Renamed Grey to Nickel, and Cloudy to Grey
- Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey
- Drastically changed Navy to be more distinct from Jet
- Replaced Indigo with Pomegranate
- Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow)
- Updated color opposite table to match
2018-09-17 02:09:22 -04:00
TehRealSalt
60c5eb372b New color brightness formula
Gets more accurate looking results
2018-09-16 23:28:10 -04:00
TehRealSalt
05ad8937b3 Alternate TC_RAINBOW
Leaving behind a commented out define for now because I dunno if I like it yet
2018-09-16 18:10:29 -04:00
Latapostrophe
026a13060e Radius is now a define 2018-09-16 11:16:30 +02:00
Latapostrophe
a487ab1913 Thunder Shield effect hardcode. 2018-09-16 10:31:24 +02:00
TehRealSalt
7f92aaba66 Buff rainbow sparks 2018-09-15 19:59:39 -04:00
TehRealSalt
078fa29247 Updated speed lines 2018-09-15 01:24:29 -04:00
TehRealSalt
80177931c3 Rainbow sparks 2018-09-13 23:39:41 -04:00
TehRealSalt
1863fb953d Ketchup, faster drift sparks 2018-09-13 23:29:14 -04:00
TehRealSalt
14ced23300 Speed lines 2018-09-13 20:26:43 -04:00
toaster
670b7d74fc angel island drift strat plus ketchup 2018-09-14 00:19:23 +01:00
toaster
45455ca35b Thunder shield stuff!
* Slightly bigger visual size!
	* Light-shadow!
	* Makes player fullbright if you have it!
	* Visuals finally removed instantly on shield drop!
	* Uses dark background for item icons!
	* Goes behind the player on some frames, faking layering!
2018-09-13 19:01:36 +01:00
toaster
00438f4c41 Dark SPB background 2018-09-13 14:36:48 +01:00
toaster
0dc963ffd2 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-13 14:23:36 +01:00
TehRealSalt
7532e58a8c Tweak these blues
Try to make all the blues using this range look a little different, you know?
- Cyan is brighter, and has more contrast.
- Teal has 1 more shade of blue for slightly better anti-aliasing.
2018-09-13 03:04:01 -04:00
TehRealSalt
5708e49c95 Instead of doing productive things, I changed around skincolors again
- Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey.
- Improved Pink & Ruby.
- Added Ketchup, replaced Canary with Mustard.
- Removed Army.
2018-09-13 02:07:00 -04:00
toaster
16caa08ddd Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
#	src/info.c
#	src/sounds.c
#	src/sounds.h
2018-09-12 15:04:53 +01:00
TehRealSalt
50826ef634 New drift sparks 2018-09-11 19:52:00 -04:00
toaster
8df3e2ffbe Do a bunch of major modifications to the voting system's rule change system!
* Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency.
	* "Never" - does what it says on the tin.
	* "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full
	* "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps
	* "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change
	* There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense.
* Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps.
* Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 15:42:53 +01:00
toaster
2198d60b07 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into misc_plus_menustuffs 2018-09-10 11:43:45 +01:00
TehRealSalt
ea90a6aaa3 Don't allow joining 20 sec into the match 2018-09-10 04:29:37 -04:00
TehRealSalt
3a34a3f7ea Item stuff
- Keep items on death, as long as you haven't used them yet.
- Restart the item roulette on spawn if you die during it.
- Held items that take up your item box now flash, to be consistent with Rocket Sneaker and Grow.
2018-09-10 02:48:10 -04:00