Merge remote-tracking branch 'upstream/master' into general-fixes

This commit is contained in:
Dean Herbert 2016-10-22 23:54:12 +09:00
commit e4c74f9c77

View File

@ -6,6 +6,7 @@ using osu.Framework.Graphics.Transformations;
using osu.Framework.Input; using osu.Framework.Input;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Framework;
namespace osu.Game namespace osu.Game
{ {
@ -56,6 +57,12 @@ namespace osu.Game
}; };
} }
public override void Load(BaseGame game)
{
base.Load(game);
updateFill();
}
public double Volume public double Volume
{ {
get { return volume.Value; } get { return volume.Value; }