15439 Commits

Author	SHA1	Message	Date
Salman Ahmed	a9125f6544	Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours	2019-12-12 12:37:51 +03:00
Dean Herbert	76a7e9cde8	Catch file exception in test reset	2019-12-12 14:04:57 +09:00
Dean Herbert	b6c86d512a	Update framework	2019-12-12 13:28:27 +09:00
Dean Herbert	8168872952	Merge remote-tracking branch 'upstream/master' into filesafety	2019-12-12 13:28:21 +09:00
Dean Herbert	606bd33aa6	Use beatmap background in editor	2019-12-12 13:04:32 +09:00
Dean Herbert	d2ada90434	Merge branch 'master' into single-scoreprocessor	2019-12-12 11:36:45 +09:00
Dean Herbert	e6102200a8	Merge remote-tracking branch 'upstream/master' into filesafety	2019-12-12 01:59:57 +09:00
Dan Balasescu	9963d18d17	Add whitespace	2019-12-11 19:13:04 +09:00
Dan Balasescu	e288706802	Merge branch 'master' into rankings-overlay-refactor	2019-12-11 19:09:29 +09:00
Dan Balasescu	166e957104	Merge pull request #6432 from LeNitrous/customized-mods ... Add per-mod settings	2019-12-11 19:07:29 +09:00
Dean Herbert	a106e2a53f	Refactor distance snap grid to not require hitobjects (#7138) ... Refactor distance snap grid to not require hitobjects	2019-12-11 19:02:29 +09:00
Dan Balasescu	900cbd7af3	Merge branch 'master' into customized-mods	2019-12-11 18:52:00 +09:00
smoogipoo	48f1dad4aa	Remove abstract ScoreProcessor class	2019-12-11 17:25:06 +09:00
Huo Yaoyuan	cffeceb229	Remove unnecessary comment.	2019-12-11 16:24:22 +08:00
Huo Yaoyuan	b86a3dbfab	PathStandardise -> ToStandardisedPath	2019-12-11 16:06:56 +08:00
Huo Yaoyuan	6b3c7c8421	Remove usages of FileSafety class.	2019-12-11 16:05:35 +08:00
Dean Herbert	75f9250645	Don't automatically pause when window is inactive if in break time	2019-12-11 15:46:07 +09:00
Dean Herbert	6c8f325063	Add failing test	2019-12-11 15:46:07 +09:00
Dean Herbert	9ebad16436	Fix logic regression	2019-12-11 14:37:10 +09:00
Dean Herbert	77b9989e11	Fix some weird private field names	2019-12-11 14:10:35 +09:00
Dean Herbert	5624b9fd3f	Fix US english	2019-12-11 13:19:13 +09:00
Dean Herbert	a37af311d0	Simplify settings update logic	2019-12-11 13:19:02 +09:00
Dean Herbert	138b83c9ea	Merge branch 'master' into customized-mods	2019-12-10 19:13:32 +09:00
Dean Herbert	f6c0b5c44a	Merge branch 'master' into settings-source	2019-12-10 18:49:41 +09:00
Dean Herbert	efc3b7fc9f	Merge branch 'master' into fix-settings-bindable-logic	2019-12-10 18:30:27 +09:00
Dean Herbert	55c938e5da	Fix bindable usage	2019-12-10 18:08:24 +09:00
Dean Herbert	65f2d1f875	Update framework	2019-12-10 17:49:42 +09:00
Dean Herbert	f7f4a57c5f	Update bindable types in line with framework	2019-12-10 16:48:24 +09:00
Dean Herbert	609c511309	Update framework	2019-12-10 16:43:58 +09:00
Dan Balasescu	bd6a08a21b	Merge branch 'master' into apply-to-track	2019-12-10 16:15:24 +09:00
smoogipoo	94a298a82d	Refactor distance snap grid to not require hitobjects	2019-12-10 16:00:09 +09:00
Dean Herbert	5f3d163772	Merge branch 'master' into segmented-slider-paths-3	2019-12-10 14:28:20 +09:00
smoogipoo	ab0f2e7c6a	Apply suggested refactorings	2019-12-10 13:12:54 +09:00
Dean Herbert	cdde5d1d69	Fix song select filters not reapplied if in a child screen ... Closes https://github.com/ppy/osu/issues/6980.	2019-12-10 02:30:23 +09:00
Dean Herbert	dc9775742c	Fix incorrect code migration ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2019-12-10 02:23:17 +09:00
smoogipoo	47f3c4a596	Don't serialise path version	2019-12-09 20:18:18 +09:00
Huo Yaoyuan	ad1fb3bda2	Remove IComparable in constraint.	2019-12-09 17:48:41 +08:00
Huo Yaoyuan	c3518a2b94	Enum constraint for enum dropdown.	2019-12-09 17:45:26 +08:00
Huo Yaoyuan	40a5c1fd96	Constrain transformable with class.	2019-12-09 17:45:26 +08:00
Huo Yaoyuan	04b3297a05	Constrain configuration lookup as enum.	2019-12-09 17:45:26 +08:00
smoogipoo	cd61893814	Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3	2019-12-09 18:25:27 +09:00
smoogipoo	6d9cd0fafe	Split out complex method	2019-12-09 18:25:13 +09:00
smoogipoo	b6e2738236	Remove unused using	2019-12-09 18:15:00 +09:00
Dean Herbert	d650bfb6d6	Remove unnecessary cast	2019-12-09 18:05:14 +09:00
smoogipoo	a1798fd38d	Fix bad ctor implementation	2019-12-09 18:01:13 +09:00
smoogipoo	bfbb9aa18e	Remove outdated assert	2019-12-09 18:01:02 +09:00
Dean Herbert	c39d2f006c	Merge branch 'master' into fix-settings-bindable-logic	2019-12-09 17:55:17 +09:00
smoogipoo	883d5bc11d	Remove automatic slider path offsetting	2019-12-09 17:54:22 +09:00
smoogipoo	9cb649436c	Default to linear control point type	2019-12-09 17:47:05 +09:00
smoogipoo	5a093c039c	Simplify path/point construction	2019-12-09 17:46:40 +09:00