Merge branch 'dev-music' of https://github.com/creyD/ludum_dare_46 into dev-music

This commit is contained in:
Jan Schuffenhauer
2020-04-20 23:24:58 +02:00
244 changed files with 44 additions and 4031 deletions

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=28 format=2]
[gd_scene load_steps=29 format=2]
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://World.gd" type="Script" id=2]
@@ -18,6 +18,7 @@
[ext_resource path="res://Objects/Barrel/Barrel.tscn" type="PackedScene" id=16]
[ext_resource path="res://Objects/Traps/Spike/Spike.tscn" type="PackedScene" id=17]
[ext_resource path="res://Maps/Grid.tscn" type="PackedScene" id=18]
[ext_resource path="res://Menus/SelectUpgradeUI/button.png" type="Texture" id=19]
[sub_resource type="ConvexPolygonShape2D" id=1]
points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 )
@@ -348,13 +349,24 @@ margin_bottom = 0.463318
[node name="SelectUpgradeUI" parent="CanvasLayer" instance=ExtResource( 4 )]
visible = false
[node name="Win" type="Button" parent="CanvasLayer"]
[node name="Win" type="TextureButton" parent="CanvasLayer"]
visible = false
anchor_left = 1.0
anchor_right = 1.0
margin_left = -42.0
margin_bottom = 24.0
text = "Win"
margin_left = -96.0
margin_bottom = 25.0
texture_normal = ExtResource( 19 )
[node name="Label" type="Label" parent="CanvasLayer/Win"]
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -28.5
margin_top = -7.0
margin_right = 28.5
margin_bottom = 7.0
text = "Win Now"
[node name="Bonfire" parent="." instance=ExtResource( 10 )]
position = Vector2( 104, 56 )