1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 01:02:55 +08:00
Commit Graph

37093 Commits

Author SHA1 Message Date
Dean Herbert
a1bee5d721
Merge branch 'master' into non-concurrent-sample-playback 2021-02-15 22:05:11 +09:00
Dean Herbert
30a9a09492
Merge pull request #11783 from peppy/hub-send-version-hash
Send client version hash on hub connection
2021-02-15 22:04:46 +09:00
Dean Herbert
72b2123500 Update nunit in line with framework 2021-02-15 21:42:35 +09:00
Dean Herbert
2e646882fa Merge branch 'master' into non-concurrent-sample-playback 2021-02-15 21:22:21 +09:00
Dean Herbert
1ac274e478 Update framework 2021-02-15 21:22:18 +09:00
Dan Balasescu
6641f4d5a9
Merge branch 'master' into hub-send-version-hash 2021-02-15 21:12:46 +09:00
Dean Herbert
8e299bc89a
Merge pull request #11782 from peppy/fix-test-signalr-connection-failures
Move HubClientConnector retrieval to IAPIProvider
2021-02-15 20:45:31 +09:00
Dan Balasescu
5f7bfc4304
Merge branch 'master' into fix-test-signalr-connection-failures 2021-02-15 19:35:50 +09:00
Dan Balasescu
eae8bc7f79
Merge pull request #11784 from peppy/fix-perform-from-screen-test-failures
Fix test failures in PerformFromScreen tests
2021-02-15 19:32:01 +09:00
Dan Balasescu
6bfc7da671
Fix sample potentially playing at the wrong frequency
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-02-15 18:10:45 +09:00
Dean Herbert
de52b8a5ba Fix test failures in PerformFromScreen tests 2021-02-15 17:14:41 +09:00
Dean Herbert
3562fddc27 Add missing nullability flag on CreateAccount return value 2021-02-15 17:02:07 +09:00
Dean Herbert
55d5d8d5be Send version hash on hub connection 2021-02-15 16:51:40 +09:00
Dean Herbert
9ad38ab20e Move HubClientConnector retrieval to IAPIProvider 2021-02-15 16:43:56 +09:00
Dean Herbert
f664fca0dd Tidy up tests (and remove duplicate with new call logic) 2021-02-15 16:11:17 +09:00
Dan Balasescu
dffccef1f0
Merge pull request #11780 from peppy/fix-tournament-test-failures
Ensure the tournament test runner is ready before performing the test run
2021-02-15 16:05:33 +09:00
Dean Herbert
9cba350337 Refactor again to better cover cases where the pause dialog should definitely be shown 2021-02-15 15:57:36 +09:00
Dean Herbert
4f264758a4 Add test coverage of pause from resume overlay 2021-02-15 15:57:36 +09:00
Dean Herbert
83183a84da Ensure the tournament test runner is ready before performing the test run 2021-02-15 15:31:51 +09:00
Dean Herbert
2d158adcc1
Merge pull request #11742 from Susko3/add-mime-types-android
Add more MIME types to Android share intent filter
2021-02-15 15:15:48 +09:00
Dean Herbert
1aea840504 Add missing return in early exit scenario (MakeCurrent isn't compatible with the following Exit) 2021-02-15 15:03:12 +09:00
Dean Herbert
ec37e1602d Add failing test coverage of retrying from the results screen 2021-02-15 15:03:09 +09:00
smoogipoo
c6ed3efa4a Merge branch 'master' into non-concurrent-sample-playback 2021-02-15 14:47:32 +09:00
Dean Herbert
25f5120fdf Add failing test coverage of user pausing or quick exiting during cooldown 2021-02-15 14:36:17 +09:00
Dan Balasescu
4e908adfb1
Merge pull request #11709 from frenzibyte/abstract-hub-connection
Share connection logic between SignalR clients
2021-02-15 14:34:42 +09:00
Dean Herbert
2b69c7b325 Fix incorrect order of operation in pause blocking logic 2021-02-15 14:24:08 +09:00
Dean Herbert
a4dc544235 Refactor some shared code in TestScenePause 2021-02-15 14:24:08 +09:00
Dan Balasescu
34e600464b
Merge branch 'master' into abstract-hub-connection 2021-02-15 13:53:54 +09:00
Dan Balasescu
cb5f49f227
Merge pull request #11762 from peppy/add-tournament-mode-loading-screen
Add loading spinner while tournament bracket is loading / retrieving data
2021-02-15 13:41:10 +09:00
Dean Herbert
1a200148e5
Merge pull request #11770 from Joehuu/fix-extra-mod-settings-overflowing
Fix extra mod settings overflowing from screen in multi room
2021-02-13 14:39:08 +09:00
Dean Herbert
07f3eea4e4
Merge pull request #11771 from Joehuu/hide-mod-settings-scrollbar 2021-02-13 11:08:37 +09:00
Joehu
982d8e35ed Fix mod settings showing scrollbar when screen is offset 2021-02-12 10:42:48 -08:00
Joehu
b28a906197 Fix extra mod settings overflowing from screen 2021-02-12 10:29:29 -08:00
Joehu
52975c5185 Remove hardcoded padding from main content 2021-02-12 10:23:33 -08:00
Dean Herbert
13aaf766f9 Fix regression in tournament test startup behaviour 2021-02-13 01:10:39 +09:00
Dean Herbert
7d057ab6ce Fix two threading issues 2021-02-12 22:38:55 +09:00
Dan Balasescu
f36a9f2d86
Merge pull request #11766 from peppy/fix-chat-formatter-test-failures
Set static locally in test to ensure tests always run correctly
2021-02-12 22:06:12 +09:00
Dan Balasescu
5a357d71ac
Merge pull request #11761 from peppy/fix-welcome-intro-looping
Fix classic "welcome" intro not looping as expected
2021-02-12 21:52:11 +09:00
Dean Herbert
a080a9bdbc
Merge pull request #11603 from Game4all/handle-stable-imports-custom-songs-folder
Handle beatmap import from a stable installation with a custom Songs directory
2021-02-12 21:42:36 +09:00
Dean Herbert
37a21cb192 Set static locally in test to ensure tests always run correctly 2021-02-12 21:30:02 +09:00
smoogipoo
9b5995f2f1 Update with removal of looping parameter 2021-02-12 19:05:17 +09:00
smoogipoo
0c3aef8645 Fix potential race in looping sample
As mentioned via GitHub comments. Very unlikely for this to happen unless: the sample takes a short amount of time to load, is very short itself, and the update thread stalls until the sample fully completes.
2021-02-12 17:42:35 +09:00
smoogipoo
d3f0c0730d Merge branch 'master' into non-concurrent-sample-playback 2021-02-12 17:22:15 +09:00
Dean Herbert
725db56837 Add loading spinner while tournament bracket is loading / retrieving data 2021-02-12 16:55:34 +09:00
Dean Herbert
4ab16694d1 Fix classic "welcome" intro not looping as expected 2021-02-12 16:22:19 +09:00
Dan Balasescu
267869bd0b
Merge pull request #11759 from peppy/chat-show-url-in-tooltips
Show URLs in tooltips when custom text has replaced the link
2021-02-12 16:04:55 +09:00
Dean Herbert
18c1c8faf2
Merge pull request #11758 from smoogipoo/fix-multiplayer-header-sprite
Fix header background being invisible in multiplayer/playlists
2021-02-12 16:03:50 +09:00
Dan Balasescu
dad6e7e825
Merge pull request #11755 from peppy/fix-message-formatter-domain
Fix MessageFormatter not working for custom endpoints
2021-02-12 16:01:55 +09:00
Dan Balasescu
352cc7e4c6
Merge pull request #11757 from peppy/fix-beatmap-links
Fix osu-web beatmap links not linking to specific beatmap
2021-02-12 16:01:41 +09:00
Dean Herbert
a073376920 Show URLs in tooltips when custom text has replaced the link 2021-02-12 15:32:31 +09:00