From 78f2037d84391e75325ad418911f59ef2a185fe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Thu, 12 Oct 2017 09:42:06 +0200 Subject: [PATCH 1/5] Remove now obsolete RatioAdjust --- osu.Game/Graphics/Processing/RatioAdjust.cs | 27 --------------------- osu.Game/OsuGameBase.cs | 3 +-- osu.Game/osu.Game.csproj | 1 - 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 osu.Game/Graphics/Processing/RatioAdjust.cs diff --git a/osu.Game/Graphics/Processing/RatioAdjust.cs b/osu.Game/Graphics/Processing/RatioAdjust.cs deleted file mode 100644 index 640814d8e1..0000000000 --- a/osu.Game/Graphics/Processing/RatioAdjust.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) 2007-2017 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using System; -using osu.Framework.Graphics.Containers; -using OpenTK; -using osu.Framework.Graphics; - -namespace osu.Game.Graphics.Processing -{ - internal class RatioAdjust : Container - { - public RatioAdjust() - { - RelativeSizeAxes = Axes.Both; - } - - protected override void Update() - { - base.Update(); - Vector2 parent = Parent.DrawSize; - - Scale = new Vector2(Math.Min(parent.Y / 768f, parent.X / 1024f)); - Size = new Vector2(1 / Scale.X); - } - } -} diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs index 8e7bfa8a76..93eb1d76df 100644 --- a/osu.Game/OsuGameBase.cs +++ b/osu.Game/OsuGameBase.cs @@ -15,7 +15,6 @@ using osu.Game.Beatmaps; using osu.Game.Configuration; using osu.Game.Graphics; using osu.Game.Graphics.Cursor; -using osu.Game.Graphics.Processing; using osu.Game.Online.API; using SQLite.Net; using osu.Framework.Graphics.Performance; @@ -186,7 +185,7 @@ namespace osu.Game GlobalKeyBindingInputManager globalBinding; - base.Content.Add(new RatioAdjust + base.Content.Add(new DrawSizePreservingFillContainer { Children = new Drawable[] { diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 81f360f640..b7bb7de9e3 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -312,7 +312,6 @@ - From 1b031ca3280d104dadf9543ebf389e2719185b2d Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 12 Oct 2017 18:28:26 +0900 Subject: [PATCH 2/5] Fix potential read from empty queue in SPM counter --- .../Objects/Drawables/Pieces/SpinnerSpmCounter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerSpmCounter.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerSpmCounter.cs index c079d3343b..ebe978f659 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerSpmCounter.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerSpmCounter.cs @@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces if (records.Count > 0) { var record = records.Peek(); - while (Time.Current - records.Peek().Time > spm_count_duration) + while (records.Count > 0 && Time.Current - records.Peek().Time > spm_count_duration) record = records.Dequeue(); SpinsPerMinute = (currentRotation - record.Rotation) / (Time.Current - record.Time) * 1000 * 60 / 360; } From d9bf465b9c5a99b6c98dd323825461f3ef1c1c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Thu, 12 Oct 2017 11:49:10 +0200 Subject: [PATCH 3/5] Update framework --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 31754e8fd0..f1cda4873e 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 31754e8fd0eb840b6aca03ec481b677665999211 +Subproject commit f1cda4873eabc778afa323483e762491ee47f297 From 4d78a0492c78609bbee85ac78d410b55c8678951 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 12 Oct 2017 19:15:59 +0900 Subject: [PATCH 4/5] Make creatorUsername a property so it is correctly deserialised --- osu.Game/Online/API/Requests/GetBeatmapSetsRequest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Online/API/Requests/GetBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/GetBeatmapSetsRequest.cs index 470e13ea7b..d216b093ee 100644 --- a/osu.Game/Online/API/Requests/GetBeatmapSetsRequest.cs +++ b/osu.Game/Online/API/Requests/GetBeatmapSetsRequest.cs @@ -51,7 +51,7 @@ namespace osu.Game.Online.API.Requests private int onlineId { get; set; } [JsonProperty(@"creator")] - private string creatorUsername; + private string creatorUsername { get; set; } [JsonProperty(@"user_id")] private long creatorId = 1; From 70c55b23f4edecb0351a1e36afde330205a525ec Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 12 Oct 2017 20:30:15 +0900 Subject: [PATCH 5/5] Remove references to CodeAnalysisRulesets Having these produce warnings under certain compile environments. --- osu-framework | 2 +- osu.Game/osu.Game.csproj | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/osu-framework b/osu-framework index f1cda4873e..b43aecdce9 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit f1cda4873eabc778afa323483e762491ee47f297 +Subproject commit b43aecdce95f59912aa0b7211dde3aba1ed9afb1 diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index b7bb7de9e3..f14b441960 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -57,7 +57,6 @@ false AnyCPU true - AllRules.ruleset false false false @@ -77,7 +76,6 @@ false AnyCPU true - AllRules.ruleset false false @@ -103,7 +101,6 @@ false 6 prompt - AllRules.ruleset --tests false