806 Commits

Author	SHA1	Message	Date
Dean Herbert	052ad79fc6	Convert dangerous events to IBindables	2020-05-19 16:44:22 +09:00
smoogipoo	3ee698cfa0	Fix being able to press enter to create matches	2020-05-19 12:39:09 +09:00
Dean Herbert	9b9b710ded	Move and rename remaining direct classes	2020-04-21 16:41:07 +09:00
Endrik Tombak	633b969017	Apply review suggestions	2020-04-12 21:57:35 +03:00
Endrik Tombak	fc1d497a86	Change PlaylistDownloadButton default	2020-04-11 14:21:28 +03:00
Dean Herbert	e10576325c	Merge branch 'master' into update-overlay-headers	2020-04-09 16:29:34 +09:00
Joehu	493b654011	Remove horizontal margin from mod display ... Can skew center alignment on fill flow containers. Fixes affected areas. Vector2(5, 0) is similar to MarginPadding { Left = 10 }.	2020-04-03 11:30:02 -07:00
TheWildTree	83410315c6	Make fields private	2020-03-26 17:18:01 +01:00
TheWildTree	9a30ff5a00	Fix code quality issues	2020-03-26 16:11:58 +01:00
TheWildTree	e85f45f911	Move old ScreenTitle to MultiHeaderTitle	2020-03-24 22:03:16 +01:00
smoogipoo	1c4296f5e7	Implement the new results screen	2020-03-17 17:43:16 +09:00
Dean Herbert	288470c313	Remove exo specification completely	2020-03-13 13:43:48 +09:00
Dean Herbert	ed837d3115	Use framework extension method for FromHex	2020-03-11 10:18:41 +09:00
Dean Herbert	dc79c11b6a	Merge branch 'master' into layout-rework	2020-03-02 16:36:48 +09:00
smoogipoo	b3220476d7	Rename methods	2020-02-27 20:05:12 +09:00
smoogipoo	085968dd7f	Rename recent participants	2020-02-27 20:00:53 +09:00
smoogipoo	22862256c1	Increase time between polls	2020-02-27 19:42:19 +09:00
smoogipoo	fe10a64137	Improve participants list transforms	2020-02-27 19:37:07 +09:00
smoogipoo	97c07281d8	Make ParticipantsList use the new participants property	2020-02-27 19:24:13 +09:00
smoogipoo	99442ec9c3	Implement single-room multiplayer room polling	2020-02-27 19:23:50 +09:00
smoogipoo	7ad6ad0bb0	Remove hacks that bypassed layout shortcomings	2020-02-27 13:32:23 +09:00
Dean Herbert	623b78d675	Combine all loading animation implementations	2020-02-21 15:32:46 +09:00
Dean Herbert	3380dbbd71	Improve visual appearance of ProcessingOverlay	2020-02-20 19:49:22 +09:00
Dean Herbert	4a3f281855	Make buttons purple	2020-02-20 18:56:14 +09:00
Dean Herbert	a0b578082e	Make ready button also have triangles	2020-02-20 18:56:00 +09:00
Dean Herbert	e7fca689b1	Change text on playlist add button to be nicer	2020-02-20 18:56:00 +09:00
Dean Herbert	76c57a695b	Change create room button colouring to match design	2020-02-20 18:56:00 +09:00
Dean Herbert	a94a6eb94e	Merge pull request #7900 from smoogipoo/room-inspector-redesign ... Update the multiplayer room inspector design	2020-02-20 18:55:03 +09:00
Dean Herbert	973093b522	Fix non-selectable playlist items not forwarding clicks to children	2020-02-20 18:32:34 +09:00
Dean Herbert	063fe191ef	Add back missing using	2020-02-20 18:15:40 +09:00
Dean Herbert	e25e9b6164	Merge branch 'master' into multiplayer-header-background	2020-02-20 18:04:02 +09:00
Dean Herbert	a11862ba0d	Improve transition between multiplayer screens (and share constants)	2020-02-20 18:03:53 +09:00
Dean Herbert	927115a085	Merge branch 'master' into room-inspector-redesign	2020-02-20 17:41:16 +09:00
smoogipoo	17b669fdf7	Refactor to detail the sizing mode setting	2020-02-20 14:32:16 +09:00
Dan Balasescu	51f03d0f07	Adjust comment ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-02-20 14:28:38 +09:00
smoogipoo	f53349ac9d	Reduce size of participants tiles	2020-02-19 19:54:48 +09:00
smoogipoo	3338241632	Add back filter control background, adjust opacity	2020-02-19 19:48:34 +09:00
smoogipoo	e966689044	Add beatmap background to multiplayer	2020-02-19 19:42:25 +09:00
smoogipoo	ac416ae743	Implement new room inspector redesign	2020-02-19 17:47:59 +09:00
smoogipoo	ec73e8f0c7	Allow different sizing modes for OverlinedParticipants	2020-02-19 17:40:38 +09:00
smoogipoo	380d200b46	Allow different sizing modes for OverlinedDisplay	2020-02-19 17:34:47 +09:00
smoogipoo	e3d37b808d	Move overlined displays to a higher namespace	2020-02-19 17:33:09 +09:00
smoogipoo	958c891d15	Update with framework-side bindable list changes	2020-02-17 15:06:14 +09:00
Dean Herbert	a51fdfb95e	Merge pull request #7839 from smoogipoo/match-subscreen-redesign ... Redesign match subscreen to add playlist support	2020-02-15 21:11:39 +09:00
Dean Herbert	a8be437103	Fix failing tests	2020-02-15 20:29:38 +09:00
recapitalverb	2778c6617c	Merge branch 'master' into remove-duplicated-load	2020-02-15 15:13:35 +07:00
Dean Herbert	2e24ceb223	Move duration higher in match settings display	2020-02-15 16:58:35 +09:00
Dean Herbert	7c29327167	Fix download button being visible for already downloaded playlist items	2020-02-15 16:56:11 +09:00
Dean Herbert	e8f1335b47	Allow for easier selection by disabling clickability of contained elements until selected	2020-02-15 16:54:37 +09:00
Dean Herbert	e2e157b455	Add minimum size rules to fix overlap at non-wide resolutions	2020-02-15 15:52:27 +09:00
Dean Herbert	19d61c1255	Merge branch 'master' into match-subscreen-redesign	2020-02-15 15:29:33 +09:00
Dean Herbert	f54844d8a5	Schedule selection update handling in MatchSubScreen to avoid firing when not the current screen	2020-02-15 15:07:10 +09:00
recapitalverb	7c9569c9a3	Merge branch 'master' into remove-duplicated-load	2020-02-15 12:10:34 +07:00
Dean Herbert	a4215106ff	Merge branch 'master' into match-detail-area	2020-02-15 11:46:29 +09:00
smoogipoo	3b2e4ecb2d	Merge branch 'match-playlist' into match-subscreen-redesign	2020-02-14 23:40:04 +09:00
smoogipoo	61d539dc67	Fix first playlist item not getting selected	2020-02-14 23:39:39 +09:00
recapitalverb	c753cb46c5	Use [Resolved] wherever possible	2020-02-14 20:14:00 +07:00
smoogipoo	9eaf372587	Immediately update selected state	2020-02-14 21:17:07 +09:00
smoogipoo	b92f1ad68d	Implement match subscreen re-design	2020-02-14 20:48:09 +09:00
smoogipoo	2ea8c47c83	Fix incorrect footer button size	2020-02-14 20:44:41 +09:00
smoogipoo	b762e5e8a5	Implement overlined components	2020-02-14 20:42:14 +09:00
smoogipoo	929eb4f035	Add match footer	2020-02-14 20:35:52 +09:00
smoogipoo	d0b7b7f53a	Re-layout match settings overlay	2020-02-14 20:34:15 +09:00
smoogipoo	d5496321e2	Implement leaderboard chat display	2020-02-14 20:31:55 +09:00
smoogipoo	c75a774297	Extract participants list from the room inspector	2020-02-14 20:27:37 +09:00
smoogipoo	80fd9485a9	Refactor ready button to support selected playlist item	2020-02-14 20:18:53 +09:00
smoogipoo	c0dba63278	Remove match info	2020-02-14 20:14:25 +09:00
smoogipoo	b0793b06ed	Re-implement the match header	2020-02-14 20:10:36 +09:00
smoogipoo	5ec9f454d5	Implement the match beatmap detail area	2020-02-14 17:20:38 +09:00
smoogipoo	aceba8791c	Clean up selection handling	2020-02-14 16:56:44 +09:00
smoogipoo	afd3e4604b	Fix race condition causing selection to be reset incorrectly	2020-02-14 16:48:23 +09:00
smoogipoo	1909ea2bd3	Add a way to hide the drag handle	2020-02-14 16:09:19 +09:00
smoogipoo	5e871f9838	Make room playlist use the common rearrangeable design	2020-02-14 15:36:47 +09:00
smoogipoo	eb14dbcd77	Initial implementation of rearrangeable playlist	2020-02-14 15:01:45 +09:00
Dean Herbert	4a04b434a9	Merge branch 'master' into remove-current-item	2020-02-13 21:41:23 +09:00
Dean Herbert	28ca1a5bcc	Merge branch 'master' into participants-bindable	2020-02-13 19:31:50 +09:00
smoogipoo	bce9c8f3f3	Make room participants into a bindable list	2020-02-13 18:59:15 +09:00
smoogipoo	75bef15583	Remove "current" multiplayer room item	2020-02-13 18:48:28 +09:00
smoogipoo	91edadfe9d	Make playlist beatmap and ruleset into bindables	2020-02-13 18:12:47 +09:00
Dean Herbert	fd71a53717	Fix test regression	2020-02-06 14:28:09 +09:00
Dean Herbert	a84386ba01	Merge branch 'simplify-mp-subscreen-disables' into lounge-ruleset-filtering	2020-02-06 14:22:52 +09:00
Dean Herbert	81cadb7875	Simplify the way multiple subscreens handle their disable states via a custom stack	2020-02-06 14:22:01 +09:00
Dean Herbert	114fd967c1	Revert "Remove leasing at a Multiplayer screen level" ... This reverts commit 304a071e39.	2020-02-06 13:47:34 +09:00
Dean Herbert	e548a4b8dd	Fix missing bind causing regression in filter	2020-02-06 13:36:49 +09:00
Dean Herbert	061b8c389f	Fix null search string causing an exception	2020-02-06 13:03:04 +09:00
Dean Herbert	1dc7fc4a33	Fix case where playlist is empty	2020-02-06 13:01:48 +09:00
Dean Herbert	a79d6ff27a	Change transition to better handle mass filter cases	2020-02-06 12:17:20 +09:00
Dean Herbert	304a071e39	Remove leasing at a Multiplayer screen level	2020-02-06 12:17:20 +09:00
Dean Herbert	50c4e34c92	Add ruleset to multiplayer filter criteria	2020-02-06 12:17:20 +09:00
Dean Herbert	00edc7e66f	Fix RoomsContainer test scene not displaying	2020-02-06 12:14:17 +09:00
recapitalverb	9898a926b2	Use ScoreInfo.DisplayAccuracy everywhere	2020-02-03 22:11:36 +07:00
Dean Herbert	19f516e710	Ensure OsuScreen level leases are taken out synchronously	2020-01-31 19:10:44 +09:00
smoogipoo	76af8bea5d	Fix percentage-formatted displays containing a space	2020-01-29 19:51:24 +09:00
Dean Herbert	36224dca13	Fix multiplayer aggregate score inheriting from ScoreInfo	2019-12-05 01:45:28 +09:00
Huo Yaoyuan	818553027b	Merge branch 'master' into sharpen	2019-11-21 23:42:46 +08:00
Dean Herbert	2325f0382c	Cancel a potentially pending filter update when an update occurs	2019-11-21 13:46:45 +09:00
smoogipoo	0cbe29dbec	Refactor / cleanup debouncing	2019-11-21 11:05:18 +09:00
smoogipoo	10287eb66d	Add debounce logic in several places	2019-11-15 17:58:47 +09:00
smoogipoo	1b4bcb81c8	Fix filtering breaking on secondary filters	2019-11-15 17:49:02 +09:00
smoogipoo	f0b7b2e1c4	Fix broken test case	2019-11-15 11:07:16 +09:00
smoogipoo	956fb9912d	Hook up multiplayer search filter	2019-11-15 08:23:56 +09:00
Huo Yaoyuan	f3f5094c26	Convert delegate to local function.	2019-11-12 20:14:22 +08:00
Huo Yaoyuan	ccc8aa6fa4	Apply brace style.	2019-11-11 20:13:13 +08:00
Dean Herbert	5127b52c25	Merge remote-tracking branch 'upstream/master' into game-handles-links	2019-11-03 13:04:18 +09:00
Dean Herbert	898520935e	Move link handling code to OsuGame ... This allows for future calls from arguments / associations	2019-11-01 11:40:51 +09:00
Dean Herbert	5b405abc52	Schedule forcefullyExit call for safety ... Screen state may have changed at an inopportune moment. Run on local scheduler, not API scheduler to avoid any weirdness.	2019-10-31 13:43:25 +09:00
Dean Herbert	32dabf80a6	Ensure forceful exit completely exits from mutliplayer ... Previously it may have gotten blocked by being in a sub screen.	2019-10-31 13:42:28 +09:00
smoogipoo	f56d9fe50c	Forcefully part room when multiplayer exits	2019-10-30 14:42:14 +09:00
smoogipoo	b6457f0ce9	Cancel room joins on part	2019-10-30 14:41:54 +09:00
smoogipoo	95ff48c123	Don't log cancelled join requests	2019-10-30 14:38:06 +09:00
Joehu	5f700f2ae9	Simplify exit logic of screens with textboxes using back button receptor	2019-10-01 08:26:34 -07:00
Dean Herbert	48716f8f2b	Update framework	2019-08-21 13:29:50 +09:00
smoogipoo	e356cc8d9e	Refactor MatchBeatmapPanel for thread safety	2019-08-13 17:57:16 +09:00
smoogipoo	7c9c9f1ce1	Simplify caching	2019-08-13 17:38:21 +09:00
smoogipoo	92c2dafa12	Tighten accessibility	2019-08-13 17:34:16 +09:00
smoogipoo	6b57c9801d	Cull some unnecessary whitespace	2019-08-13 17:32:43 +09:00
Andrei Zavatski	982066dfdf	Convert to method group	2019-08-12 10:38:34 +03:00
Andrei Zavatski	cb910a6518	Replace if/else statement	2019-08-12 10:02:45 +03:00
Andrei Zavatski	5b68a2f34a	Rename trackManager to previewTrackManager	2019-08-12 09:50:49 +03:00
Andrei Zavatski	520924b440	Don't create a new request if onlineId is null	2019-08-12 09:45:21 +03:00
Andrei Zavatski	9ab132520c	Testcase improvements	2019-08-08 12:25:46 +03:00
Andrei Zavatski	e9b5c91690	Fade out existing panel on beatmap change	2019-08-08 12:08:51 +03:00
Andrei Zavatski	08a92c38d7	adjust naming	2019-08-08 12:04:44 +03:00
Andrei Zavatski	1b559c1585	Use async loading	2019-08-08 12:01:33 +03:00
Dean Herbert	a3dbaef4ca	Adjust background gradient	2019-08-08 17:29:50 +09:00
Andrei Zavatski	8668bce25d	Fix preview can be played on start	2019-08-08 09:52:42 +03:00
Andrei Zavatski	cbcdc28900	Fix hard crash when clicking on a preview button	2019-08-08 09:04:24 +03:00
Andrei Zavatski	a4459972b6	Remove ViewBeatmapButton	2019-08-08 07:15:30 +03:00
Andrei Zavatski	ffed642929	Implement MatchBeatmapPanel	2019-08-08 07:08:51 +03:00
Joehu	0082695cd8	Choose default category sorting instead of being always first	2019-08-02 13:22:58 -07:00
David Zhao	26fc782de9	Don't exit if screenstack is null	2019-07-29 10:35:51 +09:00
Dean Herbert	e76b3e2b40	User property instead of method	2019-07-21 10:42:40 +09:00
iiSaLMaN	842417cf42	Check if selected scope requires API	2019-07-21 03:07:27 +03:00
Dean Herbert	c34f6180e6	Merge branch 'master' into generic-download-model-manager	2019-06-26 20:37:56 +09:00
Dan Balasescu	f06aabad5f	Merge branch 'master' into toolbar-rulesets-refactor	2019-06-26 18:33:45 +09:00
Dean Herbert	9e1cb90dd8	Remove existing argument for ItemAdded event ... For all usages, it looks like this was unnecessary.	2019-06-26 11:40:41 +09:00
smoogipoo	531b107a98	Exit match before exiting multiplayer	2019-06-25 18:33:26 +09:00
Andrei Zavatski	9dedd62d9a	Revert a hotfix in multi screen ... since it's been fixed in a framework	2019-06-24 22:57:18 +03:00
Andrei Zavatski	35516e7304	Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor	2019-06-24 22:52:24 +03:00
smoogipoo	8d6fc3edf0	Fix multiplayer create button appearing in match song selection	2019-06-24 11:54:41 +09:00
Andrei Zavatski	bbdb114f04	Add missing blank line	2019-06-24 02:09:00 +03:00
Andrei Zavatski	94e819578e	Finally fix the problem when we can't apply a ruleset in the multi screen ... because it's disabled	2019-06-24 01:55:35 +03:00
Dan Balasescu	c79c4641f3	Merge branch 'master' into use-modelbackeddrawable	2019-06-21 14:26:07 +09:00
Dean Herbert	6426983de0	Move logic out of update (and simplify, hopefully)	2019-06-19 13:15:58 +09:00
KingLuigi4932	fec0db8fe1	Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar	2019-06-17 21:55:07 +03:00
KingLuigi4932	d665f1fe4b	Seperate drawable and updateable flag from Country + Use UpdateableFlag	2019-06-17 20:57:57 +03:00
smoogipoo	c1d2fff651	Use RestartPoint	2019-06-17 12:44:19 +09:00
smoogipoo	bc35a30a25	Fix audio being dimmed during multiplayer	2019-06-17 12:27:53 +09:00
Dean Herbert	bc574520bf	Update ScrollContainer usages in line with framework changes	2019-06-14 15:55:32 +09:00
smoogipoo	cea353975f	Update with further framework-side changes	2019-06-04 11:04:28 +09:00
Dean Herbert	4ca34bd5e8	Update osu! in line with audio subsystem refactor	2019-05-28 17:06:01 +09:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
smoogipoo	f26a1cff6c	Fix beatmap import crashing during room creation	2019-05-07 12:14:57 +09:00
Dean Herbert	6bdaca1e3b	Fix mod equality checks not working as intended	2019-05-03 10:09:47 +09:00
Dean Herbert	fa340a9eff	Merge branch 'master' into profile-header-update	2019-04-27 23:48:23 +09:00
Dean Herbert	d40177f97c	Merge branch 'master' into drawnode-composability	2019-04-27 18:41:19 +09:00
smoogipoo	3b0d4c1bad	Merge branch 'turn-on-warnings' into profile-header-update	2019-04-25 17:43:10 +09:00
smoogipoo	0bd35ab7bb	Turn on warnings, resolve issues	2019-04-25 17:36:17 +09:00
Joehu	0838206ddd	Shorten multiplayer header to multi	2019-04-22 22:44:43 -07:00
smoogipoo	414d555484	Fix possible exit from non-current screen	2019-04-22 19:24:57 +09:00
smoogipoo	0222424aef	Make mods IReadOnlyList<Mod> gamewide ... Prevents potential multiple evaluations of enumerable.	2019-04-10 17:20:36 +09:00
smoogipoo	4310f07a5c	Rename SelectedMods -> Mods	2019-04-10 12:03:57 +09:00
jorolf	c1db635933	Merge branch 'master' of git://github.com/ppy/osu into profile-header-update	2019-04-09 20:42:39 +02:00
smoogipoo	56496d28ba	Reset mods when exiting match	2019-04-09 12:59:32 +09:00
smoogipoo	cbb3fdaca8	Fix various crashes due to bindable being disabled	2019-04-09 12:59:32 +09:00
smoogipoo	c584967eb1	Remove mods from workingbeatmap	2019-04-09 12:59:32 +09:00
smoogipoo	772bef91fa	Merge remote-tracking branch 'Joehuu/master' into drawnode-composability ... # Conflicts: # osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs	2019-04-08 23:01:12 +09:00
smoogipoo	15fbb6f176	Use common AddUserLink method	2019-04-05 14:15:36 +09:00
jorolf	ccc804a9b2	get everything working again	2019-04-04 00:24:42 +02:00
Dean Herbert	f1952c0816	Update font awesome usage	2019-04-02 19:55:24 +09:00
smoogipoo	a56e29347f	Adjust namespaces	2019-04-02 14:51:28 +09:00
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
Dean Herbert	de47e0a8e8	Merge remote-tracking branch 'upstream/master' into screen-title-class	2019-03-29 14:01:08 +09:00
Dean Herbert	2f5668f4e7	Fix remaining framework changes	2019-03-29 00:29:14 +09:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Dean Herbert	9a6576c0a1	Merge remote-tracking branch 'upstream/master' into multi-background-stack	2019-03-25 12:40:31 +09:00
Dean Herbert	9a11a08acc	Update textbox usages	2019-03-23 02:00:27 +09:00
jorolf	7873022a8b	Merge branch 'master' of git://github.com/ppy/osu into screen-title-class	2019-03-21 22:18:59 +01:00
jorolf	454c82c49e	Don't go outside of the container bounds	2019-03-21 22:18:45 +01:00
Dean Herbert	acbcca4462	Merge branch 'master' into multi-background-stack	2019-03-20 19:11:27 +09:00
Dean Herbert	baea7230bc	Rename RulesetContainer to DrawableRuleset	2019-03-19 23:47:31 +09:00
Dean Herbert	392a0a1d74	Merge branch 'master' into update-framework	2019-03-18 11:34:59 +09:00
Dean Herbert	c496f6e56b	Fix usages of OnLoadComplete	2019-03-17 13:44:20 +09:00
Dean Herbert	f0114d776d	Use interface to access API ... Allows for better testability.	2019-03-13 12:58:18 +09:00
jorolf	f91e4a1fdd	make ScreenTitle abstract and properties protected	2019-03-11 19:10:37 +01:00
jorolf	f3ab5070b9	apply suggestions	2019-03-11 18:37:36 +01:00
David Zhao	63b9fa58ef	Cleanup	2019-03-11 19:52:28 +09:00
David Zhao	6a1e600099	Create new OsuScreenStack for use in Multiplayer	2019-03-11 19:48:07 +09:00
David Zhao	aeae6143c1	Remove unnecessary variable	2019-03-11 17:47:03 +09:00
David Zhao	0b64af5e02	Put multiplayer background inside a parallax container	2019-03-11 16:51:43 +09:00
David Zhao	0d95511222	Merge branch 'master' into multi-background-stack	2019-03-11 11:19:08 +09:00
David Zhao	2df57c3a29	Give Multiplayer its own background stack	2019-03-11 11:08:04 +09:00
Joehu	0fc6fa7245	Fix file naming on ParticipantCountDisplay	2019-03-09 20:29:56 -08:00
jorolf	af1c54d995	add ScreenTitle class	2019-03-08 23:44:01 +01:00
Jamie Taylor	c34e110a2c	Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel	2019-03-07 17:01:24 +09:00
Jamie Taylor	50c1b3a576	Move room resetting logic from MatchSubScreen to LoungeSubScreen	2019-03-07 16:49:48 +09:00
Jamie Taylor	ee076bbbe3	Fix chat channel ids not being updated on room creation	2019-03-07 15:35:57 +09:00
Jamie Taylor	6e5ea78ca2	Fix some nullref crashes when escaping out of new room creation	2019-03-06 20:03:37 +09:00
Jamie Taylor	5de6e29294	Reset currentRoom state when cancelling room creation	2019-03-06 20:03:37 +09:00
David Zhao	89987210c3	Merge remote-tracking branch 'upstream/master' into LobbyList	2019-03-05 18:59:38 +09:00
David Zhao	34b2553b95	Remove redundant boolean	2019-03-05 18:59:25 +09:00
Dan Balasescu	fd147dae21	Merge branch 'master' into fix-disabled-set-crash	2019-03-05 17:25:13 +09:00
David Zhao	166a8c8bbb	Add back fallback behavior for match creation	2019-03-05 16:41:59 +09:00
David Zhao	11e353c152	Use local class instead of having a separate file	2019-03-05 15:55:37 +09:00
David Zhao	aecbc31ffa	Use BeatmapSetCoverType.List for lobby listing	2019-03-05 12:08:14 +09:00
Dan Balasescu	a37445a938	Merge branch 'master' into better-mp-songselect-deletion-handling	2019-02-28 17:35:08 +09:00
smoogipoo	921346d303	Rename a few more members	2019-02-28 17:27:28 +09:00
Jamie Taylor	4c8aa65200	private + renaming	2019-02-28 17:02:45 +09:00
Dan Balasescu	3a1066ff02	Merge branch 'master' into toquantity-1	2019-02-28 15:57:51 +09:00
Jamie Taylor	cf2feec7df	Fix multiplayer enabled mods check	2019-02-28 15:02:22 +09:00
Joehu	2241e1af9d	Use ToQuantity for words with number prefixes	2019-02-27 21:55:45 -08:00
Dean Herbert	0788a7e9f1	Merge branch 'master' into more-inspections	2019-02-28 14:32:57 +09:00
Dean Herbert	42be7857d1	Use expression body for property get/set where possible	2019-02-28 13:58:19 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
Jamie Taylor	c59d84fd21	Add sanity check to prevent TimeshiftPlayer from starting with incorrect beatmap/ruleset/mods	2019-02-27 16:21:14 +09:00
Jamie Taylor	7c2ffb1826	Fix MatchSongSelect not handling beatmapset deletions	2019-02-27 14:34:39 +09:00
Dean Herbert	80737b9ef8	Remove "silent" parameter; consolidate import logic	2019-02-25 18:24:06 +09:00
Dean Herbert	367bc53a06	Revert some more instances of 'e' variable names	2019-02-22 20:15:25 +09:00
Dean Herbert	3015d40f8f	Merge branch 'master' into osu-fontusage	2019-02-22 18:09:23 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +09:00
Dean Herbert	452caabd40	Apply suggestions from code review ... Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>	2019-02-22 17:06:49 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
smoogipoo	4db5531e4b	Replace copy-constructor/method with extension method	2019-02-20 19:32:30 +09:00
smoogipoo	dbfa95b9e7	Made medium the default font weight	2019-02-20 16:52:36 +09:00
smoogipoo	0693ab8e7d	Merge remote-tracking branch 'origin/master' into osu-fontusage ... # Conflicts: # osu.Game/Screens/Multi/Components/BeatmapTitle.cs	2019-02-20 15:04:08 +09:00
smoogipoo	a2aa3ec5cb	Adjust sprite texts in-line with framework changes	2019-02-20 15:03:20 +09:00
smoogipoo	134840f118	Fix nullref	2019-02-16 11:18:17 +09:00
Dean Herbert	1373e0fad0	Fix BeatmapTitle not always displaying	2019-02-13 14:57:40 +09:00
Dean Herbert	d5cce850a8	Revert some unnecessary complications in logo logic	2019-02-12 13:29:41 +09:00
Dean Herbert	272584eb79	Improve file layouts	2019-02-12 13:02:33 +09:00
Dean Herbert	78b47f9fe3	Fix starting matches not working	2019-02-12 11:19:42 +09:00
Dean Herbert	e4422167b6	Fix starting gameplay	2019-02-11 19:13:57 +09:00
Dean Herbert	88ffc78103	Restructure	2019-02-11 19:11:34 +09:00
Dean Herbert	e2e615cc5c	Merge branch 'master' into leased-bindables-dont-work	2019-02-11 16:30:12 +09:00
Dean Herbert	a30d3739cf	Merge remote-tracking branch 'upstream/master' into cmc-rooms	2019-02-08 18:45:39 +09:00
Dean Herbert	f52cac966b	Fix multiple blank lines	2019-02-08 18:45:32 +09:00
Dean Herbert	6c4d289901	Pass item rather than ID	2019-02-08 18:33:49 +09:00
Dan Balasescu	7ec0b4ba77	Fix nullref during room creation (#4228)	2019-02-08 17:53:01 +09:00
Dan Balasescu	959b1ac845	Fix potential nullref when exiting multiplayer (#4227) ... Fixes https://github.com/ppy/osu/issues/3954	2019-02-08 17:28:00 +09:00
smoogipoo	febcd7d7c0	Remove currentRoom from RoomManager	2019-02-08 15:46:16 +09:00
smoogipoo	5643dc2e99	Remove redundant qualifiers	2019-02-08 15:44:05 +09:00
smoogipoo	6fe1f57236	Fix crash when start button is repeatedly pressed	2019-02-08 15:39:11 +09:00
smoogipoo	99a7ccc01a	Slight cleanup in multiplayer	2019-02-08 15:38:05 +09:00
smoogipoo	43240ea85e	Fix playlist issues with room creation	2019-02-08 15:23:03 +09:00
smoogipoo	42cd55e0d7	Move current room to multiplayer	2019-02-08 14:57:51 +09:00
smoogipoo	7f13e3c5f7	Directly resolve the filter bindable	2019-02-08 13:02:17 +09:00
smoogipoo	990bd44ca2	Combine roommanager and roompollingcomponent	2019-02-08 13:01:10 +09:00
smoogipoo	17fdfc15d9	Fix room title in the breadcrumbs	2019-02-07 20:09:49 +09:00
smoogipoo	1c2450a95a	Fix up room inspector status	2019-02-07 17:59:14 +09:00
smoogipoo	1e0135af6f	Move StatusColouredContainer into a more public location	2019-02-07 17:52:40 +09:00
smoogipoo	2d61548251	Fix room name being coloured	2019-02-07 16:45:36 +09:00
smoogipoo	4f86fe92ea	Fix match settings not showing	2019-02-06 18:50:43 +09:00
smoogipoo	3207983a1c	Fix current room being set to null when parted	2019-02-06 15:12:40 +09:00
smoogipoo	a9aa22c97b	Remove ShadowModel requirement	2019-02-06 13:52:48 +09:00
smoogipoo	594dffba41	Fix a few cases of missed instant invocation	2019-02-05 19:11:20 +09:00
smoogipoo	aac371ba6e	Use CMC for all of multiplayer	2019-02-05 19:00:08 +09:00
smoogipoo	be51ee4ed5	Implement MultiplayerComposite, replaces RoomBindings	2019-02-05 16:14:37 +09:00
smoogipoo	d9537017c8	Use CMC in the Multiplayer screen	2019-02-05 16:03:05 +09:00
smoogipoo	37c1f5a824	Split polling logic from RoomManager, now a container	2019-02-05 15:38:19 +09:00
Dean Herbert	e01f342ab0	wip	2019-02-02 17:11:25 +09:00
Dean Herbert	ca5c8d37d1	Use leased bindables	2019-02-01 16:44:06 +09:00
Dean Herbert	f85518b175	Don't expose padding	2019-01-31 18:16:28 +09:00
Dean Herbert	b48bb5b792	Move parallax logic out of BackgroundScreenStack	2019-01-31 18:10:33 +09:00
smoogipoo	255b4a30e0	Allow logo to be null	2019-01-31 13:50:37 +09:00
smoogipoo	58d744e5dc	Remove manual overlay/toolbar logic from multiplayer	2019-01-31 13:38:21 +09:00
smoogipoo	5e78f51e24	Fix multiplayer crashing when exiting from lounge	2019-01-30 23:56:03 +09:00
smoogipoo	b5d187c4af	Fix post-merge errors	2019-01-29 21:27:32 +09:00
smoogipoo	91302ea0bc	Merge remote-tracking branch 'origin/master' into iscreen ... # Conflicts: # osu.Game/Screens/Multi/Match/MatchSubScreen.cs # osu.Game/Screens/Multi/Multiplayer.cs # osu.Game/Screens/Multi/MultiplayerSubScreen.cs # osu.Game/Screens/OsuScreen.cs # osu.Game/osu.Game.csproj # osu.sln	2019-01-29 21:21:36 +09:00
smoogipoo	7b1c1f3728	Move toolbar showing and overlay activation to OsuGame ... Now exposed through IOsuScreen.	2019-01-28 15:42:06 +09:00
smoogipoo	117703374e	Fix logo animations	2019-01-25 21:02:35 +09:00
smoogipoo	60cc2314ef	Fix ruleset + beatmap being changeable in match	2019-01-25 21:02:30 +09:00
smoogipoo	b3403c78da	Fix a few potential crashes	2019-01-25 20:47:37 +09:00
smoogipoo	e2891ab1e9	Fix anchors + origins	2019-01-25 20:47:31 +09:00
smoogipoo	95e6785968	Make Multiplayer not an OsuScreen	2019-01-25 20:25:55 +09:00
smoogipoo	e1e7759e0f	Re-implement MultiplayerSubScreen	2019-01-25 19:32:37 +09:00
Dean Herbert	260034a80e	Don't auto-focus textboxes when on screen keyboard would cause inconvenience	2019-01-25 19:20:29 +09:00
smoogipoo	da135346b2	Fix screen titles	2019-01-25 18:38:48 +09:00
smoogipoo	15100632f1	Remove MultiplayerSubScreen and fix multiplayer crashes	2019-01-25 18:26:04 +09:00
Dean Herbert	7ed215c521	Make InternalPadding a bit simpler	2019-01-25 14:46:45 +09:00
Dean Herbert	787d4da153	Combine constant	2019-01-25 14:10:59 +09:00
ProgrammaticNajel	4cae9bae83	Merge branch 'master' into fix-multiplayer-parallax-overflow	2019-01-24 20:41:10 +08:00
ProgrammaticNajel	593e0b36f5	Add overflow padding in other multiplayer screen components ... Added padding to Room Creation and Beatmap Selection in Multiplayer.	2019-01-24 19:42:35 +08:00
smoogipoo	8ea7ec6445	Convert everything to use IScreen	2019-01-24 19:47:44 +09:00
ProgrammaticNajel	9fcefa7d69	Typo fix	2019-01-24 18:18:32 +08:00
ProgrammaticNajel	e4084b7d5d	Add overflow padding in other multiplayer screen components ... Added overflow padding in room selection screen (Header, Room Info, Leaderboards, and Room Chat)	2019-01-24 17:40:48 +08:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
ProgrammaticNajel	7ac20c3545	Add overflow padding to account for parallax shifting ... Added overflow padding in the Multiplayer screen, and adjusting content (LoungeSubScreen, FilterControl, Header, "Create Room" button) to account for this padding.	2019-01-24 16:11:24 +08:00
Dean Herbert	5269ca31be	Merge branch 'master' into fix-room-inspector-cover	2019-01-17 21:49:25 +09:00
Dean Herbert	1d40d88f82	Merge branch 'master' into add-room-null-check	2019-01-17 21:34:25 +09:00
Dean Herbert	59f7c5a26e	Fix room inspector cover not resetting when no room selected	2019-01-17 18:44:22 +09:00
Dean Herbert	ba9cdf2ce2	Add null check to fix crash on deselecting multiplayer room	2019-01-17 18:17:47 +09:00
Dean Herbert	491537b8ba	Add fade duration ... Not really visible in the existing usage, but once we enable the settings tab it will be required. Tested by manually enabling it.	2019-01-17 18:13:05 +09:00
ekrctb	2bc3464802	Hide Room tab when Settings tab is active	2019-01-17 17:27:34 +09:00
ekrctb	b6fb3a5c05	Cancel request on disposal for RoomInspector	2019-01-17 15:14:30 +09:00
Dean Herbert	2dc185f249	Display avatars rather than full scores	2019-01-09 15:27:08 +09:00
smoogipoo	2a4c91a6ab	Remove unused using	2019-01-08 19:26:24 +09:00
smoogipoo	122fc2de58	Show room leaderboard instead in the lounge	2019-01-08 19:24:55 +09:00
Dean Herbert	f6018294b5	Update framework	2019-01-07 18:50:27 +09:00
Dean Herbert	2d405bfc43	Add back options for 3 and 7 day long rooms	2019-01-02 16:33:52 +09:00