36cde27584
Merge branch 'sal-misc' into 'master'
...
Sal misc
See merge request KartKrew/Kart!6
2018-09-21 15:08:05 -04:00
f88708bb75
Fix the weird indentation
2018-09-21 12:05:52 -04:00
68ec811909
Rearrange the code.
...
Thanks again MonsterIestyn!
2018-09-21 11:26:08 -04:00
58a0206783
Moved strlen(w_chat) out of the loop.
2018-09-21 17:03:09 +02:00
af58ba9ae3
Remove this that somehow slipped in.
2018-09-21 07:21:49 -04:00
be74b4e58b
Fix up errors with buildbots
2018-09-21 07:16:54 -04:00
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
4320e0f3a8
Fix visual error related to moving the cursor on multi-line messages.
2018-09-21 12:23:00 +02:00
3b928ca979
Condense this re: wolfs
2018-09-20 22:16:04 -04:00
378495cb2b
Add some stuff
2018-09-20 18:33:50 -04:00
a53f036149
Use MemAvailable instead
2018-09-20 18:30:46 -04:00
1a2f84a5ba
Smaller XPM with no redundant pixels
2018-09-20 22:36:01 +01:00
e2a7146667
Reeling back on this again
...
Kinda want to save it for another branch
2018-09-20 17:11:59 -04:00
e441b2bce4
Address review
...
(for anything code I did, anyway)
2018-09-20 17:11:11 -04:00
9c01ad6065
Merge branch 'sonicitems' into 'master'
...
Sonic Items
See merge request KartKrew/Kart!5
2018-09-20 14:51:07 -04:00
e90139c5b3
:shitsfree:
2018-09-20 17:45:19 +01:00
73c66e3bc4
Spark radius now follows players
2018-09-20 18:31:38 +02:00
f425ba4423
Spindash boost dust, pogo spring sfx
2018-09-19 20:13:48 -04:00
f207140791
Merge remote-tracking branch 'origin/misc_plus_menustuffs' into sal-misc
2018-09-19 18:45:47 -04:00
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
8013a064ab
Spark fix
...
(please don't spread these fixes out across different branches :boi:)
2018-09-18 15:51:27 -04:00
cb629303d6
Update a bunch of icons - `SDL_icon.xpm` and other targets' `.ico`s.
2018-09-18 19:37:03 +01:00
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
864f2466fe
Booster+wipeout fix
2018-09-17 20:24:03 -04:00
1763087844
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
20c4702986
Line exec trigger netsync: Save var2s in addition to vars
2018-09-17 14:13:31 -04:00
c00e054979
correct oversight in merge
2018-09-17 11:36:22 +01:00
123778766a
Animated sky backport
2018-09-17 11:21:25 +01:00
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
69cbbde7fc
Updated Dream
2018-09-17 02:48:10 -04:00
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
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
ac2f81e423
New color brightness formula
...
Gets more accurate looking results
2018-09-16 23:28:10 -04:00
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
1b7b1f3f79
Fix order of operations messups by adding brackets
2018-09-16 20:25:07 +01:00
09287df890
Radius is now a define
2018-09-16 11:16:30 +02:00
0bb24a392e
Fixed crash when replacing first character.
2018-09-16 11:01:00 +02:00
ce5abdc6e3
Thunder Shield effect hardcode.
2018-09-16 10:31:24 +02:00
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
649d547209
Buff rainbow sparks
2018-09-15 19:59:39 -04:00
22ee740fa8
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
5ec79afad6
Grow/Shrink fixed min speed
2018-09-15 01:29:38 -04:00
cf7198f765
Updated speed lines
2018-09-15 01:24:29 -04:00
546fa383c1
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
6532c9ccf7
Add to DeHackEd!
2018-09-14 00:29:39 -04:00
6c6ca1a110
Bug fix
2018-09-13 23:49:24 -04:00
a76e341711
Rainbow sparks
2018-09-13 23:39:41 -04:00
981cf69afe
Ketchup, faster drift sparks
2018-09-13 23:29:14 -04:00
7d4d181715
Speed lines
2018-09-13 20:26:43 -04:00
fadef55b1e
angel island drift strat plus ketchup
2018-09-14 00:19:23 +01:00
Sal