Dean Herbert
365c1bccc6
Fix multiplayer channel being unintentionally left after gameplay session
2021-08-18 18:24:20 +09:00
Salman Ahmed
5e91ec73e3
Handle star rating range display sizing
2021-08-18 11:36:27 +03:00
Dean Herbert
2099298444
Disallow clicking on chat textbox during gameplay
2021-08-18 17:30:50 +09:00
smoogipoo
9220d17202
Adjust paddings/spacings
2021-08-18 17:28:20 +09:00
Dean Herbert
9d2664cbb1
Merge branch 'master' into star-rating-display-v2
2021-08-18 17:22:33 +09:00
smoogipoo
6dc96fdb83
Disable edit button in playlists
2021-08-18 16:56:42 +09:00
smoogipoo
87a5922f0e
Remove participants from playlists screen
2021-08-18 16:26:45 +09:00
smoogipoo
66e11fe75e
Initial integration of playlists with the new structure
2021-08-18 16:09:15 +09:00
smoogipoo
568f1fd345
Fix initial RoomId state not being handled correctly
2021-08-18 16:09:00 +09:00
smoogipoo
90a1be2e61
Move paddings up one level
2021-08-18 15:54:33 +09:00
smoogipoo
744b6749d1
Resolve room settings layout issues
2021-08-18 15:29:01 +09:00
smoogipoo
228ad98b39
Remove extra corner radius on DrawableRoom
2021-08-18 15:27:23 +09:00
smoogipoo
f3bc9c3e45
Merge branch 'master' into match-subscreen-redesign
2021-08-18 15:19:29 +09:00
smoogipoo
c5268c9a99
Simplify by reusing same room panel
2021-08-18 15:19:24 +09:00
smoogipoo
704af94d39
Add edit button to room panel
2021-08-18 15:13:10 +09:00
smoogipoo
0853554c24
Fix settings overlay not being initially visible
2021-08-18 15:11:52 +09:00
smoogipoo
c66abf85f7
Remove match header
2021-08-18 14:04:44 +09:00
Dan Balasescu
eaf7bd72fc
Merge branch 'master' into multiplayer-chat
2021-08-17 20:08:01 +09:00
smoogipoo
47d4a2e97f
Make SettingsOverlay protected
2021-08-17 20:05:26 +09:00
smoogipoo
590d814881
Move RoomSettingsOverlay to RoomSubScreen
2021-08-17 18:24:04 +09:00
smoogipoo
6840ec6716
Actually show the room in the sub screen
2021-08-17 17:58:24 +09:00
Dean Herbert
4a65888cfc
Merge branch 'master' into multiplayer-chat
2021-08-17 17:34:23 +09:00
Dean Herbert
3b5fc6d10f
Ensure updateLoadingLayer is run at least once
2021-08-17 17:18:23 +09:00
Dean Herbert
9eb16fa61d
Move poll allowance logic based on signalr connection inside polling component
2021-08-17 17:16:21 +09:00
smoogipoo
5d72c5911a
Rename MatchSettingsOverlay and related classes
...
Because "match" is a multiplayer-only concept.
2021-08-17 17:14:28 +09:00
smoogipoo
6416e64e06
Adjust sizings and paddings
2021-08-17 17:13:25 +09:00
smoogipoo
4b198d14eb
Initial refactor of RoomSubScreen
2021-08-17 17:05:20 +09:00
Dean Herbert
a901fca54a
Merge branch 'master' into multi-polling-request-refactor
2021-08-17 16:23:46 +09:00
Dean Herbert
124f149cb5
Add key binding to focus chat input
2021-08-17 16:17:31 +09:00
Dean Herbert
30eee363dc
Add chat display during multiplayer gameplay
2021-08-17 16:17:31 +09:00
Salman Ahmed
3a7b9bf096
Fix MatchSettingsOverlay not resetting focus on hide properly
2021-08-17 08:56:49 +03:00
smoogipoo
f4b7ee5c7f
Merge branch 'master' into hide-player-settings-overlay
2021-08-17 13:44:33 +09:00
smoogipoo
1e282432c9
Fix password in a better way
2021-08-17 09:40:25 +09:00
smoogipoo
352949069a
Move filter to LoungeSubScreen
2021-08-17 09:36:43 +09:00
smoogipoo
97d5b80834
Fix joining with incorrect password
2021-08-17 09:18:21 +09:00
smoogipoo
6320768a67
Merge branch 'master' into multi-polling-request-refactor
2021-08-17 08:44:56 +09:00
Dean Herbert
8d45f86bd3
Rename variable to better reflect its purpose
2021-08-16 16:48:40 +09:00
Dean Herbert
81480ac4fc
Use PlayerConfiguration to convey no-seek state
2021-08-16 16:16:02 +09:00
Salman Ahmed
7fe6f6dd14
Fix kick button action asserting and using User.User.ID rather than User.UserID
2021-08-16 09:47:23 +03:00
Salman Ahmed
79cd062784
Let TeamDisplay take the full MultiplayerRoomUser rather than the underlying User
2021-08-16 09:47:23 +03:00
smoogipoo
08d347f10b
Merge branch 'master' into multi-polling-request-refactor
2021-08-16 13:12:08 +09:00
smoogipoo
b6a2020c59
General refactorings from PR review
2021-08-16 13:09:04 +09:00
smoogipoo
81f9442471
Inline update/addRoom in usage sites
2021-08-16 13:04:06 +09:00
Dean Herbert
f0fe79b568
Remove buffered container workarounds for now
2021-08-16 11:04:21 +09:00
Dean Herbert
d35886ef19
Reduce frame buffer render scale for blurred background
2021-08-16 11:03:49 +09:00
Dean Herbert
e8e387b549
Cache buffered background to fix multiplayer lounge performance
...
Consider this a request for comment. It's the cleanest solution I can
come up with without dropping either the blur, or use of
`ModelBackedDrawable`.
Intended to resolve https://github.com/ppy/osu/issues/14276 .
2021-08-16 08:04:54 +09:00
Salman Ahmed
2ddf28346a
PlayerSettingsGroups -> PlayerSettings
2021-08-14 19:58:20 +03:00
Dean Herbert
b8c63eb1cb
Merge branch 'master' into multiplayer-kick-support-events
2021-08-14 14:08:34 +09:00
Bartłomiej Dach
8f3fedade3
Merge branch 'master' into multiplayer-team-vs-results
2021-08-13 21:30:44 +02:00
smoogipoo
1c0ffd4621
Merge branch 'master' into multi-polling-request-refactor
2021-08-13 22:24:01 +09:00
smoogipoo
155e9e16a5
Refactorings
2021-08-13 22:09:47 +09:00
smoogipoo
d57508853e
Merge branch 'master' into multi-polling-request-refactor
2021-08-13 22:04:31 +09:00
smoogipoo
44b3e3bfac
Merge branch 'master' into fix-playlists-cross-ruleset-entry
2021-08-13 21:58:15 +09:00
smoogipoo
c71a581106
Fix exception when leaving match
2021-08-13 18:24:19 +09:00
smoogipoo
1f992e67f3
Fix listing polling rate when entering room
2021-08-13 18:17:25 +09:00
smoogipoo
1bae7173d3
Fix initial multiplayer poll
2021-08-13 18:14:02 +09:00
smoogipoo
6a46105b5e
Fix incorrect dependency
2021-08-13 18:12:32 +09:00
smoogipoo
83935540ca
Add selection polling component to PlaylistsRoomSubScreen
2021-08-13 18:11:52 +09:00
smoogipoo
7cbf4c48ed
Fix multiplayer polling when not connected
2021-08-13 17:59:18 +09:00
smoogipoo
8910781bcd
Move listing polling component to LoungeSubScreen
2021-08-13 17:39:09 +09:00
Dean Herbert
db52549152
Move below everything rather than proxying (works better with new design)
2021-08-13 16:20:53 +09:00
Dean Herbert
6a95fa0278
Merge branch 'master' into fix-loading-screen-depth
2021-08-13 16:20:38 +09:00
Dean Herbert
df24f7a81e
Merge pull request #14256 from smoogipoo/multiplayer-header-redesign
...
Update multiplayer header to the latest designs
2021-08-13 16:16:25 +09:00
Dean Herbert
f9f3339885
Fix vertical offset not being handled correctly during score panel detach process
2021-08-13 16:14:23 +09:00
Dan Balasescu
f47f2b43b0
Merge branch 'master' into fix-loading-screen-depth
2021-08-13 16:09:00 +09:00
Dean Herbert
732dcd30c7
Merge branch 'master' into multiplayer-team-vs-results
2021-08-13 16:03:10 +09:00
Dean Herbert
dd7ca4b77b
Increase "create room" button height
2021-08-13 15:35:45 +09:00
Dean Herbert
3b6a8a2bae
Rename background sprite and reduce load delay
2021-08-13 15:25:00 +09:00
Dean Herbert
5cec50bdd1
Add comment mentioning why event bindings are not unbound
2021-08-13 15:24:43 +09:00
Dean Herbert
bf024fbd21
Merge branch 'master' into fix-playlists-cross-ruleset-entry
2021-08-13 15:06:37 +09:00
Dean Herbert
a1b72e7f97
Remove redundant array type specification
2021-08-13 14:41:07 +09:00
Dean Herbert
b9721f5261
Centralise screen exit logic and guard against non-current screen
2021-08-13 14:39:03 +09:00
Dean Herbert
0f45155b8e
Fix remaining cases of invalid bindable operations during lease
2021-08-13 14:29:28 +09:00
Dean Herbert
92d4c9224a
Merge branch 'master' into fix-playlists-cross-ruleset-entry
2021-08-13 14:28:14 +09:00
Dean Herbert
89eded457c
Fix weird margins on loading display in lounge
2021-08-13 14:27:28 +09:00
smoogipoo
755b6460b6
Fix multiplayer navigation test failure
2021-08-13 14:05:44 +09:00
Salman Ahmed
34c2b317e2
Hide song progress bar on multi-spectator player
2021-08-13 07:30:09 +03:00
Salman Ahmed
e7cf6b2d23
Expire hold-to-quit button on multi-spectator player
2021-08-13 07:29:55 +03:00
Salman Ahmed
8dc7a925e7
Expire instead of hiding and disabling visibility state
...
Since it's a temporary change until the spectator interface gets
improved, no need to add further logic.
2021-08-13 07:28:59 +03:00
smoogipoo
e913c8f92f
Change strings to verbatim
2021-08-13 13:07:02 +09:00
Salman Ahmed
c10320f239
Hide and disable player settings overlay on multi-spectator player
2021-08-13 06:35:16 +03:00
Salman Ahmed
2b86416cb2
Hide player settings overlay on multi-spectator player loader
2021-08-13 06:35:16 +03:00
Bartłomiej Dach
70005cb39d
Merge branch 'master' into multiplayer-team-vs-results
2021-08-12 20:39:48 +02:00
Bartłomiej Dach
53b4cdfb02
Handle ties in team vs. results screen
2021-08-12 20:38:24 +02:00
Bartłomiej Dach
f06f13215b
Split off multiplayer team results screen to separate class
...
The previous version tried to keep both normal multiplayer and team
multiplayer results as one screen, but didn't check that team-specific
components aren't null in `LoadComplete()`.
To decrease number of conditional, split off the team results screen to
a separate implementation, and choose one or the other at push time in
`MultiplayerPlayer`, depending on team count.
2021-08-12 20:01:31 +02:00
Bartłomiej Dach
828268ad4d
Add winner text background to increase contrast
2021-08-12 19:34:25 +02:00
Bartłomiej Dach
4d26bb6714
Scale score panel to remove overlap with team score display
2021-08-12 19:27:32 +02:00
Dean Herbert
8249ce7988
Merge branch 'master' into multiplayer-header-redesign
2021-08-12 21:00:46 +09:00
smoogipoo
03351cf434
Add blur to background
2021-08-12 20:01:53 +09:00
smoogipoo
050f2d6b0d
Add background to room subscreen
2021-08-12 19:51:03 +09:00
smoogipoo
047b37788b
Merge online play filter control with the lounge subscreen
2021-08-12 19:48:15 +09:00
Dean Herbert
e89aea1fc2
Add some padding between scroll bar and content
2021-08-12 19:47:26 +09:00
Dean Herbert
10195e0c53
Add total user count
2021-08-12 19:47:26 +09:00
Dean Herbert
7b66616dc4
Simplify logic and test/fix edge case
2021-08-12 19:47:26 +09:00
Dean Herbert
8a67304b9f
Fix recent participants hidden user logic not handling edge case correctly
...
Hiding just one user never makes sense, so this will now always show up
to the required circle count until two users are required to be hidden.
This will make the listing more consistent with the width requirement
spec.
2021-08-12 19:47:26 +09:00
Dean Herbert
127fd4d292
Match font weight of design for hidden user count
2021-08-12 19:47:26 +09:00
Dean Herbert
2c07b68f6f
Fix incorrect colour for hidden user display
2021-08-12 19:47:26 +09:00
Dean Herbert
512382987e
Add colour provider for multiplayer usage
2021-08-12 19:47:26 +09:00
smoogipoo
ab7bd1df9d
Use full-screen background
2021-08-12 19:27:06 +09:00
smoogipoo
b75c20fee4
Adjust positioning and paddings
2021-08-12 18:02:00 +09:00
