13664 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Balasescu	77e03a59a9	Merge branch 'master' into ruleset-container	2018-06-19 21:47:10 +09:00
Tom Arrow	ad883e087a	RulesetContainer<TObject> cannot be derived	2018-06-19 14:31:24 +02:00
Dean Herbert	58b551b98e	Merge pull request #2836 from peppy/update-framework ... Update framework	2018-06-19 21:12:16 +09:00
Dan Balasescu	0b1b3319aa	Merge branch 'master' into update-framework	2018-06-19 20:57:19 +09:00
Dean Herbert	e17d60db8a	Merge branch 'master' into improve-editor-scrolling	2018-06-19 20:23:41 +09:00
Dean Herbert	3819ecb2be	Update framework	2018-06-19 20:19:52 +09:00
Dean Herbert	b9d63ee7b1	Merge pull request #2829 from tom-arrow/reverse-arrow-fix ... Fix reverse arrow displayed with incorrect angle	2018-06-19 20:17:16 +09:00
Dean Herbert	cb24957c62	Merge branch 'master' into reverse-arrow-fix	2018-06-19 20:06:37 +09:00
Dan Balasescu	c1c95dfe84	Merge pull request #2833 from peppy/update-configuration-names ... Update rider configuration names	2018-06-19 18:42:41 +09:00
Dean Herbert	15f3a05c83	Update rider configuration names	2018-06-19 18:09:02 +09:00
Dean Herbert	b8f9caf418	Merge branch 'master' into multiplayer-match	2018-06-19 17:18:33 +09:00
smoogipoo	6cd9a22e26	Update testcase	2018-06-19 13:52:24 +09:00
smoogipoo	a623155b9f	Fix missing using	2018-06-19 13:51:53 +09:00
Michael Manis	a0f1143287	Add padding to 'show more' button	2018-06-18 19:14:44 -04:00
Tom Arrow	4aa89de2d7	Fix reverse arrow displayed with incorrect angle	2018-06-18 17:22:01 +02:00
smoogipoo	f090e82b63	Fix inverted conditional	2018-06-18 21:06:09 +09:00
smoogipoo	0625bfda30	Don't split single hitobject into multiple patterns	2018-06-18 20:17:49 +09:00
smoogipoo	8529cece4a	Fix precision error	2018-06-18 20:17:19 +09:00
smoogipoo	8c671f93fc	Always perform non-seeked scroll in the editor while audio is playing	2018-06-18 19:32:04 +09:00
smoogipoo	54e60d8bc2	Fix test appveyor tests failing due to lack of audio manager	2018-06-18 19:27:22 +09:00
smoogipoo	6d318d35ee	Fix not being able to seek by other means during flick-scroll	2018-06-18 18:56:54 +09:00
smoogipoo	dbc50e35d5	Fix the timeline and editor fighting over track seeking	2018-06-18 18:02:26 +09:00
smoogipoo	01b909eaa7	Add testfixture annotation	2018-06-18 17:06:21 +09:00
smoogipoo	ffc5d7bd43	Fix some incorrect test case values	2018-06-18 17:05:04 +09:00
smoogipoo	0d154621b6	Cleanup testcase	2018-06-18 16:09:38 +09:00
Dean Herbert	c74c059044	Merge branch 'master' into multiple_previews_different_overlays	2018-06-18 05:05:27 +09:00
Dean Herbert	1d9d240454	Merge branch 'master' into mania-playfield-inversions	2018-06-18 04:41:17 +09:00
Dean Herbert	ec81ed1c8d	Merge pull request #2631 from smoogipoo/compose-timeline-colours ... Colourise the editor waveform	2018-06-18 04:39:49 +09:00
Dean Herbert	b1d059a67d	Add some colours to the compose-mode timeline	2018-06-18 04:31:47 +09:00
Dean Herbert	60d1295bc6	Merge pull request #2780 from smoogipoo/timeline-markers ... Add centre marker to the editor timeline	2018-06-18 03:42:04 +09:00
Dean Herbert	bec6e3083e	Remove scrollbar depth change as scrollbar is hidden now	2018-06-18 03:19:21 +09:00
Dean Herbert	d58ef96a23	Merge branch 'master' into timeline-markers	2018-06-18 03:14:04 +09:00
Dean Herbert	e89155f87c	Merge pull request #2783 from smoogipoo/timeline-input-adjustment ... Make the editor timeline zoom on mouse scroll	2018-06-18 03:11:17 +09:00
Dean Herbert	31f9d0161d	Add a comment about precision scroll behaviour	2018-06-18 03:03:09 +09:00
Dean Herbert	ae160baa6e	Merge branch 'master' into timeline-input-adjustment	2018-06-18 02:54:25 +09:00
Dean Herbert	48613ea1f6	Merge branch 'master' into timeline-markers	2018-06-18 02:09:20 +09:00
Dean Herbert	62a2a5fbb4	Merge pull request #2804 from smoogipoo/mania-keymod-optimisation ... Don't compute keymod difficulties for mania-specific beatmap	2018-06-18 02:07:02 +09:00
Dean Herbert	6fa72c510f	Avoid listing the base mods twice	2018-06-18 00:48:35 +09:00
Dean Herbert	bf958d736b	Merge branch 'master' into mania-keymod-optimisation	2018-06-18 00:42:26 +09:00
Dean Herbert	c09b3f2a02	Merge pull request #2777 from smoogipoo/fix-taiko-proxies ... Make taiko hitobjects properly unproxy when rewound	2018-06-18 00:41:08 +09:00
Dean Herbert	5b344525e1	Move proxy state check to base class	2018-06-18 00:27:18 +09:00
Dean Herbert	479eac8aa8	Merge branch 'master' into fix-taiko-proxies	2018-06-17 19:38:52 +09:00
Dean Herbert	3c26556a23	Merge pull request #2617 from smoogipoo/timeline-audio-scrolling ... Couple the editor waveform timeline to the audio	2018-06-17 19:33:05 +09:00
Dean Herbert	a20ec0d4cc	Merge branch 'master' into timeline-audio-scrolling	2018-06-17 19:01:21 +09:00
smoogipoo	08f172ba98	Make testcase work on appveyor (no BASS)	2018-06-17 19:01:18 +09:00
Dean Herbert	e0ee5e2085	Merge branch 'master' into timeline-audio-scrolling	2018-06-17 19:01:16 +09:00
smoogipoo	0695615c6a	Remove MusicController from compose timeline testcase	2018-06-17 19:01:14 +09:00
smoogipoo	6c100caba7	Use existing instance of beatmap rather than adding more resources	2018-06-17 19:00:58 +09:00
smoogipoo	0a99d21938	Use the passed-in ruleset	2018-06-17 18:01:28 +09:00
smoogipoo	4575319102	Privatise the proxied content	2018-06-17 17:56:46 +09:00