Merge branch 'main' into translations-system

This commit is contained in:
⍚~Nex
2024-06-09 01:38:14 +02:00
32 changed files with 224 additions and 125 deletions
+7 -2
View File
@@ -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';
}
}
+1 -6
View File
@@ -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);
}
}