From 3fbe5a972e6092440b4e7937335fddbd036ecc57 Mon Sep 17 00:00:00 2001 From: john doughty Date: Sun, 9 Oct 2022 07:58:16 -0500 Subject: [PATCH 1/2] fix to camera panning with mouse --- prototype/controls/camera.gd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/prototype/controls/camera.gd b/prototype/controls/camera.gd index 9bb7ca32..87ed20ac 100644 --- a/prototype/controls/camera.gd +++ b/prototype/controls/camera.gd @@ -76,10 +76,10 @@ func _unhandled_input(event): if game: var over_minimap = game.ui.minimap.over_minimap(event) # MOUSE PAN - #if event.is_action("pan") and not over_minimap: - # is_panning = event.is_action_pressed("pan") - #elif event is InputEventMouseMotion: - # if is_panning: pan_position = Vector2(-1 * event.relative) + if event.is_action("pan") and not over_minimap: + is_panning = event.is_action_pressed("pan") + elif event is InputEventMouseMotion: + if is_panning: pan_position = Vector2(-1 * event.relative) # TOUCH PAN AND ZOOM From f53284f7a5c698a8046374ba2e1c4329adefcab6 Mon Sep 17 00:00:00 2001 From: john doughty Date: Sun, 9 Oct 2022 08:06:13 -0500 Subject: [PATCH 2/2] ignoring apks built in the root folder --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ddf685be..6f2c2af1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ .import/ AssetSources/ Prototype/export_presets.cfg -*.import \ No newline at end of file +*.import +prototype/Shotcall.apk +prototype/Shotcall.apk.idsig