Booklordofthedings/GMTK-2024
1
0
Fork 0
Code Pull requests Activity

fix merge

Browse source
This commit is contained in:
Booklordofthedings 2024-08-18 12:16:29 +02:00
parent 34f19f4eb7
commit 1ae636e30b
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gmtk_2024/levels/level_1.tscn
View file

@ -6,11 +6,8 @@
[ext_resource type="Texture2D" uid="uid://bki6ucvk6bjwk" path="res://textures/Level 01.png" id="5_4p03u"] [ext_resource type="Texture2D" uid="uid://bki6ucvk6bjwk" path="res://textures/Level 01.png" id="5_4p03u"]
[ext_resource type="PackedScene" uid="uid://d0gpnqknarkg7" path="res://objects/Goal.tscn" id="6_xhax5"] [ext_resource type="PackedScene" uid="uid://d0gpnqknarkg7" path="res://objects/Goal.tscn" id="6_xhax5"]
[ext_resource type="PackedScene" uid="uid://cpa66thuxma15" path="res://objects/MirrorOrb.tscn" id="7_dyi0e"] [ext_resource type="PackedScene" uid="uid://cpa66thuxma15" path="res://objects/MirrorOrb.tscn" id="7_dyi0e"]
<<<<<<< HEAD
[ext_resource type="PackedScene" uid="uid://d17jpcgayfg6i" path="res://objects/BoxPushable_1.tscn" id="8_o0q03"] [ext_resource type="PackedScene" uid="uid://d17jpcgayfg6i" path="res://objects/BoxPushable_1.tscn" id="8_o0q03"]
=======
[ext_resource type="PackedScene" uid="uid://br6fngf5208j0" path="res://objects/ResizableBlock.tscn" id="8_ec71m"] [ext_resource type="PackedScene" uid="uid://br6fngf5208j0" path="res://objects/ResizableBlock.tscn" id="8_ec71m"]
>>>>>>> dev
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_e817v"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_e817v"]
texture = ExtResource("2_wqskp") texture = ExtResource("2_wqskp")
@ -170,11 +167,9 @@ position = Vector2(582, -317)
[node name="MirrorOrb" parent="." index="8" instance=ExtResource("7_dyi0e")] [node name="MirrorOrb" parent="." index="8" instance=ExtResource("7_dyi0e")]
position = Vector2(-431, -212) position = Vector2(-431, -212)
<<<<<<< HEAD
[node name="BoxPushable1" parent="." index="13" instance=ExtResource("8_o0q03")] [node name="BoxPushable1" parent="." index="13" instance=ExtResource("8_o0q03")]
position = Vector2(-228, 320) position = Vector2(-228, 320)
=======
[node name="Block" parent="." index="9" instance=ExtResource("8_ec71m")] [node name="Block" parent="." index="9" instance=ExtResource("8_ec71m")]
position = Vector2(476, 253) position = Vector2(476, 253)
collision_layer = 1 collision_layer = 1
>>>>>>> dev