Merge pull request #248 from ppy/master

a

Author: winnerspiros

osu.Game.Tests/Visual/RankedPlay/TestScenePlayerCardHand.cs

@@ -211,5 +211,13 @@ public void TestRemoveCardsWhileDragging()
             });
             AddStep("release mouse", () => InputManager.ReleaseButton(MouseButton.Left));
         }
+
+        [Test]
+        public void TestKeyboardSelectionWithoutCards()
+        {
+            AddAssert("no cards", () => !handOfCards.Cards.Any());
+            AddStep("right arrow", () => InputManager.Key(Key.Right));
+            AddStep("left arrow", () => InputManager.Key(Key.Left));
+        }
     }
 }

osu.Game/Overlays/Profile/Header/Components/MatchmakingStatsDisplay.cs

@@ -11,6 +11,7 @@
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Resources.Localisation.Web;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
@@ -58,7 +59,7 @@ private void load()
                             {
                                 new OsuSpriteText
                                 {
-                                    Text = "Quick Play",
+                                    Text = UsersStrings.ShowMatchmakingTitle,
                                     Margin = new MarginPadding { Horizontal = 5f, Vertical = 7f },
                                     Font = OsuFont.GetFont(size: 12)
                                 },

osu.Game/Overlays/Profile/Header/Components/MatchmakingStatsTooltip.cs

@@ -13,6 +13,7 @@
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Resources.Localisation.Web;
 using osuTK;
 using osuTK.Graphics;
 
@@ -68,10 +69,10 @@ public void SetContent(MatchmakingStatsTooltipData content)
                 [
                     new TableColumn(dimension: new Dimension(GridSizeMode.AutoSize)),
                     new TableColumn(dimension: new Dimension(GridSizeMode.AutoSize)),
-                    new TableColumn("Wins", dimension: new Dimension(GridSizeMode.AutoSize)),
-                    new TableColumn("Plays", dimension: new Dimension(GridSizeMode.AutoSize)),
-                    new TableColumn("Points", dimension: new Dimension(GridSizeMode.AutoSize)),
-                    new TableColumn("Rating", dimension: new Dimension(GridSizeMode.AutoSize)),
+                    new TableColumn(RankingsStrings.MatchmakingWins, dimension: new Dimension(GridSizeMode.AutoSize)),
+                    new TableColumn(RankingsStrings.MatchmakingPlays, dimension: new Dimension(GridSizeMode.AutoSize)),
+                    new TableColumn(RankingsStrings.MatchmakingPoints, dimension: new Dimension(GridSizeMode.AutoSize)),
+                    new TableColumn(RankingsStrings.MatchmakingRating, dimension: new Dimension(GridSizeMode.AutoSize)),
                 ],
                 RowSize = new Dimension(GridSizeMode.AutoSize),
                 Content = statistics.Select(s => createRow(colourProvider, s)).ToArray().ToRectangular()

osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/Hand/PlayerHandOfCards.cs

@@ -196,6 +196,9 @@ private void moveCardFocus(int direction)
         {
             var cards = GetCardsInDisplayOrder();
 
+            if (cards.Count == 0)
+                return;
+
             int currentIndex = cards.FindIndex(c => c.HasFocus);
 
             // default behaviour is to start from either end of the cards if no card is focused currently

osu.Game/Screens/Play/SubmittingPlayer.cs

@@ -145,28 +145,7 @@ void handleTokenFailure(Exception exception, bool displayNotification = false)
                     if (string.IsNullOrEmpty(exception.Message))
                         Logger.Error(exception, $"Failed to retrieve a score submission token.\n\n{whatWillHappen}");
                     else
-                    {
-                        switch (exception.Message)
-                        {
-                            case @"missing token header":
-                            case @"invalid client hash":
-                            case @"invalid verification hash":
-                                Logger.Log($"Please ensure that you are using the latest version of the official game releases.\n\n{whatWillHappen}", level: LogLevel.Important);
-                                break;
-
-                            case @"invalid or missing beatmap_hash":
-                                Logger.Log($"This beatmap does not match the online version. Please update or redownload it.\n\n{whatWillHappen}", level: LogLevel.Important);
-                                break;
-
-                            case @"expired token":
-                                Logger.Log($"Your system clock is set incorrectly. Please check your system time, date and timezone.\n\n{whatWillHappen}", level: LogLevel.Important);
-                                break;
-
-                            default:
-                                Logger.Log($"{whatWillHappen} {exception.Message}", level: LogLevel.Important);
-                                break;
-                        }
-                    }
+                        Logger.Log($"{getUserFacingAPIError(exception)}\n\n{whatWillHappen}", level: LogLevel.Important);
                 }
 
                 if (shouldExit)
@@ -346,14 +325,36 @@ private Task submitScore(Score score)
 
             request.Failure += e =>
             {
-                Logger.Error(e, $"Failed to submit score (token:{token.Value}): {e.Message}");
+                Logger.Error(e, $"{getUserFacingAPIError(e)}\n\nScore was not submitted (id: {token.Value})");
                 scoreSubmissionSource.SetResult(false);
             };
 
             api.Queue(request);
             return scoreSubmissionSource.Task;
         }
 
+        private static string getUserFacingAPIError(Exception exception)
+        {
+            switch (exception.Message)
+            {
+                case @"missing token header":
+                case @"invalid client hash":
+                case @"invalid verification hash":
+                case @"invalid token":
+                case @"outdated client":
+                    return "Please ensure that you are using the latest version of the official game releases.";
+
+                case @"invalid or missing beatmap_hash":
+                    return "This beatmap does not match the online version. Please update or redownload it.";
+
+                case @"expired token":
+                    return "Your system clock is set incorrectly. Please check your system time, date and timezone.";
+
+                default:
+                    return exception.Message;
+            }
+        }
+
         protected override ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score)
         {
             AllowRetry = true,