Dean Herbert
|
acfa0c4762
|
Merge branch 'master' into taiko_base_hit
|
2017-03-23 14:26:35 +09:00 |
|
Dean Herbert
|
63948564c6
|
Merge branch 'master' into taiko_conversion
|
2017-03-23 14:26:24 +09:00 |
|
Dean Herbert
|
681ed38941
|
Use const whenever possible.
|
2017-03-23 13:52:38 +09:00 |
|
Dean Herbert
|
54e1b24fe9
|
Enforce readonly private members where possible.
|
2017-03-23 13:50:08 +09:00 |
|
smoogipooo
|
8e1eef25b4
|
Fix some lone newlines.
|
2017-03-23 13:20:17 +09:00 |
|
smoogipooo
|
aa2b22ff12
|
Fix usings.
|
2017-03-23 13:02:34 +09:00 |
|
smoogipooo
|
cedcab1e26
|
s/Ring/Hit + privatize Judgement inside RingExplosion.
|
2017-03-23 13:02:01 +09:00 |
|
smoogipooo
|
00054f1573
|
Comment out unused container for now.
|
2017-03-23 12:56:32 +09:00 |
|
smoogipooo
|
7f33e10db0
|
Renaming + don't use List.
|
2017-03-23 12:53:38 +09:00 |
|
smoogipooo
|
39ff026b27
|
Reimplement JudgementText with the new DrawableJudgementInfo.
|
2017-03-23 12:49:58 +09:00 |
|
smoogipooo
|
8b71d70633
|
Add a way to get the score string from JugementInfo.
|
2017-03-23 12:21:09 +09:00 |
|
smoogipooo
|
b77b039d73
|
Don't instantiate TaikoHitObject.
|
2017-03-23 11:25:38 +09:00 |
|
smoogipooo
|
f3907ba831
|
Merge branch 'taiko_base_hit' into taiko_conversion
|
2017-03-23 11:24:59 +09:00 |
|
Dan Balasescu
|
9a7504a622
|
Merge branch 'master' into taiko_conversion
|
2017-03-23 11:24:30 +09:00 |
|
smoogipooo
|
db8bf8a78f
|
Add Hit class, make TaikoHitObject abstract.
|
2017-03-23 11:21:45 +09:00 |
|
Dan Balasescu
|
2c580f43e9
|
Merge branch 'master' into taiko_playfield_2
|
2017-03-23 11:10:23 +09:00 |
|
smoogipooo
|
5daa574551
|
Don't set lifetime until LoadComplete (fixes possible clock nullref if added without a clock).
|
2017-03-23 11:05:58 +09:00 |
|
Dan Balasescu
|
39134d79a8
|
Merge branch 'master' into taiko_hitobject_drawable
|
2017-03-23 11:03:42 +09:00 |
|
Dean Herbert
|
53c6665e07
|
Merge branch 'master' into taiko_bash_base
|
2017-03-23 10:57:15 +09:00 |
|
Dean Herbert
|
bf94587ca7
|
Add TODO.
|
2017-03-23 10:56:30 +09:00 |
|
Dan Balasescu
|
e3bc837b61
|
Merge branch 'master' into taiko_drawable_drawing
|
2017-03-23 10:44:00 +09:00 |
|
smoogipooo
|
5e0d9c3820
|
Cleanups + CircularContainer fixes.
|
2017-03-23 09:18:50 +09:00 |
|
smoogipooo
|
75a51fbcc7
|
Merge branch 'taiko_playfield_2' into taiko_barlines
|
2017-03-23 09:13:24 +09:00 |
|
smoogipooo
|
9c325ddd33
|
Cleanups + fix CircularContainer usages.
|
2017-03-23 09:12:51 +09:00 |
|
smoogipooo
|
2cb6757f14
|
Merge remote-tracking branch 'origin/master' into taiko_barlines
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-23 09:01:00 +09:00 |
|
smoogipooo
|
aa8780797e
|
Abstract class + move AccentColour to base.
|
2017-03-22 15:22:02 +09:00 |
|
smoogipooo
|
a72ae319a1
|
Override UpdateScrollPosition instead of Update.
|
2017-03-22 01:55:41 +09:00 |
|
smoogipooo
|
1532ae78a4
|
Fix post-merge errors.
|
2017-03-22 01:55:31 +09:00 |
|
smoogipooo
|
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 |
|
smoogipooo
|
a75a2e1794
|
Fix more post-merge errors.
|
2017-03-22 01:52:55 +09:00 |
|
smoogipooo
|
90c441f614
|
Override UpdateScrollPosition instead of Update.
|
2017-03-22 01:51:53 +09:00 |
|
smoogipooo
|
b3e8a2257c
|
Fix post-merge errors.
|
2017-03-22 01:51:44 +09:00 |
|
smoogipooo
|
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 |
|
smoogipooo
|
e4926d54ab
|
Fix post-merge errors.
|
2017-03-22 01:48:51 +09:00 |
|
smoogipooo
|
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 |
|
smoogipooo
|
24e78d015e
|
Make UpdateScrollPosition virtual.
|
2017-03-22 01:46:06 +09:00 |
|
smoogipooo
|
62dcd4fa59
|
Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-22 01:45:02 +09:00 |
|
smoogipooo
|
e7a93073a4
|
Fix post-merge errors.
|
2017-03-22 01:42:40 +09:00 |
|
smoogipooo
|
afcd42b06d
|
Merge remote-tracking branch 'origin/master' into taiko_playfield_2
|
2017-03-22 01:38:53 +09:00 |
|
smoogipooo
|
b3dde2c399
|
A bit more protection.
|
2017-03-22 01:35:39 +09:00 |
|
smoogipooo
|
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 |
|
smoogipooo
|
712d2e194c
|
A bit more protection.
|
2017-03-22 01:33:22 +09:00 |
|
smoogipooo
|
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 |
|
smoogipooo
|
863f49c2bd
|
Rename MAX_SCORE -> MAX_HIT_RESULT.
|
2017-03-21 21:38:39 +09:00 |
|
smoogipooo
|
d9524f692d
|
Renamings.
|
2017-03-21 21:36:05 +09:00 |
|
smoogipooo
|
ad74797cd4
|
End letter oppression.
|
2017-03-21 21:31:31 +09:00 |
|
smoogipooo
|
9f3def05ef
|
Add test case for bar lines.
|
2017-03-21 21:27:20 +09:00 |
|
smoogipooo
|
507e453409
|
Implement barline conversion from control points.
|
2017-03-21 21:26:29 +09:00 |
|
smoogipooo
|
b602b7a3ea
|
Add barline drawables.
|
2017-03-21 20:39:18 +09:00 |
|
smoogipooo
|
4bc038addd
|
Merge branch 'taiko_playfield_2' into taiko_barlines
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-21 20:24:33 +09:00 |
|