gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Added a shortcut to addChild + Pico fix

Browse Source
This commit is contained in:
Yoshman29
2022-12-27 17:37:20 +01:00
parent 1bb2c6c18c
commit a2732a929b
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/data/characters/pico.xml
+2 -2
View File
@@ -3,8 +3,8 @@
<anim name="idle" anim="Pico Idle Dance" fps="24" loop="false"/>
<!-- Sing Animations -->
<anim name="singLEFT" anim="Pico Note Right0" fps="24" loop="false" x="-30" y="0" />
<anim name="singDOWN" anim="Pico Down Note0" fps="24" loop="false" x="-40" y="-94" />
<anim name="singLEFT" anim="Pico Note Right0" fps="24" loop="false" x="65" y="9" />
<anim name="singDOWN" anim="Pico Down Note0" fps="24" loop="false" x="200" y="-70" />
<anim name="singUP" anim="pico Up note0" fps="24" loop="false" x="-20" y="50" />
<anim name="singRIGHT" anim="Pico NOTE LEFT0" fps="24" loop="false" x="-51" y="0" />
buildnumber.txt
+1 -1
View File
@@ -1 +1 @@
1800
1803
source/flx3d/Flx3DView.hx
+3
View File
@@ -98,6 +98,9 @@ class Flx3DView extends FlxView3D {
token = null;
}
}
public inline function addChild(c)
view.scene.addChild(c);
}
typedef ModelQueueItem = {
source/funkin/system/Conductor.hx
+3 -1
View File
@@ -145,6 +145,8 @@ class Conductor
if (FlxG.sound.music == null || !FlxG.sound.music.playing) {
speed = 1;
lastSongPos = FlxG.sound.music != null ? FlxG.sound.music.time : 0;
lastSongPosTime = Main.time;
return;
}
if (FlxG.state != null && FlxG.state is MusicBeatState && cast(FlxG.state, MusicBeatState).cancelConductorUpdate) return;
@@ -154,7 +156,7 @@ class Conductor
// update conductor
var timeUntilUpdate = -(lastSongPosTime - (lastSongPosTime = Main.time));
var elapsedAL = (lastSongPos - lastPos);
speed = FlxMath.bound(FlxMath.lerp(speed, timeUntilUpdate / elapsedAL, timeUntilUpdate / 1000), 0.85, 1.15);
speed = FlxMath.bound(FlxMath.lerp(speed, timeUntilUpdate / elapsedAL, timeUntilUpdate / 1000), 0.925, 1.075);
songPosition = lastSongPos;
} else {
songPosition += elapsed * 1000 * speed;