thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-06-28 18:46:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4159 commits 2 branches 14 tags 207 MiB
Commit graph

4159 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
ccf37b96f8 Merge branch 'musicplus-core' into musicplus-feature-postboss 2018-09-11 11:25:21 -04:00
mazmazz
1bb41a00bc Don't decrement fade timer if song is paused 2018-09-11 11:20:46 -04:00
mazmazz
2b4d7d1ad4 Change to percentage calc from interval decrement for volume fade 2018-09-11 11:17:30 -04:00
mazmazz
73842cec71 Add MUSICPOSTBOSSFADEIN 2018-09-01 13:10:50 -04:00
mazmazz
da53fd8f8f Merge branch 'music-cleanup' into musicplus-core 2018-09-01 11:22:15 -04:00
mazmazz
2c38ecadd1 Add mapmusposition placeholder to LE 413 change music 2018-08-29 15:21:17 -04:00
mazmazz
f4e80bb0b0 Fix music fade out when MUSICPOSTBOSS is not specified or doesn't exist 2018-08-28 18:46:30 -04:00
mazmazz
474d17e532 Merge branch 'musicplus-core' into musicplus-feature-postboss 2018-08-28 10:23:13 -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
c8a802bb6b Fixed post-boss music change with mapmusname comparison 2018-08-25 22:19:15 -04:00
mazmazz
b7c8f7fab7 Case-insensitive music_name comparison 2018-08-25 22:00:31 -04:00
mazmazz
7d42877ff2 Merge branch 'musicplus-core' into musicplus-feature-postboss 2018-08-25 21:55:49 -04:00
mazmazz
a622982a90 Remove tolower music_name, because we do case-insensitive matching now 2018-08-25 21:53:22 -04:00
mazmazz
1999544b62 Case-insensitive music matching 2018-08-25 21:50:56 -04:00
mazmazz
3cf24dc9b7 Case-insensitive music_name comparison 2018-08-25 21:42:39 -04:00
mazmazz
9fd8387830 Load mapmus vars post-boss even if another tune is playing, like a jingle 2018-08-25 17:42:46 -04:00
mazmazz
142807392e UINT32 muspostbosspos fix 2018-08-25 16:28:56 -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
6bb5280fbc MUSICPOSITION -> MUSICPOS 
* Added muspos level header var to lua
 2018-08-25 16:21:34 -04:00
mazmazz
26d309992a MUSICPOSTBOSSPOSITION -> MUSICPOSTBOSSPOS 2018-08-25 16:18:09 -04:00
mazmazz
bc0038ca3e Merge branch 'musicplus-core' into musicplus-feature-postboss 
# Conflicts:
#	src/dehacked.c
#	src/p_setup.c
 2018-08-25 16:11:29 -04:00
mazmazz
13854fbffb Added MUSICPOSTBOSSTRACK and MUSICPOSTBOSSPOSITION level header/variables 2018-08-25 16:10:46 -04:00
mazmazz
f30cf2b6cc Added MUSICPOSTBOSS level header for boss post-defeat music 2018-08-25 16:02:12 -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
mazmazz
2b9cadd477 Refactoring and reordering other targets 2018-08-23 17:54:40 -04:00
mazmazz
13dfbb0fdb Minor refactoring and reordering 
* I_GetMusicType() -> I_MusicType()
* Wrap MIDI volume hack in #ifdef _WIN32
 2018-08-23 17:05:37 -04:00