Commit Graph

37001 Commits

Author SHA1 Message Date
a9facc076f Fix difficulty creation flow failing for some ruleset combinations
In current `master`, the difficulty creation flow would retrieve a
"reference beatmap" to copy metadata and timing points from using
`GetPlayableBeatmap()`. But, importantly, it was calling that method
using *the ruleset of the new difficulty* rather than the ruleset of the
existing one. This would make the difficulty creation flow fail if the
beatmap couldn't be converted between rulesets (like taiko to catch).

Fixing to use the reference beatmap's actual ruleset would be trivial,
but there's no real reason to do all of that work anyway when a
`WorkingBeatmap` is available. Because getting a playable beatmap is not
required to copy across metadata and timing points, remove the
`GetPlayableBeatmap()` step entirely to fix the bug.

Closes #22145.
2023-01-14 19:46:55 +01:00
5e1ea8b34f Merge branch 'master' into move-overlay-ruleset-selectors 2023-01-14 15:22:14 +01:00
2f2ab445c9 Merge pull request #22182 from stanriders/status-icon
Update status icon design
2023-01-14 21:05:44 +09:00
e610d19d55 Merge branch 'master' into 18469 2023-01-14 19:53:08 +09:00
cfc8fd0aa1 Merge pull request #22188 from Feodor0090/nofs-locale
Localise some notifications
2023-01-14 18:12:54 +09:00
a6e7efa62c Merge pull request #22194 from Feodor0090/more-editor-nrt
Enable nullability for setup, design and timing editor screens
2023-01-14 18:11:46 +09:00
e07c0c7c1f Using 2023-01-14 02:58:18 +03:00
c95d8645f3 Revert "Use existing string"
This reverts commit f950b624ae.
2023-01-14 02:42:04 +03:00
cb4f32e7bd Use StatusIcon in UserDropdown 2023-01-14 02:31:27 +03:00
77e8315ee2 Adjust naming 2023-01-14 02:30:10 +03:00
e2d6e31314 Using 2023-01-14 02:26:26 +03:00
f70dedfd17 Enable nullability for design screen 2023-01-14 02:24:48 +03:00
4b42240fba Enable nullability for setup screen 2023-01-14 02:24:28 +03:00
78adaa9b03 Enable nullability for timing screen 2023-01-14 02:23:21 +03:00
660bf748d5 Fix GroupBadge crashing on null group colour 2023-01-14 02:23:08 +03:00
85b2154f3a Set border colour to white 2023-01-14 01:12:17 +03:00
ab3d39a940 Merge branch 'master' into comment-editor-1 2023-01-13 22:41:41 +01:00
d67184bd80 Autoformat code 2023-01-14 00:26:44 +03:00
f950b624ae Use existing string 2023-01-14 00:26:35 +03:00
5750d82c0a Move overlay ruleset selectors to tab control 2023-01-13 12:50:35 -08:00
2e28f5ed33 Add StatusIcon 2023-01-13 23:18:24 +03:00
515ada6815 Remove CanBeNull where it's no longer requered 2023-01-13 23:11:50 +03:00
a41a031909 Localise some notifications 2023-01-13 23:11:25 +03:00
c62d416680 Add localisation for notification overlay 2023-01-13 22:54:38 +03:00
6028abff39 Code Quality 2023-01-13 10:16:52 -05:00
5dd0aaccef Merge branch 'master' of https://github.com/ppy/osu into 18469 2023-01-13 09:54:29 -05:00
e38075c4ef Use PlacementState to check juice stream placement 2023-01-13 09:37:23 -05:00
11f630d49d Prefill username and email 2023-01-13 15:42:34 +09:00
4d58e6d8d2 Add UI support for redirecting the user to web registration 2023-01-13 15:36:45 +09:00
a7327b02a2 Add API level support for error message and redirect during registration flow 2023-01-13 15:32:53 +09:00
5658c3a123 Enable NRT on account creation classes 2023-01-13 15:29:25 +09:00
6daa37bd3e Merge pull request #22168 from Joehuu/fix-mute-button-closing-overlays
Fix mute button not blocking outside overlay closing presses
2023-01-13 12:35:03 +09:00
5a38abe679 Add comment highlighting reason for blocking mouse down 2023-01-12 19:32:53 -08:00
55f1c7c49d Merge pull request #22160 from EVAST9919/ruleset-selector-online
Don't display custom rulesets in online overlays
2023-01-13 12:16:42 +09:00
464c5eaa2f Fix grammar 2023-01-13 12:16:35 +09:00
73189e49ab Merge pull request #22163 from frenzibyte/fix-intermittent-channel-test-failure
Fix intermittent failure in silenced user messages test
2023-01-13 11:23:45 +09:00
ea4eb6055e Merge pull request #22169 from Feodor0090/timeline-nullability
Enable nullability for editor components
2023-01-13 11:21:42 +09:00
c554a34eaf Add "fps" keyword to frame limiter dropdown 2023-01-13 02:11:05 +03:00
a16050534d Fix mute button not blocking outside overlay closing presses 2023-01-12 14:20:16 -08:00
d74a5ef9e6 Use property instead of ctor parameter 2023-01-12 23:26:29 +03:00
a7ac31fa34 Use IsLegacyRuleset extension method 2023-01-12 23:21:33 +03:00
115cb0d297 Fix channel manager test scene not waiting for notifications client connection 2023-01-12 23:14:23 +03:00
1dae1149cb Don't display non-legacy rulesets in beatmap listing 2023-01-12 22:52:45 +03:00
a9915d6a64 Make OverlayRulesetSelector display only legacy rulesets 2023-01-12 22:44:41 +03:00
0bd1c46c74 Undo sizing changes 2023-01-12 19:48:11 +03:00
2365b065a4 Enable nullability for editor components 2023-01-12 18:07:54 +03:00
123c477e00 Merge branch 'master' into ui/segmented-graph 2023-01-12 19:02:49 +09:00
bb2ece5c71 refactor(SegmentedGraph): adjust tierCount based on passed Colours 2023-01-12 10:57:12 +01:00
c22994c1c6 Merge pull request #22151 from smoogipoo/fix-incorrect-legacy-combo
Fix incorrect max combo after watching imported legacy replays
2023-01-12 18:55:21 +09:00
7cbc03dce6 refactor(SegmentedGraph): use (get/set)ters to expose TierColour 2023-01-12 10:13:16 +01:00