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
|
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
|
a7eb219d39
|
Add basic support for drawing circles.
Conflicts:
osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
|
2017-03-20 19:30:54 +09:00 |
|
smoogipooo
|
ed9c7c8008
|
Add license headers.
|
2017-03-20 18:25:12 +09:00 |
|
smoogipooo
|
34b734275b
|
Add license headers.
|
2017-03-20 18:24:28 +09:00 |
|
smoogipooo
|
57c708619d
|
Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-20 18:21:05 +09:00 |
|
smoogipooo
|
b751cd4f29
|
Merge branch 'taiko_bash_base' into taiko_bash_drawable
|
2017-03-20 18:20:44 +09:00 |
|
smoogipooo
|
3f7cd41490
|
Merge branch 'master' into taiko_bash_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-20 18:20:32 +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
|
aaa368e014
|
Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-20 18:12:16 +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
|
409160859d
|
Remove explicit namespacing.
|
2017-03-20 18:07:44 +09:00 |
|
smoogipooo
|
70be33bde0
|
Merge branch 'taiko_drumroll_base' into taiko_drumroll_drawable
|
2017-03-20 18:06:00 +09:00 |
|
smoogipooo
|
a3e406af6a
|
Merge branch 'master' into taiko_drumroll_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-20 18:05:54 +09:00 |
|
smoogipooo
|
edd9a22177
|
License headers.
|
2017-03-20 17:02:06 +09:00 |
|
smoogipooo
|
f87f334dcd
|
Merge branch 'master' into taiko_note_circle
|
2017-03-20 16:55:08 +09:00 |
|
smoogipooo
|
730824fa58
|
Move pieces out of the visual test, fix up comments, rewrite FinisherPiece.
|
2017-03-20 16:50:22 +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
|
ecd6958eea
|
Add basic DrawableDrumRoll (no graphics yet, just input).
|
2017-03-17 19:30:22 +09:00 |
|
smoogipooo
|
7860199fbd
|
Fix post-merge errors.
|
2017-03-17 19:27:06 +09:00 |
|
smoogipooo
|
04bc37b079
|
Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable
|
2017-03-17 19:26:30 +09:00 |
|
smoogipooo
|
e3afa9bf71
|
Fix post-merge errors.
|
2017-03-17 19:25:55 +09:00 |
|
smoogipooo
|
39c2703fef
|
Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable
|
2017-03-17 19:24:57 +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 0e4ed829f2d148558d2f9a671ea4118ea1ab3965.
|
2017-03-17 19:23:18 +09:00 |
|
smoogipooo
|
1ede12d847
|
Add basic DrawableDrumRollTick (no graphics yet, just input).
|
2017-03-17 19:08:50 +09:00 |
|
smoogipooo
|
e977f25cc4
|
Merge branch 'taiko_drumroll_base' into taiko_drumroll_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-17 19:00:35 +09:00 |
|
smoogipooo
|
a2d07acb4b
|
Fix post-merge errors.
|
2017-03-17 18:59:21 +09:00 |
|
smoogipooo
|
91775b33e3
|
Merge branch 'taiko_bash_base' into taiko_bash_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-17 18:58:48 +09:00 |
|
smoogipooo
|
e2673a94bf
|
Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable
|
2017-03-17 18:57:17 +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 |
|