Merge remote-tracking branch 'upstream/master' into patch-3

2021-06-26 12:45:39 +02:00
parent 41d42e0375 84d7b68af7
commit 280828a06c
33 changed files with 1167 additions and 437 deletions
--- a/source/KadeEngineData.hx
+++ b/source/KadeEngineData.hx
@ -1,3 +1,4 @@
+import flixel.input.gamepad.FlxGamepad;
 import openfl.Lib;
 import flixel.FlxG;

@ -95,6 +96,10 @@ class KadeEngineData

 		if (FlxG.save.data.optimize == null)
 			FlxG.save.data.optimize = false;
+		
+		var gamepad:FlxGamepad = FlxG.gamepads.lastActive;
+		
+		KeyBinds.gamepad = gamepad != null;

 		Conductor.recalculateTimings();
 		PlayerSettings.player1.controls.loadKeyBinds();