1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 01:07:42 +08:00
Commit Graph

35783 Commits

Author SHA1 Message Date
Dean Herbert
3552034ffe Update framework 2020-12-30 00:55:27 +09:00
Bartłomiej Dach
4561911150
Merge pull request #11358 from peppy/remove-multiplayer-selection-poller 2020-12-29 13:27:33 +01:00
Bartłomiej Dach
05f212eb3c Merge branch 'master' into remove-multiplayer-selection-poller 2020-12-29 12:51:33 +01:00
Bartłomiej Dach
f2163a471a Trim missed reference to deleted member 2020-12-29 11:53:42 +01:00
Bartłomiej Dach
33891aae12
Merge pull request #11361 from peppy/improve-failing-api-ux 2020-12-29 11:41:08 +01:00
Bartłomiej Dach
4a85ee1374 Merge branch 'master' into improve-failing-api-ux 2020-12-29 11:01:36 +01:00
Bartłomiej Dach
361d215ab4 Reword notification messages to match new logic 2020-12-29 10:56:59 +01:00
Bartłomiej Dach
5d23199233 Trim redundant IsLoggedIn checks 2020-12-29 10:56:29 +01:00
Bartłomiej Dach
ecb07ecca7
Merge pull request #11362 from peppy/remove-unused-lock-object
Remove unused lock object
2020-12-29 10:15:42 +01:00
Dean Herbert
6bbd0ecfac Remove unused lock object 2020-12-29 17:39:00 +09:00
Dean Herbert
906a9b79b5 Show an error when forcefully exiting online play due to API failure 2020-12-29 16:47:36 +09:00
Dean Herbert
4d04e0dee7 Disallow entering the playlists/multiplayer screens if API is failing 2020-12-29 16:25:51 +09:00
Dean Herbert
03b78d1c4b Handle SocketExceptions and HttpRequestExceptions more silently
These can occur when a network connection is completely unavailable (ie.
host resolution failures are occurring). Currently these would appear as
important errors which spammed the notification overlay every retry
forever, while no network connection is available.

I also took this opportunity to remove a lot of `bool` passing which was
no longer in use (previously the fail count / retry process was
different to what we have today).
2020-12-29 16:22:11 +09:00
Dean Herbert
2cb84c5111 Fix error message being shown to user on multiplayer disconnection when not in room 2020-12-29 15:19:52 +09:00
Dean Herbert
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
Dean Herbert
d155f2c0e9
Merge pull request #11351 from bdach/client-playing-users
Change PlayingUsers population logic to match expectations
2020-12-29 15:04:33 +09:00
Dean Herbert
f31a0e455a Minor xmldoc rewording 2020-12-29 14:29:40 +09:00
Dean Herbert
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
Dean Herbert
6aeb7ece66 Tidy up update state code, naming, xmldoc 2020-12-29 14:25:08 +09:00
Dean Herbert
48019a82b0
Merge pull request #11356 from TheOmyNomy/fix-cursor-trail-blending
Change cursor trail blending mode based on cursor trail type to match stable behaviour
2020-12-29 11:38:31 +09:00
TheOmyNomy
355ecc4499 Change cursor trail blending mode to match stable 2020-12-29 12:37:57 +11:00
Susko3
770a5a85df
Merge Intent.ActionSend into one IntentFilter
Co-authored-by: Lucas A. <game4allyt@gmail.com>
2020-12-28 20:57:08 +01:00
Bartłomiej Dach
f7407347f7 Add test coverage of PlayingUsers tracking 2020-12-28 20:07:05 +01:00
Bartłomiej Dach
a014d0ec18 Use PlayingUsers when constructing player directly 2020-12-28 19:27:56 +01:00
Bartłomiej Dach
1d311a6680 Change PlayingUsers population logic to match expectations 2020-12-28 19:27:56 +01:00
Bartłomiej Dach
d2301068b6 Fix changelog header staying dimmed after build show 2020-12-28 16:35:33 +01:00
Susko3
d971aa5295
Remove file intents and add Send intent
Removed IntentFilters with DataScheme = "file"
Added Intent.ActionSend with application/octet-stream and application/zip
2020-12-28 15:54:21 +01:00
Susko3
b352c1503f
Fix IntentFilter capturing all file types
Removed string arrays and split the IntentFilter into multiple. Also added DataHost and DataMimeType
2020-12-28 15:13:33 +01:00
Dean Herbert
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
Dean Herbert
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
Bartłomiej Dach
a376a23ed7
Merge branch 'master' into fix-leaderboard-user-handling 2020-12-28 13:43:53 +01:00
Bartłomiej Dach
a9822800fc Add more null hinting in GameplayLeaderboard 2020-12-28 13:00:05 +01:00
Dean Herbert
92d74a9343 Fix potential nullref in test scene 2020-12-28 20:48:14 +09:00
Dean Herbert
1ea42d1e4d
Merge pull request #11338 from peppy/fix-user-lookup-failure-crashes
Allow null users to still be displayed in the participant list
2020-12-28 20:44:36 +09:00
Bartłomiej Dach
f16b516e58 Revert user changes if no selection was made 2020-12-28 12:35:17 +01:00
Bartłomiej Dach
fb21b7c016 Add failing test cases 2020-12-28 12:35:16 +01:00
Dean Herbert
6254907ef9 Move multiplayer leaderboard test to correct namespace 2020-12-28 20:31:08 +09:00
Dean Herbert
8f0413472c Add test coverage of null users in scoreboard 2020-12-28 20:30:08 +09:00
Dean Herbert
447a55ce11 Fix incorrect null handling in GameplayLeaderboard 2020-12-28 20:16:53 +09:00
Bartłomiej Dach
20ae84a466
Merge branch 'master' into fix-user-lookup-failure-crashes 2020-12-28 12:15:06 +01:00
Dean Herbert
545dcac4ec Add null hinting on UserLookupCache query method 2020-12-28 20:13:24 +09:00
Dean Herbert
5ca9a6a980 Add xmldoc on UserLookupCache's lookup method 2020-12-28 20:05:48 +09:00
Bartłomiej Dach
cf29d0c5ef
Merge pull request #11339 from peppy/update-fastlane 2020-12-28 11:06:55 +01:00
Bartłomiej Dach
d5b02e6f27
Merge branch 'master' into update-fastlane 2020-12-28 10:32:43 +01:00
Bartłomiej Dach
e33dd04282
Merge pull request #11340 from peppy/update-framework
Update framework
2020-12-28 10:09:23 +01:00
Dean Herbert
2e3537e966 Update framework 2020-12-28 16:52:54 +09:00
Dean Herbert
bdbc210f6d Update fastlane and dependencies 2020-12-28 16:51:45 +09:00
Dean Herbert
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
Dean Herbert
4d61c143db Fix lookup cache throwing a null reference if no matches were successful 2020-12-28 15:03:44 +09:00
Dean Herbert
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