mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-09-12 05:07:06 +00:00
Merge pull request #228 from FunkinCrew/polish/chart-intro-screen
Polish/chart intro screen
This commit is contained in:
commit
ecdb89c3a6
2
assets
2
assets
|
@ -1 +1 @@
|
||||||
Subproject commit 4ed2b3084d54899e10d10a97eaafe210158768be
|
Subproject commit f715fd22cd51e71b017fae796cfe564b76dec20e
|
|
@ -8,6 +8,7 @@ import funkin.ui.TextMenuList;
|
||||||
import funkin.ui.debug.charting.ChartEditorState;
|
import funkin.ui.debug.charting.ChartEditorState;
|
||||||
import funkin.ui.MusicBeatSubState;
|
import funkin.ui.MusicBeatSubState;
|
||||||
import funkin.util.logging.CrashHandler;
|
import funkin.util.logging.CrashHandler;
|
||||||
|
import flixel.addons.transition.FlxTransitionableState;
|
||||||
|
|
||||||
class DebugMenuSubState extends MusicBeatSubState
|
class DebugMenuSubState extends MusicBeatSubState
|
||||||
{
|
{
|
||||||
|
@ -84,6 +85,8 @@ class DebugMenuSubState extends MusicBeatSubState
|
||||||
|
|
||||||
function openChartEditor()
|
function openChartEditor()
|
||||||
{
|
{
|
||||||
|
FlxTransitionableState.skipNextTransIn = true;
|
||||||
|
|
||||||
FlxG.switchState(new ChartEditorState());
|
FlxG.switchState(new ChartEditorState());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2956,9 +2956,10 @@ class ChartEditorState extends HaxeUIState
|
||||||
if (FlxG.mouse.justReleased) FlxG.sound.play(Paths.sound("chartingSounds/ClickUp"));
|
if (FlxG.mouse.justReleased) FlxG.sound.play(Paths.sound("chartingSounds/ClickUp"));
|
||||||
|
|
||||||
// Note: If a menu is open in HaxeUI, don't handle cursor behavior.
|
// Note: If a menu is open in HaxeUI, don't handle cursor behavior.
|
||||||
var shouldHandleCursor:Bool = !(isHaxeUIFocused || playbarHeadDragging)
|
var shouldHandleCursor:Bool = !(isHaxeUIFocused || playbarHeadDragging || isHaxeUIDialogOpen)
|
||||||
|| (selectionBoxStartPos != null)
|
|| (selectionBoxStartPos != null)
|
||||||
|| (dragTargetNote != null || dragTargetEvent != null);
|
|| (dragTargetNote != null || dragTargetEvent != null);
|
||||||
|
|
||||||
var eventColumn:Int = (STRUMLINE_SIZE * 2 + 1) - 1;
|
var eventColumn:Int = (STRUMLINE_SIZE * 2 + 1) - 1;
|
||||||
|
|
||||||
// trace('shouldHandleCursor: $shouldHandleCursor');
|
// trace('shouldHandleCursor: $shouldHandleCursor');
|
||||||
|
|
|
@ -101,7 +101,13 @@ class ChartEditorDialogHandler
|
||||||
if (chartPath == null) continue;
|
if (chartPath == null) continue;
|
||||||
|
|
||||||
var linkRecentChart:Link = new Link();
|
var linkRecentChart:Link = new Link();
|
||||||
linkRecentChart.text = chartPath;
|
// regex to only use the filename, not the full path
|
||||||
|
// "dadbattle.fnc" insted of "c:/user/docs/funkin/dadbattle.fnc"
|
||||||
|
// hovering tooltip shows full path
|
||||||
|
var fileNamePattern:EReg = new EReg("([^/\\\\]+)$", "");
|
||||||
|
var fileName:String = fileNamePattern.match(chartPath) ? fileNamePattern.matched(1) : chartPath;
|
||||||
|
linkRecentChart.text = fileName;
|
||||||
|
linkRecentChart.tooltip = chartPath;
|
||||||
linkRecentChart.onClick = function(_event) {
|
linkRecentChart.onClick = function(_event) {
|
||||||
dialog.hideDialog(DialogButton.CANCEL);
|
dialog.hideDialog(DialogButton.CANCEL);
|
||||||
state.stopWelcomeMusic();
|
state.stopWelcomeMusic();
|
||||||
|
|
Loading…
Reference in a new issue