1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 03:12:54 +08:00
Commit Graph

58473 Commits

Author SHA1 Message Date
Salman Ahmed
1552726150 Fix intermittent failure in beatmap options state test 2023-01-16 14:06:02 +03:00
Dean Herbert
d00811374f
Merge pull request #22225 from Feodor0090/ruleset-settings-loc
Localise ruleset settings section
2023-01-16 14:04:26 +09:00
Dean Herbert
988544073c
Merge branch 'master' into ruleset-settings-loc 2023-01-16 13:29:15 +09:00
Dean Herbert
eb0f30c641 Use scroll speed localisation in one more usage 2023-01-16 13:28:45 +09:00
Dean Herbert
d19b35bd5f Rename ambiguous translation keys 2023-01-16 13:18:49 +09:00
Joseph Madamba
6a847faea9 Make home string keys more specific 2023-01-15 15:23:26 -08:00
Joseph Madamba
0ff143d4c8 Add argument for play some ruleset string 2023-01-15 15:23:26 -08:00
Joseph Madamba
ae49e724e4 Move converted beatmap icons logic locally 2023-01-15 15:09:25 -08:00
Joseph Madamba
b733f46c6f Apply NRT to BeatmapPicker 2023-01-15 15:09:25 -08:00
Joseph Madamba
27671f0401 Merge remote-tracking branch 'upstream/master' into pr/20709 2023-01-15 15:08:11 -08:00
Joseph Madamba
85c1932851 Mark Converts as nullable 2023-01-15 12:46:41 -08:00
ansel
6f84641596 Localise osu!mania settings 2023-01-15 23:30:20 +03:00
ansel
9ce7c51b14 Localise osu! settings 2023-01-15 23:29:58 +03:00
Dean Herbert
a397b9cbf9
Merge pull request #22221 from frenzibyte/fix-screen-navigation-test-failure
Fix intermittent failure in screen navigation tests
2023-01-16 02:51:25 +09:00
ansel
00acea59fc Move some strings to common 2023-01-15 19:37:40 +03:00
Bartłomiej Dach
7b718d75e1
Merge pull request #22218 from ekrctb/nullable-catch
Remove #nullable disable from osu.Game.Rulesets.Catch
2023-01-15 16:10:38 +01:00
mk56-spn
9a29c9ae26 remove hacky method to check if carousel is null 2023-01-15 15:32:53 +01:00
ekrctb
1f8b7b8f03 Remove #nullable disable from CaughtObject 2023-01-15 23:21:38 +09:00
ekrctb
d664a66a37 Remove redundant canBeNull: true 2023-01-15 23:11:59 +09:00
Dean Herbert
c5775aa452
Merge branch 'master' into song_select_nullability 2023-01-15 22:44:13 +09:00
Dean Herbert
4cf4a66858 Make MusicController a required dependency of SongSelect 2023-01-15 22:43:30 +09:00
Dean Herbert
f7af5a8115 Revert some formatting changes 2023-01-15 22:39:00 +09:00
Salman Ahmed
13c1b8f5a4 Fix intermittent failure in tests with restarting player instances 2023-01-15 16:06:06 +03:00
ansel
5d2e09137c Remove text padding in editor menu for now 2023-01-15 14:40:53 +03:00
ansel
8777d5349b Use existing strings 2023-01-15 14:39:34 +03:00
ekrctb
086604cd14 Remove #nullable disable from Catch.Objects.Drawables
Except DrawableCatchHitObject, it complains in base(hitObject) call.
2023-01-15 17:29:35 +09:00
ekrctb
b88091262d Remove #nullable disable from Catch.UI 2023-01-15 17:29:35 +09:00
ekrctb
b08a1e3a0b Remove #nullable disable from misc Catch files 2023-01-15 17:29:35 +09:00
ekrctb
56fb315f32 Remove #nullable disable from Catch.Objects 2023-01-15 17:29:35 +09:00
ekrctb
2468911f4b Remove #nullable disable from Catch.Judgements 2023-01-15 17:29:32 +09:00
ekrctb
3ab3f556ae Remove #nullable disable from Catch.Difficulty 2023-01-15 17:29:32 +09:00
ekrctb
b049244b75 Remove #nullable disable from Catch.Beatmaps 2023-01-15 17:29:32 +09:00
ekrctb
a75fc5108a Remove #nullable disable from Catch.Edit namespace 2023-01-15 17:29:32 +09:00
Dean Herbert
8f70424999
Merge pull request #22213 from Joehuu/fix-kudosu-wiki-link
Fix kudosu wiki link from user profile not linking to in-game overlay
2023-01-15 13:06:34 +09:00
Joseph Madamba
627d1725c3 Fix kudosu wiki link from user profile not linking to in-game overlay 2023-01-14 19:56:51 -08:00
ansel
87650044bb Localise create/save dialog 2023-01-15 01:50:47 +03:00
ansel
78e562903d Localise part of editor 2023-01-15 01:50:47 +03:00
ansel
24df23f420 Localise background header 2023-01-15 01:49:19 +03:00
ansel
76eefc7573 Add support for localisation where it was missing 2023-01-15 01:46:11 +03:00
integer
a68d4fe5d1 make expansion to not use scheduler 2023-01-14 21:18:51 +00:00
ansel
1480c691ae Explain empty string in editor's footer 2023-01-14 23:42:56 +03:00
ansel
58406cae19 Make test wait for comment loading 2023-01-14 23:42:10 +03:00
ansel
c36922dd2c Use clock to obtain a position for comment insertion 2023-01-14 22:57:51 +03:00
ansel
c2bb0949f5 Take type and id from container directly on submit 2023-01-14 22:57:23 +03:00
ansel
cdf3aafddd Add check for any drawables in content before looking for placeholder 2023-01-14 22:37:05 +03:00
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
Joseph Madamba
e7ab543799 Add ability to view converted beatmaps on beatmap set overlay 2023-01-14 10:26:21 -08:00
ansel
88c3eef8e1 Add test case with no existing comments 2023-01-14 20:59:13 +03:00
Dean Herbert
efe6dae672
Merge pull request #22200 from bdach/user-profile/update-design-basics
Update user profile appearance to closer match web
2023-01-15 02:50:11 +09:00
Bartłomiej Dach
3102044d00
Add failing test for new difficulty creation 2023-01-14 18:46:14 +01:00