15302 Commits

Author	SHA1	Message	Date
Dean Herbert	0d4854ac09	Add News Overlay skeleton and header (#5726) ... Add News Overlay skeleton and header Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-22 00:14:31 +09:00
Dean Herbert	1a6b5e8714	Implement TotalCommentsCounter component for CommentsContainer (#6867) ... Implement TotalCommentsCounter component for CommentsContainer	2019-11-21 23:45:23 +09:00
Dean Herbert	76722534ec	Fix cancel button animating when entering a dialog (#6825) ... Fix cancel button animating when entering a dialog Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-21 23:22:17 +09:00
Dean Herbert	4475307707	Fix spacing	2019-11-21 22:55:31 +09:00
Dean Herbert	ac2dfffb23	Merge remote-tracking branch 'upstream/master' into sharpraven-deprecation	2019-11-21 22:52:45 +09:00
Dean Herbert	f173961def	Add some extra search keywords to settings (#6893) ... Add some extra search keywords to settings Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-21 22:51:20 +09:00
Dean Herbert	d7cb23a909	Remove redundant keyword	2019-11-21 22:51:00 +09:00
Dean Herbert	8b1fb2d5a1	Standardise keyword specifications	2019-11-21 22:35:15 +09:00
Dean Herbert	201f32859a	Merge branch 'master' into slider-control-point-removal	2019-11-21 22:10:52 +09:00
Dean Herbert	bd6831624a	Decouple skip button animations from gameplay clock	2019-11-21 19:51:22 +09:00
Dean Herbert	ffd0e17826	Merge branch 'skip-multiple-times' into lead-in-fixes	2019-11-21 19:01:28 +09:00
Dean Herbert	46a94821d4	Add support for consecutive skips	2019-11-21 18:59:55 +09:00
Dean Herbert	8d1b11d4bd	Add storyboard lead-in tests	2019-11-21 18:50:54 +09:00
Dean Herbert	4e53bca8dd	Simplify tests	2019-11-21 18:50:38 +09:00
Dean Herbert	29d2374928	Add back skip button actuation count tests	2019-11-21 17:23:52 +09:00
Dean Herbert	2dd2e3d861	Add correct AudioLeadIn support	2019-11-21 16:55:18 +09:00
Dean Herbert	8369be90f2	Allow skip button to actuate more than once	2019-11-21 15:19:06 +09:00
Dean Herbert	c0b9bb5a12	Merge remote-tracking branch 'upstream/master' into lead-in-fixes	2019-11-21 14:22:17 +09:00
Dean Herbert	2325f0382c	Cancel a potentially pending filter update when an update occurs	2019-11-21 13:46:45 +09:00
Dean Herbert	4d6904468d	Merge remote-tracking branch 'upstream/master' into multi-searching	2019-11-21 13:44:04 +09:00
Dean Herbert	0804d8d7a4	Replace all MathHelper.Clamp usages with Math.Clamp (#6891) ... Replace all MathHelper.Clamp usages with Math.Clamp Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>	2019-11-21 11:14:34 +09:00
Dean Herbert	94009a22b8	Fix osu!direct previews muting game audio permanently (#6838) ... Fix osu!direct previews muting game audio permanently Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-21 11:13:11 +09:00
Dan Balasescu	a7c074ff37	Merge branch 'master' into math_clamp	2019-11-21 11:08:56 +09:00
smoogipoo	0cbe29dbec	Refactor / cleanup debouncing	2019-11-21 11:05:18 +09:00
Dean Herbert	19dfbb0a45	Update obsolete usages	2019-11-21 10:55:31 +09:00
Dean Herbert	cf0f0f8a1b	Reword comment	2019-11-21 10:37:50 +09:00
Dean Herbert	7637e680d7	Merge remote-tracking branch 'upstream/master' into fix-preview-track-never-stopping	2019-11-21 10:27:32 +09:00
Dean Herbert	76e63722cc	Update framework	2019-11-21 10:26:10 +09:00
Dan Balasescu	ec35d92ec0	Merge branch 'master' into fix-song-select-scroll	2019-11-21 10:22:52 +09:00
iiSaLMaN	5391c752b4	Implement IAggregateAudioAdjustments properties for FallbackSampleStore	2019-11-21 03:20:08 +03:00
iiSaLMaN	ebae92db7b	Revert "Implement IAggregateAudioAdjustments properties for FallbackSampleStore" ... This reverts commit 4a4f5ccbb2.	2019-11-21 03:18:31 +03:00
iiSaLMaN	4a4f5ccbb2	Implement IAggregateAudioAdjustments properties for FallbackSampleStore	2019-11-21 02:35:58 +03:00
Andrei Zavatski	f066d8434c	Apply suggestions	2019-11-21 00:26:39 +03:00
Andrei Zavatski	6b3010535f	Simplify Keywords usage for SettingsSubsection	2019-11-20 21:03:31 +03:00
Andrei Zavatski	f3d9abc84a	Capitalize Bar for consistency	2019-11-20 19:57:02 +03:00
Andrei Zavatski	7d8252183e	CI fix	2019-11-20 19:42:57 +03:00
Andrei Zavatski	e820ddd3e8	Implement settings keywords	2019-11-20 19:27:34 +03:00
Berkan Diler	66a3837ff4	Fix CI	2019-11-20 14:25:44 +01:00
Berkan Diler	6cab517b2d	.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.	2019-11-20 13:37:47 +01:00
Dean Herbert	3ba9f840fd	Fix song select not always scrolling to the correct location	2019-11-20 19:39:13 +09:00
Dean Herbert	a81c26577d	Fix carousel filtering twice on startup due to unpopulated rule… (#6833) ... Fix carousel filtering twice on startup due to unpopulated ruleset	2019-11-20 19:39:00 +09:00
Huo Yaoyuan	374ef6ff83	Merge branch 'master' into sharpen	2019-11-20 17:30:58 +08:00
Dean Herbert	8d7be98b8b	Move to .NET Standard 2.1 (#6837) ... Move to .NET Standard 2.1 Co-authored-by: Shane Woolcock <samahnub@gmail.com>	2019-11-20 17:57:00 +09:00
Dean Herbert	8c9ed99b1b	Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter	2019-11-20 17:24:54 +09:00
Dean Herbert	5b416eb7ba	Move initial filter to run on entering	2019-11-20 17:24:43 +09:00
Dean Herbert	e0f59d8e24	Move method	2019-11-20 15:43:00 +09:00
Dean Herbert	bcb1504110	Fix naming	2019-11-20 15:40:35 +09:00
smoogipoo	6288e6da56	Add null check	2019-11-20 13:42:54 +09:00
smoogipoo	76ed573c56	Fix crash when loading results after gameplay	2019-11-20 12:21:49 +09:00
iiSaLMaN	08b8cedfdf	Add setter to legacy skin configuration access	2019-11-20 01:15:40 +03:00
iiSaLMaN	0407d2248c	Merge remote-tracking branch 'refs/remotes/upstream/master' into add-access-to-skin-legacy-version	2019-11-20 01:10:32 +03:00
Huo Yaoyuan	b5c20fecee	Merge branch 'master' into netstandard2.1	2019-11-19 21:40:12 +08:00
Huo Yaoyuan	608785b99a	Update .Net Standard projects to 2.1	2019-11-18 18:35:58 +08:00
Huo Yaoyuan	53bc2dcab7	Use costum displaying text for inherited references.	2019-11-18 15:29:18 +08:00
Huo Yaoyuan	4d1513cef6	Sadly, xmldoc doesn't support tuple elements.	2019-11-17 21:01:56 +08:00
Huo Yaoyuan	b04bca7db6	Reference elements in origin definition.	2019-11-17 20:55:40 +08:00
Huo Yaoyuan	b1b234c6fb	Use paramref.	2019-11-17 20:49:36 +08:00
Huo Yaoyuan	f05b83d7d4	Use typeparamref.	2019-11-17 20:48:23 +08:00
Andrei Zavatski	509440ea14	TotalCommentsCounter implementation	2019-11-16 18:02:34 +03:00
Dean Herbert	e9e37fc821	Add private setter for FilterControl	2019-11-15 18:23:35 +09:00
Dean Herbert	296fff9243	Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter	2019-11-15 18:20:36 +09:00
Andrei Zavatski	f2862e95e0	CI fix	2019-11-15 12:15:51 +03:00
Andrei Zavatski	e51fd00d58	CI fix	2019-11-15 12:09:31 +03:00
Andrei Zavatski	18f77008db	Update dependency	2019-11-15 12:04:01 +03:00
smoogipoo	10287eb66d	Add debounce logic in several places	2019-11-15 17:58:47 +09:00
Andrei Zavatski	9fd225bda7	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-mod-selector-new	2019-11-15 11:58:05 +03:00
Andrei Zavatski	2592a0489b	Use existing ModNoMod	2019-11-15 11:57:40 +03:00
Andrei Zavatski	1218d41b50	Make Ruleset a property	2019-11-15 11:52:49 +03:00
smoogipoo	1b4bcb81c8	Fix filtering breaking on secondary filters	2019-11-15 17:49:02 +09:00
Andrei Zavatski	b7efc276f1	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-11-15 11:42:32 +03:00
Dean Herbert	813aebca1d	Remove unintentional dependency	2019-11-15 14:51:01 +09:00
Dean Herbert	eee5902851	Merge remote-tracking branch 'upstream/master' into lead-in-fixes	2019-11-15 14:05:31 +09:00
Dean Herbert	2c3109980a	Fix broken merge	2019-11-15 13:51:39 +09:00
Dean Herbert	6d06b444ba	Allow screen to specify whether to apply audio rate adjustments from mods	2019-11-15 13:47:14 +09:00
Dean Herbert	b8bb97607b	Merge remote-tracking branch 'upstream/master' into fix-mod-retention	2019-11-15 13:46:44 +09:00
Dan Balasescu	644c581c92	Merge branch 'master' into fix-duplicate-online-ids	2019-11-15 11:12:06 +09:00
smoogipoo	f0b7b2e1c4	Fix broken test case	2019-11-15 11:07:16 +09:00
Dean Herbert	0e587cb9f5	Merge branch 'master' into fix-duplicate-online-ids	2019-11-15 10:18:53 +09:00
Dean Herbert	6d54846462	Null online id on lookup failure	2019-11-15 10:18:47 +09:00
Dan Balasescu	cd9902cc9f	Merge branch 'master' into commit-on-focus-lost	2019-11-15 08:58:59 +09:00
Dan Balasescu	22e46c560c	Merge branch 'master' into dedupe-same-hash	2019-11-15 08:31:46 +09:00
smoogipoo	956fb9912d	Hook up multiplayer search filter	2019-11-15 08:23:56 +09:00
Huo Yaoyuan	0998afdbdb	Use ReferenceEquals instead of SequenceEqual.	2019-11-14 19:38:08 +08:00
iiSaLMaN	d2ce0878bc	Change 'current' accessibility to protected	2019-11-14 14:20:29 +03:00
iiSaLMaN	4e79bbad6b	Add inline comment	2019-11-14 14:19:42 +03:00
Dean Herbert	12243aaa9a	Dedupe .osu files with same hash in same set	2019-11-14 19:38:20 +09:00
Dean Herbert	fbf81207d4	Don't assign server-fetched online id if it was assigned elsewhere	2019-11-14 18:55:12 +09:00
Dean Herbert	1bc0eae2a6	Fix beatmap online retrieval response running incorrectly scheduled	2019-11-14 18:53:45 +09:00
Dean Herbert	81033e1fdf	Add extra logging	2019-11-14 18:52:07 +09:00
Huo Yaoyuan	677717875e	Change a case to EqualityComparer.Default to handle null properly.	2019-11-14 17:35:02 +08:00
Huo Yaoyuan	f25b1ba06f	Merge branch 'master' into equals	2019-11-14 17:33:44 +08:00
Dean Herbert	bf567e6df5	Make settings textboxes commit on focus lost	2019-11-14 14:19:55 +09:00
Dean Herbert	c15f909d83	Remove local bindable at song select, along with misplaced reset logic	2019-11-14 13:29:06 +09:00
Dean Herbert	d8a5750e5d	Fix typo ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2019-11-14 08:38:01 +09:00
Dean Herbert	a580b9079a	Reword comment	2019-11-14 08:28:41 +09:00
Andrei Zavatski	2d3fadc1a8	Don't update mod filter visibility on every beatmap change	2019-11-14 00:38:37 +03:00
Andrei Zavatski	633c497602	Hide content if beatmap has no leaderboard	2019-11-13 17:36:08 +03:00
Huo Yaoyuan	87d40cf8d0	Resolve equals usages.	2019-11-13 22:35:50 +08:00
Andrei Zavatski	d1853ea55b	Fix incorrect formatting for switch/case	2019-11-13 17:29:50 +03:00
Andrei Zavatski	8005ee73af	Trim whitespace	2019-11-13 17:23:46 +03:00
Andrei Zavatski	3f6140db6d	Improve loading animation	2019-11-13 17:18:58 +03:00
Andrei Zavatski	4e90daf212	Implement NoScoresPlaceholder	2019-11-13 16:39:33 +03:00
iiSaLMaN	172e777416	Fix preview track manager permanently muting game tracks	2019-11-13 16:16:06 +03:00
iiSaLMaN	47cbd516f3	Revert "Fix preview track manager potentially not updating" ... This reverts commit 8f7fd9993d.	2019-11-13 16:11:13 +03:00
Andrei Zavatski	2dbee5da79	Update dependency	2019-11-13 16:06:37 +03:00
Andrei Zavatski	6715b25ddd	Apply suggestions	2019-11-13 16:04:15 +03:00
iiSaLMaN	8f7fd9993d	Fix preview track manager potentially not updating	2019-11-13 14:24:22 +03:00
Dean Herbert	110c155fa0	Fix background loading twice when entering song select	2019-11-13 19:42:05 +09:00
Dean Herbert	280c1a0eb4	Fix carousel filtering twice on startup due to unpopulated ruleset	2019-11-13 19:04:52 +09:00
Dean Herbert	bca1be0bfa	Add failing test	2019-11-13 18:54:33 +09:00
smoogipoo	76ab0ecd3c	Disallow deselections with right clicks	2019-11-13 17:21:55 +09:00
Dean Herbert	f11ad7535d	Merge branch 'master' into rankings-tables	2019-11-13 15:39:13 +09:00
Dean Herbert	c8e06dd1f0	Merge branch 'master' into sharpraven-deprecation	2019-11-13 15:39:10 +09:00
Dean Herbert	230de261c8	Merge branch 'master' into fix-popup-dialog-button	2019-11-13 15:39:08 +09:00
Dean Herbert	0292cea2c4	Merge branch 'master' into beatmap-mod-selector	2019-11-13 15:39:08 +09:00
Dean Herbert	367d12aef9	Merge branch 'master' into beatmap-overlay-mod-selector-new	2019-11-13 15:39:06 +09:00
Dean Herbert	ce60f8262c	Merge branch 'master' into sharpen	2019-11-13 15:38:59 +09:00
Dean Herbert	c751328665	Disable button when not logged in	2019-11-13 12:13:33 +09:00
Andrei Zavatski	5f609b48da	Use local bindable for api.LocalUser	2019-11-13 00:29:28 +03:00
Andrei Zavatski	99ec84ed38	Update dependency	2019-11-13 00:26:19 +03:00
Andrei Zavatski	2719be7769	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-mod-selector-new	2019-11-13 00:24:40 +03:00
Andrei Zavatski	27f721eec2	Use = instead of += for OnSelectionChanged Action	2019-11-13 00:24:13 +03:00
Andrei Zavatski	aca3690d77	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-11-13 00:20:51 +03:00
Andrei Zavatski	3903e59f2f	Add null check for notification overlay	2019-11-13 00:01:13 +03:00
Andrei Zavatski	dfd5c88075	Typo fix	2019-11-13 00:00:08 +03:00
Huo Yaoyuan	8a1276db3a	Change to use instance API of sentry.	2019-11-12 22:16:48 +08:00
Huo Yaoyuan	6ae6603ded	Cleanup.	2019-11-12 22:08:16 +08:00
Ganendra Afrasya	8276428efc	Add IsPresent check when dialog popping out	2019-11-12 20:48:26 +07:00
Huo Yaoyuan	e01a50e4b3	Correct disposal.	2019-11-12 21:39:38 +08:00
Huo Yaoyuan	de732c6c24	Change code to use Sentry client.	2019-11-12 21:12:38 +08:00
Dean Herbert	da819261e0	Shrink and darken loading layer to better suit button	2019-11-12 21:38:16 +09:00
Dean Herbert	5110ae82a1	Tidy up implementation	2019-11-12 21:38:08 +09:00
Huo Yaoyuan	1349289c0e	Remove SharpRaven package and install Sentry.	2019-11-12 20:32:41 +08:00
Dean Herbert	61464c5c89	Fix potential nullref in unrelated test	2019-11-12 21:27:15 +09:00
Huo Yaoyuan	f3f5094c26	Convert delegate to local function.	2019-11-12 20:14:22 +08:00
Huo Yaoyuan	42a98c5d87	Use constants.	2019-11-12 20:07:01 +08:00
Huo Yaoyuan	d60493a961	Use discards.	2019-11-12 20:03:21 +08:00
Huo Yaoyuan	144812669d	Use static local functions.	2019-11-12 19:56:54 +08:00
Huo Yaoyuan	dcfa98414f	Use ??=.	2019-11-12 19:56:51 +08:00
Huo Yaoyuan	64fc5007fc	Use language primitive types.	2019-11-12 19:56:45 +08:00
Huo Yaoyuan	ca52d09e81	Enforce expression body for typical simple ones.	2019-11-12 19:56:37 +08:00
Huo Yaoyuan	8a1b70513c	No this. qualification.	2019-11-12 19:55:29 +08:00
Huo Yaoyuan	31cc0d13da	Use 'out var'.	2019-11-12 19:55:26 +08:00
Huo Yaoyuan	0d81b96c5f	Use deconstruction declaration.	2019-11-12 19:55:22 +08:00
Huo Yaoyuan	e5e8e70704	Use pattern matching.	2019-11-12 19:55:19 +08:00
Huo Yaoyuan	7d7b9e36b2	Use compound assignment.	2019-11-12 19:53:50 +08:00
Huo Yaoyuan	bbeab6fa76	Use auto property.	2019-11-12 19:53:25 +08:00
Dean Herbert	58df6930b2	Get error message from server	2019-11-12 19:34:20 +09:00
Dean Herbert	f04d7f733f	Merge remote-tracking branch 'upstream/master' into favourite-beatmap	2019-11-12 19:19:29 +09:00
Dean Herbert	a83c3523ae	Merge branch 'master' into rankings-tables	2019-11-12 18:59:43 +09:00
Dean Herbert	4b66ce0c52	Merge branch 'master' into slider-controlpoint-addition	2019-11-12 18:13:27 +09:00
Dean Herbert	dd196385cb	Add Ctrl+A to select all and Escape to deselect all (#6803) ... Add Ctrl+A to select all and Escape to deselect all Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-12 18:10:45 +09:00
Dean Herbert	cdd87a6903	Merge branch 'master' into delete-selection	2019-11-12 17:59:43 +09:00
Dean Herbert	2066da6c3c	Lookup tournament player statistics for the correct ruleset (#6807) ... Lookup tournament player statistics for the correct ruleset	2019-11-12 17:53:39 +09:00
Dean Herbert	46d02d9077	Update framework	2019-11-12 17:37:01 +09:00
Dean Herbert	faa5997b48	Move scaling container to OsuGame so OsuGameBase doesn't apply… (#6804) ... Move scaling container to OsuGame so OsuGameBase doesn't apply UI scale	2019-11-12 16:40:49 +09:00
Dean Herbert	0113ab5e56	Add local preserving container to OsuTestScene to ensure correc… (#6805) ... Add local preserving container to OsuTestScene to ensure correct test dimensions	2019-11-12 16:40:40 +09:00
Dean Herbert	3ab332e60b	Implement hitobject sound adjustment (#6762) ... Implement hitobject sound adjustment Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-12 16:40:15 +09:00
Dean Herbert	e32f88c770	Fix home button not closing login and now playing overlays (#6758) ... Fix home button not closing login and now playing overlays Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-12 15:40:28 +09:00
Dean Herbert	47be20fa37	Private set on track for safety	2019-11-12 15:13:47 +09:00
Dean Herbert	712a2f6918	Merge remote-tracking branch 'upstream/master' into fix-playing-multiple-beatmap-preview-tracks	2019-11-12 15:10:42 +09:00
Dean Herbert	35351d7f7c	Use variable instead of duplicated list	2019-11-12 15:04:51 +09:00
Dean Herbert	25eb964290	Simplify overlay adding logic	2019-11-12 15:03:58 +09:00
smoogipoo	10fd5ef5a7	Merge context menus	2019-11-12 15:02:27 +09:00
Andrei Zavatski	a69a4643c9	Simplify LINQ expressions	2019-11-12 08:45:21 +03:00
Dean Herbert	b4525c1f6e	Fix right clicking to select not showing context menu	2019-11-12 14:42:30 +09:00
Andrei Zavatski	fa01e11a6e	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-11-12 08:25:42 +03:00
smoogipoo	3f8928ca25	Suppress warnings	2019-11-12 13:41:54 +09:00
smoogipoo	ed11c72d0b	Merge remote-tracking branch 'origin/master' into selection-hitsound-addition	2019-11-12 13:40:25 +09:00
smoogipoo	9f1d490ac9	Only handle selection input on blueprints	2019-11-12 12:18:24 +09:00
Dean Herbert	e28ddec8d6	Merge branch 'master' into fix-home-not-closing-all-overlays	2019-11-12 12:05:19 +09:00
Dean Herbert	4516da223d	Merge branch 'master' into fix-mod-section-overflow	2019-11-12 11:35:01 +09:00
Dean Herbert	2f8768a4b1	Move LabelledDropdown local to usage	2019-11-12 11:04:49 +09:00
Dean Herbert	bedd136c81	Merge remote-tracking branch 'upstream/master' into lookup-players-for-ruleset	2019-11-12 11:02:36 +09:00
Dean Herbert	a43b0ee01b	Apply naming and styling changes	2019-11-12 10:45:46 +09:00
Dean Herbert	b37bf4ea01	Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition	2019-11-12 10:44:53 +09:00
Dean Herbert	52ab309295	Merge branch 'master' into stateful-menu-items	2019-11-12 10:31:50 +09:00
Dean Herbert	5bb65d0716	Rename button class	2019-11-12 10:21:06 +09:00
Dean Herbert	0f23844c5d	Merge remote-tracking branch 'upstream/master' into lookup-players-for-ruleset	2019-11-12 09:47:12 +09:00
Andrei Zavatski	0578f91a76	Small logic adjustments	2019-11-11 19:06:46 +03:00
Andrei Zavatski	32cc7b3d4d	CI fix	2019-11-11 19:04:50 +03:00
Andrei Zavatski	c5b64e26a3	Layout adjustment	2019-11-11 18:51:29 +03:00
Andrei Zavatski	5f5d130d1a	Update mod filter visibility on user change	2019-11-11 18:40:57 +03:00
Andrei Zavatski	31191dadf1	Handle mods change	2019-11-11 18:31:42 +03:00
Andrei Zavatski	2cfd54ca0d	Handle scope changing	2019-11-11 18:27:48 +03:00
Andrei Zavatski	00b9229737	Add mod filter to beatmap overlay	2019-11-11 18:21:07 +03:00
Andrei Zavatski	32b2f5e330	Use Bindable for ScoresContainer	2019-11-11 18:10:25 +03:00
Andrei Zavatski	3655f88180	Merge dependency	2019-11-11 17:56:57 +03:00
Andrei Zavatski	4145e25f7b	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-11-11 17:55:10 +03:00
Huo Yaoyuan	e9b8cbb516	Apply other styles.	2019-11-11 20:27:04 +08:00
Huo Yaoyuan	ccc8aa6fa4	Apply brace style.	2019-11-11 20:13:13 +08:00
Dean Herbert	bed62e0d2f	Rename ThreeState -> TernaryState and add basic tests	2019-11-11 18:56:18 +09:00
Dean Herbert	c0f6e4687a	Merge branch 'master' into stateful-menu-items	2019-11-11 18:33:50 +09:00
dependabot-preview[bot]	a345fd8a86	Bump Newtonsoft.Json from 12.0.2 to 12.0.3 ... Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 12.0.2 to 12.0.3. - [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases) - [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/12.0.2...12.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-11-11 09:26:56 +00:00
iiSaLMaN	6d3d7c5d95	Remove unnecessary use of local	2019-11-11 11:57:14 +03:00
Dean Herbert	fced262c41	Add labelled dropdown component	2019-11-11 17:39:24 +09:00
Dan Balasescu	f27398e899	Merge branch 'master' into infrastructure	2019-11-11 16:02:05 +09:00
Dean Herbert	df51f138c0	Merge branch 'master' into edit-select-all	2019-11-11 15:44:26 +09:00
Dean Herbert	13fd95d513	Remove misplaced usings	2019-11-11 14:03:29 +09:00
Dean Herbert	8ac708ada5	Move scaling container to OsuGame so OsuGameBase doesn't apply UI scale	2019-11-11 13:58:35 +09:00