Commit graph

4126 commits

Author SHA1 Message Date
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
mazmazz
e0ab8c1ed0 Fix #6 #7 SDL looping and counter bugs when looping=false
# Conflicts:
#	src/sdl12/mixer_sound.c
2018-08-15 02:15:05 -04:00
mazmazz
11c6148d4b SDL: Fix looping bug when looping=false; reset bytes counter when non-looping
# Conflicts:
#	src/sdl12/mixer_sound.c
2018-08-15 02:11:17 -04:00
mazmazz
a9776f7b25 Undoing malloc for S_MusicName, pass music_name instead.
I don't think there's a reason for copying to a new var.
2018-08-15 02:11:01 -04:00
mazmazz
44c7410a41 Add S_DigitalPlaying 2018-08-15 02:10:53 -04:00
mazmazz
47423a69ed Refactor to SetMusicPosition, GetMusicPosition
# Conflicts:
#	src/lua_baselib.c
#	src/nds/i_sound.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c
2018-08-15 02:10:46 -04:00
mazmazz
0ea40321ca S_MusicName copy music_name to new buffer (is this ok?) 2018-08-15 02:07:51 -04:00
mazmazz
34ea90600a Support mflags and looping in MusicChange hook
# Conflicts:
#	src/lua_hook.h
2018-08-15 02:07:33 -04:00
mazmazz
d14eedd700 Implemented MusicChange lua hook
# Conflicts:
#	src/lua_hook.h
#	src/lua_hooklib.c
2018-08-15 02:06:43 -04:00
mazmazz
79531b9683 Another loop fix to resolve music_bytes not resetting on non-looppoint tracks
# Conflicts:
#	src/sdl12/mixer_sound.c
2018-08-15 02:03:04 -04:00
mazmazz
2e9dba352a SDL mixer: Fix no looping bug when changing song position
# Conflicts:
#	src/sdl12/mixer_sound.c
2018-08-15 02:02:33 -04:00
mazmazz
662c366830 S_MusicName, S_MusicExists, S_PauseMusic lua, S_ResumeMusic lua
# Conflicts:
#	src/lua_baselib.c
2018-08-15 02:01:34 -04:00
mazmazz
eb52a14433 Implement I_MIDIPlaying, I_MusicPlaying, I_MusicPaused in other targets
# Conflicts:
#	src/nds/i_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c
2018-08-15 01:59:01 -04:00
mazmazz
d39f804662 Use Mix_PausedMusic instead of our own music_paused flag in SDL2/SDL1.2 I_MusicPaused
# Conflicts:
#	src/sdl12/mixer_sound.c
2018-08-15 01:55:49 -04:00
mazmazz
2483c11cc4 Implement I_MusicPaused in SDL2, SDL1.2, and FMOD; console and lua commands
# Conflicts:
#	src/sdl12/mixer_sound.c
2018-08-15 01:55:03 -04:00
mazmazz
e4a6cb87d1 Fix SDL music counter pause issue 2018-08-15 01:54:17 -04:00
mazmazz
29904a21b2 Remove MUSICPOS command, can be done in lua 2018-08-15 01:53:59 -04:00
mazmazz
297a8d537a Add S_MidiPlaying and S_MusicPlaying via I_MIDIPlaying and I_MusicPlaying
# Conflicts:
#	src/sdl12/mixer_sound.c
2018-08-15 01:53:45 -04:00
mazmazz
25880643d4 MUSICPOS console command 2018-08-15 01:52:35 -04:00
mazmazz
a8d379a6da Lua PositionMusic switch to UINT32 2018-08-15 01:52:20 -04:00
mazmazz
eab4d6b989 Lua PositionMusic/GetPositionMusic and console TUNES position 2018-08-15 01:50:19 -04:00
mazmazz
c6f63d9e9b Lua funcs MidiPlaying/MusicPlaying 2018-08-15 01:44:11 -04:00
mazmazz
d47d18998b Add S_MidiPlaying and S_MusicPlaying via I_MIDIPlaying and I_MusicPlaying
# Conflicts:
#	src/sdl12/mixer_sound.c
2018-08-15 01:43:51 -04:00
mazmazz
2cf364ab8b Fix SDL music position getting; dummy out position methods for MIDI
# Conflicts:
#	src/sdl/mixer_sound.c
#	src/sdl12/mixer_sound.c
2018-08-15 01:42:15 -04:00
mazmazz
aed388976c SDL fix for I_SetSongPosition
# Conflicts:
#	src/sdl12/mixer_sound.c
2018-08-15 01:40:54 -04:00
mazmazz
8981ef2cdc Change get/set music position to UINT32 parameter, milliseconds
# Conflicts:
#	src/d_netcmd.c
#	src/lua_baselib.c
#	src/nds/i_sound.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c
2018-08-15 01:40:20 -04:00
mazmazz
a4f7b17389 Initial attempt for get/set song position
* Declared I_SetSongPosition, I_GetSongPosition
* Implemented S_PositionMusic and S_GetPositionMusic
* Exposed in console TUNES and lua
* Implemented set position in SDL, SDL12, WIN32
* Implemented get position in WIN32

# Conflicts:
#	src/nds/i_sound.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c
2018-08-15 01:38:06 -04:00
Nev3r
f19b7bfacf Merge branch 'horizon-line-hom-fix' into 'master'
Horizon line HOM fix

See merge request STJr/SRB2Internal!152
2018-08-12 03:48:20 -04:00
Alam Ed Arias
01a023206f Merge branch 'master' into XPMupdate 2018-08-11 21:59:39 -04:00
Alam Ed Arias
7d3e4f729f TravisCI: also remove gcc-6 2018-08-11 21:59:08 -04:00
Alam Ed Arias
b5cc11f7d8 TravisCI: gcc-4.9 is also gone 2018-08-11 21:44:07 -04:00
Alam Ed Arias
bb94d9fa3a Merge branch 'master' into XPMupdate 2018-08-11 20:37:34 -04:00
Alam Ed Arias
6603f26772 Merge branch 'xpm_fix' into 'XPMupdate'
Fix white being treated as transparent.

See merge request STJr/SRB2!266
2018-08-11 20:36:57 -04:00
Steel Titanium
d9c7334dea Fix white being treated as transparent. 2018-08-10 19:02:03 -04:00
Alam Ed Arias
0575d2f1f9 TravisCI: remove gcc-5 test, gcc-5 package is gone 2018-08-10 17:16:26 -04:00
Alam Ed Arias
3479310546 SDL: update IMG_xpm.c 2018-08-10 17:09:11 -04:00
Monster Iestyn
30e4d2cd51 Merge branch 'polyobj-sky-plane-crash-fix' into 'master'
Polyobject sky plane crash fix

See merge request STJr/SRB2Internal!146
2018-08-10 15:40:43 -04:00
Monster Iestyn
299337f578 Merge branch 'leveltitle-tinkering' into 'master'
Leveltitle tinkering

See merge request STJr/SRB2Internal!134
2018-08-10 15:30:26 -04:00
Monster Iestyn
a5510cab5d Merge branch 'master' into polyobj-sky-plane-crash-fix 2018-08-10 20:06:12 +01:00