Merge branch 'master' of https://git.ghostguild.org/henry/tojam20-elevator
This commit is contained in:
commit
764ca6411a
7 changed files with 135 additions and 13 deletions
|
|
@ -13,6 +13,7 @@
|
|||
script = ExtResource("1_lbhrr")
|
||||
|
||||
[node name="World" parent="." unique_id=831374579 instance=ExtResource("1_uwrxv")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.004168272, 1.1920929e-07, -0.0019803047)
|
||||
|
||||
[node name="CanvasHud" type="CanvasLayer" parent="." unique_id=369977201]
|
||||
|
||||
|
|
@ -22,6 +23,10 @@ script = ExtResource("1_lbhrr")
|
|||
|
||||
[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]
|
||||
stream = ExtResource("4_p57ef")
|
||||
|
||||
|
|
@ -34,3 +39,4 @@ stream = ExtResource("6_gee14")
|
|||
[node name="SfxChase" type="AudioStreamPlayer3D" parent="CanvasPanel/ElevatorPanel" unique_id=812445001]
|
||||
|
||||
[node name="ComponentSpawn" parent="." unique_id=649225939 instance=ExtResource("9_0tnpc")]
|
||||
>>>>>>> f2b176c978c80dee71e2e640451aa7b607238400
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue