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
mazmazz
9fd7fac3ae
MP Core Win32: Fix FadeSong unused callback param (buildbots)
2018-09-20 08:41:40 -04:00
TehRealSalt
a3089a546f
Spindash boost dust, pogo spring sfx
2018-09-19 20:13:48 -04:00
mazmazz
0a35e11e2c
Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic
2018-09-19 19:57:19 -04:00
mazmazz
67e89f9425
MP Core s_sound: I_FadeSongFromVolume call fix (buildbots)
2018-09-19 19:46:57 -04:00
mazmazz
ef9b2b633f
Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic
2018-09-19 19:32:51 -04:00
mazmazz
85e028c1bf
MP Core s_sound: Mixed D+C fix (buildbots)
2018-09-19 19:19:18 -04:00
mazmazz
43f6038d98
MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots)
2018-09-19 19:18:35 -04:00
mazmazz
8eb2171fcd
MP Core Mixer: Old-style function dec fixes (buildbots)
2018-09-19 19:06:24 -04:00
mazmazz
b5e1856377
Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic
2018-09-19 18:55:00 -04:00
TehRealSalt
43f8b46ba0
Merge remote-tracking branch 'origin/misc_plus_menustuffs' into sal-misc
2018-09-19 18:45:47 -04:00
mazmazz
fae377b896
MP Core Mixer: Unused param fixes (buildbots)
2018-09-19 18:26:33 -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
mazmazz
ec61164765
MP Core: 2.1 dehacked typo
2018-09-18 23:29:18 -04:00
mazmazz
9d40bf57fe
Mixer: Add back var_cleanup in I_LoadSong
...
Because musicplus-libopenmpt deleted it, I added a cautionary note to ALWAYS clean up your vars!
2018-09-18 22:24:07 -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
mazmazz
4fa7a4ca37
musicplus-le-changemusic 2.2 -> 2.1 backport
2018-09-18 15:28:57 -04:00
mazmazz
a3664c3083
Lua P_RestoreMusic else if fix
2018-09-18 15:11:37 -04:00
toaster
15bf75d560
Update a bunch of icons - SDL_icon.xpm and other targets' .icos.
2018-09-18 19:37:03 +01:00
mazmazz
4ce05ceadf
MusicPlus core: Win32 DD compile fixes
2018-09-18 14:09:13 -04:00
mazmazz
d65967908d
MusicPlus core: NOMIXER=1 compile fix
2018-09-18 13:23:42 -04:00
mazmazz
80ce366b3f
Mixer I_StopSong: StopFadingSong and var_cleanup call fix
2018-09-18 12:55:19 -04: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
mazmazz
9c89bf3fef
MusicPlus core: Lua separation fixes
2018-09-18 11:39:08 -04:00
mazmazz
32c48af258
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 10:22:17 -04:00
mazmazz
4da5d45cf5
S_ChangeMusic: More specific load/play fail messages
2018-09-18 09:38:41 -04: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