7523 Commits

Author	SHA1	Message	Date
Dean Herbert	fd54ae3c87	Simplify logic	2018-04-15 16:12:42 +09:00
Dean Herbert	069d48ac14	Remove unused variable	2018-04-15 15:29:00 +09:00
TocoToucan	671de4f6c2	Resolve merge conflicts	2018-04-14 15:11:28 +03:00
smoogipoo	fe77417e03	Merge remote-tracking branch 'origin/master' into ignored_input_handler	2018-04-13 22:23:33 +09:00
Dan Balasescu	258e17566c	Merge branch 'master' into update-nunit-3.10.1	2018-04-13 22:05:26 +09:00
Dean Herbert	a0f9f8d512	Update frramework again	2018-04-13 21:47:50 +09:00
FreezyLemon	4b3a129738	bump NUnit to version 3.10.1	2018-04-13 13:19:52 +02:00
Dean Herbert	9f5a52b641	Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler	2018-04-13 19:54:15 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Dean Herbert	a1a7e63646	Merge branch 'master' into ignored_input_handler	2018-04-13 18:05:12 +09:00
Endrik Tombak	d9f587edff	Merge remote-tracking branch 'upstream/master' into alt-eagerselect	2018-04-13 11:55:35 +03:00
Dean Herbert	f7c50dee65	Merge branch 'master' into beatmap_set_overlay_difficulties_ordering	2018-04-13 16:48:43 +09:00
Dan Balasescu	2699ad8c89	Merge branch 'master' into lowercase-back-button	2018-04-13 14:14:18 +09:00
Joehu	128446e51d	Remove composer from player loader	2018-04-12 16:46:46 -07:00
TocoToucan	9acea6eab0	Order beatmap difficulty icons correctly	2018-04-12 19:33:30 +03:00
Joehu	61d6f52a53	Lowercase back button	2018-04-12 08:26:25 -07:00
TocoToucan	7c3441e2d0	ActiveInputHandlers -> IgnoredInputHandler	2018-04-12 17:06:35 +03:00
Dean Herbert	127f0d7b01	Fix smoogipoo's comments	2018-04-12 21:17:17 +09:00
Dean Herbert	0ca703beaa	Add some missing xmldoc	2018-04-12 21:04:45 +09:00
Dean Herbert	b50bad0072	Merge branch 'master' into editor-clock	2018-04-12 19:29:58 +09:00
Dean Herbert	3ddf00ee74	Merge branch 'master' into high-level-xmldoc	2018-04-12 19:05:10 +09:00
smoogipoo	baae4427ff	Move string-token property to OAuth	2018-04-12 14:30:28 +09:00
smoogipoo	e007365916	Save OAuth token to config on every token change	2018-04-12 14:23:49 +09:00
smoogipoo	6e35910419	Remove start/stop clock logic ... Beatmap track shouldn't be start/stopped anyway - the IAdjustableClock should be DI'd in to perform the functionality.	2018-04-12 14:06:36 +09:00
smoogipoo	a2484fbf56	Move back to DI-ing adjustable clock into SummaryTimeline	2018-04-12 13:37:02 +09:00
smoogipoo	fbc50d6030	Merge master into editor-clock	2018-04-12 13:35:53 +09:00
Dan Balasescu	9e2494c57b	Merge branch 'master' into high-level-xmldoc	2018-04-12 12:59:37 +09:00
TocoToucan	6a8f568f66	BeatmapContainer -> beatmapContainer	2018-04-11 16:32:58 +03:00
TocoToucan	6cdfaffcf7	PaginatedBeatmapContainer.BeganPlayingPreview	2018-04-11 16:19:21 +03:00
Dean Herbert	903dd7a015	Fix regression causing hard crash ... Regressed in #2373. My bad.	2018-04-11 19:24:19 +09:00
smoogipoo	b97c4e8b44	Fix all possible cases of crossthread import data races	2018-04-09 12:45:44 +09:00
Dean Herbert	421e9e0641	Add xmldoc to some high-level classes to explain their separation	2018-04-08 12:58:34 +09:00
TocoToucan	640be621ac	Handle multiple song previews playing in different beatmap categories on profile	2018-04-07 13:29:46 +03:00
Dean Herbert	c2a2457160	Merge branch 'master' into manual-input-test-case	2018-04-06 20:42:08 +09:00
Dan Balasescu	1895111c75	Merge branch 'master' into dynamic-assembly-update	2018-04-06 20:16:13 +09:00
Dean Herbert	6bc319caae	Merge branch 'master' into manual-input-test-case	2018-04-06 20:07:07 +09:00
Dean Herbert	cd48cb1887	Add comment	2018-04-06 19:53:23 +09:00
smoogipoo	070e68f235	Give the test case clock an accurate IsRunning value	2018-04-06 19:14:04 +09:00
smoogipoo	e59124962c	Remove re-instantiation of clock in EditorClockTestCase	2018-04-06 18:38:44 +09:00
Endrik	c7440201fb	Merge branch 'master' into alt-eagerselect	2018-04-06 12:37:16 +03:00
smoogipoo	b238130fe4	DI beat divisors to test cases with editor clocks	2018-04-06 18:23:22 +09:00
smoogipoo	9e8490735f	Fix Compose not binding to the editor's beat divisor	2018-04-06 18:22:24 +09:00
smoogipoo	248be8e35f	HitObjectComposer no longer needs a beat divisor	2018-04-06 18:21:45 +09:00
smoogipoo	fdb3227fd7	Fix + cleanup testcases	2018-04-06 18:12:44 +09:00
smoogipoo	c7abd56fc4	Give editor a custom clock to handle seeking	2018-04-06 18:11:37 +09:00
Dean Herbert	768a5e5383	Create ManualInputManagerTestCase ... A base class for running more input-driven tests.	2018-04-06 15:23:30 +09:00
Dean Herbert	acbdbcc3df	Update AssemblyInfo in line with framework changes	2018-04-06 13:17:26 +09:00
Dean Herbert	5426432e46	Fix drag select crashing	2018-04-06 11:47:21 +09:00
Dean Herbert	32e8d93596	Fix selection changing when clicking overlapping hitobjects	2018-04-06 11:22:36 +09:00
Dean Herbert	24b9a8c983	Allow HitObjectMasks to handle drag events directly	2018-04-06 10:29:34 +09:00