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
3627 commits 1 branch 12 tags 205 MiB
Commit graph

3627 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
77c69f6150 Merge branch 'master' into this-is-a-sign 2018-09-21 15:40:12 -04:00
TehRealSalt
32ad050de8 Prevent signs from disappearing 2018-09-21 15:37:30 -04: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
Steel Titanium
5efb94a35b Fix the weird indentation 2018-09-21 12:05:52 -04:00
Steel Titanium
7f7c5b60ae Rearrange the code. 
Thanks again MonsterIestyn!
 2018-09-21 11:26:08 -04:00
Latapostrophe
44e6bb8df3 Moved strlen(w_chat) out of the loop. 2018-09-21 17:03:09 +02:00
Steel
502414d609 Remove this that somehow slipped in. 2018-09-21 07:21:49 -04:00
Steel
ac8658fac8 Fix up errors with buildbots 2018-09-21 07:16:54 -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
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
Steel Titanium
43cbb0d11e Add some stuff 2018-09-20 18:33:50 -04:00
Steel Titanium
13a3f197bd Use MemAvailable instead 2018-09-20 18:30:46 -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
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
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
Monster Iestyn
e48e3e15c4 Merge branch 'public-var2s-fix' into 'next' 
Level spec thinker: Netsync var2s

See merge request STJr/SRB2!280
 2018-09-17 14:43:44 -04:00
mazmazz
f307c6d1b6 Line exec trigger netsync: Save var2s in addition to vars 2018-09-17 14:13:31 -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
Monster Iestyn
9481e7d358 Fix order of operations messups by adding brackets 2018-09-16 20:25:07 +01:00
Latapostrophe
026a13060e Radius is now a define 2018-09-16 11:16:30 +02:00
Latapostrophe
05456a4a0f Fixed crash when replacing first character. 2018-09-16 11:01:00 +02:00
Latapostrophe
a487ab1913 Thunder Shield effect hardcode. 2018-09-16 10:31:24 +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
Monster Iestyn
94b02c8e44 Merge branch 'mario-block-sync' into 'next' 
Fix for Mario block FOF texture synchronisation in netgames

See merge request STJr/SRB2!279
 2018-09-15 10:15:47 -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
Monster Iestyn
128e5fd2bb Make sure that T_MarioBlockChecker is synced in netgames, so that the textures of Mario Blocks can change when there are no more items 2018-09-14 21:01:07 +01:00
TehRealSalt
91c6776cc4 Add to DeHackEd! 2018-09-14 00:29:39 -04:00
TehRealSalt
35bd542076 Bug fix 2018-09-13 23:49:24 -04:00