Merge branch 'master' into taiko_note_circle

This commit is contained in:
Dan Balasescu
2017-03-23 14:29:24 +09:00
committed by GitHub
173 changed files with 2369 additions and 991 deletions

View File

@ -12,7 +12,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
{
internal class DrawableTaikoHit : Sprite
{
private TaikoHitObject h;
private readonly TaikoHitObject h;
public DrawableTaikoHit(TaikoHitObject h)
{
@ -29,7 +29,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
{
Texture = textures.Get(@"Menu/logo");
double duration = 0;
const double duration = 0;
Transforms.Add(new TransformPositionX { StartTime = h.StartTime - 200, EndTime = h.StartTime, StartValue = 1.1f, EndValue = 0.1f });
Transforms.Add(new TransformAlpha { StartTime = h.StartTime + duration + 200, EndTime = h.StartTime + duration + 400, StartValue = 1, EndValue = 0 });