added nothing ha fuck you!
This commit is contained in:
@@ -145,6 +145,7 @@
|
||||
|
||||
<haxelib name="hxCodec" if="VIDEO_CUTSCENES" />
|
||||
<haxelib name="away3d" />
|
||||
<haxelib name="format" />
|
||||
|
||||
<haxelib name="flixel-yc29" rename="flixel" />
|
||||
<haxedev set='webgl' />
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
1881
|
||||
1897
|
||||
@@ -156,7 +156,7 @@ class Conductor
|
||||
|
||||
if (elapsed == 0) continue;
|
||||
|
||||
__updateSongPos(elapsed);
|
||||
__updateSongPos(elapsed, syncThreadTime);
|
||||
}
|
||||
}, true);
|
||||
#end
|
||||
@@ -164,18 +164,18 @@ class Conductor
|
||||
|
||||
private static var __timeUntilUpdate:Float;
|
||||
private static var __elapsedAL:Float;
|
||||
private static function __updateSongPos(elapsed:Float) {
|
||||
private static function __updateSongPos(elapsed:Float, mainTime:Float) {
|
||||
if (FlxG.sound.music == null || !FlxG.sound.music.playing) {
|
||||
speed = destSpeed = 1;
|
||||
lastSongPos = FlxG.sound.music != null ? FlxG.sound.music.time : 0;
|
||||
lastSongPosTime = Main.time;
|
||||
lastSongPosTime = mainTime;
|
||||
return;
|
||||
}
|
||||
|
||||
var lastPos = lastSongPos;
|
||||
if (lastSongPos != (lastSongPos = FlxG.sound.music.time)) {
|
||||
// update conductor
|
||||
__timeUntilUpdate = -(lastSongPosTime - (lastSongPosTime = Main.time));
|
||||
__timeUntilUpdate = -(lastSongPosTime - (lastSongPosTime = mainTime));
|
||||
__elapsedAL = (lastSongPos - lastPos);
|
||||
destSpeed = FlxMath.bound(__elapsedAL / __timeUntilUpdate, 0.925, 1.075);
|
||||
songPosition = lastSongPos;
|
||||
@@ -193,7 +193,7 @@ class Conductor
|
||||
if (FlxG.state != null && FlxG.state is MusicBeatState && cast(FlxG.state, MusicBeatState).cancelConductorUpdate) return;
|
||||
|
||||
#if !ALLOW_MULTITHREADING
|
||||
__updateSongPos(FlxG.elapsed);
|
||||
__updateSongPos(FlxG.elapsed, Main.time);
|
||||
#end
|
||||
|
||||
if (bpm > 0) {
|
||||
|
||||
@@ -150,6 +150,14 @@ class CoolUtil
|
||||
}
|
||||
}
|
||||
|
||||
public static function preloadCharacter(name:String, ?spriteName:String) {
|
||||
if (name == null) return;
|
||||
if (spriteName == null)
|
||||
spriteName = name;
|
||||
Assets.getText(Paths.xml('characters/$name'));
|
||||
Paths.getFrames('characters/$spriteName');
|
||||
}
|
||||
|
||||
public static function playMusic(path:String, DefaultBPM:Int = 102, Volume:Int = 1, Looped:Bool = true, ?Group:FlxSoundGroup) {
|
||||
Conductor.reset();
|
||||
FlxG.sound.playMusic(path, Volume, Looped, Group);
|
||||
|
||||
@@ -60,7 +60,7 @@ class FramerateField extends TextField {
|
||||
}
|
||||
#if !web
|
||||
if (showMemory || debugMode) {
|
||||
text.push('RAM: ${CoolUtil.getSizeString(System.totalMemory)}');
|
||||
text.push('RAM: ${CoolUtil.getSizeString(cast(System.totalMemory, UInt))}');
|
||||
}
|
||||
if (showMemoryPeak || debugMode) {
|
||||
if (peak < System.totalMemory)
|
||||
|
||||
Reference in New Issue
Block a user