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
Dan Balasescu
62970108df
Merge pull request #14269 from peppy/remove-unnecessary-delimiters
...
Fix searches at song select with '!' or ',' not matching as expected
2021-08-13 18:00:11 +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
5a60b39643
Remove unnecessary delimiters from song select filter splitting
2021-08-13 16:42:58 +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
90755c0307
Replace condition with matching precalculated bool
2021-08-13 14:50:59 +09:00
Dean Herbert
93574acf72
Fix exception messaging
2021-08-13 14:46:57 +09:00
Dean Herbert
641d57e5e1
Change scroll container subclass name to hopefully read better
2021-08-13 14:46:28 +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
smoogipoo
3b7aa262d5
Make header overlap content
2021-08-12 16:52:35 +09:00
smoogipoo
d07bb10d02
Remove breadcrumbs from header
2021-08-12 16:52:30 +09:00
Dean Herbert
ab1cc6ad48
Fix padding around recent participants icon being uneven
2021-08-12 16:50:09 +09:00
Dean Herbert
5f3ceaf0ad
Merge branch 'master' into lounge-redesign
2021-08-12 16:31:14 +09:00
Dean Herbert
e84224f64c
Rename AddPlayer
method now that there's no conflict
2021-08-12 16:20:37 +09:00
Dean Herbert
68dbbc17e8
Add support for automatic scrolling in gameplay leaderboard
2021-08-12 16:20:37 +09:00
Dean Herbert
4d6101f4e5
Lease selected room while in match screen to avoid lounge potentially changing it
2021-08-12 14:56:58 +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
smoogipoo
bbb28d1b29
Don't use null-propagation for status
2021-08-12 09:14:46 +09:00
smoogipoo
58d76e9036
Use FinishTransforms()
2021-08-12 09:13:10 +09:00
Dean Herbert
31608a1bc6
Leave the match screen when kicked
2021-08-11 19:57:10 +09:00
smoogipoo
4002a1606e
Round star ratings before comparing
2021-08-11 18:20:39 +09:00
smoogipoo
eb59f3c591
Revert "Buffer the entire star rating range to fix overlapping alpha"
...
This reverts commit c680012523
.
2021-08-11 18:15:53 +09:00
smoogipoo
0f5bea235c
Merge branch 'master' into lounge-redesign
2021-08-11 18:15:34 +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
3f067e3a8d
Remove likely unnecessary score null check
2021-08-11 16:59:42 +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
735c5085dd
Fix match score display not doing an initial value update
2021-08-11 14:50:47 +09:00
Dean Herbert
ee3b373e8a
Correctly handle tied scores
2021-08-11 14:48:37 +09:00
Dean Herbert
cf82bca09c
Change logic to only handle the case of exactly two teams
2021-08-11 14:44:13 +09:00
Dean Herbert
a503274e1d
Pass through MultiplayerRoomUser
s instead of int
s to avoid re-retrieval
2021-08-10 18:39:20 +09:00
Dean Herbert
58714dbe71
Fix ordering of teams to match colours
2021-08-09 19:48:53 +09:00
Dean Herbert
490f9e1848
Fix overlap in spectator view
2021-08-09 19:45:16 +09:00
Dean Herbert
ea6e441dec
Simplify method of marking players as playing in test scenes
2021-08-09 19:21:22 +09:00
Dean Herbert
551929cf5a
Simplify method of marking players as playing in test scenes
2021-08-09 19:18:13 +09:00
Dean Herbert
5f3d087101
Also add team score display to multiplayer spectator screen
2021-08-09 19:17:51 +09:00
Dean Herbert
121648b593
Add gameplay-specific team score display which can expand and contract
2021-08-09 19:17:51 +09:00
Dean Herbert
ebbf6467e8
Support more than two teams
2021-08-09 17:23:02 +09:00
Dean Herbert
cdc173e867
Add tracking of team totals to leaderboard implementation
2021-08-09 17:08:32 +09:00
Dean Herbert
77c9aadd05
Add team colour support to multiplaye gameplay leaderboard panels
2021-08-09 17:06:25 +09:00
Dean Herbert
e1d4eee1d2
Add the ability to set custom overriding colours on GameplayLeaderboardScore
s
2021-08-09 17:06:21 +09:00
Dean Herbert
0fa1f085df
Store MultiplayerRoomUser
as part of tracked data
2021-08-09 16:31:18 +09:00
Dean Herbert
fcec714b4f
Add safeties to avoid MultiplayerPlayer
crashing when beatmap can't be loaded
2021-08-09 16:31:18 +09:00
Dean Herbert
aa4c6b9341
Bring across tournament score display for game usage
2021-08-09 16:30:37 +09:00
Dean Herbert
f4739d0118
Remove MaskingSmoothness
to avoid making sheered container blurry
2021-08-09 16:28:43 +09:00
Dean Herbert
0b76460043
Merge branch 'master' into lounge-redesign
2021-08-09 16:28:28 +09:00
Dean Herbert
a12f6b78a4
Split status retrieval into its own method
2021-08-09 16:21:12 +09:00
Dean Herbert
7cb743a734
Move font sizing to base class
2021-08-09 16:17:51 +09:00
Jamie Taylor
5031b19b42
Add sounds to multiplayer games list
2021-08-06 23:39:42 +09:00
Dan Balasescu
8f014650df
Merge branch 'master' into toggle-multiplayer-leaderboard-with-hud
2021-08-06 19:36:19 +09:00
Dean Herbert
724edcbecd
Toggle the expanded state of the multiplayer leaderboard with the user's HUD
...
Resolves https://github.com/ppy/osu/discussions/14140 .
---
Until now, the multiplayer leaderboard would expand during break time.
Now, it respects the user's HUD visibility status (which can be toggled
using Shift+Tab).
2021-08-06 19:23:44 +09:00
smoogipoo
c680012523
Buffer the entire star rating range to fix overlapping alpha
2021-08-06 19:06:16 +09:00