h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-19 07:42:58 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Alex Amadori 2017-02-19 19:09:55 +01:00
commit a0d0c1854b
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 28c4acbb818d7be0ff66c600daacde9d91a99c6e Subproject commit 697d8b7e9530ba7914d9c78012329ce1559e3681

1
osu.Game/Overlays/Options/Sidebar.cs
View File

@ -74,6 +74,7 @@ namespace osu.Game.Overlays.Options
{ {
Content.Anchor = Anchor.CentreLeft; Content.Anchor = Anchor.CentreLeft;
Content.Origin = Anchor.CentreLeft; Content.Origin = Anchor.CentreLeft;
RelativeSizeAxes = Axes.Both;
} }
} }
} }

4
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -32,8 +32,6 @@ namespace osu.Game.Screens.Menu
public Action OnChart; public Action OnChart;
public Action OnTest; public Action OnTest;
private SampleChannel sampleOsuClick;
private Toolbar toolbar; private Toolbar toolbar;
private FlowContainerWithOrigin buttonFlow; private FlowContainerWithOrigin buttonFlow;
@ -122,7 +120,6 @@ namespace osu.Game.Screens.Menu
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]
private void load(AudioManager audio, OsuGame game = null) private void load(AudioManager audio, OsuGame game = null)
{ {
sampleOsuClick = audio.Sample.Get(@"Menu/menuhit");
toolbar = game?.Toolbar; toolbar = game?.Toolbar;
} }
@ -181,7 +178,6 @@ namespace osu.Game.Screens.Menu
switch (state) switch (state)
{ {
case MenuState.Initial: case MenuState.Initial:
sampleOsuClick.Play();
State = MenuState.TopLevel; State = MenuState.TopLevel;
return; return;
case MenuState.TopLevel: case MenuState.TopLevel: