Commit Graph

49087 Commits

Author SHA1 Message Date
ebdffb3cd9 Merge pull request #16961 from peppy/timeline-load-wait-failure
Fix `TestSceneEditorSaving` not waiting for timeline load
2022-02-22 16:12:32 +09:00
347a2346b9 Fix TestSceneEditorSaving not waiting for timeline load
As seen at
https://github.com/ppy/osu/runs/5276431764?check_suite_focus=true.
2022-02-22 15:41:08 +09:00
a676acd80d Merge pull request #16945 from peppy/three-column-playlist
Update playlist room display to a three column layout
2022-02-22 12:21:56 +09:00
c2af1526aa Merge pull request #16943 from peppy/spotlights-on-top 2022-02-22 10:08:59 +09:00
d71e511413 Merge branch 'master' into spotlights-on-top 2022-02-21 23:42:02 +01:00
959f0330e0 Merge branch 'master' into three-column-playlist 2022-02-21 23:40:21 +01:00
a5af89d143 Merge pull request #16894 from dekrain/leaderboard-score-timeref
Add text displaying recent score time on the leaderboard
2022-02-21 21:16:31 +01:00
e3ae52360e Merge branch 'master' into leaderboard-score-timeref 2022-02-21 20:50:00 +01:00
897f0ecd5f Merge pull request #16938 from smoogipoo/classic-score-hitobject-factor
Scale classic score by hitobject count instead of max combo
2022-02-22 00:40:56 +09:00
98c008b95f Fix test failures due to order change 2022-02-21 19:48:39 +09:00
655b23f408 Update playlist room display to a three column layout
Similar to the changes made to multiplayer.
2022-02-21 19:46:33 +09:00
0cfb85f3bb Merge pull request #16939 from peppy/fix-intro-import-failure-ruleset-test-projects
Add safeties to skip attempted import of the intro beatmap when osu! ruleset not present
2022-02-21 18:24:56 +09:00
33592b3e9e Merge pull request #16942 from peppy/copy-spotlight-category
Allow room category to be copied even if `Spotlight`
2022-02-21 18:21:21 +09:00
46b408be75 Update tests to match new behaviour 2022-02-21 18:19:55 +09:00
02a8500500 Ensure spotlights always show at the top of the lounge listing
As proposed at https://github.com/ppy/osu/discussions/16936. Spotlights
are intended to have focus, so let's make sure they are the first thing
the user sees for the time being.
2022-02-21 18:01:46 +09:00
ab8b502709 Add test coverage of spotlights being at the top of the listing 2022-02-21 18:01:46 +09:00
1737128334 Allow room category to be copied even if Spotlight
I remember that this conditional copy was added to support making copies
of spotlight rooms without carrying across the `Spotlight` type, but in
testing this is already handled web side to the point that it's not
required.

The rationale for allowing the copy is that this method is used for
tests, where it was not being copied correctly from the input as
expected (used at
bdc3b76df0/osu.Game/Tests/Visual/OnlinePlay/TestRoomManager.cs (L38)).
2022-02-21 17:47:56 +09:00
c466d6df94 Ensure to not multiply by 0 2022-02-21 17:19:35 +09:00
2f6e65a9a2 Gracefully handle undefined DateTimeOffset values
Only seems to happen in tests, but best to safeguard against this
regardless.
2022-02-21 16:35:40 +09:00
656c58567d Add safeties to skip attempted import of the intro beatmap when osu! ruleset not present
In general running this import will not cause any critical failures, but
the import itself *will* fail – and more loudly with the upcoming
changes to `RulesetStore` (https://github.com/ppy/osu/pull/16890). Due
to it being a loud failure, it will cause the notification overlay to
display a parsing error, which can interrupt the flow of some tests.

See test failure at
https://github.com/ppy/osu/runs/5268848949?check_suite_focus=true as an
example (video coverage at
https://github.com/ppy/osu/pull/16890#issuecomment-1046542243).
2022-02-21 16:21:38 +09:00
3d0caa44c8 Remove unused utils class 2022-02-21 13:43:30 +09:00
fc1877b6fa Move to extension method and revert logic to match previous implementation 2022-02-21 13:42:26 +09:00
c3b365cf6b Scale classic score by hitobject count 2022-02-21 13:31:03 +09:00
79408f6afc Add xmldoc and clean up ScoreboardTimeUtils extension methods a touch 2022-02-21 13:30:58 +09:00
2ded7d281b Remove unused using statement 2022-02-21 13:17:19 +09:00
abe1a3990a Merge branch 'master' into leaderboard-score-timeref 2022-02-21 12:11:10 +09:00
85e2f68a64 Merge pull request #16933 from bdach/mod-overlay/basic-colour-theme
Add all colour constants for "basic" colour theme to `OsuColour`
2022-02-21 11:12:34 +09:00
36a00c1ee2 Remove static OverlayColourProviders 2022-02-20 21:09:08 +01:00
ce0db9d4db Remove all references to static OverlayColourProviders 2022-02-20 21:09:08 +01:00
79ba37bbab Add Colour0 to OverlayColourProvider 2022-02-20 21:09:08 +01:00
2592f0900d Add comments about OverlayColourProvider vs OsuColour distinction 2022-02-20 21:08:58 +01:00
e20ae5b871 Add all colour constants for "basic" colour theme to OsuColour 2022-02-20 21:00:49 +01:00
262751a98a Revert highlighting recent scores 2022-02-19 21:23:35 +01:00
31b7ce053d Fix CI issues 2022-02-19 21:18:26 +01:00
0d83c5a39a Add colour highlighting recent scores 2022-02-19 20:47:30 +01:00
15ed9ec4fa Merge scoreboard and leaderboard implementations together 2022-02-19 20:47:02 +01:00
65ffcefdf9 Merge pull request #16910 from peppy/fix-storyboard-background-replacement
Fix storyboard background replacement logic not working for beatmaps with multiple backgrounds
2022-02-18 19:08:52 +09:00
c287b169f1 Merge pull request #16907 from uzervlad/copy-screenshots
Copy screenshots to clipboard
2022-02-18 16:31:33 +09:00
e49da2948d Fix storyboard background replacement logic not working for beatmaps with multiple backgrounds
In the case where the background image of individual difficulties is
different, querying the beatmap *set*'s metadata as we were will cause
issues.

I haven't added test coverage for this but can if required. Can be
manually tested using https://osu.ppy.sh/beatmapsets/1595773#osu/3377474
(specifically the highest difficulty).

Closes https://github.com/ppy/osu/discussions/16873.
2022-02-18 16:24:19 +09:00
1abbb9ab39 Align the bar to be on baseline of score components
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-02-17 21:26:59 +01:00
08317b4265 Update ScreenshotManager.cs 2022-02-17 20:43:36 +03:00
d7ef0e4174 Merge pull request #16895 from bdach/better-new-difficulty-naming
Name newly created difficulties in a better way
2022-02-17 21:54:09 +09:00
48dc2cbe72 Merge pull request #16903 from peppy/fix-leaderboard-display
Fix beatmap overlay leaderboards and links not working
2022-02-17 21:52:17 +09:00
9d0023c750 Fix incorrect mappings 2022-02-17 21:12:51 +09:00
3d5ed24e20 Fix beatmap overlay leaderboards and links not working
Completely aware that this isn't how it should be done, but would like
to get this out in a hotfix release today. Maybe changes opinions on
https://github.com/ppy/osu/pull/16890 structure?
2022-02-17 21:05:00 +09:00
bbc4ea1203 Merge branch 'master' into better-new-difficulty-naming 2022-02-17 19:21:33 +09:00
13b6cfb5ed Merge pull request #16898 from smoogipoo/fix-mania-pp-score-multiplier
Fix mania PP calculator applying incorrect score multiplier
2022-02-17 19:21:08 +09:00
f4d1e6f600 Add tests for timerefs 2022-02-17 10:38:29 +01:00
7bd731ae08 Move the date next to the flag icon 2022-02-17 10:12:35 +01:00
4889750959 Merge pull request #16880 from smoogipoo/remove-playlistitem-beatmap
Remove beatmap bindable from PlaylistItem
2022-02-17 17:47:00 +09:00