Commit graph

3285 commits

Author SHA1 Message Date
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
Sal
670e9bd539 Merge branch 'sal-misc' into 'master'
Sal misc

See merge request KartKrew/Kart!6
2018-09-21 15:08:05 -04:00
toaster
1e57004fad Partially address Sal's review last night by switching to a more sensible default. I'm still unconvinced on the need to make encore mode a seperate knob on the grounds of overcomplexity and "you can't turn map hell off", but hopefully this'll be a shippable state we can come back to later.
Also, thank you for reminding me, Sryder - disable my very, very limited progress on encore mode in openGL so that stages aren't an unintended hodgepodge of different colourschemes for the objects versus the level environment.
2018-09-21 12:12:17 +01:00
TehRealSalt
748028e8d5 Condense this re: wolfs 2018-09-20 22:16:04 -04:00
TehRealSalt
1dc0c8ad0d Reeling back on this again
Kinda want to save it for another branch
2018-09-20 17:11:59 -04:00
TehRealSalt
c3c39182fb Address review
(for anything code I did, anyway)
2018-09-20 17:11:11 -04:00
Sal
8fe42fbf27 Merge branch 'sonicitems' into 'master'
Sonic Items

See merge request KartKrew/Kart!5
2018-09-20 14:51:07 -04: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
a9d3789c37 Enable noclip cam again.
It's just... TOO good, despite the couple of issues with it
2018-09-18 23:56:26 -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
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
b87feaeceb Animated sky backport 2018-09-17 11:21:25 +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
fc194b63e8 Changed MD2 coloring again
Squares the colors to get nicer looking results (https://www.youtube.com/watch?v=LKnqECcg6Gw), as well as only blending a small chunk of the skincolor to prevent desaturation from the brightest/darkest values.
2018-09-16 23:39:18 -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
TehRealSalt
30c37ee440 Revert this now that we have ESC functionality
(I mean. I still think this feels nicer than pressing the menu button, but...)
2018-09-15 20:13:29 -04:00
TehRealSalt
7f92aaba66 Buff rainbow sparks 2018-09-15 19:59:39 -04:00
TehRealSalt
17660379de Grow/Shrink fixed min speed 2018-09-15 01:29:38 -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
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
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
TehRealSalt
c46fe65a06 .PNG error shows lump name 2018-09-10 15:15:14 -04:00
toaster
33ab47dd3a I was getting annoyed by these arrows and their inconsistency, so I made them use the graphics. 2018-09-10 12:41:53 +01:00
toaster
e91d9760a2 More manual pages, plus renaming the option to Tricks & Secrets (F1) - PLUS, the magic of a little animated how-to for leafing through the pages. Requires new patch.kart, as I wanted the leading zeroes and Jeck wanted to add more pages without more commits later... 2018-09-10 12:39:59 +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
42fe27420f Quick fix
No other keys bound to this, it should be 0
2018-09-10 03:35:10 -04:00
TehRealSalt
eb3bfba1ed System menu default 2018-09-10 03:27:05 -04:00
TehRealSalt
b4bf63b16b Merge branch 'sonicitems' into sal-misc 2018-09-10 03:22:11 -04:00
TehRealSalt
be6d4342b9 Make Battle arrows consistent w/ the flashing item change earlier
Should make Hyudoro even more amazing in Battle, since you can tell which held items are off-limits~
2018-09-10 03:17:15 -04:00
TehRealSalt
dc76eeed31 Don't let players carry them between levels..........
(In return for not letting anyone experience this silly bug, I made spectators joining before the match starts in Battle spawn with bumpers)
2018-09-10 03:15:46 -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
TehRealSalt
cc27612b16 Camera fixes
- Fixed camera panning for higher distances.
- Because of this, re-enabled scaling the pan amount based on distance.
2018-09-10 02:24:21 -04:00
TehRealSalt
47dd9e2fc2 Drop Dash + alternate start boosts
New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker.

Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 01:47:23 -04:00
wolfy852
715711cc7b Change ESC menu override string to "Open/Close Menu (ESC)", adjust menu accordingly 2018-09-09 21:24:19 -05:00
TehRealSalt
08e101e8f8 New gamepad defaults
Based on input recieved from Jeck
2018-09-09 20:57:54 -04:00
wolfy852
56e615d595 Merge commit 'c92926bfb6e080e39e658086fbc6f44b605348d3' into sonicitems 2018-09-09 17:57:23 -05:00
TehRealSalt
c8f802370b // we're fucking sick of this
Why hasn't SRB2 already done this themselves YEARS ago...
2018-09-09 18:24:09 -04:00
TehRealSalt
77131a30ec Comment ou remaining traces of cv_karthud
We've poured so much effort into our own HUD that it doesn't make much sense to have the option to replace it with another game's at this point
2018-09-09 18:10:11 -04:00
TehRealSalt
7383bb28c7 Revert pan speed
Old one was more exciting, and gave that feeling of "you're scraping against the walls" when you try to corner really hard
2018-09-09 18:04:35 -04:00