aboutsummaryrefslogtreecommitdiffstats
path: root/godot/scenes/Game.tscn
diff options
context:
space:
mode:
Diffstat (limited to 'godot/scenes/Game.tscn')
-rw-r--r--godot/scenes/Game.tscn38
1 files changed, 38 insertions, 0 deletions
diff --git a/godot/scenes/Game.tscn b/godot/scenes/Game.tscn
index 0896836..710e5b5 100644
--- a/godot/scenes/Game.tscn
+++ b/godot/scenes/Game.tscn
@@ -1,13 +1,51 @@
+<<<<<<< HEAD
+[gd_scene load_steps=8 format=2]
+
+[ext_resource path="res://native/Game.gdns" type="Script" id=1]
+[ext_resource path="res://scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn" type="PackedScene" id=2]
+[ext_resource path="res://scripts/LevelLoader.gd" type="Script" id=3]
+[ext_resource path="res://scenes/levels/GoalTriggerZone.tscn" type="PackedScene" id=4]
+[ext_resource path="res://scenes/objects/Player.tscn" type="PackedScene" id=5]
+
+[sub_resource type="CubeMesh" id=2]
+
+[sub_resource type="SphereMesh" id=3]
+=======
[gd_scene load_steps=5 format=2]
[ext_resource path="res://scenes/Game.gd" type="Script" id=1]
[ext_resource path="res://scenes/levels/test_scene_movement/TestSceneMovement.tscn" type="PackedScene" id=2]
[ext_resource path="res://assets/theme.tres" type="Theme" id=3]
[ext_resource path="res://assets/fonts/format.tres" type="DynamicFont" id=4]
+>>>>>>> menu
[node name="Game" type="Spatial"]
script = ExtResource( 1 )
+[node name="LevelLoader" type="Node" parent="."]
+script = ExtResource( 3 )
+
+[node name="Level1" type="Spatial" parent="."]
+
+[node name="MeshInstance" type="MeshInstance" parent="Level1"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.99199, 0 )
+mesh = SubResource( 2 )
+material/0 = null
+
+[node name="GoalTriggerZone" parent="Level1" instance=ExtResource( 4 )]
+
+[node name="Level2" type="Spatial" parent="."]
+visible = false
+
+[node name="MeshInstance" type="MeshInstance" parent="Level2"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.99549, 0 )
+mesh = SubResource( 3 )
+material/0 = null
+
+[node name="PlayerRoot" parent="." instance=ExtResource( 5 )]
+input/camera_mouse_sensitivity = Vector2( 0.005, 0.005 )
+input/shoot_sensitivity = 0.005
+
[node name="TestScene" parent="." instance=ExtResource( 2 )]
[node name="PausePopup" type="Control" parent="."]