henry/tojam20-elevator
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge issues

Browse source
This commit is contained in:
Jennie Robinson Faber 2026-05-10 16:33:51 +01:00
parent 764ca6411a
commit 2b66f20365
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scenes/game.tscn
View file

@ -23,10 +23,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.004168272, 1.1920929e-07,
[node name="ElevatorPanel" parent="CanvasPanel" unique_id=574176994 instance=ExtResource("3_lnu2h")] [node name="ElevatorPanel" parent="CanvasPanel" unique_id=574176994 instance=ExtResource("3_lnu2h")]
<<<<<<< HEAD
[node name="ComponentSpawn" parent="." unique_id=649225939 instance=ExtResource("5_iywne")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.004472971, 0)
=======
[node name="SfxDing" type="AudioStreamPlayer3D" parent="CanvasPanel/ElevatorPanel" unique_id=529226129] [node name="SfxDing" type="AudioStreamPlayer3D" parent="CanvasPanel/ElevatorPanel" unique_id=529226129]
stream = ExtResource("4_p57ef") stream = ExtResource("4_p57ef")
@ -39,4 +35,3 @@ stream = ExtResource("6_gee14")
[node name="SfxChase" type="AudioStreamPlayer3D" parent="CanvasPanel/ElevatorPanel" unique_id=812445001] [node name="SfxChase" type="AudioStreamPlayer3D" parent="CanvasPanel/ElevatorPanel" unique_id=812445001]
[node name="ComponentSpawn" parent="." unique_id=649225939 instance=ExtResource("9_0tnpc")] [node name="ComponentSpawn" parent="." unique_id=649225939 instance=ExtResource("9_0tnpc")]
>>>>>>> f2b176c978c80dee71e2e640451aa7b607238400