Merge branch 'dev' into dev-ai

This commit is contained in:
Jonas Mucke
2020-04-20 13:32:24 +02:00
committed by GitHub
119 changed files with 2484 additions and 396 deletions

View File

@@ -626,8 +626,12 @@ radius = 13.3924
size = 12
font_data = ExtResource( 6 )
[node name="Player" type="KinematicBody2D"]
scale = Vector2( 1.1, 1.1 )
[node name="Player" type="KinematicBody2D" groups=[
"hero",
]]
collision_mask = 14
script = ExtResource( 1 )
ROLL_SPEED = 120
FRICTION = 270
@@ -757,6 +761,7 @@ script = ExtResource( 16 )
[node name="Effects" type="Node2D" parent="."]
[node name="HealEffect" parent="Effects" instance=ExtResource( 8 )]
emitting = false
[connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"]
[connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"]
[connection signal="area_exited" from="Hurtbox" to="." method="_on_Hurtbox_area_exited"]