diff --git a/CHANGELOG.md b/CHANGELOG.md index b0381fd..582ca8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [UNRELEASED] +### Fixed +- Idle animation bug with BF christmas and BF hair blow sprites ([Thanks to Injourn for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/237)) + ## [0.2.6] - 2021-01-20 ### Added - 3 NEW CHRISTMAS SONGS. 2 BY KAWAISPRITE, 1 BY BASSETFILMS!!!!! BF WITH DRIP! SANTA HANGIN OUT! diff --git a/assets/data/characterList.txt b/assets/data/characterList.txt index d0f05cf..3fa5358 100644 --- a/assets/data/characterList.txt +++ b/assets/data/characterList.txt @@ -9,4 +9,5 @@ bf-car parents-christmas monster-christmas bf-christmas -gf-christmas \ No newline at end of file +gf-christmas +monster \ No newline at end of file diff --git a/assets/mods/readme.txt b/assets/mods/readme.txt new file mode 100644 index 0000000..f8d8f6e --- /dev/null +++ b/assets/mods/readme.txt @@ -0,0 +1,2 @@ +THIS MOD FOLDER DOES NOT ENTIRELY WORK JUST YET!!! +DONT EXPECT MUCH OUT OF IT RIGHT NOW!!! \ No newline at end of file diff --git a/assets/music/Cocoa_Inst.mp3 b/assets/music/Cocoa_Inst.mp3 index 87fa9a4..398ad18 100644 Binary files a/assets/music/Cocoa_Inst.mp3 and b/assets/music/Cocoa_Inst.mp3 differ diff --git a/assets/music/Cocoa_Inst.ogg b/assets/music/Cocoa_Inst.ogg index 4317caf..669ce0e 100644 Binary files a/assets/music/Cocoa_Inst.ogg and b/assets/music/Cocoa_Inst.ogg differ diff --git a/assets/music/Eggnog_Inst.mp3 b/assets/music/Eggnog_Inst.mp3 index d36861e..978b89b 100644 Binary files a/assets/music/Eggnog_Inst.mp3 and b/assets/music/Eggnog_Inst.mp3 differ diff --git a/assets/music/Eggnog_Inst.ogg b/assets/music/Eggnog_Inst.ogg index bed0462..6a4e67c 100644 Binary files a/assets/music/Eggnog_Inst.ogg and b/assets/music/Eggnog_Inst.ogg differ diff --git a/source/Character.hx b/source/Character.hx index e0453d1..85aa08b 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -393,7 +393,7 @@ class Character extends FlxSprite override function update(elapsed:Float) { - if (curCharacter != 'bf') + if (!curCharacter.startsWith('bf')) { if (animation.curAnim.name.startsWith('sing')) {