4822 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
smoogipooo	8077ddf944	Update with pattern changes.	2017-05-22 10:34:12 +09:00
smoogipooo	7d417e4219	Merge remote-tracking branch 'smoogipooo/mania-pattern-changes' into mania-hitobject-object-conversion	2017-05-22 10:32:32 +09:00
smoogipooo	dba9dd3509	Remove siblings.	2017-05-22 10:30:03 +09:00
smoogipooo	6c0d226459	Merge branch 'remove-siblings' into mania-hitobject-object-conversion	2017-05-22 10:25:59 +09:00
smoogipooo	e232968ea7	Fix line endings resulting in CI error.	2017-05-22 10:25:28 +09:00
Dean Herbert	4b17bb8e69	Merge branch 'master' into mania-pattern-changes	2017-05-22 10:25:17 +09:00
smoogipooo	6714a244e8	Add check before possibly going into endless loop.	2017-05-22 10:23:08 +09:00
smoogipooo	2d11a8bdf0	Update with pattern changes.	2017-05-22 10:20:42 +09:00
Dan Balasescu	4ce3a78066	Update Pattern.cs	2017-05-22 10:18:42 +09:00
smoogipooo	e9f7be8dce	Merge branch 'mania-pattern-changes' into mania-endtime-object-conversion	2017-05-22 10:17:54 +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
smoogipooo	9f2ca1acbf	Remove siblings.	2017-05-22 09:57:03 +09:00
Dean Herbert	93182e5da3	Merge branch 'master' into generic-interface	2017-05-22 09:52:40 +09:00
smoogipooo	f42cbd5f38	Merge branch 'remove-siblings' into mania-endtime-object-conversion	2017-05-22 09:51:36 +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
MrTheMake	e9c2b51012	Random the difficulty too	2017-05-22 01:59:10 +02:00
MrTheMake	5ef7451dba	Improved LEFTand RIGHT key behaviour	2017-05-22 01:53:36 +02: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	aef7ae637f	Merge branch 'master' into mania-endtime-object-conversion	2017-05-22 08:12:24 +09:00
Dean Herbert	0ad4a18c7b	Merge branch 'master' into mania-hitobject-object-conversion	2017-05-22 08:12:09 +09:00
Dean Herbert	c9ac574db2	Merge branch 'master' into mania-distance-object-conversion	2017-05-22 07:49:21 +09:00
MrTheMake	4056338203	Remove unnecessary track starting	2017-05-21 21:35:49 +02:00
MrTheMake	0539584578	CI fix	2017-05-21 21:33:54 +02:00
MrTheMake	b543b1f9fc	Remove unnecessary restart	2017-05-21 21:20:59 +02:00
Jorolf	5b244367ee	allow for solutions were the osu repository isn't at the solution level	2017-05-21 20:29:05 +02:00
MrTheMake	6219b8e6dd	Fixed an error with looping	2017-05-21 20:27:41 +02:00
MrTheMake	974e8d1f82	Fix pressing up always goes to the first beatmap group difficulty, not the last	2017-05-21 19:27:34 +02:00
MrTheMake	9b87f5d8db	Reformating	2017-05-21 18:16:54 +02:00
MrTheMake	6d7f70d0ea	Fix CI warnings	2017-05-21 18:00:31 +02:00
EVAST9919	0615f104f0	SettingsContainer -> SettingsDropdownContainer	2017-05-21 18:22:27 +03:00
MrTheMake	34653eb8c0	Fixed null references	2017-05-21 17:20:20 +02:00
MrTheMake	7db45cb58f	Moved the whole looping assignments inside PlaySongSelect	2017-05-21 17:09:56 +02:00