Merge branch 'dev' into dev-boss-continuation

This commit is contained in:
panorb
2020-04-20 21:49:48 +02:00
committed by GitHub
11 changed files with 271 additions and 379 deletions

View File

@@ -31,6 +31,7 @@ height = 50.0
radius = 13.0
height = 30.0
[sub_resource type="CapsuleShape2D" id=3]
radius = 20.0
height = 30.0
@@ -1013,9 +1014,11 @@ position = Vector2( 0, -5 )
rotation = 1.5708
shape = SubResource( 2 )
[node name="Hurtbox" parent="." instance=ExtResource( 1 )]
[node name="Hurtbox" parent="." groups=[
"HittableByPlayer",
] instance=ExtResource( 1 )]
collision_layer = 4
collision_mask = 0
collision_mask = 128
[node name="CollisionShape2D" parent="Hurtbox" index="0"]
rotation = 1.5708