sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 00:09:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor

Browse Source 
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
This commit is contained in:
Thomas Müller
2017-03-01 18:05:58 +01:00
parent 03889e6ca6 b3a411d8c3
commit d46e68b36b
54 changed files with 321 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
View File

@ -82,9 +82,9 @@ namespace osu.Game.Graphics.UserInterface.Volume
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
volumeMeterMaster.Bindable.Weld(audio.Volume);
volumeMeterEffect.Bindable.Weld(audio.VolumeSample);
volumeMeterMusic.Bindable.Weld(audio.VolumeTrack);
volumeMeterMaster.Bindable.BindTo(audio.Volume);
volumeMeterEffect.Bindable.BindTo(audio.VolumeSample);
volumeMeterMusic.Bindable.BindTo(audio.VolumeTrack);
}
ScheduledDelegate popOutDelegate;