Merge pull request #105 from jrdoughty/main

fix to camera panning with mouse
spicylobstergames · Oct 9, 2022 · 8ccd230 · 8ccd230
2 parents 28c4376 + f53284f
commit 8ccd230
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 .import/
 AssetSources/
 Prototype/export_presets.cfg
-*.import
+*.import
+prototype/Shotcall.apk
+prototype/Shotcall.apk.idsig
diff --git 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