2809 Commits

Author	SHA1	Message	Date
Andrei Zavatski	cd0fcfabd9	Merge master with conflicts resolved	2020-01-26 16:35:07 +03:00
Andrei Zavatski	6c1fa05804	Merge remote-tracking branch 'refs/remotes/ppy/master' into no-control-overlay-headers	2020-01-26 12:48:01 +03:00
Andrei Zavatski	448663ae9a	Merge remote-tracking branch 'refs/remotes/ppy/master' into colour-provider-implementation	2020-01-25 06:41:49 +03:00
Dean Herbert	92a5fbe948	Merge branch 'master' into star-filtering	2020-01-24 23:28:36 +09:00
smoogipoo	bb390b4470	Add test	2020-01-24 19:40:20 +09:00
Andrei Zavatski	619c2d6d9c	Merge remote-tracking branch 'refs/remotes/ppy/master' into colour-provider-implementation	2020-01-24 12:44:13 +03:00
Andrei Zavatski	59ff3aa800	Fix tests	2020-01-24 12:42:48 +03:00
Dan Balasescu	368587fc06	Merge branch 'master' into timeline-maybe	2020-01-24 18:08:29 +09:00
smoogipoo	811ddb02a4	General refactoring	2020-01-24 17:50:36 +09:00
Dean Herbert	7495cfa0a9	Add a test scene ... You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene	2020-01-24 16:32:31 +09:00
Andrei Zavatski	2b941a0d52	Merge remote-tracking branch 'refs/remotes/ppy/master' into no-control-overlay-headers	2020-01-24 10:18:45 +03:00
Dean Herbert	2187dbd0c2	Rename steps in test for clarity	2020-01-24 14:37:37 +09:00
Dean Herbert	997b49f6dc	Change display to always show progress bar, only hiding seeking handle instead	2020-01-24 14:21:22 +09:00
Dean Herbert	da65fff48e	Merge remote-tracking branch 'upstream/master' into collapse-graph-option	2020-01-24 13:55:42 +09:00
Dean Herbert	ea2271c905	Merge branch 'master' into timeline-maybe	2020-01-24 13:39:51 +09:00
Dean Herbert	0e9ab8c76b	Rename test scene to match	2020-01-24 13:39:47 +09:00
Dean Herbert	c390348eab	Merge remote-tracking branch 'upstream/master' into colour-score-meter	2020-01-24 11:45:33 +09:00
Dean Herbert	ca94850ce4	Merge branch 'master' into view-comments-via-propery	2020-01-23 17:47:40 +09:00
Dean Herbert	a6d97f8ee6	Merge pull request #7577 from ProTheory8/mod-autoopen ... Make Difficulty Adjust mod customisation menu open automatically	2020-01-23 17:03:04 +09:00
Dean Herbert	143d47ec93	Merge pull request #7538 from peppy/decouple-blueprint-container ... Decouple blueprint container to allow usage in timeline	2020-01-23 16:13:51 +09:00
Dan Balasescu	0df9703c46	Merge branch 'master' into mod-autoopen	2020-01-23 16:04:43 +09:00
Dean Herbert	02ae92418f	Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container	2020-01-23 15:54:46 +09:00
Dean Herbert	d3262a5667	Cache EditorBeatmap in test	2020-01-23 15:51:00 +09:00
Dean Herbert	289be7a17b	Merge branch 'i-beat-snapping' into timeline-maybe	2020-01-23 15:45:33 +09:00
Dan Balasescu	e988976012	Merge branch 'master' into mod-autoopen	2020-01-23 15:34:19 +09:00
Dean Herbert	098d643955	Move beat snapping to its own interface	2020-01-23 14:39:56 +09:00
Dean Herbert	56c044c44a	Move beat snapping to its own interface	2020-01-23 14:30:25 +09:00
Dean Herbert	477e1b7d27	Rename TimelineHitObjectDisplay to TimelineBlueprintContainer	2020-01-23 14:30:25 +09:00
Dean Herbert	cbba708931	Merge branch 'master' into online-mod-settings	2020-01-22 22:15:41 +09:00
ProTheory8	9de4424aec	Removed TestModCustomisable3	2020-01-21 19:32:53 +05:00
ProTheory8	b8d2012fc3	Added test	2020-01-21 15:26:51 +05:00
Dean Herbert	195068ba9a	Cache EditorBeatmap in test	2020-01-21 17:35:36 +09:00
Andrei Zavatski	30edd80c8c	Refactor OverlayHeader hierarchy	2020-01-21 06:00:12 +03:00
Dean Herbert	1becbb072e	Remove broken test	2020-01-20 23:26:21 +09:00
Andrei Zavatski	4a5e855953	Rename test scene	2020-01-20 12:21:21 +03:00
Dean Herbert	25aff5d96e	Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container	2020-01-20 17:08:59 +09:00
Andrei Zavatski	17a7a75707	Merge master with conflicts resolved	2020-01-20 08:52:03 +03:00
Dean Herbert	3f2512295c	Merge pull request #7555 from peppy/update-framework ... Update framework	2020-01-18 15:57:16 +09:00
Dean Herbert	e8e6897603	Remove unnecessary linq count usage	2020-01-18 15:27:21 +09:00
smoogipoo	4fa2c5c8c1	Resolve unassigned properties	2020-01-17 18:52:13 +09:00
smoogipoo	2bc7458abf	Add mod setting (de)serialization support	2020-01-17 13:27:47 +09:00
McEndu	6579aa144d	Merge branch 'master' into mod-text	2020-01-16 20:11:51 +08:00
mcendu	e096688ac8	simplify some stuff	2020-01-16 17:58:47 +08:00
smoogipoo	d01cc37968	Fix channel tab control test scene	2020-01-16 18:36:27 +09:00
mcendu	4c18a67268	add test step	2020-01-15 18:24:43 +08:00
mcendu	052772cce7	add test case	2020-01-15 18:15:56 +08:00
Dean Herbert	d57f55f053	Apply remaining changes required to restore previous functionality	2020-01-15 19:09:49 +09:00
mcendu	62615fb8c1	format	2020-01-15 18:00:14 +08:00
mcendu	a0b6cadab5	add test scene	2020-01-15 17:36:27 +08:00
Dean Herbert	990f5b5f78	Implement editor beatmap saving (#7532) ... Implement editor beatmap saving	2020-01-15 15:35:26 +09:00