diff --git a/osu-framework b/osu-framework index a50dd75b11..4834d27107 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit a50dd75b114da963c75e6a5314099d99140035b8 +Subproject commit 4834d27107198b9dc2f0e073be484cf0b92e0416 diff --git a/osu-resources b/osu-resources index 39657fc606..4f9ed4e703 160000 --- a/osu-resources +++ b/osu-resources @@ -1 +1 @@ -Subproject commit 39657fc6066ea3a141ac71cabf67ec9ebf24975c +Subproject commit 4f9ed4e703777ede98737c7e2af31efa4694c395 diff --git a/osu.Desktop.Deploy/App.config b/osu.Desktop.Deploy/App.config index bd464a0453..d1da144f50 100644 --- a/osu.Desktop.Deploy/App.config +++ b/osu.Desktop.Deploy/App.config @@ -21,16 +21,4 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Desktop.Deploy/Program.cs b/osu.Desktop.Deploy/Program.cs index 7141b6d52f..00ec215e8a 100644 --- a/osu.Desktop.Deploy/Program.cs +++ b/osu.Desktop.Deploy/Program.cs @@ -198,7 +198,7 @@ namespace osu.Desktop.Deploy write($"- Creating release {version}...", ConsoleColor.Yellow); var req = new JsonWebRequest($"{GitHubApiEndpoint}") { - Method = HttpMethod.POST + Method = HttpMethod.POST, }; req.AddRaw(JsonConvert.SerializeObject(new GitHubRelease { @@ -215,6 +215,7 @@ namespace osu.Desktop.Deploy var upload = new WebRequest(assetUploadUrl, Path.GetFileName(a)) { Method = HttpMethod.POST, + Timeout = 240000, ContentType = "application/octet-stream", }; @@ -261,7 +262,7 @@ namespace osu.Desktop.Deploy if (!File.Exists(Path.Combine(ReleasesFolder, nupkgDistroFilename(lastRelease.Name)))) { - write("Last verion's package not found locally.", ConsoleColor.Red); + write("Last version's package not found locally.", ConsoleColor.Red); requireDownload = true; } else @@ -282,6 +283,8 @@ namespace osu.Desktop.Deploy foreach (var a in assets) { + if (a.Name.EndsWith(".exe")) continue; + write($"- Downloading {a.Name}...", ConsoleColor.Yellow); new FileWebRequest(Path.Combine(ReleasesFolder, a.Name), $"{GitHubApiEndpoint}/assets/{a.Id}").AuthenticatedBlockingPerform(); } @@ -337,6 +340,7 @@ namespace osu.Desktop.Deploy WorkingDirectory = solutionPath, CreateNoWindow = true, RedirectStandardOutput = true, + RedirectStandardError = true, UseShellExecute = false, WindowStyle = ProcessWindowStyle.Hidden }; @@ -345,6 +349,7 @@ namespace osu.Desktop.Deploy if (p == null) return false; string output = p.StandardOutput.ReadToEnd(); + output += p.StandardError.ReadToEnd(); if (p.ExitCode == 0) return true; diff --git a/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj b/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj index 6bed6bb049..7a3719a25b 100644 --- a/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj +++ b/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj @@ -104,7 +104,9 @@ osu.licenseheader - + + PreserveNewest + diff --git a/osu.Desktop.Tests/app.config b/osu.Desktop.Tests/app.config deleted file mode 100644 index 855da39b10..0000000000 --- a/osu.Desktop.Tests/app.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Desktop.Tests/osu.Desktop.Tests.csproj b/osu.Desktop.Tests/osu.Desktop.Tests.csproj index 07495311e0..e89308bbb9 100644 --- a/osu.Desktop.Tests/osu.Desktop.Tests.csproj +++ b/osu.Desktop.Tests/osu.Desktop.Tests.csproj @@ -100,7 +100,6 @@ osu.licenseheader - diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs index ede430478e..767fb0dffb 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs @@ -8,6 +8,8 @@ using osu.Framework.MathUtils; using osu.Framework.Screens.Testing; using osu.Framework.Timing; using osu.Game.Beatmaps; +using osu.Game.Beatmaps.IO; +using osu.Game.Database; using osu.Game.Modes.Catch.UI; using osu.Game.Modes.Mania.UI; using osu.Game.Modes.Objects; @@ -41,10 +43,19 @@ namespace osu.Desktop.VisualTests.Tests time += RNG.Next(50, 500); } - Beatmap beatmap = new Beatmap + WorkingBeatmap beatmap = new TestWorkingBeatmap(new Beatmap { - HitObjects = objects - }; + HitObjects = objects, + BeatmapInfo = new BeatmapInfo + { + Metadata = new BeatmapMetadata + { + Artist = @"Unknown", + Title = @"Sample Beatmap", + Author = @"peppy", + } + } + }); Add(new Drawable[] { @@ -83,5 +94,16 @@ namespace osu.Desktop.VisualTests.Tests } }); } + + private class TestWorkingBeatmap : WorkingBeatmap + { + public TestWorkingBeatmap(Beatmap beatmap) + : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet) + { + Beatmap = beatmap; + } + + protected override ArchiveReader GetReader() => null; + } } } diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs index 0b876ed171..ee58d934a4 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs @@ -110,7 +110,7 @@ namespace osu.Desktop.VisualTests.Tests Beatmap = beatmap; } - protected override BeatmapArchiveReader GetReader() => null; + protected override ArchiveReader GetReader() => null; } } } diff --git a/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs b/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs index f39da70a16..c36fc0a47d 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs @@ -1,12 +1,13 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.IO; using osu.Framework.Input.Handlers; using osu.Game.Beatmaps; -using osu.Game.Modes; +using osu.Game.Modes.Mods; +using osu.Game.Modes.Osu.Mods; using osu.Game.Screens.Play; +using System; +using System.IO; namespace osu.Desktop.VisualTests.Tests { @@ -22,9 +23,9 @@ namespace osu.Desktop.VisualTests.Tests protected override Player CreatePlayer(WorkingBeatmap beatmap) { - var player = base.CreatePlayer(beatmap); - player.ReplayInputHandler = Ruleset.GetRuleset(beatmap.PlayMode).CreateAutoplayScore(beatmap.Beatmap)?.Replay?.GetInputHandler(); - return player; + beatmap.Mods.Value = new Mod[] { new OsuModAutoplay() }; + + return base.CreatePlayer(beatmap); } } } diff --git a/osu.Desktop.VisualTests/app.config b/osu.Desktop.VisualTests/app.config deleted file mode 100644 index 855da39b10..0000000000 --- a/osu.Desktop.VisualTests/app.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj index 822f7c7a89..8a2ea5906b 100644 --- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj +++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj @@ -23,6 +23,7 @@ false LocalIntranet v4.5 + true publish\ true Disk @@ -114,7 +115,6 @@ osu.licenseheader - diff --git a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs index 19aa9ca4a6..0ef448cafe 100644 --- a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs +++ b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs @@ -13,7 +13,7 @@ namespace osu.Desktop.Beatmaps.IO /// /// Reads an extracted legacy beatmap from disk. /// - public class LegacyFilesystemReader : BeatmapArchiveReader + public class LegacyFilesystemReader : ArchiveReader { public static void Register() => AddReader((storage, path) => Directory.Exists(path)); diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs index a09f9860cb..27f58c27e1 100644 --- a/osu.Desktop/OsuGameDesktop.cs +++ b/osu.Desktop/OsuGameDesktop.cs @@ -12,7 +12,6 @@ using System.Drawing; using System.IO; using System.Threading.Tasks; using osu.Game.Screens.Menu; -using osu.Game.Beatmaps.IO; namespace osu.Desktop { @@ -31,9 +30,9 @@ namespace osu.Desktop base.LoadComplete(); versionManager.LoadAsync(this); - ModeChanged += m => + ScreenChanged += s => { - if (!versionManager.IsAlive && m is Intro) + if (!versionManager.IsAlive && s is Intro) Add(versionManager); }; } @@ -58,7 +57,7 @@ namespace osu.Desktop var dropData = (object[])e.Data.GetData(DataFormats.FileDrop); var filePaths = dropData.Select(f => f.ToString()).ToArray(); - if (filePaths.All(f => Path.GetExtension(f) == BeatmapArchiveReader.OSZ_EXTENSION)) + if (filePaths.All(f => Path.GetExtension(f) == @".osz")) Task.Run(() => BeatmapDatabase.Import(filePaths)); else if (filePaths.All(f => Path.GetExtension(f) == @".osr")) Task.Run(() => @@ -68,7 +67,7 @@ namespace osu.Desktop }); } - private static readonly string[] allowed_extensions = { BeatmapArchiveReader.OSZ_EXTENSION, @".osr" }; + private static readonly string[] allowed_extensions = { @".osz", @".osr" }; private void dragEnter(DragEventArgs e) { diff --git a/osu.Desktop/app.config b/osu.Desktop/app.config deleted file mode 100644 index 1ff0a7f133..0000000000 --- a/osu.Desktop/app.config +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj index 7e85f09d8c..48e0db1d99 100644 --- a/osu.Desktop/osu.Desktop.csproj +++ b/osu.Desktop/osu.Desktop.csproj @@ -23,6 +23,7 @@ false LocalIntranet v4.5 + true publish\ true Disk @@ -153,7 +154,6 @@ osu.licenseheader - diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs index 08edeb7bcb..ecef1ea42c 100644 --- a/osu.Game.Modes.Catch/CatchRuleset.cs +++ b/osu.Game.Modes.Catch/CatchRuleset.cs @@ -4,7 +4,9 @@ using OpenTK.Input; using osu.Game.Beatmaps; using osu.Game.Graphics; +using osu.Game.Modes.Catch.Mods; using osu.Game.Modes.Catch.UI; +using osu.Game.Modes.Mods; using osu.Game.Modes.Objects; using osu.Game.Modes.UI; using osu.Game.Screens.Play; @@ -14,7 +16,7 @@ namespace osu.Game.Modes.Catch { public class CatchRuleset : Ruleset { - public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new CatchHitRenderer(beatmap); + public override HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap) => new CatchHitRenderer(beatmap); public override IEnumerable GetModsFor(ModType type) { diff --git a/osu.Game.Modes.Catch/CatchMod.cs b/osu.Game.Modes.Catch/Mods/CatchMod.cs similarity index 91% rename from osu.Game.Modes.Catch/CatchMod.cs rename to osu.Game.Modes.Catch/Mods/CatchMod.cs index 07d6d3469e..97e4e58a5d 100644 --- a/osu.Game.Modes.Catch/CatchMod.cs +++ b/osu.Game.Modes.Catch/Mods/CatchMod.cs @@ -1,7 +1,9 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Modes.Catch +using osu.Game.Modes.Mods; + +namespace osu.Game.Modes.Catch.Mods { public class CatchModNoFail : ModNoFail { diff --git a/osu.Game.Modes.Catch/Objects/CatchConverter.cs b/osu.Game.Modes.Catch/Objects/CatchConverter.cs deleted file mode 100644 index 31ddc73f61..0000000000 --- a/osu.Game.Modes.Catch/Objects/CatchConverter.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) 2007-2017 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using System.Collections.Generic; -using osu.Game.Modes.Objects; -using osu.Game.Modes.Osu.Objects; -using osu.Game.Beatmaps; - -namespace osu.Game.Modes.Catch.Objects -{ - internal class CatchConverter : HitObjectConverter - { - public override List Convert(Beatmap beatmap) - { - List output = new List(); - - foreach (HitObject i in beatmap.HitObjects) - { - CatchBaseHit h = i as CatchBaseHit; - - if (h == null) - { - OsuHitObject o = i as OsuHitObject; - - if (o == null) throw new HitObjectConvertException(@"Catch", i); - - h = new Fruit - { - StartTime = o.StartTime, - Position = o.Position.X, - }; - } - - output.Add(h); - } - - return output; - } - } -} diff --git a/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs index 1537227d8f..a8b2d48760 100644 --- a/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs +++ b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs @@ -11,7 +11,7 @@ namespace osu.Game.Modes.Catch.UI { public class CatchHitRenderer : HitRenderer { - public CatchHitRenderer(Beatmap beatmap) + public CatchHitRenderer(WorkingBeatmap beatmap) : base(beatmap) { } diff --git a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj index 10abb312fc..4908bcd0d0 100644 --- a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj +++ b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj @@ -50,7 +50,6 @@ - @@ -58,7 +57,7 @@ - + diff --git a/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs index 0f42da4ac8..3ff210c1cc 100644 --- a/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs +++ b/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs @@ -1,7 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - using osu.Game.Beatmaps; using osu.Game.Modes.Mania.Objects; using System.Collections.Generic; diff --git a/osu.Game.Modes.Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs index e6e9cfd799..e1e954fb45 100644 --- a/osu.Game.Modes.Mania/ManiaRuleset.cs +++ b/osu.Game.Modes.Mania/ManiaRuleset.cs @@ -3,7 +3,9 @@ using osu.Game.Beatmaps; using osu.Game.Graphics; +using osu.Game.Modes.Mania.Mods; using osu.Game.Modes.Mania.UI; +using osu.Game.Modes.Mods; using osu.Game.Modes.Objects; using osu.Game.Modes.UI; using osu.Game.Screens.Play; @@ -13,7 +15,7 @@ namespace osu.Game.Modes.Mania { public class ManiaRuleset : Ruleset { - public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new ManiaHitRenderer(beatmap); + public override HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap) => new ManiaHitRenderer(beatmap); public override IEnumerable GetModsFor(ModType type) { diff --git a/osu.Game.Modes.Mania/ManiaMod.cs b/osu.Game.Modes.Mania/Mods/ManiaMod.cs similarity index 94% rename from osu.Game.Modes.Mania/ManiaMod.cs rename to osu.Game.Modes.Mania/Mods/ManiaMod.cs index d52db2977c..b330680550 100644 --- a/osu.Game.Modes.Mania/ManiaMod.cs +++ b/osu.Game.Modes.Mania/Mods/ManiaMod.cs @@ -1,10 +1,11 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using osu.Game.Graphics; +using osu.Game.Modes.Mods; +using System; -namespace osu.Game.Modes.Mania +namespace osu.Game.Modes.Mania.Mods { public class ManiaModNoFail : ModNoFail { diff --git a/osu.Game.Modes.Mania/Objects/ManiaConverter.cs b/osu.Game.Modes.Mania/Objects/ManiaConverter.cs deleted file mode 100644 index 7e1183c0e3..0000000000 --- a/osu.Game.Modes.Mania/Objects/ManiaConverter.cs +++ /dev/null @@ -1,48 +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 System.Collections.Generic; -using osu.Game.Modes.Objects; -using osu.Game.Modes.Osu.Objects; -using osu.Game.Beatmaps; - -namespace osu.Game.Modes.Mania.Objects -{ - internal class ManiaConverter : HitObjectConverter - { - private readonly int columns; - - public ManiaConverter(int columns) - { - this.columns = columns; - } - - public override List Convert(Beatmap beatmap) - { - List output = new List(); - - foreach (HitObject i in beatmap.HitObjects) - { - ManiaBaseHit h = i as ManiaBaseHit; - - if (h == null) - { - OsuHitObject o = i as OsuHitObject; - - if (o == null) throw new HitObjectConvertException(@"Mania", i); - - h = new Note - { - StartTime = o.StartTime, - Column = (int)Math.Round(o.Position.X / 512 * columns) - }; - } - - output.Add(h); - } - - return output; - } - } -} diff --git a/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs index 911742b222..d29a088225 100644 --- a/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs +++ b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs @@ -13,7 +13,7 @@ namespace osu.Game.Modes.Mania.UI { private readonly int columns; - public ManiaHitRenderer(Beatmap beatmap, int columns = 5) + public ManiaHitRenderer(WorkingBeatmap beatmap, int columns = 5) : base(beatmap) { this.columns = columns; diff --git a/osu.Game.Modes.Mania/app.config b/osu.Game.Modes.Mania/app.config deleted file mode 100644 index 855da39b10..0000000000 --- a/osu.Game.Modes.Mania/app.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj index 66e46f9e48..48f8d23a07 100644 --- a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj +++ b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj @@ -52,13 +52,12 @@ - - + @@ -82,7 +81,6 @@ osu.licenseheader - diff --git a/osu.Game.Modes.Osu/OsuMod.cs b/osu.Game.Modes.Osu/Mods/OsuMod.cs similarity index 88% rename from osu.Game.Modes.Osu/OsuMod.cs rename to osu.Game.Modes.Osu/Mods/OsuMod.cs index 3290eed61a..e80975aed1 100644 --- a/osu.Game.Modes.Osu/OsuMod.cs +++ b/osu.Game.Modes.Osu/Mods/OsuMod.cs @@ -1,11 +1,14 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using osu.Game.Beatmaps; +using osu.Game.Graphics; +using osu.Game.Modes.Mods; +using osu.Game.Modes.Osu.Objects; using System; using System.Linq; -using osu.Game.Graphics; -namespace osu.Game.Modes.Osu +namespace osu.Game.Modes.Osu.Mods { public class OsuModNoFail : ModNoFail { @@ -85,9 +88,14 @@ namespace osu.Game.Modes.Osu public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail), typeof(ModAutoplay) }; } - public class OsuModAutoplay : ModAutoplay + public class OsuModAutoplay : ModAutoplay { public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray(); + + protected override Score CreateReplayScore(Beatmap beatmap) => new Score + { + Replay = new OsuAutoReplay(beatmap) + }; } public class OsuModTarget : Mod diff --git a/osu.Game.Modes.Osu/OsuAutoReplay.cs b/osu.Game.Modes.Osu/OsuAutoReplay.cs index 953f131797..3de6106030 100644 --- a/osu.Game.Modes.Osu/OsuAutoReplay.cs +++ b/osu.Game.Modes.Osu/OsuAutoReplay.cs @@ -1,14 +1,14 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System.Collections.Generic; +using OpenTK; +using osu.Framework.Graphics.Transforms; +using osu.Framework.MathUtils; using osu.Game.Beatmaps; using osu.Game.Modes.Osu.Objects; -using OpenTK; -using System; -using osu.Framework.Graphics.Transforms; using osu.Game.Modes.Osu.Objects.Drawables; -using osu.Framework.MathUtils; +using System; +using System.Collections.Generic; using System.Diagnostics; namespace osu.Game.Modes.Osu @@ -19,9 +19,9 @@ namespace osu.Game.Modes.Osu private const float spin_radius = 50; - private Beatmap beatmap; + private Beatmap beatmap; - public OsuAutoReplay(Beatmap beatmap) + public OsuAutoReplay(Beatmap beatmap) { this.beatmap = beatmap; @@ -86,7 +86,7 @@ namespace osu.Game.Modes.Osu for (int i = 0; i < beatmap.HitObjects.Count; i++) { - OsuHitObject h = (OsuHitObject)beatmap.HitObjects[i]; + OsuHitObject h = beatmap.HitObjects[i]; //if (h.EndTime < InputManager.ReplayStartTime) //{ @@ -98,7 +98,7 @@ namespace osu.Game.Modes.Osu if (DelayedMovements && i > 0) { - OsuHitObject last = (OsuHitObject)beatmap.HitObjects[i - 1]; + OsuHitObject last = beatmap.HitObjects[i - 1]; //Make the cursor stay at a hitObject as long as possible (mainly for autopilot). if (h.StartTime - h.HitWindowFor(OsuScoreResult.Miss) > last.EndTime + h.HitWindowFor(OsuScoreResult.Hit50) + 50) diff --git a/osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs b/osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs new file mode 100644 index 0000000000..986240b37f --- /dev/null +++ b/osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs @@ -0,0 +1,56 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using System.Linq; +using osu.Framework.Allocation; +using osu.Framework.Configuration; +using osu.Framework.Input; +using osu.Game.Configuration; +using osu.Game.Screens.Play; +using OpenTK.Input; +using KeyboardState = osu.Framework.Input.KeyboardState; +using MouseState = osu.Framework.Input.MouseState; + +namespace osu.Game.Modes.Osu +{ + public class OsuKeyConversionInputManager : KeyConversionInputManager + { + private bool leftViaKeyboard; + private bool rightViaKeyboard; + private Bindable mouseDisabled; + + [BackgroundDependencyLoader] + private void load(OsuConfigManager config) + { + mouseDisabled = config.GetBindable(OsuConfig.MouseDisableButtons); + } + + protected override void TransformState(InputState state) + { + base.TransformState(state); + + var mouse = state.Mouse as MouseState; + var keyboard = state.Keyboard as KeyboardState; + + if (keyboard != null) + { + leftViaKeyboard = keyboard.Keys.Contains(Key.Z); + rightViaKeyboard = keyboard.Keys.Contains(Key.X); + } + + if (mouse != null) + { + if (mouseDisabled.Value) + { + mouse.PressedButtons.Remove(MouseButton.Left); + mouse.PressedButtons.Remove(MouseButton.Right); + } + + if (leftViaKeyboard) + mouse.PressedButtons.Add(MouseButton.Left); + if (rightViaKeyboard) + mouse.PressedButtons.Add(MouseButton.Right); + } + } + } +} diff --git a/osu.Game.Modes.Osu/OsuRuleset.cs b/osu.Game.Modes.Osu/OsuRuleset.cs index 0c46ece6da..a5b0b62bbd 100644 --- a/osu.Game.Modes.Osu/OsuRuleset.cs +++ b/osu.Game.Modes.Osu/OsuRuleset.cs @@ -4,7 +4,9 @@ using OpenTK.Input; using osu.Game.Beatmaps; using osu.Game.Graphics; +using osu.Game.Modes.Mods; using osu.Game.Modes.Objects; +using osu.Game.Modes.Osu.Mods; using osu.Game.Modes.Osu.Objects; using osu.Game.Modes.Osu.UI; using osu.Game.Modes.UI; @@ -16,7 +18,7 @@ namespace osu.Game.Modes.Osu { public class OsuRuleset : Ruleset { - public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new OsuHitRenderer(beatmap); + public override HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap) => new OsuHitRenderer(beatmap); public override IEnumerable GetBeatmapStatistics(WorkingBeatmap beatmap) => new[] { @@ -100,13 +102,6 @@ namespace osu.Game.Modes.Osu public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new OsuDifficultyCalculator(beatmap); - public override Score CreateAutoplayScore(Beatmap beatmap) - { - var score = CreateScoreProcessor().GetScore(); - score.Replay = new OsuAutoReplay(beatmap); - return score; - } - protected override PlayMode PlayMode => PlayMode.Osu; public override string Description => "osu!"; diff --git a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs index 8b7606e61e..51433df4af 100644 --- a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs +++ b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs @@ -7,12 +7,13 @@ using osu.Game.Modes.Osu.Beatmaps; using osu.Game.Modes.Osu.Objects; using osu.Game.Modes.Osu.Objects.Drawables; using osu.Game.Modes.UI; +using osu.Game.Screens.Play; namespace osu.Game.Modes.Osu.UI { public class OsuHitRenderer : HitRenderer { - public OsuHitRenderer(Beatmap beatmap) + public OsuHitRenderer(WorkingBeatmap beatmap) : base(beatmap) { } @@ -21,6 +22,8 @@ namespace osu.Game.Modes.Osu.UI protected override Playfield CreatePlayfield() => new OsuPlayfield(); + protected override KeyConversionInputManager CreateKeyConversionInputManager() => new OsuKeyConversionInputManager(); + protected override DrawableHitObject GetVisualRepresentation(OsuHitObject h) { var circle = h as HitCircle; diff --git a/osu.Game.Modes.Osu/app.config b/osu.Game.Modes.Osu/app.config deleted file mode 100644 index 88af66254d..0000000000 --- a/osu.Game.Modes.Osu/app.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - diff --git a/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj index c214c881d8..f2c6efd8bd 100644 --- a/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj +++ b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj @@ -73,6 +73,7 @@ + @@ -84,7 +85,7 @@ - + @@ -100,7 +101,6 @@ osu.licenseheader - diff --git a/osu.Game.Modes.Taiko/TaikoMod.cs b/osu.Game.Modes.Taiko/Mods/TaikoMod.cs similarity index 91% rename from osu.Game.Modes.Taiko/TaikoMod.cs rename to osu.Game.Modes.Taiko/Mods/TaikoMod.cs index 62db875991..c929ebffdd 100644 --- a/osu.Game.Modes.Taiko/TaikoMod.cs +++ b/osu.Game.Modes.Taiko/Mods/TaikoMod.cs @@ -1,7 +1,9 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Modes.Taiko +using osu.Game.Modes.Mods; + +namespace osu.Game.Modes.Taiko.Mods { public class TaikoModNoFail : ModNoFail { diff --git a/osu.Game.Modes.Taiko/Objects/TaikoConverter.cs b/osu.Game.Modes.Taiko/Objects/TaikoConverter.cs deleted file mode 100644 index 3a0e07e390..0000000000 --- a/osu.Game.Modes.Taiko/Objects/TaikoConverter.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) 2007-2017 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using System.Collections.Generic; -using osu.Game.Modes.Objects; -using osu.Game.Modes.Osu.Objects; -using osu.Game.Beatmaps; - -namespace osu.Game.Modes.Taiko.Objects -{ - internal class TaikoConverter : HitObjectConverter - { - public override List Convert(Beatmap beatmap) - { - List output = new List(); - - foreach (HitObject i in beatmap.HitObjects) - { - TaikoBaseHit h = i as TaikoBaseHit; - - if (h == null) - { - OsuHitObject o = i as OsuHitObject; - - if (o == null) throw new HitObjectConvertException(@"Taiko", i); - - h = new TaikoBaseHit - { - StartTime = o.StartTime, - }; - } - - output.Add(h); - } - - return output; - } - } -} diff --git a/osu.Game.Modes.Taiko/TaikoRuleset.cs b/osu.Game.Modes.Taiko/TaikoRuleset.cs index 418519d90c..a1c9015b78 100644 --- a/osu.Game.Modes.Taiko/TaikoRuleset.cs +++ b/osu.Game.Modes.Taiko/TaikoRuleset.cs @@ -4,7 +4,9 @@ using OpenTK.Input; using osu.Game.Beatmaps; using osu.Game.Graphics; +using osu.Game.Modes.Mods; using osu.Game.Modes.Objects; +using osu.Game.Modes.Taiko.Mods; using osu.Game.Modes.Taiko.UI; using osu.Game.Modes.UI; using osu.Game.Screens.Play; @@ -14,7 +16,7 @@ namespace osu.Game.Modes.Taiko { public class TaikoRuleset : Ruleset { - public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new TaikoHitRenderer(beatmap); + public override HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap) => new TaikoHitRenderer(beatmap); public override IEnumerable GetModsFor(ModType type) { diff --git a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs index dc0276aacc..fb5e38d4dc 100644 --- a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs +++ b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs @@ -11,7 +11,7 @@ namespace osu.Game.Modes.Taiko.UI { public class TaikoHitRenderer : HitRenderer { - public TaikoHitRenderer(Beatmap beatmap) + public TaikoHitRenderer(WorkingBeatmap beatmap) : base(beatmap) { } diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj index 0089e84532..7d6bcf4853 100644 --- a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj +++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj @@ -51,12 +51,11 @@ - - + diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs index a6ab6a989b..ae936f3f49 100644 --- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs @@ -17,7 +17,6 @@ using osu.Game.Modes.Catch; using osu.Game.Modes.Mania; using osu.Game.Modes.Osu; using osu.Game.Modes.Taiko; -using osu.Game.Beatmaps.IO; namespace osu.Game.Tests.Beatmaps.IO { @@ -107,7 +106,7 @@ namespace osu.Game.Tests.Beatmaps.IO private string prepareTempCopy(string path) { - var temp = Path.GetTempPath() + Guid.NewGuid() + BeatmapArchiveReader.OSZ_EXTENSION; + var temp = Path.GetTempFileName(); return new FileInfo(path).CopyTo(temp, true).FullName; } diff --git a/osu.Game.Tests/app.config b/osu.Game.Tests/app.config deleted file mode 100644 index 855da39b10..0000000000 --- a/osu.Game.Tests/app.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj index 96682dd1ce..d01aa77e02 100644 --- a/osu.Game.Tests/osu.Game.Tests.csproj +++ b/osu.Game.Tests/osu.Game.Tests.csproj @@ -52,7 +52,6 @@ osu.licenseheader - diff --git a/osu.Game/IO/ArchiveReader.cs b/osu.Game/Beatmaps/IO/ArchiveReader.cs similarity index 65% rename from osu.Game/IO/ArchiveReader.cs rename to osu.Game/Beatmaps/IO/ArchiveReader.cs index 8eaecdeabc..bbf4de20f5 100644 --- a/osu.Game/IO/ArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/ArchiveReader.cs @@ -6,22 +6,23 @@ using System.Collections.Generic; using System.IO; using osu.Framework.IO.Stores; using osu.Framework.Platform; +using osu.Game.Database; -namespace osu.Game.IO +namespace osu.Game.Beatmaps.IO { public abstract class ArchiveReader : IDisposable, IResourceStore { - protected class Reader + private class Reader { public Func Test { get; set; } public Type Type { get; set; } } - protected static List Readers { get; } = new List(); + private static List readers { get; } = new List(); public static ArchiveReader GetReader(Storage storage, string path) { - foreach (var reader in Readers) + foreach (var reader in readers) { if (reader.Test(storage, path)) return (ArchiveReader)Activator.CreateInstance(reader.Type, storage.GetStream(path)); @@ -31,9 +32,24 @@ namespace osu.Game.IO protected static void AddReader(Func test) where T : ArchiveReader { - Readers.Add(new Reader { Test = test, Type = typeof(T) }); + readers.Add(new Reader { Test = test, Type = typeof(T) }); } + /// + /// Reads the beatmap metadata from this archive. + /// + public abstract BeatmapMetadata ReadMetadata(); + + /// + /// Gets a list of beatmap file names. + /// + public string[] BeatmapFilenames { get; protected set; } + + /// + /// The storyboard filename. Null if no storyboard is present. + /// + public string StoryboardFilename { get; protected set; } + /// /// Opens a stream for reading a specific file from this archive. /// diff --git a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs b/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs deleted file mode 100644 index 0fab05df49..0000000000 --- a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs +++ /dev/null @@ -1,44 +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.Logging; -using osu.Framework.Platform; -using osu.Game.Database; -using osu.Game.IO; - -namespace osu.Game.Beatmaps.IO -{ - public abstract class BeatmapArchiveReader : ArchiveReader - { - public const string OSZ_EXTENSION = @".osz"; - - public static BeatmapArchiveReader GetBeatmapArchiveReader(Storage storage, string path) - { - try - { - return (BeatmapArchiveReader)GetReader(storage, path); - } - catch (InvalidCastException e) - { - Logger.Error(e, "A tricky " + $@"{nameof(ArchiveReader)}" + " instance passed the test to be a " + $@"{nameof(BeatmapArchiveReader)}" + ", but it's really not"); - throw; - } - } - - /// - /// Reads the beatmap metadata from this archive. - /// - public abstract BeatmapMetadata ReadMetadata(); - - /// - /// Gets a list of beatmap file names. - /// - public string[] BeatmapFilenames { get; protected set; } - - /// - /// The storyboard filename. Null if no storyboard is present. - /// - public string StoryboardFilename { get; protected set; } - } -} \ No newline at end of file diff --git a/osu.Game/Beatmaps/IO/OszArchiveReader.cs b/osu.Game/Beatmaps/IO/OszArchiveReader.cs index 8c3e4d702c..8a1d071cfc 100644 --- a/osu.Game/Beatmaps/IO/OszArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/OszArchiveReader.cs @@ -9,14 +9,14 @@ using osu.Game.Database; namespace osu.Game.Beatmaps.IO { - public sealed class OszArchiveReader : BeatmapArchiveReader + public sealed class OszArchiveReader : ArchiveReader { public static void Register() { AddReader((storage, path) => { using (var stream = storage.GetStream(path)) - return Path.GetExtension(path) == OSZ_EXTENSION && ZipFile.IsZipFile(stream, false); + return ZipFile.IsZipFile(stream, false); }); OsuLegacyDecoder.Register(); } diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs index 545fc9f398..16db4fc2a6 100644 --- a/osu.Game/Beatmaps/WorkingBeatmap.cs +++ b/osu.Game/Beatmaps/WorkingBeatmap.cs @@ -1,9 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.Collections.Generic; -using System.IO; using osu.Framework.Audio.Track; using osu.Framework.Configuration; using osu.Framework.Graphics.Textures; @@ -11,6 +8,10 @@ using osu.Game.Beatmaps.Formats; using osu.Game.Beatmaps.IO; using osu.Game.Database; using osu.Game.Modes; +using osu.Game.Modes.Mods; +using System; +using System.Collections.Generic; +using System.IO; namespace osu.Game.Beatmaps { @@ -32,7 +33,7 @@ namespace osu.Game.Beatmaps public readonly bool WithStoryboard; - protected abstract BeatmapArchiveReader GetReader(); + protected abstract ArchiveReader GetReader(); protected WorkingBeatmap(BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false) { @@ -100,7 +101,7 @@ namespace osu.Game.Beatmaps set { lock (beatmapLock) beatmap = value; } } - private BeatmapArchiveReader trackReader; + private ArchiveReader trackReader; private Track track; private object trackLock = new object(); public Track Track diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs index a9fe30a5e9..871251b882 100644 --- a/osu.Game/Database/BeatmapDatabase.cs +++ b/osu.Game/Database/BeatmapDatabase.cs @@ -177,7 +177,7 @@ namespace osu.Game.Database BeatmapMetadata metadata; - using (var reader = BeatmapArchiveReader.GetBeatmapArchiveReader(storage, path)) + using (var reader = ArchiveReader.GetReader(storage, path)) metadata = reader.ReadMetadata(); if (File.Exists(path)) // Not always the case, i.e. for LegacyFilesystemReader @@ -186,7 +186,7 @@ namespace osu.Game.Database { hash = input.GetMd5Hash(); input.Seek(0, SeekOrigin.Begin); - path = Path.Combine(@"beatmaps", hash.Remove(1), hash.Remove(2), hash + BeatmapArchiveReader.OSZ_EXTENSION); + path = Path.Combine(@"beatmaps", hash.Remove(1), hash.Remove(2), hash); if (!storage.Exists(path)) using (var output = storage.GetStream(path, FileAccess.Write)) input.CopyTo(output); @@ -216,7 +216,7 @@ namespace osu.Game.Database Metadata = metadata }; - using (var archive = BeatmapArchiveReader.GetBeatmapArchiveReader(storage, path)) + using (var archive = ArchiveReader.GetReader(storage, path)) { string[] mapNames = archive.BeatmapFilenames; foreach (var name in mapNames) @@ -268,12 +268,12 @@ namespace osu.Game.Database BeatmapSetRemoved?.Invoke(beatmapSet); } - public BeatmapArchiveReader GetReader(BeatmapSetInfo beatmapSet) + public ArchiveReader GetReader(BeatmapSetInfo beatmapSet) { if (string.IsNullOrEmpty(beatmapSet.Path)) return null; - return BeatmapArchiveReader.GetBeatmapArchiveReader(storage, beatmapSet.Path); + return ArchiveReader.GetReader(storage, beatmapSet.Path); } public BeatmapSetInfo GetBeatmapSet(int id) @@ -354,7 +354,7 @@ namespace osu.Game.Database this.database = database; } - protected override BeatmapArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo); + protected override ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo); } } } diff --git a/osu.Game/Modes/LegacyReplay.cs b/osu.Game/Modes/LegacyReplay.cs index 9ab6c587a9..4b77550cbc 100644 --- a/osu.Game/Modes/LegacyReplay.cs +++ b/osu.Game/Modes/LegacyReplay.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.IO; +using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Input; using osu.Framework.MathUtils; using osu.Game.Input.Handlers; @@ -95,24 +96,17 @@ namespace osu.Game.Modes public override List GetPendingStates() { + var buttons = new HashSet(); + if (CurrentFrame?.MouseLeft ?? false) + buttons.Add(MouseButton.Left); + if (CurrentFrame?.MouseRight ?? false) + buttons.Add(MouseButton.Right); + return new List { new InputState { - Mouse = new ReplayMouseState( - ToScreenSpace(position ?? Vector2.Zero), - new List - { - new MouseState.ButtonState(MouseButton.Left) - { - State = CurrentFrame?.MouseLeft ?? false - }, - new MouseState.ButtonState(MouseButton.Right) - { - State = CurrentFrame?.MouseRight ?? false - }, - } - ), + Mouse = new ReplayMouseState(ToScreenSpace(position ?? Vector2.Zero), buttons), Keyboard = new ReplayKeyboardState(new List()) } }; @@ -171,10 +165,10 @@ namespace osu.Game.Modes private class ReplayMouseState : MouseState { - public ReplayMouseState(Vector2 position, List list) + public ReplayMouseState(Vector2 position, IEnumerable list) { Position = position; - ButtonStates = list; + list.ForEach(b => PressedButtons.Add(b)); } } diff --git a/osu.Game/Modes/Mods/IApplicableMod.cs b/osu.Game/Modes/Mods/IApplicableMod.cs new file mode 100644 index 0000000000..25d0f8d701 --- /dev/null +++ b/osu.Game/Modes/Mods/IApplicableMod.cs @@ -0,0 +1,23 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + + +using osu.Game.Modes.Objects; +using osu.Game.Modes.UI; + +namespace osu.Game.Modes.Mods +{ + /// + /// An interface for mods that are applied to a HitRenderer. + /// + /// The type of HitObject the HitRenderer contains. + public interface IApplicableMod + where TObject : HitObject + { + /// + /// Applies the mod to a HitRenderer. + /// + /// The HitRenderer to apply the mod to. + void Apply(HitRenderer hitRenderer); + } +} diff --git a/osu.Game/Modes/Mod.cs b/osu.Game/Modes/Mods/Mod.cs similarity index 88% rename from osu.Game/Modes/Mod.cs rename to osu.Game/Modes/Mods/Mod.cs index 167421c23d..6a720a3574 100644 --- a/osu.Game/Modes/Mod.cs +++ b/osu.Game/Modes/Mods/Mod.cs @@ -1,11 +1,13 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; +using osu.Game.Beatmaps; using osu.Game.Graphics; -using osu.Game.Screens.Play; +using osu.Game.Modes.Objects; +using osu.Game.Modes.UI; +using System; -namespace osu.Game.Modes +namespace osu.Game.Modes.Mods { /// /// The base class for gameplay modifiers. @@ -41,12 +43,6 @@ namespace osu.Game.Modes /// The mods this mod cannot be enabled with. /// public virtual Type[] IncompatibleMods => new Type[] { }; - - /// - /// Direct access to the Player before load has run. - /// - /// - public virtual void PlayerLoading(Player player) { } } public class MultiMod : Mod @@ -151,11 +147,16 @@ namespace osu.Game.Modes public override string Description => "Watch a perfect automated play through the song"; public override double ScoreMultiplier => 0; public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail) }; + } - public override void PlayerLoading(Player player) + public abstract class ModAutoplay : ModAutoplay, IApplicableMod + where T : HitObject + { + protected abstract Score CreateReplayScore(Beatmap beatmap); + + public void Apply(HitRenderer hitRenderer) { - base.PlayerLoading(player); - player.ReplayInputHandler = Ruleset.GetRuleset(player.Beatmap.PlayMode).CreateAutoplayScore(player.Beatmap.Beatmap)?.Replay?.GetInputHandler(); + hitRenderer.InputManager.ReplayInputHandler = CreateReplayScore(hitRenderer.Beatmap)?.Replay?.GetInputHandler(); } } @@ -170,11 +171,4 @@ namespace osu.Game.Modes public override string Name => "Cinema"; public override FontAwesome Icon => FontAwesome.fa_osu_mod_cinema; } - - public enum ModType - { - DifficultyReduction, - DifficultyIncrease, - Special, - } } diff --git a/osu.Game/Modes/Mods/ModType.cs b/osu.Game/Modes/Mods/ModType.cs new file mode 100644 index 0000000000..b1d0e781e1 --- /dev/null +++ b/osu.Game/Modes/Mods/ModType.cs @@ -0,0 +1,12 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +namespace osu.Game.Modes.Mods +{ + public enum ModType + { + DifficultyReduction, + DifficultyIncrease, + Special, + } +} diff --git a/osu.Game/Modes/Objects/HitObjectConverter.cs b/osu.Game/Modes/Objects/HitObjectConverter.cs deleted file mode 100644 index d7c6113af1..0000000000 --- a/osu.Game/Modes/Objects/HitObjectConverter.cs +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2007-2017 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Game.Beatmaps; -using System; -using System.Collections.Generic; - -namespace osu.Game.Modes.Objects -{ - public abstract class HitObjectConverter - where T : HitObject - { - public abstract List Convert(Beatmap beatmap); - } - - public class HitObjectConvertException : Exception - { - public HitObject Input { get; } - public HitObjectConvertException(string modeName, HitObject input) - : base($@"Can't convert from {input.GetType().Name} to {modeName} HitObject!") - { - Input = input; - } - } -} diff --git a/osu.Game/Modes/Ruleset.cs b/osu.Game/Modes/Ruleset.cs index d8892e64e9..5c599c2f2a 100644 --- a/osu.Game/Modes/Ruleset.cs +++ b/osu.Game/Modes/Ruleset.cs @@ -3,6 +3,7 @@ using osu.Game.Beatmaps; using osu.Game.Graphics; +using osu.Game.Modes.Mods; using osu.Game.Modes.Objects; using osu.Game.Modes.UI; using osu.Game.Screens.Play; @@ -31,7 +32,7 @@ namespace osu.Game.Modes public abstract ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0); - public abstract HitRenderer CreateHitRendererWith(Beatmap beatmap); + public abstract HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap); public abstract HitObjectParser CreateHitObjectParser(); @@ -47,8 +48,6 @@ namespace osu.Game.Modes public abstract IEnumerable CreateGameplayKeys(); - public virtual Score CreateAutoplayScore(Beatmap beatmap) => null; - public static Ruleset GetRuleset(PlayMode mode) { Type type; diff --git a/osu.Game/Modes/UI/HitRenderer.cs b/osu.Game/Modes/UI/HitRenderer.cs index e08570522f..a40b332095 100644 --- a/osu.Game/Modes/UI/HitRenderer.cs +++ b/osu.Game/Modes/UI/HitRenderer.cs @@ -1,11 +1,11 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using OpenTK; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Beatmaps; +using osu.Game.Modes.Mods; using osu.Game.Modes.Objects; using osu.Game.Modes.Objects.Drawables; using osu.Game.Screens.Play; @@ -22,10 +22,13 @@ namespace osu.Game.Modes.UI internal readonly PlayerInputManager InputManager = new PlayerInputManager(); - /// - /// A function to convert coordinates from gamefield to screen space. - /// - public abstract Func MapPlayfieldToScreenSpace { get; } + protected readonly KeyConversionInputManager KeyConversionInputManager; + + protected HitRenderer() + { + KeyConversionInputManager = CreateKeyConversionInputManager(); + KeyConversionInputManager.RelativeSizeAxes = Axes.Both; + } /// /// Whether all the HitObjects have been judged. @@ -39,45 +42,48 @@ namespace osu.Game.Modes.UI if (AllObjectsJudged) OnAllJudged?.Invoke(); } + + protected virtual KeyConversionInputManager CreateKeyConversionInputManager() => new KeyConversionInputManager(); } public abstract class HitRenderer : HitRenderer where TObject : HitObject { - public override Func MapPlayfieldToScreenSpace => Playfield.ScaledContent.ToScreenSpace; - public IEnumerable DrawableObjects => Playfield.HitObjects.Children; + public Beatmap Beatmap; protected override Container Content => content; protected override bool AllObjectsJudged => Playfield.HitObjects.Children.All(h => h.Judgement.Result.HasValue); protected Playfield Playfield; - protected Beatmap Beatmap; private Container content; - protected HitRenderer(Beatmap beatmap) + protected HitRenderer(WorkingBeatmap beatmap) { - Beatmap = CreateBeatmapConverter().Convert(beatmap); + Beatmap = CreateBeatmapConverter().Convert(beatmap.Beatmap); + + applyMods(beatmap.Mods.Value); RelativeSizeAxes = Axes.Both; + KeyConversionInputManager.Add(Playfield = CreatePlayfield()); + InputManager.Add(content = new Container { RelativeSizeAxes = Axes.Both, - Children = new[] - { - Playfield = CreatePlayfield(), - } + Children = new[] { KeyConversionInputManager } }); AddInternal(InputManager); } - [BackgroundDependencyLoader] private void load() { loadObjects(); + + if (InputManager?.ReplayInputHandler != null) + InputManager.ReplayInputHandler.ToScreenSpace = Playfield.ScaledContent.ToScreenSpace; } private void loadObjects() @@ -97,6 +103,15 @@ namespace osu.Game.Modes.UI Playfield.PostProcess(); } + private void applyMods(IEnumerable mods) + { + if (mods == null) + return; + + foreach (var mod in mods.OfType>()) + mod.Apply(this); + } + private void onJudgement(DrawableHitObject o, JudgementInfo j) => TriggerOnJudgement(j); protected abstract DrawableHitObject GetVisualRepresentation(TObject h); diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 79ffcfcadf..8aa3a63d26 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -258,13 +258,13 @@ namespace osu.Game return false; } - public event Action ModeChanged; + public event Action ScreenChanged; private Container mainContent; private Container overlayContent; - private void modeChanged(Screen newScreen) + private void screenChanged(Screen newScreen) { //central game mode change logic. if ((newScreen as OsuScreen)?.ShowOverlays != true) @@ -281,7 +281,7 @@ namespace osu.Game if (newScreen is MainMenu) Cursor.FadeIn(100); - ModeChanged?.Invoke(newScreen); + ScreenChanged?.Invoke(newScreen); if (newScreen == null) Exit(); @@ -315,12 +315,12 @@ namespace osu.Game newScreen.ModePushed += screenAdded; newScreen.Exited += screenRemoved; - modeChanged(newScreen); + screenChanged(newScreen); } private void screenRemoved(Screen newScreen) { - modeChanged(newScreen); + screenChanged(newScreen); } } } diff --git a/osu.Game/Overlays/Mods/AssistedSection.cs b/osu.Game/Overlays/Mods/AssistedSection.cs index 0bb1bc9dff..a1ec7a3fdc 100644 --- a/osu.Game/Overlays/Mods/AssistedSection.cs +++ b/osu.Game/Overlays/Mods/AssistedSection.cs @@ -4,7 +4,7 @@ using OpenTK.Input; using osu.Framework.Allocation; using osu.Game.Graphics; -using osu.Game.Modes; +using osu.Game.Modes.Mods; namespace osu.Game.Overlays.Mods { diff --git a/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs b/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs index 4dfb0ba6c2..13df5aabfb 100644 --- a/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs +++ b/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs @@ -4,7 +4,7 @@ using OpenTK.Input; using osu.Framework.Allocation; using osu.Game.Graphics; -using osu.Game.Modes; +using osu.Game.Modes.Mods; namespace osu.Game.Overlays.Mods { diff --git a/osu.Game/Overlays/Mods/DifficultyReductionSection.cs b/osu.Game/Overlays/Mods/DifficultyReductionSection.cs index d92fb541c3..f8ac4551ef 100644 --- a/osu.Game/Overlays/Mods/DifficultyReductionSection.cs +++ b/osu.Game/Overlays/Mods/DifficultyReductionSection.cs @@ -4,7 +4,7 @@ using OpenTK.Input; using osu.Framework.Allocation; using osu.Game.Graphics; -using osu.Game.Modes; +using osu.Game.Modes.Mods; namespace osu.Game.Overlays.Mods { diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs index 6e3bafbada..acd5f37092 100644 --- a/osu.Game/Overlays/Mods/ModButton.cs +++ b/osu.Game/Overlays/Mods/ModButton.cs @@ -1,8 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.Linq; using OpenTK; using OpenTK.Graphics; using OpenTK.Input; @@ -15,8 +13,10 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Transforms; using osu.Framework.Input; using osu.Game.Graphics.Sprites; -using osu.Game.Modes; +using osu.Game.Modes.Mods; using osu.Game.Modes.UI; +using System; +using System.Linq; namespace osu.Game.Overlays.Mods { diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs index c07114919e..489af21ef4 100644 --- a/osu.Game/Overlays/Mods/ModSection.cs +++ b/osu.Game/Overlays/Mods/ModSection.cs @@ -1,7 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using OpenTK; using OpenTK.Graphics; using OpenTK.Input; @@ -10,7 +9,8 @@ using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Primitives; using osu.Framework.Input; using osu.Game.Graphics.Sprites; -using osu.Game.Modes; +using osu.Game.Modes.Mods; +using System; namespace osu.Game.Overlays.Mods { diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs index 1be1b9a351..3a685be7fa 100644 --- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs +++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs @@ -1,11 +1,9 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.Collections.Generic; -using System.Linq; using OpenTK; using OpenTK.Graphics; +using osu.Framework.Allocation; using osu.Framework.Configuration; using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Graphics; @@ -13,11 +11,14 @@ using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Transforms; -using osu.Framework.Allocation; using osu.Game.Graphics; using osu.Game.Graphics.Backgrounds; using osu.Game.Graphics.Sprites; using osu.Game.Modes; +using osu.Game.Modes.Mods; +using System; +using System.Collections.Generic; +using System.Linq; namespace osu.Game.Overlays.Mods { diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index 1b4692f50e..5c9adb6b20 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/osu.Game/Overlays/MusicController.cs @@ -210,7 +210,7 @@ namespace osu.Game.Overlays } } }; - + this.beatmaps = beatmaps; trackManager = osuGame.Audio.Track; preferUnicode = config.GetBindable(OsuConfig.ShowUnicode); @@ -247,6 +247,8 @@ namespace osu.Game.Overlays if (current.Track.HasCompleted && !current.Track.Looping) next(); } + else + playButton.Icon = FontAwesome.fa_play_circle_o; } private void preferUnicode_changed(object sender, EventArgs e) @@ -337,12 +339,16 @@ namespace osu.Game.Overlays Task.Run(() => { if (beatmap?.Beatmap == null) - //todo: we may need to display some default text here (currently in the constructor). - return; - - BeatmapMetadata metadata = beatmap.Beatmap.BeatmapInfo.Metadata; - title.Text = unicodeString(metadata.Title, metadata.TitleUnicode); - artist.Text = unicodeString(metadata.Artist, metadata.ArtistUnicode); + { + title.Text = @"Nothing to play"; + artist.Text = @"Nothing to play"; + } + else + { + BeatmapMetadata metadata = beatmap.Beatmap.BeatmapInfo.Metadata; + title.Text = unicodeString(metadata.Title, metadata.TitleUnicode); + artist.Text = unicodeString(metadata.Artist, metadata.ArtistUnicode); + } }); MusicControllerBackground newBackground; diff --git a/osu.Game/Screens/Play/KeyConversionInputManager.cs b/osu.Game/Screens/Play/KeyConversionInputManager.cs new file mode 100644 index 0000000000..f3ca764bd7 --- /dev/null +++ b/osu.Game/Screens/Play/KeyConversionInputManager.cs @@ -0,0 +1,16 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.Input; + +namespace osu.Game.Screens.Play +{ + /// + /// An InputManager primarily used to map keys to new functions. + /// By default this does nothing; override TransformState to make alterations. + /// + public class KeyConversionInputManager : PassThroughInputManager + { + + } +} \ No newline at end of file diff --git a/osu.Game/Screens/Play/KeyCounterMouse.cs b/osu.Game/Screens/Play/KeyCounterMouse.cs index 037d890a9e..425bcffee5 100644 --- a/osu.Game/Screens/Play/KeyCounterMouse.cs +++ b/osu.Game/Screens/Play/KeyCounterMouse.cs @@ -10,11 +10,25 @@ namespace osu.Game.Screens.Play public class KeyCounterMouse : KeyCounter { public MouseButton Button { get; } - public KeyCounterMouse(MouseButton button) : base(button.ToString()) + + public KeyCounterMouse(MouseButton button) : base(getStringRepresentation(button)) { Button = button; } + private static string getStringRepresentation(MouseButton button) + { + switch (button) + { + default: + return button.ToString(); + case MouseButton.Left: + return @"M1"; + case MouseButton.Right: + return @"M2"; + } + } + public override bool Contains(Vector2 screenSpacePos) => true; protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index 1a71543786..1a3a5b7036 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -7,7 +7,6 @@ using osu.Framework.Allocation; using osu.Framework.Audio; using osu.Framework.Audio.Track; using osu.Framework.Configuration; -using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Transforms; @@ -69,8 +68,6 @@ namespace osu.Game.Screens.Play return; } - Beatmap.Mods.Value.ForEach(m => m.PlayerLoading(this)); - dimLevel = config.GetBindable(OsuConfig.DimLevel); mouseWheelDisabled = config.GetBindable(OsuConfig.MouseDisableWheel); @@ -128,13 +125,10 @@ namespace osu.Game.Screens.Play OnQuit = Exit }; - hitRenderer = ruleset.CreateHitRendererWith(beatmap); + hitRenderer = ruleset.CreateHitRendererWith(Beatmap); if (ReplayInputHandler != null) - { - ReplayInputHandler.ToScreenSpace = hitRenderer.MapPlayfieldToScreenSpace; hitRenderer.InputManager.ReplayInputHandler = ReplayInputHandler; - } hudOverlay.BindHitRenderer(hitRenderer); @@ -305,7 +299,8 @@ namespace osu.Game.Screens.Play { if (pauseOverlay == null) return false; - if (ReplayInputHandler != null) return false; + if (hitRenderer.InputManager.ReplayInputHandler != null) + return false; if (pauseOverlay.State != Visibility.Visible && !canPause) return true; diff --git a/osu.Game/Screens/Play/PlayerInputManager.cs b/osu.Game/Screens/Play/PlayerInputManager.cs index a16c1ba9c6..32d20118af 100644 --- a/osu.Game/Screens/Play/PlayerInputManager.cs +++ b/osu.Game/Screens/Play/PlayerInputManager.cs @@ -1,25 +1,14 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Framework.Allocation; -using osu.Framework.Configuration; using osu.Framework.Input; -using osu.Game.Configuration; -using System.Linq; using osu.Framework.Timing; using osu.Game.Input.Handlers; -using OpenTK.Input; -using KeyboardState = osu.Framework.Input.KeyboardState; -using MouseState = osu.Framework.Input.MouseState; namespace osu.Game.Screens.Play { public class PlayerInputManager : PassThroughInputManager { - private bool leftViaKeyboard; - private bool rightViaKeyboard; - private Bindable mouseDisabled; - private ManualClock clock = new ManualClock(); private IFrameBasedClock parentClock; @@ -47,40 +36,6 @@ namespace osu.Game.Screens.Play Clock = new FramedClock(clock); } - [BackgroundDependencyLoader] - private void load(OsuConfigManager config) - { - mouseDisabled = config.GetBindable(OsuConfig.MouseDisableButtons); - } - - protected override void TransformState(InputState state) - { - base.TransformState(state); - - var mouse = state.Mouse as MouseState; - var keyboard = state.Keyboard as KeyboardState; - - if (keyboard != null) - { - leftViaKeyboard = keyboard.Keys.Contains(Key.Z); - rightViaKeyboard = keyboard.Keys.Contains(Key.X); - } - - if (mouse != null) - { - if (mouseDisabled.Value) - { - mouse.ButtonStates.Find(s => s.Button == MouseButton.Left).State = false; - mouse.ButtonStates.Find(s => s.Button == MouseButton.Right).State = false; - } - - if (leftViaKeyboard) - mouse.ButtonStates.Find(s => s.Button == MouseButton.Left).State = true; - if (rightViaKeyboard) - mouse.ButtonStates.Find(s => s.Button == MouseButton.Right).State = true; - } - } - protected override void Update() { base.Update(); diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs index bc3b16079c..eac12f7370 100644 --- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs +++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs @@ -16,7 +16,6 @@ using osu.Game.Database; using osu.Framework.Graphics.Colour; using osu.Game.Beatmaps.Drawables; using System.Linq; -using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.MathUtils; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; @@ -56,8 +55,15 @@ namespace osu.Game.Screens.Select public void UpdateBeatmap(WorkingBeatmap beatmap) { if (beatmap?.BeatmapInfo == null) + { + FadeOut(250); + beatmapInfoContainer?.FadeOut(250); + beatmapInfoContainer?.Expire(); + beatmapInfoContainer = null; return; + } + FadeIn(250); var lastContainer = beatmapInfoContainer; float newDepth = lastContainer?.Depth + 1 ?? 0; @@ -84,7 +90,7 @@ namespace osu.Game.Screens.Select })); //get statistics fromt he current ruleset. - Ruleset.GetRuleset(beatmap.BeatmapInfo.Mode).GetBeatmapStatistics(beatmap).ForEach(s => labels.Add(new InfoLabel(s))); + labels.AddRange(Ruleset.GetRuleset(beatmap.BeatmapInfo.Mode).GetBeatmapStatistics(beatmap).Select(s => new InfoLabel(s))); } (beatmapInfoContainer = new BufferedContainer @@ -191,7 +197,7 @@ namespace osu.Game.Screens.Select private string getBPMRange(Beatmap beatmap) { - double bpmMax = beatmap.BPMMaximum; + double bpmMax = beatmap.BPMMaximum; double bpmMin = beatmap.BPMMinimum; if (Precision.AlmostEquals(bpmMin, bpmMax)) return Math.Round(bpmMin) + "bpm"; diff --git a/osu.Game/Screens/Select/CarouselContainer.cs b/osu.Game/Screens/Select/CarouselContainer.cs index e7fba05036..6a5bb2dc94 100644 --- a/osu.Game/Screens/Select/CarouselContainer.cs +++ b/osu.Game/Screens/Select/CarouselContainer.cs @@ -57,6 +57,7 @@ namespace osu.Game.Screens.Select public void RemoveGroup(BeatmapGroup group) { groups.Remove(group); + panels.Remove(group.Header); foreach (var p in group.BeatmapPanels) panels.Remove(p); diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index 2a204b3670..943084b9f2 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -327,8 +327,7 @@ namespace osu.Game.Screens.Select backgroundModeBeatmap.FadeTo(1, 250); } - if (beatmap != null) - beatmapInfoWedge.UpdateBeatmap(beatmap); + beatmapInfoWedge.UpdateBeatmap(beatmap); } /// @@ -338,11 +337,11 @@ namespace osu.Game.Screens.Select { base.OnBeatmapChanged(beatmap); - beatmap.Mods.BindTo(modSelect.SelectedMods); + beatmap?.Mods.BindTo(modSelect.SelectedMods); //todo: change background in selectionChanged instead; support per-difficulty backgrounds. changeBackground(beatmap); - carousel.SelectBeatmap(beatmap.BeatmapInfo); + carousel.SelectBeatmap(beatmap?.BeatmapInfo); } /// diff --git a/osu.Game/app.config b/osu.Game/app.config deleted file mode 100644 index 855da39b10..0000000000 --- a/osu.Game/app.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index d470d9496a..b68c3511dc 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -91,6 +91,8 @@ + + @@ -114,7 +116,6 @@ - @@ -168,6 +169,7 @@ + @@ -238,7 +240,7 @@ - + @@ -305,7 +307,7 @@ - + @@ -326,12 +328,10 @@ - - @@ -347,7 +347,6 @@ osu.licenseheader -