sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 08:33:55 +09:00
Code Issues Packages Projects 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
parent f028188398 5721e7f2d2
commit bd4af69461
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

Submodule osu-framework updated: 28c4acbb81...697d8b7e95

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: