From ebc38917dcab14c8e74874f0a838ff4b26b1ab27 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 18 Feb 2017 22:29:20 +0900 Subject: [PATCH 1/3] Fix options sidebar not displaying correclty. --- osu.Game/Overlays/Options/Sidebar.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/Overlays/Options/Sidebar.cs b/osu.Game/Overlays/Options/Sidebar.cs index f3fe3e1683..ffc3d04756 100644 --- a/osu.Game/Overlays/Options/Sidebar.cs +++ b/osu.Game/Overlays/Options/Sidebar.cs @@ -74,6 +74,7 @@ namespace osu.Game.Overlays.Options { Content.Anchor = Anchor.CentreLeft; Content.Origin = Anchor.CentreLeft; + RelativeSizeAxes = Axes.Both; } } } From c1194102b1716800d2b00bbbaa8ef8f330b442ed Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 18 Feb 2017 22:33:24 +0900 Subject: [PATCH 2/3] Remove second sample playback when clicking osu! logo. --- osu.Game/Screens/Menu/ButtonSystem.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs index 8464ca92ef..a203638478 100644 --- a/osu.Game/Screens/Menu/ButtonSystem.cs +++ b/osu.Game/Screens/Menu/ButtonSystem.cs @@ -32,8 +32,6 @@ namespace osu.Game.Screens.Menu public Action OnChart; public Action OnTest; - private SampleChannel sampleOsuClick; - private Toolbar toolbar; private FlowContainerWithOrigin buttonFlow; @@ -122,7 +120,6 @@ namespace osu.Game.Screens.Menu [BackgroundDependencyLoader(true)] private void load(AudioManager audio, OsuGame game = null) { - sampleOsuClick = audio.Sample.Get(@"Menu/menuhit"); toolbar = game?.Toolbar; } @@ -181,7 +178,6 @@ namespace osu.Game.Screens.Menu switch (state) { case MenuState.Initial: - sampleOsuClick.Play(); State = MenuState.TopLevel; return; case MenuState.TopLevel: From 837992d11225229dd24ded485b04bc809a0d3f24 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sun, 19 Feb 2017 00:27:00 +0900 Subject: [PATCH 3/3] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 28c4acbb81..697d8b7e95 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 28c4acbb818d7be0ff66c600daacde9d91a99c6e +Subproject commit 697d8b7e9530ba7914d9c78012329ce1559e3681