1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 13:17:26 +08:00
Commit Graph

16 Commits

Author SHA1 Message Date
smoogipooo
5281842965 Rewrite CirclePiece to be referenced to 128x128px and handle accented hits more sanely. 2017-03-24 18:37:56 +09:00
smoogipooo
6753a22512 Fix post-merge issues. 2017-03-24 16:03:38 +09:00
smoogipooo
99f1e86a5e Fix something that was removed during merge conflicts. 2017-03-24 15:19:58 +09:00
smoogipooo
bb4b6b783c Fix post-merge errors. 2017-03-24 15:14:49 +09:00
smoogipooo
20e80a758a Merge branch 'master' into taiko_drawable_drawing
Conflicts:
	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 15:11:56 +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
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
smoogipooo
aa8780797e Abstract class + move AccentColour to base. 2017-03-22 15:22:02 +09:00
smoogipooo
24e78d015e Make UpdateScrollPosition virtual. 2017-03-22 01:46:06 +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
75fb7a3eb3 Suppress Resharper. 2017-03-20 18:10:09 +09:00
smoogipooo
5136064cb3 Revert "Make DrawableTaikoHitObject generic."
This reverts commit 0e4ed829f2.
2017-03-17 19:23:18 +09:00
smoogipooo
0e4ed829f2 Make DrawableTaikoHitObject generic. 2017-03-17 18:55:54 +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
2e0d100a22 Add base DrawableTaikoHitObject, remove DrawableTaikoHit. 2017-03-17 15:19:56 +09:00