Dean Herbert
4afc808ffc
Remove horizontal transitions for now
...
They look bad with the current toolbar implementation. We can probably
add them back once the toolbar is moved to the lounge.
2021-08-19 18:29:59 +09:00
smoogipoo
023f3fb70e
Use BackgroundScreen for multiplayer backgrounds
2021-08-19 18:19:31 +09:00
smoogipoo
493f47787b
Disable condition for the time being
2021-08-19 18:18:42 +09:00
Dean Herbert
4d1582d721
Play settings hide animation if visible when exiting RoomSubScreen
2021-08-19 18:14:45 +09:00
smoogipoo
6b6d52c23b
Add dependency container to RoomSubScreen
2021-08-19 16:53:07 +09:00
smoogipoo
4d1897c6b4
Remove unnecessary resolve into ListingPollingComponent
2021-08-19 16:52:54 +09:00
smoogipoo
00be7f4cca
Make RoomsContainer/DrawableRoom not resolve via DI
2021-08-19 16:52:54 +09:00
smoogipoo
3a1154c00e
Pass room into SelectionPollingComponent
2021-08-19 16:41:21 +09:00
smoogipoo
c31af96f1d
Pass room into RoomSettingsOverlay
2021-08-19 16:41:21 +09:00
smoogipoo
1fd746524d
Remove realtime room category, fix end-date showing for realtime
2021-08-19 16:09:28 +09:00
smoogipoo
6469eaa427
Fix background not updated in room
2021-08-19 15:52:51 +09:00
Salman Ahmed
6bfae25cda
Apply 5px vertical spacing on fill flow
...
Regressed, was margin { bottom = 5f } from the star rating display
creation method, which I've partly inlined.
2021-08-19 08:30:29 +03:00
Dean Herbert
6d00ea3375
Allow toggling focus via binding
2021-08-19 14:19:59 +09:00
Salman Ahmed
25e6317e7f
Use animated star display in beatmap info wedge and synchronise bar
2021-08-19 07:18:02 +03:00
Salman Ahmed
102320f8ae
Merge branch 'master' into mod-settings-difficulty-cache
2021-08-19 06:35:13 +03:00
Salman Ahmed
b984780d6a
Merge branch 'master' into fix-lounge-loading
2021-08-19 06:26:15 +03:00
Salman Ahmed
0e2f3dff4d
Fix rooms scroll container not masking properly due to padding
2021-08-19 05:09:49 +03:00
Salman Ahmed
ffbe8ddfa4
Refactor lounge sub screen layout for better loading screen appearance
2021-08-19 04:23:12 +03:00
Bartłomiej Dach
07951fe18c
Merge branch 'master' into limit-match-settings-textbox
2021-08-18 21:17:16 +02:00
Davran Dilshat
43cbd10a38
change limit to be on actual usage site
2021-08-18 18:30:50 +01:00
Davran Dilshat
61675eefe0
Add length limit to match settings textboxes
2021-08-18 17:36:57 +01:00
smoogipoo
d40023bcc1
Hide border by default
2021-08-18 21:09:34 +09:00
smoogipoo
e9221f0126
Cleanup unnecessary implementation
2021-08-18 21:00:11 +09:00
smoogipoo
eadf02933a
Split lounge-specific implementation from DrawableRoom
2021-08-18 20:56:44 +09:00
smoogipoo
63af67f61b
Cleanup around footers
2021-08-18 20:25:48 +09:00
Salman Ahmed
8172ffc401
Fix lounge sub screen loading layer displaying in the background
2021-08-18 13:12:58 +03:00
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
Salman Ahmed
8c5d99ab21
Override CreateInstance() in osu! bindable subclasses
...
Three bindables are left which don't have this overriden due to them
already not having a value-only constructor and not supporting
`GetBoundCopy()` properly:
- `BeatmapDifficultyCache.BindableStarDifficulty`.
- `TotalScoreBindable`
- `TotalScoreStringBindable`
I could add support for them by passing the required data to them, as
they seem to be able to have that shared, but I'm hesitant to support
something which was already broken and never used, not sure.
2021-08-18 04:19:58 +03:00
Dan Balasescu
eaf7bd72fc
Merge branch 'master' into multiplayer-chat
2021-08-17 20:08:01 +09:00
Dan Balasescu
d8e9845d00
Merge pull request #14360 from peppy/improve-timeline-tick-visibility
...
Improve visibility of repeat ticks / drag areas on timeline
2021-08-17 20:06:49 +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
Dean Herbert
f16468b706
Improve visibility of repeat ticks / drag areas on timeline
2021-08-17 18:17:55 +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
ef9bfece13
Merge branch 'master' into multi-polling-request-refactor
2021-08-17 17:31:25 +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
Dan Balasescu
b1efc6d763
Merge branch 'master' into local-user-play-info
2021-08-17 16:23:44 +09:00
Dean Herbert
6ee6a46894
Remove unnecessary public prefix in interface specification
2021-08-17 16:22:14 +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
Dean Herbert
0d283aa6a3
Expose LocalUserPlaying from Player
2021-08-17 16:16:49 +09:00
Dean Herbert
82eddeffef
Add LocalUserPlayInfo interface to convey common information about player status
2021-08-17 16:15:47 +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
081524b6c8
Privatise setters
2021-08-17 13:44:21 +09:00
Salman Ahmed
b419ea716b
Refactor beatmap info wedge to not fully refresh on star difficulty change
...
Makes it look awkward when changing difficulty via mod settings for
example.
Now the changes should instead only affect the displayed components which consume it
directly.
2021-08-17 05:46:06 +03: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
Marvin Schürz
78f9f4a230
Move time clamp to Seek/transformSeekTo methods
2021-08-16 20:39:09 +02:00
Lucas A
a0a9777109
Fix merge conflicts.
2021-08-16 14:50:00 +02:00
Lucas A
1f942d15f8
Localise scoreboard
2021-08-16 13:38:57 +02:00
Lucas A
7bebbf9f74
Mark format strings as verbatim.
2021-08-16 12:46:41 +02:00
Dean Herbert
3ad7688eaf
Merge pull request #14339 from peppy/revert-breaking-config-rename
...
Revert "Rename element in OsuSettings enum"
2021-08-16 19:18:22 +09:00
Dean Herbert
1c7cbc8621
Add missing readonly keyword to new bindable
2021-08-16 17:14:13 +09:00
Dean Herbert
8555a465ac
Merge pull request #14318 from bdach/editor-colours-save
...
Add support for saving edited combo colours and displaying them in composer
2021-08-16 17:07:53 +09:00
Dean Herbert
fc89f2bac4
Revert "Rename element in OsuSettings enum"
...
This reverts commit c2bbe17562
2021-08-16 16:56:48 +09:00
Dean Herbert
8d45f86bd3
Rename variable to better reflect its purpose
2021-08-16 16:48:40 +09:00
Dean Herbert
ae8a1adae8
Allow seeking via Player.Seek even if disabled
2021-08-16 16:47:57 +09:00
Dean Herbert
838bcc51b2
Avoid new bindable requirement
2021-08-16 16:27:19 +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
Salman Ahmed
554b09ac1b
Fix SkinnableTargetsContainer blocked from processing scheduled tasks
2021-08-16 06:57:45 +03: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
cc3468b4ab
apply suggestions
...
- make `UserActivity.InGame` and derive that to `InSoloGame` and `InMultiplayerGame`
- rename `SoloGame` to `InSoloGame`
- rename `MultiplayerGame` to `InMultiplayerGame`
2021-08-16 06:32:33 +08:00
Bartłomiej Dach
6108451449
Retrieve separated skin instance from working beatmap for editing
2021-08-15 21:18:09 +02:00
Bartłomiej Dach
81280dfd25
Use editable skin structure in combo colour picker
2021-08-15 21:18:08 +02:00
Bartłomiej Dach
0d64da8c63
Add skin providing container responding to beatmap skin edits
2021-08-15 21:18:08 +02:00
Bartłomiej Dach
df43e758ee
Add editable beatmap skin
2021-08-15 21:18:07 +02:00
Marvin Schürz
d287db7961
Clamping seekTime to beatmap length
2021-08-15 14:48:56 +02: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
kj415j45
c2bbe17562
Rename element in OsuSettings enum
...
`ShowProgressGraph` -> `ShowDifficultyGraph`
2021-08-14 22:35:15 +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
Dean Herbert
a10ba17b64
Merge pull request #14250 from peppy/leaderboard-limit-player-count
...
Add ability for gameplay leaderboard scroll when too many users are displayed
2021-08-14 14:08:18 +09:00
Bartłomiej Dach
e2cc96097f
Unify match score display formatting
...
Commas are already applied on the multiplayer leaderboard, as well as
the results screen.
2021-08-13 23:57:51 +02:00
Bartłomiej Dach
00317c0e30
Round when totalling up team scores instead of truncating
...
Matches score handling in `ScoreManager`.
2021-08-13 23:44:07 +02:00
Bartłomiej Dach
8f3fedade3
Merge branch 'master' into multiplayer-team-vs-results
2021-08-13 21:30:44 +02:00
smoogipoo
0e66a05963
Hide left border of beatmap wedge
2021-08-13 22:29:22 +09: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
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
