thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-04 15:12:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
8956 commits 2 branches 14 tags 206 MiB
Commit graph

729 commits

Author SHA1 Message Date
mazmazz
88d2ac8d4e 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
3c5406ee04 Checkpoint 2018-08-19 16:25:12 -04:00
mazmazz
307450f8b3 S_FadeMusic[FromLevel] and S_StopFadingMusic other targets 2018-08-19 16:19:55 -04:00
mazmazz
df1463b378 S_FadeMusic[FromLevel] and S_StopFadingMusic implementation 2018-08-19 16:19:48 -04:00
mazmazz
c092f6724b I_SetInternalMusicVolume other targets 2018-08-19 09:39:11 -04:00
mazmazz
9e4d60e7ce I_SetInternalMusicVolume implementation 2018-08-19 09:38:57 -04:00
mazmazz
0df729f630 Framework for internal_volume; more fade code 2018-08-19 09:16:52 -04:00
mazmazz
ba523a5300 Merge branch 'musicplus-core' into musicplus-fade-sdltimer 2018-08-19 08:35:56 -04:00
mazmazz
33ac960cf9 Enable midi_volume, it actually works 2018-08-19 08:34:03 -04:00
mazmazz
67c8b6661e Fade checkpoint 2018-08-19 08:32:12 -04:00
mazmazz
4c730138f3 Add LIBGME ifdefs 2018-08-19 06:43:57 -04:00
mazmazz
68cc439347 Minor cleanup 2018-08-18 23:26:58 -04:00
mazmazz
c29d3ec3d7 Merge branch 'musicplus-core' into musicplus-fade-sdltimer 
# Conflicts:
#	src/sdl/mixer_sound.c
 2018-08-18 23:12:58 -04:00
mazmazz
2f7bdd4aa3 Fixed loop point counter bug 2018-08-18 21:29:18 -04:00
mazmazz
0a0537d486 Fix S_SetMusicLoopPoint wrong method; trigger only on is_looping 2018-08-18 20:54:56 -04:00
mazmazz
1869c21b6d 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
6c2fd14b85 Loop point modulo by length 2018-08-18 20:29:19 -04:00
mazmazz
9d835614a9 I_GetMusicLoopPoint and I_SetMusicLoopPoint for other targets 2018-08-18 20:19:54 -04:00
mazmazz
1629a8cfd0 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
4659bc241a Remove I_MIDIPlaying from other targets 2018-08-18 17:46:06 -04:00
mazmazz
22b2ef44b9 Remove I_MIDIPlaying 2018-08-18 17:45:57 -04:00
mazmazz
14336ea1ae Other interfaces for I_MusicType 2018-08-18 17:18:13 -04:00
mazmazz
c9c1b24ad6 S_MusicType implementation; MOD support for Get/SetMusicPosition and MusicLength 
* Misc MOD fixes
 2018-08-18 17:17:53 -04:00
mazmazz
7080c93576 Added GME for GetMusicLength, SetMusicPosition, GetMusicPosition 
* Misc fixes
 2018-08-18 16:21:28 -04:00
mazmazz
8db0d04cb8 Support wide chars when searching for music tags (MP3) 2018-08-18 15:26:31 -04:00
mazmazz
7328f47b53 I_GetMusicLength declarations for other interfaces 2018-08-18 14:18:49 -04:00
mazmazz
e7a4f6d78f I_GetMusicLength implementation 2018-08-18 14:18:29 -04:00
Monster Iestyn
6797976531 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
10f8337347 Checkpoint: Basic functions 2018-08-15 12:07:08 -04:00
mazmazz
da5fd51feb Fix merge errors 2018-08-15 02:42:50 -04:00
mazmazz
b24efc7439 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
afa71ec7cd 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
5197f69c6f 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
7eabad83a1 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
58727a3bba 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
10f989f906 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
6841f90562 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
de4d4e87e1 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
0f5a7e43a1 Fix SDL music counter pause issue 2018-08-15 01:54:17 -04:00
mazmazz
53c176e922 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
44c3928d82 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
d23d77754e 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
6d82e03710 SDL fix for I_SetSongPosition 
# Conflicts:
#	src/sdl12/mixer_sound.c
 2018-08-15 01:40:54 -04:00
mazmazz
55ef2d1d20 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
f8f71422ca 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
Steel Titanium
cd790eca91 Fix white being treated as transparent. 2018-08-10 19:02:03 -04:00
Alam Ed Arias
8f6d20d53c SDL: update IMG_xpm.c 2018-08-10 17:09:11 -04:00
Monster Iestyn
f6b8206660 Merge branch 'public_next' 
# Conflicts:
#	src/hardware/hw_md2.c
 2018-07-31 19:41:54 +01:00
Monster Iestyn
e4f38995e7 Merge branch 'gme-lowvolume-fix' into 'master' 
GME low volume fix

See merge request STJr/SRB2!248
 2018-07-31 14:35:32 -04:00
Steel Titanium
d649700abf Re-did this fix. 2018-07-28 01:58:25 -04:00