thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3333 commits 1 branch 12 tags 205 MiB
Commit graph

3333 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Sal
739bbd3808 Merge branch 'encore' into 'master' 
Encore

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

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

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

See merge request KartKrew/Kart!10
 2018-09-22 17:14:04 -04:00
toaster
a5f8b8ac65 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
bbed50b73f List update as requested by Sal 2018-09-22 20:56:44 +01:00
toaster
6884e4aa9a * 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
d2fc1ea230 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chat-changes 2018-09-22 15:14:21 +01:00
toaster
3e23576060 One last thing - make the OpenGL level loading bar screen have the correct background colour. 2018-09-22 12:43:54 +01:00
toaster
fd247b8252 Sign compare fix via boolean cast 2018-09-22 11:59:07 +01:00
toaster
b21863afdb 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
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
Sal
670e9bd539 Merge branch 'sal-misc' into 'master' 
Sal misc

See merge request KartKrew/Kart!6
 2018-09-21 15:08:05 -04:00
Latapostrophe
44e6bb8df3 Moved strlen(w_chat) out of the loop. 2018-09-21 17:03:09 +02: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
Latapostrophe
ed3b69ff7f Fix visual error related to moving the cursor on multi-line messages. 2018-09-21 12:23:00 +02:00
TehRealSalt
748028e8d5 Condense this re: wolfs 2018-09-20 22:16:04 -04:00
toaster
a901e2de7e Smaller XPM with no redundant pixels 2018-09-20 22:36:01 +01: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
toaster
d16021febd :shitsfree: 2018-09-20 17:45:19 +01: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
toaster
15bf75d560 Update a bunch of icons - SDL_icon.xpm and other targets' .icos. 2018-09-18 19:37:03 +01: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
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
Latapostrophe
05456a4a0f Fixed crash when replacing first character. 2018-09-16 11:01:00 +02: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
91c6776cc4 Add to DeHackEd! 2018-09-14 00:29:39 -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
239be94fa8 Make these sparks fullbright (thanks, Ancient Tomb!) 2018-09-13 20:51:30 +01:00