4680 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	fe70641980	Merge branch 'master' into mania-distance-object-conversion	2017-05-22 12:08:01 +09:00
Dean Herbert	0ff3280bb3	Merge pull request #781 from huoyaoyuan/generic-interface ... More tidy ups	2017-05-22 11:49:24 +09:00
Dan Balasescu	d02aaf0a28	Merge branch 'master' into mania-distance-object-conversion	2017-05-22 11:36:36 +09:00
Dean Herbert	7f08d60008	Merge branch 'master' into generic-interface	2017-05-22 11:35:50 +09:00
Dean Herbert	05f5e55bc7	Merge pull request #820 from smoogipooo/remove-siblings ... Remove Note Siblings.	2017-05-22 11:28:25 +09:00
Dean Herbert	469cc5fa52	Merge branch 'master' into remove-siblings	2017-05-22 11:18:46 +09:00
Dean Herbert	71e5b0dd02	Merge pull request #813 from MrTheMake/replay-no-pausing ... Do not pause a running replay if the window is not focused	2017-05-22 11:18:14 +09:00
Dean Herbert	04f0dcc255	Merge branch 'master' into replay-no-pausing	2017-05-22 11:09:31 +09:00
Dean Herbert	d7796fa941	Merge pull request #822 from smoogipooo/mania-pattern-changes ... Mania pattern changes	2017-05-22 11:09:01 +09:00
Dean Herbert	4b17bb8e69	Merge branch 'master' into mania-pattern-changes	2017-05-22 10:25:17 +09:00
Dan Balasescu	4ce3a78066	Update Pattern.cs	2017-05-22 10:18:42 +09:00
smoogipooo	cd66e2af14	Update with pattern changes.	2017-05-22 10:17:08 +09:00
smoogipooo	9fd4ab2302	Merge branch 'mania-pattern-changes' into mania-distance-object-conversion	2017-05-22 10:14:32 +09:00
Dan Balasescu	4ffc44eac7	Merge pull request #821 from peppy/remove-some-colours ... Move spinner colours to local definition for now	2017-05-22 10:14:04 +09:00
smoogipooo	0a0139aded	Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod.	2017-05-22 10:12:33 +09:00
smoogipooo	8c260e3364	Renamings + refactorings to Pattern.	2017-05-22 10:04:25 +09:00
smoogipooo	9de18d45a5	Use bitshifted notation.	2017-05-22 10:00:11 +09:00
Dean Herbert	93182e5da3	Merge branch 'master' into generic-interface	2017-05-22 09:52:40 +09:00
Dean Herbert	82cf94bbff	Move spinner colours to local definition for now ... We don't want to start polluting the OsuColours namespace with non-UI colours.	2017-05-22 09:50:45 +09:00
smoogipooo	3041b55aac	Remove siblings.	2017-05-22 09:50:36 +09:00
smoogipooo	384295bdca	Merge branch 'remove-siblings' into mania-distance-object-conversion	2017-05-22 09:49:00 +09:00
smoogipooo	e58ffbd87d	Remove Note Siblings.	2017-05-22 09:46:34 +09:00
Dan Balasescu	0ddf2cb454	Merge pull request #817 from peppy/spinner-colour-rehash ... Update spinner colours	2017-05-22 09:38:12 +09:00
Dan Balasescu	256cf90305	Merge branch 'master' into spinner-colour-rehash	2017-05-22 09:22:49 +09:00
Dean Herbert	a2c7e3b859	Merge pull request #818 from Jorolf/more-freedom ... Allow for solutions where the osu repository isn't at the solution level	2017-05-22 08:43:19 +09:00
smoogipooo	ecf81fa8d2	Cleanup.	2017-05-22 08:25:48 +09:00
Dean Herbert	c9ac574db2	Merge branch 'master' into mania-distance-object-conversion	2017-05-22 07:49:21 +09:00
Jorolf	5b244367ee	allow for solutions were the osu repository isn't at the solution level	2017-05-21 20:29:05 +02:00
Dean Herbert	8f3ab79918	Simplify SpinnerTicks & CI fixes	2017-05-21 17:31:35 +09:00
Dean Herbert	95498fe6df	Adjust spinner colours making use of EdgeEffect.Hollow	2017-05-21 17:21:49 +09:00
Dean Herbert	18a7271dc6	Update framework	2017-05-21 17:07:16 +09:00
Dean Herbert	3ff5c271ea	Merge branch 'master' into replay-no-pausing	2017-05-21 02:00:00 +09:00
MrTheMake	57b9ed0f54	Do not pause a running replay if the window is not focused.	2017-05-20 18:56:50 +02:00
Dean Herbert	82f2927f1a	Merge pull request #808 from DrabWeb/playlist-item-paragraph ... Make PlaylistItem use Paragraphs	2017-05-20 15:54:54 +09:00
Dean Herbert	fb72693c96	Merge branch 'master' into playlist-item-paragraph	2017-05-20 15:47:54 +09:00
Dean Herbert	808f5c3ae3	Merge pull request #807 from DrabWeb/mod-tooltips ... Mod button tooltips	2017-05-20 15:46:34 +09:00
DrabWeb	995a573b9c	@"" -> string.Empty	2017-05-20 03:22:37 -03:00
DrabWeb	7485a78128	Update framework	2017-05-20 03:14:22 -03:00
DrabWeb	139b03a1ce	Only recreate text once per unicode option change	2017-05-20 02:05:13 -03:00
DrabWeb	43bd0f686b	Fix artist being the opposite value	2017-05-20 01:25:42 -03:00
DrabWeb	48417beb81	Unused using directive	2017-05-20 01:22:33 -03:00
DrabWeb	615082d757	Remove whitespace	2017-05-20 01:17:04 -03:00
DrabWeb	dcc3dbf5e2	Make PlaylistItem use Paragraphs	2017-05-20 01:11:20 -03:00
DrabWeb	bfedd42ca4	Add mod tooltips	2017-05-19 23:56:48 -03:00
Dean Herbert	5d818620c9	Merge pull request #804 from peppy/debug-config-rename ... FrameworkDebugConfig -> DebugSetting	2017-05-20 01:44:40 +09:00
Dean Herbert	c2572eea27	Merge branch 'master' into debug-config-rename	2017-05-20 01:15:55 +09:00
Dean Herbert	c33f418c02	Merge pull request #801 from peppy/skip-redesign ... Skip button redesign & refactor	2017-05-20 01:15:43 +09:00
Dean Herbert	a34d9d8b09	Oops	2017-05-20 01:14:51 +09:00
Dean Herbert	9c9c0a64fd	Merge branch 'master' into debug-config-rename	2017-05-20 00:45:16 +09:00
Dean Herbert	9aca8fc843	Update framework	2017-05-20 00:43:17 +09:00