Merge pull request #365 from peppy/general-fixes

Better screen hierarchy

osu.Desktop.VisualTests/Benchmark.cs

@@ -9,7 +9,7 @@
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Desktop.Platform;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Game;
 using osu.Game.Modes;
 using osu.Game.Modes.Catch;

osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs

@@ -5,7 +5,7 @@
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;

osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.MathUtils;
 using osu.Framework.Timing;

osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Timing;
 using OpenTK;

osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <[email protected]>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
 using OpenTK.Input;

osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <[email protected]>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Screens.Menu;

osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <[email protected]>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Timing;
 using osu.Game.Overlays;

osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework.Graphics;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.MathUtils;
 using osu.Framework.Timing;
 using osu.Game.Overlays;

osu.Desktop.VisualTests/Tests/TestCaseOptions.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <[email protected]>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
 using OpenTK.Input;

osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs

@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Colour;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Desktop.VisualTests.Tests

osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Desktop.VisualTests.Platform;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Game.Database;
 using osu.Game.Modes;
 using osu.Game.Screens.Select;

osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework.Allocation;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.MathUtils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
@@ -71,7 +71,7 @@ public override void Reset()
             Add(new Box
             {
                 RelativeSizeAxes = Framework.Graphics.Axes.Both,
-                Colour = Color4.Gray,
+                Colour = Color4.Black,
             });
 
             Add(new Player

osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.MathUtils;

osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;

osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <[email protected]>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;

osu.Desktop.VisualTests/VisualTestGame.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics.Cursor;
 using osu.Game.Database;
 using osu.Game;
@@ -21,7 +21,7 @@ protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            (new BackgroundModeDefault() { Depth = 10 }).Preload(this, AddInternal);
+            (new BackgroundScreenDefault() { Depth = 10 }).Preload(this, AddInternal);
 
             // Have to construct this here, rather than in the constructor, because
             // we depend on some dependencies to be loaded within OsuGameBase.load().

osu.Desktop/OsuGameDesktop.cs

@@ -14,22 +14,32 @@
 using osu.Desktop.Overlays;
 using System.Reflection;
 using System.Drawing;
+using osu.Game.Screens.Menu;
 
 namespace osu.Desktop
 {
     class OsuGameDesktop : OsuGame
     {
+        private VersionManager versionManager;
+
+        public override bool IsDeployedBuild => versionManager.IsDeployedBuild;
+
         public OsuGameDesktop(string[] args = null)
             : base(args)
         {
-
+            versionManager = new VersionManager { Depth = int.MinValue };
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            (new VersionManager()).Preload(this, Add);
+            versionManager.Preload(this);
+            ModeChanged += m =>
+            {
+                if (!versionManager.IsAlive && m is Intro)
+                    Add(versionManager);
+            };
         }
 
         public override void SetHost(BasicGameHost host)

osu.Desktop/Overlays/VersionManager.cs

@@ -23,6 +23,10 @@ public class VersionManager : OverlayContainer
         private UpdateManager updateManager;
         private NotificationManager notification;
 
+        AssemblyName assembly = Assembly.GetEntryAssembly().GetName();
+
+        public bool IsDeployedBuild => assembly.Version.Major > 0;
+
         protected override bool HideOnEscape => false;
 
         public override bool HandleInput => false;
@@ -40,14 +44,13 @@ private void load(NotificationManager notification, OsuColour colours, TextureSt
             bool isDebug = false;
             Debug.Assert(isDebug = true);
 
-            var asm = Assembly.GetEntryAssembly().GetName();
             string version;
-            if (asm.Version.Major == 0)
+            if (!IsDeployedBuild)
             {
                 version = @"local " + (isDebug ? @"debug" : @"release");
             }
             else
-                version = $@"{asm.Version.Major}.{asm.Version.Minor}.{asm.Version.Build}";
+                version = $@"{assembly.Version.Major}.{assembly.Version.Minor}.{assembly.Version.Build}";
 
             Children = new Drawable[]
             {

osu.Game.Modes.Osu/Objects/Slider.cs

@@ -57,10 +57,10 @@ public override void SetDefaultsFromBeatmap(Beatmap beatmap)
             ControlPoint overridePoint;
             ControlPoint timingPoint = beatmap.TimingPointAt(StartTime, out overridePoint);
             var velocityAdjustment = overridePoint?.VelocityAdjustment ?? 1;
-            var baseVelocity = 100 * baseDifficulty.SliderMultiplier;
+            var baseVelocity = 100 * baseDifficulty.SliderMultiplier / velocityAdjustment;
 
-            Velocity = baseVelocity / (timingPoint.BeatLength * velocityAdjustment);
-            TickDistance = baseVelocity / (baseDifficulty.SliderTickRate * velocityAdjustment);
+            Velocity = baseVelocity / timingPoint.BeatLength;
+            TickDistance = baseVelocity / baseDifficulty.SliderTickRate;
         }
 
         public int RepeatCount = 1;

osu.Game/Beatmaps/Beatmap.cs

@@ -40,7 +40,10 @@ public ControlPoint TimingPointAt(double time, out ControlPoint overridePoint)
             ControlPoint timingPoint = null;
             foreach (var controlPoint in ControlPoints)
             {
-                if (controlPoint.Time <= time)
+                // Some beatmaps have the first timingPoint (accidentally) start after the first HitObject(s).
+                // This null check makes it so that the first ControlPoint that makes a timing change is used as
+                // the timingPoint for those HitObject(s).
+                if (controlPoint.Time <= time || timingPoint == null)
                 {
                     if (controlPoint.TimingChange)
                     {
@@ -49,19 +52,10 @@ public ControlPoint TimingPointAt(double time, out ControlPoint overridePoint)
                     }
                     else overridePoint = controlPoint;
                 }
-                // Some beatmaps have the first timingPoint (accidentally) start after the first HitObject(s).
-                // This branch makes it so that the first ControlPoint that makes a timing change is used as the timingPoint for the HitObject(s).
-                else if (timingPoint == null && controlPoint.TimingChange)
-                {
-                    timingPoint = controlPoint;
-                }
-                else
-                {
-                    break;
-                }
+                else break;
             }
 
-            return timingPoint;
+            return timingPoint ?? ControlPoint.Default;
         }
     }
 }

osu.Game/Beatmaps/Timing/ControlPoint.cs

@@ -1,20 +1,21 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <[email protected]>.
 // 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;
-
 namespace osu.Game.Beatmaps.Timing
 {
     public class ControlPoint
     {
+        public static ControlPoint Default = new ControlPoint
+        {
+            BeatLength = 500,
+            TimingChange = true,
+        };
+
         public double Time;
         public double BeatLength;
         public double VelocityAdjustment;
         public bool TimingChange;
+
     }
 
     internal enum TimeSignatures

osu.Game/Online/Chat/Drawables/ChannelDisplay.cs

@@ -38,6 +38,7 @@ public ChannelDisplay(Channel channel)
                 },
                 new ScrollContainer
                 {
+                    RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
                         flow = new FlowContainer