Merge branch 'Rycarus_ObjectConnection' into dev

This commit is contained in:
Fabio 2024-08-18 20:15:37 +02:00
commit c77169deba
18 changed files with 520 additions and 82 deletions

View file

@ -3,12 +3,11 @@
[ext_resource type="PackedScene" uid="uid://ba6afuig8bqrg" path="res://levels/LevelBase.tscn" id="1_87xn7"]
[ext_resource type="Texture2D" uid="uid://c3m4os8kteaix" path="res://textures/level01-spritesheet.png" id="2_wqskp"]
[ext_resource type="Shader" path="res://shaders/scrolling.gdshader" id="4_0x2h7"]
[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://cpa66thuxma15" path="res://objects/MirrorOrb.tscn" id="7_dyi0e"]
[ext_resource type="PackedScene" uid="uid://br6fngf5208j0" path="res://objects/ResizableBlock.tscn" id="8_ec71m"]
[ext_resource type="PackedScene" uid="uid://d17jpcgayfg6i" path="res://objects/BoxPushable_1.tscn" id="8_urw3p"]
[ext_resource type="PackedScene" uid="uid://bnvyaxh2kotd3" path="res://objects/BreakableBlock.tscn" id="9_m0qjy"]
[ext_resource type="Texture2D" uid="uid://c61y0181w3sq2" path="res://textures/Level 01.png" id="5_4p03u"]
[ext_resource type="PackedScene" path="res://objects/Goal.tscn" id="6_xhax5"]
[ext_resource type="PackedScene" path="res://objects/MirrorOrb.tscn" id="7_dyi0e"]
[ext_resource type="PackedScene" uid="uid://vtwswrkfkgas" path="res://objects/EnemyMover.tscn" id="8_16072"]
[ext_resource type="PackedScene" uid="uid://br6fngf5208j0" path="res://objects/ResizableBlockBig.tscn" id="8_ec71m"]
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_e817v"]
texture = ExtResource("2_wqskp")
@ -130,10 +129,10 @@ shader_parameter/scroll_speed = 0.02
[node name="Player" parent="." index="0"]
position = Vector2(-542, 331)
scale = Vector2(2, 2)
jump_strength_max = 400
[node name="UI" parent="UILayer" index="0"]
[node name="UI" parent="UILayer" index="0" node_paths=PackedStringArray("player")]
mouse_filter = 2
player = NodePath("../../Player")
[node name="HBoxContainer" parent="UILayer/UI" index="0"]
mouse_filter = 0
@ -171,15 +170,14 @@ position = Vector2(582, -317)
position = Vector2(-431, -212)
[node name="Block" parent="." index="9" node_paths=PackedStringArray("ui_actions") instance=ExtResource("8_ec71m")]
position = Vector2(476, 253)
position = Vector2(432, 186)
collision_layer = 1
ui_actions = NodePath("../UILayer/UI")
[node name="BoxPushable1" parent="." index="11" instance=ExtResource("8_urw3p")]
position = Vector2(-84, 326)
[node name="EnemyMover" parent="." index="10" instance=ExtResource("8_16072")]
position = Vector2(-132, 311)
[node name="BreakableBlock" parent="." index="12" instance=ExtResource("9_m0qjy")]
position = Vector2(271, 210)
[node name="BreakableBlock2" parent="." index="13" instance=ExtResource("9_m0qjy")]
position = Vector2(240, 210)
[node name="Block3" parent="." index="11" node_paths=PackedStringArray("ui_actions") instance=ExtResource("8_ec71m")]
position = Vector2(162, 124)
collision_layer = 1
ui_actions = NodePath("../UILayer/UI")