Monster Iestyn
a0c822fec8
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/m_menu.c
# src/s_sound.c
# src/sdl/sdl_sound.c
2018-10-20 15:31:48 +01:00
mazmazz
82e60f806e
Merge remote-tracking branch 'steeltitanium/music-clean' into test-public-music-cleanup
2018-10-19 23:56:56 -04:00
mazmazz
bf93dace76
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
Monster Iestyn
0b70c725c8
Merge branch 'public_next'
...
# Conflicts:
# src/nds/i_sound.c
# src/r_data.c
# src/sdl12/mixer_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
2018-10-19 22:46:19 +01:00
Sal
dbf7096d27
Merge branch 'nextmerge_plus_rain' into 'master'
...
Next-merge plus rain
See merge request KartKrew/Kart!41
2018-10-16 16:36:18 -04:00
TehRealSalt
430a5dfcc1
Default sound channels
...
Now that we figured out that the sound cut-outs were due to a race condition and not this option, I feel content putting it with these other engine tweaks.
2018-10-16 13:26:03 -04:00
TehRealSalt
9891080360
Give engines SF_TOTALLYSINGLE, and bug-fix it so that it can work like a flag
...
Sryder's request
2018-10-16 12:30:47 -04:00
toaster
1142fddc71
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/g_game.c
# src/p_floor.c
# src/p_user.c
# src/r_data.c
# src/r_data.h
# src/v_video.c
2018-10-14 21:52:05 +01:00
Sryder
4132b39b9a
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
...
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
Steel Titanium
7428fb991c
Remove the condition in restartaudio command.
...
No longer needed as S_RegisterSoundStuff will return early if in
dedicated mode.
2018-10-11 20:11:37 -04:00
Steel Titanium
9b8b5ea57c
Move commands and console variable into s_sound.c
2018-10-11 16:29:43 -04:00
mazmazz
9bfd8c4a4b
MP Jingle: Changed music_stacks from fixed array to next/prev chain
2018-09-20 17:13:52 -04:00
mazmazz
000873cf50
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-19 20:06:56 -04:00
mazmazz
8cca1f5627
Merge branch 'public-musicplus-core' into public-musicplus-jingle
2018-09-19 19:56:50 -04:00
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
