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

277 commits

Author SHA1 Message Date
mazmazz
d288dd2b5c GME fix: play song in I_PlaySong, not I_LoadSong 
(cherry picked from commit 5f21bf230d9716b7cc5b52e4bf3591ebe01e9f3a)
 2018-09-14 10:45:39 -04:00
mazmazz
223160ffbd Refactor I_MusicType MusicPlaying and MusicPaused other targets 
(cherry picked from commit 9e6eebeb8d6b4119d87e9678bb6b0687e3dc5217)
 2018-09-14 10:45:39 -04:00
mazmazz
37a2f1d2b7 Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ... 
(cherry picked from commit 4b82de9e540d6dc0651bbe8db8e5e15cba39f650)
 2018-09-14 10:45:38 -04:00
mazmazz
74d6302f09 Minor refactoring and reordering 
* I_GetMusicType() -> I_MusicType()
* Wrap MIDI volume hack in #ifdef _WIN32

(cherry picked from commit a7d51bf81030c228937a8e759f8f43b85817fce6)
 2018-09-14 10:42:27 -04:00
mazmazz
f41ad3073d Refactoring, music statues 
* S_Init -> S_InitSfxChannels because it did mostly SFX anyway
* S_MusicPlaying, S_MusicPaused, S_MusicName, S_MusicExists new status methods
* I_MusicPlaying, I_MusicPaused

(cherry picked from commit f5f0b5e76c2fd405c8cc895dde653c5ed2652622)
 2018-09-14 10:28:29 -04:00
mazmazz
1ca6ac1c67 Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume into one method 
* In s_sound, they are merged to one method as well, but there are still two separate digvolume and seqvolume variables
* Simplified Dig/MidiMusicDisabled in s_sound
* Method reordering

(cherry picked from commit 701cc5a7dd1dfead87a42ec7558c9fa6a1deb193)
 2018-09-14 10:23:37 -04:00
mazmazz
ff91315cbc Added I_GetMusicType and removed midimode variable 
* Revised S_PlayMusic arguments
* Now music plays again!

(cherry picked from commit 55f3803e4b9f8104c90cc6c769d54121e5bac0b8)
 2018-09-14 09:42:29 -04:00
mazmazz
e24ea0cb4d Block song position changes on GME because unstable 2018-09-13 13:27:42 -04:00
mazmazz
1c24b9ac8e Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-11 11:26:12 -04:00
mazmazz
1bb41a00bc Don't decrement fade timer if song is paused 2018-09-11 11:20:46 -04:00
mazmazz
2b4d7d1ad4 Change to percentage calc from interval decrement for volume fade 2018-09-11 11:17:30 -04:00
mazmazz
797f2b6575 Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-09-01 11:38:26 -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
82512a3ce4 Fix MIDI music not reloading sometimes on settings change 2018-09-01 11:33:39 -04:00
mazmazz
059f364740 Add Mixer X retrieve song length and position natively, if available 2018-08-31 13:52:01 -04:00
mazmazz
2cf2b0c66b Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-31 12:19:03 -04:00
mazmazz
e5b4cf2dcf Fix MIDI not reloading when erroring on a player 2018-08-31 12:18:54 -04:00
mazmazz
5af6aa06ae Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-08-28 10:27:49 -04:00
mazmazz
5ef4deb974 Fix MIDI looping/non-looping 2018-08-28 10:16:06 -04:00
mazmazz
e98cd17d0e Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-27 08:40:36 -04:00
mazmazz
cc27ce8ed4 Move cvars to D_RegisterClientCommands for config recall 2018-08-27 08:40:24 -04:00
mazmazz
0e685d2686 Remove MP3 warning for win32 Mixer X 2018-08-27 06:16:55 -04:00
mazmazz
193735bc5f Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-27 05:59:55 -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
cedf656451 Checkpoint: Add FluidSynth and Timidity support 2018-08-26 23:03:38 -04:00
mazmazz
8f5aeb49ff HAVE_MIXERX and NOMIXERX compile flags (win32 only) 2018-08-26 15:12:00 -04:00
mazmazz
0939cabd57 Make SDL Mixer X win32-exclusive 2018-08-26 14:20:41 -04:00
mazmazz
ed6ec14797 Merge branch 'music-cleanup' into music-sdlmixerx 2018-08-26 14:04:54 -04:00
toaster
41b7625fa7 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems 
# Conflicts:
#	src/g_game.c
#	src/v_video.c
 2018-08-26 12:42:55 +01: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
350dbf639c I_SongPlaying detect GME properly 2018-08-24 18:00:39 -04:00
mazmazz
95c41dd822 Detect GME more simply 2018-08-24 17:58:56 -04:00
mazmazz
5e48d50178 Stub I_UnloadSong because we already unload in I_StopMusic 
* Stop-gap for now. Ideally the logic would be in the respective places.
 2018-08-24 17:56:22 -04:00
mazmazz
8493d0bfcc Volume fixes 2018-08-24 17:56:14 -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
mazmazz
4962a2b9aa GME fix: play song in I_PlaySong, not I_LoadSong 2018-08-24 13:35:41 -04:00
mazmazz
052f9f8a7c Checkpoint: Revised fading routines for new load/play pattern 
* Perform fade-out/fade-in using callbacks
* Move queued music from interface to s_sound
 2018-08-24 13:11:38 -04:00
mazmazz
1f5e62197e Merge branch 'music-cleanup' into musicplus-core 
Pending rewrite of fade music changing

# Conflicts:
#	src/android/i_sound.c
#	src/djgppdos/i_sound.c
#	src/i_sound.h
#	src/s_sound.c
#	src/s_sound.h
#	src/sdl/mixer_sound.c
#	src/sdl/sdl_sound.c
#	src/win32/win_snd.c
 2018-08-23 21:07:39 -04:00
mazmazz
5972ff3e90 Refactor I_MusicType MusicPlaying and MusicPaused other targets 2018-08-23 20:23:16 -04:00
mazmazz
8533e08ded Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ... 2018-08-23 20:14:46 -04:00
mazmazz
13dfbb0fdb Minor refactoring and reordering 
* I_GetMusicType() -> I_MusicType()
* Wrap MIDI volume hack in #ifdef _WIN32
 2018-08-23 17:05:37 -04:00
mazmazz
ff26baa6a1 Refactoring, music statues 
* S_Init -> S_InitSfxChannels because it did mostly SFX anyway
* S_MusicPlaying, S_MusicPaused, S_MusicName, S_MusicExists new status methods
* I_MusicPlaying, I_MusicPaused
 2018-08-23 12:30:47 -04:00
mazmazz
a672d38bba Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume into one method 
* In s_sound, they are merged to one method as well, but there are still two separate digvolume and seqvolume variables
* Simplified Dig/MidiMusicDisabled in s_sound
* Method reordering
 2018-08-23 11:54:36 -04:00