Merge pull request #77 from aaronfranke/bullet-aim

aaronfranke · web-flow · commit 99e4f80969ec · 2020-06-29T21:52:19.000-04:00
Prevent aiming at other bullets by setting their collision layer to zero
diff --git a/player/bullet/bullet.tscn b/player/bullet/bullet.tscn
@@ -170,6 +170,7 @@ tracks/5/keys = {
 }
 
 [node name="Bullet" type="KinematicBody"]
+collision_layer = 0
 script = ExtResource( 1 )
 
 [node name="MeshInstance" type="MeshInstance" parent="."]

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,7 @@ tracks/5/keys = {`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`[node name="Bullet" type="KinematicBody"]`
	`173`	`+collision_layer = 0`
`173`	`174`	`script = ExtResource( 1 )`
`174`	`175`
`175`	`176`	`[node name="MeshInstance" type="MeshInstance" parent="."]`