smoogipoo
691e414acb
Add request to add a new playlist item
2021-10-20 21:08:58 +09:00
smoogipoo
67090fc598
Re-namespace enum
2021-10-20 20:52:16 +09:00
smoogipoo
599867a3b1
Add implementation to settings overlay
2021-10-20 20:29:06 +09:00
smoogipoo
0e446105fb
Rename to "picking mode" as simpler english
2021-10-20 17:52:51 +09:00
smoogipoo
bc57190fb4
Make dropdown not move the selection control
2021-10-20 17:52:05 +09:00
smoogipoo
116ce09e49
Merge branch 'master' into multi-queueing-modes
2021-10-20 17:27:25 +09:00
smoogipoo
ea9c070e59
Add setting for queue mode
2021-10-20 14:51:59 +09:00
5ln
3529f34c98
Multi: Hide mods when spectating or Beatmap isn't Locally Available.
...
Signed-off-by: 5ln <xnafumie@gmail.com>
2021-10-18 02:01:50 +08:00
smoogipoo
2fd101ad50
Reorder elements to follow designs
2021-10-15 20:25:32 +09:00
smoogipoo
a70d7e4feb
Remove unnecessary extra GridContainer
2021-10-15 20:18:25 +09:00
Dean Herbert
9d54285b2e
Merge branch 'master' into fix-multiplayer-sounds-during-gameplay
2021-10-14 21:34:04 +09:00
Dean Herbert
06249c4ab2
Fix incorrect usages of Scheduler.AddOnce
2021-10-14 17:52:19 +09:00
Dean Herbert
0d86dab80a
Fix multiplayer components updating when not alive
...
Should close https://github.com/ppy/osu/issues/15092 .
- [ ] Depends on https://github.com/ppy/osu-framework/pull/4826 .
2021-10-14 17:37:10 +09:00
Bartłomiej Dach
f3647eb94e
Recolour room settings screens to match dropdown theming
2021-10-13 22:50:19 +02:00
Dean Herbert
853cf6feaa
Rename last remaining BeatmapInfo Beatmap usage
2021-10-04 17:35:53 +09:00
Dean Herbert
05ca3aec4f
Rename GameplayState to SpectatorGameplayState
2021-10-02 02:10:11 +09:00
smoogipoo
c83dd7d2b6
Merge OnlinePlayComposite and RoomSubScreenComposite
2021-09-29 20:55:20 +09:00
smoogipoo
f9d5abff8a
Update with keybinding changes
2021-09-16 18:26:12 +09:00
Dean Herbert
fa693bb8a8
Move MusicController adjustment set to inside OsuScreen itself (and result nullable)
2021-09-16 16:08:09 +09:00
AbstractQbit
318f0941ca
Move all the "inherit previous AllowTrackAdjustments" logic into OsuScreen
2021-09-15 21:25:39 +03:00
AbstractQbit
b9193aae6d
Make IOsuScreen.AllowTrackAdjustments nullable
...
Allows for inheriting value from the previous screen if undefined
2021-09-14 17:37:57 +03:00
Dean Herbert
7fe0eefb78
Add inline comment regarding team switch sample logic
...
Feels a bit convoluted without this. Don't really have a better
suggestion for now so a comment will do.
2021-09-13 14:12:19 +09:00
Jamie Taylor
217ca754ae
Add sound for team swaps
2021-09-08 13:45:05 +09:00
Dan Balasescu
7be825f470
Merge pull request #14488 from frenzibyte/multi-spectator-player-leaving
...
Gray out and stop player instances who quit during multi-spectator sessions
2021-08-30 12:04:19 +09:00
Dean Herbert
2b06dacd0e
Change debounce back to using scheduler
...
Should better allow for adjusting in the future, as well.
2021-08-27 18:57:19 +09:00
Jamie Taylor
e341f471b0
Add lobby sfx for join/leave/kick/ready/unready events
2021-08-26 15:29:22 +09:00
Salman Ahmed
196c74fce8
Gray out and remove player clock when users stop playing
2021-08-25 11:31:02 +03:00
Salman Ahmed
599145b46a
Stop clocks when removing them from sync manager
2021-08-25 11:31:02 +03:00
Dean Herbert
e1ab3434ed
Add ability to handle user join/leave/kick events in MultiplayerComposites
2021-08-25 14:37:14 +09:00
Bartłomiej Dach
e503182a8d
Merge branch 'master' into activity-on-multiplayer-screens
2021-08-24 18:50:55 +02:00
smoogipoo
16ddbcd208
Don't bind to RoomId where it's expected to be constant
2021-08-24 14:25:40 +09:00
smoogipoo
de0de451fe
Refactor to remove resolved dependency
2021-08-24 13:29:19 +09:00
smoogipoo
df170afbc4
Fix multiplayer crashing when entering gameplay
2021-08-24 13:22:06 +09:00
smoogipoo
956c1cc216
Merge branch 'master' into activity-on-multiplayer-screens
2021-08-24 12:33:34 +09:00
Dean Herbert
eaa4d479ac
Merge pull request #14408 from smoogipoo/remove-current-room
...
Remove the global "selected room" from online screens
2021-08-23 17:29:31 +09:00
Nathan Alo
2877b43824
split multiplayer and playlist activity
2021-08-22 09:54:07 +08:00
Dean Herbert
15d443f6b7
Use the UI mouse cursor when hovering gameplay chat in an interactive state
2021-08-21 14:44:54 +09:00
smoogipoo
f85d3665d8
Cleanups
2021-08-20 21:45:24 +09:00
smoogipoo
610a162271
Merge branch 'master' into remove-current-room
2021-08-20 16:23:36 +09:00
Dan Balasescu
c95bf735fe
Merge branch 'master' into multiplayer-chat
2021-08-20 11:54:42 +09:00
Dean Herbert
b09105e5a7
Merge pull request #14381 from smoogipoo/match-subscreen-redesign
...
Update layout of multiplayer room screens
2021-08-19 19:36:21 +09:00
Dean Herbert
8fce5911a9
Adjust spacing and padding of footer buttons
2021-08-19 19:08:46 +09:00
Dean Herbert
16aecfe934
Start free mod selection area hidden on screen display
2021-08-19 19:02:54 +09:00
Dean Herbert
be77498044
Move chat to right column in multiplayer match screen
2021-08-19 19:02:31 +09:00
Dean Herbert
675e2e34ba
Add padding between beatmap panel and edit button
2021-08-19 19:02:05 +09:00
smoogipoo
493f47787b
Disable condition for the time being
2021-08-19 18:18:42 +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
Dean Herbert
6d00ea3375
Allow toggling focus via binding
2021-08-19 14:19:59 +09: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
smoogipoo
63af67f61b
Cleanup around footers
2021-08-18 20:25:48 +09: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
Dean Herbert
2099298444
Disallow clicking on chat textbox during gameplay
2021-08-18 17:30:50 +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
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
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
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
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
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
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
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
0b76460043
Merge branch 'master' into lounge-redesign
2021-08-09 16:28:28 +09:00
Dean Herbert
7cb743a734
Move font sizing to base class
2021-08-09 16:17:51 +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
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
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
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
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
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
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
