From 2bef1cb88ad3594429665ceba012e17bbd44e2f1 Mon Sep 17 00:00:00 2001 From: Eric Myllyoja Date: Mon, 22 Aug 2022 21:55:30 -0400 Subject: [PATCH] Adjusted firing streak and angle. --- .gitignore | 9 +++++---- hmm.json | 22 +++++++++++++--------- hxformat.json | 1 + source/funkin/modding/PolymodHandler.hx | 4 ++-- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 492e1d0c7..8896597a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ -export/ +.DS_STORE +.haxelib/ .vscode/ APIStuff.hx -.DS_STORE -RECOVER_*.fla -.haxelib/ \ No newline at end of file +dump/ +export/ +RECOVER_*.fla \ No newline at end of file diff --git a/hmm.json b/hmm.json index 884f9eedc..56c9cc910 100644 --- a/hmm.json +++ b/hmm.json @@ -11,14 +11,14 @@ "name": "flixel", "type": "git", "dir": null, - "ref": "75a2789", + "ref": "0f3ae2d", "url": "https://github.com/haxeflixel/flixel" }, { "name": "flixel-addons", "type": "git", "dir": null, - "ref": "dev", + "ref": "a3877f0", "url": "https://github.com/MasterEric/flixel-addons" }, { @@ -30,7 +30,7 @@ "name": "flxanimate", "type": "git", "dir": null, - "ref": "90c44ca", + "ref": "18b2060", "url": "https://github.com/Dot-Stuff/flxanimate" }, { @@ -55,19 +55,23 @@ }, { "name": "lime", - "type": "haxelib", - "version": "7.9.0" + "type": "git", + "dir": null, + "ref": "770bf0e", + "url": "https://github.com/openfl/lime" }, { - "name": "openfl", - "type": "haxelib", - "version": "9.1.0" + "name": "flixel-addons", + "type": "git", + "dir": null, + "ref": "dev", + "url": "https://github.com/MasterEric/flixel-addons" }, { "name": "polymod", "type": "git", "dir": null, - "ref": "bde0604", + "ref": "develop", "url": "https://github.com/larsiusprime/polymod" }, { diff --git a/hxformat.json b/hxformat.json index 5f15f3835..3eeb6de92 100644 --- a/hxformat.json +++ b/hxformat.json @@ -2,6 +2,7 @@ "lineEnds": { "leftCurly": "both", "rightCurly": "both", + "emptyCurly": "break", "objectLiteralCurly": { "leftCurly": "after" } diff --git a/source/funkin/modding/PolymodHandler.hx b/source/funkin/modding/PolymodHandler.hx index c1d95a23c..d08e8c8f6 100644 --- a/source/funkin/modding/PolymodHandler.hx +++ b/source/funkin/modding/PolymodHandler.hx @@ -68,7 +68,7 @@ class PolymodHandler // Framework being used to load assets. framework: OPENFL, // The current version of our API. - apiVersion: API_VERSION, + apiVersionRule: API_VERSION, // Call this function any time an error occurs. errorCallback: PolymodErrorHandler.onPolymodError, // Enforce semantic version patterns for each mod. @@ -166,7 +166,7 @@ class PolymodHandler public static function getAllMods():Array { trace('Scanning the mods folder...'); - var modMetadata = Polymod.scan(MOD_FOLDER); + var modMetadata = Polymod.scan(); trace('Found ${modMetadata.length} mods when scanning.'); return modMetadata; }