logan/the-crypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Logan 2020-07-19 18:49:40 -05:00
parent f6b0bfb720 d9983f3601
commit 527d7c520e
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
magic/Projectiles/EcoProjectile.tscn
View file

@ -8,7 +8,11 @@ radius = 5.0
[node name="EcoProjectile" type="KinematicBody2D"]
collision_layer = 8
<<<<<<< HEAD
collision_mask = 2
=======
collision_mask = 6
>>>>>>> master
script = ExtResource( 2 )
[node name="Sprite" type="Sprite" parent="."]

4
magic/Projectiles/PhantomProjectile.tscn
View file

@ -8,7 +8,11 @@ radius = 5.0
height = 2.0
[node name="PhantomProjectile" type="KinematicBody2D"]
<<<<<<< HEAD
collision_layer = 8
=======
collision_layer = 2147483656
>>>>>>> master
collision_mask = 6
script = ExtResource( 2 )