Merge branch 'dev' into dev-music

This commit is contained in:
2020-04-21 01:09:00 +02:00
committed by GitHub
16 changed files with 231 additions and 124 deletions

View File

@@ -245,7 +245,6 @@ HeroTemplate = ExtResource( 1 )
[node name="Background" parent="." instance=ExtResource( 7 )]
pause_mode = 1
frame = 20
playing = false
[node name="FloorTileMap" type="TileMap" parent="."]
pause_mode = 1