From 4590be552fcc61bdbd1ae8372115fb91dfdeb294 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 14 Nov 2016 18:54:24 +0900 Subject: [PATCH] Move play modes to their own projects. --- .../Platform/TestStorage.cs | 12 ++- .../Tests/TestCaseGamefield.cs | 6 +- .../Tests/TestCaseHitObjects.cs | 4 +- .../Tests/TestCaseMusicController.cs | 13 +-- .../Tests/TestCasePlaySongSelect.cs | 9 +- .../Tests/TestCasePlayer.cs | 2 +- .../Tests/TestCaseScoreCounter.cs | 5 ++ osu.Desktop.VisualTests/VisualTestGame.cs | 1 - .../osu.Desktop.VisualTests.csproj | 24 +++-- osu.Desktop/osu.Desktop.csproj | 12 +-- .../Objects/Drawables/DrawableHitCircle.cs | 15 ++-- .../Objects/HitCircle.cs | 2 +- .../Objects}/OsuBaseHit.cs | 3 +- .../Objects}/OsuConverter.cs | 5 +- .../Objects}/Slider.cs | 2 +- .../Objects}/Spinner.cs | 2 +- osu.Game.Mode.Osu/OpenTK.dll.config | 25 ++++++ .../Osu => osu.Game.Mode.Osu}/OsuRuleset.cs | 4 +- osu.Game.Mode.Osu/Properties/AssemblyInfo.cs | 36 ++++++++ .../UI}/OsuComboCounter.cs | 3 +- .../UI}/OsuHitRenderer.cs | 9 +- .../UI}/OsuPlayfield.cs | 3 +- .../UI}/ScoreOverlayOsu.cs | 17 ++-- osu.Game.Mode.Osu/app.config | 11 +++ osu.Game.Mode.Osu/osu.Game.Modes.Osu.csproj | 80 +++++++++++++++++ osu.Game.Mode.Osu/packages.config | 4 + .../CatchRuleset.cs | 4 +- .../Objects}/CatchBaseHit.cs | 4 +- .../Objects}/CatchConverter.cs | 5 +- .../Objects}/Drawable/DrawableFruit.cs | 2 +- .../Objects}/Droplet.cs | 2 +- .../Objects}/Fruit.cs | 2 +- osu.Game.Modes.Catch/OpenTK.dll.config | 25 ++++++ .../Properties/AssemblyInfo.cs | 36 ++++++++ .../UI}/CatchComboCounter.cs | 4 +- .../UI}/CatchHitRenderer.cs | 5 +- .../UI}/CatchPlayfield.cs | 3 +- .../osu.Game.Modes.Catch.csproj | 85 ++++++++++++++++++ osu.Game.Modes.Catch/packages.config | 4 + .../ManiaRuleset.cs | 3 + .../Objects}/Drawable/DrawableNote.cs | 4 +- .../Objects}/HoldNote.cs | 2 +- .../Objects}/ManiaBaseHit.cs | 4 +- .../Objects}/ManiaConverter.cs | 5 +- .../Objects}/Note.cs | 2 +- osu.Game.Modes.Mania/OpenTK.dll.config | 25 ++++++ .../Properties/AssemblyInfo.cs | 36 ++++++++ .../UI}/ManiaComboCounter.cs | 4 +- .../UI}/ManiaHitRenderer.cs | 5 +- .../UI}/ManiaPlayfield.cs | 3 +- osu.Game.Modes.Mania/app.config | 11 +++ .../osu.Game.Modes.Mania.csproj | 90 +++++++++++++++++++ osu.Game.Modes.Mania/packages.config | 4 + .../Objects}/Drawable/DrawableTaikoHit.cs | 2 +- .../Objects}/TaikoBaseHit.cs | 4 +- .../Objects}/TaikoConverter.cs | 5 +- osu.Game.Modes.Taiko/OpenTK.dll.config | 25 ++++++ .../Properties/AssemblyInfo.cs | 36 ++++++++ .../TaikoRuleset.cs | 4 +- .../UI}/TaikoComboCounter.cs | 3 +- .../UI}/TaikoHitRenderer.cs | 5 +- .../UI}/TaikoPlayfield.cs | 3 +- .../osu.Game.Modes.Taiko.csproj | 83 +++++++++++++++++ osu.Game.Modes.Taiko/packages.config | 4 + .../Beatmaps/Formats/OsuLegacyDecoderTest.cs | 2 +- osu.Game.Tests/osu.Game.Tests.csproj | 4 + osu.Game/Modes/Objects/HitObject.cs | 3 +- osu.Game/Modes/Objects/HitObjectConverter.cs | 1 + osu.Game/Modes/Ruleset.cs | 21 +++-- osu.Game/Modes/{ => UI}/ComboCounter.cs | 2 +- osu.Game/Modes/{ => UI}/ComboResultCounter.cs | 2 +- osu.Game/Modes/{ => UI}/HitRenderer.cs | 2 +- osu.Game/Modes/{ => UI}/Playfield.cs | 2 +- osu.Game/Modes/{ => UI}/ScoreOverlay.cs | 2 +- osu.Game/Screens/Play/Player.cs | 1 + osu.Game/osu.Game.csproj | 46 ++-------- osu.sln | 28 ++++++ 77 files changed, 820 insertions(+), 158 deletions(-) rename osu.Game/Modes/Objects/Osu/Drawable/DrawableCircle.cs => osu.Game.Mode.Osu/Objects/Drawables/DrawableHitCircle.cs (92%) rename osu.Game/Modes/Objects/Osu/Circle.cs => osu.Game.Mode.Osu/Objects/HitCircle.cs (81%) rename {osu.Game/Modes/Objects/Osu => osu.Game.Mode.Osu/Objects}/OsuBaseHit.cs (93%) rename {osu.Game/Modes/Objects/Osu => osu.Game.Mode.Osu/Objects}/OsuConverter.cs (75%) rename {osu.Game/Modes/Objects/Osu => osu.Game.Mode.Osu/Objects}/Slider.cs (86%) rename {osu.Game/Modes/Objects/Osu => osu.Game.Mode.Osu/Objects}/Spinner.cs (81%) create mode 100644 osu.Game.Mode.Osu/OpenTK.dll.config rename {osu.Game/Modes/Osu => osu.Game.Mode.Osu}/OsuRuleset.cs (76%) create mode 100644 osu.Game.Mode.Osu/Properties/AssemblyInfo.cs rename {osu.Game/Modes/Osu => osu.Game.Mode.Osu/UI}/OsuComboCounter.cs (95%) rename {osu.Game/Modes/Osu => osu.Game.Mode.Osu/UI}/OsuHitRenderer.cs (64%) rename {osu.Game/Modes/Osu => osu.Game.Mode.Osu/UI}/OsuPlayfield.cs (93%) rename {osu.Game/Modes/Osu => osu.Game.Mode.Osu/UI}/ScoreOverlayOsu.cs (74%) create mode 100644 osu.Game.Mode.Osu/app.config create mode 100644 osu.Game.Mode.Osu/osu.Game.Modes.Osu.csproj create mode 100644 osu.Game.Mode.Osu/packages.config rename {osu.Game/Modes/Catch => osu.Game.Modes.Catch}/CatchRuleset.cs (83%) rename {osu.Game/Modes/Objects/Catch => osu.Game.Modes.Catch/Objects}/CatchBaseHit.cs (75%) rename {osu.Game/Modes/Objects/Catch => osu.Game.Modes.Catch/Objects}/CatchConverter.cs (87%) rename {osu.Game/Modes/Objects/Catch => osu.Game.Modes.Catch/Objects}/Drawable/DrawableFruit.cs (93%) rename {osu.Game/Modes/Objects/Catch => osu.Game.Modes.Catch/Objects}/Droplet.cs (81%) rename {osu.Game/Modes/Objects/Catch => osu.Game.Modes.Catch/Objects}/Fruit.cs (81%) create mode 100644 osu.Game.Modes.Catch/OpenTK.dll.config create mode 100644 osu.Game.Modes.Catch/Properties/AssemblyInfo.cs rename {osu.Game/Modes/Catch => osu.Game.Modes.Catch/UI}/CatchComboCounter.cs (93%) rename {osu.Game/Modes/Catch => osu.Game.Modes.Catch/UI}/CatchHitRenderer.cs (83%) rename {osu.Game/Modes/Catch => osu.Game.Modes.Catch/UI}/CatchPlayfield.cs (87%) create mode 100644 osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj create mode 100644 osu.Game.Modes.Catch/packages.config rename {osu.Game/Modes/Mania => osu.Game.Modes.Mania}/ManiaRuleset.cs (83%) rename {osu.Game/Modes/Objects/Mania => osu.Game.Modes.Mania/Objects}/Drawable/DrawableNote.cs (93%) rename {osu.Game/Modes/Objects/Mania => osu.Game.Modes.Mania/Objects}/HoldNote.cs (80%) rename {osu.Game/Modes/Objects/Mania => osu.Game.Modes.Mania/Objects}/ManiaBaseHit.cs (75%) rename {osu.Game/Modes/Objects/Mania => osu.Game.Modes.Mania/Objects}/ManiaConverter.cs (88%) rename {osu.Game/Modes/Objects/Mania => osu.Game.Modes.Mania/Objects}/Note.cs (81%) create mode 100644 osu.Game.Modes.Mania/OpenTK.dll.config create mode 100644 osu.Game.Modes.Mania/Properties/AssemblyInfo.cs rename {osu.Game/Modes/Mania => osu.Game.Modes.Mania/UI}/ManiaComboCounter.cs (94%) rename {osu.Game/Modes/Mania => osu.Game.Modes.Mania/UI}/ManiaHitRenderer.cs (87%) rename {osu.Game/Modes/Mania => osu.Game.Modes.Mania/UI}/ManiaPlayfield.cs (91%) create mode 100644 osu.Game.Modes.Mania/app.config create mode 100644 osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj create mode 100644 osu.Game.Modes.Mania/packages.config rename {osu.Game/Modes/Objects/Taiko => osu.Game.Modes.Taiko/Objects}/Drawable/DrawableTaikoHit.cs (93%) rename {osu.Game/Modes/Objects/Taiko => osu.Game.Modes.Taiko/Objects}/TaikoBaseHit.cs (79%) rename {osu.Game/Modes/Objects/Taiko => osu.Game.Modes.Taiko/Objects}/TaikoConverter.cs (87%) create mode 100644 osu.Game.Modes.Taiko/OpenTK.dll.config create mode 100644 osu.Game.Modes.Taiko/Properties/AssemblyInfo.cs rename {osu.Game/Modes/Taiko => osu.Game.Modes.Taiko}/TaikoRuleset.cs (83%) rename {osu.Game/Modes/Taiko => osu.Game.Modes.Taiko/UI}/TaikoComboCounter.cs (94%) rename {osu.Game/Modes/Taiko => osu.Game.Modes.Taiko/UI}/TaikoHitRenderer.cs (83%) rename {osu.Game/Modes/Taiko => osu.Game.Modes.Taiko/UI}/TaikoPlayfield.cs (91%) create mode 100644 osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj create mode 100644 osu.Game.Modes.Taiko/packages.config rename osu.Game/Modes/{ => UI}/ComboCounter.cs (96%) rename osu.Game/Modes/{ => UI}/ComboResultCounter.cs (95%) rename osu.Game/Modes/{ => UI}/HitRenderer.cs (95%) rename osu.Game/Modes/{ => UI}/Playfield.cs (86%) rename osu.Game/Modes/{ => UI}/ScoreOverlay.cs (95%) diff --git a/osu.Desktop.VisualTests/Platform/TestStorage.cs b/osu.Desktop.VisualTests/Platform/TestStorage.cs index bffa3420d4..2a6b5a787c 100644 --- a/osu.Desktop.VisualTests/Platform/TestStorage.cs +++ b/osu.Desktop.VisualTests/Platform/TestStorage.cs @@ -1,13 +1,11 @@ -using System; -using System.IO; -using osu.Framework; +using osu.Framework; using osu.Framework.Desktop.Platform; using SQLite.Net; -using SQLite.Net.Platform.Generic; using SQLite.Net.Interop; -using SQLite.Net.Platform.Win32; - -namespace osu.Desktop.Platform +using SQLite.Net.Platform.Generic; +using SQLite.Net.Platform.Win32; + +namespace osu.Desktop.VisualTests.Platform { public class TestStorage : DesktopStorage { diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs index 4793f9f157..1ffe76bdda 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs @@ -8,11 +8,15 @@ using osu.Framework.MathUtils; using osu.Framework.Timing; using osu.Game.Beatmaps; using osu.Game.Modes.Catch; +using osu.Game.Modes.Catch.UI; using osu.Game.Modes.Mania; +using osu.Game.Modes.Mania.UI; using osu.Game.Modes.Objects; -using osu.Game.Modes.Objects.Osu; using osu.Game.Modes.Osu; +using osu.Game.Modes.Osu.Objects; +using osu.Game.Modes.Osu.UI; using osu.Game.Modes.Taiko; +using osu.Game.Modes.Taiko.UI; using OpenTK; namespace osu.Desktop.VisualTests.Tests diff --git a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs index c55b326b82..904123dd50 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs @@ -8,8 +8,8 @@ using osu.Framework.Timing; using OpenTK; using osu.Framework.Allocation; using osu.Game.Modes.Objects; -using osu.Game.Modes.Objects.Osu; -using osu.Game.Modes.Objects.Osu.Drawable; +using osu.Game.Modes.Osu.Objects; +using osu.Game.Modes.Osu.Objects.Drawables; namespace osu.Desktop.VisualTests.Tests { diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs b/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs index bdf20ee73c..72ab3b7a7f 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs @@ -1,19 +1,12 @@ //Copyright (c) 2007-2016 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 System.Text; -using System.Threading.Tasks; -using osu.Framework.Allocation; -using osu.Framework.Graphics; using osu.Framework.GameModes.Testing; -using osu.Game.Overlays; +using osu.Framework.Graphics; using osu.Framework.Timing; -using osu.Framework; +using osu.Game.Overlays; -namespace osu.Desktop.Tests +namespace osu.Desktop.VisualTests.Tests { class TestCaseMusicController : TestCase { diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs b/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs index caf4c90aa7..d6e656e57f 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs @@ -1,17 +1,14 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Framework.GameModes.Testing; using System.Collections.Generic; -using osu.Desktop.Platform; +using osu.Desktop.VisualTests.Platform; +using osu.Framework.GameModes.Testing; using osu.Game.Database; -using SQLiteNetExtensions.Extensions; -using osu.Framework; -using osu.Game; using osu.Game.Modes; using osu.Game.Screens.Play; -namespace osu.Desktop.Tests +namespace osu.Desktop.VisualTests.Tests { class TestCasePlaySongSelect : TestCase { diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs index c3b7034f79..862377c131 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs @@ -11,7 +11,7 @@ using OpenTK; using osu.Framework; using osu.Framework.Allocation; using osu.Game.Modes.Objects; -using osu.Game.Modes.Objects.Osu; +using osu.Game.Modes.Osu.Objects; using osu.Game.Screens.Play; namespace osu.Desktop.VisualTests.Tests diff --git a/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs index 005124e3c5..7629c33780 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs @@ -9,9 +9,14 @@ using osu.Framework.MathUtils; using osu.Game.Graphics.UserInterface; using osu.Game.Modes; using osu.Game.Modes.Catch; +using osu.Game.Modes.Catch.UI; using osu.Game.Modes.Mania; +using osu.Game.Modes.Mania.UI; using osu.Game.Modes.Osu; +using osu.Game.Modes.Osu.UI; using osu.Game.Modes.Taiko; +using osu.Game.Modes.Taiko.UI; +using osu.Game.Modes.UI; using osu.Game.Screens.Play; using OpenTK; using OpenTK.Graphics; diff --git a/osu.Desktop.VisualTests/VisualTestGame.cs b/osu.Desktop.VisualTests/VisualTestGame.cs index 4d5d349fca..0dc260e1fd 100644 --- a/osu.Desktop.VisualTests/VisualTestGame.cs +++ b/osu.Desktop.VisualTests/VisualTestGame.cs @@ -11,7 +11,6 @@ using System.Reflection; using System.IO; using System.Collections.Generic; using SQLiteNetExtensions.Extensions; -using osu.Desktop.Platform; using osu.Framework.Allocation; namespace osu.Desktop.VisualTests diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj index e8f8656f15..d12ecc273d 100644 --- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj +++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj @@ -150,6 +150,22 @@ {d9a367c9-4c1a-489f-9b05-a0cea2b53b58} osu.Game.Resources + + {c92a607b-1fdd-4954-9f92-03ff547d9080} + osu.Game.Modes.Osu + + + {58f6c80c-1253-4a0e-a465-b8c85ebeadf3} + osu.Game.Modes.Catch + + + {48f4582b-7687-4621-9cbe-5c24197cb536} + osu.Game.Modes.Mania + + + {f167e17a-7de6-4af5-b920-a5112296c695} + osu.Game.Modes.Taiko + {0d3fbf8a-7464-4cf7-8c90-3e7886df2d4d} osu.Game @@ -158,9 +174,9 @@ + - @@ -172,9 +188,7 @@ - - - + + + + + + + + diff --git a/osu.Game/Modes/Osu/OsuRuleset.cs b/osu.Game.Mode.Osu/OsuRuleset.cs similarity index 76% rename from osu.Game/Modes/Osu/OsuRuleset.cs rename to osu.Game.Mode.Osu/OsuRuleset.cs index bf7c7498ec..27154fa646 100644 --- a/osu.Game/Modes/Osu/OsuRuleset.cs +++ b/osu.Game.Mode.Osu/OsuRuleset.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using osu.Game.Modes.Objects; +using osu.Game.Modes.Osu.UI; +using osu.Game.Modes.UI; namespace osu.Game.Modes.Osu { @@ -10,5 +12,5 @@ namespace osu.Game.Modes.Osu { public override ScoreOverlay CreateScoreOverlay() => new ScoreOverlayOsu(); - public override HitRenderer CreateHitRendererWith(List objects) => new OsuHitRenderer { Objects = objects }; + public override HitRenderer CreateHitRendererWith(List objects) => new UI.OsuHitRenderer { Objects = objects }; }} diff --git a/osu.Game.Mode.Osu/Properties/AssemblyInfo.cs b/osu.Game.Mode.Osu/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..1b0664acf5 --- /dev/null +++ b/osu.Game.Mode.Osu/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +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.Mode.Osu")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("osu.Game.Mode.Osu")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[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("c92a607b-1fdd-4954-9f92-03ff547d9080")] + +// 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/Modes/Osu/OsuComboCounter.cs b/osu.Game.Mode.Osu/UI/OsuComboCounter.cs similarity index 95% rename from osu.Game/Modes/Osu/OsuComboCounter.cs rename to osu.Game.Mode.Osu/UI/OsuComboCounter.cs index 58edaa096c..a10a1fbcbf 100644 --- a/osu.Game/Modes/Osu/OsuComboCounter.cs +++ b/osu.Game.Mode.Osu/UI/OsuComboCounter.cs @@ -1,9 +1,10 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using osu.Game.Modes.UI; using OpenTK; -namespace osu.Game.Modes.Osu +namespace osu.Game.Modes.Osu.UI { /// /// Uses the 'x' symbol and has a pop-out effect while rolling over. Used in osu! standard. diff --git a/osu.Game/Modes/Osu/OsuHitRenderer.cs b/osu.Game.Mode.Osu/UI/OsuHitRenderer.cs similarity index 64% rename from osu.Game/Modes/Osu/OsuHitRenderer.cs rename to osu.Game.Mode.Osu/UI/OsuHitRenderer.cs index ffed72d8f1..94f4ba2fd4 100644 --- a/osu.Game/Modes/Osu/OsuHitRenderer.cs +++ b/osu.Game.Mode.Osu/UI/OsuHitRenderer.cs @@ -2,10 +2,13 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Game.Modes.Objects; -using osu.Game.Modes.Objects.Osu; -using osu.Game.Modes.Objects.Osu.Drawable; +using osu.Game.Modes.UI; +using Circle = osu.Game.Modes.Osu.Objects.Circle; +using DrawableCircle = osu.Game.Modes.Osu.Objects.Drawables.DrawableCircle; +using OsuBaseHit = osu.Game.Modes.Osu.Objects.OsuBaseHit; +using OsuConverter = osu.Game.Modes.Osu.Objects.OsuConverter; -namespace osu.Game.Modes.Osu +namespace osu.Game.Modes.Osu.UI { public class OsuHitRenderer : HitRenderer { diff --git a/osu.Game/Modes/Osu/OsuPlayfield.cs b/osu.Game.Mode.Osu/UI/OsuPlayfield.cs similarity index 93% rename from osu.Game/Modes/Osu/OsuPlayfield.cs rename to osu.Game.Mode.Osu/UI/OsuPlayfield.cs index 33dc9a7cc4..93700db30b 100644 --- a/osu.Game/Modes/Osu/OsuPlayfield.cs +++ b/osu.Game.Mode.Osu/UI/OsuPlayfield.cs @@ -4,10 +4,11 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; +using osu.Game.Modes.UI; using OpenTK; using OpenTK.Graphics; -namespace osu.Game.Modes.Osu +namespace osu.Game.Modes.Osu.UI { public class OsuPlayfield : Playfield { diff --git a/osu.Game/Modes/Osu/ScoreOverlayOsu.cs b/osu.Game.Mode.Osu/UI/ScoreOverlayOsu.cs similarity index 74% rename from osu.Game/Modes/Osu/ScoreOverlayOsu.cs rename to osu.Game.Mode.Osu/UI/ScoreOverlayOsu.cs index 3654191b8d..911a462ca2 100644 --- a/osu.Game/Modes/Osu/ScoreOverlayOsu.cs +++ b/osu.Game.Mode.Osu/UI/ScoreOverlayOsu.cs @@ -3,12 +3,13 @@ using osu.Framework.Graphics; using osu.Game.Graphics.UserInterface; +using osu.Game.Modes.UI; using OpenTK; using OpenTK.Input; -namespace osu.Game.Modes.Osu +namespace osu.Game.Modes.Osu.UI { - class ScoreOverlayOsu : ScoreOverlay + public class ScoreOverlayOsu : ScoreOverlay { protected override PercentageCounter CreateAccuracyCounter() => new PercentageCounter() { @@ -38,12 +39,12 @@ namespace osu.Game.Modes.Osu Origin = Anchor.BottomRight, Position = new Vector2(10), Counters = new KeyCounter[] - { - new KeyCounterKeyboard(@"Z", Key.Z), - new KeyCounterKeyboard(@"X", Key.X), - new KeyCounterMouse(@"M1", MouseButton.Left), - new KeyCounterMouse(@"M2", MouseButton.Right), - } + { + new KeyCounterKeyboard(@"Z", Key.Z), + new KeyCounterKeyboard(@"X", Key.X), + new KeyCounterMouse(@"M1", MouseButton.Left), + new KeyCounterMouse(@"M2", MouseButton.Right), + } }; } } diff --git a/osu.Game.Mode.Osu/app.config b/osu.Game.Mode.Osu/app.config new file mode 100644 index 0000000000..757f23cb22 --- /dev/null +++ b/osu.Game.Mode.Osu/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/osu.Game.Mode.Osu/osu.Game.Modes.Osu.csproj b/osu.Game.Mode.Osu/osu.Game.Modes.Osu.csproj new file mode 100644 index 0000000000..e53a760db6 --- /dev/null +++ b/osu.Game.Mode.Osu/osu.Game.Modes.Osu.csproj @@ -0,0 +1,80 @@ + + + + + Debug + AnyCPU + {C92A607B-1FDD-4954-9F92-03FF547D9080} + Library + Properties + osu.Game.Modes.Osu + osu.Game.Mode.Osu + v4.5 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll + True + + + + + + + + + + + + + + + + + + + + + + + {C76BF5B3-985E-4D39-95FE-97C9C879B83A} + osu.Framework + + + {0d3fbf8a-7464-4cf7-8c90-3e7886df2d4d} + osu.Game + + + + + + + + + + \ No newline at end of file diff --git a/osu.Game.Mode.Osu/packages.config b/osu.Game.Mode.Osu/packages.config new file mode 100644 index 0000000000..e1adbd7260 --- /dev/null +++ b/osu.Game.Mode.Osu/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/osu.Game/Modes/Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs similarity index 83% rename from osu.Game/Modes/Catch/CatchRuleset.cs rename to osu.Game.Modes.Catch/CatchRuleset.cs index a92518b0db..91385155b8 100644 --- a/osu.Game/Modes/Catch/CatchRuleset.cs +++ b/osu.Game.Modes.Catch/CatchRuleset.cs @@ -2,8 +2,10 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; +using osu.Game.Modes.Catch.UI; using osu.Game.Modes.Objects; -using osu.Game.Modes.Osu; +using osu.Game.Modes.Osu.UI; +using osu.Game.Modes.UI; namespace osu.Game.Modes.Catch { diff --git a/osu.Game/Modes/Objects/Catch/CatchBaseHit.cs b/osu.Game.Modes.Catch/Objects/CatchBaseHit.cs similarity index 75% rename from osu.Game/Modes/Objects/Catch/CatchBaseHit.cs rename to osu.Game.Modes.Catch/Objects/CatchBaseHit.cs index 29bc967e01..67e94e7000 100644 --- a/osu.Game/Modes/Objects/Catch/CatchBaseHit.cs +++ b/osu.Game.Modes.Catch/Objects/CatchBaseHit.cs @@ -1,7 +1,9 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Modes.Objects.Catch +using osu.Game.Modes.Objects; + +namespace osu.Game.Modes.Catch.Objects { public abstract class CatchBaseHit : HitObject { diff --git a/osu.Game/Modes/Objects/Catch/CatchConverter.cs b/osu.Game.Modes.Catch/Objects/CatchConverter.cs similarity index 87% rename from osu.Game/Modes/Objects/Catch/CatchConverter.cs rename to osu.Game.Modes.Catch/Objects/CatchConverter.cs index 49d889df23..81eabc15a2 100644 --- a/osu.Game/Modes/Objects/Catch/CatchConverter.cs +++ b/osu.Game.Modes.Catch/Objects/CatchConverter.cs @@ -2,9 +2,10 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; -using osu.Game.Modes.Objects.Osu; +using osu.Game.Modes.Objects; +using osu.Game.Modes.Osu.Objects; -namespace osu.Game.Modes.Objects.Catch +namespace osu.Game.Modes.Catch.Objects { class CatchConverter : HitObjectConverter { diff --git a/osu.Game/Modes/Objects/Catch/Drawable/DrawableFruit.cs b/osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs similarity index 93% rename from osu.Game/Modes/Objects/Catch/Drawable/DrawableFruit.cs rename to osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs index b0a5a2f16d..dd9cfbcc6b 100644 --- a/osu.Game/Modes/Objects/Catch/Drawable/DrawableFruit.cs +++ b/osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs @@ -8,7 +8,7 @@ using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Transformations; using OpenTK; -namespace osu.Game.Modes.Objects.Catch.Drawable +namespace osu.Game.Modes.Catch.Objects.Drawable { class DrawableFruit : Sprite { diff --git a/osu.Game/Modes/Objects/Catch/Droplet.cs b/osu.Game.Modes.Catch/Objects/Droplet.cs similarity index 81% rename from osu.Game/Modes/Objects/Catch/Droplet.cs rename to osu.Game.Modes.Catch/Objects/Droplet.cs index e33dc29138..42ad809e2c 100644 --- a/osu.Game/Modes/Objects/Catch/Droplet.cs +++ b/osu.Game.Modes.Catch/Objects/Droplet.cs @@ -1,7 +1,7 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Modes.Objects.Catch +namespace osu.Game.Modes.Catch.Objects { public class Droplet : CatchBaseHit { diff --git a/osu.Game/Modes/Objects/Catch/Fruit.cs b/osu.Game.Modes.Catch/Objects/Fruit.cs similarity index 81% rename from osu.Game/Modes/Objects/Catch/Fruit.cs rename to osu.Game.Modes.Catch/Objects/Fruit.cs index ee7bc38c6d..f1cb3d6db4 100644 --- a/osu.Game/Modes/Objects/Catch/Fruit.cs +++ b/osu.Game.Modes.Catch/Objects/Fruit.cs @@ -1,7 +1,7 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Modes.Objects.Catch +namespace osu.Game.Modes.Catch.Objects { public class Fruit : CatchBaseHit { diff --git a/osu.Game.Modes.Catch/OpenTK.dll.config b/osu.Game.Modes.Catch/OpenTK.dll.config new file mode 100644 index 0000000000..5620e3d9e2 --- /dev/null +++ b/osu.Game.Modes.Catch/OpenTK.dll.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/osu.Game.Modes.Catch/Properties/AssemblyInfo.cs b/osu.Game.Modes.Catch/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..4f0e60baaf --- /dev/null +++ b/osu.Game.Modes.Catch/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +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.Modes.Catch")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("osu.Game.Modes.Catch")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[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("58f6c80c-1253-4a0e-a465-b8c85ebeadf3")] + +// 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/Modes/Catch/CatchComboCounter.cs b/osu.Game.Modes.Catch/UI/CatchComboCounter.cs similarity index 93% rename from osu.Game/Modes/Catch/CatchComboCounter.cs rename to osu.Game.Modes.Catch/UI/CatchComboCounter.cs index ee972ac49a..685516f352 100644 --- a/osu.Game/Modes/Catch/CatchComboCounter.cs +++ b/osu.Game.Modes.Catch/UI/CatchComboCounter.cs @@ -1,10 +1,10 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Game.Modes.Osu; +using osu.Game.Modes.Osu.UI; using OpenTK.Graphics; -namespace osu.Game.Modes.Catch +namespace osu.Game.Modes.Catch.UI { /// /// Similar to Standard, but without the 'x' and has tinted pop-ups. Used in osu!catch. diff --git a/osu.Game/Modes/Catch/CatchHitRenderer.cs b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs similarity index 83% rename from osu.Game/Modes/Catch/CatchHitRenderer.cs rename to osu.Game.Modes.Catch/UI/CatchHitRenderer.cs index a796d70c0e..4d58ce6278 100644 --- a/osu.Game/Modes/Catch/CatchHitRenderer.cs +++ b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs @@ -1,10 +1,11 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using osu.Game.Modes.Catch.Objects; using osu.Game.Modes.Objects; -using osu.Game.Modes.Objects.Catch; +using osu.Game.Modes.UI; -namespace osu.Game.Modes.Catch +namespace osu.Game.Modes.Catch.UI { public class CatchHitRenderer : HitRenderer { diff --git a/osu.Game/Modes/Catch/CatchPlayfield.cs b/osu.Game.Modes.Catch/UI/CatchPlayfield.cs similarity index 87% rename from osu.Game/Modes/Catch/CatchPlayfield.cs rename to osu.Game.Modes.Catch/UI/CatchPlayfield.cs index ca323f81d5..4b6b2ab531 100644 --- a/osu.Game/Modes/Catch/CatchPlayfield.cs +++ b/osu.Game.Modes.Catch/UI/CatchPlayfield.cs @@ -3,9 +3,10 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; +using osu.Game.Modes.UI; using OpenTK; -namespace osu.Game.Modes.Catch +namespace osu.Game.Modes.Catch.UI { public class CatchPlayfield : Playfield { diff --git a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj new file mode 100644 index 0000000000..1db852e438 --- /dev/null +++ b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj @@ -0,0 +1,85 @@ + + + + + Debug + AnyCPU + {58F6C80C-1253-4A0E-A465-B8C85EBEADF3} + Library + Properties + osu.Game.Modes.Catch + osu.Game.Modes.Catch + v4.5 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {C76BF5B3-985E-4D39-95FE-97C9C879B83A} + osu.Framework + + + {C92A607B-1FDD-4954-9F92-03FF547D9080} + osu.Game.Modes.Osu + + + {0D3FBF8A-7464-4CF7-8C90-3E7886DF2D4D} + osu.Game + + + + + \ No newline at end of file diff --git a/osu.Game.Modes.Catch/packages.config b/osu.Game.Modes.Catch/packages.config new file mode 100644 index 0000000000..4da07d9f06 --- /dev/null +++ b/osu.Game.Modes.Catch/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/osu.Game/Modes/Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs similarity index 83% rename from osu.Game/Modes/Mania/ManiaRuleset.cs rename to osu.Game.Modes.Mania/ManiaRuleset.cs index 29935ce6f8..5dd9167e75 100644 --- a/osu.Game/Modes/Mania/ManiaRuleset.cs +++ b/osu.Game.Modes.Mania/ManiaRuleset.cs @@ -2,8 +2,11 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; +using osu.Game.Modes.Mania.UI; using osu.Game.Modes.Objects; using osu.Game.Modes.Osu; +using osu.Game.Modes.Osu.UI; +using osu.Game.Modes.UI; namespace osu.Game.Modes.Mania { diff --git a/osu.Game/Modes/Objects/Mania/Drawable/DrawableNote.cs b/osu.Game.Modes.Mania/Objects/Drawable/DrawableNote.cs similarity index 93% rename from osu.Game/Modes/Objects/Mania/Drawable/DrawableNote.cs rename to osu.Game.Modes.Mania/Objects/Drawable/DrawableNote.cs index 34c7217dbb..1d81ab16f8 100644 --- a/osu.Game/Modes/Objects/Mania/Drawable/DrawableNote.cs +++ b/osu.Game.Modes.Mania/Objects/Drawable/DrawableNote.cs @@ -2,13 +2,13 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Allocation; -using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Transformations; +using osu.Framework.Graphics; using OpenTK; -namespace osu.Game.Modes.Objects.Mania.Drawable +namespace osu.Game.Modes.Mania.Objects.Drawable { public class DrawableNote : Sprite { diff --git a/osu.Game/Modes/Objects/Mania/HoldNote.cs b/osu.Game.Modes.Mania/Objects/HoldNote.cs similarity index 80% rename from osu.Game/Modes/Objects/Mania/HoldNote.cs rename to osu.Game.Modes.Mania/Objects/HoldNote.cs index fd6ff8ba6d..7c12593d79 100644 --- a/osu.Game/Modes/Objects/Mania/HoldNote.cs +++ b/osu.Game.Modes.Mania/Objects/HoldNote.cs @@ -1,7 +1,7 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Modes.Objects.Mania +namespace osu.Game.Modes.Mania.Objects { public class HoldNote : Note { diff --git a/osu.Game/Modes/Objects/Mania/ManiaBaseHit.cs b/osu.Game.Modes.Mania/Objects/ManiaBaseHit.cs similarity index 75% rename from osu.Game/Modes/Objects/Mania/ManiaBaseHit.cs rename to osu.Game.Modes.Mania/Objects/ManiaBaseHit.cs index 09ad613f1b..efb2c20959 100644 --- a/osu.Game/Modes/Objects/Mania/ManiaBaseHit.cs +++ b/osu.Game.Modes.Mania/Objects/ManiaBaseHit.cs @@ -1,7 +1,9 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Modes.Objects.Mania +using osu.Game.Modes.Objects; + +namespace osu.Game.Modes.Mania.Objects { public abstract class ManiaBaseHit : HitObject { diff --git a/osu.Game/Modes/Objects/Mania/ManiaConverter.cs b/osu.Game.Modes.Mania/Objects/ManiaConverter.cs similarity index 88% rename from osu.Game/Modes/Objects/Mania/ManiaConverter.cs rename to osu.Game.Modes.Mania/Objects/ManiaConverter.cs index 06a2481875..d07d88d970 100644 --- a/osu.Game/Modes/Objects/Mania/ManiaConverter.cs +++ b/osu.Game.Modes.Mania/Objects/ManiaConverter.cs @@ -3,9 +3,10 @@ using System; using System.Collections.Generic; -using osu.Game.Modes.Objects.Osu; +using osu.Game.Modes.Objects; +using osu.Game.Modes.Osu.Objects; -namespace osu.Game.Modes.Objects.Mania +namespace osu.Game.Modes.Mania.Objects { class ManiaConverter : HitObjectConverter { diff --git a/osu.Game/Modes/Objects/Mania/Note.cs b/osu.Game.Modes.Mania/Objects/Note.cs similarity index 81% rename from osu.Game/Modes/Objects/Mania/Note.cs rename to osu.Game.Modes.Mania/Objects/Note.cs index df8c06f9bd..ec1ee270e3 100644 --- a/osu.Game/Modes/Objects/Mania/Note.cs +++ b/osu.Game.Modes.Mania/Objects/Note.cs @@ -1,7 +1,7 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Modes.Objects.Mania +namespace osu.Game.Modes.Mania.Objects { public class Note : ManiaBaseHit { diff --git a/osu.Game.Modes.Mania/OpenTK.dll.config b/osu.Game.Modes.Mania/OpenTK.dll.config new file mode 100644 index 0000000000..5620e3d9e2 --- /dev/null +++ b/osu.Game.Modes.Mania/OpenTK.dll.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/osu.Game.Modes.Mania/Properties/AssemblyInfo.cs b/osu.Game.Modes.Mania/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..0ac2657410 --- /dev/null +++ b/osu.Game.Modes.Mania/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +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.Modes.Mania")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("osu.Game.Modes.Mania")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[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("48f4582b-7687-4621-9cbe-5c24197cb536")] + +// 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/Modes/Mania/ManiaComboCounter.cs b/osu.Game.Modes.Mania/UI/ManiaComboCounter.cs similarity index 94% rename from osu.Game/Modes/Mania/ManiaComboCounter.cs rename to osu.Game.Modes.Mania/UI/ManiaComboCounter.cs index 26e654622f..dccd871def 100644 --- a/osu.Game/Modes/Mania/ManiaComboCounter.cs +++ b/osu.Game.Modes.Mania/UI/ManiaComboCounter.cs @@ -3,10 +3,10 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Transformations; -using osu.Game.Modes.Taiko; +using osu.Game.Modes.Taiko.UI; using OpenTK.Graphics; -namespace osu.Game.Modes.Mania +namespace osu.Game.Modes.Mania.UI { /// /// Similar to osu!taiko, with a pop-out animation when failing (rolling). Used in osu!mania. diff --git a/osu.Game/Modes/Mania/ManiaHitRenderer.cs b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs similarity index 87% rename from osu.Game/Modes/Mania/ManiaHitRenderer.cs rename to osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs index 82f6bd1e9d..2e4514cb85 100644 --- a/osu.Game/Modes/Mania/ManiaHitRenderer.cs +++ b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs @@ -1,10 +1,11 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using osu.Game.Modes.Mania.Objects; using osu.Game.Modes.Objects; -using osu.Game.Modes.Objects.Mania; +using osu.Game.Modes.UI; -namespace osu.Game.Modes.Mania +namespace osu.Game.Modes.Mania.UI { public class ManiaHitRenderer : HitRenderer { diff --git a/osu.Game/Modes/Mania/ManiaPlayfield.cs b/osu.Game.Modes.Mania/UI/ManiaPlayfield.cs similarity index 91% rename from osu.Game/Modes/Mania/ManiaPlayfield.cs rename to osu.Game.Modes.Mania/UI/ManiaPlayfield.cs index 277927ffde..bd905cef9a 100644 --- a/osu.Game/Modes/Mania/ManiaPlayfield.cs +++ b/osu.Game.Modes.Mania/UI/ManiaPlayfield.cs @@ -3,10 +3,11 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; +using osu.Game.Modes.UI; using OpenTK; using OpenTK.Graphics; -namespace osu.Game.Modes.Mania +namespace osu.Game.Modes.Mania.UI { public class ManiaPlayfield : Playfield { diff --git a/osu.Game.Modes.Mania/app.config b/osu.Game.Modes.Mania/app.config new file mode 100644 index 0000000000..44ccc4b77a --- /dev/null +++ b/osu.Game.Modes.Mania/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000000..2ccfff5dcd --- /dev/null +++ b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj @@ -0,0 +1,90 @@ + + + + + Debug + AnyCPU + {48F4582B-7687-4621-9CBE-5C24197CB536} + Library + Properties + osu.Game.Modes.Mania + osu.Game.Modes.Mania + v4.5 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll + True + + + + + + + + + + + + + + + + + + + + + + + + + + {C76BF5B3-985E-4D39-95FE-97C9C879B83A} + osu.Framework + + + {C92A607B-1FDD-4954-9F92-03FF547D9080} + osu.Game.Modes.Osu + + + {F167E17A-7DE6-4AF5-B920-A5112296C695} + osu.Game.Modes.Taiko + + + {0D3FBF8A-7464-4CF7-8C90-3E7886DF2D4D} + osu.Game + + + + + + + + + + \ No newline at end of file diff --git a/osu.Game.Modes.Mania/packages.config b/osu.Game.Modes.Mania/packages.config new file mode 100644 index 0000000000..4da07d9f06 --- /dev/null +++ b/osu.Game.Modes.Mania/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/osu.Game/Modes/Objects/Taiko/Drawable/DrawableTaikoHit.cs b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs similarity index 93% rename from osu.Game/Modes/Objects/Taiko/Drawable/DrawableTaikoHit.cs rename to osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs index 5a77aa1c58..8ef57160d5 100644 --- a/osu.Game/Modes/Objects/Taiko/Drawable/DrawableTaikoHit.cs +++ b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs @@ -8,7 +8,7 @@ using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Transformations; using OpenTK; -namespace osu.Game.Modes.Objects.Taiko.Drawable +namespace osu.Game.Modes.Taiko.Objects.Drawable { class DrawableTaikoHit : Sprite { diff --git a/osu.Game/Modes/Objects/Taiko/TaikoBaseHit.cs b/osu.Game.Modes.Taiko/Objects/TaikoBaseHit.cs similarity index 79% rename from osu.Game/Modes/Objects/Taiko/TaikoBaseHit.cs rename to osu.Game.Modes.Taiko/Objects/TaikoBaseHit.cs index 3805326b2a..ed3f154d20 100644 --- a/osu.Game/Modes/Objects/Taiko/TaikoBaseHit.cs +++ b/osu.Game.Modes.Taiko/Objects/TaikoBaseHit.cs @@ -1,7 +1,9 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Modes.Objects.Taiko +using osu.Game.Modes.Objects; + +namespace osu.Game.Modes.Taiko.Objects { public class TaikoBaseHit : HitObject { diff --git a/osu.Game/Modes/Objects/Taiko/TaikoConverter.cs b/osu.Game.Modes.Taiko/Objects/TaikoConverter.cs similarity index 87% rename from osu.Game/Modes/Objects/Taiko/TaikoConverter.cs rename to osu.Game.Modes.Taiko/Objects/TaikoConverter.cs index 62d90beedc..4f849d538b 100644 --- a/osu.Game/Modes/Objects/Taiko/TaikoConverter.cs +++ b/osu.Game.Modes.Taiko/Objects/TaikoConverter.cs @@ -2,9 +2,10 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; -using osu.Game.Modes.Objects.Osu; +using osu.Game.Modes.Objects; +using osu.Game.Modes.Osu.Objects; -namespace osu.Game.Modes.Objects.Taiko +namespace osu.Game.Modes.Taiko.Objects { class TaikoConverter : HitObjectConverter { diff --git a/osu.Game.Modes.Taiko/OpenTK.dll.config b/osu.Game.Modes.Taiko/OpenTK.dll.config new file mode 100644 index 0000000000..5620e3d9e2 --- /dev/null +++ b/osu.Game.Modes.Taiko/OpenTK.dll.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/osu.Game.Modes.Taiko/Properties/AssemblyInfo.cs b/osu.Game.Modes.Taiko/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..fe4ac44ab7 --- /dev/null +++ b/osu.Game.Modes.Taiko/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +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.Modes.Taiko")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("osu.Game.Modes.Taiko")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[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("f167e17a-7de6-4af5-b920-a5112296c695")] + +// 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/Modes/Taiko/TaikoRuleset.cs b/osu.Game.Modes.Taiko/TaikoRuleset.cs similarity index 83% rename from osu.Game/Modes/Taiko/TaikoRuleset.cs rename to osu.Game.Modes.Taiko/TaikoRuleset.cs index b90c96113d..1764b542da 100644 --- a/osu.Game/Modes/Taiko/TaikoRuleset.cs +++ b/osu.Game.Modes.Taiko/TaikoRuleset.cs @@ -3,7 +3,9 @@ using System.Collections.Generic; using osu.Game.Modes.Objects; -using osu.Game.Modes.Osu; +using osu.Game.Modes.Osu.UI; +using osu.Game.Modes.Taiko.UI; +using osu.Game.Modes.UI; namespace osu.Game.Modes.Taiko { diff --git a/osu.Game/Modes/Taiko/TaikoComboCounter.cs b/osu.Game.Modes.Taiko/UI/TaikoComboCounter.cs similarity index 94% rename from osu.Game/Modes/Taiko/TaikoComboCounter.cs rename to osu.Game.Modes.Taiko/UI/TaikoComboCounter.cs index ac7211a92e..cc94e5e4ea 100644 --- a/osu.Game/Modes/Taiko/TaikoComboCounter.cs +++ b/osu.Game.Modes.Taiko/UI/TaikoComboCounter.cs @@ -2,9 +2,10 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics.Transformations; +using osu.Game.Modes.UI; using OpenTK; -namespace osu.Game.Modes.Taiko +namespace osu.Game.Modes.Taiko.UI { /// /// Allows tint and scaling animations. Used in osu!taiko. diff --git a/osu.Game/Modes/Taiko/TaikoHitRenderer.cs b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs similarity index 83% rename from osu.Game/Modes/Taiko/TaikoHitRenderer.cs rename to osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs index 5b6119e2ad..28180b5d24 100644 --- a/osu.Game/Modes/Taiko/TaikoHitRenderer.cs +++ b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs @@ -2,9 +2,10 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Game.Modes.Objects; -using osu.Game.Modes.Objects.Taiko; +using osu.Game.Modes.Taiko.Objects; +using osu.Game.Modes.UI; -namespace osu.Game.Modes.Taiko +namespace osu.Game.Modes.Taiko.UI { public class TaikoHitRenderer : HitRenderer { diff --git a/osu.Game/Modes/Taiko/TaikoPlayfield.cs b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs similarity index 91% rename from osu.Game/Modes/Taiko/TaikoPlayfield.cs rename to osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs index 7d999ae213..b9bf31bb56 100644 --- a/osu.Game/Modes/Taiko/TaikoPlayfield.cs +++ b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs @@ -5,10 +5,11 @@ using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Textures; +using osu.Game.Modes.UI; using OpenTK; using OpenTK.Graphics; -namespace osu.Game.Modes.Taiko +namespace osu.Game.Modes.Taiko.UI { public class TaikoPlayfield : Playfield { diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj new file mode 100644 index 0000000000..d49c3c2466 --- /dev/null +++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj @@ -0,0 +1,83 @@ + + + + + Debug + AnyCPU + {F167E17A-7DE6-4AF5-B920-A5112296C695} + Library + Properties + osu.Game.Modes.Taiko + osu.Game.Modes.Taiko + v4.5 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + {C76BF5B3-985E-4D39-95FE-97C9C879B83A} + osu.Framework + + + {C92A607B-1FDD-4954-9F92-03FF547D9080} + osu.Game.Modes.Osu + + + {0D3FBF8A-7464-4CF7-8C90-3E7886DF2D4D} + osu.Game + + + + + \ No newline at end of file diff --git a/osu.Game.Modes.Taiko/packages.config b/osu.Game.Modes.Taiko/packages.config new file mode 100644 index 0000000000..4da07d9f06 --- /dev/null +++ b/osu.Game.Modes.Taiko/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs index 226725b93f..db2e4b7d7e 100644 --- a/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs +++ b/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs @@ -7,7 +7,7 @@ using osu.Game.Beatmaps; using osu.Game.Beatmaps.Formats; using osu.Game.Beatmaps.Samples; using osu.Game.Modes; -using osu.Game.Modes.Objects.Osu; +using osu.Game.Modes.Osu.Objects; using osu.Game.Screens.Play; using osu.Game.Tests.Resources; diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj index d4a1976f17..646ee756d5 100644 --- a/osu.Game.Tests/osu.Game.Tests.csproj +++ b/osu.Game.Tests/osu.Game.Tests.csproj @@ -66,6 +66,10 @@ {c76bf5b3-985e-4d39-95fe-97c9c879b83a} osu.Framework + + {c92a607b-1fdd-4954-9f92-03ff547d9080} + osu.Game.Modes.Osu + {0D3FBF8A-7464-4CF7-8C90-3E7886DF2D4D} osu.Game diff --git a/osu.Game/Modes/Objects/HitObject.cs b/osu.Game/Modes/Objects/HitObject.cs index fe63579d67..62c47d7059 100644 --- a/osu.Game/Modes/Objects/HitObject.cs +++ b/osu.Game/Modes/Objects/HitObject.cs @@ -2,7 +2,6 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Game.Beatmaps.Samples; -using osu.Game.Modes.Objects.Osu; using OpenTK.Graphics; namespace osu.Game.Modes.Objects @@ -29,7 +28,7 @@ namespace osu.Game.Modes.Objects switch (mode) { case PlayMode.Osu: - return OsuBaseHit.Parse(val); + return null; //return OsuBaseHit.Parse(val); default: return null; } diff --git a/osu.Game/Modes/Objects/HitObjectConverter.cs b/osu.Game/Modes/Objects/HitObjectConverter.cs index 73a27f9e96..66a73956fa 100644 --- a/osu.Game/Modes/Objects/HitObjectConverter.cs +++ b/osu.Game/Modes/Objects/HitObjectConverter.cs @@ -11,6 +11,7 @@ namespace osu.Game.Modes.Objects { public abstract List Convert(List input); } + public class HitObjectConvertException : Exception { public HitObject Input { get; } diff --git a/osu.Game/Modes/Ruleset.cs b/osu.Game/Modes/Ruleset.cs index 12d0fbb718..842b9ed211 100644 --- a/osu.Game/Modes/Ruleset.cs +++ b/osu.Game/Modes/Ruleset.cs @@ -2,11 +2,8 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; -using osu.Game.Modes.Catch; -using osu.Game.Modes.Mania; using osu.Game.Modes.Objects; -using osu.Game.Modes.Osu; -using osu.Game.Modes.Taiko; +using osu.Game.Modes.UI; namespace osu.Game.Modes { @@ -21,13 +18,15 @@ namespace osu.Game.Modes switch (mode) { default: - return new OsuRuleset(); - case PlayMode.Catch: - return new CatchRuleset(); - case PlayMode.Mania: - return new ManiaRuleset(); - case PlayMode.Taiko: - return new TaikoRuleset(); + return null; + + // return new OsuRuleset(); + //case PlayMode.Catch: + // return new CatchRuleset(); + //case PlayMode.Mania: + // return new ManiaRuleset(); + //case PlayMode.Taiko: + // return new TaikoRuleset(); } } } diff --git a/osu.Game/Modes/ComboCounter.cs b/osu.Game/Modes/UI/ComboCounter.cs similarity index 96% rename from osu.Game/Modes/ComboCounter.cs rename to osu.Game/Modes/UI/ComboCounter.cs index cc00ac700a..d371110308 100644 --- a/osu.Game/Modes/ComboCounter.cs +++ b/osu.Game/Modes/UI/ComboCounter.cs @@ -7,7 +7,7 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Transformations; using osu.Framework.MathUtils; -namespace osu.Game.Modes +namespace osu.Game.Modes.UI { public abstract class ComboCounter : Container { diff --git a/osu.Game/Modes/ComboResultCounter.cs b/osu.Game/Modes/UI/ComboResultCounter.cs similarity index 95% rename from osu.Game/Modes/ComboResultCounter.cs rename to osu.Game/Modes/UI/ComboResultCounter.cs index 4ae203363e..840a2e0b73 100644 --- a/osu.Game/Modes/ComboResultCounter.cs +++ b/osu.Game/Modes/UI/ComboResultCounter.cs @@ -7,7 +7,7 @@ using osu.Framework.Graphics.Transformations; using osu.Framework.MathUtils; using osu.Game.Graphics.UserInterface; -namespace osu.Game.Modes +namespace osu.Game.Modes.UI { /// /// Used to display combo with a roll-up animation in results screen. diff --git a/osu.Game/Modes/HitRenderer.cs b/osu.Game/Modes/UI/HitRenderer.cs similarity index 95% rename from osu.Game/Modes/HitRenderer.cs rename to osu.Game/Modes/UI/HitRenderer.cs index e73669ff6a..475d2ec897 100644 --- a/osu.Game/Modes/HitRenderer.cs +++ b/osu.Game/Modes/UI/HitRenderer.cs @@ -9,7 +9,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Modes.Objects; -namespace osu.Game.Modes +namespace osu.Game.Modes.UI { public abstract class HitRenderer : Container { diff --git a/osu.Game/Modes/Playfield.cs b/osu.Game/Modes/UI/Playfield.cs similarity index 86% rename from osu.Game/Modes/Playfield.cs rename to osu.Game/Modes/UI/Playfield.cs index 4fe1887962..24aecb8a22 100644 --- a/osu.Game/Modes/Playfield.cs +++ b/osu.Game/Modes/UI/Playfield.cs @@ -3,7 +3,7 @@ using osu.Framework.Graphics.Containers; -namespace osu.Game.Modes +namespace osu.Game.Modes.UI { public class Playfield : Container { diff --git a/osu.Game/Modes/ScoreOverlay.cs b/osu.Game/Modes/UI/ScoreOverlay.cs similarity index 95% rename from osu.Game/Modes/ScoreOverlay.cs rename to osu.Game/Modes/UI/ScoreOverlay.cs index 52b42f640f..2270533d47 100644 --- a/osu.Game/Modes/ScoreOverlay.cs +++ b/osu.Game/Modes/UI/ScoreOverlay.cs @@ -7,7 +7,7 @@ using osu.Framework.Graphics.Containers; using osu.Game.Graphics.UserInterface; using osu.Game.Modes.Objects; -namespace osu.Game.Modes +namespace osu.Game.Modes.UI { public abstract class ScoreOverlay : Container { diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index 4030d02986..926fd77222 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -12,6 +12,7 @@ using osu.Framework.Timing; using osu.Game.Database; using osu.Game.Modes; using osu.Game.Modes.Objects; +using osu.Game.Modes.UI; using osu.Game.Screens.Backgrounds; using OpenTK.Input; using MouseState = osu.Framework.Input.MouseState; diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 9317741df2..9e8a3a0141 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -71,28 +71,9 @@ - - - - - - - - - - - - - - - - - - - @@ -121,37 +102,23 @@ - - - - - - - - - - - - - - - - + + + - - + + - @@ -159,15 +126,12 @@ - - - diff --git a/osu.sln b/osu.sln index 3d79d4444f..9677a752fb 100644 --- a/osu.sln +++ b/osu.sln @@ -21,6 +21,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Desktop.VisualTests", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Tests", "osu.Game.Tests\osu.Game.Tests.csproj", "{54377672-20B1-40AF-8087-5CF73BF3953A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Modes.Osu", "osu.Game.Mode.Osu\osu.Game.Modes.Osu.csproj", "{C92A607B-1FDD-4954-9F92-03FF547D9080}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Modes.Catch", "osu.Game.Modes.Catch\osu.Game.Modes.Catch.csproj", "{58F6C80C-1253-4A0E-A465-B8C85EBEADF3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Modes.Taiko", "osu.Game.Modes.Taiko\osu.Game.Modes.Taiko.csproj", "{F167E17A-7DE6-4AF5-B920-A5112296C695}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Modes.Mania", "osu.Game.Modes.Mania\osu.Game.Modes.Mania.csproj", "{48F4582B-7687-4621-9CBE-5C24197CB536}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -55,6 +63,22 @@ Global {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 {54377672-20B1-40AF-8087-5CF73BF3953A}.Release|Any CPU.Build.0 = Release|Any CPU + {C92A607B-1FDD-4954-9F92-03FF547D9080}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C92A607B-1FDD-4954-9F92-03FF547D9080}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C92A607B-1FDD-4954-9F92-03FF547D9080}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C92A607B-1FDD-4954-9F92-03FF547D9080}.Release|Any CPU.Build.0 = Release|Any CPU + {58F6C80C-1253-4A0E-A465-B8C85EBEADF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58F6C80C-1253-4A0E-A465-B8C85EBEADF3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58F6C80C-1253-4A0E-A465-B8C85EBEADF3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58F6C80C-1253-4A0E-A465-B8C85EBEADF3}.Release|Any CPU.Build.0 = Release|Any CPU + {F167E17A-7DE6-4AF5-B920-A5112296C695}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F167E17A-7DE6-4AF5-B920-A5112296C695}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F167E17A-7DE6-4AF5-B920-A5112296C695}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F167E17A-7DE6-4AF5-B920-A5112296C695}.Release|Any CPU.Build.0 = Release|Any CPU + {48F4582B-7687-4621-9CBE-5C24197CB536}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {48F4582B-7687-4621-9CBE-5C24197CB536}.Debug|Any CPU.Build.0 = Debug|Any CPU + {48F4582B-7687-4621-9CBE-5C24197CB536}.Release|Any CPU.ActiveCfg = Release|Any CPU + {48F4582B-7687-4621-9CBE-5C24197CB536}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -67,6 +91,10 @@ Global {65DC628F-A640-4111-AB35-3A5652BC1E17} = {7A75DFA2-DE65-4458-98AF-26AF96FFD6DC} {69051C69-12AE-4E7D-A3E6-460D2E282312} = {0D37A2AD-80A4-464F-A1DE-1560B70F1CE3} {54377672-20B1-40AF-8087-5CF73BF3953A} = {0D37A2AD-80A4-464F-A1DE-1560B70F1CE3} + {C92A607B-1FDD-4954-9F92-03FF547D9080} = {0D37A2AD-80A4-464F-A1DE-1560B70F1CE3} + {58F6C80C-1253-4A0E-A465-B8C85EBEADF3} = {0D37A2AD-80A4-464F-A1DE-1560B70F1CE3} + {F167E17A-7DE6-4AF5-B920-A5112296C695} = {0D37A2AD-80A4-464F-A1DE-1560B70F1CE3} + {48F4582B-7687-4621-9CBE-5C24197CB536} = {0D37A2AD-80A4-464F-A1DE-1560B70F1CE3} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0