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

Merge remote-tracking branch 'refs/remotes/ppy/master' into connection_fix

Browse Source
This commit is contained in:
Andrey Zavadskiy 2017-02-19 13:10:34 +03:00
commit bd4af69461
3 changed files with 2 additions and 5 deletions
osu-framework
osu.Game
Overlays/Options
Sidebar.cs
Screens/Menu
ButtonSystem.cs

2
osu-framework

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

1
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;
}
}
}

4
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: