From eb7486f1094e0c75f00f69044181fa2e54f15ea7 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sat, 8 Oct 2016 10:26:35 -0400 Subject: [PATCH 1/2] Update osu-framework and specify game name --- osu-framework | 2 +- osu.Desktop.VisualTests/Program.cs | 2 +- osu.Desktop/Program.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu-framework b/osu-framework index 6b884e1b80..a191e86dba 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 6b884e1b80444c5249754634a4b5529c50b52934 +Subproject commit a191e86dbae40c4530ed3ff4b291732696e3a2b0 diff --git a/osu.Desktop.VisualTests/Program.cs b/osu.Desktop.VisualTests/Program.cs index 1cfa440dd9..966b6d00b1 100644 --- a/osu.Desktop.VisualTests/Program.cs +++ b/osu.Desktop.VisualTests/Program.cs @@ -12,7 +12,7 @@ public static class Program [STAThread] public static void Main(string[] args) { - BasicGameHost host = Host.GetSuitableHost(); + BasicGameHost host = Host.GetSuitableHost(@"visual-tests"); host.Add(new VisualTestGame()); host.Run(); } diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs index fe7423924c..1421086054 100644 --- a/osu.Desktop/Program.cs +++ b/osu.Desktop/Program.cs @@ -13,7 +13,7 @@ public static class Program [STAThread] public static void Main() { - BasicGameHost host = Host.GetSuitableHost(); + BasicGameHost host = Host.GetSuitableHost(@"osu"); host.Add(new OsuGame()); host.Run(); } From 3f83ffcb996083e49576145416dc431133e55919 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 10 Oct 2016 14:36:27 +0900 Subject: [PATCH 2/2] Bring framework up-to-date with upstream master. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index a191e86dba..857a472d57 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit a191e86dbae40c4530ed3ff4b291732696e3a2b0 +Subproject commit 857a472d570227937de549d50fa8bd672022afbf