From 1d1f8762c5963c38ec51b9453291fda6652cd670 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Mon, 21 Jan 2019 19:09:24 +0900 Subject: [PATCH 1/5] Add win7 & 8.1 requirements to readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index fc9ef51c6b..a92c0fa4a6 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,8 @@ We are accepting bug reports (please report with as much detail as possible). Fe - A desktop platform with the [.NET Core SDK 2.2](https://www.microsoft.com/net/learn/get-started) or higher installed. - When working with the codebase, we recommend using an IDE with intellisense and syntax highlighting, such as [Visual Studio 2017+](https://visualstudio.microsoft.com/vs/), [Jetbrains Rider](https://www.jetbrains.com/rider/) or [Visual Studio Code](https://code.visualstudio.com/). +[There are additional requirements for Windows 7 and Windows 8.1](https://docs.microsoft.com/en-us/dotnet/core/windows-prerequisites?tabs=netcore2x) + # Running osu! ## Releases From e6a3de8652776b82e5399ec6062e1467f34fffb2 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 21 Jan 2019 20:15:53 +0900 Subject: [PATCH 2/5] Format better --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index a92c0fa4a6..a54b28b74a 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,7 @@ We are accepting bug reports (please report with as much detail as possible). Fe - A desktop platform with the [.NET Core SDK 2.2](https://www.microsoft.com/net/learn/get-started) or higher installed. - When working with the codebase, we recommend using an IDE with intellisense and syntax highlighting, such as [Visual Studio 2017+](https://visualstudio.microsoft.com/vs/), [Jetbrains Rider](https://www.jetbrains.com/rider/) or [Visual Studio Code](https://code.visualstudio.com/). - -[There are additional requirements for Windows 7 and Windows 8.1](https://docs.microsoft.com/en-us/dotnet/core/windows-prerequisites?tabs=netcore2x) +- Note that there are **[additional requirements for Windows 7 and Windows 8.1](https://docs.microsoft.com/en-us/dotnet/core/windows-prerequisites?tabs=netcore2x)** which you may need to manually install if your operating system is not up-to-date. # Running osu! From fb51578df39172fd9df7b6dbe5adda4f5e941ed5 Mon Sep 17 00:00:00 2001 From: chrisny286 Date: Mon, 21 Jan 2019 17:19:40 +0100 Subject: [PATCH 3/5] Update PlayerSettingsOverlay.cs Framework renamed this variable so it needs to be renamed here too. --- osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs index 2249e743e6..478a99a2eb 100644 --- a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs +++ b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs @@ -50,7 +50,7 @@ namespace osu.Game.Screens.Play.HUD protected override void PopOut() => this.FadeOut(fade_duration); //We want to handle keyboard inputs all the time in order to trigger ToggleVisibility() when not visible - public override bool HandleNonPositionalInput => true; + public override bool PropagateNonPositionalInputSubTree => true; protected override bool OnKeyDown(KeyDownEvent e) { From 65fd69c817d47f35e78d60f23676dbe03f364641 Mon Sep 17 00:00:00 2001 From: chrisny286 Date: Mon, 21 Jan 2019 19:10:29 +0100 Subject: [PATCH 4/5] Update HUDOverlay.cs separate PlayerSettingsOverlay from the other HUD elements in the Visibility Container --- osu.Game/Screens/Play/HUDOverlay.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs index cc665d99a1..7abcca146c 100644 --- a/osu.Game/Screens/Play/HUDOverlay.cs +++ b/osu.Game/Screens/Play/HUDOverlay.cs @@ -56,10 +56,10 @@ namespace osu.Game.Screens.Play HealthDisplay = CreateHealthDisplay(), Progress = CreateProgress(), ModDisplay = CreateModsContainer(), - PlayerSettingsOverlay = CreatePlayerSettingsOverlay(), } }, - new FillFlowContainer + PlayerSettingsOverlay = CreatePlayerSettingsOverlay(), + new FillFlowContainer { Anchor = Anchor.BottomRight, Origin = Anchor.BottomRight, From d7d2e2fe447d69974a105f5f7fe240f8da6a9bcb Mon Sep 17 00:00:00 2001 From: chrisny286 Date: Mon, 21 Jan 2019 19:22:19 +0100 Subject: [PATCH 5/5] trimmed whitespace --- osu.Game/Screens/Play/HUDOverlay.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs index 7abcca146c..910707915b 100644 --- a/osu.Game/Screens/Play/HUDOverlay.cs +++ b/osu.Game/Screens/Play/HUDOverlay.cs @@ -58,8 +58,8 @@ namespace osu.Game.Screens.Play ModDisplay = CreateModsContainer(), } }, - PlayerSettingsOverlay = CreatePlayerSettingsOverlay(), - new FillFlowContainer + PlayerSettingsOverlay = CreatePlayerSettingsOverlay(), + new FillFlowContainer { Anchor = Anchor.BottomRight, Origin = Anchor.BottomRight,