1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 14:47:23 +08:00
Commit Graph

64078 Commits

Author SHA1 Message Date
Dean Herbert
8286d3896f
Fix searching at song select matching incorrect ruleset
Regressed with https://github.com/ppy/osu/pull/25679.
2023-12-06 11:32:26 +09:00
Bartłomiej Dach
88095aaefa
Merge pull request #25637 from smoogipoo/multiplayer-abort
Add ability for the host to abort an in-progress match
2023-12-05 13:51:00 +01:00
Bartłomiej Dach
4644c4e7a2
Remove unused class 2023-12-05 12:43:32 +01:00
Bartłomiej Dach
566d336470
Merge pull request #25679 from peppy/song-select-search-performance
Improve song select search performance
2023-12-05 11:06:31 +01:00
Dean Herbert
8704dc3505
Fix change in filter behaviour 2023-12-05 18:20:27 +09:00
Dean Herbert
5a2240838b
Merge branch 'master' into multiplayer-abort 2023-12-05 17:01:54 +09:00
Dean Herbert
02178d8e61
Remove usage of case-when 2023-12-05 16:58:16 +09:00
Dean Herbert
f317e06da1
Use DangerousActionDialog 2023-12-05 16:54:44 +09:00
Dean Herbert
7b9c9a3bfd
Merge pull request #25675 from vegguid/editor-setup-show-filename
Changed the LabelledFileChooser in the setup to show the file name of the file that is was selected
2023-12-05 16:38:07 +09:00
Dean Herbert
45e499778f
Search terms before performing other criteria checks
Very minor, but putting the more common case towards the
start of the method allows early return.
2023-12-05 15:28:56 +09:00
Dean Herbert
42010574b5
Avoid list construction when doing filtering 2023-12-05 15:26:14 +09:00
Dean Herbert
27e778ae09
Avoid sorting items when already in the correct sort order 2023-12-05 14:47:32 +09:00
Dean Herbert
7fda38d0b0
Use ordinal comparison when searching at song select
Bypasses various overheads. In theory should be fine? (until it's not on some language)
2023-12-05 14:14:13 +09:00
Guido
8756dd25c6 Changed file chooser in resource selection to show file name when file is selected 2023-12-04 22:51:56 +01:00
Bartłomiej Dach
1292c322c0
Merge pull request #25671 from Susko3/uncomment-net6.0-code
Uncomment net6.0 code and remove old code in `BeatmapListingOverlay`
2023-12-04 21:06:54 +01:00
Susko3
0e47492858 Uncomment net6.0 code and remove old code 2023-12-04 20:17:22 +01:00
Bartłomiej Dach
f0364f01ea
Merge pull request #25665 from bdach/skin-editor-breakage
Fix several edge cases in skin editor gameplay scene opening flow
2023-12-04 16:48:41 +01:00
Dean Herbert
c5a08a0711
Remove unused using statement 2023-12-04 23:06:08 +09:00
Bartłomiej Dach
5512298d60
Trim unused resolved bindable 2023-12-04 15:01:23 +01:00
Bartłomiej Dach
8754fa40f4
Source autoplay mod from beatmap about to be presented rather than ambient global 2023-12-04 14:42:51 +01:00
Bartłomiej Dach
063694f544
Do not attempt to load gameplay scene if current beatmap is dummy 2023-12-04 14:42:51 +01:00
Bartłomiej Dach
9d39b70e38
Fix endless player not handling load failure 2023-12-04 14:42:51 +01:00
Bartłomiej Dach
055fb5bd8f
Do not set initial activity in skin editor endless player
Seems like an overreach to say that the user is "watching a replay"
there.
2023-12-04 14:42:51 +01:00
Bartłomiej Dach
43312619e3
Add test coverage for crashing on wrong ruleset 2023-12-04 14:42:51 +01:00
Bartłomiej Dach
7c041df0f1
Add test coverage for crashing on dummy beatmap 2023-12-04 14:42:42 +01:00
Bartłomiej Dach
d3e94cd5bf
Add test coverage for crashing on empty beatmap 2023-12-04 14:42:40 +01:00
Bartłomiej Dach
7deff70b4a
Extract beatmap import steps from gameplay scene switch helper 2023-12-04 13:34:36 +01:00
Dean Herbert
36b1369a4e
Merge pull request #25636 from Susko3/fix-older-android-storage
Request `READ_EXTERNAL_STORAGE` on older android versions
2023-12-04 12:11:08 +09:00
Dean Herbert
c2a4a6d8cb
Add inline comment matching framework 2023-12-04 12:10:31 +09:00
Dean Herbert
e06d5f5875
Merge pull request #25649 from smoogipoo/remove-mania-drain-again
Once again remove Mania passive HP drain
2023-12-04 12:03:32 +09:00
Dan Balasescu
8587652869
Fix countdown button being enabled 2023-12-04 11:00:11 +09:00
Dan Balasescu
9ccd33a1ec
Add comments to test 2023-12-04 10:20:53 +09:00
Dan Balasescu
c2644a5d5e
Correctly implement button enabled state 2023-12-04 10:18:37 +09:00
Dan Balasescu
d0acb7f4f9
Improve commenting
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-12-04 06:08:31 +09:00
Dan Balasescu
230278f2c9
Once again remove Mania passive HP drain 2023-12-03 01:47:20 +09:00
Bartłomiej Dach
ee2a06be2f
Merge pull request #25627 from Susko3/fix-overlapping-chat-links
Fix overlapping chat links crashing the game
2023-12-02 16:36:29 +01:00
Susko3
abb4c943a7 Rename to more readable names 2023-12-01 18:35:57 +01:00
Bartłomiej Dach
30a4e77097
Merge branch 'master' into fix-overlapping-chat-links 2023-12-01 14:30:55 +01:00
Bartłomiej Dach
7ac33bc3eb
Merge pull request #25626 from Susko3/cleanup-chat-link-test
Cleanup chat link tests
2023-12-01 14:28:46 +01:00
Bartłomiej Dach
28aa98ab6a
Merge branch 'master' into cleanup-chat-link-test 2023-12-01 13:34:42 +01:00
Dan Balasescu
f3530a79b1
Add test 2023-12-01 21:34:20 +09:00
Bartłomiej Dach
d97ae8df6a
Remove commented out italic code
It's a holdover from the Exo days (anyone remember those?) and hasn't
been relevant for years, so why keep it.
2023-12-01 13:31:11 +01:00
Bartłomiej Dach
cdaff30aa6
Update framework 2023-12-01 13:24:51 +01:00
Susko3
e0eea07a3f Request READ_EXTERNAL_STORAGE on older android versions 2023-12-01 13:01:49 +01:00
Bartłomiej Dach
3d1f10b9eb
Merge pull request #25618 from Joehuu/fix-chat-icon
Fix chat overlay top bar icon being incorrect
2023-12-01 13:00:39 +01:00
Dan Balasescu
1b0fc8ca9d
Refactor 2023-12-01 20:41:41 +09:00
Dan Balasescu
15c9416244
Rename method 2023-12-01 18:47:40 +09:00
Dan Balasescu
a94180c8c6
Rename LoadAborted -> GameplayAborted, AbortGameplayReal -> AbortMatch 2023-12-01 18:26:59 +09:00
Dan Balasescu
894c31753b
Add initial support for aborting multiplayer games 2023-12-01 15:31:06 +09:00
Susko3
d3517998cf Use common Overlaps() logic
This actually fixes the problem and makes the tests pass
2023-12-01 01:11:10 +01:00