1698 Commits

Author	SHA1	Message	Date
Dean Herbert	a5a7181915	Fix unintentionally broken background update logic	2021-11-04 15:35:32 +09:00
Dean Herbert	a49366ff84	Remove nullability from IBeatmapInfo.Metadata	2021-11-04 14:28:39 +09:00
Dean Herbert	9f9c960fe3	Revert PlaylistItem.APIBeatmap to be private	2021-11-04 13:36:32 +09:00
Dean Herbert	05f1fd4bc9	Remove unnecessary properties and parameters	2021-11-04 13:33:54 +09:00
Dean Herbert	3453160a8b	Change PlaylistItem.Beatmap to be an IBeatmapInfo	2021-11-04 13:16:56 +09:00
Dean Herbert	6fdeb66dc1	Use APIBeatmap instead of BeatmapInfo in playlist display classes where feasible	2021-11-04 11:55:50 +09:00
Bartłomiej Dach	098fa181b4	Fix text flow wrapping incorrectly in multiplayer usages	2021-11-03 18:36:43 +01:00
Bartłomiej Dach	ed00cd9fc5	Remove simple localisable .ToString() calls	2021-11-02 21:42:02 +01:00
Bartłomiej Dach	ad98ab0a26	Fix drawable room playlist item assuming single sprite text	2021-11-02 21:42:02 +01:00
Bartłomiej Dach	b95c95527e	Accept LocalisableStrings in LinkFlowContainer	2021-11-02 21:42:01 +01:00
Dean Herbert	6efd3d3115	Don't perform background difficulty calculation for multiplayer panels ... There are cases these are shown in a long list. They shouldn't be running calculations.	2021-11-03 03:12:52 +09:00
smoogipoo	3db199292f	Fix queue mode not passed from room to settings overlay	2021-11-01 18:52:57 +09:00
smoogipoo	65b920e4c1	Merge branch 'master' into multi-queueing-modes	2021-11-01 18:37:16 +09:00
Dean Herbert	123b10f647	Fix playlist item download button being clickable when it shouldn't	2021-11-01 15:10:32 +09:00
smoogipoo	e667ef4eea	Add basic tests	2021-10-29 15:44:48 +09:00
Dean Herbert	414d920ca2	Revert to previous exposure of RoomSubScreen.BeatmapAvailability	2021-10-29 12:02:10 +09:00
Dean Herbert	b252b176d4	Seal implementation and add comment about LoadComplete execution order	2021-10-29 11:59:07 +09:00
Dean Herbert	3b095e1626	Merge branch 'master' into beatmap-refactor/download-tracker	2021-10-29 11:50:54 +09:00
smoogipoo	f076b72fbe	Merge branch 'master' into multi-queueing-modes	2021-10-29 10:48:16 +09:00
Dean Herbert	6f5040722a	Merge branch 'master' into beatmap-refactor/uncontested	2021-10-28 16:37:26 +09:00
Dean Herbert	a9208838a9	Merge pull request #15307 from peppy/playlist-remaining-attempt-display ... Show remaining attempts again on playlist screen	2021-10-28 05:28:20 +09:00
Dean Herbert	746d6a4c16	Fix some oversights and test failures	2021-10-27 23:42:27 +09:00
Dean Herbert	f014ceaead	Update remaining usages of download tracking	2021-10-27 21:00:46 +09:00
Dean Herbert	f268363924	Update UpdateableBeatmapBackgroundSprite to accept IBeatmapInfo	2021-10-27 16:38:48 +09:00
Dean Herbert	6944151486	Apply batch fixing of built-in types using var	2021-10-27 13:04:41 +09:00
Dean Herbert	c15bfb2cf4	Handle bindable changes to fix new playlist creation not showing correct details	2021-10-26 18:19:05 +09:00
Dean Herbert	42d8d4fd38	Add tooltips to start button to explain why it's not clickable	2021-10-26 18:06:08 +09:00
Dean Herbert	1c578f285a	Disable playlist start button when attempts have been exhausted	2021-10-26 18:06:08 +09:00
Dean Herbert	bffd9162ba	Tint attempt count red when no attempts remain	2021-10-26 18:06:08 +09:00
Dean Herbert	708d40931b	Add back remaining attempt display on playlist room screen	2021-10-26 18:06:08 +09:00
Dean Herbert	ea55ba7ba9	Remove unused using statement	2021-10-26 16:08:21 +09:00
Dean Herbert	6c38028d06	Fix gameplay chat display not losing focus on escape key press ... Closes #15293.	2021-10-26 13:55:08 +09:00
Dan Balasescu	c6ca0e5895	Merge branch 'master' into fix-password-popover-focus	2021-10-22 22:52:46 +09:00
smoogipoo	04b0529a7f	Fix list overflowing subscreen background	2021-10-22 22:17:26 +09:00
smoogipoo	d7a98097a1	Make DrawableRoomPlaylist handle expired items	2021-10-22 21:04:52 +09:00
smoogipoo	95ab82fb58	Remove BeatmapSelectionControl and inline at usage sites	2021-10-22 19:41:36 +09:00
Dean Herbert	90477e3788	Remove unused BeatmapTypeInfo class ... Helps reduce the scope of upcoming changes.	2021-10-22 19:13:50 +09:00
smoogipoo	db87e42d47	Remove beatmap/ruleset/etc from MultiplayerRoomSettings	2021-10-22 16:48:28 +09:00
Dean Herbert	c580ec865f	APIBeatmapSet.Covers is never null	2021-10-21 19:34:01 +09:00
Dean Herbert	69e7810dad	Enable nullable and switch classes to structs	2021-10-21 18:54:36 +09:00
smoogipoo	f41cf822b0	Rename request	2021-10-21 17:02:11 +09:00
Dean Herbert	0706ad70fb	Move BeatmapSetOnlineInfo to an interface type	2021-10-21 16:58:42 +09:00
Bartłomiej Dach	9ad9465020	Remove online-screen-local textbox recolours	2021-10-20 22:49:25 +02:00
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
Dean Herbert	480dc57102	Schedule joinFailed callback for added safety	2021-10-19 15:54:12 +09:00
Dean Herbert	da524261c0	Fix focus potentially being transferred too far up when password is being verified	2021-10-19 15:53:29 +09:00
Dean Herbert	a589964dc7	Centralise join logic	2021-10-19 15:53:29 +09:00
Dean Herbert	8944b1dd78	Add basic test coverage of DrawableLoungeRoom	2021-10-19 15:36:27 +09:00
Dean Herbert	473459d191	Add layout duration to PasswordEntryPopover to make error text look a bit smoother	2021-10-19 15:36:27 +09:00
Dean Herbert	d35fe5493a	Change default value of DrawableLoungeRoom.matchingFilter so they display by default	2021-10-19 15:36:27 +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	d2115824fa	Merge branch 'master' into dropdown-refresh	2021-10-13 23:53:14 +02:00
Bartłomiej Dach	f3647eb94e	Recolour room settings screens to match dropdown theming	2021-10-13 22:50:19 +02:00
smoogipoo	fdf7142711	Remove Room.Position	2021-10-13 21:24:54 +09:00
Dan Balasescu	4bbff2ebf7	Merge branch 'master' into new-interfaces	2021-10-06 11:38:17 +09:00
Dean Herbert	d3b9660148	Move common interface implementations to extension methods	2021-10-05 14:41:14 +09:00
Dean Herbert	b41fa41c85	Rename APIRequest.Result to Response	2021-10-05 14:28:56 +09:00
Dean Herbert	853cf6feaa	Rename last remaining BeatmapInfo Beatmap usage	2021-10-04 17:35:53 +09:00
Dan Balasescu	aa1bfc16d2	Merge pull request #14929 from peppy/gameplay-state ... Replace `GameplayBeatmap` with `GameplayState`	2021-10-04 15:56:44 +09:00
Bartłomiej Dach	017756cbca	Use Torus alternates on online play screens as per design	2021-10-04 00:26:41 +02:00
Dean Herbert	05ca3aec4f	Rename GameplayState to SpectatorGameplayState	2021-10-02 02:10:11 +09:00
smoogipoo	816018edb7	Move hosted by text into nullcheck	2021-09-30 12:04:30 +09:00
smoogipoo	202a602d2f	Change default status to "ready to play"	2021-09-30 12:03:44 +09:00
smoogipoo	ea30445efc	Remove verbatim string	2021-09-30 12:03:34 +09:00
smoogipoo	619a907c47	Fix zero height grid	2021-09-30 12:01:26 +09:00
smoogipoo	56b3c8aa9a	Remove forgotten text	2021-09-30 11:52:14 +09:00
smoogipoo	c83dd7d2b6	Merge OnlinePlayComposite and RoomSubScreenComposite	2021-09-29 20:55:20 +09:00
smoogipoo	c9c2d20544	Limit max size	2021-09-29 20:44:38 +09:00
smoogipoo	67d847fbd3	Add room status text to DrawableRoom	2021-09-29 20:24:49 +09:00
smoogipoo	5f921c7836	Change SelectedItem to show the last item by default	2021-09-29 20:24:32 +09:00
smoogipoo	d89577b2e7	Add host to DrawableRoomParticipantsList	2021-09-29 19:34:40 +09:00
smoogipoo	73ee82ee2b	Rename RecentParticipantsList -> DrawableRoomParticipantsList	2021-09-29 19:15:58 +09:00
Jamie Taylor	f868feae44	Remove unnecessary Schedule	2021-09-17 21:12:39 +09:00
Jamie Taylor	9485323a13	Add audio feedback for incorrect MP room password	2021-09-17 20:52:13 +09:00
Dean Herbert	027912d4f6	Refocus the multiplayer password entry textbox on failed join	2021-09-17 18:25:25 +09:00
Dean Herbert	f524e913e1	Move AllowTrackAdjustments specification to RoomSubScreen	2021-09-17 13:24:01 +09:00
Dean Herbert	cd4ba71a6b	Revert "Merge pull request #14772 from Joehuu/lounge-disallow-track-adj" ... This reverts commit 06ff4838fb, reversing changes made to 5453ea0ce9.	2021-09-17 13:22:39 +09:00
Joseph Madamba	55feb47e61	Disallow track adjustments on playlists / multi lounge	2021-09-16 20:17:21 -07: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
Dean Herbert	931e873a7e	Merge branch 'master' into inheritable-allow-track-adjust	2021-09-15 22:26:13 +09:00
AbstractQbit	f0439ef50b	Remove unnecessary AllowTrackAdjustments overrides, add true to SongSelect	2021-09-15 13:12:57 +03:00
Dean Herbert	8acfefed1b	Merge pull request #14741 from smoogipoo/fix-lounge-beatmaps-counter ... Fix incorrect beatmap count and SR range in multi lounge	2021-09-15 18:51:52 +09:00
smoogipoo	f54d554d30	Extract removal to method	2021-09-15 17:03:28 +09:00
Bartłomiej Dach	7b9e501fa0	Merge branch 'master' into 14421-multi-password-error-handling	2021-09-14 22:58:20 +02: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
smoogipoo	a775915338	Fix incorrect beatmap count and SR range in multi lounge	2021-09-14 18:20:28 +09:00
Dean Herbert	5058f28504	Remove breaking padding	2021-09-14 14:52:50 +09:00
Dean Herbert	8865e3cab8	Add back shake and tweak transform of text	2021-09-14 14:44:32 +09:00
Dean Herbert	7bd749d0eb	Remove weird shaking	2021-09-14 14:19:55 +09:00
Dean Herbert	e3c56f9ebd	Show error message in popover	2021-09-14 14:14:06 +09:00
Dean Herbert	eaac2bad3d	Fix incorrect child margin specifications	2021-09-14 13:49:02 +09:00
Dan Balasescu	f6c4bbe2c9	Merge pull request #14730 from peppy/add-missing-track-adjustment-defaults ... Add missing screen level mod application settings for some screens	2021-09-13 15:22:22 +09:00
Dean Herbert	f9c82a9098	Merge pull request #14676 from nekodex/lobby-team-swap ... Add sound for multiplayer team swaps	2021-09-13 15:01:58 +09:00
Dean Herbert	caf7ef6519	Add missing screen level mod application settings for some screens ... Closes #7480. But based on discussion in there this solution may change.	2021-09-13 15:00:34 +09: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
sh0ckR6	447001931c	Resolve LoungeSubScreen from PasswordEntryPopover ... This is preferred over passing down the already-resolved LoungeSubScreen	2021-09-12 14:36:11 -04:00
sh0ckR6	e018071be4	Remove OnShakeFinish event	2021-09-11 19:50:41 -04:00
sh0ckR6	6cdc842452	Remove placeholder text response ... Weird UX, doesn't feel right compared to the rest of lazer	2021-09-11 17:42:49 -04:00
sh0ckR6	b8a6925175	Use already-resolved LoungeSubScreen instead of nested delegates	2021-09-11 17:41:07 -04:00
Dean Herbert	6fc46792d3	Fix test regressions	2021-09-09 00:39:54 +09:00
Dean Herbert	136573982c	Add fade in and fix incorrect wrapper bounds	2021-09-08 20:52:14 +09:00
Dean Herbert	7941240a00	Revert "Load DrawableLoungRooms asynchronously" ... This reverts commit 0b55bb6913fbf05ebb8ecadfe711084d6797efe0.	2021-09-08 20:52:14 +09:00
Dean Herbert	3e41d8b32e	Reduce initial fade transforms	2021-09-08 20:52:14 +09:00
Dean Herbert	bebb9d7e67	Wrap main content of DrawableRoom	2021-09-08 20:52:14 +09:00
Dean Herbert	037b9cfb59	Load DrawableLoungRooms asynchronously	2021-09-08 20:52:14 +09:00
Jamie Taylor	217ca754ae	Add sound for team swaps	2021-09-08 13:45:05 +09:00
sh0ckR6	b1f91596a7	Give user feedback on password attempt fail ... Shake the popover Set the input box's color to red and set the placeholder text to "incorrect password"	2021-09-07 20:05:24 -04:00
sh0ckR6	b8a1ebb786	Hide Popover after failed password attempt ... Instead of throwing an error, just close the popover and let the user continue	2021-09-07 16:54:21 -04:00
smoogipoo	4658577b1d	Factor in total score calculation time in results screen load	2021-09-07 15:19:09 +09:00
Dean Herbert	9e21f5a59c	Rename LocalPlayer to User in mod select prefixes	2021-09-01 17:22:52 +09:00
Salman Ahmed	6154642075	Merge branch 'master' into local-popover-containers	2021-08-30 15:44:29 +03: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
Bartłomiej Dach	7457480b50	Add local popover container to lounge subscreen	2021-08-28 20:05:58 +02: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	56baecdde4	Add missing interaction sfx to MatchTypePicker	2021-08-26 15:30:20 +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
Dean Herbert	99bb3032a5	Move gradient to be part of the background for now	2021-08-23 15:27:32 +09:00
Dean Herbert	58fb0c042b	Remove background scale altogether ... I'm not sure why this is required. Seems like something which was meant to exist to handle parallax, but that is already handled elsewhere now.	2021-08-23 14:34:27 +09:00
smoogipoo	4f3a5fbad5	Fix test failure	2021-08-23 14:29:15 +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	5192ee3b57	Fix initial display in room background	2021-08-20 21:40:35 +09:00
smoogipoo	5c8ca32ea4	Simplify lounge implementation	2021-08-20 21:33:21 +09:00
smoogipoo	b1a732b9b7	Remove selectedRoom from OnlinePlayScreen	2021-08-20 21:28:48 +09:00
smoogipoo	ceb07826d7	Merge branch 'master' into remove-current-room	2021-08-20 21:10:41 +09:00
smoogipoo	9458cd5a31	Make DrawableMatchRoom background load instantly	2021-08-20 21:07:51 +09:00
smoogipoo	b190020c4b	Block lounge background screen from exiting	2021-08-20 21:02:25 +09:00
smoogipoo	d304e283e4	Don't deselect online room when joined	2021-08-20 18:14:59 +09:00
smoogipoo	c22c6f3a49	Initial room background implementation	2021-08-20 18:14:12 +09:00
smoogipoo	258ba4674c	Fix background overflows	2021-08-20 17:50:49 +09:00
smoogipoo	3d96da84e6	Set a default background	2021-08-20 17:05:46 +09:00
smoogipoo	8524937c82	Move screenstack up a level	2021-08-20 17:02:55 +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	e25592f325	Merge branch 'master' into fix-lounge-loading	2021-08-19 20:01:47 +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
smoogipoo	44e157447c	Initial rework of backgrounds	2021-08-19 19:10:54 +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
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
Dean Herbert	6d00ea3375	Allow toggling focus via binding	2021-08-19 14:19:59 +09: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
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)). Added the assertions to be very explicit about the nested stack's state at this point. Both of those events can only be triggered if the stack has a loaded screen (as far as I can tell), making this check unnecessary in those cases.	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
Dan Balasescu	8037b101cb	Merge branch 'master' into perform-from-subscreen-support	2021-02-22 11:55:51 +09:00
Dan Balasescu	9fc57b2145	Merge pull request #11832 from peppy/leaderboard-compact-mode ... Show compact leaderboard during gameplay to reduce distractions	2021-02-19 18:17:46 +09:00
Dean Herbert	362e4802f7	Add the ability for PerformFromMenuRunner to inspect nested screen stacks	2021-02-19 17:58:04 +09:00
Dean Herbert	b8c1e8ed7a	Merge pull request #11708 from frenzibyte/multiplayer-participant-rank ... Display user global rank for multiplayer room participants	2021-02-19 16:57:30 +09:00
Dean Herbert	9d02f589fe	Compact leaderboard during gameplay	2021-02-19 16:51:39 +09:00
Dean Herbert	484968d797	Fix weird bool check ... Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>	2021-02-19 14:46:10 +09:00
Dean Herbert	4504023a23	Merge branch 'master' into playlists-freemod-support	2021-02-19 14:43:59 +09:00
Dean Herbert	39059ed82d	Remove unnecessary null coalesce check	2021-02-19 14:36:51 +09:00
Dean Herbert	df05c57f44	Merge branch 'master' into playlists-freemod-support	2021-02-19 14:35:20 +09:00
Dean Herbert	a2aec6bcdc	Merge pull request #11808 from smoogipoo/multiplayer-no-playlist-mangling ... Rework multiplayer playlist handling to support multiple items	2021-02-19 14:33:53 +09:00
smoogipoo	bc10fcafae	Remove now unnecessary schedule	2021-02-19 13:23:51 +09:00
Dean Herbert	b68dbbceff	Merge branch 'master' into multiplayer-participant-rank	2021-02-19 13:16:44 +09:00
Salman Ahmed	e14a59f272	Fix creating ruleset instances per LINQ select	2021-02-18 15:26:59 +03:00
smoogipoo	e911760318	Split OnlinePlayComposite to remove if-statement	2021-02-18 15:47:33 +09:00
Dean Herbert	421cdb6650	Consume new method in existing usages (and remove some unnecessary set/unset code)	2021-02-18 15:01:11 +09:00
smoogipoo	6ef235c4c5	Fix beatmap panel flickering multiple times	2021-02-17 21:54:43 +09:00
smoogipoo	2a1bb2f578	Fix selected item potentially changing during gameplay	2021-02-17 21:40:21 +09:00
smoogipoo	8930ff4465	Merge branch 'master' into multiplayer-no-playlist-mangling	2021-02-17 19:29:01 +09:00
smoogipoo	604add04e4	Fix song select mods being reset incorrectly	2021-02-17 19:06:37 +09:00
smoogipoo	70a995919c	Update comments	2021-02-17 17:58:24 +09:00
Dan Balasescu	57ede6eb37	Merge branch 'master' into fix-multiplayer-mod-propagation-race	2021-02-17 16:22:51 +09:00
Dean Herbert	86faa7f465	Merge pull request #11798 from smoogipoo/multiplayer-long-types ... Use long type where required in multiplayer	2021-02-17 15:50:12 +09:00
Salman Ahmed	a845e96b7a	Replace Ranks.Global completely with a GlobalRank property	2021-02-17 08:52:04 +03:00
Salman Ahmed	d7c91a7c6f	Merge branch 'fix-tournament-user-population' into multiplayer-participant-rank	2021-02-17 08:42:59 +03:00
Bartłomiej Dach	8f72631c31	Fix typo in comment	2021-02-16 21:48:19 +01:00
smoogipoo	100097d78f	Fix playlist not being handled correctly for non-joined cases	2021-02-16 21:32:35 +09:00
Dan Balasescu	bef0e5cfa1	Merge pull request #11790 from peppy/playlists-show-remaining-attempts ... Display remaining attempts for playlist rooms with room-level attempt limits	2021-02-16 21:10:19 +09:00
Dan Balasescu	ffa90c1a23	Remove whitespace	2021-02-16 20:23:19 +09:00
Dan Balasescu	8e077c2857	Merge pull request #11791 from peppy/rooms-container-fix-click-deselection ... Add the ability to deselect the currently selected room via clicking away	2021-02-16 20:22:24 +09:00
smoogipoo	379393fe10	Merge branch 'multiplayer-long-types' into multiplayer-no-playlist-mangling	2021-02-16 19:37:55 +09:00
smoogipoo	3e802531d3	Use long type where required in multiplayer	2021-02-16 19:34:01 +09:00
smoogipoo	e24a5949c5	Fix resolve	2021-02-16 19:26:51 +09:00
smoogipoo	2a1096a3c8	Make BeatmapSelectionControl use the selected item	2021-02-16 19:02:16 +09:00
smoogipoo	3ff9e14e35	Make StatefulMultiplayerClient control current playlist item	2021-02-16 18:56:13 +09:00
smoogipoo	855d24dce7	Cache selected item bindable from RoomSubScreen	2021-02-16 17:38:33 +09:00
smoogipoo	f25b5147ef	Select last playlist item in match subscreen	2021-02-16 15:37:45 +09:00
Dean Herbert	fdcb6384cb	Add user mod selection to playlists room screen	2021-02-16 15:14:56 +09:00
Dean Herbert	97a7572cb8	Move UserModSelectOverlay to RoomSubScreen for Playlists consumption	2021-02-16 15:14:48 +09:00
Dean Herbert	fff1cb0b35	Fix allowed mods not being copied when populating playlist items	2021-02-16 15:14:21 +09:00
Dean Herbert	da42c6d282	Expose FreeMods from OnlinePlaySongSelect	2021-02-16 15:14:21 +09:00
Dean Herbert	52e544aa67	Revert "Remove redundant double call to ValueChanged on UserMods change" ... This reverts commit 9ed45ce1ca.	2021-02-16 14:42:31 +09:00
Dean Herbert	9ed45ce1ca	Remove redundant double call to ValueChanged on UserMods change	2021-02-16 14:31:00 +09:00
Dean Herbert	0ca747b39f	Merge branch 'master' into fix-multiplayer-mod-propagation-race	2021-02-16 14:25:27 +09:00
Dean Herbert	31a5cdd8ac	Fix current selection not updating visually after creating a new playlist	2021-02-16 14:02:21 +09:00
Dean Herbert	e969ca8974	Remove unused using statement that rider could not identify	2021-02-16 13:52:42 +09:00
Dean Herbert	e82922f8c5	Add the ability to deselect the currently selected room via clicking away ... Always felt wrong that you couldn't do this until now.	2021-02-16 13:44:37 +09:00
Salman Ahmed	0e7f52b5cc	Always use JSON property global_rank for global ranks instead	2021-02-16 07:33:16 +03:00
Salman Ahmed	5b4999e8af	Update user statistics retrieval with API changes	2021-02-16 07:33:13 +03:00
Dean Herbert	02417697e9	Display remaining attempts for playlist rooms with room-level attempt limits	2021-02-16 13:32:14 +09:00
Salman Ahmed	d15ffff9a5	Simplifiy user statistics retrieval to one-time on deserialization	2021-02-16 04:48:36 +03:00
Salman Ahmed	a1496cd8f3	Remove necessity of using CurrentModeRank as a fallback	2021-02-16 04:48:36 +03:00
Salman Ahmed	90aa6256d7	Merge branch 'master' into multiplayer-participant-rank	2021-02-16 04:44:57 +03:00
Dan Balasescu	6bfc7da671	Fix sample potentially playing at the wrong frequency ... Co-authored-by: Dean Herbert <pe@ppy.sh>	2021-02-15 18:10:45 +09:00
smoogipoo	c6ed3efa4a	Merge branch 'master' into non-concurrent-sample-playback	2021-02-15 14:47:32 +09:00
Joehu	b28a906197	Fix extra mod settings overflowing from screen	2021-02-12 10:29:29 -08:00
Joehu	52975c5185	Remove hardcoded padding from main content	2021-02-12 10:23:33 -08:00
smoogipoo	d3f0c0730d	Merge branch 'master' into non-concurrent-sample-playback	2021-02-12 17:22:15 +09:00
Dean Herbert	889a99c49c	Use AddOnce everywhere to reduce potential call count	2021-02-11 16:00:52 +09:00
Dean Herbert	549e7520c5	Move scheduler logic to client callback rather than inside the update method	2021-02-11 16:00:52 +09:00
Dean Herbert	21f66a19fd	Make server authoritative in which mods the client should be using when gameplay starts	2021-02-11 15:55:18 +09:00
smoogipoo	86682cdb34	Add client/room null check	2021-02-10 20:16:26 +09:00
smoogipoo	6fff7c39da	Ensure tracker is disposed	2021-02-10 20:09:45 +09:00
smoogipoo	822c66033f	Add local-user freemod configuration	2021-02-10 19:56:59 +09:00
Dan Balasescu	92599aa02b	Merge branch 'master' into user-beatmap-downloading-states-2	2021-02-09 21:06:09 +09:00
Salman Ahmed	d101add159	Display user global rank for selected ruleset in participants panel	2021-02-08 21:25:50 +03:00
Dean Herbert	5fbed05d04	Merge pull request #11551 from smoogipoo/fix-leave-room-race-2 ... Fix client potentially not leaving a room on exiting multiplayer	2021-02-08 19:23:14 +09:00
smoogipoo	a08c51f213	Remove duplicate code	2021-02-08 19:23:10 +09:00
Dean Herbert	34a1918d03	Merge branch 'master' into user-beatmap-downloading-states-2	2021-02-06 00:27:55 +09:00
Dean Herbert	dd4207cb4e	Merge pull request #11661 from peppy/playlist-max-room-attempts ... Add support for setting the maximum attempt count for a playlist	2021-02-05 23:40:38 +09:00
Dean Herbert	7f82a06a61	Remove no longer used using directive	2021-02-05 23:08:31 +09:00
Dean Herbert	0679901e4d	Update error handling	2021-02-05 22:53:40 +09:00
Dean Herbert	3ca64a1cb2	Merge branch 'master' into playlist-max-room-attempts	2021-02-05 22:13:13 +09:00
smoogipoo	95ad7ea8f7	Fix mods on participant panels flashing when changed	2021-02-05 18:44:33 +09:00
Dean Herbert	f338fa114b	Merge branch 'master' into user-beatmap-downloading-states-2	2021-02-05 18:02:40 +09:00
Dean Herbert	791cbb7f03	Don't reset ready state if the map is locally available	2021-02-05 17:17:29 +09:00
Dean Herbert	3e750feaa4	Subclass LocalPlayerModSelectOverlay to correctly deselect incompatible mods on free mod selection	2021-02-05 16:42:35 +09:00
Dean Herbert	be91f54349	Add back edge case with comment	2021-02-05 16:19:45 +09:00
Dean Herbert	9ba5ae3db7	Remove lots of unnecessary client side logic	2021-02-05 16:17:02 +09:00
Dean Herbert	1b6a052798	Refactor logic to suck a bit less	2021-02-05 15:46:03 +09:00
Dean Herbert	d1f9aa52a4	Inline variable	2021-02-05 15:33:48 +09:00
Dean Herbert	9e9e382bee	Merge branch 'master' into user-beatmap-downloading-states-2	2021-02-05 15:27:17 +09:00
Dean Herbert	2fc3a97f56	Merge pull request #11516 from frenzibyte/ready-button-clean-up ... Replace ready button beatmap logic with using `MultiplayerBeatmapTracker` instead	2021-02-05 15:09:25 +09:00
Dean Herbert	de8724b1f6	Use AddRangeInternal for simplicity, but disallow ClearInternal for safety	2021-02-05 14:39:25 +09:00
Dean Herbert	fc37d8b7df	Refactor content redirection logic to be easier to parse	2021-02-05 14:25:19 +09:00
Dean Herbert	9258836f10	Merge pull request #11641 from smoogipoo/freemods ... Add support for optional per-user mods in multiplayer (aka freemod)	2021-02-05 13:59:30 +09:00
Salman Ahmed	78ea2d50bb	Merge branch 'master' into ready-button-clean-up	2021-02-05 07:23:11 +03:00
smoogipoo	df2da5950f	Add back vertical spacer	2021-02-05 13:09:13 +09:00
smoogipoo	2e85ce5b82	Rename UserMods -> Mods for MultiplayerRoomUser	2021-02-05 12:40:16 +09:00
Dan Balasescu	a71d6a4c97	Merge branch 'master' into multiplayer-beatmap-tracker	2021-02-05 12:25:36 +09:00
smoogipoo	a2fdba3e51	Rename to OnlinePlayBeatmapAvailabilityTracker	2021-02-05 12:24:38 +09:00
smoogipoo	cf5233c6ab	Merge branch 'master' into freemods	2021-02-05 00:27:14 +09:00
Dean Herbert	f23ca7c7cf	Centralise selection animation logic	2021-02-04 18:10:55 +09:00
Dean Herbert	daf7ab9422	Apply the expected font to the checkbox's label	2021-02-04 16:58:15 +09:00
Dean Herbert	48a58e790e	Don't specify arbitrary width	2021-02-04 16:57:39 +09:00
Bartłomiej Dach	cb87da2bb8	Merge branch 'master' into freemod-select-overlay	2021-02-03 22:19:35 +01:00
Dean Herbert	b06f4ee124	Merge branch 'master' into solo-mod-select-overlay	2021-02-03 23:44:08 +09:00
Dean Herbert	17072a5dda	Merge pull request #11664 from smoogipoo/modselect-dynamic-isvalid ... Make it possible to change IsValidMod in mod selection	2021-02-03 23:43:36 +09:00
Dean Herbert	2a52851e68	Merge branch 'master' into modselect-dynamic-isvalid	2021-02-03 22:11:33 +09:00
Dean Herbert	9d7164816c	Add reverse binding for max attempts (currently unused but good for safety)	2021-02-03 22:02:40 +09:00
Dean Herbert	3fe190cfbe	Show original error message on web exceptions (or is no message is returned)	2021-02-03 22:00:16 +09:00
Dan Balasescu	f24a6178bc	Merge branch 'master' into ongoing-tracker-fix-more	2021-02-03 21:00:45 +09:00
smoogipoo	21d5f842fc	Re-layout to reduce movement	2021-02-03 14:53:55 +09:00
Dan Balasescu	2a4488c11b	Merge branch 'master' into freemods	2021-02-03 14:12:39 +09:00
Bartłomiej Dach	fc84ec1313	Move anchor specification to central place	2021-02-02 22:18:14 +01:00
Bartłomiej Dach	181d2c672b	Fix outdated comment	2021-02-02 22:05:25 +01:00
Bartłomiej Dach	fe7f4f7222	Merge branch 'master' into playlists-item-visual-improvements	2021-02-02 21:26:16 +01:00
Salman Ahmed	50d57a3931	Move tracker loading into BDL	2021-02-02 17:22:48 +03:00
smoogipoo	aeb3ed8bb3	Renamespace footer button	2021-02-02 21:46:22 +09:00
smoogipoo	6453367a9c	Merge branch 'freemod-select-overlay' into freemods	2021-02-02 21:43:35 +09:00
smoogipoo	097ce37e96	Merge branch 'fix-mod-icon' into freemods	2021-02-02 21:37:24 +09:00
smoogipoo	6ff8e8dd37	Disable a few mods by default	2021-02-02 21:29:08 +09:00
smoogipoo	5a56e2ba4b	Fix sound duplication due to checkbox	2021-02-02 21:29:00 +09:00
smoogipoo	643c0605d8	Implement the freemod selection overlay	2021-02-02 21:14:38 +09:00
smoogipoo	e58ece9e10	Make ModSelectOverlay abstract	2021-02-02 21:06:04 +09:00
smoogipoo	10ceddf3ff	Make IsValidMod adjustable	2021-02-02 20:47:50 +09:00
smoogipoo	a2e3b1c0e4	Move Mods reset code to OnlinePlaySongSelect	2021-02-02 19:02:39 +09:00
Dean Herbert	fc3adaf612	Show maximum attempt count in room display (when not unlimited)	2021-02-02 18:45:05 +09:00
Dean Herbert	9b209d67dc	Match size of participants text with host display	2021-02-02 18:45:05 +09:00
Dean Herbert	96d20bf607	Reduce height of ModeTypeInfo to match adjacent text sections	2021-02-02 18:45:05 +09:00
Dean Herbert	90acdd4361	Display the correct error message on score submission failure ... The server will return a valid error message in most cases here. We may eventually want to add some fallback message for cases an error may occur that isn't of [InvariantException](3169b33ccc/app/Exceptions/InvariantException.php (L9-L10)) type, but I'm not 100% sure how to identify these just yet.	2021-02-02 18:45:05 +09:00
Dean Herbert	6fdaf02518	Hook up room-level max attempts to UI	2021-02-02 18:45:05 +09:00
Dean Herbert	40233fb47c	Make font bolder	2021-02-02 17:09:59 +09:00
Dean Herbert	6d9ac4d0f0	Increase darkness of gradient on buttons to make text readability (slightly) better	2021-02-02 16:57:27 +09:00
Dean Herbert	fb52ac8c69	Share remove from playlist button design with adjacent download button	2021-02-02 16:57:08 +09:00
Dean Herbert	bdc05af4b7	Make playlist settings area taller to better match screen aspect ratio	2021-02-02 16:30:45 +09:00
smoogipoo	0bce9d6833	Clear freemods when ruleset is changed	2021-02-02 13:54:58 +09:00
smoogipoo	173e20938c	Revert changes to ModDisplay	2021-02-02 13:49:58 +09:00
smoogipoo	87f9e46b16	Add option to select all	2021-02-02 13:37:25 +09:00
smoogipoo	9c3c0895cf	Hide customise button + multiplier label	2021-02-02 13:36:58 +09:00
smoogipoo	7a14e14e67	Refactor condition ... This won't make any noticeable difference, but is the more correct way to handle MultiMod because flattening works through infinite recursion levels.	2021-02-02 12:54:26 +09:00
smoogipoo	b54f65c282	Exclude more mods from multiplayer	2021-02-02 12:48:15 +09:00
smoogipoo	4cf52077b6	Make checkbox also respond to all mods selected	2021-02-02 11:11:28 +09:00
smoogipoo	97e3023df9	Renamespace/rename MatchSongSelect -> PlaylistsSongSelect	2021-02-01 20:16:58 +09:00
smoogipoo	e5ca9b1e50	Remove usage of removed method	2021-02-01 19:28:33 +09:00
smoogipoo	9c4c47599f	Merge branch 'master' into freemods	2021-02-01 19:28:10 +09:00
smoogipoo	ee92ec0a5c	Disallow local user mod customisation	2021-02-01 18:54:47 +09:00
smoogipoo	89a42d60fb	General cleanup	2021-02-01 18:50:32 +09:00
smoogipoo	3a906a89fc	Pin mod position in participant panels	2021-02-01 18:27:15 +09:00
smoogipoo	51cb288717	Reduce mod selection height	2021-02-01 18:18:59 +09:00
smoogipoo	e134af82f5	Stack freemods for the local user	2021-02-01 18:16:38 +09:00
smoogipoo	3e74f8fd9e	Disable customisation of freemods, move stacking to property	2021-02-01 18:11:20 +09:00
smoogipoo	3cd30d284e	Renamespace	2021-02-01 18:08:49 +09:00
smoogipoo	f538963607	Extra mods -> user mods	2021-02-01 17:57:32 +09:00
smoogipoo	ac2a995041	Add user and panel states	2021-02-01 17:54:56 +09:00
Dean Herbert	1d8de2f718	Rename class to better match purpose	2021-02-01 17:32:54 +09:00
Dean Herbert	c73a05d0b5	Merge branch 'master' into multiplayer-beatmap-tracker	2021-02-01 17:24:24 +09:00
smoogipoo	0909c73ead	Once again disallow DT/etc as allowable mods	2021-02-01 15:07:56 +09:00
smoogipoo	b43e529964	Fix allowed mods being copied into required mods	2021-02-01 15:07:43 +09:00
smoogipoo	426569c2a9	Move common song select implementation for online play	2021-02-01 14:57:39 +09:00
smoogipoo	b846146f16	Update mods when resuming room subscreen	2021-02-01 13:58:44 +09:00
smoogipoo	4ae10b1e1c	Add initial UI for selecting extra mods	2021-02-01 13:40:59 +09:00
smoogipoo	e02e3cf19a	Disallow selecting DT/HT/WU/WD as allowable freemods	2021-02-01 13:35:48 +09:00
smoogipoo	797a810287	Allow unstacking mods	2021-02-01 13:24:56 +09:00
smoogipoo	230b347c1e	Move ModSelectOverlay.IsValidMod to a property	2021-02-01 12:18:11 +09:00
Bartłomiej Dach	90ba8ae234	Don't part room if join task was cancelled	2021-01-30 23:39:01 +01:00
Bartłomiej Dach	5f320cd426	Move lease check inside schedule ... Theoretically safer due to avoiding a potential data race (change in `leasedInProgress` between the time of the check and start of schedule execution).	2021-01-30 21:03:09 +01:00
Bartłomiej Dach	96f56d1c94	Return tracker lease via UnbindAll() ... Improves reliability by being fail-safe in case of multiple returns, which can happen if the operation tracker is part of a screen being exited (as is the case with its current primary usage in multiplayer).	2021-01-30 21:00:13 +01:00
Dean Herbert	a61444690e	Remove all usage of CatchUnobservedExceptions ... This should no longer be required with the recent framework side change that stops a game from crashing on unobserved exceptions (https://github.com/ppy/osu-framework/pull/4171).	2021-01-29 16:32:29 +09:00
smoogipoo	b79d1c7b81	Add mods to footer	2021-01-27 22:33:03 +09:00
smoogipoo	ff8ee379fb	Fix possible nullref	2021-01-27 22:27:31 +09:00
smoogipoo	4c256f1fb3	Actually populate the playlist item	2021-01-27 22:23:38 +09:00
smoogipoo	45e41aaeac	Initial implementation of freemod selection overlay	2021-01-27 22:15:53 +09:00
Dean Herbert	10e8b7082e	Rework logic to avoid custom disposal early return handling	2021-01-25 16:53:58 +09:00
Bartłomiej Dach	d22f557a3b	Remove possibility of double-disposal interference	2021-01-23 16:14:58 +01:00
Bartłomiej Dach	7f89d9117d	Make disposal of tracker idempotent for operations	2021-01-23 16:04:12 +01:00
Bartłomiej Dach	18b309a195	Make disposal of tracker operation idempotent	2021-01-23 16:02:51 +01:00
Dean Herbert	e6980688f6	Leave the multiplayer channel when leaving multiplayer	2021-01-21 15:42:23 +09:00
Dan Balasescu	7da7079ef2	Merge pull request #11537 from Mysfit/mp-initial-creation-screen-fix ... Fix match/playlist room screen showing briefly behind initial room settings window on creation.	2021-01-20 22:05:14 +09:00
Dan Balasescu	455383c3c0	Merge pull request #11528 from peppy/fix-autoplay-in-multiplayer ... Fix multiplayer mod select showing autoplay as a choice	2021-01-20 21:49:16 +09:00
Salman Ahmed	34612ae233	Forward internal management to a container alongside tracker	2021-01-19 20:01:22 +03:00
Mysfit	052e9eef02	Added inline comments	2021-01-19 09:16:39 -05:00
Mysfit	33677f5770	Use BindValueChanged to show main content for new multiplayer and playlist rooms when the settings overlay is hidden.	2021-01-19 08:52:43 -05:00
Mysfit	6d1d488831	Revert "Use the client.RoomUpdated action instead of binding the value of the settings overlay visibility and creating an event from it based on its ValueChanged action." ... This reverts commit cbfb999c28.	2021-01-19 08:24:14 -05:00
Mysfit	9b7187e3c8	Revert "Use fades instead of event listening. Fixed same issue in the playlist room creation." ... This reverts commit 3a7608275d.	2021-01-19 08:23:31 -05:00
smoogipoo	de9d075f94	Initial sample + samplechannel rework	2021-01-19 17:11:40 +09:00
Mysfit	3a7608275d	Use fades instead of event listening. Fixed same issue in the playlist room creation.	2021-01-19 00:35:56 -05:00
Mysfit	cbfb999c28	Use the client.RoomUpdated action instead of binding the value of the settings overlay visibility and creating an event from it based on its ValueChanged action.	2021-01-18 17:13:24 -05:00
Mysfit	5233a0449a	Hide main room subscreen on initial mp room creation. Toggle mp room subscreen visibility based on settings overlay visibility before room is created.	2021-01-18 16:08:06 -05:00
Salman Ahmed	4a1acdece2	Merge branch 'multiplayer-beatmap-tracker' into ready-button-clean-up	2021-01-18 20:06:47 +03:00
Salman Ahmed	dc91cebce9	Merge branch 'master' into multiplayer-beatmap-tracker	2021-01-18 19:15:45 +03:00
Salman Ahmed	e6ceaad732	Revert user state back to idle upon availability change	2021-01-18 17:23:51 +03:00
Dean Herbert	0b165dce4b	Fix multiplayer mod select showing autoplay as a choice	2021-01-18 17:50:32 +09:00
Salman Ahmed	6deb10e075	Add UI state display for each client's beatmap availability	2021-01-18 11:10:02 +03:00
Salman Ahmed	4e6c1a3906	Update client beatmap availability in-line with tracker	2021-01-18 10:51:39 +03:00
Salman Ahmed	585aa87c53	Fix playlist item download button never shown back after hiding	2021-01-17 19:17:14 +03:00
Dean Herbert	5fd644fc57	Unify variable names	2021-01-17 22:42:48 +09:00
Dean Herbert	edb6d3907b	Merge pull request #11472 from frenzibyte/explicit-beatmap-markers ... Add explicit content markers to beatmap panels and overlay	2021-01-17 21:44:10 +09:00
Salman Ahmed	59ae50b0e5	Clean up ready button logic into using MultiplayerBeatmapTracker	2021-01-17 01:11:03 +03:00
Salman Ahmed	cf23781036	Cache beatmap tracker and bind to selected item in RoomSubScreen	2021-01-17 00:01:11 +03:00
Dan Balasescu	67b5ebadf5	Merge branch 'master' into fix-is-connected-thread-safety	2021-01-15 12:56:21 +09:00
Dan Balasescu	3e8732a59f	Merge branch 'master' into fix-participants-list	2021-01-14 21:30:53 +09:00
Salman Ahmed	1502b07ea8	Add explicit pill to playlist items	2021-01-13 12:27:15 +03:00
Bartłomiej Dach	2d3cacca11	Fix non-hosts crashing on load requested ... `onLoadRequested()` always released the `readyClickOperation` ongoing operation, without checking whether it actually needs to/should (it should only do so if the action initiating the operation was starting the game by the host). This would crash all other consumers, who already released the operation when their ready-up operation completed server side. To resolve, relax the constraint such that the operation can be ended multiple times in any order. At the end of the day the thing that matters is that the operation is done and the ready button is unblocked.	2021-01-13 00:58:53 +01:00
Dean Herbert	7298adc9d9	Fix non-threadsafe usage of MultiplayerClient.IsConnected	2021-01-12 19:04:16 +09:00
Dean Herbert	b51b07c3a9	Fix unstable multiplayer room ordering when selection is made	2021-01-12 18:05:29 +09:00
Dean Herbert	422260797b	Revert polling changes to fix participant list display ... It turns out this polling was necessary to get extra data that isn't included in the main listing request. It was removed deemed useless, and in order to fix the order of rooms changing when selecting a room. Weirdly, I can't reproduce this happening any more, and on close inspection of the code can't see how it could happen in the first place. For now, let's revert this change and iterate from there, if/when the same issue arises again. I've discussed avoiding this second poll by potentially including more data (just `user_id`s?) in the main listing request, but not 100% sure on this - even if the returned data is minimal it's an extra join server-side, which could cause performance issues for large numbers of rooms.	2021-01-12 17:26:00 +09:00
Bartłomiej Dach	8c3955d341	Improve safety of ongoing operation tracker ... Finishing an operation started via `OngoingOperationTracker.BeginOperation()` was risky in cases where the operation ended at a callback on another thread (which, in the case of multiplayer, is *most* cases). In particular, if any consumer registered a callback that mutates transforms when the operation ends, it would result in crashes after the framework-side safety checks. Rework `OngoingOperationTracker` into an always-present component residing in the drawable hierarchy, and ensure that the `operationInProgress` bindable is always updated on the update thread. This way consumers don't have to add local schedules in multiple places.	2021-01-09 22:45:24 +01:00
Dean Herbert	b69fe8a274	Merge branch 'master' into disable-repeat-multi-actions	2021-01-09 10:15:20 +09:00
Bartłomiej Dach	c2eeb822b8	Rename {joiningRoom -> operationInProgress}	2021-01-08 22:23:38 +01:00
Bartłomiej Dach	dad5dd3667	Remove unnecessary permissiveness wrt null	2021-01-08 22:21:54 +01:00
Dean Herbert	edd328c8fe	Move bindable closer to source class	2021-01-08 17:24:55 +09:00
Bartłomiej Dach	52687fc37c	Merge branch 'master' into fix-transform-mutation-loading-layer	2021-01-05 23:10:51 +01:00
Dean Herbert	54982dcdd7	Refactor LoadingLayer to avoid applying effects to external drawables ... In theory this seemed like a good idea (and an optimisation in some cases, due to lower fill rate), but in practice this leads to weird edge cases. This aims to do away with the operations on external drawables by applying a dim to the area behind the `LoadingLayer` when required. I went over each usage and ensured they look as good or better than previously. The specific bad usage here was the restoration of the colour on dispose (if the `LoadingLayer` was disposed in a still-visible state). I'm aware that the `BeatmapListingOverlay` will now dim completely during load. I think this is fine for the time being.	2021-01-05 17:31:45 +09:00
Dean Herbert	ed6ffe2ef1	Remove hacky code	2021-01-05 14:54:59 +09:00
Dean Herbert	deb1ad7bca	Merge branch 'master' into disable-repeat-multi-actions	2021-01-04 23:38:29 +09:00
Salman Ahmed	485a57776b	Fix hasBeatmap potentially checking on outdated DeletePending value	2021-01-04 10:28:41 +03:00
Salman Ahmed	ea38b00b29	Schedule all calls to updateBeatmapState()	2021-01-04 10:27:08 +03:00
Salman Ahmed	445a4bd01c	Re-query beatmap info on database changes	2021-01-04 09:00:16 +03:00
Bartłomiej Dach	7d9a61fbc1	Handle unobserved exceptions from ready button properly	2020-12-31 11:57:13 +01:00
Bartłomiej Dach	f800448c87	Move game start logic to a higher level	2020-12-30 18:15:48 +01:00
Bartłomiej Dach	d34609b98e	Rename On{ToggleReady -> ReadyClick}	2020-12-30 16:29:36 +01:00
Bartłomiej Dach	59f2017a13	Move BindValueChanged subscriptions to LoadComplete	2020-12-30 16:22:11 +01:00
Bartłomiej Dach	05f212eb3c	Merge branch 'master' into remove-multiplayer-selection-poller	2020-12-29 12:51:33 +01:00
Bartłomiej Dach	cafa241ef3	Fix ready-up button getting stuck if server operation fails	2020-12-29 09:44:30 +01:00
Bartłomiej Dach	e9b0652359	Move ready-up operation logic again to client ... To salvage ready up button tests.	2020-12-29 09:16:02 +01:00
Dean Herbert	906a9b79b5	Show an error when forcefully exiting online play due to API failure	2020-12-29 16:47:36 +09:00
Bartłomiej Dach	db52255bbe	Adjust tracker usages to match new API	2020-12-29 08:20:43 +01:00
Bartłomiej Dach	f59ba799d3	Adjust operation tracker implementation	2020-12-29 07:54:27 +01:00
Bartłomiej Dach	9ff2140232	Move ready-up logic to match sub-screen	2020-12-29 07:52:15 +01:00
Bartłomiej Dach	903dca875e	Make localUser a client property	2020-12-29 07:46:22 +01:00
Bartłomiej Dach	f68e4fc88f	Merge branch 'master' into disable-repeat-multi-actions	2020-12-29 07:42:20 +01:00
Dean Herbert	45c578b857	Remove selection polling from multiplayer ... Looks like this was just copy-paste without any thought into whether it should exist. It really shouldn't exist. This is a thing for the playlists system because the *whole system* there relies on polling the web API to get updated information. In the case of mutliplayer, we hand off all communications to the realtime server at the point of joining the rooms. The argument that this was there to do faster polling on the selection isn't valid since the polling times were the same for both cases. Closes #11348.	2020-12-29 15:10:09 +09:00
Dean Herbert	e3a41f6118	Rename variable to make more sense ... It needs to be explicitly stated that the users in this list are related to the *joined* room. Especially since it's sharing its variable name with `SpectatorStreamingClient` where it has the opposite meaning (is a list of *globally* playing players).	2020-12-29 14:27:35 +09:00
Bartłomiej Dach	540dec2e7c	Allow null tracker in lounge screen for tests	2020-12-28 22:54:52 +01:00
Bartłomiej Dach	6dc0f6af50	Disable setting apply button for duration of operation	2020-12-28 22:48:03 +01:00
Bartłomiej Dach	af66e45311	Disable create room button after triggering join	2020-12-28 22:48:03 +01:00
Bartłomiej Dach	47ab7c9fd6	Disable ready button after host click	2020-12-28 22:48:03 +01:00
Bartłomiej Dach	9e6994166c	Add helper to track ongoing operations in UI	2020-12-28 22:48:03 +01:00
Bartłomiej Dach	a014d0ec18	Use PlayingUsers when constructing player directly	2020-12-28 19:27:56 +01:00
Dean Herbert	2e88036f39	Merge pull request #11342 from bdach/fix-beatmap-not-reverting ... Fix user changes in multi song select not reverting on exit without confirmation	2020-12-28 21:56:07 +09:00
Bartłomiej Dach	f16b516e58	Revert user changes if no selection was made	2020-12-28 12:35:17 +01:00
Dean Herbert	046a76cb1d	Allow null users to still be displayed in the participant list ... The fix here is correcting the access of `user.Country`. The deicision to have null users display is because this is the best we can do (if osu-web could not resolve the user). We still want the users in the lobby to be aware of this user's presence, rather than hiding them from view. osu-stable does a similar thing, showing these users as `[Loading]`. I decided to go with blank names instead because having *any* text there causes confusion. We can iterate on this in future design updates.	2020-12-28 15:03:44 +09:00
Dean Herbert	fe1bbb1cac	Don't fail if the local user is not present in room users when updating ready button state	2020-12-26 10:49:22 +09:00
Dean Herbert	f9900720d5	Rename OnRoomChanged to OnRoomUpdated to avoid confusion	2020-12-26 10:49:02 +09:00
Bartłomiej Dach	2e4b1b95c2	Rename {Multiplayer -> OnlinePlay}BackgroundSprite	2020-12-25 18:07:34 +01:00
Bartłomiej Dach	ed4b8482b6	Rename {Multiplayer -> OnlinePlay}Composite	2020-12-25 18:07:34 +01:00
Bartłomiej Dach	4c43a67b68	Rename I{Multiplayer -> OnlinePlay}SubScreen	2020-12-25 18:07:34 +01:00
Bartłomiej Dach	e5064ee930	Rename {Multiplayer -> OnlinePlay}SubScreen	2020-12-25 17:02:35 +01:00
Bartłomiej Dach	eb0f125fef	Rename {Multiplayer -> OnlinePlay}SubScreenStack	2020-12-25 17:00:31 +01:00
Bartłomiej Dach	4caf75850b	Rename {Multiplayer -> OnlinePlay}Screen	2020-12-25 17:00:00 +01:00
Bartłomiej Dach	83fb7c7a1a	Re-namespace all files in OnlinePlay directory	2020-12-25 16:50:09 +01:00
Bartłomiej Dach	e797e5ce7a	Rename Multi directory to OnlinePlay	2020-12-25 16:50:02 +01:00