stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-06 18:01:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
4059 commits 60 branches 11 tags 94 MiB
Commit graph

4059 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Latapostrophe
73c66e3bc4 Spark radius now follows players 2018-09-20 18:31:38 +02: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
mazmazz
34e403afcb S_ChangeMusic: More specific load/play fail messages 2018-09-18 09:38:41 -04:00
TehRealSalt
864f2466fe Booster+wipeout fix 2018-09-17 20:24:03 -04:00
Monster Iestyn
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
mazmazz
20c4702986 Line exec trigger netsync: Save var2s in addition to vars 2018-09-17 14:13:31 -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
Monster Iestyn
1b7b1f3f79 Fix order of operations messups by adding brackets 2018-09-16 20:25:07 +01:00
Latapostrophe
09287df890 Radius is now a define 2018-09-16 11:16:30 +02:00
Latapostrophe
0bb24a392e Fixed crash when replacing first character. 2018-09-16 11:01:00 +02:00
Latapostrophe
ce5abdc6e3 Thunder Shield effect hardcode. 2018-09-16 10:31:24 +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
Monster Iestyn
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
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
mazmazz
40a8c9c1ee Mixer: HAVE_LIBGME ifdef in I_LoadSong 2018-09-15 00:35:24 -04:00
mazmazz
9a5eb02459 Fix Windows buildbot for MP3_MAD/MODPLUG define (the header we use is 2.0.2) 2018-09-14 17:47:04 -04:00
mazmazz
17ec5d8022 Mixer: Better MODPLUG/MP3_MAD defines 
(cherry picked from commit 5b724e18b5268b0492b3f8b8980aadd2dd41e235)
 2018-09-14 17:27:31 -04:00
mazmazz
fdbe3e80f6 Fix compile errors on buildbots 
* Check SDL Mixer 2.0.3 for MUS_MODPLUG_UNUSED, MUS_MP3_MAD_UNUSED
* Mixed D+C in I_LoadSong
 2018-09-14 17:07:13 -04:00
mazmazz
b330dc2394 Don't call I_StartupSound in SFX toggle 
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call
 2018-09-14 16:39:10 -04:00
Monster Iestyn
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
mazmazz
76be77b93a Rip out SDL Mixer code from sdl_sound.c because superfluous 
* Mixer code has been in mixer_sound.c; this file is not invoked unless compiling with NOMIXER=1
* Remove everything under #ifdef HAVE_MIXER because this is never triggered
* Comment out #ifdef HAVE_LIBGME because we don't support playing music anyway (but theoretically, it could have worked separately from Mixer)
* Stub new music calls
 2018-09-14 14:52:24 -04:00
mazmazz
cb4e075137 I_InitMusic SDL2: Don't unload GME indiscriminately 2018-09-14 13:36:01 -04:00
mazmazz
0999b0f8a8 srb2dd music cleanup fixes 2018-09-14 13:24:15 -04:00
mazmazz
e72610a3dc Separate StopMusic and UnloadMusic 2018-09-14 12:47:33 -04:00
mazmazz
8e05de17f0 Bring back music_data handle, for srb2dd 2018-09-14 12:29:58 -04:00
mazmazz
691de18fbb Menu sound toggle fixes (and add starpost sfx to menu) 2018-09-14 11:24:28 -04:00
mazmazz
4b1bc53db1 Compile fixes 2018-09-14 10:58:41 -04:00
mazmazz
fac7d19637 Case-insensitive music_name comparison 
(cherry picked from commit a7ae059949b320723727aea4468a370bc63c3910)
 2018-09-14 10:49:44 -04:00
mazmazz
8541963c61 I_SongPlaying detect GME properly 
(cherry picked from commit e88d1477616ca66472ecb50d371e37dc79c77c0f)
 2018-09-14 10:49:44 -04:00
mazmazz
d94f7e3cb0 Stub I_UnloadSong because we already unload in I_StopMusic 
* Stop-gap for now. Ideally the logic would be in the respective places.

# Conflicts:
#	src/sdl/mixer_sound.c

(cherry picked from commit eae5d3333f5001512c82f22f2b1433a955b3a6c3)
 2018-09-14 10:49:44 -04:00
mazmazz
5f22b7d973 Volume fixes 
# Conflicts:
#	src/sdl/mixer_sound.c

(cherry picked from commit d39b7011c5b12e5b7abe3e493971e003469a1f3d)
 2018-09-14 10:49:44 -04:00
mazmazz
2fbe206ecb A word 
(cherry picked from commit fb6f8c8a0752c229f5b7369729437c8fecb54d45)
 2018-09-14 10:49:44 -04:00
mazmazz
b0c47e2fb1 GME fix: play song in I_PlaySong, not I_LoadSong 
(cherry picked from commit 5f21bf230d9716b7cc5b52e4bf3591ebe01e9f3a)
 2018-09-14 10:45:39 -04:00