diff --git a/CHANGELOG.md b/CHANGELOG.md index 4358043..763ca37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ 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] +### Added +- Enemy icons change when they you are winning a lot ([Thanks to pahaze for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/138)) +- Holding CTRL in charting editor places notes on both sides ### Fixed - Song no longer loops when finishing the song. ([Thanks Injourn for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/132)) diff --git a/assets/music/Cocoa_Inst.mp3 b/assets/music/Cocoa_Inst.mp3 new file mode 100644 index 0000000..87fa9a4 Binary files /dev/null and b/assets/music/Cocoa_Inst.mp3 differ diff --git a/assets/music/Cocoa_Inst.ogg b/assets/music/Cocoa_Inst.ogg new file mode 100644 index 0000000..4317caf Binary files /dev/null and b/assets/music/Cocoa_Inst.ogg differ diff --git a/assets/music/Cocoa_Voices.mp3 b/assets/music/Cocoa_Voices.mp3 new file mode 100644 index 0000000..61d02a3 Binary files /dev/null and b/assets/music/Cocoa_Voices.mp3 differ diff --git a/assets/music/Cocoa_Voices.ogg b/assets/music/Cocoa_Voices.ogg new file mode 100644 index 0000000..741a226 Binary files /dev/null and b/assets/music/Cocoa_Voices.ogg differ diff --git a/source/ChartingState.hx b/source/ChartingState.hx index db4c6b3..d9c5953 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -82,6 +82,9 @@ class ChartingState extends MusicBeatState gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16); add(gridBG); + var gridBlackLine:FlxSprite = new FlxSprite(gridBG.x + gridBG.width / 2).makeGraphic(2, Std.int(gridBG.height), FlxColor.BLACK); + add(gridBlackLine); + curRenderedNotes = new FlxTypedGroup(); curRenderedSustains = new FlxTypedGroup(); @@ -798,6 +801,11 @@ class ChartingState extends MusicBeatState curSelectedNote = _song.notes[curSection].sectionNotes[_song.notes[curSection].sectionNotes.length - 1]; + if (FlxG.keys.pressed.CONTROL) + { + _song.notes[curSection].sectionNotes.push([noteStrum, (noteData + 4) % 8, noteSus]); + } + trace(getStrumTime(dummyArrow.y) + (curSection * (Conductor.stepCrochet * lengthBpmBullshit()))); trace(curSection);