From 1fc4f3681066c9d5b0c47a12469e55549b4519cf Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Sun, 28 Apr 2024 03:17:37 -0400 Subject: [PATCH 01/10] asset submod --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index b8fc296b1..2e59d1bf5 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit b8fc296b1254305c66228a439c9db8d2d70db521 +Subproject commit 2e59d1bf5b9b7d3e5d83f9b949464bd27544ce14 From 3083305f51038051944db788e1b5ca0c49999617 Mon Sep 17 00:00:00 2001 From: FabsTheFabs Date: Mon, 29 Apr 2024 02:21:44 +0100 Subject: [PATCH 02/10] fix pixel combo numbers being huge --- source/funkin/play/components/PopUpStuff.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/funkin/play/components/PopUpStuff.hx b/source/funkin/play/components/PopUpStuff.hx index b062b22cf..b7e206e97 100644 --- a/source/funkin/play/components/PopUpStuff.hx +++ b/source/funkin/play/components/PopUpStuff.hx @@ -42,7 +42,7 @@ class PopUpStuff extends FlxTypedGroup if (PlayState.instance.currentStageId.startsWith('school')) { - rating.setGraphicSize(Std.int(rating.width * Constants.PIXEL_ART_SCALE * 0.65)); + rating.setGraphicSize(Std.int(rating.width * Constants.PIXEL_ART_SCALE * 0.7)); rating.antialiasing = false; } else @@ -133,7 +133,7 @@ class PopUpStuff extends FlxTypedGroup if (PlayState.instance.currentStageId.startsWith('school')) { - numScore.setGraphicSize(Std.int(numScore.width * Constants.PIXEL_ART_SCALE)); + numScore.setGraphicSize(Std.int(numScore.width * Constants.PIXEL_ART_SCALE * 0.7)); numScore.antialiasing = false; } else From b35822f9a4935362655bc36f9d698366fc7f1f13 Mon Sep 17 00:00:00 2001 From: FabsTheFabs Date: Mon, 29 Apr 2024 02:22:11 +0100 Subject: [PATCH 03/10] soundtray fade --- source/funkin/ui/options/FunkinSoundTray.hx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/funkin/ui/options/FunkinSoundTray.hx b/source/funkin/ui/options/FunkinSoundTray.hx index 4af94569b..b8c408508 100644 --- a/source/funkin/ui/options/FunkinSoundTray.hx +++ b/source/funkin/ui/options/FunkinSoundTray.hx @@ -20,6 +20,7 @@ class FunkinSoundTray extends FlxSoundTray { var graphicScale:Float = 0.30; var lerpYPos:Float = 0; + var alphaTarget:Float = 0; var volumeMaxSound:String; @@ -40,7 +41,7 @@ class FunkinSoundTray extends FlxSoundTray // makes an alpha'd version of all the bars (bar_10.png) var backingBar:Bitmap = new Bitmap(Assets.getBitmapData(Paths.image("soundtray/bars_10"))); - backingBar.x = 10; + backingBar.x = 9; backingBar.y = 5; backingBar.scaleX = graphicScale; backingBar.scaleY = graphicScale; @@ -56,7 +57,7 @@ class FunkinSoundTray extends FlxSoundTray for (i in 1...11) { var bar:Bitmap = new Bitmap(Assets.getBitmapData(Paths.image("soundtray/bars_" + i))); - bar.x = 10; + bar.x = 9; bar.y = 5; bar.scaleX = graphicScale; bar.scaleY = graphicScale; @@ -77,15 +78,18 @@ class FunkinSoundTray extends FlxSoundTray override public function update(MS:Float):Void { y = MathUtil.coolLerp(y, lerpYPos, 0.1); + alpha = MathUtil.coolLerp(alpha, alphaTarget, 0.25); // Animate sound tray thing if (_timer > 0) { _timer -= (MS / 1000); + alphaTarget = 1; } else if (y > -height) { lerpYPos = -height - 10; + alphaTarget = 0; if (y <= -height) { From c609e3591bd8653194686457a09983aa85786fbb Mon Sep 17 00:00:00 2001 From: FabsTheFabs Date: Mon, 29 Apr 2024 02:22:33 +0100 Subject: [PATCH 04/10] fixed classic camera reset --- source/funkin/play/event/FocusCameraSongEvent.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/play/event/FocusCameraSongEvent.hx b/source/funkin/play/event/FocusCameraSongEvent.hx index 569dcb87a..074fafccf 100644 --- a/source/funkin/play/event/FocusCameraSongEvent.hx +++ b/source/funkin/play/event/FocusCameraSongEvent.hx @@ -127,7 +127,7 @@ class FocusCameraSongEvent extends SongEvent switch (ease) { case 'CLASSIC': // Old-school. No ease. Just set follow point. - PlayState.instance.resetCamera(); + PlayState.instance.resetCamera(false, true); PlayState.instance.cameraFollowPoint.setPosition(targetX, targetY); case 'INSTANT': // Instant ease. Duration is automatically 0. PlayState.instance.tweenCameraToPosition(targetX, targetY, 0); From 333b177ffb1f90ab8c515b9abc2d8b1d55c4497b Mon Sep 17 00:00:00 2001 From: FabsTheFabs Date: Mon, 29 Apr 2024 02:22:49 +0100 Subject: [PATCH 05/10] update assets submod --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index ac8bf6e12..61eabfd45 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit ac8bf6e129113551e1c7971327b31096d703e433 +Subproject commit 61eabfd454436c18470af769610fe23b0af9a8e7 From 21ab198c58b77db400412ebb4c70fa169792b582 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Mon, 29 Apr 2024 01:19:58 -0400 Subject: [PATCH 06/10] assets submod --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index 2e59d1bf5..ad2264080 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 2e59d1bf5b9b7d3e5d83f9b949464bd27544ce14 +Subproject commit ad22640805196fe606417dcf12d8e679ee61c543 From 450a232eb8f10fbeea213415abe451b6aa65ae71 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Mon, 29 Apr 2024 01:39:19 -0400 Subject: [PATCH 07/10] hxcodec version commit bump --- hmm.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hmm.json b/hmm.json index c53a1143b..300f0287f 100644 --- a/hmm.json +++ b/hmm.json @@ -80,7 +80,7 @@ "name": "hxCodec", "type": "git", "dir": null, - "ref": "387e1665d6feb5762358134f168e6ebfe46acec8", + "ref": "c0c7f2680cc190c932a549c2e2fdd9b0ba2bd10e", "url": "https://github.com/FunkinCrew/hxCodec" }, { @@ -171,4 +171,4 @@ "url": "https://github.com/FunkinCrew/thx.semver" } ] -} \ No newline at end of file +} From 64b416e956db55a6c334e6a59a6d259821096736 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Mon, 29 Apr 2024 02:31:40 -0400 Subject: [PATCH 08/10] async the LoadingState asset preloads --- source/funkin/ui/transition/LoadingState.hx | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/source/funkin/ui/transition/LoadingState.hx b/source/funkin/ui/transition/LoadingState.hx index 3b53e1b4a..28533e35b 100644 --- a/source/funkin/ui/transition/LoadingState.hx +++ b/source/funkin/ui/transition/LoadingState.hx @@ -326,15 +326,20 @@ class LoadingState extends MusicBeatSubState // I will fix this properly later I swear -eric if (!path.endsWith('.png')) continue; - FunkinSprite.cacheTexture(path); + new Future(function() { + FunkinSprite.cacheTexture(path); + // Another dumb hack: FlxAnimate fetches from OpenFL's BitmapData cache directly and skips the FlxGraphic cache. + // Since FlxGraphic tells OpenFL to not cache it, we have to do it manually. + if (path.endsWith('spritemap1.png')) + { + trace('Preloading FlxAnimate asset: ${path}'); + openfl.Assets.getBitmapData(path, true); + } + return 'Done precaching ${path}'; + }, true); - // Another dumb hack: FlxAnimate fetches from OpenFL's BitmapData cache directly and skips the FlxGraphic cache. - // Since FlxGraphic tells OpenFL to not cache it, we have to do it manually. - if (path.endsWith('spritemap1.png')) - { - trace('Preloading FlxAnimate asset: ${path}'); - openfl.Assets.getBitmapData(path, true); - } + trace("Queued ${path} for precaching"); + // FunkinSprite.cacheTexture(path); } // FunkinSprite.cacheAllNoteStyleTextures(noteStyle) // This will replace the stuff above! From 81f8338c99bc082dc9f1d7ebff99affc44151a9b Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Mon, 29 Apr 2024 03:49:28 -0400 Subject: [PATCH 09/10] sets the selected track as first one in group when swapping sorts on freeplay --- source/funkin/ui/freeplay/FreeplayState.hx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx index b16cbe63a..bd558f747 100644 --- a/source/funkin/ui/freeplay/FreeplayState.hx +++ b/source/funkin/ui/freeplay/FreeplayState.hx @@ -456,6 +456,14 @@ class FreeplayState extends MusicBeatSubState default: generateSongList({filterType: REGEXP, filterData: str}, true); } + + // We want to land on the first song of the group, rather than random song when changing letter sorts + // that is, only if there's more than one song in the group! + if (grpCapsules.members.length > 0) + { + curSelected = 1; + changeSelection(); + } }; exitMovers.set([fp, txtCompletion, fnfHighscoreSpr], From 3a7efeeca36d99639c8295c882c0d1319fb85b9d Mon Sep 17 00:00:00 2001 From: Hazel Date: Mon, 29 Apr 2024 20:04:01 +0100 Subject: [PATCH 10/10] fix(ci): linux private repo issues (#524) --- .github/hooks/post-checkout | 0 .github/hooks/post-merge | 0 .github/hooks/pre-push | 0 Project.xml | 2 +- hmm.json | 6 +++--- source/funkin/audio/visualize/ABotVis.hx | 6 +++--- 6 files changed, 7 insertions(+), 7 deletions(-) mode change 100644 => 100755 .github/hooks/post-checkout mode change 100644 => 100755 .github/hooks/post-merge mode change 100644 => 100755 .github/hooks/pre-push diff --git a/.github/hooks/post-checkout b/.github/hooks/post-checkout old mode 100644 new mode 100755 diff --git a/.github/hooks/post-merge b/.github/hooks/post-merge old mode 100644 new mode 100755 diff --git a/.github/hooks/pre-push b/.github/hooks/pre-push old mode 100644 new mode 100755 diff --git a/Project.xml b/Project.xml index 0a44a268c..2e056426c 100644 --- a/Project.xml +++ b/Project.xml @@ -124,7 +124,7 @@ - + diff --git a/hmm.json b/hmm.json index c53a1143b..0417b583a 100644 --- a/hmm.json +++ b/hmm.json @@ -46,10 +46,10 @@ "version": "3.5.0" }, { - "name": "funkVis", + "name": "funkin.vis", "type": "git", "dir": null, - "ref": "7fc9901553fbe9b8fcf6e2e84bc86eabeaf29701", + "ref": "98c9db09f0bbfedfe67a84538a5814aaef80bdea", "url": "https://github.com/FunkinCrew/funkVis" }, { @@ -171,4 +171,4 @@ "url": "https://github.com/FunkinCrew/thx.semver" } ] -} \ No newline at end of file +} diff --git a/source/funkin/audio/visualize/ABotVis.hx b/source/funkin/audio/visualize/ABotVis.hx index 0295e35ff..ca77dd58a 100644 --- a/source/funkin/audio/visualize/ABotVis.hx +++ b/source/funkin/audio/visualize/ABotVis.hx @@ -8,8 +8,8 @@ import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; import flixel.math.FlxMath; import flixel.sound.FlxSound; import funkin.util.MathUtil; -import funkVis.dsp.SpectralAnalyzer; -import funkVis.audioclip.frontends.LimeAudioClip; +import funkin.vis.dsp.SpectralAnalyzer; +import funkin.vis.audioclip.frontends.LimeAudioClip; using Lambda; @@ -90,7 +90,7 @@ class ABotVis extends FlxTypedSpriteGroup } /** - * TJW funkVis based visualizer! updateFFT() is the old nasty shit that dont worky! + * TJW funkin.vis based visualizer! updateFFT() is the old nasty shit that dont worky! */ function drawFFT():Void {