Commit Graph

35516 Commits

Author SHA1 Message Date
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
00d50150de Ensure the current room is left at a mutliplayer client level on client disconnection 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
fa94703b9b Merge pull request #8759 from LittleEndu/present-recommended 2020-12-23 00:09:47 +01:00
08d87ccb1e Merge branch 'master' into present-recommended 2020-12-22 23:36:13 +01:00
3147267180 Merge pull request #11252 from peppy/show-all-participant-states 2020-12-22 22:28:54 +01:00
3ae9dd8491 Merge branch 'master' into show-all-participant-states 2020-12-22 21:50:36 +01:00
4a677ecc19 Make random state choice in test more robust
`RNG.Next(int, int)` is max-exclusive, so the random state choice would
actually never pick `MultiplayerUserState.Results` on its own. The only
reason why that state ever did show up was by a freak accident of sorts
(the logic in `TestRealtimeMultiplayerClient` would automatically
convert every `FinishedPlay` state to `Results`, up until seeing the
first player that was in the `Playing` state).
2020-12-22 21:49:42 +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
84ba55ab91 Merge pull request #11246 from peppy/fix-editor-crash-on-nan-scale
Fix crash when attempting to scale two hitobjects on the same axis
2020-12-22 21:21:12 +01:00
f31f79625d Merge branch 'master' into fix-editor-crash-on-nan-scale 2020-12-22 20:46:45 +01:00
a64ffcd294 Refrain from joining room if not allowed 2020-12-22 16:38:10 +03:00
91d5c53643 Add method for checking room joinability 2020-12-22 16:36:17 +03:00
5c3df55cdf Merge pull request #11247 from frenzibyte/fix-resolution-dropdown
Fix resolution dropdown not respecting current display changes
2020-12-22 18:28:01 +09:00
23bf9c372c Fix naming conflict with test scenes 2020-12-22 18:26:39 +09:00
ce806dd880 Replace the ready mark display with a state display, showing all participant states 2020-12-22 18:25:45 +09:00
3c33ea7f1c Merge pull request #11239 from smoogipoo/realtime-multiplayer-2
Implement realtime multiplayer
2020-12-22 18:23:03 +09:00
4f02928601 Change sorting to better handle portrait screens 2020-12-22 17:36:56 +09:00
3d5783a0ea Improve variable names 2020-12-22 17:34:51 +09:00
a1d67f0cf6 Merge branch 'master' into fix-resolution-dropdown 2020-12-22 17:26:53 +09:00
59734229ff Remove unused using 2020-12-22 17:21:53 +09:00
ecacf3868e Merge pull request #11236 from peppy/fix-mania-legacy-judgement-animation
Update osu!mania legacy skin's judgement animation to match stable
2020-12-22 17:09:54 +09:00
7da3420e07 Merge pull request #11216 from Joehuu/fix-selected-highlight-on-some-dropdowns
Fix selected item not being highlighted on some setting dropdowns
2020-12-22 17:09:22 +09:00
cb63c115c4 Merge pull request #11249 from peppy/update-framework
Update framework
2020-12-22 17:08: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
3cf889b7c5 Fix some errors being completely ignored 2020-12-22 16:19:19 +09:00
34421c9232 Update framework 2020-12-22 15:58:57 +09:00
17d924c755 Move timeshift settings overlay to correct namespace 2020-12-22 15:52:47 +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
85e93c5dde Fix main menu multiplayer icons being back to front 2020-12-22 15:22:27 +09:00
3f966386ed Fix compile time failure due to potentially null connection 2020-12-22 15:15:32 +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
807c1ecd1f Refactor recommendation iteration code to read better 2020-12-22 14:57:32 +09:00
3bf670510a Split into two actions 2020-12-22 14:55:25 +09:00
c6be969e33 Remove unnecessary resolved recommender in test 2020-12-22 14:42:12 +09:00
df5e1d83bd Allow recommender to potentially be null 2020-12-22 14:36:52 +09:00
8cc2ed3fae Move from OsuGameBase to OsuGame
Also moves to a more suitable namespace.
2020-12-22 14:28:27 +09:00
626b7615ad Move and rename some fields for better readability 2020-12-22 14:23:33 +09:00
dff865f335 Tidy up comments, code, and multiple linq enumeration 2020-12-22 14:12:02 +09:00