mazmazz
|
506db1e303
|
Interface name refactor: Music -> Song other targets
|
2018-08-21 06:22:42 -04:00 |
|
|
mazmazz
|
a1b1391e24
|
Interface name refactor: Music -> Song
* Music refers to the music system, song refers to the entity being played.
* s_sound doesn't follow this, everything is music
|
2018-08-21 06:22:35 -04:00 |
|
|
mazmazz
|
17e2c3f5be
|
Debug messages
|
2018-08-20 08:47:41 -04:00 |
|
|
mazmazz
|
18daf255ee
|
Rename I_QueueDigSongPostFade to I_QueueDigSong
|
2018-08-20 01:16:52 -04:00 |
|
|
mazmazz
|
9539c597dd
|
Midimode safeties for song queueing/fading
|
2018-08-20 01:14:29 -04:00 |
|
|
mazmazz
|
6d8e3c2ac1
|
Lua comment
|
2018-08-20 01:14:16 -04:00 |
|
|
mazmazz
|
6b028049e0
|
Music lump existence minor fixes
|
2018-08-20 01:14:01 -04:00 |
|
|
mazmazz
|
60c9e5ab37
|
Lua player argument fixes, GetMusicLength and FadeMusic
|
2018-08-20 00:21:35 -04:00 |
|
|
mazmazz
|
9eeed6338f
|
Allow queueing music at end of song, not just fading
|
2018-08-20 00:12:23 -04:00 |
|
|
mazmazz
|
e51f9ecf90
|
* Allow S_ChangeMusic to queue the same track for fading
* StopDigSong upon running queue so that GME works for queueing
|
2018-08-19 23:20:40 -04:00 |
|
|
mazmazz
|
fb0d1b45ac
|
I_FadeOutStopMusic, I_FadeInStartDigSong, S_ChangeMusic lua
|
2018-08-19 22:06:09 -04:00 |
|
|
mazmazz
|
9410676737
|
I_FadeOutStopMusic, I_FadeInStartDigSong other targets
|
2018-08-19 22:05:55 -04:00 |
|
|
mazmazz
|
2cf49f9361
|
I_FadeOutStopMusic, I_FadeInStartDigSong, S_ChangeMusicWithFade implementation
* First attempt, a little messy but works fine
|
2018-08-19 22:05:42 -04:00 |
|
|
mazmazz
|
87b6fc613b
|
I_FadeMusicFromLevel/I_FadeMusic change for other targets
|
2018-08-19 17:02:27 -04:00 |
|
|
mazmazz
|
b844a908a1
|
Make S_FadeMusicFromLevel accept mandatory source_volume
* Make S_FadeMusic a legitimate function to grab current internal volume
|
2018-08-19 17:02:13 -04:00 |
|
|
mazmazz
|
3d8c4585d4
|
Checkpoint
|
2018-08-19 16:25:12 -04:00 |
|
|
mazmazz
|
9b50eec56a
|
S_FadeMusic[FromLevel] and S_StopFadingMusic Lua
* Fixed some arg position weirdness with other music lua funcs
|
2018-08-19 16:20:14 -04:00 |
|
|
mazmazz
|
5117bdebfe
|
S_FadeMusic[FromLevel] and S_StopFadingMusic other targets
|
2018-08-19 16:19:55 -04:00 |
|
|
mazmazz
|
918976bdcc
|
S_FadeMusic[FromLevel] and S_StopFadingMusic implementation
|
2018-08-19 16:19:48 -04:00 |
|
|
mazmazz
|
000847654e
|
I_SetInternalMusicVolume lua
|
2018-08-19 09:39:32 -04:00 |
|
|
mazmazz
|
7d03c19409
|
I_SetInternalMusicVolume other targets
|
2018-08-19 09:39:11 -04:00 |
|
|
mazmazz
|
d5dfde240d
|
I_SetInternalMusicVolume implementation
|
2018-08-19 09:38:57 -04:00 |
|
|
mazmazz
|
51228b328c
|
Framework for internal_volume; more fade code
|
2018-08-19 09:16:52 -04:00 |
|
|
mazmazz
|
69153194fe
|
Merge branch 'musicplus-core' into musicplus-fade-sdltimer
|
2018-08-19 08:35:56 -04:00 |
|
|
mazmazz
|
6ea002b1b5
|
Enable midi_volume, it actually works
|
2018-08-19 08:34:03 -04:00 |
|
|
mazmazz
|
47495e72b5
|
Fade checkpoint
|
2018-08-19 08:32:12 -04:00 |
|
|
mazmazz
|
c4ea18b2bb
|
Add LIBGME ifdefs
|
2018-08-19 06:43:57 -04:00 |
|
|
mazmazz
|
a38664e109
|
Minor cleanup
|
2018-08-18 23:26:58 -04:00 |
|
|
mazmazz
|
3bd3e51313
|
Merge branch 'musicplus-core' into musicplus-fade-sdltimer
# Conflicts:
# src/sdl/mixer_sound.c
|
2018-08-18 23:12:58 -04:00 |
|
|
mazmazz
|
3e7d7cfcae
|
Fixed loop point counter bug
|
2018-08-18 21:29:18 -04:00 |
|
|
mazmazz
|
5487fd5be0
|
Fix S_SetMusicLoopPoint wrong method; trigger only on is_looping
|
2018-08-18 20:54:56 -04:00 |
|
|
mazmazz
|
5f564f7798
|
Consolidate variable cleanup in mixer_sound
* Fix I_SetSongTrack MOD tracking returns the expected result
* Make music_loop hook stop digital song properly if not looping
|
2018-08-18 20:44:32 -04:00 |
|
|
mazmazz
|
78b041800e
|
Loop point modulo by length
|
2018-08-18 20:29:19 -04:00 |
|
|
mazmazz
|
c18372dd06
|
I_GetMusicLoopPoint and I_SetMusicLoopPoint for Lua
* Fix S_GetMusicLength for player compatibility
|
2018-08-18 20:20:18 -04:00 |
|
|
mazmazz
|
dc2c530d42
|
I_GetMusicLoopPoint and I_SetMusicLoopPoint for other targets
|
2018-08-18 20:19:54 -04:00 |
|
|
mazmazz
|
fdd1af62a8
|
I_GetMusicLoopPoint and I_SetMusicLoopPoint implementation
* Stub pause for MIDI
* Fix MP3 tag wide char search
* Reset songpaused bool where appropriate
|
2018-08-18 20:19:44 -04:00 |
|
|
mazmazz
|
137291d50b
|
Lua merge fixes
|
2018-08-18 18:57:53 -04:00 |
|
|
mazmazz
|
8b6c24c6fa
|
Remove I_MIDIPlaying from Lua
|
2018-08-18 17:46:14 -04:00 |
|
|
mazmazz
|
57c8cf25af
|
Remove I_MIDIPlaying from other targets
|
2018-08-18 17:46:06 -04:00 |
|
|
mazmazz
|
d7720a8556
|
Remove I_MIDIPlaying
|
2018-08-18 17:45:57 -04:00 |
|
|
mazmazz
|
58b204809f
|
Lua for MusicType
|
2018-08-18 17:18:22 -04:00 |
|
|
mazmazz
|
d88b923959
|
Other interfaces for I_MusicType
|
2018-08-18 17:18:13 -04:00 |
|
|
mazmazz
|
bd1eece7bc
|
S_MusicType implementation; MOD support for Get/SetMusicPosition and MusicLength
* Misc MOD fixes
|
2018-08-18 17:17:53 -04:00 |
|
|
mazmazz
|
3c2f7038d0
|
Added GME for GetMusicLength, SetMusicPosition, GetMusicPosition
* Misc fixes
|
2018-08-18 16:21:28 -04:00 |
|
|
mazmazz
|
f4a574aba2
|
Support wide chars when searching for music tags (MP3)
|
2018-08-18 15:26:31 -04:00 |
|
|
mazmazz
|
76c4f5dd5c
|
Lua for I_GetMusicLength
|
2018-08-18 14:18:58 -04:00 |
|
|
mazmazz
|
6b35857ed1
|
I_GetMusicLength declarations for other interfaces
|
2018-08-18 14:18:49 -04:00 |
|
|
mazmazz
|
c6035f5956
|
I_GetMusicLength implementation
|
2018-08-18 14:18:29 -04:00 |
|
|
mazmazz
|
34872bc146
|
Merge branch 'musicplus-core' into musicplus-fade-sdltimer
|
2018-08-18 09:34:49 -04:00 |
|
|
mazmazz
|
7833612c9e
|
HAVE_LUA_MUSICPLUS for testing
|
2018-08-18 09:33:37 -04:00 |
|