mazmazz
13e910f6ff
420: Unncessary include
2018-09-15 20:03:43 -04:00
mazmazz
e2e1ca0ac6
420: Combine speed and duration logic for fade lighting
2018-09-15 19:01:21 -04:00
mazmazz
e01fd1f3a3
453: Try ResetFakeFloorFader if condition again
2018-09-15 02:24:44 -04:00
mazmazz
a19c44d21f
453: P_ResetFakeFloorFader stray & address if condition
2018-09-15 02:16:54 -04:00
mazmazz
09338f77a7
Colormap overhaul: Wrap R_CheckNumForNameList under ifdef EXTRACOLORMAPLUMPS
2018-09-15 02:10:55 -04:00
mazmazz
b9c5d2177c
Merge remote-tracking branch 'origin/master' into music-cleanup
2018-09-15 01:52:48 -04:00
mazmazz
17ea15a050
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-15 01:51:06 -04:00
mazmazz
400dbe0118
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-15 01:50:53 -04:00
mazmazz
20eb98b89f
Colormap overhaul: %d format size_t -> UINT32 fix
2018-09-15 01:50:33 -04:00
mazmazz
707d649d67
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-15 01:17:33 -04:00
mazmazz
a8c4912810
Mixer: Add missing tag declarations in I_LoadSong
2018-09-15 01:14:24 -04:00
mazmazz
95aeb78550
453: Mixed D+C fixes; unused param cast in P_FadeFakeFloor
2018-09-15 01:05:21 -04:00
mazmazz
413f25f323
492: Mixed D+C fix
2018-09-15 00:56:46 -04:00
mazmazz
73a907f52f
455: Mixed D+C fix
2018-09-15 00:53:21 -04:00
mazmazz
2d032082a8
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-15 00:52:45 -04:00
mazmazz
23de95dce2
Colormap overhaul r_data: Mixed D+C fix
2018-09-15 00:49:03 -04:00
mazmazz
b2e3352c5a
Merge branch 'music-cleanup' into musicplus-core
2018-09-15 00:46:02 -04:00
mazmazz
134387b249
Merge branch 'music-cleanup' into music-sdlmixerx
2018-09-15 00:36:16 -04:00
mazmazz
76e3b7a7cd
Mixer: HAVE_LIBGME ifdef in I_LoadSong
2018-09-15 00:35:24 -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
2083cd815b
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-14 22:36:09 -04:00
mazmazz
ac094790b7
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-14 22:35:51 -04:00
mazmazz
d19eefdcf4
Remove possibly wrong comment about extracolormap_t->fog
2018-09-14 22:35:30 -04:00
mazmazz
43b0c71de1
Lua support for floorrover/ceilingrover
2018-09-14 21:43:43 -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
89a26f28bd
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
ead04aeeeb
Mixer: Better MODPLUG/MP3_MAD defines
...
(cherry picked from commit 5b724e18b5268b0492b3f8b8980aadd2dd41e235)
2018-09-14 17:27:31 -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
a2dd03bff6
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
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
c64d52c1f9
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
128e5fd2bb
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
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
74c6ae9661
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
Monster Iestyn
04b14ba169
Merge branch 'public_next'
2018-09-14 19:51:20 +01: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
f2ca028bbf
I_InitMusic SDL2: Don't unload GME indiscriminately
2018-09-14 13:36:01 -04:00
mazmazz
5822cbbbe4
srb2dd music cleanup fixes
2018-09-14 13:24:15 -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
b767a0bfd1
Sound menu toggle fix: unnecessary if condition
2018-09-14 11:25:25 -04:00
mazmazz
e7d87ea486
Menu sound toggle fixes (and add starpost sfx to menu)
2018-09-14 11:24:28 -04:00
mazmazz
af2496de9e
Compile fixes
2018-09-14 10:58:41 -04:00
