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

34715 Commits

Author SHA1 Message Date
Bartłomiej Dach
05ddfe7522
Merge branch 'master' into editor-setup-no-state-change 2022-08-14 18:21:31 +02:00
basseX
383afe04f3 Remove not needed override 2022-08-14 15:15:36 +02:00
basseX
932becc4b2 Remove CommentMarkdownTextFlowContainer and rather use base-class OsuMarkdownTextFlowContainer 2022-08-14 10:11:49 +02:00
basseX
b05acb0073 Make CommentMarkdownTextFlowContainer render images 2022-08-13 21:32:24 +02:00
Dan Balasescu
c02990ad67
Merge pull request #19718 from peppy/fix-playlist-imported-items
Fix playlist overlay showing new imports when they don't match collection filter
2022-08-12 23:27:26 +09:00
Dan Balasescu
e6ecdf7457
Merge pull request #19715 from peppy/relax-mod-multiplier
Adjust various mod multipliers to avoid competition with normal scores
2022-08-12 23:12:57 +09:00
Dan Balasescu
9d1b0b5836 Revert sealing 2022-08-12 22:32:27 +09:00
Dean Herbert
e5e9841652 Apply multiple other mod debuffs as decided in pull request discussion 2022-08-12 18:58:09 +09:00
Dean Herbert
b76e5757e1 Fix InSelectedCollection not being applied to newly imported beatmaps 2022-08-12 15:06:34 +09:00
Dean Herbert
5111bad86c Refactor TestScenePlaylistOverlay to use realm for testing
Removes the dual-purpose flow which existed only for testing.
2022-08-12 15:06:34 +09:00
Dean Herbert
38afc53bad Update interactive visual test runs to use development directory 2022-08-12 13:40:29 +09:00
Dean Herbert
ac4213ecee Adjust relax mod multiplayer to 0.5x
Has previously been discussed internally. Probably good to get this out
before the next full reprocess of scores server-side.

The multiplier here was @smoogipoo's suggested value. I'd be willing to
go lower if this is seen at too high, but it should be a round number to
make it easy for users to understand the max score available to them.
2022-08-12 12:30:13 +09:00
Andrew Hong
667b700a28
Merge branch 'master' into open-profile-hotkey 2022-08-11 13:04:19 -04:00
Dan Balasescu
d88f247594 Fix possible null reference inspection 2022-08-11 20:38:08 +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
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
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
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
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
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
Dean Herbert
551e1cf7ff Revert ordering and reword comment 2022-08-09 19:26:24 +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