diff options
| author |  cel <cel@blos.sm> | 2022-07-16 22:57:56 +0100 |
|---|---|---|
| committer | cel <cel@blos.sm> | 2022-07-16 22:57:56 +0100 |
| commit | 598a36466e76d0c7c16a690a72d4a0e8d7326351 (patch) | |
| tree | 513fc0696611e1ab0c8fb215dfd4561657e0b458 /godot/scenes/levels | |
| parent | c5bacb265a477f1f80be6a9fbdabc072fc074a59 (diff) | |
| download | 2022-598a36466e76d0c7c16a690a72d4a0e8d7326351.tar.gz 2022-598a36466e76d0c7c16a690a72d4a0e8d7326351.tar.bz2 2022-598a36466e76d0c7c16a690a72d4a0e8d7326351.zip | |
fixed merge conflicts
Diffstat (limited to 'godot/scenes/levels')
| -rw-r--r-- | godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn b/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn index c1c8707..0820451 100644 --- a/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn +++ b/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn @@ -1,15 +1,19 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://scenes/levels/test_scene_uuuhhh/Wall.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/levels/test_scene_uuuhhh/Floor.tscn" type="PackedScene" id=2] +[ext_resource path="res://scenes/scripts/roblox-cube.gd" type="Script" id=3] [ext_resource path="res://assets/sounds/Uuhhh.mp3" type="AudioStream" id=4] -<<<<<<< HEAD -======= [ext_resource path="res://scenes/Die.tscn" type="PackedScene" id=5] ->>>>>>> menu [node name="TestScene" type="Spatial"] +[node name="W8" parent="." instance=ExtResource( 5 )] +transform = Transform( 0.990268, 0.0360207, 0.134431, 0, 0.965926, -0.258819, -0.139173, 0.2563, 0.956525, -2.57174, 1.79727, 8.45058 ) +contacts_reported = 3 +contact_monitor = true +script = ExtResource( 3 ) + [node name="Floor" parent="." instance=ExtResource( 2 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0290833, -0.981747, 0.00208664 ) |