3101 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
Dean Herbert	0ad070c2d8	Update grade textures.	2017-03-27 22:24:47 +09:00
Dan Balasescu	74d003bbf6	Merge pull request #556 from peppy/fix-drag-regression ... Fix regression in mouse dragging behaviour.	2017-03-27 21:38:24 +09:00
Dean Herbert	cc5154dd12	Fix regression in mouse dragging behaviour.	2017-03-27 17:55:57 +09:00
Dean Herbert	b8c8ca2f0e	Adjust input drum transition slightly.	2017-03-27 15:49:32 +09:00
Dean Herbert	d0b1fda24f	Fix merge fail.	2017-03-27 12:33:15 +09:00
Dean Herbert	4e50b28884	Merge branch 'master' into taiko_drumroll_drawable	2017-03-27 12:30:31 +09:00
Dean Herbert	d6d19d726b	Merge pull request #516 from smoogipooo/taiko_bash_drawable ... Drawable Bash Implementation (Input only)	2017-03-27 12:20:05 +09:00
Dean Herbert	dfd40c6b29	Merge branch 'master' into taiko_drumroll_drawable	2017-03-27 11:51:10 +09:00
Dean Herbert	e81040cfa1	Merge branch 'master' into taiko_bash_drawable	2017-03-27 11:51:08 +09:00
Dean Herbert	806d8bfd1c	Merge pull request #554 from smoogipooo/better_taiko_keys ... Move validKeys to DrawableTaikoHitObject. Cleanup + reword comments.	2017-03-27 11:22:41 +09:00
smoogipooo	bcaf2f9758	Use lambda expression.	2017-03-26 00:01:00 +09:00
smoogipooo	7c9900376f	Remove validKeys (now in DrawableTaikoHitObject).	2017-03-25 23:54:50 +09:00
smoogipooo	e5c674a051	Merge branch 'better_taiko_keys' into taiko_drumroll_drawable ... Conflicts: osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-03-25 23:52:41 +09:00
smoogipooo	d9ecb430ed	Remove validKeys (now in DrawableTaikoHitObject).	2017-03-25 23:48:13 +09:00