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

185 commits

Author SHA1 Message Date
mazmazz
c737b18924 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2018-09-19 19:56:49 -04:00
mazmazz
1e2436434a MP Jingle: Better empty_music_stack_entry initialization (buildbots) 2018-09-19 19:51:04 -04:00
mazmazz
2b3f8be93d MP Core s_sound: I_FadeSongFromVolume call fix (buildbots) 2018-09-19 19:47:21 -04:00
mazmazz
67e89f9425 MP Core s_sound: I_FadeSongFromVolume call fix (buildbots) 2018-09-19 19:46:57 -04:00
mazmazz
9547e6206c MP Core s_sound: Mixed D+C fix (buildbots) 2018-09-19 19:41:23 -04:00
mazmazz
494f172597 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2018-09-19 19:32:49 -04:00
mazmazz
2db5278f47 Merge branch 'public-musicplus-core' into public-musicplus-jingle 2018-09-19 19:24:57 -04:00
mazmazz
47973f787e MP Jingle: Buildbot fixes 2018-09-19 19:24:35 -04:00
mazmazz
85e028c1bf MP Core s_sound: Mixed D+C fix (buildbots) 2018-09-19 19:19:18 -04:00
mazmazz
a235d95d37 MP Jingle: Buildbot fixes 2018-09-19 18:42:35 -04:00
mazmazz
77381cd984 musicplus-jingle 2.2 -> 2.1 backport 2018-09-18 15:10:00 -04:00
mazmazz
cd0dbac3db Move cv_modfilter from mixer_sound.c to s_sound.c for other targets 2018-09-18 13:01:34 -04:00
mazmazz
320cb89af9 Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-09-18 12:46:46 -04:00
mazmazz
28d62dc19b Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-18 12:46:41 -04:00
mazmazz
633c20debb Define cv_midiplayer/soundfontpath/timiditypath in s_sound.c when NOMIXER=1 2018-09-18 12:41:49 -04:00
mazmazz
85c6715188 musicplus-libopenmpt 2.2 -> 2.1 backport 2018-09-18 12:31:47 -04:00
mazmazz
95ea520ad1 MusicPlus core: Lua separation fixes 2018-09-18 10:32:38 -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
mazmazz
0c7ddd44c5 Merge branch 'music-cleanup' into musicplus-core 2018-09-18 08:33:20 -04:00
mazmazz
b31b93abec S_ChangeMusic: More specific load/play fail messages 2018-09-18 08:32:34 -04:00
mazmazz
08efe2aa24 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-16 23:18:11 -04:00
mazmazz
ce37b8f121 S_ChangeMusicAdvanced -> S_ChangeMusicEx 2018-09-16 23:10:23 -04:00
mazmazz
707d649d67 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-15 01:17:33 -04:00
mazmazz
b2e3352c5a Merge branch 'music-cleanup' into musicplus-core 2018-09-15 00:46:02 -04:00
mazmazz
7bb2accb40 Merge branch 'music-cleanup' into music-sdlmixerx 2018-09-15 00:28:38 -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
db37bfc921 Separate StopMusic and UnloadMusic 2018-09-14 12:47:33 -04:00
mazmazz
4069c36b16 Bring back music_data handle, for srb2dd 2018-09-14 12:29:58 -04:00
mazmazz
af2496de9e Compile fixes 2018-09-14 10:58:41 -04:00
mazmazz
6d6cd4f4c4 Case-insensitive music_name comparison 
(cherry picked from commit a7ae059949b320723727aea4468a370bc63c3910)
 2018-09-14 10:49:44 -04:00
mazmazz
245bc9a66f Volume fixes 
# Conflicts:
#	src/sdl/mixer_sound.c

(cherry picked from commit d39b7011c5b12e5b7abe3e493971e003469a1f3d)
 2018-09-14 10:49:44 -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
89dcae23a2 Play the opposite type music (Digital/MIDI) when toggling between them in menu 
* S_MusicInfo method to retrieve name, flags, and looping

(cherry picked from commit f6ec93198f0dcfa1d053cca88172c3e3c7ba310c)
 2018-09-14 10:38:32 -04:00
mazmazz
b51cf6c060 Toggle Digi/MIDI music in menu accurately; add S_MusicType 
(cherry picked from commit 4aa100aa575cc7fc14a743085222c806ba2c714a)
 2018-09-14 10:37:08 -04:00
mazmazz
23acc47b39 nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled 
(cherry picked from commit 07738fb0bcf640a4349337373f451fe68e024b2a)
 2018-09-14 10:35:51 -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
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
5af6aa06ae Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-08-28 10:27:49 -04:00
mazmazz
adb9fa044d Revise LUAh_MusicChange hook 2018-08-28 10:10:56 -04:00
mazmazz
193735bc5f Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-27 05:59:55 -04:00
mazmazz
cedf656451 Checkpoint: Add FluidSynth and Timidity support 2018-08-26 23:03:38 -04:00
mazmazz
123c781b27 Fix S_ChangeMusic newmusic -> mmusic, merge error 2018-08-26 14:22:14 -04:00
mazmazz
b7c8f7fab7 Case-insensitive music_name comparison 2018-08-25 22:00:31 -04:00