Commit graph

4182 commits

Author SHA1 Message Date
mazmazz
df5ac5826c Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-09-02 08:16:40 -04:00
mazmazz
5a278b5168 Linux Compiler fix HAVE_MIXERX cvars 2018-09-02 08:15:55 -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
0f9f055961 Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-31 13:27:11 -04:00
mazmazz
4810c48c08 Compile in modplug (for libopenmpt file detection) 2018-08-31 13:27:02 -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
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
cc4f59878a Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-31 11:23:25 -04:00
mazmazz
853fe38569 Compiled fluidsynth into libraries 2018-08-31 11:23:16 -04:00
mazmazz
e33d385a6a Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-31 02:26:45 -04:00
mazmazz
580a3471a8 Updated SDL Mixer X binaries 2018-08-31 02:26:21 -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
adb9fa044d Revise LUAh_MusicChange hook 2018-08-28 10:10:56 -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
1e9fdb0454 Corrected unterminated #endif in sdl_sound 2018-08-27 06:15:01 -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
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
a622982a90 Remove tolower music_name, because we do case-insensitive matching now 2018-08-25 21:53:22 -04:00
mazmazz
3cf24dc9b7 Case-insensitive music_name comparison 2018-08-25 21:42:39 -04:00
mazmazz
e588460fe5 MUSICPOSITION -> MUSICPOS
* Added muspos level header var to lua

# Conflicts:
#	src/dehacked.c
#	src/lua_maplib.c
#	src/p_setup.c
2018-08-25 16:23:01 -04:00
mazmazz
5ed5f469b2 Add MUSICPOSITION level header and mapmusposition variable to instantly jump to position
* Cutscene support too!
2018-08-25 15:59:20 -04:00
mazmazz
0ff0b0a3fb Remove S_ChangeMusic call in G_PlayerReborn because redundant to S_Init 2018-08-25 15:23:48 -04:00
mazmazz
68f0a25323 Add MUSIC_FORCERESET flag 2018-08-25 13:18:14 -04:00
mazmazz
cc6c9d878d Lua add S_MusicName 2018-08-25 08:08:30 -04:00
mazmazz
a7def0ac3d Add S_MusicName back as a convenience function
* Move MUSICRATE to doomdef.h
2018-08-25 08:08:25 -04:00
mazmazz
7155f42c6c Add MUSICRATE to dehacked 2018-08-25 08:08:04 -04:00