mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2025-01-23 13:07:07 +00:00
more keybind shit
This commit is contained in:
parent
fe21dfe7e8
commit
17b6015b2c
|
@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
### Added
|
### 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))
|
- 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
|
- Holding CTRL in charting editor places notes on both sides
|
||||||
|
- Other charting editor workflow improvements
|
||||||
### Fixed
|
### Fixed
|
||||||
- Song no longer loops when finishing the song. ([Thanks Injourn for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/132))
|
- Song no longer loops when finishing the song. ([Thanks Injourn for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/132))
|
||||||
|
|
||||||
|
|
|
@ -495,6 +495,22 @@ class ChartingState extends MusicBeatState
|
||||||
FlxG.switchState(new PlayState());
|
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 (!typingShit.hasFocus)
|
||||||
{
|
{
|
||||||
if (FlxG.keys.justPressed.SPACE)
|
if (FlxG.keys.justPressed.SPACE)
|
||||||
|
@ -514,9 +530,9 @@ class ChartingState extends MusicBeatState
|
||||||
if (FlxG.keys.justPressed.R)
|
if (FlxG.keys.justPressed.R)
|
||||||
{
|
{
|
||||||
if (FlxG.keys.pressed.SHIFT)
|
if (FlxG.keys.pressed.SHIFT)
|
||||||
resetSection();
|
|
||||||
else
|
|
||||||
resetSection(true);
|
resetSection(true);
|
||||||
|
else
|
||||||
|
resetSection();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (FlxG.mouse.wheel != 0)
|
if (FlxG.mouse.wheel != 0)
|
||||||
|
@ -524,7 +540,7 @@ class ChartingState extends MusicBeatState
|
||||||
FlxG.sound.music.pause();
|
FlxG.sound.music.pause();
|
||||||
vocals.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;
|
vocals.time = FlxG.sound.music.time;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -624,7 +640,10 @@ class ChartingState extends MusicBeatState
|
||||||
FlxG.sound.music.time = lengthBpmBullshit() * Conductor.stepCrochet * curSection;
|
FlxG.sound.music.time = lengthBpmBullshit() * Conductor.stepCrochet * curSection;
|
||||||
|
|
||||||
if (songBeginning)
|
if (songBeginning)
|
||||||
|
{
|
||||||
FlxG.sound.music.time = 0;
|
FlxG.sound.music.time = 0;
|
||||||
|
curSection = 0;
|
||||||
|
}
|
||||||
|
|
||||||
vocals.time = FlxG.sound.music.time;
|
vocals.time = FlxG.sound.music.time;
|
||||||
updateCurStep();
|
updateCurStep();
|
||||||
|
|
Loading…
Reference in a new issue