diff options
Diffstat (limited to 'godot/scenes/characters')
| -rw-r--r-- | godot/scenes/characters/PlayerRigid.tscn | 4 | ||||
| -rw-r--r-- | godot/scenes/characters/viewmodel_arms.tscn | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/godot/scenes/characters/PlayerRigid.tscn b/godot/scenes/characters/PlayerRigid.tscn index 6e9fe48..87a463d 100644 --- a/godot/scenes/characters/PlayerRigid.tscn +++ b/godot/scenes/characters/PlayerRigid.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://scripts/characters/player_controller_new.gd" type="Script" id=1] [ext_resource path="res://theming/FreeMono.otf" type="DynamicFontData" id=2] @@ -7,6 +7,7 @@ [ext_resource path="res://scenes/weapons/hands.res" type="Resource" id=5] [ext_resource path="res://scenes/weapons/pistol.tres" type="Resource" id=6] [ext_resource path="res://scenes/weapons/rockets.tres" type="Resource" id=7] +[ext_resource path="res://scenes/weapons/grapplinghook.tres" type="Resource" id=8] [sub_resource type="PhysicsMaterial" id=8] resource_local_to_scene = true @@ -46,6 +47,7 @@ script = ExtResource( 1 ) weapon_slot1 = ExtResource( 5 ) weapon_slot2 = ExtResource( 6 ) weapon_slot3 = ExtResource( 7 ) +weapon_slot4 = ExtResource( 8 ) [node name="Collision" type="CollisionShape" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0 ) diff --git a/godot/scenes/characters/viewmodel_arms.tscn b/godot/scenes/characters/viewmodel_arms.tscn index 1808785..b4d3257 100644 --- a/godot/scenes/characters/viewmodel_arms.tscn +++ b/godot/scenes/characters/viewmodel_arms.tscn @@ -49,7 +49,7 @@ bones/3/name = "Wrist.R" bones/3/parent = 2 bones/3/rest = Transform( 0.942879, -0.20747, 0.260645, 0.237384, 0.967355, -0.0887301, -0.233727, 0.145535, 0.961348, 2.68221e-07, 1.29325, 0 ) bones/3/enabled = true -bones/3/bound_children = [ NodePath("GunBone") ] +bones/3/bound_children = [ ] bones/4/name = "Thumb.R" bones/4/parent = 3 bones/4/rest = Transform( 0.771494, -0.608265, -0.186579, 0.518122, 0.770842, -0.370612, 0.369253, 0.189254, 0.909854, -0.138479, 0.349082, 0.150327 ) @@ -176,5 +176,5 @@ mesh = ExtResource( 3 ) skin = ExtResource( 4 ) [node name="GunBone" type="BoneAttachment" parent="Skeleton"] -transform = Transform( -0.978, -0.15941, 0.134542, 0.1673, -0.214165, 0.962363, -0.124596, 0.963702, 0.236124, -1.28918, -0.187637, 3.05885 ) +transform = Transform( -0.988177, 0.144629, -0.0508501, -0.0291988, 0.148051, 0.988548, 0.150501, 0.978347, -0.142077, -1.28918, -0.187637, 3.05885 ) bone_name = "Wrist.R" |