From 598a36466e76d0c7c16a690a72d4a0e8d7326351 Mon Sep 17 00:00:00 2001 From: cel Date: Sat, 16 Jul 2022 22:57:56 +0100 Subject: fixed merge conflicts --- godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'godot/scenes/levels/test_scene_uuuhhh') 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 ) -- cgit