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
Dean Herbert
54abf8f6f6
Vertically centre leaderboard for now
2021-05-03 14:48:04 +09:00
Dean Herbert
b1a19b6dd6
Add xmldoc for PlayerIsolationContainer
2021-05-03 14:41:55 +09:00
Dean Herbert
2aa21e2aff
Adjust documentation in CatchUpSyncManager
2021-05-03 14:37:11 +09:00
Dean Herbert
c065092e72
Fix weird access to userIds in MultiplayerSpectatorScreen
2021-05-03 14:25:52 +09:00
Dean Herbert
dc5ee31d94
Use switch for screen construction
2021-05-03 14:04:20 +09:00
Dean Herbert
66ae6e58d1
Reword comment regarding LoadRequested special case to be easier to understand context
2021-05-03 14:01:10 +09:00
Dean Herbert
6da4105da6
Remove Sync namespace (feels unnecessary)
2021-05-03 13:38:53 +09:00
smoogipoo
630a6dc46a
Fix missing dependency
2021-04-26 22:23:44 +09:00
smoogipoo
ed93e26e52
Use single method for starting/restarting spectator screen
2021-04-26 21:56:15 +09:00
smoogipoo
7e11d520d5
Remove finished players from multi spectator screen
2021-04-26 21:25:46 +09:00
smoogipoo
94d0b06493
Expose mute adjustment instead
2021-04-26 19:01:30 +09:00
smoogipoo
d7618b63fa
Fix test failure
2021-04-26 17:35:13 +09:00
smoogipoo
6626e70c95
Pass in master clock instead of slave clock
2021-04-26 17:30:27 +09:00
smoogipoo
5b4cb71cc7
Change terminology from "slave" to "player clock"
2021-04-26 17:19:44 +09:00
Dean Herbert
aa99c192d0
Fix type in inline comment
2021-04-26 16:21:12 +09:00
smoogipoo
63a9484255
Expose WaitingOnFrames as mutable bindable
2021-04-23 19:11:47 +09:00
smoogipoo
575ec7c528
Document + refactor max player limitation
2021-04-23 19:11:35 +09:00
smoogipoo
90ecda91af
Fix exception
2021-04-23 00:06:54 +09:00
smoogipoo
4f0857f946
Xmldocs and general refactorings
2021-04-22 23:52:22 +09:00
smoogipoo
ee25949751
Rename classes
2021-04-22 23:39:02 +09:00
smoogipoo
8a0ba3a055
Merge GameplayIsolationContainer into PlayerInstance, remove track
2021-04-22 23:38:51 +09:00
smoogipoo
4aceb75eb2
Disable spectate button on closed rooms
...
Doesn't have an effect normally - only for safety purposes in case we
allow entering the match subscreen after a match has finished in the
future.
2021-04-22 23:37:45 +09:00
smoogipoo
fd0b030cf4
Refactor gameplay screen creation
2021-04-22 23:37:33 +09:00
smoogipoo
64579d50ac
Use only single PlayerInstance for hit sample playback
2021-04-22 22:59:47 +09:00
smoogipoo
6588859c32
Remove loggings
2021-04-22 22:29:18 +09:00
smoogipoo
1ca2152e61
Privatise + rename to SlaveGameplayClockContainer
2021-04-21 23:22:36 +09:00
smoogipoo
2bea625613
Fix initial playback states not being correct
2021-04-21 23:22:11 +09:00
smoogipoo
f32d00c0d9
Fix post-merge errors
2021-04-21 17:13:01 +09:00
smoogipoo
ef3801b5dd
Add helper method supporting RomanisableString
2021-04-19 15:29:26 +09:00
PercyDan54
488001d570
Support SpriteText for LinkFlowContainer
2021-04-18 20:58:08 +08:00
PercyDan54
646403b826
Fix CI errors
2021-04-18 10:54:42 +08:00
PercyDan54
1339c126a4
Remove unused using
2021-04-18 09:54:50 +08:00
PercyDan54
cfaaf2e83e
Add ToRomanisableString()
2021-04-18 09:52:25 +08:00
PercyDan54
512cec3458
Use unicode for playlists
2021-04-18 00:10:01 +08:00
smoogipoo
724fe3d378
Remove unnecessary method
2021-04-16 22:57:34 +09:00
smoogipoo
72ebcb157f
Dispose track on dispose
2021-04-16 22:57:27 +09:00
smoogipoo
4c5d4752b1
Rename classes to reduce redundant naming
2021-04-16 22:47:52 +09:00
smoogipoo
7d5d7088cd
Remove now unnecessary override
2021-04-16 20:51:07 +09:00
smoogipoo
65a6f9f8a4
Merge branch 'fix-initial-spectator-state-callback' into multiplayer-spectator-screen
2021-04-16 18:26:46 +09:00
Christine Chen
b15838b220
Move storyboard outro logic to DrawableStoryboard
2021-04-16 00:59:10 -04:00
smoogipoo
1c086d99de
Add loading spinner
2021-04-16 13:28:32 +09:00
smoogipoo
5ac0eb02cd
Always add player instances at first, populate later
2021-04-16 12:25:29 +09:00
Christine Chen
45c2b72a25
Merge branch 'master' into play-storyboard-outro
2021-04-15 15:11:35 -04:00
Christine Chen
25b8c2f257
Allow skipping storyboard outro
...
Reuses SkipOverlay by calculating the endtime of the storyboard and using that as a "start point". Upon skipping the outro the score is instantly shown.
When the end of the storyboard is reached the score screen automatically shows up. If the player holds ESC (pause) during the outro, the score is displayed
The storyboard endtime is calculated by getting the latest endtime of the storyboard's elements, or simply returning 0 if there is no storyboard.
Co-Authored-By: Marlina José <marlina@umich.edu>
2021-04-15 13:20:40 -04:00
smoogipoo
b391a8f94e
Properly bind WaitingOnFrames
2021-04-15 19:37:45 +09:00
smoogipoo
33cc5c5cb3
A few more xmldocs
2021-04-15 19:35:57 +09:00
smoogipoo
82fcabb8f0
More refactorings/renamespacings/xmldocs
2021-04-15 19:32:55 +09:00
smoogipoo
df4fce2c57
Rename classes
2021-04-15 19:16:00 +09:00
smoogipoo
1705d472b5
Reimplement multiplayer syncing using new master/slave clocks
2021-04-15 19:12:52 +09:00
smoogipoo
33ad7850cb
Remove LastFrameTime
2021-04-15 16:45:59 +09:00
smoogipoo
6fc7488a67
Reimplement syncing logic as a new component
2021-04-15 16:33:59 +09:00
smoogipoo
774cca38c4
Make spectating instances use custom GCC
2021-04-14 20:39:14 +09:00
smoogipoo
69b01e7270
Add some debugging
2021-04-14 00:58:03 +09:00
smoogipoo
77830527e7
Fix spectate button being disabled during play
2021-04-13 23:57:16 +09:00
smoogipoo
d49b90877e
Fix operation remaining in progress
2021-04-13 23:21:48 +09:00
smoogipoo
3039b7b0f9
Make tests a bit more resilient
2021-04-13 22:40:24 +09:00
smoogipoo
20823abb30
Make resyncing a bit more resilient
2021-04-13 22:10:35 +09:00
smoogipoo
627dd960b0
Disable player input for now
2021-04-13 20:52:20 +09:00
smoogipoo
5b53a2b211
Merge branch 'master' into multiplayer-spectator-screen
2021-04-13 20:07:56 +09:00
Dean Herbert
2c1f20a38f
Merge branch 'master' into fix-editor-alt-scroll
2021-04-13 19:36:25 +09:00
Dean Herbert
2884ed3ab9
Merge pull request #12350 from smoogipoo/multiplayer-spectator-player-grid
...
Add the multiplayer spectator player grid
2021-04-13 19:25:32 +09:00
smoogipoo
c531e38a36
Rework to create a derived tracked user data instead
2021-04-12 22:00:27 +09:00
Dean Herbert
0eab9daf13
Update existing overlay containers to not block scroll input
2021-04-12 16:41:36 +09:00
Dean Herbert
dd1925aaed
Remove temporary input ignore
2021-04-12 14:29:27 +09:00
Dean Herbert
9be3163592
Merge branch 'master' into multiplayer-spectator-player-grid
2021-04-12 14:14:13 +09:00
smoogipoo
4409c1a36f
Increase sync offset to prevent constant catchups
2021-04-09 22:01:21 +09:00
smoogipoo
6eddc6c59e
Enable spectating multiplayer matches
2021-04-09 21:03:50 +09:00
smoogipoo
3e46d6401e
Remove some unnecessary code
2021-04-09 20:23:11 +09:00
smoogipoo
eccd269cce
Implement maximum start delay
2021-04-09 20:17:57 +09:00
smoogipoo
49b7519c53
Refactor gameplay starting logic
2021-04-09 20:03:34 +09:00
smoogipoo
c93ce73123
Move catchup logic inside PlayerInstance, fixup some edge cases
2021-04-09 19:59:34 +09:00
smoogipoo
f8dfb9544b
Merge branch 'multiplayer-spectator-leaderboard' into multiplayer-spectator-screen
2021-04-09 18:42:04 +09:00
smoogipoo
d2c37e6cf8
Remove unnecessary parameter
2021-04-09 18:41:58 +09:00
smoogipoo
4fa51d5ec8
Add leaderboard to multiplayer spectate screen
2021-04-09 18:41:48 +09:00
smoogipoo
950e4e05ef
Merge branch 'multiplayer-spectator-leaderboard' into multiplayer-spectator-screen
2021-04-09 18:30:21 +09:00
smoogipoo
90e243eea5
Rename methods
2021-04-09 18:15:27 +09:00
smoogipoo
3b86f0eb2f
Fix exception with 0 frames
2021-04-09 18:15:23 +09:00
smoogipoo
bb15baf118
Add initial multiplayer spectator leaderboard
2021-04-09 17:31:14 +09:00
smoogipoo
ecd0b84d94
Use max_sync_offset constant
2021-04-08 22:15:07 +09:00
smoogipoo
1b5679b0d7
Refactor ctor
2021-04-08 22:14:26 +09:00
smoogipoo
7d276144b8
Fix player sizing + masking
2021-04-08 22:13:54 +09:00
smoogipoo
709016f0d6
Add initial multiplayer screen implementation
2021-04-08 22:07:00 +09:00
smoogipoo
d64b236f86
Add a container that provides an isolated gameplay context
2021-04-08 21:27:16 +09:00
smoogipoo
125358158b
Merge branch 'master' into multiplayer-spectator-screen
2021-04-08 21:13:37 +09:00
smoogipoo
fd2a14a0bf
Only set button state once
2021-04-08 16:31:40 +09:00
Dean Herbert
a55e62188e
Change state icon to binoculars so the eye isn't staring at me
2021-04-08 15:54:58 +09:00
Dean Herbert
b73860cb5f
Slightly alter button colour scheme to make text more legible and reduce saturation
2021-04-08 15:47:55 +09:00
smoogipoo
72a42ceaf7
Merge branch 'multiplayer-spectator-player-grid' into multiplayer-spectator-screen
2021-04-08 00:19:00 +09:00
smoogipoo
5dc939c2f3
More documentation
2021-04-08 00:12:21 +09:00
smoogipoo
024adb699c
Add test and fix several issues
2021-04-08 00:12:21 +09:00
smoogipoo
648a9d5258
Add multiplayer spectator player grid
2021-04-08 00:12:21 +09:00
smoogipoo
99bee73ac1
Merge branch 'master' into add-spectate-button-and-state
2021-04-07 22:07:52 +09:00
smoogipoo
93c5935ebc
Add match subscreen support + test
2021-04-07 20:46:30 +09:00
smoogipoo
abd637ffaa
Add button to footer
2021-04-07 17:35:18 +09:00
smoogipoo
56c13148f1
Fix typo in class name
2021-04-07 16:45:10 +09:00
smoogipoo
c744f77cfa
Add participant panel state
2021-04-07 16:40:24 +09:00
smoogipoo
6be9c9f0f4
Link up ready button to spectate state
2021-04-07 16:35:50 +09:00
smoogipoo
6de91d7b6b
Add spectate button + test
2021-04-06 21:37:27 +09:00
Dean Herbert
6a4157d193
Remove unused using statement
2021-03-26 16:13:43 +09:00
Dean Herbert
7faca766e4
Fix crash on attempting to join lobby using key press during a pending join
...
Closes https://github.com/ppy/osu/issues/12040 .
2021-03-26 14:49:05 +09:00
Dean Herbert
84b2f9a848
Make token private
2021-03-24 13:20:44 +09:00
Dean Herbert
3cd8bf2d7f
Move token request construction to LoadAsyncComplete to better allow DI usage
2021-03-23 18:20:55 +09:00
Dean Herbert
571124669d
Remove all references to "score submission" from Player
2021-03-23 18:20:55 +09:00
Dean Herbert
12f050264a
Further split out a player class which submits to "rooms"
2021-03-23 18:20:55 +09:00
Dean Herbert
7045fce555
Move score submission logic in general out to its own Player type
2021-03-23 18:20:55 +09:00
Dean Herbert
9c690f9545
Fix second usage
2021-03-23 14:08:00 +09:00
Dean Herbert
b1cd01ceb8
Apply ConfigureAwait changes to game side
2021-03-08 14:36:35 +09:00
Dean Herbert
23a46819dc
Merge branch 'master' into multiplayer-confirm-on-exit
2021-03-03 20:35:31 +09:00
Dean Herbert
0f5bce70ad
Split confirmation dialog classes apart
2021-03-03 20:34:37 +09:00
Dean Herbert
0ede28da2f
Fix test failures due to missing dependency
2021-03-03 15:24:55 +09:00
Dean Herbert
cb4c3503a0
Confirm exiting a multiplayer match
2021-03-03 14:54:18 +09:00
Dean Herbert
d332fd2414
Handle case where local user tries to change beatmap while not the host
2021-03-03 14:53:47 +09:00
Dean Herbert
36e1fb6da8
Add flow to allow MatchSubScreen to handle beatmap presentation locally
2021-03-03 14:13:51 +09:00
Dean Herbert
90e8308716
Merge branch 'master' into localisation-refactor-framework
2021-02-25 17:28:55 +09:00
Dean Herbert
e82eaffaed
Flip order back to original for romanisable strings
2021-02-25 14:14:07 +09:00
Dean Herbert
8a97e2e28d
Update LocalisedString usages to RomanisedString
2021-02-22 19:01:42 +09:00
Dean Herbert
1fd76ea3fb
Apply changes to UI components overriding functions with changing signatures
2021-02-22 19:01:42 +09:00
smoogipoo
ccb83ef3a3
Fix checkbox not being updated
2021-02-22 15:47:47 +09:00
smoogipoo
8d463987dd
Fix being able to select incompatible freemods
2021-02-22 13:24:24 +09:00
