Commit Graph

38 Commits

Author SHA1 Message Date
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
24e78d015e Make UpdateScrollPosition virtual. 2017-03-22 01:46:06 +09:00
34b734275b Add license headers. 2017-03-20 18:24:28 +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
090e8bbb79 Remove hit object types solution-wide. 2017-03-20 13:10:24 +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
7860199fbd Fix post-merge errors. 2017-03-17 19:27:06 +09:00
04bc37b079 Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable 2017-03-17 19:26:30 +09:00
5136064cb3 Revert "Make DrawableTaikoHitObject generic."
This reverts commit 0e4ed829f2.
2017-03-17 19:23:18 +09:00
1ede12d847 Add basic DrawableDrumRollTick (no graphics yet, just input). 2017-03-17 19:08:50 +09:00
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
0e4ed829f2 Make DrawableTaikoHitObject generic. 2017-03-17 18:55:54 +09:00
35f63cb2aa Set Anchor/Origin and RelativePositionAxes. 2017-03-17 16:10:40 +09:00
cdfe95c159 Add AcentColour and xmldoc. 2017-03-17 16:05:16 +09:00
f48af91686 Appease the resharper gods. 2017-03-17 15:45:54 +09:00
2e0d100a22 Add base DrawableTaikoHitObject, remove DrawableTaikoHit. 2017-03-17 15:19:56 +09:00
12de3f6657 Implement DrumRoll + DrumRollTick. 2017-03-17 13:56:14 +09:00
b399c6adbb Implement TaikoHitObject. 2017-03-17 13:38:48 +09:00
28240fb3b5 Rename TaikoBaseHit -> TaikoHitObject. 2017-03-17 13:33:48 +09:00
5a47fd659c Fix up warnings, convert back to float position. 2017-03-14 13:11:07 +09:00
f50e0bbf3c Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use. 2017-03-13 19:15:25 +09:00
0cad5d7d41 Fix most warnings. 2017-03-07 13:05:57 +09:00
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
38b25a7df3 Add hit object stacking. 2017-02-09 07:28:40 +01:00
50bd80cb0c Update and standardise license headers. 2017-02-07 14:27:41 +09:00
3ac89216bd Standardise some naming and make hitcircles feel better. 2016-11-19 19:07:57 +09:00
4590be552f Move play modes to their own projects. 2016-11-14 18:54:24 +09:00