diff --git a/.import/Handgun.gltf-dfc6de5a6d72ba5ef43f43a4cd2ab91e.md5 b/.import/Handgun.gltf-dfc6de5a6d72ba5ef43f43a4cd2ab91e.md5 new file mode 100644 index 0000000..c487be0 --- /dev/null +++ b/.import/Handgun.gltf-dfc6de5a6d72ba5ef43f43a4cd2ab91e.md5 @@ -0,0 +1,3 @@ +source_md5="8b70b5a7d0071027d20efba3641d0caf" +dest_md5="dec8372f4fb3e2742b9b5e2b3c42621a" + diff --git a/.import/Handgun.gltf-dfc6de5a6d72ba5ef43f43a4cd2ab91e.scn b/.import/Handgun.gltf-dfc6de5a6d72ba5ef43f43a4cd2ab91e.scn new file mode 100644 index 0000000..5f6870c Binary files /dev/null and b/.import/Handgun.gltf-dfc6de5a6d72ba5ef43f43a4cd2ab91e.scn differ diff --git a/Assets/Weapons/Handgun/Handgun.blend b/Assets/Weapons/Handgun/Handgun.blend index 41894f5..0823edc 100644 Binary files a/Assets/Weapons/Handgun/Handgun.blend and b/Assets/Weapons/Handgun/Handgun.blend differ diff --git a/Assets/Weapons/Handgun/Handgun.blend1 b/Assets/Weapons/Handgun/Handgun.blend1 index fd84956..41894f5 100644 Binary files a/Assets/Weapons/Handgun/Handgun.blend1 and b/Assets/Weapons/Handgun/Handgun.blend1 differ diff --git a/Assets/Weapons/Handgun/Handgun.gltf b/Assets/Weapons/Handgun/Handgun.gltf index 91844fb..5b40011 100644 --- a/Assets/Weapons/Handgun/Handgun.gltf +++ b/Assets/Weapons/Handgun/Handgun.gltf @@ -28,9 +28,9 @@ 14.836203575134277 ], "translation" : [ - -0.5225987434387207, - 0.06583499908447266, - -0.0019259302644059062 + -0.5225988030433655, + 0.06583502888679504, + -0.001925930380821228 ] }, { @@ -50,13 +50,13 @@ "mesh" : 3, "name" : "Static", "scale" : [ - 0.44230252504348755, - 0.44230252504348755, - 0.44230252504348755 + 0.22115126252174377, + 0.22115126252174377, + 0.22115126252174377 ], "translation" : [ - -0.32985466718673706, - 0.20647387206554413, + -0.17539557814598083, + 0.11030124872922897, 0 ] } diff --git a/Player.tscn b/Player.tscn index fd09316..38b39d4 100644 --- a/Player.tscn +++ b/Player.tscn @@ -7,11 +7,11 @@ radius = 0.33 height = 1.1 -[sub_resource type="CylinderShape" id=3] +[sub_resource type="CylinderShape" id=4] radius = 0.2 height = 0.3 -[sub_resource type="CapsuleMesh" id=2] +[sub_resource type="CapsuleMesh" id=3] radius = 0.33 mid_height = 1.1 @@ -22,7 +22,7 @@ script = ExtResource( 1 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.53592, -0.0651628 ) [node name="Weapon" type="Spatial" parent="Camera"] -transform = Transform( -2.18557e-07, 0, -5, 0, 5, 0, 5, 0, -2.18557e-07, 0.263, -0.216, -0.559 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335, -0.4, -0.559 ) [node name="Handgun" parent="Camera/Weapon" instance=ExtResource( 2 )] @@ -32,11 +32,11 @@ shape = SubResource( 1 ) [node name="CollisionShapeFeet" type="CollisionShape" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.150321, 0 ) -shape = SubResource( 3 ) +shape = SubResource( 4 ) [node name="MeshInstance" type="MeshInstance" parent="."] transform = Transform( 1, 0, 0, 0, -1.62921e-07, -1, 0, 1, -1.62921e-07, 0, 0.882822, 0 ) -mesh = SubResource( 2 ) +mesh = SubResource( 3 ) material/0 = null [node name="Debug" type="Label" parent="."]