1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 22:52:54 +08:00
Commit Graph

54535 Commits

Author SHA1 Message Date
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
Andrew Hong
b4fc2a0fc8
Merge branch 'master' into open-profile-hotkey 2022-08-09 13:41:21 -04:00
Salman Ahmed
a83f7202ec
Merge pull request #19670 from peppy/update-framework
Update framework
2022-08-09 20:28:24 +03:00
Dean Herbert
ad410fc88b Update resources 2022-08-10 01:50:23 +09:00
Dean Herbert
e8fef6e05c Update framework 2022-08-10 01:36:39 +09:00
its5Q
abca3d1b2a Prefix common strings for context 2022-08-10 00:35:19 +10:00
Dean Herbert
a5081826b7 Handle cancellation at more points during Player initialisation
As discussed in discord, this will help avoid null references during
cancellation which can otherwise be quite confusing to debug.
2022-08-09 23:25:19 +09:00
Dean Herbert
d59f4720f1
Merge pull request #19664 from peppy/test-assertions
Update multiple tests to use new assert output for easier to understand failures
2022-08-09 23:15:16 +09:00
Dean Herbert
1392395ea0
Merge pull request #19668 from smoogipoo/fix-ended-room-status
Fix host room status showing ended after playing
2022-08-09 23:02:38 +09:00
Dan Balasescu
4107049b08 Fix host room status showing ended after playing 2022-08-09 21:43:10 +09:00
Dan Balasescu
41af03dec5
Merge pull request #19597 from frenzibyte/hotfix-multi-spectator-results-screen
Fix multi-spectator potentially getting stuck for passed players (hotfix)
2022-08-09 21:11:10 +09:00
Dan Balasescu
2de9e5f40f
Fix test failure 2022-08-09 20:23:45 +09:00
Dean Herbert
551e1cf7ff Revert ordering and reword comment 2022-08-09 19:26:24 +09:00
Dean Herbert
1270ee9624 Update multiple tests to use new assert output for easier to understand failures 2022-08-09 19:19:54 +09:00
Dean Herbert
940629f2f1 Fix database storing order being changed by previous changes 2022-08-09 18:18:03 +09:00
Dean Herbert
106932b906 Add null check in TestPlayer's disposal code to avoid cascading test failure 2022-08-09 18:15:50 +09:00
Dan Balasescu
efc4a129d9
Merge pull request #19658 from peppy/user-button-better-display
Display connecting / failing states on toolbar user display
2022-08-09 17:59:28 +09:00
Dean Herbert
4a312d5658 Use a placeholder user with the correct username during connecting process
This allows for various components (like gameplay) to obtain a correct
username even if the API is not yet in a connected state. The most
common case is during startup, where a connection may not have been
established yet, but the user's username was restored from their config
file.

By making the change, local scores will now have the correct username
(although avatar etc. will be missing, which I think it fine) even if
the API is not yet connected. Previously, they would show up as "Guest".
2022-08-09 17:13:09 +09:00
Dean Herbert
f9d0cc3c4e Change APIAccess.IsLoggedIn to also return true when connecting
All usages of this are made with the intention of showing data when an
api is going to eventually become available. In the case of a login
failure, components are also able to display a correct state.

With this change, it makes online components display in a more correct
state during startup or initial logging in phase.
2022-08-09 17:11:44 +09:00
Dean Herbert
beb3d41f0c Fix unsafe usage of APIAccess.LocalUser in BeatmapListingOverlay 2022-08-09 17:11:44 +09:00
Andrew Hong
ce67820d87
Merge branch 'master' into open-profile-hotkey 2022-08-09 04:10:27 -04:00
Andrew Hong
aee18135a9 Switch to toggle 2022-08-09 04:09:22 -04:00
Dean Herbert
961f5d4acc Reorganise global bindings section to be easier to find things 2022-08-09 17:08:31 +09:00
Dan Balasescu
d80db2aee7
Merge pull request #19639 from peppy/fix-fps-damping
Fix incorrect FPS damping implementation
2022-08-09 17:03:55 +09:00
Dean Herbert
a71c2bbe28 Split overlay toggles into own section in key bindings
Things were getting hard to find..
2022-08-09 17:01:38 +09:00
Andrew Hong
6903ce1bcc
Merge branch 'master' into open-profile-hotkey 2022-08-09 03:25:41 -04:00
Andrew Hong
a705c4f5d2 Moved ShowProfile to the bottom of the enum 2022-08-09 03:17:55 -04:00
Andrew Hong
04108a749e Rename translation key 2022-08-09 03:03:14 -04:00
Dean Herbert
47ca812faf
Merge pull request #19656 from smoogipoo/fix-gameplay-test-rerun
Fix gameplay tests crashing when run multiple times
2022-08-09 16:01:39 +09:00
Dean Herbert
32852e5b21 Fix potentially thread-unsafe LocalUser usage 2022-08-09 16:01:04 +09:00
Andrew Hong
ededaed5ef Remove unused import 2022-08-09 02:58:28 -04:00