From 618b53c59fab7f8b1dc1530a1dfd82dcb93f704a Mon Sep 17 00:00:00 2001 From: jorolf Date: Sun, 23 Sep 2018 03:10:13 +0200 Subject: [PATCH] update osu submodule and fix pippidon --- osu | 2 +- .../Beatmaps/PippidonBeatmapConverter.cs | 13 ++- .../Judgements/PippidonJudgement.cs | 8 -- .../Objects/Drawables/Coin.cs | 33 ++----- .../Objects/PippidonObject.cs | 27 +++--- .../PippidonDifficultyCalculator.cs | 14 ++- osu.Game.Rulesets.Pippidon/PippidonRuleset.cs | 16 ++-- .../Properties/AssemblyInfo.cs | 35 -------- .../Replays/PippidonAutoGenerator.cs | 12 ++- .../Replays/PippidonReplayInputHandler.cs | 12 +-- .../Scoring/PippidonScoreProcessor.cs | 12 +-- .../UI/PippidonPlayfield.cs | 4 +- .../UI/PippidonRulesetContainer.cs | 8 +- .../osu.Game.Rulesets.Pippidon.csproj | 88 +++---------------- pippidon.sln | 35 +++----- pippidon.sln.DotSettings | 5 ++ 16 files changed, 100 insertions(+), 224 deletions(-) delete mode 100644 osu.Game.Rulesets.Pippidon/Judgements/PippidonJudgement.cs delete mode 100644 osu.Game.Rulesets.Pippidon/Properties/AssemblyInfo.cs diff --git a/osu b/osu index e0220de..5e51a50 160000 --- a/osu +++ b/osu @@ -1 +1 @@ -Subproject commit e0220de1a5ce1880f76ac116f6046a3679866855 +Subproject commit 5e51a50658d2c3d481c05f6cf4aa7368631ee05c diff --git a/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs b/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs index 85921e3..44ad13e 100644 --- a/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs +++ b/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs @@ -10,11 +10,11 @@ namespace osu.Game.Rulesets.Pippidon.Beatmaps { public class PippidonBeatmapConverter : BeatmapConverter { - protected override IEnumerable ValidConversionTypes => new[] { typeof(IHasXPosition) , typeof(IHasYPosition) }; + protected override IEnumerable ValidConversionTypes { get; } = new[] { typeof(IHasXPosition) }; - private readonly Dictionary floatRanges = new Dictionary(); + private readonly Dictionary floatRanges = new Dictionary(); - protected override IEnumerable ConvertHitObject(HitObject original, Beatmap beatmap) + protected override IEnumerable ConvertHitObject(HitObject original, IBeatmap beatmap) { float pos = (original as IHasYPosition)?.Y ?? ((IHasXPosition)original).X; @@ -29,7 +29,7 @@ protected override IEnumerable ConvertHitObject(HitObject origin }; } - private void calcRange(Beatmap beatmap) + private void calcRange(IBeatmap beatmap) { List positions = beatmap.HitObjects.OfType().Select(hitObject => hitObject.Y).ToList(); if(!positions.Any()) @@ -47,5 +47,10 @@ private class FloatRange public float Max, Min; public float Range => Max - Min; } + + public PippidonBeatmapConverter(IBeatmap beatmap) + : base(beatmap) + { + } } } diff --git a/osu.Game.Rulesets.Pippidon/Judgements/PippidonJudgement.cs b/osu.Game.Rulesets.Pippidon/Judgements/PippidonJudgement.cs deleted file mode 100644 index fcfdf47..0000000 --- a/osu.Game.Rulesets.Pippidon/Judgements/PippidonJudgement.cs +++ /dev/null @@ -1,8 +0,0 @@ -using osu.Game.Rulesets.Judgements; - -namespace osu.Game.Rulesets.Pippidon.Judgements -{ - public class PippidonJudgement : Judgement - { - } -} diff --git a/osu.Game.Rulesets.Pippidon/Objects/Drawables/Coin.cs b/osu.Game.Rulesets.Pippidon/Objects/Drawables/Coin.cs index 23e8690..51d8843 100644 --- a/osu.Game.Rulesets.Pippidon/Objects/Drawables/Coin.cs +++ b/osu.Game.Rulesets.Pippidon/Objects/Drawables/Coin.cs @@ -4,8 +4,6 @@ using osu.Game.Rulesets.Objects.Drawables; using OpenTK; using System; -using osu.Game.Rulesets.Judgements; -using osu.Game.Rulesets.Pippidon.Judgements; using OpenTK.Graphics; using osu.Game.Rulesets.Scoring; @@ -17,8 +15,6 @@ public class Coin : DrawableHitObject private readonly Func touchingPippi; - private Judgement judgement; - public Coin(PippidonObject hitObject, TextureStore textures, Func touchingPippi) : base(hitObject) { Size = new Vector2(40); @@ -26,7 +22,7 @@ public Coin(PippidonObject hitObject, TextureStore textures, Func tou this.touchingPippi = touchingPippi; - Add(new Sprite + AddInternal(new Sprite { RelativeSizeAxes = Axes.Both, Texture = textures.Get("coin"), @@ -38,40 +34,21 @@ protected override void Update() base.Update(); if (Time.Current - HitObject.StartTime < -hit_window) - UpdateJudgement(true); + UpdateResult(true); } - protected override void CheckForJudgements(bool userTriggered, double timeOffset) + protected override void CheckForResult(bool userTriggered, double timeOffset) { if (Math.Abs(timeOffset) < hit_window) { if (touchingPippi(HitObject.Lane)) { - if (judgement == null) - { - judgement = new PippidonJudgement - { - Result = HitResult.Perfect, - TimeOffset = timeOffset, - }; - } - else if (timeOffset <= 0) - { - judgement.TimeOffset = 0; - } - } - - if (judgement != null && timeOffset >= 0) - { - AddJudgement(judgement); + ApplyResult(r => r.Type = HitResult.Perfect); } } else if (timeOffset > hit_window) { - AddJudgement(new PippidonJudgement - { - Result = HitResult.Miss, - }); + ApplyResult(r => r.Type = HitResult.Miss); } } diff --git a/osu.Game.Rulesets.Pippidon/Objects/PippidonObject.cs b/osu.Game.Rulesets.Pippidon/Objects/PippidonObject.cs index 54c905d..c86fa38 100644 --- a/osu.Game.Rulesets.Pippidon/Objects/PippidonObject.cs +++ b/osu.Game.Rulesets.Pippidon/Objects/PippidonObject.cs @@ -1,12 +1,15 @@ -using osu.Game.Rulesets.Objects; - -namespace osu.Game.Rulesets.Pippidon.Objects -{ - public class PippidonObject : HitObject - { - /// - /// Range = [-1,1] - /// - public int Lane; - } -} +using osu.Game.Rulesets.Judgements; +using osu.Game.Rulesets.Objects; + +namespace osu.Game.Rulesets.Pippidon.Objects +{ + public class PippidonObject : HitObject + { + /// + /// Range = [-1,1] + /// + public int Lane; + + public override Judgement CreateJudgement() => new Judgement(); + } +} diff --git a/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs b/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs index 5758af9..f123334 100644 --- a/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs +++ b/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs @@ -1,13 +1,19 @@ -using System.Collections.Generic; -using osu.Game.Beatmaps; +using osu.Game.Beatmaps; +using osu.Game.Rulesets.Difficulty; +using osu.Game.Rulesets.Mods; namespace osu.Game.Rulesets.Pippidon { public class PippidonDifficultyCalculator : DifficultyCalculator { - public override double Calculate(Dictionary categoryDifficulty = null) + public PippidonDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap) + : base(ruleset, beatmap) { - return 0; + } + + protected override DifficultyAttributes Calculate(IBeatmap beatmap, Mod[] mods, double timeRate) + { + return new DifficultyAttributes(mods, 0); } } } diff --git a/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs b/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs index 79de337..b2dd1fd 100644 --- a/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs +++ b/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs @@ -8,6 +8,8 @@ using osu.Framework.Graphics.Textures; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; +using osu.Game.Rulesets.Difficulty; +using osu.Game.Rulesets.Pippidon.Beatmaps; using osu.Game.Rulesets.Pippidon.Mods; namespace osu.Game.Rulesets.Pippidon @@ -19,28 +21,30 @@ public class PippidonRuleset : Ruleset public PippidonRuleset(RulesetInfo rulesetInfo) : base(rulesetInfo) { - ResourceStore = new NamespacedResourceStore(new DllResourceStore("osu.Game.Rulesets.Pippidon.dll"), "Resources"); - TextureStore = new TextureStore(new RawTextureLoaderStore(new NamespacedResourceStore(ResourceStore, @"Textures"))); + ResourceStore = new NamespacedResourceStore(new DllResourceStore("osu.Game.Rulesets.Pippidon.dll"), @"Resources"); + TextureStore = new TextureStore(new TextureLoaderStore(new NamespacedResourceStore(ResourceStore, @"Textures"))); } public override string Description => "pippipidoooooon"; - public override RulesetContainer CreateRulesetContainerWith(WorkingBeatmap beatmap, bool isForCurrentRuleset) => new PippidonRulesetContainer(this, beatmap, isForCurrentRuleset); + public override RulesetContainer CreateRulesetContainerWith(WorkingBeatmap beatmap) => new PippidonRulesetContainer(this, beatmap); - public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap, Mod[] mods = null) => new PippidonDifficultyCalculator(); + public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new PippidonBeatmapConverter(beatmap); + + public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new PippidonDifficultyCalculator(this, beatmap); public override IEnumerable GetModsFor(ModType type) { switch (type) { - case ModType.Special: + case ModType.Automation: return new[] { new PippidonModAutoplay() }; default: return new Mod[] { null }; } } - public override string ShortName => "pipidon"; + public override string ShortName => "pippidon"; public override IEnumerable GetDefaultKeyBindings(int variant = 0) => new[] { diff --git a/osu.Game.Rulesets.Pippidon/Properties/AssemblyInfo.cs b/osu.Game.Rulesets.Pippidon/Properties/AssemblyInfo.cs deleted file mode 100644 index 6311b8a..0000000 --- a/osu.Game.Rulesets.Pippidon/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("osu.Game.Rulesets.Pippidon")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("osu.Game.Rulesets.Pippidon")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("5ae1f0f1-dafa-46e7-959c-da233b7c87e9")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs b/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs index 23f168e..9f542ac 100644 --- a/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs +++ b/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs @@ -26,6 +26,8 @@ public PippidonAutoGenerator(Beatmap beatmap) : base(beatmap) public override Replay Generate() { int lastLane = 0; + Frames.Add(new PippidonReplayFrame()); + foreach(PippidonObject hitObject in Beatmap.HitObjects) { if (lastLane == hitObject.Lane) @@ -47,8 +49,14 @@ public override Replay Generate() throw new Exception("Unknown lane"); } - Frames.Add(new PippidonReplayFrame(button)); - Frames.Add(new PippidonReplayFrame()); //Release the keys as well + Frames.Add(new PippidonReplayFrame(button) + { + Time = hitObject.StartTime - KEY_UP_DELAY + }); + Frames.Add(new PippidonReplayFrame + { + Time = hitObject.StartTime + }); //Release the keys as well lastLane = hitObject.Lane; } diff --git a/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayInputHandler.cs b/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayInputHandler.cs index 46be3b7..21f025c 100644 --- a/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayInputHandler.cs +++ b/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayInputHandler.cs @@ -1,7 +1,7 @@ -using osu.Game.Rulesets.Replays; -using System.Collections.Generic; +using System.Collections.Generic; +using osu.Game.Rulesets.Replays; using System.Linq; -using osu.Framework.Input; +using osu.Framework.Input.StateChanges; namespace osu.Game.Rulesets.Pippidon.Replays { @@ -13,13 +13,13 @@ public PippidonReplayInputHandler(Replay replay) : base(replay) protected override bool IsImportant(PippidonReplayFrame frame) => frame.Actions.Any(); - public override List GetPendingStates() + public override List GetPendingInputs() { - return new List + return new List { new ReplayState { - PressedActions = CurrentFrame.Actions + PressedActions = CurrentFrame.Actions, } }; } diff --git a/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs b/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs index 7e0b45f..96be1a7 100644 --- a/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs +++ b/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs @@ -1,6 +1,4 @@ -using osu.Game.Beatmaps; -using osu.Game.Rulesets.Pippidon.Judgements; -using osu.Game.Rulesets.Pippidon.Objects; +using osu.Game.Rulesets.Pippidon.Objects; using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.UI; @@ -16,14 +14,6 @@ public PippidonScoreProcessor(RulesetContainer ruleset) : base(r { } - protected override void SimulateAutoplay(Beatmap beatmap) - { - foreach (var unused in beatmap.HitObjects) - { - AddJudgement(new PippidonJudgement { Result = HitResult.Perfect }); - } - } - protected override void Reset(bool storeResults) { base.Reset(storeResults); diff --git a/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs b/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs index 935904d..fa82282 100644 --- a/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs +++ b/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs @@ -24,11 +24,11 @@ public class PippidonPlayfield : ScrollingPlayfield public int PippidonLane => pippidon.LanePosition; public PippidonPlayfield(PippidonRuleset ruleset) - : base(ScrollingDirection.Left) { VisibleTimeRange.Value = 6000; + Direction.Value = ScrollingDirection.Left; - ScaledContent.AddRange(new Drawable[] + base.Content.AddRange(new Drawable[] { content = new Container { diff --git a/osu.Game.Rulesets.Pippidon/UI/PippidonRulesetContainer.cs b/osu.Game.Rulesets.Pippidon/UI/PippidonRulesetContainer.cs index a2f4eef..77bcdbf 100644 --- a/osu.Game.Rulesets.Pippidon/UI/PippidonRulesetContainer.cs +++ b/osu.Game.Rulesets.Pippidon/UI/PippidonRulesetContainer.cs @@ -3,7 +3,6 @@ using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.UI; using osu.Game.Rulesets.Pippidon.Scoring; -using osu.Game.Rulesets.Pippidon.Beatmaps; using osu.Framework.Input; using osu.Framework.Graphics; using osu.Game.Input.Handlers; @@ -12,6 +11,7 @@ using osu.Game.Rulesets.Replays; using osu.Game.Rulesets.Pippidon.Replays; using osu.Game.Rulesets.UI.Scrolling; +using OpenTK; namespace osu.Game.Rulesets.Pippidon.UI { @@ -19,15 +19,13 @@ public class PippidonRulesetContainer : ScrollingRulesetContainer new PippidonScoreProcessor(this); - protected override BeatmapConverter CreateBeatmapConverter() => new PippidonBeatmapConverter(); - protected override Playfield CreatePlayfield() => new PippidonPlayfield(pippidonRuleset); protected override DrawableHitObject GetVisualRepresentation(PippidonObject h) @@ -42,5 +40,7 @@ protected override DrawableHitObject GetVisualRepresentation(Pip protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new PippidonReplayInputHandler(replay); public override PassThroughInputManager CreateInputManager() => new PippidonInputManager(Ruleset?.RulesetInfo); + + protected override Vector2 PlayfieldArea => new Vector2(1); } } diff --git a/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj b/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj index 3046149..85f054d 100644 --- a/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj +++ b/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj @@ -1,82 +1,16 @@ - - - - - Debug - AnyCPU - {5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9} + + + netstandard2.0 + osu.Game.Rulesets.Pippidon Library - Properties - osu.Game.Rulesets.Pippidon - osu.Game.Rulesets.Pippidon - v4.6.1 - 512 - + AnyCPU + OnOutputUpdated - - true - full - false - ..\osu\osu.Desktop\bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\osu\osu.Desktop\bin\Release\ - TRACE - prompt - 4 - - - - - ..\..\packages\ppy.OpenTK.3.0.13\lib\net45\OpenTK.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {c76bf5b3-985e-4d39-95fe-97c9c879b83a} - osu.Framework - - - {2a66dd92-adb1-4994-89e2-c94e04acda0d} - osu.Game - + + - + + + \ No newline at end of file diff --git a/pippidon.sln b/pippidon.sln index aa334d5..da4e021 100644 --- a/pippidon.sln +++ b/pippidon.sln @@ -3,27 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27004.2009 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game", "osu\osu.Game\osu.Game.csproj", "{2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game", "osu\osu.Game\osu.Game.csproj", "{2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework", "osu\osu-framework\osu.Framework\osu.Framework.csproj", "{C76BF5B3-985E-4D39-95FE-97C9C879B83A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Resources", "osu\osu-resources\osu.Game.Resources\osu.Game.Resources.csproj", "{D9A367C9-4C1A-489F-9B05-A0CEA2B53B58}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Resources", "osu\osu-resources\osu.Game.Resources\osu.Game.Resources.csproj", "{D9A367C9-4C1A-489F-9B05-A0CEA2B53B58}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.Osu", "osu\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj", "{C92A607B-1FDD-4954-9F92-03FF547D9080}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Osu", "osu\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj", "{C92A607B-1FDD-4954-9F92-03FF547D9080}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.Catch", "osu\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj", "{58F6C80C-1253-4A0E-A465-B8C85EBEADF3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Catch", "osu\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj", "{58F6C80C-1253-4A0E-A465-B8C85EBEADF3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.Taiko", "osu\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj", "{F167E17A-7DE6-4AF5-B920-A5112296C695}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Taiko", "osu\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj", "{F167E17A-7DE6-4AF5-B920-A5112296C695}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.Mania", "osu\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj", "{48F4582B-7687-4621-9CBE-5C24197CB536}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Mania", "osu\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj", "{48F4582B-7687-4621-9CBE-5C24197CB536}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Tests", "osu\osu.Game.Tests\osu.Game.Tests.csproj", "{54377672-20B1-40AF-8087-5CF73BF3953A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Desktop.Deploy", "osu\osu.Desktop.Deploy\osu.Desktop.Deploy.csproj", "{BAEA2F74-0315-4667-84E0-ACAC0B4BF785}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Desktop", "osu\osu.Desktop\osu.Desktop.csproj", "{419659FD-72EA-4678-9EB8-B22A746CED70}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Tests", "osu\osu.Game.Tests\osu.Game.Tests.csproj", "{54377672-20B1-40AF-8087-5CF73BF3953A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Desktop", "osu\osu.Desktop\osu.Desktop.csproj", "{419659FD-72EA-4678-9EB8-B22A746CED70}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon", "osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj", "{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.Pippidon", "osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj", "{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -38,12 +34,6 @@ Global {2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}.Release|Any CPU.Build.0 = Release|Any CPU {2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}.VisualTests|Any CPU.ActiveCfg = Debug|Any CPU {2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}.VisualTests|Any CPU.Build.0 = Debug|Any CPU - {C76BF5B3-985E-4D39-95FE-97C9C879B83A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C76BF5B3-985E-4D39-95FE-97C9C879B83A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C76BF5B3-985E-4D39-95FE-97C9C879B83A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C76BF5B3-985E-4D39-95FE-97C9C879B83A}.Release|Any CPU.Build.0 = Release|Any CPU - {C76BF5B3-985E-4D39-95FE-97C9C879B83A}.VisualTests|Any CPU.ActiveCfg = Debug|Any CPU - {C76BF5B3-985E-4D39-95FE-97C9C879B83A}.VisualTests|Any CPU.Build.0 = Debug|Any CPU {D9A367C9-4C1A-489F-9B05-A0CEA2B53B58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D9A367C9-4C1A-489F-9B05-A0CEA2B53B58}.Debug|Any CPU.Build.0 = Debug|Any CPU {D9A367C9-4C1A-489F-9B05-A0CEA2B53B58}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -74,9 +64,6 @@ Global {48F4582B-7687-4621-9CBE-5C24197CB536}.Release|Any CPU.Build.0 = Release|Any CPU {48F4582B-7687-4621-9CBE-5C24197CB536}.VisualTests|Any CPU.ActiveCfg = Debug|Any CPU {48F4582B-7687-4621-9CBE-5C24197CB536}.VisualTests|Any CPU.Build.0 = Debug|Any CPU - {BAEA2F74-0315-4667-84E0-ACAC0B4BF785}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAEA2F74-0315-4667-84E0-ACAC0B4BF785}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAEA2F74-0315-4667-84E0-ACAC0B4BF785}.VisualTests|Any CPU.ActiveCfg = Debug|Any CPU {54377672-20B1-40AF-8087-5CF73BF3953A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {54377672-20B1-40AF-8087-5CF73BF3953A}.Debug|Any CPU.Build.0 = Debug|Any CPU {54377672-20B1-40AF-8087-5CF73BF3953A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -87,8 +74,8 @@ Global {419659FD-72EA-4678-9EB8-B22A746CED70}.Debug|Any CPU.Build.0 = Debug|Any CPU {419659FD-72EA-4678-9EB8-B22A746CED70}.Release|Any CPU.ActiveCfg = Release|Any CPU {419659FD-72EA-4678-9EB8-B22A746CED70}.Release|Any CPU.Build.0 = Release|Any CPU - {419659FD-72EA-4678-9EB8-B22A746CED70}.VisualTests|Any CPU.ActiveCfg = VisualTests|Any CPU - {419659FD-72EA-4678-9EB8-B22A746CED70}.VisualTests|Any CPU.Build.0 = VisualTests|Any CPU + {419659FD-72EA-4678-9EB8-B22A746CED70}.VisualTests|Any CPU.ActiveCfg = Release|Any CPU + {419659FD-72EA-4678-9EB8-B22A746CED70}.VisualTests|Any CPU.Build.0 = Release|Any CPU {5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.Build.0 = Debug|Any CPU {5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/pippidon.sln.DotSettings b/pippidon.sln.DotSettings index fdfbf25..b3f60a0 100644 --- a/pippidon.sln.DotSettings +++ b/pippidon.sln.DotSettings @@ -167,6 +167,7 @@ NEXT_LINE NEXT_LINE True + NEVER False False True @@ -649,7 +650,11 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-frame <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> True + True + True + True True True + True True True