Dean Herbert
9eb16fa61d
Move poll allowance logic based on signalr connection inside polling component
2021-08-17 17:16:21 +09:00
Dean Herbert
a901fca54a
Merge branch 'master' into multi-polling-request-refactor
2021-08-17 16:23:46 +09: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
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
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
155e9e16a5
Refactorings
2021-08-13 22:09:47 +09:00
smoogipoo
c71a581106
Fix exception when leaving match
2021-08-13 18:24:19 +09:00
smoogipoo
1bae7173d3
Fix initial multiplayer poll
2021-08-13 18:14:02 +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
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
Dean Herbert
732dcd30c7
Merge branch 'master' into multiplayer-team-vs-results
2021-08-13 16:03:10 +09:00
Dean Herbert
b9721f5261
Centralise screen exit logic and guard against non-current screen
2021-08-13 14:39:03 +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
047b37788b
Merge online play filter control with the lounge subscreen
2021-08-12 19:48:15 +09:00
Dean Herbert
5f3ceaf0ad
Merge branch 'master' into lounge-redesign
2021-08-12 16:31:14 +09:00
Dan Balasescu
88f70e7f29
Merge branch 'master' into multiplayer-kick-support-events
2021-08-12 12:12:06 +09:00
Dan Balasescu
60e988aac3
Merge branch 'master' into multiplayer-kick-support
2021-08-12 11:46:56 +09:00
smoogipoo
543482111b
Remove outdated todo
2021-08-12 10:40:14 +09:00
Dean Herbert
31608a1bc6
Leave the match screen when kicked
2021-08-11 19:57:10 +09:00
Dean Herbert
d6352637d6
Also add tooltip and context menu item
2021-08-11 17:45:34 +09:00
Dean Herbert
bb51ebd0ef
Don't show button on self
2021-08-11 17:42:46 +09:00
Dean Herbert
7aab8c32ec
Add kick button and hook up logic
2021-08-11 17:31:54 +09:00
Dean Herbert
a223f111cb
Move text to avoid overlapping the results panel
2021-08-11 15:50:01 +09:00
Dean Herbert
430a0e496c
Add winner text
2021-08-11 15:32:14 +09:00
Dean Herbert
c376e652a4
Convey and show team scores at the multiplayer results screen
2021-08-11 15:32:14 +09:00
Dean Herbert
cf82bca09c
Change logic to only handle the case of exactly two teams
2021-08-11 14:44:13 +09:00