Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-27 01:55:52 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'rewrite/master' into feature/blazin-touchups

Browse source
This commit is contained in:
Cameron Taylor 2024-03-08 16:43:56 -05:00
commit 7a5d48b290
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/funkin/play/ResultState.hx
View file

@ -347,6 +347,10 @@ class ResultState extends MusicBeatSubState
if (controls.PAUSE) if (controls.PAUSE)
{ {
FlxTween.tween(FlxG.sound.music, {volume: 0}, 0.8);
FlxTween.tween(FlxG.sound.music, {pitch: 3}, 0.1, {onComplete: _ -> {
FlxTween.tween(FlxG.sound.music, {pitch: 0.5}, 0.4);
}});
if (params.storyMode) if (params.storyMode)
{ {
openSubState(new funkin.ui.transition.StickerSubState(null, (sticker) -> new StoryMenuState(sticker))); openSubState(new funkin.ui.transition.StickerSubState(null, (sticker) -> new StoryMenuState(sticker)));

2
source/funkin/play/cutscene/VideoCutscene.hx
View file

@ -61,7 +61,7 @@ class VideoCutscene
VideoCutscene.cutsceneType = cutsceneType; VideoCutscene.cutsceneType = cutsceneType;
#if html5 #if html5
playVideoHTML5(filePath); playVideoHTML5(rawFilePath);
#elseif hxCodec #elseif hxCodec
playVideoNative(rawFilePath); playVideoNative(rawFilePath);
#else #else

2
source/funkin/util/TrackerUtil.hx
View file

@ -17,7 +17,9 @@ class TrackerUtil
*/ */
public static function initTrackers():Void public static function initTrackers():Void
{ {
#if FLX_DEBUG
Tracker.addProfile(new TrackerProfile(Highscore, ["tallies"])); Tracker.addProfile(new TrackerProfile(Highscore, ["tallies"]));
FlxG.console.registerClass(Highscore); FlxG.console.registerClass(Highscore);
#end
} }
} }

7
source/funkin/util/logging/AnsiTrace.hx
View file

@ -52,7 +52,12 @@ class AnsiTrace
public static function traceBF() public static function traceBF()
{ {
#if sys #if sys
if (colorSupported) Sys.println(ansiBF.join("\n")); if (colorSupported)
{
for (line in ansiBF)
Sys.stdout().writeString(line + "\n");
Sys.stdout().flush();
}
#end #end
} }