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

4321 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
3b94dd8d34 CHANGED MIND: Nix'd S_MIDIMusic, I_PlaySong, and I_RegisterSong 
* music_lumpnum, music_data, music_handle are gone
* Relevant interfaces I_PlaySong are transferred to I_StartDigSong
 2018-08-23 07:49:09 -04:00
mazmazz
31fd0f0cf5 Nix'd midimusicvolume other targets 2018-08-23 07:39:45 -04:00
mazmazz
5a2663704e Nix'd midimusicvolume 2018-08-23 07:39:32 -04:00
Monster Iestyn
dbec486af1 Merge branch 'cez-bramble-hardcode' into 'master' 
CEZ Bramble Hardcode

See merge request STJr/SRB2Internal!169
 2018-08-22 14:47:04 -04:00
Monster Iestyn
fa637475ae Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125 2018-08-22 17:16:11 +01:00
mazmazz
623a5ae525 Position fixes with looppoint 2018-08-21 11:58:38 -04:00
Monster Iestyn
3cce0b8a33 Merge branch 'public_next' 
# Conflicts:
#	src/sdl12/i_cdmus.c
#	src/win32ce/win_cd.c
 2018-08-21 15:40:54 +01:00
Monster Iestyn
36080cc49a Merge branch 'master' into next 2018-08-21 15:36:36 +01:00
Monster Iestyn
eb5b5300ab Merge branch 'XPMupdate' into 'master' 
update XPM icon

See merge request STJr/SRB2!267
 2018-08-21 10:31:25 -04:00
mazmazz
1ec90ba21e S_MusicPlaying safety 2018-08-21 08:56:05 -04:00
mazmazz
7c3578896c S_ChangeMusicWithFade fixes 
* MusicSlot compatibility name fix
 2018-08-21 08:55:53 -04:00
mazmazz
dbd7cce52c Lua FadeMusicFromVolume, GetMusicName refactor 2018-08-21 08:54:23 -04:00
mazmazz
9d1f509972 I_FadeSongFromLevel -> I_FadeSongFromVolume refactor other targets 2018-08-21 08:54:04 -04:00
mazmazz
2594909e70 I_FadeSongFromLevel -> I_FadeSongFromVolume refactor 
* S_MusicName->GetMusicName refactor
* S_ChangeMusicWithFade->ChangeMusicAdvanced refactor
 2018-08-21 08:53:51 -04:00
mazmazz
086d7fc73b Interface name refactor: Music -> Song other targets 2018-08-21 06:22:42 -04:00
mazmazz
fd757b4e74 Interface name refactor: Music -> Song 
* Music refers to the music system, song refers to the entity being played.
* s_sound doesn't follow this, everything is music
 2018-08-21 06:22:35 -04:00
Monster Iestyn
9639c510a4 Merge branch 'defaultsoundvol' into 'master' 
Change default sound volume

See merge request STJr/SRB2!238
 2018-08-20 09:41:04 -04:00
mazmazz
bded9c546e Debug messages 2018-08-20 08:47:41 -04:00
mazmazz
3ad2b7f039 Rename I_QueueDigSongPostFade to I_QueueDigSong 2018-08-20 01:16:52 -04:00
mazmazz
d61857c768 Midimode safeties for song queueing/fading 2018-08-20 01:14:29 -04:00
mazmazz
32a7bee02c Lua comment 2018-08-20 01:14:16 -04:00
mazmazz
2fb7eb5679 Music lump existence minor fixes 2018-08-20 01:14:01 -04:00
mazmazz
8ea82a98d7 Lua player argument fixes, GetMusicLength and FadeMusic 2018-08-20 00:21:35 -04:00
mazmazz
cba02eadbf Allow queueing music at end of song, not just fading 2018-08-20 00:12:23 -04:00
mazmazz
1701b81079 * Allow S_ChangeMusic to queue the same track for fading 
* StopDigSong upon running queue so that GME works for queueing
 2018-08-19 23:20:40 -04:00
mazmazz
0a41485b60 I_FadeOutStopMusic, I_FadeInStartDigSong, S_ChangeMusic lua 2018-08-19 22:06:09 -04:00
mazmazz
ec58f2e94f I_FadeOutStopMusic, I_FadeInStartDigSong other targets 2018-08-19 22:05:55 -04:00
mazmazz
87df31a685 I_FadeOutStopMusic, I_FadeInStartDigSong, S_ChangeMusicWithFade implementation 
* First attempt, a little messy but works fine
 2018-08-19 22:05:42 -04:00
mazmazz
783ccf8c67 I_FadeMusicFromLevel/I_FadeMusic change for other targets 2018-08-19 17:02:27 -04:00
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
ac9167b654 S_FadeMusic[FromLevel] and S_StopFadingMusic Lua 
* Fixed some arg position weirdness with other music lua funcs
 2018-08-19 16:20:14 -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
f845a7fcfd I_SetInternalMusicVolume lua 2018-08-19 09:39:32 -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
c64686d8c6 I_GetMusicLoopPoint and I_SetMusicLoopPoint for Lua 
* Fix S_GetMusicLength for player compatibility
 2018-08-18 20:20:18 -04:00
mazmazz
9d835614a9 I_GetMusicLoopPoint and I_SetMusicLoopPoint for other targets 2018-08-18 20:19:54 -04:00