merged menu branch

3 files changed, 32 insertions, 18 deletions

diff --git a/godot/scenes/objects/W8.tscn b/godot/scenes/Die.tscn
index 8766011..57594ed 100644
--- a/godot/scenes/objects/W8.tscn
+++ b/godot/scenes/Die.tscn
@@ -1,5 +1,10 @@
+<<<<<<< HEAD:godot/scenes/objects/W8.tscn
 [gd_scene load_steps=6 format=2]
+=======
+[gd_scene load_steps=5 format=2]
+>>>>>>> menu:godot/scenes/Die.tscn
 
+[ext_resource path="res://scenes/Die.gd" type="Script" id=1]
 [ext_resource path="res://assets/game_objects/W8baseColor_Mat.material" type="Material" id=2]
 
 [sub_resource type="ArrayMesh" id=1]
@@ -20,11 +25,16 @@ surfaces/0 = {
 [sub_resource type="ConvexPolygonShape" id=2]
 points = PoolVector3Array( -0.0850063, -0.879389, -0.0282584, 0.0288993, 0.929375, 0.0289349, 0.0288993, 0.929375, -0.0289349, 0.929367, -0.0289314, 0.0289314, -0.0289784, -0.0289338, 0.929338, -0.929369, 0.028929, 0.028929, 0.0288993, -0.0289349, -0.929375, 0.0288993, -0.929375, 0.0289349, -0.0850063, 0.0282584, -0.879389, 0.0282247, 0.084959, 0.87945, 0.857489, 0.056933, -0.0855785, -0.879454, -0.0849424, 0.0282549, 0.0570775, -0.885814, -0.0571088, 0.0570775, -0.0571088, 0.885814, -0.0571532, 0.885743, -0.0571043, -0.0571532, 0.885743, 0.0571043, 0.0570775, 0.0571088, -0.885814, -0.885806, -0.057097, -0.057097, 0.879446, 0.0849494, 0.0282572, 0.857335, -0.0571018, -0.0855632, -0.0571532, 0.0571043, 0.885743, -0.0571532, -0.885743, 0.0571043, -0.885806, 0.057097, -0.057097, -0.0571532, -0.0571043, -0.885743, 0.0570775, 0.0571088, 0.885814, -0.0571532, -0.885743, -0.0571043, -0.0571532, 0.0571043, -0.885743, 0.0570775, -0.885814, 0.0571088, 0.0570775, 0.885814, 0.0571088, -0.0571532, -0.0571043, 0.885743, -0.885806, 0.057097, 0.057097, 0.0570775, 0.885814, -0.0571088, 0.0570775, -0.0571088, -0.885814, 0.857335, -0.0571018, 0.0855632, -0.885806, -0.057097, 0.057097, 0.857489, 0.056933, 0.0855785, 0.929425, 0.0287513, -0.0289333, 0.929367, -0.0289314, -0.0289314, -0.0289784, 0.929338, -0.0289338, 0.0288993, 0.0289349, -0.929375, -0.929369, -0.028929, -0.028929, -0.0283039, -0.87942, -0.0849561, 0.084933, 0.0282608, 0.879461, -0.0289784, 0.929338, 0.0289338, -0.0289784, -0.0289338, -0.929338, -0.0289784, 0.0289338, 0.929338, 0.0288993, -0.0289349, 0.929375, 0.0288993, -0.929375, -0.0289349, -0.0289784, -0.929338, 0.0289338, -0.929369, 0.028929, -0.028929, -0.0283039, 0.0849561, -0.87942, -0.879454, -0.0282549, 0.0849424, 0.879512, 0.0280816, 0.0849558, 0.879446, -0.0849494, -0.0282572, -0.0282988, -0.822574, 0.141805, 0.17021, 0.0280745, -0.794261, -0.879454, 0.0849424, -0.0282549, -0.0283039, 0.87942, 0.0849561, 0.0282247, 0.87945, -0.084959, 0.0282247, -0.084959, -0.87945, -0.879454, -0.0282549, -0.0849424, -0.0850063, 0.0282584, 0.879389, -0.0850063, 0.879389, 0.0282584, 0.084933, -0.0282608, 0.879461 )
 
+<<<<<<< HEAD:godot/scenes/objects/W8.tscn
 [sub_resource type="SphereShape" id=3]
 
 [sub_resource type="SphereMesh" id=4]
 
 [node name="RigidBody" type="RigidBody"]
+=======
+[node name="Die" type="RigidBody"]
+script = ExtResource( 1 )
+>>>>>>> menu:godot/scenes/Die.tscn
 
 [node name="MeshDie" type="MeshInstance" parent="."]
 mesh = SubResource( 1 )
@@ -34,6 +44,7 @@ material/0 = null
 [node name="CollisionShapeDie" type="CollisionShape" parent="."]
 shape = SubResource( 2 )
 
+<<<<<<< HEAD:godot/scenes/objects/W8.tscn
 [node name="CollisionShapeSphere" type="CollisionShape" parent="."]
 transform = Transform( 0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, 0 )
 shape = SubResource( 3 )
@@ -44,3 +55,13 @@ transform = Transform( 0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, 0 )
 visible = false
 mesh = SubResource( 4 )
 material/0 = ExtResource( 2 )
+=======
+[node name="CamRoot" type="Spatial" parent="."]
+
+[node name="Horizontal" type="Spatial" parent="CamRoot"]
+
+[node name="Vertical" type="Spatial" parent="CamRoot/Horizontal"]
+
+[node name="Camera" type="ClippedCamera" parent="CamRoot/Horizontal/Vertical"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 10.1285 )
+>>>>>>> menu:godot/scenes/Die.tscn
diff --git a/godot/scenes/objects/Player.tscn b/godot/scenes/objects/Player.tscn
deleted file mode 100644
index cc3662e..0000000
--- a/godot/scenes/objects/Player.tscn
+++ /dev/null
@@ -1,18 +0,0 @@
-[gd_scene load_steps=4 format=2]
-
-[ext_resource path="res://scenes/objects/W8.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scenes/objects/Camera.tscn" type="PackedScene" id=2]
-[ext_resource path="res://native/BasicDie.gdns" type="Script" id=3]
-
-[node name="PlayerRoot" type="Spatial"]
-script = ExtResource( 3 )
-camera/camera_clamp = Vector2( 0, -1.3 )
-shooting/max_force = 30.0
-shooting/up_angle = 0.3
-shooting/stopping_velocity = 0.003
-
-[node name="W8" parent="." instance=ExtResource( 1 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0 )
-
-[node name="Camera" parent="." instance=ExtResource( 2 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0 )
diff --git a/godot/scenes/objects/old/Die.tscn b/godot/scenes/objects/old/Die.tscn
new file mode 100644
index 0000000..cab0d15
--- /dev/null
+++ b/godot/scenes/objects/old/Die.tscn
@@ -0,0 +1,11 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://scenes/Die.tscn" type="PackedScene" id=1]
+
+[node name="Die" type="Spatial"]
+
+[node name="Die" parent="." instance=ExtResource( 1 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0 )
+
+[node name="CamRoot" type="Spatial" parent="Die"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.1, 0 )