diff --git a/CHANGELOG.md b/CHANGELOG.md index 763ca377a..112ab5f21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### 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 +- Other charting editor workflow improvements ### 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/source/ChartingState.hx b/source/ChartingState.hx index b7001a708..54f526ce2 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -495,6 +495,22 @@ class ChartingState extends MusicBeatState FlxG.switchState(new PlayState()); } + if (FlxG.keys.justPressed.TAB) + { + if (FlxG.keys.pressed.SHIFT) + { + UI_box.selected_tab -= 1; + if (UI_box.selected_tab < 0) + UI_box.selected_tab = 2; + } + else + { + UI_box.selected_tab += 1; + if (UI_box.selected_tab >= 3) + UI_box.selected_tab = 0; + } + } + if (!typingShit.hasFocus) { if (FlxG.keys.justPressed.SPACE) @@ -514,9 +530,9 @@ class ChartingState extends MusicBeatState if (FlxG.keys.justPressed.R) { if (FlxG.keys.pressed.SHIFT) - resetSection(); - else resetSection(true); + else + resetSection(); } if (FlxG.mouse.wheel != 0) @@ -524,7 +540,7 @@ class ChartingState extends MusicBeatState FlxG.sound.music.pause(); vocals.pause(); - FlxG.sound.music.time -= (FlxG.mouse.wheel * Conductor.stepCrochet * 1); + FlxG.sound.music.time -= (FlxG.mouse.wheel * Conductor.stepCrochet * 0.4); vocals.time = FlxG.sound.music.time; } @@ -624,7 +640,10 @@ class ChartingState extends MusicBeatState FlxG.sound.music.time = lengthBpmBullshit() * Conductor.stepCrochet * curSection; if (songBeginning) + { FlxG.sound.music.time = 0; + curSection = 0; + } vocals.time = FlxG.sound.music.time; updateCurStep();