|
|
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 |
|
|
|
75dba19e7b
|
Merge branch 'master' into taiko_drumroll_drawable
|
2017-03-24 15:00:35 +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 |
|
|
|
730051520e
|
Add a way to determine the type of a Hit.
|
2017-03-24 14:23:32 +09:00 |
|
|
|
afdb719c60
|
Rename finisher -> accented.
|
2017-03-24 11:09:01 +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 |
|
|
|
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 |
|
|
|
768bc2bb5f
|
Make TaikoHitObject store whether the hit object is a finisher.
|
2017-03-23 19:14:21 +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 |
|
|
|
96fc8eef30
|
Merge branch 'master' into taiko_hitobject_drawable
|
2017-03-23 17:23:22 +09:00 |
|
|
|
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 |
|
|
|
a40338614a
|
Merge branch 'master' into taiko_note_circle
|
2017-03-23 14:29:24 +09:00 |
|
|
|
acfa0c4762
|
Merge branch 'master' into taiko_base_hit
|
2017-03-23 14:26:35 +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 |
|
|
|
db8bf8a78f
|
Add Hit class, make TaikoHitObject abstract.
|
2017-03-23 11:21:45 +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 |
|
|
|
39134d79a8
|
Merge branch 'master' into taiko_hitobject_drawable
|
2017-03-23 11:03:42 +09:00 |
|
|
|
53c6665e07
|
Merge branch 'master' into taiko_bash_base
|
2017-03-23 10:57:15 +09:00 |
|
|
|
bf94587ca7
|
Add TODO.
|
2017-03-23 10:56:30 +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 |
|
|
|
b3dde2c399
|
A bit more protection.
|
2017-03-22 01:35:39 +09:00 |
|
|
|
cf251618c7
|
Merge remote-tracking branch 'origin/master' into taiko_bash_base
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-22 01:34:47 +09:00 |
|
|
|
712d2e194c
|
A bit more protection.
|
2017-03-22 01:33:22 +09:00 |
|
|
|
a346191ca7
|
Merge remote-tracking branch 'origin/master' into taiko_drumroll_base
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-22 01:27:07 +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 |
|
|
|
34b734275b
|
Add license headers.
|
2017-03-20 18:24:28 +09:00 |
|
