be4ab13f4d
Rename finisher -> accented.
2017-03-25 20:30:26 +09:00
cb189bd006
Merge remote-tracking branch 'origin/master' into taiko_hit_drawables
2017-03-25 20:16:25 +09:00
55d7b027d2
Merge branch 'master' into taiko_drumroll_drawable
2017-03-24 21:26:42 +09:00
2ee68ae75a
Make CirclePiece use relative width (leaving length control to DrawableDrumRoll).
2017-03-24 20:10:17 +09:00
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
405c6f9691
More explicative xmldoc.
2017-03-24 19:05:45 +09:00
369e3903ac
Don't use a magic number.
2017-03-24 19:04:46 +09:00
feecf23d9f
Don't force the size.
2017-03-24 19:04:32 +09:00
df46d0f446
Cleanup.
2017-03-24 18:49:10 +09:00
5281842965
Rewrite CirclePiece to be referenced to 128x128px and handle accented hits more sanely.
2017-03-24 18:37:56 +09:00
47065d8031
Remove explicit alpha = 1.
2017-03-24 16:15:14 +09:00
6753a22512
Fix post-merge issues.
2017-03-24 16:03:38 +09:00
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
d6d3eb99b7
Adjust comment.
2017-03-24 15:55:25 +09:00
82752e0988
Moar cleanup.
2017-03-24 15:50:18 +09:00
95183279f3
Rename ScrollingCirclePiece -> ScrollingPiece.
2017-03-24 15:44:43 +09:00
eea24b2d82
Make sure icon is only instantiated once.
2017-03-24 15:43:17 +09:00
aa9a65d69c
Move load below CreateIcon().
2017-03-24 15:42:48 +09:00
99f1e86a5e
Fix something that was removed during merge conflicts.
2017-03-24 15:19:58 +09:00
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
bb4b6b783c
Fix post-merge errors.
2017-03-24 15:14:49 +09:00
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
79fa9daec8
Fix post-merge errors.
2017-03-24 15:05:54 +09:00
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
45b013c85f
Fix post-merge errors.
2017-03-24 14:59:59 +09:00
bf3846eedb
Merge branch 'master' into taiko_hit_drawables
2017-03-24 14:55:07 +09:00
cce5b4f80f
Make readonly.
2017-03-24 14:42:42 +09:00
ac2d36da3b
Merge branch 'master' into taiko_note_circle
2017-03-24 14:33:08 +09:00
60dcf2d14d
Make readonly.
2017-03-23 19:43:49 +09:00
315deb6f12
Fix post-merge errors.
2017-03-23 19:43:00 +09:00
217fd14595
Merge branch 'taiko_drumroll_tick_judgements' into taiko_drumroll_drawable
2017-03-23 19:40:14 +09:00
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
2d5bb326f0
Merge branch 'master' into taiko_drumroll_drawable
2017-03-23 17:55:08 +09:00
a40338614a
Merge branch 'master' into taiko_note_circle
2017-03-23 14:29:24 +09:00
681ed38941
Use const whenever possible.
2017-03-23 13:52:38 +09:00
54e1b24fe9
Enforce readonly private members where possible.
2017-03-23 13:50:08 +09:00
5daa574551
Don't set lifetime until LoadComplete (fixes possible clock nullref if added without a clock).
2017-03-23 11:05:58 +09:00
5e0d9c3820
Cleanups + CircularContainer fixes.
2017-03-23 09:18:50 +09:00
aa8780797e
Abstract class + move AccentColour to base.
2017-03-22 15:22:02 +09:00
a72ae319a1
Override UpdateScrollPosition instead of Update.
2017-03-22 01:55:41 +09:00
1532ae78a4
Fix post-merge errors.
2017-03-22 01:55:31 +09:00
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
90c441f614
Override UpdateScrollPosition instead of Update.
2017-03-22 01:51:53 +09:00
b3e8a2257c
Fix post-merge errors.
2017-03-22 01:51:44 +09:00
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
e4926d54ab
Fix post-merge errors.
2017-03-22 01:48:51 +09:00
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
24e78d015e
Make UpdateScrollPosition virtual.
2017-03-22 01:46:06 +09:00
a7eb219d39
Add basic support for drawing circles.
...
Conflicts:
osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
2017-03-20 19:30:54 +09:00
ed9c7c8008
Add license headers.
2017-03-20 18:25:12 +09:00
