thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4164 commits 1 branch 12 tags 205 MiB
Commit graph

4164 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
5af6aa06ae Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-08-28 10:27:49 -04:00
mazmazz
5ef4deb974 Fix MIDI looping/non-looping 2018-08-28 10:16:06 -04:00
mazmazz
adb9fa044d Revise LUAh_MusicChange hook 2018-08-28 10:10:56 -04:00
mazmazz
e98cd17d0e Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-27 08:40:36 -04:00
mazmazz
cc27ce8ed4 Move cvars to D_RegisterClientCommands for config recall 2018-08-27 08:40:24 -04:00
mazmazz
0e685d2686 Remove MP3 warning for win32 Mixer X 2018-08-27 06:16:55 -04:00
mazmazz
1e9fdb0454 Corrected unterminated #endif in sdl_sound 2018-08-27 06:15:01 -04:00
mazmazz
193735bc5f Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-27 05:59:55 -04:00
mazmazz
1042f2bf84 Remove unused methods (for now?) 2018-08-27 05:53:43 -04:00
mazmazz
4285ce99af Load Fluidsynth soundfont upon cvar change 2018-08-27 05:52:01 -04:00
mazmazz
fa8112c5be Lazy midi reload support on menu 2018-08-27 00:43:25 -04:00
mazmazz
a37e45ff37 Advanced submenu for sound options 2018-08-26 23:58:43 -04:00
mazmazz
57e5e3dba5 Revert "Sound scroll menu attempt" 
This reverts commit 6afa648c40.
 2018-08-26 23:46:55 -04:00
mazmazz
6afa648c40 Sound scroll menu attempt 2018-08-26 23:46:20 -04:00
mazmazz
cedf656451 Checkpoint: Add FluidSynth and Timidity support 2018-08-26 23:03:38 -04:00
mazmazz
cd44668e21 Makefile comments 2018-08-26 23:02:57 -04:00
mazmazz
5ef05da736 New SDL Mixer X builds with FluidSynth and Timidity 2018-08-26 23:02:29 -04:00
mazmazz
8f5aeb49ff HAVE_MIXERX and NOMIXERX compile flags (win32 only) 2018-08-26 15:12:00 -04:00
mazmazz
123c781b27 Fix S_ChangeMusic newmusic -> mmusic, merge error 2018-08-26 14:22:14 -04:00
mazmazz
0939cabd57 Make SDL Mixer X win32-exclusive 2018-08-26 14:20:41 -04:00
mazmazz
3dfbb61546 New SDL2 test files 2018-08-26 14:12:11 -04:00
mazmazz
ed6ec14797 Merge branch 'music-cleanup' into music-sdlmixerx 2018-08-26 14:04:54 -04:00
mazmazz
b7c8f7fab7 Case-insensitive music_name comparison 2018-08-25 22:00:31 -04:00
mazmazz
a622982a90 Remove tolower music_name, because we do case-insensitive matching now 2018-08-25 21:53:22 -04:00
mazmazz
3cf24dc9b7 Case-insensitive music_name comparison 2018-08-25 21:42:39 -04:00
mazmazz
e588460fe5 MUSICPOSITION -> MUSICPOS 
* Added muspos level header var to lua

# Conflicts:
#	src/dehacked.c
#	src/lua_maplib.c
#	src/p_setup.c
 2018-08-25 16:23:01 -04:00
mazmazz
5ed5f469b2 Add MUSICPOSITION level header and mapmusposition variable to instantly jump to position 
* Cutscene support too!
 2018-08-25 15:59:20 -04:00
mazmazz
0ff0b0a3fb Remove S_ChangeMusic call in G_PlayerReborn because redundant to S_Init 2018-08-25 15:23:48 -04:00
mazmazz
68f0a25323 Add MUSIC_FORCERESET flag 2018-08-25 13:18:14 -04:00
mazmazz
cc6c9d878d Lua add S_MusicName 2018-08-25 08:08:30 -04:00
mazmazz
a7def0ac3d Add S_MusicName back as a convenience function 
* Move MUSICRATE to doomdef.h
 2018-08-25 08:08:25 -04:00
mazmazz
7155f42c6c Add MUSICRATE to dehacked 2018-08-25 08:08:04 -04:00
mazmazz
0493fc6879 #ifdef MUSICRATE 1000 for adjustable music timings 2018-08-25 08:07:34 -04:00
mazmazz
db410cb236 Update functions for other targets 2018-08-24 18:20:53 -04:00
mazmazz
512a5f0e1b I_SongPlaying detect GME properly 2018-08-24 18:03:50 -04:00
mazmazz
c05be4e0b5 Stub I_UnloadSong because we already unload in I_StopMusic 
* Stop-gap for now. Ideally the logic would be in the respective places.

# Conflicts:
#	src/sdl/mixer_sound.c
 2018-08-24 18:02:46 -04:00
mazmazz
07cfc1a29a Volume fixes 
# Conflicts:
#	src/sdl/mixer_sound.c
 2018-08-24 18:01:57 -04:00
mazmazz
350dbf639c I_SongPlaying detect GME properly 2018-08-24 18:00:39 -04:00
mazmazz
95c41dd822 Detect GME more simply 2018-08-24 17:58:56 -04:00
mazmazz
5e48d50178 Stub I_UnloadSong because we already unload in I_StopMusic 
* Stop-gap for now. Ideally the logic would be in the respective places.
 2018-08-24 17:56:22 -04:00
mazmazz
8493d0bfcc Volume fixes 2018-08-24 17:56:14 -04:00
mazmazz
2961d32e4a A word 2018-08-24 13:41:26 -04:00
mazmazz
76ab06cdb2 Merge branch 'music-cleanup' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into music-cleanup 2018-08-24 13:36:07 -04:00
mazmazz
4962a2b9aa GME fix: play song in I_PlaySong, not I_LoadSong 2018-08-24 13:35:41 -04:00
mazmazz
e1a8319013 Lua S_MusicInfo fix and FMOD GME fix: play song in I_PlaySong, not I_LoadSong 2018-08-24 13:12:14 -04:00
mazmazz
052f9f8a7c Checkpoint: Revised fading routines for new load/play pattern 
* Perform fade-out/fade-in using callbacks
* Move queued music from interface to s_sound
 2018-08-24 13:11:38 -04:00
mazmazz
5188dcfd87 Lua method reordering for Musicplus 
* Change to S_MusicName to S_MusicInfo for API
 2018-08-23 21:23:55 -04:00
mazmazz
1f5e62197e Merge branch 'music-cleanup' into musicplus-core 
Pending rewrite of fade music changing

# Conflicts:
#	src/android/i_sound.c
#	src/djgppdos/i_sound.c
#	src/i_sound.h
#	src/s_sound.c
#	src/s_sound.h
#	src/sdl/mixer_sound.c
#	src/sdl/sdl_sound.c
#	src/win32/win_snd.c
 2018-08-23 21:07:39 -04:00
mazmazz
5972ff3e90 Refactor I_MusicType MusicPlaying and MusicPaused other targets 2018-08-23 20:23:16 -04:00
mazmazz
8533e08ded Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ... 2018-08-23 20:14:46 -04:00