b4df2d6d43
Add method for copying properties from another mod
2021-01-01 03:46:09 +03:00
faed776112
Merge pull request #11382 from mcendu/move-health-meter
2020-12-31 22:39:49 +09:00
1e02f450a6
Merge branch 'master' into move-health-meter
2020-12-31 13:59:37 +01:00
17abe90c27
move SkinnableHealthDisplay
...
Similar components are in osu.Game.Screens.Play.HUD while this is not
2020-12-31 20:23:13 +08:00
ec75efe124
Merge pull request #11379 from peppy/fix-perform-from-menu-nullref
...
Fix PerformFromMenuRunner failing if CurrentScreen is null
2020-12-31 19:10:21 +09:00
1b1447eb35
Merge branch 'master' into fix-perform-from-menu-nullref
2020-12-31 10:33:05 +01:00
00c6703c51
Inline complete method as well
...
For better guarantees that `finalAction` is actually called on the same
screen that `checkCanComplete()` was (uses result of one
`getCurrentScreen()` call throughout instead of calling multiple times).
2020-12-31 10:27:42 +01:00
f9196ae976
Fix PerformFromMenuRunner failing if CurrentScreen is null
2020-12-31 16:36:20 +09:00
6ebb267c66
Merge pull request #11346 from bdach/fix-changelog-regression
...
Fix changelog header staying dimmed after build show
2020-12-31 16:15:25 +09:00
a45f9b63b9
Merge pull request #11373 from peppy/move-out-thread-safety
...
Move thread safety / locking logic from MultiplayerRoom
2020-12-30 23:27:36 +09:00
497d644a19
Move thread safety / locking logic from MultiplayerRoom
2020-12-30 20:24:50 +09:00
6596e3c5e8
Merge branch 'master' into fix-changelog-regression
2020-12-30 01:34:18 +09:00
575a00dd7d
Merge pull request #11359 from peppy/fix-error-spam-on-disconnection
2020-12-30 01:33:02 +09:00
3920dac8af
Merge branch 'master' into fix-error-spam-on-disconnection
2020-12-30 00:55:37 +09:00
3552034ffe
Update framework
2020-12-30 00:55:27 +09:00
4561911150
Merge pull request #11358 from peppy/remove-multiplayer-selection-poller
2020-12-29 13:27:33 +01:00
05f212eb3c
Merge branch 'master' into remove-multiplayer-selection-poller
2020-12-29 12:51:33 +01:00
f2163a471a
Trim missed reference to deleted member
2020-12-29 11:53:42 +01:00
33891aae12
Merge pull request #11361 from peppy/improve-failing-api-ux
2020-12-29 11:41:08 +01:00
4a85ee1374
Merge branch 'master' into improve-failing-api-ux
2020-12-29 11:01:36 +01:00
361d215ab4
Reword notification messages to match new logic
2020-12-29 10:56:59 +01:00
5d23199233
Trim redundant IsLoggedIn checks
2020-12-29 10:56:29 +01:00
ecb07ecca7
Merge pull request #11362 from peppy/remove-unused-lock-object
...
Remove unused lock object
2020-12-29 10:15:42 +01:00
6bbd0ecfac
Remove unused lock object
2020-12-29 17:39:00 +09:00
906a9b79b5
Show an error when forcefully exiting online play due to API failure
2020-12-29 16:47:36 +09:00
4d04e0dee7
Disallow entering the playlists/multiplayer screens if API is failing
2020-12-29 16:25:51 +09:00
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
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
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
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
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
355ecc4499
Change cursor trail blending mode to match stable
2020-12-29 12:37:57 +11:00
f7407347f7
Add test coverage of PlayingUsers tracking
2020-12-28 20:07:05 +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
92d74a9343
Fix potential nullref in test scene
2020-12-28 20:48:14 +09:00
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
f16b516e58
Revert user changes if no selection was made
2020-12-28 12:35:17 +01:00
fb21b7c016
Add failing test cases
2020-12-28 12:35:16 +01:00
6254907ef9
Move multiplayer leaderboard test to correct namespace
2020-12-28 20:31:08 +09:00
8f0413472c
Add test coverage of null users in scoreboard
2020-12-28 20:30:08 +09:00
447a55ce11
Fix incorrect null handling in GameplayLeaderboard
2020-12-28 20:16:53 +09:00
