Dan Balasescu
|
bf3846eedb
|
Merge branch 'master' into taiko_hit_drawables
|
2017-03-24 14:55:07 +09:00 |
|
smoogipooo
|
afdb719c60
|
Rename finisher -> accented.
|
2017-03-24 11:09:01 +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 |
|
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 |
|
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 |
|
Dean Herbert
|
54e1b24fe9
|
Enforce readonly private members where possible.
|
2017-03-23 13:50:08 +09:00 |
|
smoogipooo
|
db8bf8a78f
|
Add Hit class, make TaikoHitObject abstract.
|
2017-03-23 11:21:45 +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 |
|
smoogipooo
|
aa8780797e
|
Abstract class + move AccentColour to base.
|
2017-03-22 15:22:02 +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
|
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
|
ed9c7c8008
|
Add license headers.
|
2017-03-20 18:25:12 +09:00 |
|
smoogipooo
|
75d09e7038
|
Fix unused usings.
|
2017-03-20 18:18:25 +09:00 |
|
smoogipooo
|
da1b911da9
|
Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-20 18:18:17 +09:00 |
|
smoogipooo
|
5a28833c32
|
Merge branch 'master' into taiko_hit_drawables
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-20 18:17:18 +09:00 |
|
smoogipooo
|
75fb7a3eb3
|
Suppress Resharper.
|
2017-03-20 18:10:09 +09:00 |
|
smoogipooo
|
a27dae0beb
|
Merge branch 'master' into taiko_hitobject_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-20 18:09:05 +09:00 |
|
smoogipooo
|
090e8bbb79
|
Remove hit object types solution-wide.
|
2017-03-20 13:10:24 +09:00 |
|
smoogipooo
|
b9006e4026
|
Remove Type.
|
2017-03-20 13:04:09 +09:00 |
|
smoogipooo
|
c3d10f8abf
|
Merge remote-tracking branch 'origin/master' into taiko_bash_base
|
2017-03-20 13:03:25 +09:00 |
|
smoogipooo
|
b3b8fadf03
|
Remove Type.
|
2017-03-20 13:02:52 +09:00 |
|
smoogipooo
|
7b7255863c
|
Merge remote-tracking branch 'origin/master' into taiko_drumroll_base
|
2017-03-20 13:01:43 +09:00 |
|
Dean Herbert
|
73ffbf8142
|
Remove unnecessary using.
|
2017-03-19 11:52:16 +09:00 |
|
smoogipooo
|
4b3308fd1d
|
Remove TaikoHitObject Type, we won't be using this going forward.
|
2017-03-18 18:40:26 +09:00 |
|
smoogipooo
|
ad396c65ee
|
Fix post-merge errors.
|
2017-03-17 19:24:39 +09:00 |
|
smoogipooo
|
558641c317
|
Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables
|
2017-03-17 19:23:57 +09:00 |
|
smoogipooo
|
5136064cb3
|
Revert "Make DrawableTaikoHitObject generic."
This reverts commit 0e4ed829f2.
|
2017-03-17 19:23:18 +09:00 |
|
smoogipooo
|
938da01540
|
Fix post-merge errors.
|
2017-03-17 18:56:58 +09:00 |
|
smoogipooo
|
9f4f297bb7
|
Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables
|
2017-03-17 18:56:24 +09:00 |
|
smoogipooo
|
0e4ed829f2
|
Make DrawableTaikoHitObject generic.
|
2017-03-17 18:55:54 +09:00 |
|
smoogipooo
|
1892d86921
|
Add basic DrawableHitFinisher (no graphics yet, just input).
|
2017-03-17 17:38:49 +09:00 |
|
smoogipooo
|
863d4959af
|
Make OnKeyDown non-sealed.
|
2017-03-17 17:38:24 +09:00 |
|
smoogipooo
|
f26cf7bf68
|
Add basic DrawableHit (no graphics yet, just input).
|
2017-03-17 16:55:57 +09:00 |
|
smoogipooo
|
35f63cb2aa
|
Set Anchor/Origin and RelativePositionAxes.
|
2017-03-17 16:10:40 +09:00 |
|
smoogipooo
|
cdfe95c159
|
Add AcentColour and xmldoc.
|
2017-03-17 16:05:16 +09:00 |
|
smoogipooo
|
f48af91686
|
Appease the resharper gods.
|
2017-03-17 15:45:54 +09:00 |
|
smoogipooo
|
2e0d100a22
|
Add base DrawableTaikoHitObject, remove DrawableTaikoHit.
|
2017-03-17 15:19:56 +09:00 |
|
smoogipooo
|
d478a58a89
|
Invert getters and setters for EndTime / Duration.
|
2017-03-17 14:43:00 +09:00 |
|