1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:37:28 +08:00
Commit Graph

54342 Commits

Author SHA1 Message Date
Dean Herbert
0833a6fb9a Avoid multiple iteration of LINQ query using a local 2022-08-16 15:39:23 +09:00
Dean Herbert
7cc9fdbaa0 Simplify context menu check by using existing mergeable object list 2022-08-16 15:39:23 +09:00
Dean Herbert
ecb9351bab Remove unnecessary null pre-checks 2022-08-16 15:36:43 +09:00
Dean Herbert
e636fcd9b8 Use DI'd components from parent class rather than fetching locally 2022-08-16 15:35:32 +09:00
OliBomby
d140e0df14 remove nullable disable annotation 2022-08-15 21:15:23 +02:00
OliBomby
7c2ada9b20 Revert "remove copyright notice from new file"
This reverts commit b5e5411348.
2022-08-15 21:11:06 +02:00
OliBomby
b5e5411348 remove copyright notice from new file 2022-08-15 18:07:55 +02:00
OliBomby
d261be8734 added visual tests 2022-08-15 17:19:04 +02:00
OliBomby
3abc333813 added hotkey for merging selection 2022-08-15 17:18:55 +02:00
OliBomby
3525dfb0f1 added merging feature 2022-08-12 01:17:33 +02:00
Dean Herbert
9148305fd8
Merge pull request #19657 from novialriptide/open-profile-hotkey
Add keybind for showing profile
2022-08-12 02:47:13 +09:00
Andrew Hong
667b700a28
Merge branch 'master' into open-profile-hotkey 2022-08-11 13:04:19 -04:00
Dean Herbert
b4af32efb7
Merge pull request #19708 from smoogipoo/fix-inspection
Fix possible null reference inspection
2022-08-11 21:52:09 +09:00
Dan Balasescu
d88f247594 Fix possible null reference inspection 2022-08-11 20:38:08 +09:00
Dan Balasescu
f29d1b2ded
Merge pull request #19001 from stanriders/pp-balancing
osu! performance points balancing pass
2022-08-11 20:31:33 +09:00
Dan Balasescu
9f28c4c033 Adjust test values 2022-08-11 19:47:32 +09:00
Dan Balasescu
61a3758cd9 Merge branch 'master' into pp-balancing 2022-08-11 19:46:16 +09:00
Dan Balasescu
9839d9933d
Merge pull request #19707 from peppy/api-run-loop-refactor
Refactor `APIAccess` main loop to read better
2022-08-11 19:44:01 +09:00
Dan Balasescu
d6c64af5e3
Merge branch 'master' into api-run-loop-refactor 2022-08-11 19:09:32 +09:00
Dan Balasescu
77cd279a76
Merge pull request #19706 from peppy/api-connected-state-refactor
Fix avatar potentially not loading in `LoginOverlay` due to misordered events
2022-08-11 19:08:25 +09:00
Dean Herbert
865d63f768 Refactor APIAccess main loop to read better 2022-08-11 15:43:39 +09:00
Dean Herbert
47196b19a5 Stop setting Online state in handleRequest
This is already handled amicably by the `Failing` -> `Connecting` flow.
Having this set in `handleRequest` throws things off, potentially
leading to the `Online` state change before the user has been populated.
2022-08-11 14:36:30 +09:00
Dean Herbert
7ec67c28b9 Set Online state sooner in connection process
This isn't really required as such, but feels more correct. There was no
reason for it to wait for the friend population to complete before
deeming things to be "online".
2022-08-11 14:35:56 +09:00
Dan Balasescu
65a1daf211
Merge pull request #15666 from MBmasher/fl-slider
Add slider bonus to Flashlight skill
2022-08-11 13:42:31 +09:00
Dan Balasescu
b18f9b39dc
Merge pull request #19702 from peppy/api-access-user-thread-safety
Add thread safety to `APIAccess.LocalUser`
2022-08-11 13:25:27 +09:00
Dean Herbert
e01383b138 Tidy up user passing logic 2022-08-11 13:17:17 +09:00
Dean Herbert
e5b534bb26 Add thread safety to APIAccess.LocalUser 2022-08-11 12:45:26 +09:00
Andrew Hong
60abe83398 Remove newline 2022-08-10 17:56:36 -04:00
Andrew Hong
11d480997a
Merge branch 'master' into open-profile-hotkey 2022-08-10 13:34:53 -04:00
Andrew Hong
396860d9e8 Move Hide() to OsuGame 2022-08-10 13:32:33 -04:00
Dan Balasescu
7cac089246
Merge branch 'master' into fl-slider 2022-08-10 21:19:05 +09:00
Dan Balasescu
1721a91168
Merge pull request #19661 from peppy/overlay-key-binding-organisation
Reorganise global bindings and split out overlay bindings to make things easier to find
2022-08-10 21:18:28 +09:00
Dan Balasescu
98c7138803
Merge pull request #19586 from peppy/realm-versioning-for-debug
Version realm files for debug executions
2022-08-10 21:17:51 +09:00
Dan Balasescu
f9c6dc314b
Merge pull request #19678 from peppy/fix-file-comparisons-many-places
Fix audio track not correctly advancing when changing between certain beatmaps
2022-08-10 20:38:14 +09:00
Dan Balasescu
69cbf4185b Match class name to file 2022-08-10 19:53:40 +09:00
Dan Balasescu
76fea25668
Merge pull request #19646 from its5Q/settings-localisation
Add missing localisation for settings enums
2022-08-10 18:51:52 +09:00
Dean Herbert
6e9031b03e Update framework 2022-08-10 17:49:39 +09:00
its5Q
8f5bd437f6 Rename enum member to be more like the other 2022-08-10 18:41:53 +10:00
its5Q
231c331690
Rename keys to match enum members
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2022-08-10 18:31:57 +10:00
Dan Balasescu
c151cb4443
Merge pull request #19677 from peppy/fix-mobile-import-crash
Fix crash when attempting to import on mobile platforms
2022-08-10 16:11:38 +09:00
Dean Herbert
ef10d074e8 Update framework 2022-08-10 16:07:47 +09:00
Dean Herbert
7c6e5a1085 Add test coverage of case insensitive audio equality 2022-08-10 16:06:56 +09:00
Dean Herbert
ac99c1ad69 Migrate the majority of existing file lookups to use new extension methods 2022-08-10 16:01:16 +09:00
Dean Herbert
5f10ec1955 Add extension methods for case insensitive file lookups 2022-08-10 15:48:25 +09:00
Dean Herbert
ddffa9b1bd Fix crash when attempting to import on mobile platforms
Regressed with NRT application to this file. It's probably the first
time we've actually hit this due to an optional DI that is actually not
available outside of tests.
2022-08-10 15:32:43 +09:00
Andrew Hong
6f1fdd4c34
Merge branch 'master' into open-profile-hotkey 2022-08-10 01:31:37 -04:00
Dan Balasescu
87133b9cc5
Merge pull request #19669 from peppy/abort-load-player-more
Handle cancellation at more points during `Player` initialisation
2022-08-10 13:53:27 +09:00
Dan Balasescu
888c4c8e08
Merge pull request #19662 from peppy/startup-correct-username
Use a placeholder user with the correct username during login process
2022-08-10 13:09:37 +09:00
Andrew Hong
8c7ede6111 Add proper toggling 2022-08-09 14:43:37 -04:00
Andrew Hong
7ed489b56d Add hotkey to Toolbar 2022-08-09 14:10:38 -04:00