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

Merge branch 'bugfix/week-7-pico-stress' into rewrite/master

Browse Source
This commit is contained in:
Cameron Taylor
2024-09-27 17:00:54 -04:00
parent 9a57762a9c 007a32dc9c
commit fb1b3cc1cd
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets
+1 -1
Submodule assets updated: 962e3d3a14...228cf6dd81
source/funkin/play/PlayState.hx
+2 -2
View File
@@ -1979,8 +1979,8 @@ class PlayState extends MusicBeatSubState
vocals.volume = 1.0;
vocals.pitch = playbackRate;
vocals.time = FlxG.sound.music.time;
trace('${FlxG.sound.music.time}');
trace('${vocals.time}');
// trace('${FlxG.sound.music.time}');
// trace('${vocals.time}');
resyncVocals();
#if FEATURE_DISCORD_RPC
source/funkin/play/character/BaseCharacter.hx
+3 -3
View File
@@ -305,7 +305,7 @@ class BaseCharacter extends Bopper
{
super.onAnimationFinished(animationName);
trace('${characterId} has finished animation: ${animationName}');
// trace('${characterId} has finished animation: ${animationName}');
if ((animationName.endsWith(Constants.ANIMATION_END_SUFFIX) && !animationName.startsWith('idle') && !animationName.startsWith('dance'))
|| animationName.startsWith('combo')
|| animationName.startsWith('drop'))
@@ -402,7 +402,7 @@ class BaseCharacter extends Bopper
FlxG.watch.addQuick('singTimeSec-${characterId}', singTimeSec);
if (holdTimer > singTimeSec && shouldStopSinging)
{
trace('holdTimer reached ${holdTimer}sec (> ${singTimeSec}), stopping sing animation');
// trace('holdTimer reached ${holdTimer}sec (> ${singTimeSec}), stopping sing animation');
holdTimer = 0;
var currentAnimation:String = getCurrentAnimation();
@@ -636,7 +636,7 @@ class BaseCharacter extends Bopper
var anim:String = 'sing${dir.nameUpper}${miss ? 'miss' : ''}${suffix != '' ? '-${suffix}' : ''}';
// restart even if already playing, because the character might sing the same note twice.
trace('Playing ${anim}...');
// trace('Playing ${anim}...');
playAnimation(anim, true);
}