From 190e7acd39be36fb85485dc59d7b7094338989a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= Date: Fri, 16 Dec 2022 16:37:05 +0100 Subject: [PATCH 1/5] Fix wrong paths to macOS log folder in docs Wrong since 2eb1c60d6e72d8b2c478cf4376470ca614ef3f88. --- .github/ISSUE_TEMPLATE/bug-issue.yml | 3 ++- CONTRIBUTING.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-issue.yml b/.github/ISSUE_TEMPLATE/bug-issue.yml index 91ca622f55..5e2cb8c8d5 100644 --- a/.github/ISSUE_TEMPLATE/bug-issue.yml +++ b/.github/ISSUE_TEMPLATE/bug-issue.yml @@ -58,7 +58,8 @@ body: The default places to find the logs on desktop platforms are as follows: - `%AppData%/osu/logs` *on Windows* - - `~/.local/share/osu/logs` *on Linux & macOS* + - `~/.local/share/osu/logs` *on Linux* + - `~/Library/Application Support/osu/files` *on macOS* If you have selected a custom location for the game files, you can find the `logs` folder there. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ae2bdd2e82..c72a3b442e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,8 @@ Issues, bug reports and feature suggestions are welcomed, though please keep in * the in-game logs, which are located at: * `%AppData%/osu/logs` (on Windows), - * `~/.local/share/osu/logs` (on Linux and macOS), + * `~/.local/share/osu/logs` (on Linux), + * `~/Library/Application Support/osu/logs` (on macOS), * `Android/data/sh.ppy.osulazer/files/logs` (on Android), * on iOS they can be obtained by connecting your device to your desktop and [copying the `logs` directory from the app's own document storage using iTunes](https://support.apple.com/en-us/HT201301#copy-to-computer), * your system specifications (including the operating system and platform you are playing on), From 00bae8fab90687df6a6a741895f433ec39f2bedf Mon Sep 17 00:00:00 2001 From: Salman Ahmed Date: Fri, 16 Dec 2022 18:44:19 +0300 Subject: [PATCH 2/5] Fix slight mistake in path --- .github/ISSUE_TEMPLATE/bug-issue.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug-issue.yml b/.github/ISSUE_TEMPLATE/bug-issue.yml index 5e2cb8c8d5..ff6d869e72 100644 --- a/.github/ISSUE_TEMPLATE/bug-issue.yml +++ b/.github/ISSUE_TEMPLATE/bug-issue.yml @@ -59,7 +59,7 @@ body: The default places to find the logs on desktop platforms are as follows: - `%AppData%/osu/logs` *on Windows* - `~/.local/share/osu/logs` *on Linux* - - `~/Library/Application Support/osu/files` *on macOS* + - `~/Library/Application Support/osu/logs` *on macOS* If you have selected a custom location for the game files, you can find the `logs` folder there. From fea0895f16291ae47507fe5c38e8d49381a12701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= Date: Sat, 17 Dec 2022 21:08:11 +0100 Subject: [PATCH 3/5] Call spectator `EndPlaying()` immediately after score submission As it turns out, in current `master`, if a gameplay session ends normally (i.e. by the player completing the beatmap in full), then the spectator server `EndPlaying()` method will not be called until `SubmittingPlayer.OnExiting()`, which in practice turns out to be the moment where the user exits from the post-gameplay results screen back to song select. There is seemingly no reasonable cause for not calling this earlier. In fact the solo spectator flow looks more broken without this call than with, because without it the spectator view just hangs until the spectated player exits gameplay, and *only then* shows results, rather than do it upon normal gameplay completion. --- osu.Game/Screens/Play/SubmittingPlayer.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs index 4c507f8c67..1eec71f33a 100644 --- a/osu.Game/Screens/Play/SubmittingPlayer.cs +++ b/osu.Game/Screens/Play/SubmittingPlayer.cs @@ -130,6 +130,7 @@ namespace osu.Game.Screens.Play score.ScoreInfo.Date = DateTimeOffset.Now; await submitScore(score).ConfigureAwait(false); + spectatorClient.EndPlaying(GameplayState); } [Resolved] From 6e62033bc4b1db91982105afb0d86a913a6f59e7 Mon Sep 17 00:00:00 2001 From: Joseph Madamba Date: Sun, 18 Dec 2022 20:10:22 -0800 Subject: [PATCH 4/5] Fix some comment actions not being lowercased --- osu.Game/Overlays/Comments/CommentReportButton.cs | 3 ++- osu.Game/Overlays/Comments/DrawableComment.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/osu.Game/Overlays/Comments/CommentReportButton.cs b/osu.Game/Overlays/Comments/CommentReportButton.cs index 10bd3a64bf..ba5319094b 100644 --- a/osu.Game/Overlays/Comments/CommentReportButton.cs +++ b/osu.Game/Overlays/Comments/CommentReportButton.cs @@ -3,6 +3,7 @@ using osu.Framework.Allocation; using osu.Framework.Extensions; +using osu.Framework.Extensions.LocalisationExtensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Cursor; @@ -53,7 +54,7 @@ namespace osu.Game.Overlays.Comments } }; - link.AddLink(UsersStrings.ReportButtonText, this.ShowPopover); + link.AddLink(ReportStrings.CommentButton.ToLower(), this.ShowPopover); } private void report(CommentReportReason reason, string comments) diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs index 7bada5ef2a..1d3825c44c 100644 --- a/osu.Game/Overlays/Comments/DrawableComment.cs +++ b/osu.Game/Overlays/Comments/DrawableComment.cs @@ -19,6 +19,7 @@ using System; using osu.Framework.Graphics.Shapes; using osu.Framework.Extensions.IEnumerableExtensions; using System.Collections.Specialized; +using osu.Framework.Extensions.LocalisationExtensions; using osu.Framework.Localisation; using osu.Framework.Platform; using osu.Game.Graphics.UserInterface; @@ -335,7 +336,7 @@ namespace osu.Game.Overlays.Comments actionsContainer.AddArbitraryDrawable(Empty().With(d => d.Width = 10)); if (Comment.UserId.HasValue && Comment.UserId.Value == api.LocalUser.Value.Id) - actionsContainer.AddLink(CommonStrings.ButtonsDelete, deleteComment); + actionsContainer.AddLink(CommonStrings.ButtonsDelete.ToLower(), deleteComment); else actionsContainer.AddArbitraryDrawable(new CommentReportButton(Comment)); From 8d83c788103a75e132a25c24fd76fbdd46dc609a Mon Sep 17 00:00:00 2001 From: Joseph Madamba Date: Sun, 18 Dec 2022 21:12:38 -0800 Subject: [PATCH 5/5] Fix casing on comment actions test --- .../Visual/Online/TestSceneCommentActions.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs index 7981e212d4..8d82843134 100644 --- a/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs +++ b/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs @@ -77,14 +77,14 @@ namespace osu.Game.Tests.Visual.Online { var comments = this.ChildrenOfType(); var ourComment = comments.SingleOrDefault(x => x.Comment.Id == 1); - return ourComment != null && ourComment.ChildrenOfType().Any(x => x.Text == "Delete"); + return ourComment != null && ourComment.ChildrenOfType().Any(x => x.Text == "delete"); }); AddAssert("Second doesn't", () => { var comments = this.ChildrenOfType(); var ourComment = comments.Single(x => x.Comment.Id == 2); - return ourComment.ChildrenOfType().All(x => x.Text != "Delete"); + return ourComment.ChildrenOfType().All(x => x.Text != "delete"); }); } @@ -102,7 +102,7 @@ namespace osu.Game.Tests.Visual.Online }); AddStep("It has delete button", () => { - var btn = ourComment.ChildrenOfType().Single(x => x.Text == "Delete"); + var btn = ourComment.ChildrenOfType().Single(x => x.Text == "delete"); InputManager.MoveMouseTo(btn); }); AddStep("Click delete button", () => @@ -175,7 +175,7 @@ namespace osu.Game.Tests.Visual.Online }); AddStep("It has delete button", () => { - var btn = ourComment.ChildrenOfType().Single(x => x.Text == "Delete"); + var btn = ourComment.ChildrenOfType().Single(x => x.Text == "delete"); InputManager.MoveMouseTo(btn); }); AddStep("Click delete button", () => @@ -245,7 +245,7 @@ namespace osu.Game.Tests.Visual.Online }); AddStep("Click the button", () => { - var btn = targetComment.ChildrenOfType().Single(x => x.Text == "Report"); + var btn = targetComment.ChildrenOfType().Single(x => x.Text == "report"); InputManager.MoveMouseTo(btn); InputManager.Click(MouseButton.Left); });