Commit Graph

49060 Commits

Author SHA1 Message Date
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
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
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
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
c3b365cf6b Scale classic score by hitobject count 2022-02-21 13:31:03 +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
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
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
4889750959 Merge pull request #16880 from smoogipoo/remove-playlistitem-beatmap
Remove beatmap bindable from PlaylistItem
2022-02-17 17:47:00 +09:00
2a1edcdf73 Merge branch 'master' into remove-playlistitem-beatmap 2022-02-17 17:19:26 +09:00
510d1d6277 Merge pull request #16901 from peppy/update-framework
Update framework
2022-02-17 17:12:30 +09:00
dc74d17478 Update framework 2022-02-17 16:45:20 +09:00
64360f2b37 Merge pull request #16891 from smoogipoo/fix-mania-hitwindow-attrib
Fix mania hit window attribute improperly considering rate-adjustment mods
2022-02-17 14:03:51 +09:00
39a7bbdb9a Fix mania PP calculator applying incorrect score multiplier 2022-02-17 14:03:39 +09:00
03d3501a3c Merge pull request #16897 from peppy/add-back-mod-multiplier
Revert changes to mod multiplier display
2022-02-17 14:02:42 +09:00
7307e68e9c Revert "Merge pull request #16889 from smoogipoo/remove-mod-multiplier"
This reverts commit 252b945d3b, reversing
changes made to a1b39a96cf.
2022-02-17 13:26:12 +09:00
9410fb46af Merge pull request #16896 from Stedoss/remove-creator-from-playlist-item-beatmap-text
Remove creator name from playlist item panel beatmap text
2022-02-17 12:46:02 +09:00
aac1c53b06 Remove creator name from playlist item panel beatmap text 2022-02-17 03:04:16 +00:00
e459523afe Adjust beatmap creation test cases to new behaviour 2022-02-17 00:28:18 +01:00
8a08bb7aaf Use best-name-finding helper in new difficulty creation flow 2022-02-17 00:28:18 +01:00
e09570c31b Implement best-name-finding helper method 2022-02-17 00:28:17 +01:00
cb9ffc655a Add tests showing expected behaviour of naming helper 2022-02-17 00:28:13 +01:00
0b37efc985 Add explanatory note 2022-02-16 20:07:58 +09:00
a0ee86ddd2 Fix improperly considering rate adjustment mods 2022-02-16 19:51:42 +09:00
1f9892802c Merge pull request #16886 from peppy/clarify-parenthesis
Clarify ambiguous conditionals in `LegacyStageBackground`
2022-02-16 19:15:21 +09:00
252b945d3b Merge pull request #16889 from smoogipoo/remove-mod-multiplier
Remove mod multipliers from applying to scores
2022-02-16 17:59:26 +09:00
28fcad9281 Update failing test to not account for no-longer-existing multiplier 2022-02-16 17:33:55 +09:00
23933fc881 Update xmldoc to mention that multipliers are not applied anywhere 2022-02-16 17:32:22 +09:00
4c1413e0c7 No longer require Mod implementation 2022-02-16 16:36:02 +09:00
5dd9771c5f Remove mod multipliers from being applied to scores 2022-02-16 16:27:27 +09:00
d4bf335fcc Use score multiplier attribute in ManiaPerformanceCalculator 2022-02-16 16:24:40 +09:00
55d9f0b44b Store beatmap to a field instead 2022-02-16 16:03:08 +09:00
edd31bf3aa Revert styling change 2022-02-16 15:51:18 +09:00
f703828e1b Clarify ambiguous conditionals in LegacyStageBackground 2022-02-16 15:27:49 +09:00