summaryrefslogtreecommitdiff
path: root/godot/scenes/ballistics/Cannonball.tscn
diff options
context:
space:
mode:
authorAnson Bridges <bridges.anson@gmail.com>2022-09-30 11:20:16 -0400
committerAnson Bridges <bridges.anson@gmail.com>2022-09-30 11:20:16 -0400
commit4a17fde692b900393d796675bcf7011aa7399dad (patch)
tree5305dba808a7094192821736a379168cdb549843 /godot/scenes/ballistics/Cannonball.tscn
parent7a1d857de96174dfa5a0fa40f8c14acbd2f651c2 (diff)
syncing off main
Diffstat (limited to 'godot/scenes/ballistics/Cannonball.tscn')
-rw-r--r--godot/scenes/ballistics/Cannonball.tscn5
1 files changed, 2 insertions, 3 deletions
diff --git a/godot/scenes/ballistics/Cannonball.tscn b/godot/scenes/ballistics/Cannonball.tscn
index 4e5d06a..b9d5a0d 100644
--- a/godot/scenes/ballistics/Cannonball.tscn
+++ b/godot/scenes/ballistics/Cannonball.tscn
@@ -34,7 +34,6 @@ mass = 10.0
continuous_cd = true
contacts_reported = 2
contact_monitor = true
-can_sleep = false
script = ExtResource( 1 )
[node name="CollisionShape" type="CollisionShape" parent="."]
@@ -44,12 +43,12 @@ shape = SubResource( 1 )
mesh = SubResource( 2 )
material/0 = SubResource( 3 )
-[node name="PickupArea" type="Area" parent="."]
+[node name="CarryArea" type="Area" parent="."]
collision_layer = 2
collision_mask = 2
monitoring = false
-[node name="CollisionShape" type="CollisionShape" parent="PickupArea"]
+[node name="CollisionShape" type="CollisionShape" parent="CarryArea"]
shape = SubResource( 6 )
[connection signal="body_entered" from="." to="." method="_on_collision"]