Commit Graph

70 Commits

Author SHA1 Message Date
1ac93d4eeb Merge pull request #11268 from bdach/fix-room-song-select-stuck
Fix realtime multiplayer song select getting stuck after selecting invalid beatmap
2020-12-24 11:26:07 +09:00
414f886b02 Split timeshift & multiplayer "create" buttons
Multiplayer button gets new, different "Create match" text, and disable
logic in case of a dropped connection to the multiplayer server.
2020-12-23 22:03:57 +01:00
e7a91b3dca Merge branch 'master' into fix-room-song-select-stuck 2020-12-23 18:13:27 +01:00
b1fb906773 Merge branch 'master' into fix-hard-crash-on-signal-r-exceptions 2020-12-23 17:37:49 +01:00
980e85ce25 Refactor player exit logic to convey intention better 2020-12-23 16:16:24 +01:00
c5692a5d6a Re-enable carousel selection after error 2020-12-23 14:19:30 +01:00
74f0c50d82 Merge branch 'fix-multiplayer-server-disconnection-flow' into fix-hard-crash-on-signal-r-exceptions 2020-12-23 13:31:36 +01:00
c839892a4c Merge branch 'master' into fix-multiplayer-server-disconnection-flow 2020-12-23 11:57:43 +01:00
64095307de Merge branch 'master' into realtime-leaderboard 2020-12-23 09:56:47 +01:00
0ddcab574f Rename method to avoid weird code analysis rule 2020-12-23 17:14:58 +09:00
7cc38f03d1 Use extension method in all call sites of fire-and-forget async usage 2020-12-23 17:10:34 +09:00
c3c3364d39 Simplify error handling of JoinRoom call 2020-12-23 16:56:57 +09:00
d27b83d678 More correctly handle fire-and-forget async call 2020-12-23 16:51:11 +09:00
91021eb8c4 Remove unused using 2020-12-23 16:49:17 +09:00
f5d27b40a8 Standardise flow for aborting realtime player exit to avoid double-exit call 2020-12-23 16:35:39 +09:00
569c4092ef Move notification to stateful client so it is only shown to the user from one location 2020-12-23 16:35:39 +09:00
a1d42dc4a0 Don't allow creating or joining a room when not connected to server 2020-12-23 16:35:39 +09:00
12df3056e6 Ensure appropriate screens handle exiting when the server gets disconnected
I would have liked for this to be handled via the `OnRoomChanged` event
flow, but this isn't present in RealtimeMatchSubScreen due to
inheritence woes.
2020-12-23 16:35:39 +09:00
b632e44bac Merge pull request #11256 from frenzibyte/disallow-joining-ended-realtime-room
Disallow joining ended rooms in realtime multiplayer
2020-12-23 14:30:00 +09:00
45dcd3242d Add comment explaining why things are done where they are 2020-12-23 13:57:48 +09:00
3aa2b22838 Add early check for room status before joining 2020-12-23 05:52:10 +03:00
7751ef4f3e Revert previous logic of join guarding 2020-12-23 05:50:15 +03:00
3272804704 Fix potential crash when no submission token
Can happen because `TimeshiftPlayer` will schedule a screen exit on
token retrieval failure, and `RealtimePlayer`'s BDL won't even attempt
to create a leaderboard in that case.
2020-12-22 22:34:26 +01:00
5efc3b9496 Start state display as hidden
Would otherwise flicker for a few frames when a new user was added to
the list of participants.
2020-12-22 21:49:42 +01:00
91d5c53643 Add method for checking room joinability 2020-12-22 16:36:17 +03:00
6517acc510 Add leaderboard display to realtime player 2020-12-22 19:10:08 +09:00
ce806dd880 Replace the ready mark display with a state display, showing all participant states 2020-12-22 18:25:45 +09:00
59734229ff Remove unused using 2020-12-22 17:21:53 +09:00
30357a9447 Add loading layer to multi song select to show during settings confirmation 2020-12-22 17:08:04 +09:00
12876d7fb6 Add very basic error handling on ChangeSettings calls 2020-12-22 16:50:30 +09:00
2d7174d99c Add padding to song select 2020-12-22 16:23:06 +09:00
8201fa8e34 Split out common implementation and private classes in MatchSettingsOverlay 2020-12-22 15:51:24 +09:00
27e64bdb34 Schedule callback continuations 2020-12-22 15:31:07 +09:00
ab90db7c8d Fix stuck lounge on join failure 2020-12-22 15:27:49 +09:00
81e2edc73f Use MRE with timeout to wait on match start 2020-12-22 14:59:11 +09:00
dece41d050 Add todo 2020-12-22 14:58:47 +09:00
9fa1f60b7d Fix incorrect footer being used 2020-12-21 17:31:15 +09:00
dbffe735de Merge branch 'master' into realtime-multiplayer-2 2020-12-21 16:22:14 +09:00
82cf58353c Fix incorrect joinedroom null checks 2020-12-21 15:38:20 +09:00
27623822c4 Merge branch 'master' into realtime-ready-button 2020-12-21 11:19:03 +09:00
bcd140b8df Merge branch 'master' into realtime-ready-button 2020-12-20 18:20:57 +01:00
b76ec79a70 Merge branch 'master' into realtime-participants-list 2020-12-20 18:20:22 +01:00
4e8e4f0343 Merge branch 'master' into realtime-room-composite 2020-12-20 17:46:10 +01:00
b31f4e9e85 Merge branch 'stateful-multiplayer-client' into realtime-multiplayer-2 2020-12-21 00:41:42 +09:00
d127494c2d Fix thread-unsafe room removal 2020-12-21 00:39:31 +09:00
3af702453f Implement realtime match song select 2020-12-21 00:37:13 +09:00
275efd12b8 Fix room manager reference 2020-12-21 00:21:48 +09:00
15480c006b Create the correct room subscreen 2020-12-21 00:21:30 +09:00
5b4197a9ef Disable watching replays from realtime results screen 2020-12-21 00:14:54 +09:00
07077b8f4e Add realtime player 2020-12-21 00:13:05 +09:00