Merge branch 'master' into ignored_input_handler

osu.Game.Tests/Visual/TestCaseGamefield.cs

@@ -1,90 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using NUnit.Framework;
-using osu.Game.Beatmaps.ControlPoints;
-
-namespace osu.Game.Tests.Visual
-{
-    [TestFixture]
-    public class TestCaseGamefield : OsuTestCase
-    {
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            /*int time = 500;
-            for (int i = 0; i < 100; i++)
-            {
-                  objects.Add(new HitCircle
-                  {
-                      StartTime = time,
-                      Position = new Vector2(RNG.Next(0, (int)OsuPlayfield.BASE_SIZE.X), RNG.Next(0, (int)OsuPlayfield.BASE_SIZE.Y)),
-                      Scale = RNG.NextSingle(0.5f, 1.0f),
-                  });
-
-                time += RNG.Next(50, 500);
-            }*/
-
-            var controlPointInfo = new ControlPointInfo();
-            controlPointInfo.TimingPoints.Add(new TimingControlPoint
-            {
-                BeatLength = 200
-            });
-
-            /*WorkingBeatmap beatmap = new TestWorkingBeatmap(new Beatmap
-            {
-                HitObjects = objects,
-                BeatmapInfo = new BeatmapInfo
-                {
-                    Difficulty = new BeatmapDifficulty(),
-                    Ruleset = rulesets.Query<RulesetInfo>().First(),
-                    Metadata = new BeatmapMetadata
-                    {
-                        Artist = @"Unknown",
-                        Title = @"Sample Beatmap",
-                        Author = @"peppy",
-                    },
-                },
-                ControlPointInfo = controlPointInfo
-            });
-
-            AddRange(new Drawable[]
-            {
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    //ensure we are at offset 0
-                    Clock = new FramedClock(),
-                    Children = new Drawable[]
-                    {
-                        new OsuRulesetContainer(new OsuRuleset(), beatmap, false)
-                        {
-                            Scale = new Vector2(0.5f),
-                            Anchor = Anchor.TopLeft,
-                            Origin = Anchor.TopLeft
-                        },
-                        new TaikoRulesetContainer(new TaikoRuleset(),beatmap, false)
-                        {
-                            Scale = new Vector2(0.5f),
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight
-                        },
-                        new CatchRulesetContainer(new CatchRuleset(),beatmap, false)
-                        {
-                            Scale = new Vector2(0.5f),
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft
-                        },
-                        new ManiaRulesetContainer(new ManiaRuleset(),beatmap, false)
-                        {
-                            Scale = new Vector2(0.5f),
-                            Anchor = Anchor.BottomRight,
-                            Origin = Anchor.BottomRight
-                        }
-                    }
-                }
-            });*/
-        }
-    }
-}

osu.Game/Graphics/UserInterface/BackButton.cs

@@ -10,7 +10,7 @@ namespace osu.Game.Graphics.UserInterface
     {
         public BackButton()
         {
-            Text = @"Back";
+            Text = @"back";
             Icon = FontAwesome.fa_osu_left_o;
             Anchor = Anchor.BottomLeft;
             Origin = Anchor.BottomLeft;

osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs

@@ -44,7 +44,7 @@ namespace osu.Game.Overlays.BeatmapSet
                 Beatmap.Value = BeatmapSet.Beatmaps.First();
                 plays.Value = BeatmapSet.OnlineInfo.PlayCount;
                 favourites.Value = BeatmapSet.OnlineInfo.FavouriteCount;
-                difficulties.ChildrenEnumerable = BeatmapSet.Beatmaps.Select(b => new DifficultySelectorButton(b)
+                difficulties.ChildrenEnumerable = BeatmapSet.Beatmaps.OrderBy(beatmap => beatmap.StarDifficulty).Select(b => new DifficultySelectorButton(b)
                 {
                     State = DifficultySelectorState.NotSelected,
                     OnHovered = beatmap =>

osu.Game/Overlays/Direct/DirectPanel.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using OpenTK;
@@ -208,7 +209,7 @@ namespace osu.Game.Overlays.Direct
         {
             var icons = new List<DifficultyIcon>();
 
-            foreach (var b in SetInfo.Beatmaps)
+            foreach (var b in SetInfo.Beatmaps.OrderBy(beatmap => beatmap.StarDifficulty))
                 icons.Add(new DifficultyIcon(b));
 
             return icons;

osu.Game/Screens/Play/PlayerLoader.cs

@@ -309,11 +309,6 @@ namespace osu.Game.Screens.Play
                                 Origin = Anchor.TopCentre,
                                 Anchor = Anchor.TopCentre,
                             },
-                            new MetadataLine("Composer", string.Empty)
-                            {
-                                Origin = Anchor.TopCentre,
-                                Anchor = Anchor.TopCentre,
-                            },
                             new MetadataLine("Mapper", metadata.AuthorString)
                             {
                                 Origin = Anchor.TopCentre,