Commit Graph

22523 Commits

Author SHA1 Message Date
f68e4fc88f Merge branch 'master' into disable-repeat-multi-actions 2020-12-29 07:42:20 +01:00
2cb84c5111 Fix error message being shown to user on multiplayer disconnection when not in room 2020-12-29 15:19:52 +09:00
45c578b857 Remove selection polling from multiplayer
Looks like this was just copy-paste without any thought into whether it
should exist. It really shouldn't exist.

This is a thing for the playlists system because the *whole system*
there relies on polling the web API to get updated information. In the
case of mutliplayer, we hand off all communications to the realtime
server at the point of joining the rooms.

The argument that this was there to do faster polling on the selection
isn't valid since the polling times were the same for both cases.

Closes #11348.
2020-12-29 15:10:09 +09:00
f31a0e455a Minor xmldoc rewording 2020-12-29 14:29:40 +09:00
e3a41f6118 Rename variable to make more sense
It needs to be explicitly stated that the users in this list are related
to the *joined* room. Especially since it's sharing its variable name
with `SpectatorStreamingClient` where it has the opposite meaning (is a
list of *globally* playing players).
2020-12-29 14:27:35 +09:00
6aeb7ece66 Tidy up update state code, naming, xmldoc 2020-12-29 14:25:08 +09:00
540dec2e7c Allow null tracker in lounge screen for tests 2020-12-28 22:54:52 +01:00
6dc0f6af50 Disable setting apply button for duration of operation 2020-12-28 22:48:03 +01:00
af66e45311 Disable create room button after triggering join 2020-12-28 22:48:03 +01:00
47ab7c9fd6 Disable ready button after host click 2020-12-28 22:48:03 +01:00
9e6994166c Add helper to track ongoing operations in UI 2020-12-28 22:48:03 +01:00
a014d0ec18 Use PlayingUsers when constructing player directly 2020-12-28 19:27:56 +01:00
1d311a6680 Change PlayingUsers population logic to match expectations 2020-12-28 19:27:56 +01:00
d2301068b6 Fix changelog header staying dimmed after build show 2020-12-28 16:35:33 +01:00
9155671557 Merge pull request #11341 from peppy/fix-leaderboard-user-handling
Fix incorrect null handling in GameplayLeaderboard
2020-12-28 22:44:55 +09:00
2e88036f39 Merge pull request #11342 from bdach/fix-beatmap-not-reverting
Fix user changes in multi song select not reverting on exit without confirmation
2020-12-28 21:56:07 +09:00
a376a23ed7 Merge branch 'master' into fix-leaderboard-user-handling 2020-12-28 13:43:53 +01:00
a9822800fc Add more null hinting in GameplayLeaderboard 2020-12-28 13:00:05 +01:00
f16b516e58 Revert user changes if no selection was made 2020-12-28 12:35:17 +01:00
447a55ce11 Fix incorrect null handling in GameplayLeaderboard 2020-12-28 20:16:53 +09:00
20ae84a466 Merge branch 'master' into fix-user-lookup-failure-crashes 2020-12-28 12:15:06 +01:00
545dcac4ec Add null hinting on UserLookupCache query method 2020-12-28 20:13:24 +09:00
5ca9a6a980 Add xmldoc on UserLookupCache's lookup method 2020-12-28 20:05:48 +09:00
2e3537e966 Update framework 2020-12-28 16:52:54 +09:00
046a76cb1d Allow null users to still be displayed in the participant list
The fix here is correcting the access of `user.Country`. The deicision
to have null users display is because this is the best we can do (if
osu-web could not resolve the user). We still want the users in the
lobby to be aware of this user's presence, rather than hiding them from
view.

osu-stable does a similar thing, showing these users as `[Loading]`. I
decided to go with blank names instead because having *any* text there
causes confusion. We can iterate on this in future design updates.
2020-12-28 15:03:44 +09:00
4d61c143db Fix lookup cache throwing a null reference if no matches were successful 2020-12-28 15:03:44 +09:00
69fab7de77 Merge pull request #11307 from bdach/fix-account-creation-overlay-after-logout
Fix account creation overlay not showing up the first time after a log-out
2020-12-28 11:52:48 +09:00
1b7c72f03b Merge branch 'master' into changelog-refactor 2020-12-28 11:00:14 +09:00
2ff49f4758 Merge branch 'master' into fix-quit-user-showing-in-leaderboard 2020-12-27 13:02:40 +01:00
f75dccc9e4 Explicitly use discard in value changed callback 2020-12-27 13:00:27 +01:00
6b6b1514e2 Rename method to be less misleading
As it doesn't only change colour, but also width.
2020-12-27 12:58:37 +01:00
3b5260fd67 Merge branch 'master' into fix-gameplay-leaderboard-clickable-avatars 2020-12-27 19:00:38 +09:00
1b34f2115f Remove dignostics using 2020-12-27 16:57:23 +09:00
d14a8d24b5 Remove assert for now 2020-12-27 16:42:20 +09:00
fa0576f47f Move quit colour change implementation to updateColour for better coverage 2020-12-27 13:40:02 +09:00
a933483848 Merge branch 'master' into tourney-switching-ui 2020-12-26 15:45:29 +01:00
9e15dccc56 Move graceful exit to OsuGameBase 2020-12-26 15:36:21 +01:00
15948de2f0 Fix gameplay leaderboard avatars being clickable 2020-12-26 14:35:14 +01:00
8ec7970b6a Move load-complete fade specification inside 2020-12-26 14:35:14 +01:00
e8f96b2401 Bring back DrawableAvatar as a simple sprite 2020-12-26 14:35:14 +01:00
0b42b4b955 Rename {Drawable -> Clickable}Avatar 2020-12-26 14:35:11 +01:00
a1af749b4b Merge branch 'master' into patch/11310 2020-12-26 13:19:13 +01:00
b059b5d616 Merge branch 'master' into fix-ready-button-crash 2020-12-26 12:41:47 +01:00
b9d725ab49 Don't copy spotlight category 2020-12-26 20:13:28 +09:00
04d54c40db Allow all StatefulMultiplayerClient schedules to run inline
Fixes test failures due to not allowing to do so, therefore inverting
execution order in some cases - for example, calling

        JoinRoom(room);
        LeaveRoom();

on the update thread would invert execution order due to the first being
unscheduled but the second being scheduled.
2020-12-26 12:04:10 +01:00
dae27fefe4 Run user list copy inline if possible
`getRoomUsers()` was not safe to call from the update thread, as
evidenced by the test failures. This was due to the fact that the added
reset event could never actually be set from within the method, as the
wait was blocking the scheduled set from ever proceeding.

Resolve by allowing the scheduled copy & set to run inline if on the
update thread already.
2020-12-26 12:03:03 +01:00
71dcbeaf7c Mark user as quit visually on the leaderboard 2020-12-26 12:11:09 +09:00
116acc2b5e Add flow for marking user as quit for further handling 2020-12-26 11:35:51 +09:00
ff57562956 Fix multiplayer leaderboard not unsubscribing from quit users 2020-12-26 11:35:31 +09:00
e7339d6959 fix(osu.Game): Ensure Category property is copied in Room. 2020-12-25 21:07:33 -05:00