3250 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipooo	6a3601efdc	Fix post-merge errors.	2017-04-03 14:22:22 +09:00
smoogipooo	27132958c8	Merge remote-tracking branch 'origin/master' into taiko-drawable-generation ... Conflicts: osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-04-03 14:19:31 +09:00
Dean Herbert	b8dbc697f0	Merge pull request #564 from smoogipooo/taiko_drumroll_drawing ... Taiko drumroll drawing	2017-04-03 11:18:04 +09:00
Dean Herbert	8ae4d0f7a7	Merge branch 'master' into taiko_drumroll_drawing	2017-04-03 11:10:47 +09:00
Dan Balasescu	0e52bead75	Merge pull request #582 from peppy/general-fixes ... Update async load usage to new style.	2017-04-03 09:41:29 +09:00
Dean Herbert	263374a357	Remove unnecessary using.	2017-04-02 17:11:31 +09:00
Dean Herbert	a7f48e0eda	Update framework.	2017-04-02 17:07:25 +09:00
Dean Herbert	bfa2e68bfb	Container->Wrapper.	2017-04-02 16:17:13 +09:00
Dean Herbert	6f1fff4ee7	Update async load usage to new style.	2017-04-02 15:56:12 +09:00
smoogipooo	efb589cc08	(de)creases for misses.	2017-04-01 16:34:30 +09:00
smoogipooo	b5ef0ae0d8	consecutiveHits -> rollingHits.	2017-04-01 16:32:31 +09:00
Dean Herbert	d1e3bbb5f4	Don't call Reset() from within TestCaseTaikoHitObjects.	2017-04-01 16:16:34 +09:00
Dean Herbert	782c6bf28e	Remove unnecessary usings.	2017-04-01 16:07:54 +09:00
Dean Herbert	d610b9e884	Merge remote-tracking branch 'upstream/master' into taiko_drumroll_drawing ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs	2017-04-01 16:02:32 +09:00
Dan Balasescu	9bd19e99ee	Merge pull request #579 from peppy/general-fixes ... Framework & VisualTests update	2017-04-01 15:44:13 +09:00
Dean Herbert	062d99607b	Merge branch 'master' into general-fixes	2017-04-01 15:40:20 +09:00
Dean Herbert	041e4f921a	Merge remote-tracking branch 'upstream/master' into taiko_drumroll_drawing	2017-04-01 14:53:25 +09:00
Dean Herbert	904efb2916	Update framework again.	2017-03-31 18:13:24 +09:00
Dean Herbert	01538ed7d7	Fix nullref.	2017-03-31 18:05:24 +09:00
Dean Herbert	2b847aa2f4	Bring VisualTests up-to-date.	2017-03-31 18:00:14 +09:00
Dean Herbert	24d06fa92d	CheckBox -> Checkbox.	2017-03-31 17:38:33 +09:00
Dean Herbert	ba7f1233b3	Merge pull request #568 from smoogipooo/taiko_replays ... Taiko replays	2017-03-31 17:27:25 +09:00
Dean Herbert	1110747648	Merge branch 'master' into taiko_replays	2017-03-31 17:10:56 +09:00
Dean Herbert	f42935eccf	Merge pull request #571 from smoogipooo/partial-judgements ... Implement partial judgements + make Result non-nullable.	2017-03-31 17:07:32 +09:00
Dean Herbert	14fcc197e9	Merge branch 'master' into partial-judgements	2017-03-31 16:53:49 +09:00
Dean Herbert	b078dfdc4e	Merge pull request #577 from smoogipooo/accented-interface ... Accented interface	2017-03-31 16:46:56 +09:00
Dean Herbert	50c328f1b4	Merge remote-tracking branch 'upstream/master' into partial-judgements ... # Conflicts: # osu.Game/osu.Game.csproj	2017-03-31 16:46:40 +09:00
Dean Herbert	5d25fa3282	Merge remote-tracking branch 'upstream/master' into accented-interface	2017-03-31 16:38:19 +09:00
smoogipooo	8f37d1ad91	Update to match new replay structure.	2017-03-31 16:20:31 +09:00
smoogipooo	fb6f27a439	Merge branch 'master' into taiko_replays	2017-03-31 16:11:58 +09:00
Dan Balasescu	8773dfcc49	Merge pull request #578 from peppy/framed-replay ... Add FramedReplay and use where legacy is not needed.	2017-03-31 16:05:48 +09:00
Dean Herbert	75bdccdc3e	Update framework.	2017-03-31 16:03:59 +09:00
Dean Herbert	3f080ab424	Add some commenting.	2017-03-31 16:01:48 +09:00
Dean Herbert	cf87330f80	Allow SetReplay to receive null.	2017-03-31 16:00:40 +09:00
Dean Herbert	fa7c72a099	Refactor ReplayInputHandler creation for more flexibility.	2017-03-31 15:59:53 +09:00
Dean Herbert	0f4b98ce73	Move FramedReplayInputHandler to own file and un-nest.	2017-03-31 15:32:34 +09:00
Dean Herbert	c531d774b7	Fix file naming.	2017-03-31 15:21:30 +09:00
Dan Balasescu	9be60e7a25	Merge branch 'master' into accented-interface	2017-03-31 15:08:22 +09:00
smoogipooo	a48224bd6d	Don't need Drawable type.	2017-03-31 15:06:33 +09:00
smoogipooo	43c306d658	IAccented -> IHasAccentColour.	2017-03-31 15:06:31 +09:00
smoogipooo	09b98d71a7	Add back Capacity.	2017-03-31 13:33:19 +09:00
Dean Herbert	79031b9e74	Update framework.	2017-03-31 12:58:54 +09:00
Dean Herbert	0bcec4e61a	Add null-checks to comparers.	2017-03-31 12:55:43 +09:00
Dean Herbert	e7ecc479c9	Add FramedReplay and use where legacy is not needed.	2017-03-31 12:43:42 +09:00
smoogipooo	cd915a32be	Let's use a List for now.	2017-03-31 11:58:24 +09:00
smoogipooo	49575c3447	Special case not needed.	2017-03-31 11:54:12 +09:00
smoogipooo	c2dbbc608a	General fixes.	2017-03-31 11:50:31 +09:00
Dean Herbert	591ecc0ef4	Update framework.	2017-03-31 11:48:54 +09:00
Dan Balasescu	dbcd2d134b	Merge branch 'master' into taiko_drumroll_drawing	2017-03-31 11:43:58 +09:00
Dean Herbert	2cb64cbf52	Merge pull request #567 from smoogipooo/taiko_swell_drawing ... Taiko swell drawing	2017-03-31 11:41:41 +09:00