thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-14 03:52:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4073 commits 2 branches 14 tags 206 MiB
Commit graph

4073 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
633c20debb Define cv_midiplayer/soundfontpath/timiditypath in s_sound.c when NOMIXER=1 2018-09-18 12:41:49 -04:00
mazmazz
d21467eeaa Improve MIDI console parameters 
* Allow multiple SF2 for midisoundfont
* Correctly branch when toggling midiplayer or midisoundfont
 2018-09-16 16:02:26 -04:00
mazmazz
0c307ea528 Build notes for SDL Mixer X 2018-09-16 16:02:24 -04:00
mazmazz
56e697ba90 Add SDL Mixer X external DLL dependencies 2018-09-16 16:02:23 -04:00
mazmazz
134387b249 Merge branch 'music-cleanup' into music-sdlmixerx 2018-09-15 00:36:16 -04:00
mazmazz
fab6316954 Mixer: HAVE_LIBGME ifdef in I_LoadSong 2018-09-15 00:34:55 -04:00
mazmazz
7bb2accb40 Merge branch 'music-cleanup' into music-sdlmixerx 2018-09-15 00:28:38 -04:00
mazmazz
b6894de26a Fix Windows buildbot for MP3_MAD/MODPLUG define (the header we use is 2.0.2) 
(cherry picked from commit 89a26f28bd)
 2018-09-14 17:48:12 -04:00
mazmazz
aac7857d16 Mixer: Better MODPLUG/MP3_MAD defines 2018-09-14 17:27:00 -04:00
mazmazz
c4305c5963 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

(cherry picked from commit a2dd03bff6)
 2018-09-14 17:09:21 -04:00
mazmazz
00987dd7e5 Don't call I_StartupSound in SFX toggle 
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call

(cherry picked from commit c64d52c1f9)
 2018-09-14 16:43:48 -04:00
mazmazz
21e1b72f5b 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

(cherry picked from commit 74c6ae9661)
 2018-09-14 14:53:56 -04:00
mazmazz
cacb12392b I_InitMusic SDL2: Don't unload GME indiscriminately 
(cherry picked from commit f2ca028bbf)
 2018-09-14 13:57:24 -04:00
mazmazz
69359d4db0 srb2dd music cleanup fixes 
(cherry picked from commit 5822cbbbe4)
 2018-09-14 13:57:22 -04:00
mazmazz
dc20a41c25 Separate StopMusic and UnloadMusic 
(cherry picked from commit db37bfc921)
 2018-09-14 13:57:20 -04:00
mazmazz
64cc452077 Bring back music_data handle, for srb2dd 
(cherry picked from commit 4069c36b16)
 2018-09-14 13:56:14 -04:00
mazmazz
093158b80b newmusic -> mmusic typo, S_ChangeMusic 2018-09-14 13:55:07 -04:00
mazmazz
1b2d28bc7a More unnecessary if conditions, toggle SFX menu 2018-09-14 13:54:41 -04:00
mazmazz
b767a0bfd1 Sound menu toggle fix: unnecessary if condition 2018-09-14 11:25:25 -04:00
mazmazz
5a278b5168 Linux Compiler fix HAVE_MIXERX cvars 2018-09-02 08:15:55 -04:00
mazmazz
abb67d35e3 Reset MIDI music properly on settings change 
* Added reset flag to S_Start (now S_StartEx)
 2018-09-01 11:37:53 -04:00
mazmazz
1aa4035594 Revert "Fix MIDI music not reloading sometimes on settings change" 
This reverts commit be21072b58.
 2018-09-01 11:35:54 -04:00
mazmazz
be21072b58 Fix MIDI music not reloading sometimes on settings change 2018-09-01 11:34:03 -04:00
mazmazz
4810c48c08 Compile in modplug (for libopenmpt file detection) 2018-08-31 13:27:02 -04:00
mazmazz
e5b4cf2dcf Fix MIDI not reloading when erroring on a player 2018-08-31 12:18:54 -04:00
mazmazz
a4d6458ecd Revert "Update SDL Windows dependency to 2.0.8" 
This reverts commit adce4db5aa.
 2018-08-31 12:00:33 -04:00
mazmazz
c78472539c Revert "New SDL2 test files" 
This reverts commit 3dfbb61546.
 2018-08-31 11:58:18 -04:00
mazmazz
853fe38569 Compiled fluidsynth into libraries 2018-08-31 11:23:16 -04:00
mazmazz
580a3471a8 Updated SDL Mixer X binaries 2018-08-31 02:26:21 -04:00
mazmazz
cc27ce8ed4 Move cvars to D_RegisterClientCommands for config recall 2018-08-27 08:40:24 -04:00
mazmazz
1042f2bf84 Remove unused methods (for now?) 2018-08-27 05:53:43 -04:00
mazmazz
4285ce99af Load Fluidsynth soundfont upon cvar change 2018-08-27 05:52:01 -04:00
mazmazz
fa8112c5be Lazy midi reload support on menu 2018-08-27 00:43:25 -04:00
mazmazz
a37e45ff37 Advanced submenu for sound options 2018-08-26 23:58:43 -04:00
mazmazz
57e5e3dba5 Revert "Sound scroll menu attempt" 
This reverts commit 6afa648c40.
 2018-08-26 23:46:55 -04:00
mazmazz
6afa648c40 Sound scroll menu attempt 2018-08-26 23:46:20 -04:00
mazmazz
cedf656451 Checkpoint: Add FluidSynth and Timidity support 2018-08-26 23:03:38 -04:00
mazmazz
cd44668e21 Makefile comments 2018-08-26 23:02:57 -04:00
mazmazz
5ef05da736 New SDL Mixer X builds with FluidSynth and Timidity 2018-08-26 23:02:29 -04:00
mazmazz
8f5aeb49ff HAVE_MIXERX and NOMIXERX compile flags (win32 only) 2018-08-26 15:12:00 -04:00
mazmazz
123c781b27 Fix S_ChangeMusic newmusic -> mmusic, merge error 2018-08-26 14:22:14 -04:00
mazmazz
0939cabd57 Make SDL Mixer X win32-exclusive 2018-08-26 14:20:41 -04:00
mazmazz
3dfbb61546 New SDL2 test files 2018-08-26 14:12:11 -04:00
mazmazz
ed6ec14797 Merge branch 'music-cleanup' into music-sdlmixerx 2018-08-26 14:04:54 -04:00
mazmazz
b7c8f7fab7 Case-insensitive music_name comparison 2018-08-25 22:00:31 -04:00
mazmazz
512a5f0e1b I_SongPlaying detect GME properly 2018-08-24 18:03:50 -04:00
mazmazz
c05be4e0b5 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
 2018-08-24 18:02:46 -04:00
mazmazz
07cfc1a29a Volume fixes 
# Conflicts:
#	src/sdl/mixer_sound.c
 2018-08-24 18:01:57 -04:00
mazmazz
2961d32e4a A word 2018-08-24 13:41:26 -04:00
mazmazz
76ab06cdb2 Merge branch 'music-cleanup' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into music-cleanup 2018-08-24 13:36:07 -04:00