Merge branch 'dev' into dev-gameplay

This commit is contained in:
2020-04-20 21:55:15 +02:00
committed by GitHub

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=23 format=2]
[gd_scene load_steps=24 format=2]
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://World.gd" type="Script" id=2]
@@ -7,10 +7,12 @@
[ext_resource path="res://Menus/DialogueBox/DialogueBox.tscn" type="PackedScene" id=6]
[ext_resource path="res://Maps/Background/Background.tscn" type="PackedScene" id=7]
[ext_resource path="res://Boss/SlimeBoss/SlimeBoss.tscn" type="PackedScene" id=8]
[ext_resource path="res://Menus/SelectUpgradeUI/SelectUpgradeUI.tscn" type="PackedScene" id=9]
[ext_resource path="res://Menus/SelectUpgradeUI/SelectUpgradeUI.tscn" type="PackedScene" id=19]
[ext_resource path="res://Fonts/Harmonic/Harmonic12.tres" type="DynamicFont" id=9]
[ext_resource path="res://Objects/Bonfire/Bonfire.tscn" type="PackedScene" id=10]
[ext_resource path="res://Debug/BossStateDisplay.gd" type="Script" id=11]
[ext_resource path="res://Maps/Tilesets/Edge/tileset_edge.png" type="Texture" id=12]
[ext_resource path="res://Boss/Minion.tscn" type="PackedScene" id=13]
[ext_resource path="res://Maps/Grid.tscn" type="PackedScene" id=18]
[sub_resource type="ConvexPolygonShape2D" id=1]
@@ -270,11 +272,10 @@ pause_mode = 1
[node name="Bonfire" parent="YSort" instance=ExtResource( 10 )]
position = Vector2( 379.618, 131.478 )
[node name="SlimeBoss" parent="YSort" instance=ExtResource( 8 )]
position = Vector2( 240, 120 )
[node name="Minion" parent="YSort" instance=ExtResource( 9 )]
[node name="Minion" parent="YSort" instance=ExtResource( 13 )]
position = Vector2( 24, 184 )
[node name="Grid" parent="." instance=ExtResource( 18 )]
@@ -287,7 +288,6 @@ pause_mode = 2
visible = false
[node name="DebugLabel" type="Control" parent="CanvasLayer"]
visible = false
anchor_right = 1.0
anchor_bottom = 1.0
__meta__ = {