Merge branch 'dev-rounds' into dev-gameplay

This commit is contained in:
Streamfire
2020-04-20 18:37:31 +02:00
6 changed files with 122 additions and 16 deletions

View File

@@ -198,7 +198,8 @@ func _on_Hurtbox_area_exited(area):
func _on_Stats_no_health():
queue_free()
get_tree().change_scene("res://Menus/TitleScreen/TitleScreen.tscn")
get_tree().get_root().get_node("World").hero_has_died()
#get_tree().change_scene("res://Menus/TitleScreen/TitleScreen.tscn")
func _on_Hitbox_area_entered(area):

View File

@@ -629,6 +629,7 @@ font_data = ExtResource( 6 )
[node name="Player" type="KinematicBody2D" groups=[
"hero",
]]
scale = Vector2( 2, 2 )
collision_mask = 14
script = ExtResource( 1 )
ROLL_SPEED = 120