Merge branch 'master' of https://github.com/ppy/osu

osu-framework

@@ -1 +1 @@
-Subproject commit d87dab204b3df50f62e6070b1970c135ea647d78
+Subproject commit fe49ccb3c8f8661d653752d225ae1dc183944bb4

osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs

@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
         protected override IEnumerable<CatchBaseHit> ConvertHitObject(HitObject obj, Beatmap beatmap)
         {
             var curveData = obj as IHasCurve;
-            var positionData = obj as IHasPosition;
+            var positionData = obj as IHasXPosition;
             var comboData = obj as IHasCombo;
 
             if (positionData == null)

osu.Game.Tests/Visual/TestCaseButtonSystem.cs

@@ -0,0 +1,33 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Screens.Menu;
+using OpenTK.Graphics;
+
+namespace osu.Game.Tests.Visual
+{
+    internal class TestCaseButtonSystem : OsuTestCase
+    {
+        public TestCaseButtonSystem()
+        {
+            OsuLogo logo;
+            ButtonSystem buttons;
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = ColourInfo.GradientVertical(Color4.Gray, Color4.WhiteSmoke),
+                    RelativeSizeAxes = Axes.Both,
+                },
+                buttons = new ButtonSystem(),
+                logo = new OsuLogo()
+            };
+
+            buttons.SetOsuLogo(logo);
+        }
+    }
+}

osu.Game.Tests/Visual/TestCaseMenuButtonSystem.cs

@@ -1,25 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System.ComponentModel;
-using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Screens.Menu;
-using OpenTK.Graphics;
-
-namespace osu.Game.Tests.Visual
-{
-    [Description("main menu")]
-    internal class TestCaseMenuButtonSystem : OsuTestCase
-    {
-        public TestCaseMenuButtonSystem()
-        {
-            Add(new Box
-            {
-                Colour = ColourInfo.GradientVertical(Color4.Gray, Color4.WhiteSmoke),
-                RelativeSizeAxes = Framework.Graphics.Axes.Both,
-            });
-            Add(new ButtonSystem());
-        }
-    }
-}

osu.Game.Tests/osu.Game.Tests.csproj

@@ -116,7 +116,7 @@
     <Compile Include="Visual\TestCaseKeyCounter.cs" />
     <Compile Include="Visual\TestCaseLeaderboard.cs" />
     <Compile Include="Visual\TestCaseMedalOverlay.cs" />
-    <Compile Include="Visual\TestCaseMenuButtonSystem.cs" />
+    <Compile Include="Visual\TestCaseButtonSystem.cs" />
     <Compile Include="Visual\TestCaseMenuOverlays.cs" />
     <Compile Include="Visual\TestCaseMods.cs" />
     <Compile Include="Visual\TestCaseMusicController.cs" />

osu.Game/Beatmaps/BeatmapMetrics.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Beatmaps
     public class BeatmapMetrics
     {
         /// <summary>
-        /// Total vote counts of user ratings on a scale of 0..length.
+        /// Total vote counts of user ratings on a scale of 0..10 where 0 is unused (probably will be fixed at API?).
         /// </summary>
         public IEnumerable<int> Ratings { get; set; }
 

osu.Game/Database/DatabaseBackedStore.cs

@@ -35,6 +35,7 @@ namespace osu.Game.Database
 
             var id = obj.ID;
             obj = lookupSource?.SingleOrDefault(t => t.ID == id) ?? context.Find<T>(id);
+            context.Entry(obj).Reload();
         }
 
         /// <summary>

osu.Game/Graphics/UserInterface/Bar.cs

@@ -20,6 +20,7 @@ namespace osu.Game.Graphics.UserInterface
         private const Easing easing = Easing.InOutCubic;
 
         private float length;
+
         /// <summary>
         /// Length of the bar, ranges from 0 to 1
         /// </summary>
@@ -134,4 +135,4 @@ namespace osu.Game.Graphics.UserInterface
         Vertical = TopToBottom | BottomToTop,
         Horizontal = LeftToRight | RightToLeft,
     }
-}
+}

osu.Game/Screens/Play/Player.cs

@@ -46,6 +46,8 @@ namespace osu.Game.Screens.Play
 
         public bool HasFailed { get; private set; }
 
+        public bool AllowPause { get; set; } = true;
+
         public int RestartCount;
 
         private IAdjustableClock adjustableSourceClock;
@@ -158,7 +160,7 @@ namespace osu.Game.Screens.Play
                     FramedClock = offsetClock,
                     OnRetry = Restart,
                     OnQuit = Exit,
-                    CheckCanPause = () => ValidForResume && !HasFailed && !RulesetContainer.HasReplayLoaded,
+                    CheckCanPause = () => AllowPause && ValidForResume && !HasFailed && !RulesetContainer.HasReplayLoaded,
                     Retries = RestartCount,
                     OnPause = () => {
                         hudOverlay.KeyCounter.IsCounting = pauseContainer.IsPaused;
@@ -355,7 +357,7 @@ namespace osu.Game.Screens.Play
 
         protected override bool OnExiting(Screen next)
         {
-            if (HasFailed || !ValidForResume || pauseContainer?.AllowExit != false || RulesetContainer?.HasReplayLoaded != false)
+            if (!AllowPause || HasFailed || !ValidForResume || pauseContainer?.AllowExit != false || RulesetContainer?.HasReplayLoaded != false)
             {
                 // In the case of replays, we may have changed the playback rate.
                 applyRateFromMods();

osu.Game/Screens/Select/Details/UserRatings.cs

@@ -29,11 +29,17 @@ namespace osu.Game.Screens.Select.Details
                 if (value == metrics) return;
                 metrics = value;
 
-                var ratings = Metrics.Ratings.ToList();
+                const int rating_range = 10;
-                negativeRatings.Text = ratings.GetRange(0, ratings.Count / 2 + 1).Sum().ToString();
+
-                positiveRatings.Text = ratings.GetRange(ratings.Count / 2 + 1, ratings.Count / 2).Sum().ToString();
+                var ratings = Metrics.Ratings.Skip(1).Take(rating_range); // adjust for API returning weird empty data at 0.
-                ratingsBar.Length = (float)ratings.GetRange(0, ratings.Count / 2 + 1).Sum() / ratings.Sum();
+
-                graph.Values = Metrics.Ratings.Select(r => (float)r);
+                var negativeCount = ratings.Take(rating_range / 2).Sum();
+                var totalCount = ratings.Sum();
+
+                negativeRatings.Text = negativeCount.ToString();
+                positiveRatings.Text = (totalCount - negativeCount).ToString();
+                ratingsBar.Length = totalCount == 0 ? 0 : (float)negativeCount / totalCount;
+                graph.Values = ratings.Take(rating_range).Select(r => (float)r);
             }
         }
 

osu.Game/Screens/Select/SongSelect.cs

@@ -203,8 +203,8 @@ namespace osu.Game.Screens.Select
             Push(new Editor());
         }
 
-        private void onBeatmapRestored(BeatmapInfo b) => carousel.UpdateBeatmap(b);
+        private void onBeatmapRestored(BeatmapInfo b) => Schedule(() => carousel.UpdateBeatmap(b));
-        private void onBeatmapHidden(BeatmapInfo b) => carousel.UpdateBeatmap(b);
+        private void onBeatmapHidden(BeatmapInfo b) => Schedule(() => carousel.UpdateBeatmap(b));
 
         private void carouselBeatmapsLoaded()
         {

osu.Game/Tests/Visual/ScreenTestCase.cs

@@ -0,0 +1,48 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Screens;
+using osu.Game.Screens;
+
+namespace osu.Game.Tests.Visual
+{
+    /// <summary>
+    /// A test case which can be used to test a screen (that relies on OnEntering being called to execute startup instructions).
+    /// </summary>
+    public abstract class ScreenTestCase : OsuTestCase
+    {
+        private readonly TestOsuScreen baseScreen;
+
+        protected ScreenTestCase()
+        {
+            Add(baseScreen = new TestOsuScreen());
+        }
+
+        protected void LoadScreen(OsuScreen screen) => baseScreen.LoadScreen(screen);
+
+        public class TestOsuScreen : OsuScreen
+        {
+            private OsuScreen nextScreen;
+
+            public void LoadScreen(OsuScreen screen) => Schedule(() =>
+            {
+                nextScreen = screen;
+
+                if (IsCurrentScreen)
+                {
+                    Push(screen);
+                    nextScreen = null;
+                }
+                else
+                    MakeCurrent();
+            });
+
+            protected override void OnResuming(Screen last)
+            {
+                base.OnResuming(last);
+                if (nextScreen != null)
+                    LoadScreen(nextScreen);
+            }
+        }
+    }
+}

osu.Game/Tests/Visual/TestCasePlayer.cs

@@ -17,7 +17,7 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Tests.Visual
 {
-    public abstract class TestCasePlayer : OsuTestCase
+    public abstract class TestCasePlayer : ScreenTestCase
     {
         private readonly Type ruleset;
 
@@ -44,6 +44,7 @@ namespace osu.Game.Tests.Visual
             {
                 RelativeSizeAxes = Framework.Graphics.Axes.Both,
                 Colour = Color4.Black,
+                Depth = int.MaxValue
             });
 
             string instantiation = ruleset?.AssemblyQualifiedName;
@@ -77,19 +78,17 @@ namespace osu.Game.Tests.Visual
             if (Player != null)
                 Remove(Player);
 
-            Add(Player = CreatePlayer(working, instance));
+            LoadScreen(CreatePlayer(working, instance));
         }
 
-        protected virtual Player CreatePlayer(WorkingBeatmap beatmap, Ruleset ruleset)
+        protected virtual Player CreatePlayer(WorkingBeatmap beatmap, Ruleset ruleset) => new Player
         {
-            return new Player
+            InitialBeatmap = beatmap,
-            {
+            AllowPause = false
-                InitialBeatmap = beatmap
+        };
-            };
-        }
 
         private const string test_beatmap_data =
-@"osu file format v14
+            @"osu file format v14
 
 [General]
 AudioLeadIn: 500

osu.Game/osu.Game.csproj

@@ -784,6 +784,7 @@
     <Compile Include="Tests\Beatmaps\TestWorkingBeatmap.cs" />
     <Compile Include="Tests\Platform\TestStorage.cs" />
     <Compile Include="Tests\Visual\OsuTestCase.cs" />
+    <Compile Include="Tests\Visual\ScreenTestCase.cs" />
     <Compile Include="Tests\Visual\TestCasePlayer.cs" />
     <Compile Include="Users\Avatar.cs" />
     <Compile Include="Users\Country.cs" />