vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3333 commits 50 branches 7 tags 75 MiB
Commit graph

3333 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster d7f8d4507a 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
Sal 5f78807ef0 Merge branch 'encore' into 'master' 
Encore

See merge request KartKrew/Kart!7
 2018-09-22 17:52:33 -04:00
Sal 81249a084a Merge branch 'shitsfree' into 'master' 
:shitsfree:

See merge request KartKrew/Kart!12
 2018-09-22 17:24:11 -04:00
Sal be36d8ed84 Merge branch 'icon_update' into 'master' 
Icon Update

See merge request KartKrew/Kart!9
 2018-09-22 17:19:02 -04:00
Sal 09b30c660c Merge branch 'chat-changes' into 'master' 
Chat changes

See merge request KartKrew/Kart!10
 2018-09-22 17:14:04 -04:00
toaster f20710fbb4 Turns out I actually forgot to push this when I did the GL fade colour thing earlier, woops. 2018-09-22 21:05:20 +01:00
toaster 81c04480f9 List update as requested by Sal 2018-09-22 20:56:44 +01:00
toaster 3a76605772 * Seven new text colours! Gold, Lavender, Tea-green, Steel, Pink, Teal, and Peach, all added to the menu highlights cvar. 
* Revamp the saycmd colour list to take advantage of them. Peach and Purple are used the least...
* In all of the string drawers, replace colormap only when charflags changes.
* Add V_SKYMAP to dehacked.c alongside the above (oversight from when I added it yonks ago...)
 2018-09-22 18:22:04 +01:00
toaster 1f2ee32a83 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chat-changes 2018-09-22 15:14:21 +01:00
toaster 4fd4deff8a One last thing - make the OpenGL level loading bar screen have the correct background colour. 2018-09-22 12:43:54 +01:00
toaster 84c2a8c28f Sign compare fix via boolean cast 2018-09-22 11:59:07 +01:00
toaster 20222c47e7 Okay, seems like reducing it to 1x is enough - making it singular is overkill and means that often if the furthest one away from you is the one to yell, you'll barely hear it. At least this way you'll only hear overkill chao if you're super close to the stands and the mapper's placed way too many 2018-09-21 22:06:27 +01:00
toaster 80bc266f3f 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 084b99a5c9 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 36cde27584 Merge branch 'sal-misc' into 'master' 
Sal misc

See merge request KartKrew/Kart!6
 2018-09-21 15:08:05 -04:00
Latapostrophe 58a0206783 Moved strlen(w_chat) out of the loop. 2018-09-21 17:03:09 +02:00
toaster 25ae5a5e7f 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
Latapostrophe 4320e0f3a8 Fix visual error related to moving the cursor on multi-line messages. 2018-09-21 12:23:00 +02:00
TehRealSalt 3b928ca979 Condense this re: wolfs 2018-09-20 22:16:04 -04:00
toaster 1a2f84a5ba Smaller XPM with no redundant pixels 2018-09-20 22:36:01 +01:00
TehRealSalt e2a7146667 Reeling back on this again 
Kinda want to save it for another branch
 2018-09-20 17:11:59 -04:00
TehRealSalt e441b2bce4 Address review 
(for anything code I did, anyway)
 2018-09-20 17:11:11 -04:00
Sal 9c01ad6065 Merge branch 'sonicitems' into 'master' 
Sonic Items

See merge request KartKrew/Kart!5
 2018-09-20 14:51:07 -04:00
toaster e90139c5b3 :shitsfree: 2018-09-20 17:45:19 +01:00
TehRealSalt f425ba4423 Spindash boost dust, pogo spring sfx 2018-09-19 20:13:48 -04:00
TehRealSalt f207140791 Merge remote-tracking branch 'origin/misc_plus_menustuffs' into sal-misc 2018-09-19 18:45:47 -04:00
TehRealSalt b2099678d1 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 8013a064ab Spark fix 
(please don't spread these fixes out across different branches :boi:)
 2018-09-18 15:51:27 -04:00
toaster cb629303d6 Update a bunch of icons - SDL_icon.xpm and other targets' .icos. 2018-09-18 19:37:03 +01:00
toaster a1045d232b :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 864f2466fe Booster+wipeout fix 2018-09-17 20:24:03 -04:00
toaster c00e054979 correct oversight in merge 2018-09-17 11:36:22 +01:00
toaster 123778766a Animated sky backport 2018-09-17 11:21:25 +01:00
toaster 8618d7bbec 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 69cbbde7fc Updated Dream 2018-09-17 02:48:10 -04:00
TehRealSalt f2838f7ab3 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 c9994c6ad8 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 ac2f81e423 New color brightness formula 
Gets more accurate looking results
 2018-09-16 23:28:10 -04:00
TehRealSalt 78a4cdab9f 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 0bb24a392e Fixed crash when replacing first character. 2018-09-16 11:01:00 +02:00
TehRealSalt 7edb99b87a 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 649d547209 Buff rainbow sparks 2018-09-15 19:59:39 -04:00
TehRealSalt 5ec79afad6 Grow/Shrink fixed min speed 2018-09-15 01:29:38 -04:00
TehRealSalt cf7198f765 Updated speed lines 2018-09-15 01:24:29 -04:00
TehRealSalt 6532c9ccf7 Add to DeHackEd! 2018-09-14 00:29:39 -04:00
TehRealSalt a76e341711 Rainbow sparks 2018-09-13 23:39:41 -04:00
TehRealSalt 981cf69afe Ketchup, faster drift sparks 2018-09-13 23:29:14 -04:00
TehRealSalt 7d4d181715 Speed lines 2018-09-13 20:26:43 -04:00
toaster fadef55b1e angel island drift strat plus ketchup 2018-09-14 00:19:23 +01:00
toaster 32d64a8282 Make these sparks fullbright (thanks, Ancient Tomb!) 2018-09-13 20:51:30 +01:00