RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
EVAST9919 2017-11-12 06:21:53 +03:00
parent 36ac002820 6300e182e2
commit bc45843def
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 1a563d7ce0834cede2ef587762f98fe580badf3c Subproject commit 36fad894f0657d0fdc998ffd3f2f3fa87e45d67d

2
osu-resources

@ -1 +1 @@
Subproject commit a4418111f8ed2350a6fd46fe69258884f0757745 Subproject commit 1750ab8f6761ab35592fd46da71fbe0c141bfd93

14
osu.Desktop/OsuGameDesktop.cs
View File

@ -18,9 +18,12 @@ namespace osu.Desktop
{ {
internal class OsuGameDesktop : OsuGame internal class OsuGameDesktop : OsuGame
{ {
private readonly bool noVersionOverlay;
public OsuGameDesktop(string[] args = null) public OsuGameDesktop(string[] args = null)
: base(args) : base(args)
{ {
noVersionOverlay = args?.Any(a => a == "--no-version-overlay") ?? false;
} }
public override Storage GetStorageForStableInstall() public override Storage GetStorageForStableInstall()
@ -79,11 +82,14 @@ protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
LoadComponentAsync(new VersionManager { Depth = int.MinValue }, v => if (!noVersionOverlay)
{ {
Add(v); LoadComponentAsync(new VersionManager { Depth = int.MinValue }, v =>
v.State = Visibility.Visible; {
}); Add(v);
v.State = Visibility.Visible;
});
}
} }
public override void SetHost(GameHost host) public override void SetHost(GameHost host)