smoogipooo
3050039972
Implement partial judgements + make Result non-nullable.
2017-03-29 18:35:28 +09:00
smoogipooo
1b3e908565
Fix notelocking by pressing a key before the swell's start time.
2017-03-29 16:02:12 +09:00
smoogipooo
3d2c8f19ae
Make Swells require alternating key hits.
2017-03-29 15:59:12 +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
37dcc8b71d
Rewrite how swell circle piece is instantiated.
2017-03-29 14:52:14 +09:00
smoogipooo
400a57ace6
Fix delay + animations a bit (peppy).
2017-03-29 14:50:10 +09:00
smoogipooo
74e12bd95e
Rewrite how drawable-specific circle pieces are instantiated.
2017-03-29 14:01:01 +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
b54e8356f2
Merge remote-tracking branch 'origin/master' into taiko_replays
...
Conflicts:
osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-29 10:56:24 +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
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
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
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
Dean Herbert
ffbf6888c4
Merge branch 'master' into general_taiko_fixes
2017-03-28 15:40:55 +09:00
smoogipooo
3f6b17c0bf
Add drawable Swell.
2017-03-28 15:05:45 +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
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
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
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
smoogipooo
989a6ab02b
Move validKeys to DrawableTaikoHitObject. Cleanup + reword comments.
2017-03-25 23:43:41 +09:00
Dean Herbert
a774a68456
Merge branch 'master' into taiko_bash_drawable
2017-03-25 22:01:50 +09:00
smoogipooo
cbb6930f76
Remove CreateCircle() - hitobjects should handle the addition of this to their hierarchy themselves.
...
CreateCircle() lends itself to a few issues:
- It can't be used for drum roll ticks unless it returned a Container instead, at which point the method loses its meaning, and I would rather that constructed in the ctor.
- Writing `return Accented ? new AccentedCirclePiece() : new CirclePiece()` in two places as the body of this method feels wrong - it's something I would expect to be taken care of in the base DrawableTaikoHitObject, but that leads back to #1 .
- Swells don't have an AccentedCirclePiece, so #2 becomes more problematic.
2017-03-25 20:58:02 +09:00
smoogipooo
e7941859e4
Rename bash -> swell.
2017-03-25 20:57:49 +09:00
smoogipooo
a7cea811f4
Merge remote-tracking branch 'origin/master' into taiko_bash_drawable
...
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-25 20:55:14 +09:00
smoogipooo
5bd9147661
Remove CreateCircle() - hitobjects should handle the addition of this to their hierarchy themselves.
...
CreateCircle() lends itself to a few issues:
- It can't be used for drum roll ticks unless it returned a Container instead, at which point the method loses its meaning, and I would rather that constructed in the ctor.
- Writing `return Accented ? new AccentedCirclePiece() : new CirclePiece()` in two places as the body of this method feels wrong - it's something I would expect to be taken care of in the base DrawableTaikoHitObject, but that leads back to #1 .
- Swells don't have an AccentedCirclePiece, so #2 becomes more problematic.
2017-03-25 20:53:45 +09:00
smoogipooo
be4ab13f4d
Rename finisher -> accented.
2017-03-25 20:30:26 +09:00
smoogipooo
cb189bd006
Merge remote-tracking branch 'origin/master' into taiko_hit_drawables
2017-03-25 20:16:25 +09:00
Dean Herbert
55d7b027d2
Merge branch 'master' into taiko_drumroll_drawable
2017-03-24 21:26:42 +09:00
smoogipooo
2ee68ae75a
Make CirclePiece use relative width (leaving length control to DrawableDrumRoll).
2017-03-24 20:10:17 +09:00
smoogipooo
fdd17c1575
Rewrite circle pieces to use custom graphics again.
...
Also using FontAwesome for now to enforce the same size, because otherwise you have to mess around with sprites + the custom graphics. This will all be changed when sprites are fixed to maintain aspect ratios and when glow/border use relative axes.
2017-03-24 20:08:40 +09:00
smoogipooo
405c6f9691
More explicative xmldoc.
2017-03-24 19:05:45 +09:00
smoogipooo
369e3903ac
Don't use a magic number.
2017-03-24 19:04:46 +09:00
smoogipooo
feecf23d9f
Don't force the size.
2017-03-24 19:04:32 +09:00
smoogipooo
df46d0f446
Cleanup.
2017-03-24 18:49:10 +09:00
smoogipooo
5281842965
Rewrite CirclePiece to be referenced to 128x128px and handle accented hits more sanely.
2017-03-24 18:37:56 +09:00
smoogipooo
47065d8031
Remove explicit alpha = 1.
2017-03-24 16:15:14 +09:00
smoogipooo
6753a22512
Fix post-merge issues.
2017-03-24 16:03:38 +09:00
smoogipooo
33c160efeb
Merge branch 'taiko_note_circle' into taiko_drawable_drawing
...
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 16:02:49 +09:00
smoogipooo
d6d3eb99b7
Adjust comment.
2017-03-24 15:55:25 +09:00
smoogipooo
82752e0988
Moar cleanup.
2017-03-24 15:50:18 +09:00
smoogipooo
95183279f3
Rename ScrollingCirclePiece -> ScrollingPiece.
2017-03-24 15:44:43 +09:00
smoogipooo
eea24b2d82
Make sure icon is only instantiated once.
2017-03-24 15:43:17 +09:00
smoogipooo
aa9a65d69c
Move load below CreateIcon().
2017-03-24 15:42:48 +09:00
smoogipooo
99f1e86a5e
Fix something that was removed during merge conflicts.
2017-03-24 15:19:58 +09:00
smoogipooo
3cecffbc48
Merge branch 'taiko_note_circle' into taiko_drawable_drawing
...
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 15:17:17 +09:00
smoogipooo
bb4b6b783c
Fix post-merge errors.
2017-03-24 15:14:49 +09:00
smoogipooo
20e80a758a
Merge branch 'master' into taiko_drawable_drawing
...
Conflicts:
osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 15:11:56 +09:00
smoogipooo
79fa9daec8
Fix post-merge errors.
2017-03-24 15:05:54 +09:00
smoogipooo
ce1257ba56
Merge branch 'master' into taiko_bash_drawable
...
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 15:03:55 +09:00
smoogipooo
75dba19e7b
Merge branch 'master' into taiko_drumroll_drawable
2017-03-24 15:00:35 +09:00
smoogipooo
45b013c85f
Fix post-merge errors.
2017-03-24 14:59:59 +09:00
Dan Balasescu
bf3846eedb
Merge branch 'master' into taiko_hit_drawables
2017-03-24 14:55:07 +09:00
smoogipooo
cce5b4f80f
Make readonly.
2017-03-24 14:42:42 +09:00
Dan Balasescu
ac2d36da3b
Merge branch 'master' into taiko_note_circle
2017-03-24 14:33:08 +09:00
smoogipooo
730051520e
Add a way to determine the type of a Hit.
2017-03-24 14:23:32 +09:00
smoogipooo
afdb719c60
Rename finisher -> accented.
2017-03-24 11:09:01 +09:00
smoogipooo
60dcf2d14d
Make readonly.
2017-03-23 19:43:49 +09:00
smoogipooo
315deb6f12
Fix post-merge errors.
2017-03-23 19:43:00 +09:00
smoogipooo
217fd14595
Merge branch 'taiko_drumroll_tick_judgements' into taiko_drumroll_drawable
2017-03-23 19:40:14 +09:00
smoogipooo
99cd215f56
Merge branch 'taiko_drumroll_tick_judgements' into taiko_scoreprocessing
...
Conflicts:
osu.Game.Modes.Taiko/TaikoScoreProcessor.cs
2017-03-23 19:38:00 +09:00
smoogipooo
768bc2bb5f
Make TaikoHitObject store whether the hit object is a finisher.
2017-03-23 19:14:21 +09:00
Dean Herbert
2cb801317d
JudgementInfo -> Judgement.
...
There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.
2017-03-23 19:00:18 +09:00
Dan Balasescu
2d5bb326f0
Merge branch 'master' into taiko_drumroll_drawable
2017-03-23 17:55:08 +09:00
Dean Herbert
96fc8eef30
Merge branch 'master' into taiko_hitobject_drawable
2017-03-23 17:23:22 +09:00
smoogipooo
3d1dad8185
Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable
...
Conflicts:
osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-23 14:40:06 +09:00
Dan Balasescu
a40338614a
Merge branch 'master' into taiko_note_circle
2017-03-23 14:29:24 +09:00
Dean Herbert
acfa0c4762
Merge branch 'master' into taiko_base_hit
2017-03-23 14:26:35 +09:00
Dean Herbert
681ed38941
Use const whenever possible.
2017-03-23 13:52:38 +09:00
