cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-27 09:13:18 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret

Browse source
This commit is contained in:
Cameron Taylor 2021-03-31 10:09:01 -07:00
parent 643ce8a350 c6cc9a73de
commit eae5b1888c
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/Note.hx
View file

@ -184,8 +184,6 @@ class Note extends FlxSprite
} }
prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.5 * PlayState.SONG.speed; prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.5 * PlayState.SONG.speed;
if (PreferencesMenu.getPref('downscroll'))
prevNote.angle = 0;
prevNote.updateHitbox(); prevNote.updateHitbox();
// prevNote.setGraphicSize(); // prevNote.setGraphicSize();
} }

14
source/PlayState.hx
View file

@ -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); var index:Int = unspawnNotes.indexOf(dunceNote);
unspawnNotes.splice(index, 1); unspawnNotes.splice(index, 1);
}
} }
if (generatedMusic) 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); 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.height = (strumLineMid - daNote.y) / daNote.scale.y;
swagRect.y = daNote.height / daNote.scale.y - swagRect.height;
daNote.clipRect = swagRect; daNote.clipRect = swagRect;
} }
} }