1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-18 13:52:54 +08:00
Commit Graph

91 Commits

Author SHA1 Message Date
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
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
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
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
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
5136064cb3 Revert "Make DrawableTaikoHitObject generic."
This reverts commit 0e4ed829f2.
2017-03-17 19:23:18 +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
0e4ed829f2 Make DrawableTaikoHitObject generic. 2017-03-17 18:55:54 +09:00
smoogipooo
891bd011c6 Add basic DrawableBash (no graphics yet, just input). 2017-03-17 18:54:44 +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
smoogipooo
d2194e3d2a Implement Bash. 2017-03-17 14:01:32 +09:00
smoogipooo
12de3f6657 Implement DrumRoll + DrumRollTick. 2017-03-17 13:56:14 +09:00
smoogipooo
b399c6adbb Implement TaikoHitObject. 2017-03-17 13:38:48 +09:00
smoogipooo
28240fb3b5 Rename TaikoBaseHit -> TaikoHitObject. 2017-03-17 13:33:48 +09:00
smoogipooo
5a47fd659c Fix up warnings, convert back to float position. 2017-03-14 13:11:07 +09:00
smoogipooo
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
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Thomas Müller
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
Damnae
38b25a7df3 Add hit object stacking. 2017-02-09 07:28:40 +01:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert
3ac89216bd Standardise some naming and make hitcircles feel better. 2016-11-19 19:07:57 +09:00
Dean Herbert
4590be552f Move play modes to their own projects. 2016-11-14 18:54:24 +09:00