stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-18 02:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
4336 commits 171 branches 41 tags 310 MiB
Commit graph

4336 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Digiku
e943259057 Remove unnecessary totalring deduction condition 
Because it would be triggered by !(maptol & TOL_NIGHTS) in the old code anyway
 2018-08-17 09:11:59 -04:00
Digiku
792360ea97 Revert "Checkpoint (unfinished): player->totalsphere" 
This reverts commit 6a0175147f
 2018-08-17 09:09:10 -04:00
mazmazz
e8c221f691 Place backwards Bumpers with the correct Thing angle 2018-08-16 22:07:53 -04:00
Monster Iestyn
b63290211a Merge branch 'master' into next 2018-08-16 22:04:00 +01:00
Monster Iestyn
a4cfa9e82a Merge branch 'lua-sector-names-fix' into 'next' 
Lua sector names fix

See merge request STJr/SRB2!263
 2018-08-16 16:57:41 -04:00
Monster Iestyn
364339e1ce Merge branch 'sdl_mixer_fixes' into 'master' 
SDL Mixer fixes

Closes #31

See merge request STJr/SRB2!260
 2018-08-16 16:57:14 -04:00
mazmazz
18b6b53722 Adjust vertical angle and forwards/backwards of NiGHTS bumper in objectplace 2018-08-16 16:51:48 -04:00
mazmazz
6a0175147f Checkpoint (unfinished): player->totalsphere 2018-08-16 13:11:32 -04:00
mazmazz
7474e073f8 Change SETRINGS to support player->spheres in NiGHTS 2018-08-16 12:13:57 -04:00
mazmazz
03c4a626c3 Line from revert 2018-08-16 11:35:35 -04:00
mazmazz
365a59f186 Revert "SETSPHERES console command for debugging/cheating" 
This reverts commit 4cb7036f51.
 2018-08-16 11:34:57 -04:00
mazmazz
08f35c0792 Don't apply autobrake on NiGHTS bumpers 2018-08-15 23:40:42 -04:00
mazmazz
432c1ab862 Also center non-NiGHTS players on NiGHTS bumpers 2018-08-15 19:09:54 -04:00
mazmazz
67da64a064 Use more efficient position setting. For Z, also adjust for bumper mobj scale. 2018-08-15 18:50:28 -04:00
mazmazz
55d2da2201 Fix NiGHTS Bumper player positioning 2018-08-15 18:42:20 -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