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 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