mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-11-05 06:14:36 +00:00
Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret
This commit is contained in:
commit
eae5b1888c
|
@ -184,8 +184,6 @@ class Note extends FlxSprite
|
|||
}
|
||||
|
||||
prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.5 * PlayState.SONG.speed;
|
||||
if (PreferencesMenu.getPref('downscroll'))
|
||||
prevNote.angle = 0;
|
||||
prevNote.updateHitbox();
|
||||
// prevNote.setGraphicSize();
|
||||
}
|
||||
|
|
|
@ -1622,16 +1622,13 @@ class PlayState extends MusicBeatState
|
|||
}
|
||||
}
|
||||
|
||||
if (unspawnNotes[0] != null)
|
||||
while (unspawnNotes[0] != null &&unspawnNotes[0].strumTime - Conductor.songPosition < 1500 / SONG.speed)
|
||||
{
|
||||
if (unspawnNotes[0].strumTime - Conductor.songPosition < 1500)
|
||||
{
|
||||
var dunceNote:Note = unspawnNotes[0];
|
||||
notes.add(dunceNote);
|
||||
var dunceNote:Note = unspawnNotes[0];
|
||||
notes.add(dunceNote);
|
||||
|
||||
var index:Int = unspawnNotes.indexOf(dunceNote);
|
||||
unspawnNotes.splice(index, 1);
|
||||
}
|
||||
var index:Int = unspawnNotes.indexOf(dunceNote);
|
||||
unspawnNotes.splice(index, 1);
|
||||
}
|
||||
|
||||
if (generatedMusic)
|
||||
|
@ -1663,6 +1660,7 @@ class PlayState extends MusicBeatState
|
|||
var swagRect:FlxRect = new FlxRect(0, 0, daNote.width / daNote.scale.x, daNote.height / daNote.scale.y);
|
||||
|
||||
swagRect.height = (strumLineMid - daNote.y) / daNote.scale.y;
|
||||
swagRect.y = daNote.height / daNote.scale.y - swagRect.height;
|
||||
daNote.clipRect = swagRect;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue