1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 17:52:56 +08:00
Commit Graph

58148 Commits

Author SHA1 Message Date
Bartłomiej Dach
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
Bartłomiej Dach
3102044d00
Add failing test for new difficulty creation 2023-01-14 18:46:14 +01:00
Bartłomiej Dach
43c0f8b95f
Merge pull request #22191 from Joehuu/move-overlay-ruleset-selectors
Move overlay ruleset selectors to tab control in line with web
2023-01-14 16:01:55 +01:00
Bartłomiej Dach
5e1ea8b34f
Merge branch 'master' into move-overlay-ruleset-selectors 2023-01-14 15:22:14 +01:00
Bartłomiej Dach
d9045b5fa8
Merge pull request #22198 from frenzibyte/fix-mgcc-test-failure
Fix intermittent failure in GCC seeking test
2023-01-14 13:18:14 +01:00
Dean Herbert
2f2ab445c9
Merge pull request #22182 from stanriders/status-icon
Update status icon design
2023-01-14 21:05:44 +09:00
Salman Ahmed
befb275512 Fix intermittent failure in GCC seeking test 2023-01-14 14:34:22 +03:00
ekrctb
8a55dcec11
Merge pull request #21522 from Mogiiii/18469
Show distance snap for first juice stream object.
2023-01-14 20:25:06 +09:00
ekrctb
e610d19d55
Merge branch 'master' into 18469 2023-01-14 19:53:08 +09:00
Dean Herbert
cfc8fd0aa1
Merge pull request #22188 from Feodor0090/nofs-locale
Localise some notifications
2023-01-14 18:12:54 +09:00
Dean Herbert
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
Bartłomiej Dach
b37c3203e5
Merge pull request #22192 from stanriders/fix-group-badges
Fix `GroupBadge` crashing on `null` group colour
2023-01-14 01:17:58 +01:00
StanR
e07c0c7c1f Using 2023-01-14 02:58:18 +03:00
ansel
c95d8645f3 Revert "Use existing string"
This reverts commit f950b624ae.
2023-01-14 02:42:04 +03:00
StanR
cb4f32e7bd Use StatusIcon in UserDropdown 2023-01-14 02:31:27 +03:00
ansel
77e8315ee2 Adjust naming 2023-01-14 02:30:10 +03:00
StanR
e2d6e31314 Using 2023-01-14 02:26:26 +03:00
ansel
f70dedfd17 Enable nullability for design screen 2023-01-14 02:24:48 +03:00
ansel
4b42240fba Enable nullability for setup screen 2023-01-14 02:24:28 +03:00
ansel
78adaa9b03 Enable nullability for timing screen 2023-01-14 02:23:21 +03:00
StanR
660bf748d5 Fix GroupBadge crashing on null group colour 2023-01-14 02:23:08 +03:00
Bartłomiej Dach
7782bfb80b
Merge pull request #21448 from Feodor0090/comment-editor-1
Update comment editor component
2023-01-13 23:51:31 +01:00
StanR
85b2154f3a Set border colour to white 2023-01-14 01:12:17 +03:00
Bartłomiej Dach
ab3d39a940
Merge branch 'master' into comment-editor-1 2023-01-13 22:41:41 +01:00
ansel
d67184bd80 Autoformat code 2023-01-14 00:26:44 +03:00
ansel
f950b624ae Use existing string 2023-01-14 00:26:35 +03:00
Bartłomiej Dach
92062e4bb1
Merge pull request #22186 from frenzibyte/fix-score-test-failure
Fix intermittent failure in score submission tests
2023-01-13 22:22:57 +01:00
Joseph Madamba
5750d82c0a Move overlay ruleset selectors to tab control 2023-01-13 12:50:35 -08:00
StanR
2e28f5ed33 Add StatusIcon 2023-01-13 23:18:24 +03:00
ansel
515ada6815 Remove CanBeNull where it's no longer requered 2023-01-13 23:11:50 +03:00
ansel
a41a031909 Localise some notifications 2023-01-13 23:11:25 +03:00
Salman Ahmed
b681a0d47f Fix intermittent failure in score submission tests 2023-01-13 22:57:40 +03:00
ansel
c62d416680 Add localisation for notification overlay 2023-01-13 22:54:38 +03:00
Dylan Nantz
6028abff39 Code Quality 2023-01-13 10:16:52 -05:00
Dylan Nantz
5dd0aaccef Merge branch 'master' of https://github.com/ppy/osu into 18469 2023-01-13 09:54:29 -05:00
Dylan Nantz
e38075c4ef Use PlacementState to check juice stream placement 2023-01-13 09:37:23 -05:00
Dan Balasescu
ad2582a3ab
Merge pull request #22156 from peppy/remove-cf-bundle-version
Remove `CFBundleVersion` from iOS plist file
2023-01-13 17:48:43 +09:00
Dan Balasescu
0c1561bc82
Merge pull request #22172 from peppy/create-account-redirect-support
Add support for redirection to website during account creation process
2023-01-13 17:03:24 +09:00
Dean Herbert
911cc78094 Fix debug build thinking it's deployed due to major version >= 1 2023-01-13 16:21:13 +09:00
Dean Herbert
11f630d49d Prefill username and email 2023-01-13 15:42:34 +09:00
Dean Herbert
4d58e6d8d2 Add UI support for redirecting the user to web registration 2023-01-13 15:36:45 +09:00
Dean Herbert
a7327b02a2 Add API level support for error message and redirect during registration flow 2023-01-13 15:32:53 +09:00
Dean Herbert
5658c3a123 Enable NRT on account creation classes 2023-01-13 15:29:25 +09:00
Dean Herbert
bdf901e490 Use more correct default version to avoid startup crash on attempting to parse 2023-01-13 15:27:56 +09:00
Dean Herbert
c078838d6f Merge branch 'master' into remove-cf-bundle-version 2023-01-13 15:17:39 +09:00
Dean Herbert
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
Joseph Madamba
5a38abe679 Add comment highlighting reason for blocking mouse down 2023-01-12 19:32:53 -08:00
Dean Herbert
d8e0e67c45 Add default version specifications to iOS csproj file
Matches implementation for android.
2023-01-13 12:26:47 +09:00
Dean Herbert
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
Dean Herbert
464c5eaa2f
Fix grammar 2023-01-13 12:16:35 +09:00