23819 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	a36c2aa266	Merge branch 'math_clamp' of https://github.com/turbedi/osu into math_clamp	2019-11-20 13:40:30 +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
Berkan Diler	6fec9826c6	Merge branch 'math_clamp' of https://github.com/turbedi/osu into math_clamp	2019-11-20 13:20:27 +01:00
Berkan Diler	da41b70d43	.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.	2019-11-20 13:19:49 +01:00
Berkan Diler	b7d5e36890	Remove unused Using directives	2019-11-20 13:18:03 +01:00
Berkan Diler	39d5ceb77d	Merge branch 'master' into math_clamp	2019-11-20 13:05:03 +01:00
Berkan Diler	6cace0c5f5	Replace all Mathhelper.Clamp usages with Math.Clamp	2019-11-20 12:43:14 +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
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	74c034aee8	Fix crash when loading results after gameplay (#6886) ... Fix crash when loading results after gameplay	2019-11-20 15:52:09 +09:00
Dean Herbert	e0f59d8e24	Move method	2019-11-20 15:43:00 +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
Huo Yaoyuan	b5c20fecee	Merge branch 'master' into netstandard2.1	2019-11-19 21:40:12 +08:00
Shane Woolcock	465c8c2618	Re-add package references to osu.iOS.props	2019-11-19 13:47:29 +09:00
Dan Balasescu	7eaafe63cb	Merge pull request #6872 from huoyaoyuan/xml-doc-fixes ... Fix bad references in xml doc	2019-11-19 12:12:53 +09:00
Huo Yaoyuan	efbab54206	Bump Android test projects version.	2019-11-18 18:48:29 +08:00
Huo Yaoyuan	608785b99a	Update .Net Standard projects to 2.1	2019-11-18 18:35:58 +08:00
Huo Yaoyuan	140278bf4c	Bump Xamarin.Android version to 10.0	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
Huo Yaoyuan	5727963f86	Turn on xmldoc warning, and use appendive syntax for NoWarn.	2019-11-17 20:43:34 +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
Dan Balasescu	3e3427c3e8	Merge pull request #6846 from peppy/fix-mod-retention ... Fix selected mods not being retained on exiting song select	2019-11-15 18:07:00 +09: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	dbfec215e7	Improve test quality	2019-11-15 14:47:28 +09:00
Dean Herbert	c7d0b88854	Update test scene	2019-11-15 14:15:09 +09:00
Dean Herbert	eee5902851	Merge remote-tracking branch 'upstream/master' into lead-in-fixes	2019-11-15 14:05:31 +09:00