darknight/puzzle-quest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/save-state-scene

Browse Source
This commit is contained in:
darknight
2021-05-15 16:42:32 +02:00
parent 9d9ca0a283 3428b0b980
commit 3d37ec00a6
22 changed files with 400 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/levels/warcraft/WarCraft.tscn
+7 -1
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=62 format=2]
[gd_scene load_steps=64 format=2]
[ext_resource path="res://assets/props/candle/sm_candle_top.mesh" type="ArrayMesh" id=1]
[ext_resource path="res://scenes/levels/warcraft/WarCraft.gd" type="Script" id=2]
@@ -43,6 +43,8 @@
[ext_resource path="res://assets/props/misc/plane.mesh" type="ArrayMesh" id=41]
[ext_resource path="res://assets/props/spyglass/sm_spyglass.mesh" type="ArrayMesh" id=42]
[ext_resource path="res://assets/props/spyglass/materials/MA_spyglass.material" type="Material" id=43]
[ext_resource path="res://scenes/UI/list_ho/UI_list_ho.tscn" type="PackedScene" id=44]
[ext_resource path="res://scenes/UI/UI_back.tscn" type="PackedScene" id=45]
[sub_resource type="PanoramaSky" id=1]
panorama = ExtResource( 11 )
@@ -752,4 +754,8 @@ collision_mask = 2
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0358186, 0, 0.0109152 )
shape = SubResource( 18 )
[node name="Control" parent="." instance=ExtResource( 44 )]
[node name="Control2" parent="." instance=ExtResource( 45 )]
[connection signal="confirmed" from="Dialog/ConfirmEscape" to="." method="_on_ConfirmEscape_confirmed"]