1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 06:47:25 +08:00
Commit Graph

333 Commits

Author SHA1 Message Date
Dan Balasescu
5f0c681feb Merge branch 'master' into taiko_drumroll_drawing 2017-03-30 14:10:57 +09:00
smoogipooo
7ba7bc18f8 Don't use a List for HitKeys. 2017-03-29 15:35:22 +09:00
Dan Balasescu
7ee7954f62 Merge branch 'master' into taiko_hit_drawing 2017-03-29 15:22:32 +09:00
smoogipooo
74e12bd95e Rewrite how drawable-specific circle pieces are instantiated. 2017-03-29 14:01:01 +09:00
Dean Herbert
d64f00cae2 Merge pull request #563 from smoogipooo/general_taiko_fixes
General taiko fixes
2017-03-29 13:33:40 +09:00
smoogipooo
1c503edad1 Add explicit delay + expire (this will be moved into the base DrawableHitObject later). 2017-03-29 13:19:48 +09:00
smoogipooo
1a56c48ddb Don't need CentreLeft anchors. 2017-03-29 13:07:43 +09:00
smoogipooo
b10f9512ad Remove unused using. 2017-03-29 11:40:13 +09:00
smoogipooo
1b291ec1a1 Make drumroll body colour depending on completion. 2017-03-29 09:38:24 +09:00
smoogipooo
2a018e708d Better life time end. 2017-03-29 09:36:07 +09:00
smoogipooo
7b479ac737 Merge remote-tracking branch 'origin/master' into taiko_drumroll_drawing 2017-03-29 09:12:48 +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
Dan Balasescu
bca18ce209 Merge branch 'master' into move-easingtypes 2017-03-29 08:14:13 +09:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
smoogipooo
714c280531 One more xmldoc. 2017-03-28 17:26:39 +09:00
Dan Balasescu
0a1b9fe398 Merge branch 'master' into taiko_hit_drawing 2017-03-28 17:25:07 +09:00
smoogipooo
79764603d7 Adjust comment. 2017-03-28 17:19:05 +09:00
smoogipooo
efa7e5cb7d Adjust radius. 2017-03-28 17:14:06 +09:00
smoogipooo
adf2550811 Base playfield height + hit target offset on hit object height. 2017-03-28 17:13:05 +09:00
smoogipooo
6f66558e29 Use relative size for ticks. 2017-03-28 17:10:01 +09:00
smoogipooo
6b1dab5b83 Implement drawable drumroll. 2017-03-28 17:08:34 +09:00
smoogipooo
2e8607687c Implement DrumRollTick drawing. 2017-03-28 16:49:39 +09:00
smoogipooo
1220972170 Fix ticks not being passed IsStrong. 2017-03-28 16:47:25 +09:00
smoogipooo
1615db386a Give DrumRoll some sane velocity/tickdistance defaults. 2017-03-28 16:47:13 +09:00
smoogipooo
d1f686b1a8 Fix DrawableTaikoHitObject origins. 2017-03-28 16:38:58 +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
076dd73e84 Merge branch 'master' into rename_accented 2017-03-28 14:22:33 +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
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
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
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
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
smoogipooo
9b0a15cd6c Fix post-merge errors. 2017-03-25 23:48:00 +09:00
smoogipooo
6e5db7b75d Merge branch 'better_taiko_keys' into taiko_bash_drawable
Conflicts:
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
2017-03-25 23:44:40 +09:00