Sryder
|
eeb6003595
|
Disable VSync by default. I wouldn't be surprised if there are issues that arise from it, and I'm fairly sure its always been slightly spotty.
|
2018-10-04 21:08:47 +01:00 |
|
mazmazz
|
95db2ea276
|
MP Core Win32: Fix FadeSong unused callback param (buildbots)
|
2018-09-20 08:42:28 -04:00 |
|
mazmazz
|
9fd7fac3ae
|
MP Core Win32: Fix FadeSong unused callback param (buildbots)
|
2018-09-20 08:41:40 -04:00 |
|
mazmazz
|
f771c12701
|
MP Libopenmpt: Make explicit OPENMPT=1 for non-windows platforms
|
2018-09-19 23:03:35 -04:00 |
|
mazmazz
|
fa22f65610
|
Merge branch 'musicplus-core' into musicplus-sdlmixerx
|
2018-09-19 18:53:41 -04:00 |
|
mazmazz
|
15dc28144b
|
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
|
2018-09-18 22:24:44 -04:00 |
|
mazmazz
|
77381cd984
|
musicplus-jingle 2.2 -> 2.1 backport
|
2018-09-18 15:10:00 -04:00 |
|
mazmazz
|
0f2b4da1a9
|
MusicPlus core: Win32 DD compile fixes
|
2018-09-18 14:09:24 -04:00 |
|
mazmazz
|
4ce05ceadf
|
MusicPlus core: Win32 DD compile fixes
|
2018-09-18 14:09:13 -04:00 |
|
mazmazz
|
85c6715188
|
musicplus-libopenmpt 2.2 -> 2.1 backport
|
2018-09-18 12:31:47 -04:00 |
|
mazmazz
|
32c48af258
|
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
|
2018-09-18 10:22:17 -04:00 |
|
mazmazz
|
707d649d67
|
Merge branch 'musicplus-core' into musicplus-sdlmixerx
|
2018-09-15 01:17:33 -04:00 |
|
mazmazz
|
b2e3352c5a
|
Merge branch 'music-cleanup' into musicplus-core
|
2018-09-15 00:46:02 -04:00 |
|
mazmazz
|
69359d4db0
|
srb2dd music cleanup fixes
(cherry picked from commit 5822cbbbe4)
|
2018-09-14 13:57:22 -04:00 |
|
mazmazz
|
5822cbbbe4
|
srb2dd music cleanup fixes
|
2018-09-14 13:24:15 -04:00 |
|
mazmazz
|
d288dd2b5c
|
GME fix: play song in I_PlaySong, not I_LoadSong
(cherry picked from commit 5f21bf230d9716b7cc5b52e4bf3591ebe01e9f3a)
|
2018-09-14 10:45:39 -04:00 |
|
mazmazz
|
223160ffbd
|
Refactor I_MusicType MusicPlaying and MusicPaused other targets
(cherry picked from commit 9e6eebeb8d6b4119d87e9678bb6b0687e3dc5217)
|
2018-09-14 10:45:39 -04:00 |
|
mazmazz
|
03c5f5635d
|
Refactoring and reordering other targets
(cherry picked from commit cf065e106f68fb8af3b0568eba188c8235b1656e)
|
2018-09-14 10:43:46 -04:00 |
|
mazmazz
|
bcc99d705d
|
I_MusicPlaying, I_MusicPaused other targets
(cherry picked from commit d5ec38815968e267aceb59a48a6cb6d3292c0b69)
|
2018-09-14 10:28:35 -04:00 |
|
mazmazz
|
a8ce3d3002
|
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets
(cherry picked from commit 9fb9386f84b3739fe765a78bcb9683eb7e98bc36)
|
2018-09-14 10:23:47 -04:00 |
|
mazmazz
|
32ab93a012
|
Added I_GetMusicType and removed midimode variable: other targets
(cherry picked from commit 14b393ab16736bb44dab6fd4a90b7bdd8ff782e0)
|
2018-09-14 09:55:45 -04:00 |
|
mazmazz
|
5a4e6cf924
|
Loose ends other targets
(cherry picked from commit 9a5fc5f66a31baf713c6f32f7a696b933da6907b)
|
2018-09-14 09:41:08 -04:00 |
|
mazmazz
|
193735bc5f
|
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
|
2018-08-27 05:59:55 -04:00 |
|
mazmazz
|
8f5aeb49ff
|
HAVE_MIXERX and NOMIXERX compile flags (win32 only)
|
2018-08-26 15:12:00 -04:00 |
|
mazmazz
|
0939cabd57
|
Make SDL Mixer X win32-exclusive
|
2018-08-26 14:20:41 -04:00 |
|
mazmazz
|
ed6ec14797
|
Merge branch 'music-cleanup' into music-sdlmixerx
|
2018-08-26 14:04:54 -04:00 |
|
toaster
|
41b7625fa7
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems
# Conflicts:
# src/g_game.c
# src/v_video.c
|
2018-08-26 12:42:55 +01:00 |
|
mazmazz
|
db410cb236
|
Update functions for other targets
|
2018-08-24 18:20:53 -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
|
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
|
2b9cadd477
|
Refactoring and reordering other targets
|
2018-08-23 17:54:40 -04:00 |
|
mazmazz
|
8830943906
|
I_MusicPlaying, I_MusicPaused other targets
|
2018-08-23 12:31:01 -04:00 |
|
mazmazz
|
d79f38871e
|
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets
|
2018-08-23 11:54:58 -04:00 |
|
mazmazz
|
70d3315ac4
|
Added I_GetMusicType and removed midimode variable: other targets
|
2018-08-23 10:19:04 -04:00 |
|
mazmazz
|
a7df3be449
|
Loose ends other targets
|
2018-08-23 09:37:02 -04:00 |
|
mazmazz
|
b4b4285666
|
Revert "Nix'd midimusicvolume other targets"
This reverts commit 31fd0f0cf5.
# Conflicts:
# src/android/i_sound.c
# src/dummy/i_sound.c
# src/win32/win_snd.c
|
2018-08-23 09:09:12 -04:00 |
|
mazmazz
|
8be165db5b
|
Playback routines other targets
|
2018-08-23 09:06:31 -04:00 |
|
mazmazz
|
31fd0f0cf5
|
Nix'd midimusicvolume other targets
|
2018-08-23 07:39:45 -04:00 |
|
mazmazz
|
43e908e7c4
|
SDL Mixer X compile on Windows x86
|
2018-08-22 00:17:25 -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 |
|
mazmazz
|
9d1f509972
|
I_FadeSongFromLevel -> I_FadeSongFromVolume refactor other targets
|
2018-08-21 08:54:04 -04:00 |
|
mazmazz
|
086d7fc73b
|
Interface name refactor: Music -> Song other targets
|
2018-08-21 06:22:42 -04:00 |
|
mazmazz
|
ec58f2e94f
|
I_FadeOutStopMusic, I_FadeInStartDigSong other targets
|
2018-08-19 22:05:55 -04:00 |
|
mazmazz
|
783ccf8c67
|
I_FadeMusicFromLevel/I_FadeMusic change for other targets
|
2018-08-19 17:02:27 -04:00 |
|
mazmazz
|
307450f8b3
|
S_FadeMusic[FromLevel] and S_StopFadingMusic other targets
|
2018-08-19 16:19:55 -04:00 |
|
mazmazz
|
c092f6724b
|
I_SetInternalMusicVolume other targets
|
2018-08-19 09:39:11 -04:00 |
|
mazmazz
|
9d835614a9
|
I_GetMusicLoopPoint and I_SetMusicLoopPoint for other targets
|
2018-08-18 20:19:54 -04:00 |
|