finish merge

This commit is contained in:
2025-10-20 21:36:43 -06:00
parent a6c4d56650
commit 0f87a64d5c

View File

@@ -31,12 +31,7 @@ func _process(delta: float) -> void:
time_since_first_location = 0 time_since_first_location = 0
if Input.is_action_pressed("click"): if Input.is_action_pressed("click"):
<<<<<<< Updated upstream
mouse_first_location = get_global_mouse_position() mouse_first_location = get_global_mouse_position()
=======
# If
time_since_first_location += delta
>>>>>>> Stashed changes
elif Input.is_action_just_released("click"): elif Input.is_action_just_released("click"):
time_since_first_location += delta time_since_first_location += delta