Commit Graph

186 Commits

Author SHA1 Message Date
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
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
b751cd4f29 Merge branch 'taiko_bash_base' into taiko_bash_drawable 2017-03-20 18:20:44 +09:00
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
75d09e7038 Fix unused usings. 2017-03-20 18:18:25 +09:00
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
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
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
75fb7a3eb3 Suppress Resharper. 2017-03-20 18:10:09 +09:00
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
409160859d Remove explicit namespacing. 2017-03-20 18:07:44 +09:00
70be33bde0 Merge branch 'taiko_drumroll_base' into taiko_drumroll_drawable 2017-03-20 18:06:00 +09:00
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
edd9a22177 License headers. 2017-03-20 17:02:06 +09:00
f87f334dcd Merge branch 'master' into taiko_note_circle 2017-03-20 16:55:08 +09:00
730824fa58 Move pieces out of the visual test, fix up comments, rewrite FinisherPiece. 2017-03-20 16:50:22 +09:00
090e8bbb79 Remove hit object types solution-wide. 2017-03-20 13:10:24 +09:00
b9006e4026 Remove Type. 2017-03-20 13:04:09 +09:00
c3d10f8abf Merge remote-tracking branch 'origin/master' into taiko_bash_base 2017-03-20 13:03:25 +09:00
b3b8fadf03 Remove Type. 2017-03-20 13:02:52 +09:00
7b7255863c Merge remote-tracking branch 'origin/master' into taiko_drumroll_base 2017-03-20 13:01:43 +09:00
73ffbf8142 Remove unnecessary using. 2017-03-19 11:52:16 +09:00
4b3308fd1d Remove TaikoHitObject Type, we won't be using this going forward. 2017-03-18 18:40:26 +09:00
ecd6958eea Add basic DrawableDrumRoll (no graphics yet, just input). 2017-03-17 19:30:22 +09:00