Merge branch 'initial-character-behavior'

* initial-character-behavior:
  Add view model implementing character movement
  Define basic key bindings
  Add placeholder character object
  Add generic weapon

1 files changed, 44 insertions, 0 deletions

diff --git a/assets/weapons/goo_gun/GooGun.tscn b/assets/weapons/goo_gun/GooGun.tscn
new file mode 100644
index 0000000..f0b9622
--- /dev/null
+++ b/assets/weapons/goo_gun/GooGun.tscn
@@ -0,0 +1,44 @@
+[gd_scene load_steps=7 format=2]
+
+[ext_resource path="res://assets/weapons/goo_gun/gun_material.tres" type="Material" id=1]
+[ext_resource path="res://assets/weapons/goo_gun/tank_material.tres" type="Material" id=2]
+
+[sub_resource type="CubeMesh" id=1]
+material = ExtResource( 1 )
+size = Vector3( 0.25, 0.25, 2 )
+
+[sub_resource type="CapsuleMesh" id=2]
+material = ExtResource( 2 )
+radius = 0.275
+mid_height = 0.618
+
+[sub_resource type="CubeMesh" id=3]
+material = ExtResource( 1 )
+size = Vector3( 0.15, 0.5, 0.15 )
+
+[sub_resource type="CylinderMesh" id=4]
+material = ExtResource( 1 )
+top_radius = 0.24
+bottom_radius = 0.088
+height = 0.429
+
+[node name="GooGun" type="Spatial"]
+
+[node name="Body" type="MeshInstance" parent="."]
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Tank" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.398, -0.375 )
+mesh = SubResource( 2 )
+material/0 = null
+
+[node name="Handle" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.373, -0.27 )
+mesh = SubResource( 3 )
+material/0 = null
+
+[node name="Nozzle" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0.953 )
+mesh = SubResource( 4 )
+material/0 = null