1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-18 10:43:22 +08:00
Commit Graph

70874 Commits

Author SHA1 Message Date
Dan Balasescu
35c70ceb18
Merge pull request #31106 from peppy/player-settings-fix-overlap-skins
Fix player settings overlay cog overlapping skin elements
2024-12-13 19:30:39 +09:00
Dean Herbert
4b0cdd761d
Add note about player settings overlay button 2024-12-13 18:58:20 +09:00
Dan Balasescu
f84c67babd
Merge pull request #31101 from Joehuu/recommended-diff-beatmap-listing
Add recommended difficulty numerical value near filter in beatmap listing
2024-12-13 18:57:16 +09:00
Dan Balasescu
e2af8820de
Merge pull request #31107 from bdach/flaky-editor-test
Attempt to fix flaky editor beatmap creation test
2024-12-13 18:53:43 +09:00
Dan Balasescu
22a5ed8a07
Merge branch 'master' into player-settings-fix-overlap-skins 2024-12-13 18:36:12 +09:00
Dan Balasescu
c29c3d48bf
Merge pull request #31105 from peppy/player-settings-no-show-skin-editor
Fix player settings overlay appearing while in skin editor
2024-12-13 18:34:05 +09:00
Dean Herbert
d00bc4bdd1
Also allow using "quick retry" for other replays 2024-12-13 18:14:45 +09:00
Dean Herbert
0e0d96829f
Fix "quick retry" hotkey not working for autoplay 2024-12-13 18:08:29 +09:00
Dan Balasescu
edbaaa9468
Fix test 2024-12-13 17:41:55 +09:00
Bartłomiej Dach
fdc41ace7e
Fix flaky editor beatmap creation test
As seen in
https://github.com/ppy/osu/actions/runs/12289146465/job/34294167417#step:5:1588
or
https://github.com/ppy/osu/actions/runs/12310133160/job/34358241666#step:5:53.

Exception messages hint pretty strongly at this being a threading issue
and there does seem to be a rather frivolous lack of waiting for
`CreateNewDifficulty()` to do its thing, so I'm thinking maybe this will
help.
2024-12-13 17:35:41 +09:00
Dean Herbert
a796af9511
Fix player settings overlay cog overlapping skin elements
This brings it down to be in line with the flowing elements that usually
do their best to not get in the way.

Decided against putting it in the `HUDOverlay` flow for simplicity. It
will work fine until it doesn't.
2024-12-13 17:28:15 +09:00
Dean Herbert
1e809c7f16
Fix player settings overlay appearing while in skin editor 2024-12-13 17:18:34 +09:00
Dean Herbert
b470e30cc0
Add failing test showing player settings appearing in skin editor 2024-12-13 17:18:34 +09:00
Dan Balasescu
2930db5d6e
Merge pull request #31073 from bdach/filter-playing-rooms
Add ability to filter out currently playing rooms
2024-12-13 17:03:30 +09:00
Dan Balasescu
7bb1a5118e
Unbind event on disposal 2024-12-13 16:39:16 +09:00
Dan Balasescu
62a1a5883a
Merge branch 'master' into recommended-diff-beatmap-listing 2024-12-13 16:38:07 +09:00
Dean Herbert
313de33986
Adjust padding to avoid wrapping on checkbox text 2024-12-13 15:42:30 +09:00
Dan Balasescu
ae1030197a
Merge pull request #31103 from Joehuu/update-taiko-recommended-diff
Update recommended difficulty for osu!taiko
2024-12-13 14:26:02 +09:00
Joseph Madamba
38b3d5fc00
Update recommended difficulty for osu!taiko 2024-12-12 16:17:57 -08:00
Joseph Madamba
f7364de01a
Add test and null protections 2024-12-12 15:23:00 -08:00
Joseph Madamba
92e07b4f99
Add recommended difficulty numerical value near filter in beatmap listing 2024-12-12 15:23:00 -08:00
Joseph Madamba
e95dc2b308
Add FormatStarRating() method util 2024-12-12 15:23:00 -08:00
Joseph Madamba
3035e8435d
Apply NRT to incoming changed files 2024-12-12 15:22:58 -08:00
Nicholas Chin
a22f3416d6 Replace switch expression with LocalisableDescription attribute for variant display
Use existing localisation strings from BeatmapsStrings instead of CommonStrings for consistent localisation handling
2024-12-12 22:39:21 +08:00
Bartłomiej Dach
0328708889
Store value of toggle to setting 2024-12-12 15:17:39 +09:00
Bartłomiej Dach
61ee830588
Adjust copy 2024-12-12 15:17:39 +09:00
Bartłomiej Dach
d8d5a00f3b
Merge branch 'master' into filter-playing-rooms 2024-12-12 13:06:22 +09:00
Bartłomiej Dach
88241d5b95
Merge pull request #30838 from smoogipoo/better-room-status
Improve multiplayer room status handling
2024-12-12 13:05:59 +09:00
Dean Herbert
862b41c38e
Move BeatmapInfoWedgeV2 to correct namespace 2024-12-12 12:53:05 +09:00
Nicholas Chin
26f15def70 Add missing mania tooltip overlay for 4k and 7k 2024-12-11 23:15:05 +08:00
Dean Herbert
e8c0e27cc0
Adjust in line with upstream changes 2024-12-11 18:17:59 +09:00
Dean Herbert
0aa17a905b
Increase timed update frequency and add inline comment 2024-12-11 18:08:34 +09:00
Dean Herbert
a3998fbd52
Merge branch 'master' into better-room-status 2024-12-11 18:06:55 +09:00
Bartłomiej Dach
4e4a99decc
Merge pull request #31076 from peppy/beatmap-store-interface
Access beatmap store via abstract base class
2024-12-11 17:48:32 +09:00
Bartłomiej Dach
99f9e2800a
Merge pull request #30763 from Darius-Wattimena/catch-convert-to-stream
Add convert to stream functionality for juice streams
2024-12-11 17:37:44 +09:00
Dean Herbert
cc1f94939f
Merge pull request #31037 from frenzibyte/ios-beatmap-export
Enable beatmap exports on iOS
2024-12-11 00:12:56 -08:00
Dean Herbert
2a4f596f90
Merge branch 'master' into ios-beatmap-export 2024-12-10 23:59:15 -08:00
Dean Herbert
02c52e41bd
Merge pull request #31039 from frenzibyte/ios-temporary-export-storage
Use temporary storage for file exports on iOS
2024-12-10 23:53:40 -08:00
Dean Herbert
8079784e96
Merge pull request #30877 from peppy/medal-display-fix
Fix potential issues with medal display
2024-12-10 23:53:34 -08:00
Dean Herbert
a868c33380
Remove BeatmapCarousel testing backdoor 2024-12-11 16:28:51 +09:00
Dean Herbert
c94b393e30
Access beatmap store via abstract base class
The intention here is to make things more testable going forward.
Specifically, to remove the "back-door" entrance into `BeatmapCarousel`
where `BeatmapSets` can be set by tests and bypas/block realm retrieval.
2024-12-11 16:28:51 +09:00
Dean Herbert
bab9b9c937
Remove no-longer-correct comment 2024-12-11 16:28:50 +09:00
Dean Herbert
de31a48beb
Some Carousel classes can be abstract 2024-12-11 16:28:50 +09:00
Bartłomiej Dach
5a0b732ee3
Add comments backreferences to copies of duplicated code for future use 2024-12-11 16:26:11 +09:00
Bartłomiej Dach
1f43ad3928
Merge branch 'master' into catch-convert-to-stream 2024-12-11 16:24:45 +09:00
Bartłomiej Dach
c4374c7315
Merge branch 'master' into medal-display-fix 2024-12-11 15:52:38 +09:00
Salman Alshamrani
e0aec6f907 Revert unnecessary complexity 2024-12-11 01:03:55 -05:00
Salman Alshamrani
723883e1f0 Revert "Update exporter test to use OsuStorage"
This reverts commit f0f3c53571.
2024-12-11 01:03:20 -05:00
Bartłomiej Dach
89e3c551ff
Merge pull request #30860 from frenzibyte/editor-multiple-background-audio-files
Allow choosing different background/audio files for individual difficulties
2024-12-11 14:12:58 +09:00
Bartłomiej Dach
b37a06c0fe
Hide "show playing rooms" toggle when in filter mode it doesn't make sense with 2024-12-11 13:24:54 +09:00