diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 00000000..96d12b21 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,36 @@ +# You need to run the following command in your repository: +# +# git config blame.ignoreRevsFile .git-blame-ignore-revs +# +# afterwards, revisions specified in this file will be ignored in git blame +# any revision needs to be in a unabbreviated sha1 format +# see https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt for more information + +# A good format to use is: + +# # reason for ignoring the revisions +# + +# Removed unused imports & reordered imports +d17ea72c74bbbadac0bb00e11868dddf6aebd346 + +# ScriptPack revert +8a2ac9e1d4e51e688cd2339bdccd6b39ed7d52a3 + +# Spaces to tabs +a63e5f5958ed0643fab92e9d5708a4c26e5238a1 + +# Removed useless indentation and more spaces to tabs +f8b20774e3f035eeddb9211a28a391b20db74456 + +# Revert a revert +75f6bec8294e5b783368cfd7ae6e45698c326cb3 +4aa95838d7df9c307bcac6456e937081645a0f4a + +# Revert a revert (note types use int) +17e177a69554f4d798f5acdd3799687dc9f01a93 +008ad05bf1407d9772805ed69985cfbcde79e495 + +# Revert a revert (empty script) +392416e00cbd82e1c49e82a9fafdcf2e069a654e +159467de832a172681200c463d244a46e295c3c8 \ No newline at end of file diff --git a/libs.xml b/libs.xml index 014312e0..0bb13c52 100644 --- a/libs.xml +++ b/libs.xml @@ -48,7 +48,7 @@ Rebuilding Lime... - + --> diff --git a/source/funkin/backend/FlxAnimate.hx b/source/funkin/backend/FlxAnimate.hx index e22cb867..a0df7cf9 100644 --- a/source/funkin/backend/FlxAnimate.hx +++ b/source/funkin/backend/FlxAnimate.hx @@ -25,10 +25,13 @@ class FlxAnimate extends flxanimate.FlxAnimate { if (limb != _pivot) { if (frameOffsetAngle != null && frameOffsetAngle != angle) { - var angleOff = (-angle + frameOffsetAngle) * FlxAngle.TO_RAD; - rMatrix.rotate(-angleOff); + var angleOff = (frameOffsetAngle - angle) * FlxAngle.TO_RAD; + var cos = Math.cos(angleOff); + var sin = Math.sin(angleOff); + // cos doesnt need to be negated + rMatrix.rotateWithTrig(cos, -sin); rMatrix.translate(-frameOffset.x, -frameOffset.y); - rMatrix.rotate(angleOff); + rMatrix.rotateWithTrig(cos, sin); } else { diff --git a/source/funkin/backend/assets/Paths.hx b/source/funkin/backend/assets/Paths.hx index 6e689102..97d152a0 100644 --- a/source/funkin/backend/assets/Paths.hx +++ b/source/funkin/backend/assets/Paths.hx @@ -71,15 +71,17 @@ class Paths inline static public function voices(song:String, ?difficulty:String, ?prefix:String = "", ?ext:String) { if (difficulty == null) difficulty = Constants.DEFAULT_DIFFICULTY; if (ext == null) ext = Constants.SOUND_EXT; - var diff = getPath('songs/${song.toLowerCase()}/song/Voices$prefix-${difficulty.toLowerCase()}.${ext}', null); - return OpenFlAssets.exists(diff) ? diff : getPath('songs/${song.toLowerCase()}/song/Voices$prefix.${ext}', null); + song = song.toLowerCase(); + var diff = getPath('songs/$song/song/Voices$prefix-${difficulty.toLowerCase()}.${ext}', null); + return OpenFlAssets.exists(diff) ? diff : getPath('songs/$song/song/Voices$prefix.${ext}', null); } inline static public function inst(song:String, ?difficulty:String, ?prefix:String = "", ?ext:String) { if (difficulty == null) difficulty = Constants.DEFAULT_DIFFICULTY; if (ext == null) ext = Constants.SOUND_EXT; - var diff = getPath('songs/${song.toLowerCase()}/song/Inst$prefix-${difficulty.toLowerCase()}.${ext}', null); - return OpenFlAssets.exists(diff) ? diff : getPath('songs/${song.toLowerCase()}/song/Inst$prefix.${ext}', null); + song = song.toLowerCase(); + var diff = getPath('songs/$song/song/Inst$prefix-${difficulty.toLowerCase()}.${ext}', null); + return OpenFlAssets.exists(diff) ? diff : getPath('songs/$song/song/Inst$prefix.${ext}', null); } static public function image(key:String, ?library:String, checkForAtlas:Bool = false, ?ext:String) { diff --git a/source/funkin/backend/chart/FNFLegacyParser.hx b/source/funkin/backend/chart/FNFLegacyParser.hx index 80d7d815..6fa316e2 100644 --- a/source/funkin/backend/chart/FNFLegacyParser.hx +++ b/source/funkin/backend/chart/FNFLegacyParser.hx @@ -226,7 +226,7 @@ typedef SwagSong = typedef SwagSection = { - var sectionNotes:Array; + var sectionNotes:Array>; var lengthInSteps:Int; var ?sectionBeats:Float; var ?typeOfSection:Int;