Dean Herbert
1faf789f0e
Allow expanding chat using key binding even when it is hidden
2021-08-18 18:25:21 +09:00
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
Nathan Alo
2cc096101e
trim whitespace
2021-08-15 18:56:24 +08:00
Salman Ahmed
2ddf28346a
PlayerSettingsGroups -> PlayerSettings
2021-08-14 19:58:20 +03:00
Nathan Alo
4ed06a1021
apply suggestions
2021-08-14 22:39:12 +08:00
Nathan Alo
a553942a7f
update InitialActivity on multiplayer Player and SongSelect
2021-08-14 13:20:36 +08: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
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
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
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
Dean Herbert
a503274e1d
Pass through MultiplayerRoomUsers instead of ints to avoid re-retrieval
2021-08-10 18:39:20 +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
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
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
Salman Ahmed
b01893d3f2
Merge branch 'master' into star-rating-display-v2
2021-08-06 13:51:34 +03: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
smoogipoo
19ed24a06f
Remove unnecessary duplicate background
2021-08-06 18:59:19 +09:00
Dean Herbert
b401dc0b2e
Remove playlist button
2021-08-06 18:58:50 +09:00
smoogipoo
9019e0947a
Remove unused using
2021-08-06 18:54:02 +09:00
smoogipoo
798b16fc24
Remove unused params
2021-08-06 18:52:46 +09:00
smoogipoo
bdfdd00afe
Adjust spacings and sizings of left-side details
2021-08-06 18:52:01 +09:00
Dean Herbert
6164903fec
Merge branch 'master' into new-difficulty-colours
2021-08-06 18:05:53 +09:00
smoogipoo
74bffeac5e
Minor design adustments (paddings/sizing)
2021-08-06 17:03:44 +09:00
smoogipoo
0ea982c036
Update recent participants list to use participant_count
2021-08-05 22:49:41 +09:00
smoogipoo
fd6d488657
Add thousands separator to rank range pill
2021-08-05 21:40:09 +09:00
smoogipoo
c74e620ce9
Add constant for background colour
2021-08-05 21:39:51 +09:00
smoogipoo
87fd1eaf06
Explain negative padding
2021-08-05 21:19:23 +09:00
smoogipoo
438f0ce702
Increase default number of avatars
2021-08-05 21:18:30 +09:00
smoogipoo
2f2e3d7366
Use higher res background image
2021-08-05 21:01:21 +09:00
smoogipoo
b8ec1cb984
Hide star rating max display for equal difficulties
2021-08-05 21:00:28 +09:00
smoogipoo
bd394d9377
Fix pluralisation
2021-08-05 20:56:23 +09:00
smoogipoo
5521f38cfb
Adjust spacing
2021-08-05 20:56:09 +09:00
smoogipoo
0246e6f850
Merge branch 'master' into lounge-redesign
2021-08-05 19:55:15 +09:00
Dan Balasescu
0211521a97
Merge branch 'master' into multiplayer-create-with-enter
2021-08-05 17:07:03 +09:00
Dan Balasescu
5811dff853
Merge pull request #14120 from peppy/multiplayer-team-vs-team-selection
...
Add ability to choose Team Versus match type and view / switch teams
2021-08-05 17:02:14 +09:00
Dean Herbert
2b973b9831
Redirect beatmap selection to intentionally click the button directly
2021-08-05 14:21:51 +09:00
Dean Herbert
bf720f7e06
Ensure operations are not performed during loading
2021-08-05 14:14:07 +09:00
Dean Herbert
22bd6c7556
Move keyboard progress flow handling to MatchSettingsOverlay
2021-08-05 14:06:58 +09:00
Dean Herbert
fd54487186
Add safety against pushing to non-current screen
2021-08-05 14:06:58 +09:00
Dean Herbert
c84bd2c74d
Update new obsolete usages
2021-08-05 13:22:59 +09:00
Salman Ahmed
b2332eb5b3
Use new difficulty colours permanently
2021-08-04 18:19:37 +03:00
Salman Ahmed
d4399f10f9
Merge both variants of the star rating display
2021-08-04 18:19:28 +03:00
Salman Ahmed
d0ce0cf9f5
Merge branch 'master' into new-difficulty-colours
2021-08-04 17:12:15 +03:00
smoogipoo
3b6771ca65
Remove todo
2021-08-04 22:09:03 +09:00
smoogipoo
fbf89493ad
Merge branch 'master' into lounge-redesign
2021-08-04 19:53:55 +09:00
Dean Herbert
476442d1a3
Merge branch 'master' into multiplayer-create-with-enter
2021-08-04 19:37:41 +09:00
Dan Balasescu
5a6636ae5c
Merge pull request #14116 from peppy/update-platform-action-triggers
...
Update existing test to make use of `ManualInputManager.Keys`
2021-08-04 19:36:39 +09:00
Dean Herbert
42e14fb492
Merge branch 'update-platform-action-triggers' into multiplayer-create-with-enter
2021-08-04 17:31:38 +09:00
Dean Herbert
9b9dacf3fe
Update usages of Drawable.Click()
2021-08-04 17:30:33 +09:00
smoogipoo
c06fffb56a
Increase background image resolution
2021-08-04 13:49:13 +09:00
Dean Herbert
aa320c70a7
Improve show/hide animation and add more padding around the crown
2021-08-03 23:42:37 +09:00
Dean Herbert
b8e878ccc9
Add the ability to change team by clicking current team colour
...
Definitely not the final UX, but it's what people are used to and easy
to implement, so it'll do for now.
2021-08-03 23:42:37 +09:00
Dean Herbert
5e59b1325c
Add team display to participant list
2021-08-03 23:42:37 +09:00
Dean Herbert
b956d32587
Add the ability to change multiplayer game type
2021-08-03 23:42:37 +09:00
Dean Herbert
c856611f65
Merge branch 'master' into multiplayer-match-rulesets
2021-08-03 23:40:24 +09:00
Salman Ahmed
9a5e052dc0
Use star difficulty colour spectrum game-wide
2021-08-03 15:02:18 +03:00
smoogipoo
50f6632051
Fix duplicate RoomManager
2021-08-03 20:38:50 +09:00
smoogipoo
1b6b7ce343
Merge branch 'master' into lounge-redesign
2021-08-03 20:02:31 +09:00
Dean Herbert
063868713e
Add ability to create a room using only keyboard input
2021-08-03 19:11:10 +09:00
Dean Herbert
feadfbcca7
Add playlist type to picker temporarily
2021-08-03 17:48:20 +09:00
Dean Herbert
01f15bd6fc
Rename picker class to match new naming
2021-08-03 17:47:53 +09:00
Dean Herbert
a42762e351
Merge branch 'multiplayer-rename-game-type' into multiplayer-match-rulesets
2021-08-03 14:55:51 +09:00
Dean Herbert
2564c0c3df
Rename GameType to MatchType and make enum instead of class
2021-08-03 14:46:31 +09:00
Dean Herbert
867426441e
Fix weird access to room via Client
2021-08-02 18:50:22 +09:00
Henry Lin
89e8296eb1
Reset all types of adjustments in MusicController; Rename AllowRateAdjustments to AllowTrackAdjustments
2021-07-29 15:39:26 +08:00
Dan Balasescu
488dd3ea52
Merge pull request #13980 from peppy/fix-online-song-select-background
...
Fix song select background not showing in multiplayer/playlists
2021-07-26 15:16:39 +09:00
Dean Herbert
3770193ede
Fix keyboard navigation at multiplayer lounge not iterating in correct order
2021-07-26 13:49:09 +09:00
Salman Ahmed
749d7a7b24
Fix DrawableRoom swallowing mouse down events before reaching its container
2021-07-26 04:41:47 +03:00
Dean Herbert
a5736085a9
Ensure externally run operations on LoungeSubScreen are run after load is completed
2021-07-23 02:23:37 +09:00
Dean Herbert
ec3ce57bb9
Fix song select background not showing in multiplayer/playlists
...
The screen was now being loaded against incorrect dependencies. I'm not
sure why I thought it wasn't possible to just do the `Push` in
`LoadComplete` as it seems to work without issue this time...
Closes #13974 .
2021-07-22 14:33:08 +09:00
Henry Lin
aab7678a69
Truncate beatmap text
2021-07-22 12:18:37 +08:00
Bartłomiej Dach
db9cf443c7
Allow confirming room password by pressing Enter
2021-07-21 00:04:51 +02:00
Dan Balasescu
15127f972e
Merge branch 'master' into fix-online-play-sub-screens-not-async-loaded
2021-07-20 18:47:41 +09:00
Dean Herbert
d87ea741ed
Fix OnlinePlayScreen sub-screens not loaded asynchronously
2021-07-20 16:38:39 +09:00
Dean Herbert
fe414b942f
Ensure online play subscreen is loaded before forwarding OnExiting
...
Closes https://github.com/ppy/osu-framework/issues/4619 (actually not a
framework issue; the framework correctly guards against this scenario,
see
4e29504384/osu.Framework/Screens/ScreenStack.cs (L277)
2021-07-20 15:51:34 +09:00
smoogipoo
6a55cb9df0
Revert unintended change
...
It's a deeper issue with ScreenStack (see:
https://github.com/ppy/osu-framework/issues/4619 ).
2021-07-19 22:52:07 +09:00
smoogipoo
57a99886d5
Fix password icon not disappearing when no password
2021-07-19 22:31:01 +09:00
smoogipoo
892d858d5f
Fix compile error
2021-07-19 22:23:31 +09:00
smoogipoo
b7c2d6b1ab
Merge branch 'master' into add-password-support
2021-07-19 22:23:09 +09:00
smoogipoo
3168a927dc
Fix possible exception
2021-07-19 20:50:30 +09:00
smoogipoo
2515785f93
Use room password to fill settings textbox
2021-07-19 20:03:32 +09:00
Dean Herbert
3c028ce05c
Add IDeepCloneable interface and update existing CreateCopy methods to use it
2021-07-19 12:54:17 +09:00
Dean Herbert
c6bc95767d
Simplify popover hide logic and add test coverage
2021-07-17 22:31:47 +09:00
Dean Herbert
c966cb0530
Fix dependency lookup failing due to location of PopoverContainer
2021-07-17 15:04:18 +09:00
Dean Herbert
9d693c75cf
Add Schedule to restore password text box focus behaviour
2021-07-14 23:56:52 +09:00
Dean Herbert
cc09a8b5ba
Update to use OsuPopover implementation
2021-07-14 23:55:46 +09:00
Dean Herbert
b5dd9403b1
Merge branch 'master' into add-password-support
2021-07-14 23:53:03 +09:00
smoogipoo
dfe7cc40a9
Move create room button into the lounge
2021-07-14 18:55:01 +09:00
smoogipoo
3e6b9bd48d
Add filter background
2021-07-14 18:24:30 +09:00
smoogipoo
c64230315f
Adjust layouts
2021-07-14 18:10:59 +09:00
smoogipoo
0bfaf11d51
Remove/fix paddings in lounge
2021-07-14 17:46:52 +09:00
smoogipoo
f6b81b76e8
Add shadow
2021-07-14 17:46:32 +09:00
smoogipoo
da3b40a4dd
Add default background to panel, reduce nesting
2021-07-14 16:56:46 +09:00
smoogipoo
e0c61c24b1
Remove spotlights glow
2021-07-14 16:51:31 +09:00
smoogipoo
0e89bafd17
Add special category pill + secondary background
2021-07-14 16:48:53 +09:00
smoogipoo
c5977f3318
Merge branch 'master' into lounge-redesign
2021-07-14 12:47:16 +09:00
Dan Balasescu
4ce96109b7
Merge branch 'master' into fix-match-screen-buttons-no-user
2021-07-13 18:20:23 +09:00
Dan Balasescu
0557761e51
Merge pull request #13862 from peppy/fix-multiplayer-create-game-failure-crash
...
Fix crash when multiplayer server join fails during game creation
2021-07-13 18:00:47 +09:00
Dean Herbert
e791669c40
Fix multiplayer screen buttons showing no text when local user not available
2021-07-13 17:59:58 +09:00
Dean Herbert
60e17fc2b7
Fix disconnected-from-server multiplayer exit sequence being blocked by confirmation dialog
2021-07-13 17:12:35 +09:00
Dean Herbert
481e4dedb0
Move PopoverContainer to OsuGameBase
2021-07-13 16:51:31 +09:00
smoogipoo
b5d4b9444f
wip
2021-07-13 16:51:29 +09:00
Dean Herbert
6409a518db
Focus password text box on popover display
2021-07-13 16:35:37 +09:00
smoogipoo
0cb80e105b
Renamespace classes
2021-07-13 16:02:18 +09:00
smoogipoo
ab282b9e59
Remove RoomInspector from the lounge
2021-07-13 16:00:42 +09:00
smoogipoo
689cee832c
Fix 1px gaps in DrawableRoom background
2021-07-13 15:50:46 +09:00
smoogipoo
8c4a257742
Add recent participants
2021-07-13 15:10:44 +09:00
Dean Herbert
5cffaf4d3b
Add extra explanatory comment to avoid any confusion
2021-07-13 14:34:56 +09:00
Dean Herbert
125bd36ab1
Send password in request ctor directly
2021-07-13 14:27:07 +09:00
Dean Herbert
c6bd58ea4b
Exit match sub screen when a room goes away
...
Closes #13847 .
I think we can probably get some test coverage of this if required, but
needs a bit of thought (basically an error needs to be thrown during the
multiplayer client portion of the join procedure, after `CurrentRoom` is
non-null but before the join completes).
Manual testing on password branch (#13861 ) is possible since it
currently errors due to missing method on the live/dev servers.
- Create game, which will fail with `MethodNotExists`.
- Note the fields on the settings screen are emptied.
- Fill fields again and press create game (crash).
2021-07-12 19:20:41 +09:00
Dean Herbert
4dea2d9778
Dismiss popovers on returning to lounge
2021-07-12 18:54:17 +09:00
Dean Herbert
bbc3a013c8
Use BasicPopover for now
2021-07-12 18:29:50 +09:00
Dean Herbert
b4ca6b6188
Update popover logic to take advantage of new explicit popup functionality
2021-07-12 18:25:04 +09:00
Dean Herbert
a3e0168a46
Update tests
2021-07-12 18:25:04 +09:00
Dean Herbert
e25b3518dc
Make password popover display inside RoomsContainer rooms
2021-07-12 18:25:04 +09:00
Dean Herbert
9f9d7f9125
Add remaining pieces of password flow (for osu-web join request)
2021-07-12 18:22:52 +09:00
Dean Herbert
3c49b46c5f
Add lock overlay for rooms which are password protected
2021-07-12 18:22:52 +09:00
smoogipoo
c1fba3da6b
Add solid background
2021-07-12 16:30:34 +09:00
smoogipoo
aba09b20a5
Add host under room title
2021-07-12 16:28:22 +09:00
smoogipoo
4ac812de86
Add rank range pill
2021-07-12 16:15:26 +09:00
Dean Herbert
08c40938db
Add support for updating a room's password
2021-07-12 15:49:19 +09:00
Dean Herbert
4fd6f2101c
Add password textbox input
2021-07-12 15:49:19 +09:00
Dean Herbert
24f330e5c1
Avoid MatchSettingsOverlay base class potentially accessing an uninitialised field
2021-07-12 15:49:19 +09:00
smoogipoo
435b4b0e6e
Remove pill inheritance
2021-07-12 15:21:00 +09:00
smoogipoo
a8cbffa57e
Add playlist count pill
2021-07-12 15:11:53 +09:00
smoogipoo
185e36bf97
Split pill display into abstract class
2021-07-12 15:11:10 +09:00
smoogipoo
b4b0b862ef
Adjust some layout
2021-07-12 14:07:21 +09:00
smoogipoo
8929aa0ca7
Initial redesign of DrawableRoom
2021-07-07 14:47:24 +09:00
smoogipoo
2ddfa15a80
Redesign RoomStatusInfo
2021-07-07 14:47:24 +09:00
smoogipoo
c50e3fd317
Clean up selection box construction
2021-07-07 14:47:24 +09:00
Dan Balasescu
32e6c9c5d3
Merge pull request #13786 from peppy/multiplayer-test-fixes
...
Fix multiplayer test failures due to leaderboard load process
2021-07-06 16:33:41 +09:00
Dean Herbert
0658cfb986
Throw exceptions rather than silently failing if attempting to add a clock for a non-tracked user
2021-07-06 14:56:00 +09:00
PercyDan54
e1c646b9b2
Remove redundant arguments
2021-07-05 23:52:39 +08:00
Dean Herbert
77adf687c6
Consume ability to lookup multiple users in MultiplayerGameplayLeaderboard
...
Avoids syncrhonously blocking on asynchronous operations (which was
leading to LCA starvation in tests).
2021-07-05 19:56:37 +09:00
Dean Herbert
229bba14e6
Fix master clock becoming incorrectly paused when all spectator players are too far ahead
2021-07-05 17:45:08 +09:00
smoogipoo
4c95af4b16
Add star rating range display
2021-07-01 20:35:31 +09:00
smoogipoo
6dd3c6fe93
Make MultiSpectatorScreen and tests more resillient to timing
2021-06-29 22:45:51 +09:00
smoogipoo
bfdbe3c3fe
Fix clocks getting added a second time
2021-06-29 17:29:25 +09:00
smoogipoo
8e04d73b67
Merge branch 'rework-multiplayer-test-scenes' into spectator-start-at-end-2
2021-06-29 17:06:57 +09:00
smoogipoo
bcdf36e77b
Merge branch 'master' into spectator-start-at-end-2
2021-06-29 15:53:58 +09:00
smoogipoo
92fa99700e
Merge branch 'master' into rework-multiplayer-test-scenes
2021-06-29 15:39:59 +09:00
smoogipoo
a3b1e1d5fc
Check for null ruleset in FilterCriteria
2021-06-29 15:18:40 +09:00
Bartłomiej Dach
50c27d2635
Update usages of IHasTooltip in line with framework localisation changes
2021-06-25 19:10:04 +02:00
Dean Herbert
51dd7fc238
Merge pull request #13622 from aitani9/mod-settings-dropdown-height
...
Decrease the max dropdown height in mod settings
2021-06-25 17:42:47 +09:00
Dean Herbert
5883922177
Remove mod multiplier completely
2021-06-25 16:36:31 +09:00
Joseph Madamba
db86098062
Fix dialog not closing after spamming OS window close
2021-06-21 20:23:11 -07:00
Joseph Madamba
9bcd1e6922
Move confirm dialog logic to OnExiting
2021-06-21 20:22:18 -07:00
Joseph Madamba
00b4cf1829
Handle sub screen OnExiting logic on main screen
2021-06-21 20:20:43 -07:00
Dean Herbert
45122594e5
Remove the synchronous version of PrepareScoreForResults
...
Replaces all existing usages with the `async` version.
2021-06-18 16:24:08 +09:00
Dean Herbert
e0a3696145
Merge branch 'master' into player-completion-refactoring
2021-06-17 23:51:42 +09:00
Dean Herbert
d03c6da60c
Refactor and redocument updateCompletionState() and surrounding methods
2021-06-17 19:13:53 +09:00
Dean Herbert
808b2baa41
Consume new behaviour to fix UserTile discrepancy
...
Closes https://github.com/ppy/osu/issues/13522 .
2021-06-17 16:31:12 +09:00
smoogipoo
9f163f7f20
Use switch statement to be more explicit about state
2021-06-11 19:23:25 +09:00
smoogipoo
0a8daab4f7
Pause master clock when too far ahead
2021-06-11 19:15:53 +09:00
smoogipoo
59eda70c12
Seek to the least most-recent frame instead
2021-06-11 18:40:56 +09:00
smoogipoo
263b8ff097
Wait for full player load
2021-06-11 18:14:37 +09:00
smoogipoo
a99cb79738
Seek master clock on multi-spectator start
2021-06-11 16:25:45 +09:00
smoogipoo
75d825c85c
Dont control master clock from sync manager
2021-06-11 16:24:52 +09:00
smoogipoo
1c67ef7c91
Make catchup clock support seeking
2021-06-11 16:23:59 +09:00
Dean Herbert
b754c52392
Update ModAutoplay matching to use new UserPlayable flag instead
2021-06-09 14:32:48 +09:00
Dean Herbert
7774344f0e
Remove "Unranked" text from ModDisplay
2021-06-09 13:45:09 +09:00
smoogipoo
c3ea1b26e1
Fix DT being doubled in multiplayer spectator
2021-06-08 22:51:42 +09:00
smoogipoo
ab9290772b
Fix a similar case with online play sub-screens
2021-06-08 17:54:54 +09:00
Dean Herbert
a15cac6f53
Change the way Score is initialised in Player to better lend to population of metadata
2021-06-02 15:44:04 +09:00
Dean Herbert
6ef9b346e1
Fix newly found inspections from 2021.1EAP1
2021-06-01 14:33:21 +09:00
Dean Herbert
df426b9334
Merge pull request #12852 from timiimit/multi-larger-freemod-overlay
...
Make freemod selection overlay taller in multiplayer room
2021-05-21 18:45:15 +09:00
Dean Herbert
abc96057b2
Remove relative height specification and use constant height
2021-05-21 17:55:46 +09:00
smoogipoo
a74405d0ed
Merge branch 'master' into restructure-spectator-client
2021-05-20 18:53:42 +09:00
smoogipoo
6beeb7f7c4
Rename SpectatorStreamingClient -> SpectatorClient
2021-05-20 15:55:07 +09:00
smoogipoo
d197a7f6f5
Rename multiplayer client classes
2021-05-20 15:39:45 +09:00
timiimit
1fd00d1313
Change from fullscreen to 0.7
2021-05-18 21:52:28 +02:00
timiimit
ac5fe0c18c
Change larger freemod selection overlay
2021-05-18 18:50:42 +02:00
Dan Balasescu
ce7c503e6e
Merge branch 'master' into playlist-unicode
2021-05-17 11:47:10 +09:00
Salman Ahmed
8338f702c3
Remove not required null conditional
2021-05-14 09:32:56 +03:00
Dean Herbert
48672f8afd
Add very basic test logic to ensure PlayerLoader is present for playlists
2021-05-14 15:02:36 +09:00
Salman Ahmed
9e8c0a7e70
Fix online play subscreens not pushing player loaders when starting gameplay
2021-05-14 04:25:29 +03:00
smoogipoo
9ad1e5067e
Fix spectate being entered while not having the beatmap
2021-05-11 19:22:09 +09:00
smoogipoo
10a4a5decb
Merge branch 'master' into multiplayer-spectator-screen
2021-05-11 17:33:09 +09:00
