Merge branch 'main' into translations-system
This commit is contained in:
@@ -428,13 +428,18 @@ class Controls extends FlxActionSet
|
||||
return byName[name].check();
|
||||
}
|
||||
|
||||
public function getKeyName(control:Control):String
|
||||
{
|
||||
return getDialogueName(getActionFromControl(control));
|
||||
}
|
||||
|
||||
public function getDialogueName(action:FlxActionDigital):String
|
||||
{
|
||||
var input = action.inputs[0];
|
||||
return switch input.device
|
||||
{
|
||||
case KEYBOARD: return '[${(input.inputID : FlxKey)}]';
|
||||
case GAMEPAD: return '(${(input.inputID : FlxGamepadInputID)})';
|
||||
case KEYBOARD: return '${(input.inputID : FlxKey)}';
|
||||
case GAMEPAD: return '${(input.inputID : FlxGamepadInputID)}';
|
||||
case device: throw 'unhandled device: $device';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,11 +68,6 @@ class MainState extends FlxState {
|
||||
betaWarningShown = true;
|
||||
}
|
||||
|
||||
#if sys
|
||||
sys.FileSystem.createDirectory('./.temp/');
|
||||
#if windows
|
||||
try new funkin.backend.utils.native.HiddenProcess("attrib +h .temp")
|
||||
catch(e) Logs.warn('Failed to set hidden attribute on .temp folder');
|
||||
#end #end
|
||||
CoolUtil.safeSetAttribute('./.temp/', HIDDEN);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user