Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-23 08:07:54 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'rewrite/master' into freeplay-no-randoms

Browse source
This commit is contained in:
Eric 2024-04-29 15:55:52 -04:00 committed by GitHub
commit c8dcda89a1
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
.github/hooks/post-checkout vendored Normal file → Executable file
View file

0
.github/hooks/post-merge vendored Normal file → Executable file
View file

0
.github/hooks/pre-push vendored Normal file → Executable file
View file

2
Project.xml
View file

@ -124,7 +124,7 @@
<haxelib name="polymod" /> <!-- Modding framework --> <haxelib name="polymod" /> <!-- Modding framework -->
<haxelib name="flxanimate" /> <!-- Texture atlas rendering --> <haxelib name="flxanimate" /> <!-- Texture atlas rendering -->
<haxelib name="hxCodec" if="desktop" unless="hl" /> <!-- Video playback --> <haxelib name="hxCodec" if="desktop" unless="hl" /> <!-- Video playback -->
<haxelib name="funkVis"/> <haxelib name="funkin.vis"/>
<haxelib name="json2object" /> <!-- JSON parsing --> <haxelib name="json2object" /> <!-- JSON parsing -->

4
hmm.json
View file

@ -46,10 +46,10 @@
"version": "3.5.0" "version": "3.5.0"
}, },
{ {
"name": "funkVis", "name": "funkin.vis",
"type": "git", "type": "git",
"dir": null, "dir": null,
"ref": "7fc9901553fbe9b8fcf6e2e84bc86eabeaf29701", "ref": "98c9db09f0bbfedfe67a84538a5814aaef80bdea",
"url": "https://github.com/FunkinCrew/funkVis" "url": "https://github.com/FunkinCrew/funkVis"
}, },
{ {

6
source/funkin/audio/visualize/ABotVis.hx
View file

@ -8,8 +8,8 @@ import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
import flixel.math.FlxMath; import flixel.math.FlxMath;
import flixel.sound.FlxSound; import flixel.sound.FlxSound;
import funkin.util.MathUtil; import funkin.util.MathUtil;
import funkVis.dsp.SpectralAnalyzer; import funkin.vis.dsp.SpectralAnalyzer;
import funkVis.audioclip.frontends.LimeAudioClip; import funkin.vis.audioclip.frontends.LimeAudioClip;
using Lambda; using Lambda;
@ -90,7 +90,7 @@ class ABotVis extends FlxTypedSpriteGroup<FlxSprite>
} }
/** /**
* 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 function drawFFT():Void
{ {