lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4052 commits 1 branch 29 tags 122 MiB
Commit graph

4052 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
mazmazz 8452ec5c7c Checkpoint: Basic functions 2018-08-15 12:07:08 -04:00
mazmazz d93ca34859 Hide MusicPlus lua behind an #ifdef HAVE_LUA_MUSICPLUS 
# Conflicts:
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/p_user.c
 2018-08-15 03:37:11 -04:00
mazmazz 0254f4f368 Fix merge errors 2018-08-15 02:42:50 -04:00
mazmazz 878ea36559 Lua: Make P_RestoreMusic follow the non-local player nil output convention 2018-08-15 02:29:26 -04:00
mazmazz 8fe4c369bf Lua: Fix music functions not returning proper values 
# Conflicts:
#	src/lua_baselib.c
 2018-08-15 02:29:04 -04:00
mazmazz 6bde90f887 Lua: Make S_SpeedMusic and S_ChangeMusic return nil for invalid players 2018-08-15 02:23:18 -04:00
mazmazz c71719ac6b Music lua: Return nil for invalid players and non-nil for valid players 
# Conflicts:
#	src/lua_baselib.c
 2018-08-15 02:22:52 -04:00
mazmazz 9dbc807528 Make S_StopMusic return nil for invalid player, true otherwise 2018-08-15 02:21:18 -04:00
mazmazz 8d0044c5f1 Lua S_GetMusicPosition: Remove erroneous position input line 
# Conflicts:
#	src/lua_baselib.c
 2018-08-15 02:20:56 -04:00
mazmazz 3fb4559480 Lua: Make S_GetMusicPosition and S_SetMusicPosition return nil when non-local player is passed 2018-08-15 02:19:12 -04:00
mazmazz 9a5800d2bb Lua: Added player_t input to S_DigitalPlaying, S_MidiPlaying, S_MusicPlaying, S_MusicPaused, S_MusicName 2018-08-15 02:19:06 -04:00
mazmazz 95e4d0d423 Add player parameter to S_GetMusicPosition lua 
# Conflicts:
#	src/lua_baselib.c
 2018-08-15 02:18:46 -04:00