4213 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	8983bbcaad	Merge branch 'master' into leaderboards	2017-03-22 08:24:49 +09:00
Dean Herbert	91f088e67e	Merge pull request #507 from Jorolf/seperateCursorSize ... Separated menu and gameplay cursor size	2017-03-22 08:19:12 +09:00
Huo Yaoyuan	f0edf5d3d3	Update to DropDown and Menu.	2017-03-22 07:18:53 +08:00
Dean Herbert	b00f86d809	Merge branch 'master' into seperateCursorSize	2017-03-22 08:11:45 +09:00
Adrian Wielgosik	3270fdcfde	Fix auto-sliders in TestCaseHitObject	2017-03-21 22:48:33 +01:00
smoogipooo	a72ae319a1	Override UpdateScrollPosition instead of Update.	2017-03-22 01:55:41 +09:00
smoogipooo	1532ae78a4	Fix post-merge errors.	2017-03-22 01:55:31 +09:00
smoogipooo	7cf935cef2	Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable ... Conflicts: osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-03-22 01:53:44 +09:00
smoogipooo	a75a2e1794	Fix more post-merge errors.	2017-03-22 01:52:55 +09:00
smoogipooo	90c441f614	Override UpdateScrollPosition instead of Update.	2017-03-22 01:51:53 +09:00
smoogipooo	b3e8a2257c	Fix post-merge errors.	2017-03-22 01:51:44 +09:00
smoogipooo	b9f1b44ca4	Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable ... Conflicts: osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-03-22 01:49:45 +09:00
smoogipooo	e4926d54ab	Fix post-merge errors.	2017-03-22 01:48:51 +09:00
smoogipooo	1bfc4d484d	Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables ... Conflicts: osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-03-22 01:47:25 +09:00
smoogipooo	24e78d015e	Make UpdateScrollPosition virtual.	2017-03-22 01:46:06 +09:00
smoogipooo	62dcd4fa59	Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable ... Conflicts: osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-03-22 01:45:02 +09:00
smoogipooo	8f6cee2544	Override is unnecessary.	2017-03-22 01:43:20 +09:00
smoogipooo	e7a93073a4	Fix post-merge errors.	2017-03-22 01:42:40 +09:00
smoogipooo	b769c43660	Update framework.	2017-03-22 01:39:39 +09:00
smoogipooo	afcd42b06d	Merge remote-tracking branch 'origin/master' into taiko_playfield_2	2017-03-22 01:38:53 +09:00
smoogipooo	b3dde2c399	A bit more protection.	2017-03-22 01:35:39 +09:00
smoogipooo	cf251618c7	Merge remote-tracking branch 'origin/master' into taiko_bash_base ... Conflicts: osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-03-22 01:34:47 +09:00
smoogipooo	712d2e194c	A bit more protection.	2017-03-22 01:33:22 +09:00
smoogipooo	a346191ca7	Merge remote-tracking branch 'origin/master' into taiko_drumroll_base ... Conflicts: osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-03-22 01:27:07 +09:00
Jorolf	82d6129063	renamed CursorSize to MenuCursorSize	2017-03-21 17:16:23 +01:00
Dean Herbert	7d8c2c9a15	Merge pull request #521 from EVAST9919/fixes ... Fixes	2017-03-22 00:30:57 +09:00
Andrey Zavadskiy	943bd737c4	Hide letterbox position sliders	2017-03-21 18:24:19 +03:00
Andrey Zavadskiy	4fa6db6cfa	Hide options when entering the game	2017-03-21 18:20:15 +03:00
Dean Herbert	0b2bb2ea0e	Fix typo in font name declaration.	2017-03-21 22:51:49 +09:00
Dean Herbert	993f68bc61	Merge pull request #514 from smoogipooo/taiko_judgement_scoring ... Add TaikoJudgementInfo.	2017-03-21 22:39:34 +09:00
Dean Herbert	d5af15579c	Merge pull request #519 from smoogipooo/parse_timesignature ... Parse time signature from legacy beatmap control points.	2017-03-21 22:24:29 +09:00
smoogipooo	863f49c2bd	Rename MAX_SCORE -> MAX_HIT_RESULT.	2017-03-21 21:38:39 +09:00
smoogipooo	d9524f692d	Renamings.	2017-03-21 21:36:05 +09:00
smoogipooo	ad74797cd4	End letter oppression.	2017-03-21 21:31:31 +09:00
smoogipooo	9f3def05ef	Add test case for bar lines.	2017-03-21 21:27:20 +09:00
smoogipooo	e1f8f44b32	Woops forgot to commit framework.	2017-03-21 21:26:55 +09:00
smoogipooo	507e453409	Implement barline conversion from control points.	2017-03-21 21:26:29 +09:00
smoogipooo	e8a0d6f898	Merge branch 'parse_timesignature' into taiko_barlines	2017-03-21 21:22:56 +09:00
Dean Herbert	12fc8b8553	Merge pull request #518 from smoogipooo/late_add_hitobjects_container ... Late-add the HitObjects container in the Playfield.	2017-03-21 21:19:47 +09:00
smoogipooo	a272675705	Parse time signature from legacy beatmap control points.	2017-03-21 21:18:08 +09:00
smoogipooo	b602b7a3ea	Add barline drawables.	2017-03-21 20:39:18 +09:00
smoogipooo	4bc038addd	Merge branch 'taiko_playfield_2' into taiko_barlines ... Conflicts: osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-03-21 20:24:33 +09:00
smoogipooo	b05a12372a	Add base barline.	2017-03-21 18:44:49 +09:00
smoogipooo	259ed03610	Reduce some container nesting.	2017-03-21 18:28:04 +09:00
smoogipooo	e2b510f3f0	Add comments.	2017-03-21 18:26:19 +09:00
smoogipooo	7cb237798a	Add a 1px offset for the playfield border.	2017-03-21 18:13:10 +09:00
smoogipooo	aac4f24a2e	10% chance to get finisher hits in testcase.	2017-03-21 17:55:18 +09:00
smoogipooo	2cfab75bc7	Remove now unnecessary field.	2017-03-21 17:50:05 +09:00
smoogipooo	60e866aebd	Increase RingExplosion base size for finishers. ... Subtle but looks good imo (checked with flyte).	2017-03-21 17:49:22 +09:00
smoogipooo	eec4a1b5d3	Redesign HitTarget.	2017-03-21 17:48:19 +09:00