diff --git a/Preloader.hx b/Preloader.hx index 6f12b403a..75769d7f3 100644 --- a/Preloader.hx +++ b/Preloader.hx @@ -47,8 +47,8 @@ class Preloader extends FlxBasePreloader { logo.scaleX += Percent / 1280; logo.scaleY += Percent / 1280; - logo.x -= Percent * 0.9; - logo.y -= Percent / 1.6; + logo.x -= Percent * 0.86; + logo.y -= Percent / 1.5; }else{ logo.scaleX = this._width / 1280; logo.scaleY = this._width / 1280; diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 59839368f..2db5f397d 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -119,8 +119,6 @@ class FreeplayState extends MusicBeatState { super.update(elapsed); - trace("Freeplay Menu Updating"); - lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.4)); scoreText.text = "PERSONAL BEST:" + lerpScore; diff --git a/source/PlayState.hx b/source/PlayState.hx index f4e4fd579..5ba6e82cb 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -288,6 +288,10 @@ class PlayState extends MusicBeatState // cameras = [FlxG.cameras.list[1]]; + #if lime + trace("IT'S LIME"); + #end + super.create(); } @@ -589,12 +593,9 @@ class PlayState extends MusicBeatState { super.update(elapsed); - #if lime - trace("IT'S LIME"); - #end - //trace("FlxG.elapsed: " + FlxG.elapsed); trace("FlxG.sound.music.time: " + FlxG.sound.music.time); + trace("Conductor.songPosition: " + Conductor.songPosition); //trace("FlxG.sound.music.playing: " + FlxG.sound.music.playing); //trace("SONG POS: " + Conductor.songPosition); // FlxG.sound.music.pitch = 2; @@ -647,7 +648,8 @@ class PlayState extends MusicBeatState } else { - Conductor.songPosition = FlxG.sound.music.time; + //Conductor.songPosition = FlxG.sound.music.time; + Conductor.songPosition += FlxG.elapsed * 1000; if (!paused) { diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index 9c49dce25..5cde2bd4d 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -169,8 +169,6 @@ class StoryMenuState extends MusicBeatState override function update(elapsed:Float) { - trace("Story Menu Updating"); - // scoreText.setFormat('VCR OSD Mono', 32); lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.5));