Merge branch 'dev' into dev-gameplay

This commit is contained in:
2020-04-20 21:51:10 +02:00
committed by GitHub
11 changed files with 270 additions and 378 deletions

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=11 format=2]
[gd_scene load_steps=12 format=2]
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://World.gd" type="Script" id=2]
@@ -23,7 +23,8 @@ HeroTemplate = ExtResource( 1 )
[node name="Background" parent="." instance=ExtResource( 7 )]
pause_mode = 1
frame = 36
frame = 20
playing = false
[node name="FloorTileMap" type="TileMap" parent="."]
pause_mode = 1
@@ -44,6 +45,9 @@ position = Vector2( 379.618, 131.478 )
[node name="SlimeBoss" parent="YSort" instance=ExtResource( 8 )]
position = Vector2( 104, 80 )
[node name="Minion" parent="YSort" instance=ExtResource( 9 )]
position = Vector2( 24, 184 )
[node name="Grid" parent="." instance=ExtResource( 18 )]
pause_mode = 1