Dan Balasescu
3e0e77394b
Merge branch 'master' into beatmap-decoder-ruleset-store
2022-02-21 18:26:22 +09:00
Dan Balasescu
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
Dan Balasescu
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
Dan Balasescu
46b408be75
Update tests to match new behaviour
2022-02-21 18:19:55 +09:00
Dean Herbert
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
Dean Herbert
ab8b502709
Add test coverage of spotlights being at the top of the listing
2022-02-21 18:01:46 +09:00
Dean Herbert
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
Dan Balasescu
c466d6df94
Ensure to not multiply by 0
2022-02-21 17:19:35 +09:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
3d0caa44c8
Remove unused utils class
2022-02-21 13:43:30 +09:00
Dean Herbert
fc1877b6fa
Move to extension method and revert logic to match previous implementation
2022-02-21 13:42:26 +09:00
Dan Balasescu
c3b365cf6b
Scale classic score by hitobject count
2022-02-21 13:31:03 +09:00
Dean Herbert
79408f6afc
Add xmldoc and clean up ScoreboardTimeUtils
extension methods a touch
2022-02-21 13:30:58 +09:00
Dean Herbert
2ded7d281b
Remove unused using statement
2022-02-21 13:17:19 +09:00
Dean Herbert
abe1a3990a
Merge branch 'master' into leaderboard-score-timeref
2022-02-21 12:11:10 +09:00
Dean Herbert
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
Bartłomiej Dach
36a00c1ee2
Remove static OverlayColourProvider
s
2022-02-20 21:09:08 +01:00
Bartłomiej Dach
ce0db9d4db
Remove all references to static OverlayColourProvider
s
2022-02-20 21:09:08 +01:00
Bartłomiej Dach
79ba37bbab
Add Colour0
to OverlayColourProvider
2022-02-20 21:09:08 +01:00
Bartłomiej Dach
2592f0900d
Add comments about OverlayColourProvider
vs OsuColour
distinction
2022-02-20 21:08:58 +01:00
Bartłomiej Dach
e20ae5b871
Add all colour constants for "basic" colour theme to OsuColour
2022-02-20 21:00:49 +01:00
dekrain
262751a98a
Revert highlighting recent scores
2022-02-19 21:23:35 +01:00
dekrain
31b7ce053d
Fix CI issues
2022-02-19 21:18:26 +01:00
dekrain
0d83c5a39a
Add colour highlighting recent scores
2022-02-19 20:47:30 +01:00
dekrain
15ed9ec4fa
Merge scoreboard and leaderboard implementations together
2022-02-19 20:47:02 +01:00
Susko3
11a11802ed
Ensure exiting is disallowed if we're not at the main menu
2022-02-19 19:28:17 +01:00
Susko3
7ef710de22
Allow exiting/minimizing on Android when on the initial cookie screen
2022-02-19 18:15:49 +01:00
Dean Herbert
c869be87d1
Update FlatFileWorkingBeatmap
to not require a ruleset store
2022-02-19 20:53:04 +09:00
Dan Balasescu
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
Dean Herbert
a029e418cf
Use internal
instead of protected internal
2022-02-18 17:06:04 +09:00
Dean Herbert
3abbf07fb3
Revert local registrations in test scenes
2022-02-18 16:52:34 +09:00
Dean Herbert
cf1dd1ebd3
Disallow registering a null RulesetStore
2022-02-18 16:52:34 +09:00
Dean Herbert
420e2c538f
Automatically use an AssemblyRulesetStore
if no custom store is registered
2022-02-18 16:52:34 +09:00
Dean Herbert
631c23ea3a
Merge branch 'master' into beatmap-decoder-ruleset-store
2022-02-18 16:52:33 +09:00
Dean Herbert
c287b169f1
Merge pull request #16907 from uzervlad/copy-screenshots
...
Copy screenshots to clipboard
2022-02-18 16:31:33 +09:00
Dean Herbert
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
Dean Herbert
29c5683ba3
Add handling of beatmap links on startup
2022-02-18 16:14:37 +09:00
Dean Herbert
98aaf83177
Add a centralised constant for the osu URL schema protocol
2022-02-18 15:57:37 +09:00
dekrain
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
OctopuSSX
08317b4265
Update ScreenshotManager.cs
2022-02-17 20:43:36 +03:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
9d0023c750
Fix incorrect mappings
2022-02-17 21:12:51 +09:00
Dean Herbert
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
Dean Herbert
bbc4ea1203
Merge branch 'master' into better-new-difficulty-naming
2022-02-17 19:21:33 +09:00
Dean Herbert
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
dekrain
f4d1e6f600
Add tests for timerefs
2022-02-17 10:38:29 +01:00
dekrain
7bd731ae08
Move the date next to the flag icon
2022-02-17 10:12:35 +01:00
Dean Herbert
4889750959
Merge pull request #16880 from smoogipoo/remove-playlistitem-beatmap
...
Remove beatmap bindable from PlaylistItem
2022-02-17 17:47:00 +09:00