mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2025-03-23 02:19:46 +00:00
game works again, twin-stick is fun
This commit is contained in:
parent
77c9422088
commit
9de490f296
|
@ -47,8 +47,8 @@ class Preloader extends FlxBasePreloader
|
||||||
{
|
{
|
||||||
logo.scaleX += Percent / 1280;
|
logo.scaleX += Percent / 1280;
|
||||||
logo.scaleY += Percent / 1280;
|
logo.scaleY += Percent / 1280;
|
||||||
logo.x -= Percent * 0.9;
|
logo.x -= Percent * 0.86;
|
||||||
logo.y -= Percent / 1.6;
|
logo.y -= Percent / 1.5;
|
||||||
}else{
|
}else{
|
||||||
logo.scaleX = this._width / 1280;
|
logo.scaleX = this._width / 1280;
|
||||||
logo.scaleY = this._width / 1280;
|
logo.scaleY = this._width / 1280;
|
||||||
|
|
|
@ -119,8 +119,6 @@ class FreeplayState extends MusicBeatState
|
||||||
{
|
{
|
||||||
super.update(elapsed);
|
super.update(elapsed);
|
||||||
|
|
||||||
trace("Freeplay Menu Updating");
|
|
||||||
|
|
||||||
lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.4));
|
lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.4));
|
||||||
scoreText.text = "PERSONAL BEST:" + lerpScore;
|
scoreText.text = "PERSONAL BEST:" + lerpScore;
|
||||||
|
|
||||||
|
|
|
@ -288,6 +288,10 @@ class PlayState extends MusicBeatState
|
||||||
|
|
||||||
// cameras = [FlxG.cameras.list[1]];
|
// cameras = [FlxG.cameras.list[1]];
|
||||||
|
|
||||||
|
#if lime
|
||||||
|
trace("IT'S LIME");
|
||||||
|
#end
|
||||||
|
|
||||||
super.create();
|
super.create();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -589,12 +593,9 @@ class PlayState extends MusicBeatState
|
||||||
{
|
{
|
||||||
super.update(elapsed);
|
super.update(elapsed);
|
||||||
|
|
||||||
#if lime
|
|
||||||
trace("IT'S LIME");
|
|
||||||
#end
|
|
||||||
|
|
||||||
//trace("FlxG.elapsed: " + FlxG.elapsed);
|
//trace("FlxG.elapsed: " + FlxG.elapsed);
|
||||||
trace("FlxG.sound.music.time: " + FlxG.sound.music.time);
|
trace("FlxG.sound.music.time: " + FlxG.sound.music.time);
|
||||||
|
trace("Conductor.songPosition: " + Conductor.songPosition);
|
||||||
//trace("FlxG.sound.music.playing: " + FlxG.sound.music.playing);
|
//trace("FlxG.sound.music.playing: " + FlxG.sound.music.playing);
|
||||||
//trace("SONG POS: " + Conductor.songPosition);
|
//trace("SONG POS: " + Conductor.songPosition);
|
||||||
// FlxG.sound.music.pitch = 2;
|
// FlxG.sound.music.pitch = 2;
|
||||||
|
@ -647,7 +648,8 @@ class PlayState extends MusicBeatState
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Conductor.songPosition = FlxG.sound.music.time;
|
//Conductor.songPosition = FlxG.sound.music.time;
|
||||||
|
Conductor.songPosition += FlxG.elapsed * 1000;
|
||||||
|
|
||||||
if (!paused)
|
if (!paused)
|
||||||
{
|
{
|
||||||
|
|
|
@ -169,8 +169,6 @@ class StoryMenuState extends MusicBeatState
|
||||||
|
|
||||||
override function update(elapsed:Float)
|
override function update(elapsed:Float)
|
||||||
{
|
{
|
||||||
trace("Story Menu Updating");
|
|
||||||
|
|
||||||
// scoreText.setFormat('VCR OSD Mono', 32);
|
// scoreText.setFormat('VCR OSD Mono', 32);
|
||||||
lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.5));
|
lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.5));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue