Commit Graph

911 Commits

Author SHA1 Message Date
17bc0b51aa Merge branch 'playlist-item-add-owner' into new-multiplayer-playlist 2021-12-01 21:33:48 +09:00
942e48ffbd Merge branch 'master' into new-multiplayer-playlist 2021-12-01 21:33:11 +09:00
c38537a51a Initial implementation of MultiplayerPlaylist 2021-12-01 21:32:56 +09:00
e1445dcb05 Only show owner in match subscreen 2021-11-26 17:40:45 +09:00
8be2defd09 Right-align avatar 2021-11-26 17:17:06 +09:00
8541db1e85 Merge branch 'master' into playlist-item-add-owner 2021-11-26 17:13:23 +09:00
1f5d95666e Add owner avatar to multiplayer items 2021-11-25 23:15:29 +09:00
132bb59203 Update working beatmap when returning to match 2021-11-24 19:56:02 +09:00
6363833fb3 Revert unnecessary changes 2021-11-23 16:17:09 +09:00
1f13669636 Don't poll while in room
Fixes timeout in `TestJoinRoomWithoutPassword`, because the 'server' returns
out-of-date data while the `MatchSubScreen` has possible not been entered
yet (and thus hasn't disabled polling itself yet).

Can be tested by adding a `Task.Delay(3000);` at the end of
the `MultiplayerClient.JoinRoom()` task.
2021-11-23 16:14:01 +09:00
69a9fc9732 Fix a few more multiplayer test timeouts
These can be tested by adding a `Task.Delay(3000);` at the end of the
`MultiplayerClient.JoinRoom` task. The reason is typically that
`Client.Room` becomes not-null but the join task still hasn't completed
yet, so e.g. the ready button is still disabled.
2021-11-23 16:07:03 +09:00
4b498c7bd6 Merge branch 'master' into multi-queueing-modes 2021-11-22 07:46:45 +09:00
d397524878 Merge pull request #15676 from peppy/multiplayer-incorrect-beatmap-error
Show better error message when selecting an unavailable beatmap during multiplayer room creation
2021-11-19 18:59:46 +09:00
de0e8ad822 Merge branch 'master' into multi-queueing-modes 2021-11-19 18:58:15 +09:00
4c8c34b43f Use full name for round robin 2021-11-19 18:42:34 +09:00
4e625b78e2 Update queue mode names 2021-11-19 18:28:43 +09:00
12e1142b07 Rename settings section 2021-11-19 15:47:40 +09:00
a922ce2fd9 Remove unnecessary nameofs 2021-11-19 15:45:45 +09:00
0c289bf8e5 Remove pointless namespace 2021-11-19 14:46:53 +09:00
284e554cbf Only show user displayable portion of server errors when seleting a song in multiplayer 2021-11-19 13:58:03 +09:00
c901a4fd7e Show better error message when selecting an unavailable beatmap during multiplayer room creation 2021-11-19 13:28:42 +09:00
cb2547a6be Merge branch 'master' into multi-queueing-modes 2021-11-19 13:20:57 +09:00
1dacc50ecb Merge branch 'master' into multi-queueing-modes 2021-11-18 15:16:27 +09:00
66c307e0ee Remove usage of key repeat helper method 2021-11-18 13:13:36 +09:00
3de8125eac Update UI cases where repeat should not be handled 2021-11-18 13:13:36 +09:00
214705f1e5 Adjust error message, take 2 2021-11-17 21:11:37 +09:00
5fb5baa4c9 Adjust error message 2021-11-17 21:06:33 +09:00
96e983bbad Disallow playlist item selection at playlist room creation screen
Wasn't being used for anything, confusing that it's even possible.
2021-11-17 14:40:07 +09:00
8e9b55ef6d Disallow selection of invalid items 2021-11-17 11:28:43 +09:00
6dd684588a Merge branch 'master' into playlist-show-invalid-beatmaps 2021-11-16 17:25:33 +09:00
2d125893fc Add tests and disable selection on invalid items 2021-11-16 17:23:52 +09:00
6f82e6351f Parse osu-web error text to present invalid items to the user in a more approachable format 2021-11-16 17:14:15 +09:00
e78c5d0858 Show loadingLayer before calling CreateRoom
This fixes `TestScenePlaylistsMatchSettingsOverlay` incorrectly leaving
the loading layer visible.
2021-11-16 17:14:15 +09:00
aa188d5a52 Add ability for playlist items to be marked as invalid 2021-11-16 17:01:24 +09:00
49cdcffa30 Simplify schedule logic in DrawableRoomPlaylistItem 2021-11-16 16:58:44 +09:00
29d0d5badf Rename QueueModes -> QueueMode 2021-11-16 14:53:10 +09:00
5c3141d16a Fix ready button tooltip showing when locally available 2021-11-16 14:48:52 +09:00
459e819a5d Update todo 2021-11-16 00:50:23 +09:00
d27edb3a25 Fix another potential crash from async load 2021-11-16 00:31:46 +09:00
b9e38269e3 Prevent playlist mangling selection if not allowed 2021-11-16 00:31:46 +09:00
8e014ca17a Reverse in-match playlist 2021-11-16 00:31:46 +09:00
eb983ed548 Fix potential crash from playlist updating during async load 2021-11-16 00:02:38 +09:00
f743a3647f Rename APIPlaylistItem -> MultiplayerPlaylistItem 2021-11-15 23:14:27 +09:00
5489b19c57 Update PlaylistItem to use IRulesetInfo 2021-11-15 16:13:03 +09:00
1988b263c6 One more missed usage.. 2021-11-15 16:02:08 +09:00
73cb80d8a4 Update one more missed usage 2021-11-15 16:00:45 +09:00
285b161da7 Update other usages of online ID comparisons to use new extension method 2021-11-15 14:44:08 +09:00
3b24ec3643 Merge branch 'master' into multi-queueing-modes 2021-11-12 22:16:04 +09:00
6a098a8634 Rename BeatmapInfo.OnlineBeatmapID to OnlineID to match interface 2021-11-12 17:46:24 +09:00
07a7b4bcdc Merge branch 'master' into multi-queueing-modes 2021-11-11 22:19:30 +09:00