From 705e66c7a13a6509f64a8b3f6f2c9553ee24129b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 18 Apr 2017 22:29:58 +0900 Subject: [PATCH 1/3] Fix spinners becoming wonky. --- osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs index 9ff77a5f3c..4623fe7f22 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs @@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables Position = s.Position; //take up full playfield. - Size = OsuPlayfield.BASE_SIZE; + Size = new Vector2(OsuPlayfield.BASE_SIZE.X); spinner = s; From cef6a014d56a27fe7c4470a6f30ea2c5c29a3da0 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 18 Apr 2017 22:31:52 +0900 Subject: [PATCH 2/3] Add a simulated key-up delay to auto replays. Fixes key counter display looking odd. --- osu.Game.Rulesets.Osu/OsuAutoReplay.cs | 2 +- osu.Game.Rulesets.Taiko/Replays/TaikoAutoReplay.cs | 4 ++-- osu.Game/Rulesets/Replays/Replay.cs | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/osu.Game.Rulesets.Osu/OsuAutoReplay.cs b/osu.Game.Rulesets.Osu/OsuAutoReplay.cs index 6fc005fb6a..d6eab9eb56 100644 --- a/osu.Game.Rulesets.Osu/OsuAutoReplay.cs +++ b/osu.Game.Rulesets.Osu/OsuAutoReplay.cs @@ -213,7 +213,7 @@ namespace osu.Game.Rulesets.Osu ReplayButtonState button = buttonIndex % 2 == 0 ? ReplayButtonState.Left1 : ReplayButtonState.Right1; - double hEndTime = (h as IHasEndTime)?.EndTime ?? h.StartTime; + double hEndTime = ((h as IHasEndTime)?.EndTime ?? h.StartTime) + KEY_UP_DELAY; ReplayFrame newFrame = new ReplayFrame(h.StartTime, targetPosition.X, targetPosition.Y, button); ReplayFrame endFrame = new ReplayFrame(hEndTime + endDelay, h.EndPosition.X, h.EndPosition.Y, ReplayButtonState.None); diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoReplay.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoReplay.cs index b44c789be5..a8187d68ab 100644 --- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoReplay.cs +++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoReplay.cs @@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Taiko.Replays else throw new Exception("Unknown hit object type."); - Frames.Add(new ReplayFrame(endTime + 1, 0, 0, ReplayButtonState.None)); + Frames.Add(new ReplayFrame(endTime + KEY_UP_DELAY, 0, 0, ReplayButtonState.None)); if (i < beatmap.HitObjects.Count - 1) { @@ -113,4 +113,4 @@ namespace osu.Game.Rulesets.Taiko.Replays } } } -} \ No newline at end of file +} diff --git a/osu.Game/Rulesets/Replays/Replay.cs b/osu.Game/Rulesets/Replays/Replay.cs index 8e9d7cdaad..c903c2f56d 100644 --- a/osu.Game/Rulesets/Replays/Replay.cs +++ b/osu.Game/Rulesets/Replays/Replay.cs @@ -7,6 +7,8 @@ namespace osu.Game.Rulesets.Replays { public class Replay { + protected const double KEY_UP_DELAY = 50; + public List Frames = new List(); } -} \ No newline at end of file +} From 3eca32a380359737561d99e69add6c64b38c3410 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 19 Apr 2017 01:37:30 +0900 Subject: [PATCH 3/3] mono now uses msbuild. --- .vscode/tasks.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 03f5bc4c6c..433e5fd2a9 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -8,10 +8,7 @@ "taskName": "build", "isShellCommand": true, "showOutput": "silent", - "command": "xbuild", - "windows": { - "command": "msbuild" - }, + "command": "msbuild", "args": [ // Ask msbuild to generate full paths for file names. "/property:GenerateFullPaths=true"