3115 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipooo	24c6ee620f	Merge branch 'taiko_hit_drawing' into taiko-drawable-generation ... Conflicts: osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs	2017-03-29 11:12:39 +09:00
smoogipooo	9da28d372a	Merge branch 'taiko_swell_drawing' into taiko-drawable-generation	2017-03-29 11:09:51 +09:00
Dean Herbert	42f4d67de2	Update framework.	2017-03-29 10:43:29 +09:00
Dan Balasescu	604d487366	Merge pull request #565 from peppy/dynamic-recompile ... Dynamically recompile VisualTests	2017-03-29 10:20:33 +09:00
smoogipooo	8f01bd75a1	Update framework.	2017-03-29 10:16:35 +09:00
Dan Balasescu	d7674e2367	Merge branch 'master' into dynamic-recompile	2017-03-29 10:12:48 +09:00
Dean Herbert	ab97967237	Update references and framework.	2017-03-29 09:54:00 +09:00
smoogipooo	d74454141b	Remove explicit life time end.	2017-03-29 09:12:21 +09:00
smoogipooo	e518508f2d	Better life time ends.	2017-03-29 09:11:07 +09:00
smoogipooo	bbc6a4234a	Fix post-merge errors.	2017-03-29 09:08:26 +09:00
smoogipooo	c478c74227	Merge remote-tracking branch 'origin/master' into taiko_hit_drawing	2017-03-29 09:03:19 +09:00
smoogipooo	6d5b0a13e4	Fix resharper warning.	2017-03-29 09:02:49 +09:00
smoogipooo	7fc68864be	Move swells on top of the playfield when they reach the hit target.	2017-03-29 09:01:40 +09:00
smoogipooo	6bee57c94f	Better life time ends.	2017-03-29 08:41:50 +09:00
smoogipooo	45653d7b43	Fix post-merge errors.	2017-03-29 08:32:34 +09:00
smoogipooo	eabcae82c6	Merge remote-tracking branch 'origin/master' into taiko_swell_drawing ... Conflicts: osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-03-29 08:30:30 +09:00
Dan Balasescu	5e734a9271	Merge pull request #566 from peppy/move-easingtypes ... Move EasingTypes up one namespace level.	2017-03-29 08:24:38 +09:00
smoogipooo	6856e17364	Update framework.	2017-03-29 08:17:54 +09:00
Dan Balasescu	bca18ce209	Merge branch 'master' into move-easingtypes	2017-03-29 08:14:13 +09:00
Dan Balasescu	2bb8e3bae8	Merge pull request #558 from peppy/avatars-and-login ... Avatar refactoring & better focus handling in login form.	2017-03-29 08:12:05 +09:00
Dan Balasescu	e53a5a3521	Merge branch 'master' into avatars-and-login	2017-03-29 07:52:43 +09:00
Dean Herbert	f7dc7e9bb9	Update references.	2017-03-28 21:26:20 +09:00
Dean Herbert	24a105704a	Update framework.	2017-03-28 20:39:08 +09:00
Dan Balasescu	0a1b9fe398	Merge branch 'master' into taiko_hit_drawing	2017-03-28 17:25:07 +09:00
Dean Herbert	4bdf9e09ca	Merge pull request #560 from smoogipooo/general_taiko_fixes ... General taiko fixes	2017-03-28 16:12:19 +09:00
smoogipooo	ae4cabccef	Adjust comment.	2017-03-28 16:00:39 +09:00
Dean Herbert	ffbf6888c4	Merge branch 'master' into general_taiko_fixes	2017-03-28 15:40:55 +09:00
Dean Herbert	28bde5eecd	Merge pull request #559 from smoogipooo/rename_accented ... Rename Accented to Strong.	2017-03-28 15:40:35 +09:00
Dean Herbert	4042b94e01	Use DelayedLoadContainer in more places.	2017-03-28 15:28:58 +09:00
smoogipooo	3f6b17c0bf	Add drawable Swell.	2017-03-28 15:05:45 +09:00
Dean Herbert	f690e1d0c4	Move async logic to framework.	2017-03-28 14:24:34 +09:00
Dean Herbert	076dd73e84	Merge branch 'master' into rename_accented	2017-03-28 14:22:33 +09:00
Dean Herbert	8ad4c5f312	Merge pull request #513 from smoogipooo/taiko_drumroll_drawable ... Drawable DrumRoll Implementation (Input only)	2017-03-28 14:21:44 +09:00
smoogipooo	ec9a027b59	ZZZZZZZzzzzzzzz.	2017-03-28 11:21:01 +09:00
smoogipooo	b7d9de57a2	Add rim hits.	2017-03-28 11:18:12 +09:00
smoogipooo	1faff828d1	Move piece to Pieces/.	2017-03-28 11:01:35 +09:00
smoogipooo	3f1e8ddcd1	License headers + general fixes.	2017-03-28 10:51:22 +09:00
smoogipooo	621bcaed59	Add drawable Hits/StrongHits.	2017-03-28 10:33:23 +09:00
smoogipooo	2211c08441	Properly set playfield scale.	2017-03-28 10:32:27 +09:00
smoogipooo	542cff0976	Move consts to CirclePiece.	2017-03-28 10:32:01 +09:00
smoogipooo	2ff4aa5346	Merge branch 'rename_accented' into taiko_hit_drawing	2017-03-28 10:04:52 +09:00
smoogipooo	4c7e523d18	Rename Accented to Strong.	2017-03-28 10:02:41 +09:00
smoogipooo	4bb60607e1	Add property to make the div2 internal.	2017-03-28 09:50:43 +09:00
smoogipooo	4c7a724beb	Merge remote-tracking branch 'origin/master' into taiko_drumroll_drawable	2017-03-28 09:44:50 +09:00
Dan Balasescu	a52991c101	Merge pull request #557 from peppy/update-grade-textures ... Update grade textures.	2017-03-28 09:26:09 +09:00
Dean Herbert	36af868f44	Add missing licence header.	2017-03-28 00:13:38 +09:00
Dean Herbert	768b3c4b4b	Add better focus handling in the login form.	2017-03-28 00:08:27 +09:00
Dean Herbert	13272e6995	Make Avatar accept a user. ... Add UpdateableAvatar to handle the toolbar use-case.	2017-03-28 00:08:26 +09:00
Dean Herbert	039f4a65dc	Combine user models.	2017-03-28 00:08:24 +09:00
Dean Herbert	55df07a872	Fix username being cleared when it shouldn't be.	2017-03-28 00:08:22 +09:00