From 96a5d7032dcfc78477c57c48755dfbed45cc2366 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 21 Apr 2017 22:37:55 +0900 Subject: [PATCH 01/10] Fix regression causing menu cursor to stick to screen edges. --- osu.Game/OsuGameBase.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs index 6eb9747eef..c9d7d856db 100644 --- a/osu.Game/OsuGameBase.cs +++ b/osu.Game/OsuGameBase.cs @@ -149,6 +149,7 @@ namespace osu.Game { new Container { + AlwaysReceiveInput = true, RelativeSizeAxes = Axes.Both, Depth = float.MinValue, Children = new Drawable[] From 2d914002394352b201c91afff40121bd579332ad Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Sat, 22 Apr 2017 15:35:57 +0900 Subject: [PATCH 02/10] Fix nullref due to framework change. --- .../Options/Sections/Graphics/LayoutOptions.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs b/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs index b04f853ec4..9f5e3458f3 100644 --- a/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs +++ b/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs @@ -12,8 +12,8 @@ namespace osu.Game.Overlays.Options.Sections.Graphics { protected override string Header => "Layout"; - private OptionSlider letterboxPositionX; - private OptionSlider letterboxPositionY; + private OptionSlider letterboxPositionX; + private OptionSlider letterboxPositionY; private Bindable letterboxing; @@ -35,15 +35,15 @@ namespace osu.Game.Overlays.Options.Sections.Graphics LabelText = "Letterboxing", Bindable = letterboxing, }, - letterboxPositionX = new OptionSlider + letterboxPositionX = new OptionSlider { LabelText = "Horizontal position", - Bindable = (BindableInt)config.GetBindable(FrameworkConfig.LetterboxPositionX) + Bindable = config.GetBindable(FrameworkConfig.LetterboxPositionX) }, - letterboxPositionY = new OptionSlider + letterboxPositionY = new OptionSlider { LabelText = "Vertical position", - Bindable = (BindableInt)config.GetBindable(FrameworkConfig.LetterboxPositionY) + Bindable = config.GetBindable(FrameworkConfig.LetterboxPositionY) }, }; From 307dc3e2e11150d55e59fb6a0ec7b662e3655956 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Sat, 22 Apr 2017 15:36:40 +0900 Subject: [PATCH 03/10] Make VSCode use CLR on Windows platform. --- .vscode/launch.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.vscode/launch.json b/.vscode/launch.json index c836ff97bc..876f960836 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -3,6 +3,9 @@ "configurations": [ { "name": "Launch VisualTests", + "windows": { + "type": "clr" + }, "type": "mono", "request": "launch", "program": "${workspaceRoot}/osu.Desktop.VisualTests/bin/Debug/osu!.exe", @@ -15,6 +18,9 @@ }, { "name": "Launch Desktop", + "windows": { + "type": "clr" + }, "type": "mono", "request": "launch", "program": "${workspaceRoot}/osu.Desktop/bin/Debug/osu!.exe", From 8dd77819252f735172cb4da9bf758e406ca064e5 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Sat, 22 Apr 2017 16:18:00 +0900 Subject: [PATCH 04/10] Add clr-specific attach request. --- .vscode/launch.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.vscode/launch.json b/.vscode/launch.json index 876f960836..0e07b0a067 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -33,6 +33,11 @@ }, { "name": "Attach", + "windows": { + "type": "clr", + "request": "attach", + "processName": "osu!" + }, "type": "mono", "request": "attach", "address": "localhost", From 0b67cf0e91e3724d7cb5334b7b793371e6362e2b Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Sat, 22 Apr 2017 16:30:21 +0900 Subject: [PATCH 05/10] Bring framework up to date. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index b4e1b9a0eb..d0f7f3a97c 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit b4e1b9a0eb1782ab8cfc48e305fd295a25c0579e +Subproject commit d0f7f3a97c11650b2b599a96cd55a446422ac94f From c108a7b48edcae12f4ffedc22cec5323f705bb56 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Sat, 22 Apr 2017 16:59:15 +0900 Subject: [PATCH 06/10] Generate portable PDBs + add rebuild task. --- .vscode/tasks.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 433e5fd2a9..6918afa620 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -11,7 +11,23 @@ "command": "msbuild", "args": [ // Ask msbuild to generate full paths for file names. - "/property:GenerateFullPaths=true" + "/property:GenerateFullPaths=true", + "/property:DebugType=portable" + ], + // Use the standard MS compiler pattern to detect errors, warnings and infos + "problemMatcher": "$msCompile", + "isBuildCommand": true + }, + { + "taskName": "rebuild", + "isShellCommand": true, + "showOutput": "silent", + "command": "msbuild", + "args": [ + // Ask msbuild to generate full paths for file names. + "/property:GenerateFullPaths=true", + "/property:DebugType=portable", + "/target:Clean,Build" ], // Use the standard MS compiler pattern to detect errors, warnings and infos "problemMatcher": "$msCompile", From 35cf4af9e72176f93fc5470cc6692ebcd05ac4c1 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 22 Apr 2017 23:17:59 +0900 Subject: [PATCH 07/10] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index d0f7f3a97c..9204b83850 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit d0f7f3a97c11650b2b599a96cd55a446422ac94f +Subproject commit 9204b838504a51ffe7577c103b91270a2687bfb8 From 1d254f4a56d3de34966793619a0fecdff517dbe9 Mon Sep 17 00:00:00 2001 From: ColdVolcano Date: Sun, 23 Apr 2017 00:13:58 -0500 Subject: [PATCH 08/10] Take MusicController back to life --- osu.Game/Beatmaps/WorkingBeatmap.cs | 4 ++-- osu.Game/Overlays/MusicController.cs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs index e9271492e4..6270e780ce 100644 --- a/osu.Game/Beatmaps/WorkingBeatmap.cs +++ b/osu.Game/Beatmaps/WorkingBeatmap.cs @@ -18,7 +18,7 @@ namespace osu.Game.Beatmaps public readonly BeatmapSetInfo BeatmapSetInfo; - public readonly Bindable> Mods = new Bindable>(); + public readonly Bindable> Mods = new Bindable>(new Mod[] { }); public readonly bool WithStoryboard; @@ -27,7 +27,7 @@ namespace osu.Game.Beatmaps BeatmapInfo = beatmapInfo; BeatmapSetInfo = beatmapSetInfo; WithStoryboard = withStoryboard; - + Mods.ValueChanged += mods => applyRateAdjustments(); } diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index 9d21a0341c..399c352ee3 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/osu.Game/Overlays/MusicController.cs @@ -22,6 +22,7 @@ using osu.Game.Database; using osu.Game.Graphics; using osu.Framework.Graphics.Primitives; using osu.Game.Graphics.Sprites; +using osu.Framework.Extensions; using osu.Framework.Extensions.Color4Extensions; namespace osu.Game.Overlays @@ -293,7 +294,7 @@ namespace osu.Game.Overlays trackManager.SetExclusive(current.Track); current.Track.Start(); beatmapSource.Value = current; - }); + }).ContinueWith(task => Schedule(() => task.ThrowIfFaulted())); updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev); } From 4b69477531afd5b4ed0f589323e0bfe44d3a021d Mon Sep 17 00:00:00 2001 From: ColdVolcano Date: Sun, 23 Apr 2017 00:41:15 -0500 Subject: [PATCH 09/10] Trim whitespace --- osu.Game/Beatmaps/WorkingBeatmap.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs index 6270e780ce..616128dab5 100644 --- a/osu.Game/Beatmaps/WorkingBeatmap.cs +++ b/osu.Game/Beatmaps/WorkingBeatmap.cs @@ -27,7 +27,7 @@ namespace osu.Game.Beatmaps BeatmapInfo = beatmapInfo; BeatmapSetInfo = beatmapSetInfo; WithStoryboard = withStoryboard; - + Mods.ValueChanged += mods => applyRateAdjustments(); } From 6a05440e6caba16584b4226273dfbbe8c35f8006 Mon Sep 17 00:00:00 2001 From: ColdVolcano Date: Sun, 23 Apr 2017 00:53:21 -0500 Subject: [PATCH 10/10] Only schedule when faulted --- osu.Game/Overlays/MusicController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index 399c352ee3..19e742facb 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/osu.Game/Overlays/MusicController.cs @@ -294,7 +294,7 @@ namespace osu.Game.Overlays trackManager.SetExclusive(current.Track); current.Track.Start(); beatmapSource.Value = current; - }).ContinueWith(task => Schedule(() => task.ThrowIfFaulted())); + }).ContinueWith(task => Schedule(() => task.ThrowIfFaulted()), TaskContinuationOptions.OnlyOnFaulted); updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev); }