diff --git a/godot/models/animations/Aim.res b/godot/models/animations/Aim.res index c93c56c..eca6c19 100644 Binary files a/godot/models/animations/Aim.res and b/godot/models/animations/Aim.res differ diff --git a/godot/models/animations/Aim_Fire.res b/godot/models/animations/Aim_Fire.res index 60fcfca..1218957 100644 Binary files a/godot/models/animations/Aim_Fire.res and b/godot/models/animations/Aim_Fire.res differ diff --git a/godot/models/animations/Fall_die.res b/godot/models/animations/Fall_die.res index 168e4d8..dc63564 100644 Binary files a/godot/models/animations/Fall_die.res and b/godot/models/animations/Fall_die.res differ diff --git a/godot/models/animations/RESET.res b/godot/models/animations/RESET.res index 12e1b95..66fad74 100644 Binary files a/godot/models/animations/RESET.res and b/godot/models/animations/RESET.res differ diff --git a/godot/models/animations/Run_forward.res b/godot/models/animations/Run_forward.res index 417aea1..865059b 100644 Binary files a/godot/models/animations/Run_forward.res and b/godot/models/animations/Run_forward.res differ diff --git a/godot/models/animations/Turn_left.res b/godot/models/animations/Turn_left.res index b57683c..09c3edc 100644 Binary files a/godot/models/animations/Turn_left.res and b/godot/models/animations/Turn_left.res differ diff --git a/godot/models/animations/Turn_right.res b/godot/models/animations/Turn_right.res index 7c95f2e..c6ea2a4 100644 Binary files a/godot/models/animations/Turn_right.res and b/godot/models/animations/Turn_right.res differ diff --git a/godot/models/animations/Walk_forward.res b/godot/models/animations/Walk_forward.res index 28766c1..74ebaba 100644 Binary files a/godot/models/animations/Walk_forward.res and b/godot/models/animations/Walk_forward.res differ diff --git a/godot/models/animations/character_tree.tres b/godot/models/animations/character_tree.tres index 4bea190..1110ca1 100644 --- a/godot/models/animations/character_tree.tres +++ b/godot/models/animations/character_tree.tres @@ -193,7 +193,7 @@ states/Start/position = Vector2(383.995, 14.954) "states/Walk [turn]/node" = SubResource("AnimationNodeBlendTree_2mbyh") "states/Walk [turn]/position" = Vector2(477.995, 226.767) transitions = ["Aim [aim] [turn]", "Aim Down [aim]", SubResource("AnimationNodeStateMachineTransition_4lybd"), "Aim Down [aim]", "Walk [turn]", SubResource("AnimationNodeStateMachineTransition_5aafd"), "Aim [aim] [turn]", "Fire [aim]", SubResource("AnimationNodeStateMachineTransition_8f4gl"), "Fire [aim]", "Aim [aim] [turn]", SubResource("AnimationNodeStateMachineTransition_xnat3"), "Walk [turn]", "Aim [aim] [turn]", SubResource("AnimationNodeStateMachineTransition_12bos"), "Aim Down [aim]", "Stationary [turn]", SubResource("AnimationNodeStateMachineTransition_n0ndr"), "Walk [turn]", "Stationary [turn]", SubResource("AnimationNodeStateMachineTransition_0wc5e"), "Stationary [turn]", "Walk [turn]", SubResource("AnimationNodeStateMachineTransition_4hisb"), "Start", "Stationary [turn]", SubResource("AnimationNodeStateMachineTransition_bmty6"), "Stationary [turn]", "RESET To Aim", SubResource("AnimationNodeStateMachineTransition_kyd6p"), "RESET To Aim", "Aim [aim] [turn]", SubResource("AnimationNodeStateMachineTransition_w5kob"), "Stationary [turn]", "Run", SubResource("AnimationNodeStateMachineTransition_g0i3x"), "Walk [turn]", "Run", SubResource("AnimationNodeStateMachineTransition_ocffv"), "Run", "Stationary [turn]", SubResource("AnimationNodeStateMachineTransition_h0my5"), "Run", "Walk [turn]", SubResource("AnimationNodeStateMachineTransition_nymcr")] -graph_offset = Vector2(162.422, 4.345) +graph_offset = Vector2(-60.578, -14.155) [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_au62i"] animation = &"Fall_die" @@ -203,13 +203,14 @@ animation = &"Fall_die" [sub_resource type="AnimationNodeTimeSeek" id="AnimationNodeTimeSeek_p56ym"] [resource] +graph_offset = Vector2(-456.05, 79.5434) nodes/Actions/node = SubResource("AnimationNodeStateMachine_7smdg") nodes/Actions/position = Vector2(0, 140) nodes/Death/node = SubResource("AnimationNodeAnimation_au62i") -nodes/Death/position = Vector2(-200, 300) +nodes/Death/position = Vector2(0, 380) nodes/DeathBlend/node = SubResource("AnimationNodeBlend2_av3pm") -nodes/DeathBlend/position = Vector2(180, 140) +nodes/DeathBlend/position = Vector2(460, 320) nodes/DeathSeek/node = SubResource("AnimationNodeTimeSeek_p56ym") -nodes/DeathSeek/position = Vector2(20, 300) -nodes/output/position = Vector2(327.273, 163.636) +nodes/DeathSeek/position = Vector2(240, 360) +nodes/output/position = Vector2(700, 320) node_connections = [&"DeathBlend", 0, &"Actions", &"DeathBlend", 1, &"DeathSeek", &"DeathSeek", 0, &"Death", &"output", 0, &"DeathBlend"] diff --git a/godot/models/character.glb b/godot/models/character.glb index bf1aa2c..77cf73f 100644 --- a/godot/models/character.glb +++ b/godot/models/character.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:915183045de306484168edefdd321c4b0fcf4ba83348536102a4d748c98b7f61 -size 2372336 +oid sha256:e5deaafb392441a1ddd2f07b3db4f4e83dd5bca3eacf18cbbf562da3050cc015 +size 15633660 diff --git a/godot/models/character_british_uniform.png b/godot/models/character_british_uniform.png new file mode 100644 index 0000000..d1c51a3 --- /dev/null +++ b/godot/models/character_british_uniform.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d3393b7d44d1da4a81e632dbe73d36e8e1acb496e91024b25372152f30846c8 +size 13276926 diff --git a/godot/models/character_british_uniform.png.import b/godot/models/character_british_uniform.png.import new file mode 100644 index 0000000..e106993 --- /dev/null +++ b/godot/models/character_british_uniform.png.import @@ -0,0 +1,38 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://x14a0xbv4vwt" +path.s3tc="res://.godot/imported/character_british_uniform.png-19d860996f12b698df1e4a7e18961f31.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} +generator_parameters={ +"md5": "e27cfed25748c45b5346c4ba92fb0dad" +} + +[deps] + +source_file="res://models/character_british_uniform.png" +dest_files=["res://.godot/imported/character_british_uniform.png-19d860996f12b698df1e4a7e18961f31.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/godot/models/materials/Primary.tres b/godot/models/materials/Primary.tres index a0fcd29..1b41f53 100644 --- a/godot/models/materials/Primary.tres +++ b/godot/models/materials/Primary.tres @@ -1,13 +1,13 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://c2ic02ndhqkod"] -[ext_resource type="Texture2D" uid="uid://bpbh6yad5us1u" path="res://models/character_grid.png" id="1_54a4n"] +[ext_resource type="Texture2D" uid="uid://x14a0xbv4vwt" path="res://models/character_british_uniform.png" id="1_k4ift"] [resource] resource_name = "Primary" transparency = 4 cull_mode = 2 specular_mode = 1 -albedo_texture = ExtResource("1_54a4n") +albedo_texture = ExtResource("1_k4ift") distance_fade_mode = 2 distance_fade_min_distance = 0.2 distance_fade_max_distance = 0.3 diff --git a/godot/objects/character_model_base.tscn b/godot/objects/character_model_base.tscn index 8f000a6..2b57166 100644 --- a/godot/objects/character_model_base.tscn +++ b/godot/objects/character_model_base.tscn @@ -7,7 +7,7 @@ [node name="Skeleton3D" parent="skeleton_character" index="0"] bones/0/rotation = Quaternion(1.12928e-22, 1, 2.98023e-08, -1.94707e-07) -bones/1/position = Vector3(3.28472e-17, 0.826102, -2.26306e-09) +bones/1/position = Vector3(3.1225e-17, 0.826102, -2.26306e-09) bones/1/rotation = Quaternion(-0.0189874, -6.30661e-09, -1.08732e-09, 0.99982) bones/2/rotation = Quaternion(0.0262842, 8.66579e-09, 1.56723e-09, 0.999655) bones/3/rotation = Quaternion(-0.013812, -0.124595, 8.42949e-05, 0.992112) @@ -15,53 +15,53 @@ bones/4/rotation = Quaternion(0.0100466, -3.89644e-10, 6.78268e-10, 0.99995) bones/5/rotation = Quaternion(-0.0233085, 0.0669743, -0.00156502, 0.997481) bones/6/rotation = Quaternion(0.623077, 0.672557, 0.307599, -0.254607) bones/7/rotation = Quaternion(-0.311931, -0.528262, 0.360764, 0.702487) -bones/8/rotation = Quaternion(0.385362, 0.19105, 0.552643, 0.71385) +bones/8/rotation = Quaternion(0.385362, 0.19105, 0.552644, 0.713849) bones/9/rotation = Quaternion(0.204715, 0.0914037, 0.275611, 0.93476) bones/10/rotation = Quaternion(-0.160687, -0.0459478, -0.0475321, 0.984789) bones/10/scale = Vector3(1, 1, 1) -bones/11/rotation = Quaternion(-0.0305181, -0.0130498, -0.0216154, 0.999215) +bones/11/rotation = Quaternion(-0.030518, -0.0130498, -0.0216154, 0.999215) bones/11/scale = Vector3(1, 1, 1) -bones/12/rotation = Quaternion(0.00872478, 0.00565776, 0.00131029, 0.999945) +bones/12/rotation = Quaternion(0.0087248, 0.00565774, 0.0013103, 0.999945) bones/12/scale = Vector3(1, 1, 1) bones/13/rotation = Quaternion(-0.617934, -0.0462445, 0.180663, 0.763793) bones/13/scale = Vector3(1, 1, 1) bones/14/rotation = Quaternion(-0.23045, 0.0743406, 0.160693, 0.956841) -bones/15/rotation = Quaternion(-0.541263, -0.00752764, 0.238029, 0.806424) +bones/15/rotation = Quaternion(-0.541263, -0.00752765, 0.238029, 0.806424) bones/15/scale = Vector3(1, 1, 1) -bones/16/rotation = Quaternion(-0.611023, -0.262913, 0.402215, 0.629087) +bones/16/rotation = Quaternion(-0.611024, -0.262913, 0.402215, 0.629087) bones/16/scale = Vector3(1, 1, 1) -bones/17/rotation = Quaternion(0.0158023, 0.0368156, 0.177499, 0.983305) +bones/17/rotation = Quaternion(0.0158022, 0.0368156, 0.177499, 0.983305) bones/18/rotation = Quaternion(-0.115784, 0.0786986, 0.503797, 0.852402) -bones/19/rotation = Quaternion(-0.77808, 0.139756, 0.0140335, 0.612261) +bones/19/rotation = Quaternion(-0.77808, 0.139756, 0.0140334, 0.612261) bones/19/scale = Vector3(1, 1, 1) bones/20/rotation = Quaternion(-0.0923591, 0.0238578, 0.0736642, 0.992711) bones/21/rotation = Quaternion(-0.193467, 0.101022, 0.0447897, 0.974864) bones/21/scale = Vector3(1, 1, 1) bones/22/rotation = Quaternion(-0.293695, -0.10649, 0.259809, 0.91373) bones/22/scale = Vector3(1, 1, 1) -bones/23/rotation = Quaternion(-0.0310475, -0.0162324, -0.00151601, 0.999385) +bones/23/rotation = Quaternion(-0.0310475, -0.0162325, -0.00151601, 0.999385) bones/24/rotation = Quaternion(0.140362, -0.0289769, -0.195164, 0.970242) bones/25/rotation = Quaternion(0.585184, -0.476496, -0.473244, -0.454479) bones/25/scale = Vector3(1, 1, 1) bones/26/rotation = Quaternion(-0.449756, 0.301541, -0.311322, 0.780943) bones/27/rotation = Quaternion(-0.122233, -0.135947, -0.565028, 0.804562) bones/27/scale = Vector3(1, 1, 1) -bones/28/rotation = Quaternion(0.155387, -0.432411, -0.521703, 0.71882) +bones/28/rotation = Quaternion(0.155388, -0.432411, -0.521703, 0.71882) bones/29/rotation = Quaternion(-0.0486369, 0.0590467, -0.0759536, 0.994173) bones/30/rotation = Quaternion(-0.0305179, 0.0130499, 0.0216153, 0.999215) bones/30/scale = Vector3(1, 1, 1) -bones/31/rotation = Quaternion(-0.518356, -0.00412336, -0.00408933, 0.855145) +bones/31/rotation = Quaternion(-0.518356, -0.00412336, -0.00408935, 0.855145) bones/32/rotation = Quaternion(-0.290993, 0.0788459, 0.0248015, 0.953148) bones/33/rotation = Quaternion(-0.419789, -0.067382, -0.039477, 0.904256) bones/33/scale = Vector3(1, 1, 1) -bones/34/rotation = Quaternion(-0.266884, 0.00530696, 0.00065886, 0.963714) +bones/34/rotation = Quaternion(-0.266884, 0.00530696, 0.000658852, 0.963714) bones/34/scale = Vector3(1, 1, 1) -bones/35/rotation = Quaternion(-0.422483, 0.214372, -0.00100307, 0.880654) +bones/35/rotation = Quaternion(-0.422483, 0.214372, -0.00100308, 0.880654) bones/36/rotation = Quaternion(-0.345783, -0.0439312, -0.261553, 0.900052) bones/36/scale = Vector3(1, 1, 1) bones/37/rotation = Quaternion(-0.0107008, 0.00769689, 0.00365465, 0.999906) bones/37/scale = Vector3(1, 1, 1) -bones/38/rotation = Quaternion(-0.389883, 0.108139, -0.120461, 0.906524) +bones/38/rotation = Quaternion(-0.389883, 0.108139, -0.120461, 0.906525) bones/39/rotation = Quaternion(-0.399909, -0.0921328, -0.130163, 0.902575) bones/40/rotation = Quaternion(-0.0125688, 0.0114118, 0.00134584, 0.999855) bones/40/scale = Vector3(1, 1, 1) @@ -81,17 +81,18 @@ bones/49/scale = Vector3(1, 1, 1) bones/50/position = Vector3(-0.0246244, 0.246628, -0.0197923) bones/50/rotation = Quaternion(0.31578, 0.920316, 0.115311, -0.200014) bones/50/scale = Vector3(1, 1, 1) -bones/51/rotation = Quaternion(0.997309, -0.00549226, 0.0715033, -0.015225) +bones/51/rotation = Quaternion(0.997309, -0.00549226, 0.0715033, -0.0152251) bones/51/scale = Vector3(1, 1, 1) bones/52/rotation = Quaternion(-0.00225666, 0.00306653, -0.000453776, 0.999993) bones/52/scale = Vector3(1, 1, 1) bones/53/rotation = Quaternion(0.665461, 0.000165138, -0.00238783, 0.746429) -bones/54/rotation = Quaternion(0.997309, 0.00549226, -0.0715033, -0.015225) +bones/54/rotation = Quaternion(0.997309, 0.00549227, -0.0715033, -0.0152251) bones/54/scale = Vector3(1, 1, 1) bones/55/rotation = Quaternion(-0.00225666, -0.0030665, 0.000453778, 0.999993) bones/55/scale = Vector3(1, 1, 1) bones/56/rotation = Quaternion(0.665461, -0.000165001, 0.00238774, 0.746429) bones/56/scale = Vector3(1, 1, 1) +bones/57/position = Vector3(3.64125e-07, 0.0462301, -0.935059) bones/57/scale = Vector3(0, 0, 0) bones/58/rotation = Quaternion(-2.99921e-13, 0.707107, 0.707107, -2.99921e-13) bones/59/rotation = Quaternion(2.01446e-13, 0.707107, 0.707107, 2.01446e-13) @@ -120,7 +121,7 @@ tree_root = ExtResource("2_wdyfc") anim_player = NodePath("../AnimationPlayer") parameters/Actions/Run/Speed/blend_amount = 0 "parameters/Actions/Stationary [turn]/BoneMask/blend_amount" = 0 -"parameters/Actions/Stationary [turn]/Turn/blend_position" = 0 +"parameters/Actions/Stationary [turn]/Turn/blend_position" = null "parameters/Actions/Walk [turn]/Speed/blend_amount" = 0 parameters/DeathBlend/blend_amount = 0 parameters/DeathSeek/seek_request = -1.0 diff --git a/godot/objects/enemy.tscn b/godot/objects/enemy.tscn index addfbca..46429df 100644 --- a/godot/objects/enemy.tscn +++ b/godot/objects/enemy.tscn @@ -14,7 +14,7 @@ unique_name_in_owner = true [node name="Skeleton3D" parent="CharacterModel/skeleton_character" index="0"] bones/0/rotation = Quaternion(1.12928e-22, 1, 2.98023e-08, -1.94707e-07) -bones/1/position = Vector3(3.28472e-17, 0.826102, -2.26306e-09) +bones/1/position = Vector3(3.1225e-17, 0.826102, -2.26306e-09) bones/1/rotation = Quaternion(-0.0189874, -6.30661e-09, -1.08732e-09, 0.99982) bones/2/rotation = Quaternion(0.0262842, 8.66579e-09, 1.56723e-09, 0.999655) bones/3/rotation = Quaternion(-0.013812, -0.124595, 8.42949e-05, 0.992112) @@ -22,34 +22,34 @@ bones/4/rotation = Quaternion(0.0100466, -3.89644e-10, 6.78268e-10, 0.99995) bones/5/rotation = Quaternion(-0.0233085, 0.0669743, -0.00156502, 0.997481) bones/6/rotation = Quaternion(0.623077, 0.672557, 0.307599, -0.254607) bones/7/rotation = Quaternion(-0.311931, -0.528262, 0.360764, 0.702487) -bones/8/rotation = Quaternion(0.385362, 0.19105, 0.552643, 0.71385) +bones/8/rotation = Quaternion(0.385362, 0.19105, 0.552644, 0.713849) bones/9/rotation = Quaternion(0.204715, 0.0914037, 0.275611, 0.93476) bones/10/rotation = Quaternion(-0.160687, -0.0459478, -0.0475321, 0.984789) -bones/11/rotation = Quaternion(-0.0305181, -0.0130498, -0.0216154, 0.999215) -bones/12/rotation = Quaternion(0.00872478, 0.00565776, 0.00131029, 0.999945) +bones/11/rotation = Quaternion(-0.030518, -0.0130498, -0.0216154, 0.999215) +bones/12/rotation = Quaternion(0.0087248, 0.00565774, 0.0013103, 0.999945) bones/13/rotation = Quaternion(-0.617934, -0.0462445, 0.180663, 0.763793) bones/14/rotation = Quaternion(-0.23045, 0.0743406, 0.160693, 0.956841) -bones/15/rotation = Quaternion(-0.541263, -0.00752764, 0.238029, 0.806424) -bones/16/rotation = Quaternion(-0.611023, -0.262913, 0.402215, 0.629087) -bones/17/rotation = Quaternion(0.0158023, 0.0368156, 0.177499, 0.983305) +bones/15/rotation = Quaternion(-0.541263, -0.00752765, 0.238029, 0.806424) +bones/16/rotation = Quaternion(-0.611024, -0.262913, 0.402215, 0.629087) +bones/17/rotation = Quaternion(0.0158022, 0.0368156, 0.177499, 0.983305) bones/18/rotation = Quaternion(-0.115784, 0.0786986, 0.503797, 0.852402) -bones/19/rotation = Quaternion(-0.77808, 0.139756, 0.0140335, 0.612261) +bones/19/rotation = Quaternion(-0.77808, 0.139756, 0.0140334, 0.612261) bones/20/rotation = Quaternion(-0.0923591, 0.0238578, 0.0736642, 0.992711) bones/21/rotation = Quaternion(-0.193467, 0.101022, 0.0447897, 0.974864) bones/22/rotation = Quaternion(-0.293695, -0.10649, 0.259809, 0.91373) -bones/23/rotation = Quaternion(-0.0310475, -0.0162324, -0.00151601, 0.999385) +bones/23/rotation = Quaternion(-0.0310475, -0.0162325, -0.00151601, 0.999385) bones/24/rotation = Quaternion(0.140362, -0.0289769, -0.195164, 0.970242) bones/25/rotation = Quaternion(0.585184, -0.476496, -0.473244, -0.454479) bones/26/rotation = Quaternion(-0.449756, 0.301541, -0.311322, 0.780943) bones/27/rotation = Quaternion(-0.122233, -0.135947, -0.565028, 0.804562) -bones/28/rotation = Quaternion(0.155387, -0.432411, -0.521703, 0.71882) -bones/31/rotation = Quaternion(-0.518356, -0.00412336, -0.00408933, 0.855145) +bones/28/rotation = Quaternion(0.155388, -0.432411, -0.521703, 0.71882) +bones/31/rotation = Quaternion(-0.518356, -0.00412336, -0.00408935, 0.855145) bones/32/rotation = Quaternion(-0.290993, 0.0788459, 0.0248015, 0.953148) bones/33/rotation = Quaternion(-0.419789, -0.067382, -0.039477, 0.904256) -bones/34/rotation = Quaternion(-0.266884, 0.00530696, 0.00065886, 0.963714) -bones/35/rotation = Quaternion(-0.422483, 0.214372, -0.00100307, 0.880654) +bones/34/rotation = Quaternion(-0.266884, 0.00530696, 0.000658852, 0.963714) +bones/35/rotation = Quaternion(-0.422483, 0.214372, -0.00100308, 0.880654) bones/36/rotation = Quaternion(-0.345783, -0.0439312, -0.261553, 0.900052) -bones/38/rotation = Quaternion(-0.389883, 0.108139, -0.120461, 0.906524) +bones/38/rotation = Quaternion(-0.389883, 0.108139, -0.120461, 0.906525) bones/39/rotation = Quaternion(-0.399909, -0.0921328, -0.130163, 0.902575) bones/44/position = Vector3(0.16719, 0.195796, -0.0454406) bones/44/rotation = Quaternion(-0.610992, 0.0971646, 0.14821, 0.771545) @@ -60,12 +60,13 @@ bones/49/position = Vector3(0.0228929, -0.0282939, -0.00824324) bones/49/rotation = Quaternion(-0.112129, 0.585203, -0.155744, 0.78785) bones/50/position = Vector3(-0.0246244, 0.246628, -0.0197923) bones/50/rotation = Quaternion(0.31578, 0.920316, 0.115311, -0.200014) -bones/51/rotation = Quaternion(0.997309, -0.00549226, 0.0715033, -0.015225) +bones/51/rotation = Quaternion(0.997309, -0.00549226, 0.0715033, -0.0152251) bones/52/rotation = Quaternion(-0.00225666, 0.00306653, -0.000453776, 0.999993) bones/53/rotation = Quaternion(0.665461, 0.000165138, -0.00238783, 0.746429) -bones/54/rotation = Quaternion(0.997309, 0.00549226, -0.0715033, -0.015225) +bones/54/rotation = Quaternion(0.997309, 0.00549227, -0.0715033, -0.0152251) bones/55/rotation = Quaternion(-0.00225666, -0.0030665, 0.000453778, 0.999993) bones/56/rotation = Quaternion(0.665461, -0.000165001, 0.00238774, 0.746429) +bones/57/position = Vector3(3.64125e-07, 0.0462301, -0.935059) bones/58/rotation = Quaternion(-2.99921e-13, 0.707107, 0.707107, -2.99921e-13) bones/59/rotation = Quaternion(2.01446e-13, 0.707107, 0.707107, 2.01446e-13) bones/60/rotation = Quaternion(-0.707107, 1.25097e-07, 1.25097e-07, 0.707107) @@ -73,6 +74,9 @@ bones/61/rotation = Quaternion(-0.707107, 1.25097e-07, 1.25097e-07, 0.707107) bones/62/rotation = Quaternion(-0.707107, 1.5189e-07, 1.5189e-07, 0.707107) bones/63/rotation = Quaternion(-0.707107, 1.5189e-07, 1.5189e-07, 0.707107) +[node name="BoneAttachment3D" parent="CharacterModel/skeleton_character/Skeleton3D" index="3"] +transform = Transform3D(-0.937186, 0.347435, 0.0311762, 0.0973187, 0.17459, 0.97982, 0.33498, 0.921308, -0.197435, -0.16719, 1.02003, 0.0528419) + [node name="CollisionShape3D" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) shape = SubResource("CapsuleShape3D_3tduq") diff --git a/godot/objects/player.tscn b/godot/objects/player.tscn index 2bdeab7..0144510 100644 --- a/godot/objects/player.tscn +++ b/godot/objects/player.tscn @@ -18,7 +18,7 @@ unique_name_in_owner = true [node name="Skeleton3D" parent="CharacterModel/skeleton_character" index="0"] bones/0/rotation = Quaternion(1.12928e-22, 1, 2.98023e-08, -1.94707e-07) -bones/1/position = Vector3(3.28472e-17, 0.826102, -2.26306e-09) +bones/1/position = Vector3(3.1225e-17, 0.826102, -2.26306e-09) bones/1/rotation = Quaternion(-0.0189874, -6.30661e-09, -1.08732e-09, 0.99982) bones/2/rotation = Quaternion(0.0262842, 8.66579e-09, 1.56723e-09, 0.999655) bones/3/rotation = Quaternion(-0.013812, -0.124595, 8.42949e-05, 0.992112) @@ -26,34 +26,34 @@ bones/4/rotation = Quaternion(0.0100466, -3.89644e-10, 6.78268e-10, 0.99995) bones/5/rotation = Quaternion(-0.0233085, 0.0669743, -0.00156502, 0.997481) bones/6/rotation = Quaternion(0.623077, 0.672557, 0.307599, -0.254607) bones/7/rotation = Quaternion(-0.311931, -0.528262, 0.360764, 0.702487) -bones/8/rotation = Quaternion(0.385362, 0.19105, 0.552643, 0.71385) +bones/8/rotation = Quaternion(0.385362, 0.19105, 0.552644, 0.713849) bones/9/rotation = Quaternion(0.204715, 0.0914037, 0.275611, 0.93476) bones/10/rotation = Quaternion(-0.160687, -0.0459478, -0.0475321, 0.984789) -bones/11/rotation = Quaternion(-0.0305181, -0.0130498, -0.0216154, 0.999215) -bones/12/rotation = Quaternion(0.00872478, 0.00565776, 0.00131029, 0.999945) +bones/11/rotation = Quaternion(-0.030518, -0.0130498, -0.0216154, 0.999215) +bones/12/rotation = Quaternion(0.0087248, 0.00565774, 0.0013103, 0.999945) bones/13/rotation = Quaternion(-0.617934, -0.0462445, 0.180663, 0.763793) bones/14/rotation = Quaternion(-0.23045, 0.0743406, 0.160693, 0.956841) -bones/15/rotation = Quaternion(-0.541263, -0.00752764, 0.238029, 0.806424) -bones/16/rotation = Quaternion(-0.611023, -0.262913, 0.402215, 0.629087) -bones/17/rotation = Quaternion(0.0158023, 0.0368156, 0.177499, 0.983305) +bones/15/rotation = Quaternion(-0.541263, -0.00752765, 0.238029, 0.806424) +bones/16/rotation = Quaternion(-0.611024, -0.262913, 0.402215, 0.629087) +bones/17/rotation = Quaternion(0.0158022, 0.0368156, 0.177499, 0.983305) bones/18/rotation = Quaternion(-0.115784, 0.0786986, 0.503797, 0.852402) -bones/19/rotation = Quaternion(-0.77808, 0.139756, 0.0140335, 0.612261) +bones/19/rotation = Quaternion(-0.77808, 0.139756, 0.0140334, 0.612261) bones/20/rotation = Quaternion(-0.0923591, 0.0238578, 0.0736642, 0.992711) bones/21/rotation = Quaternion(-0.193467, 0.101022, 0.0447897, 0.974864) bones/22/rotation = Quaternion(-0.293695, -0.10649, 0.259809, 0.91373) -bones/23/rotation = Quaternion(-0.0310475, -0.0162324, -0.00151601, 0.999385) +bones/23/rotation = Quaternion(-0.0310475, -0.0162325, -0.00151601, 0.999385) bones/24/rotation = Quaternion(0.140362, -0.0289769, -0.195164, 0.970242) bones/25/rotation = Quaternion(0.585184, -0.476496, -0.473244, -0.454479) bones/26/rotation = Quaternion(-0.449756, 0.301541, -0.311322, 0.780943) bones/27/rotation = Quaternion(-0.122233, -0.135947, -0.565028, 0.804562) -bones/28/rotation = Quaternion(0.155387, -0.432411, -0.521703, 0.71882) -bones/31/rotation = Quaternion(-0.518356, -0.00412336, -0.00408933, 0.855145) +bones/28/rotation = Quaternion(0.155388, -0.432411, -0.521703, 0.71882) +bones/31/rotation = Quaternion(-0.518356, -0.00412336, -0.00408935, 0.855145) bones/32/rotation = Quaternion(-0.290993, 0.0788459, 0.0248015, 0.953148) bones/33/rotation = Quaternion(-0.419789, -0.067382, -0.039477, 0.904256) -bones/34/rotation = Quaternion(-0.266884, 0.00530696, 0.00065886, 0.963714) -bones/35/rotation = Quaternion(-0.422483, 0.214372, -0.00100307, 0.880654) +bones/34/rotation = Quaternion(-0.266884, 0.00530696, 0.000658852, 0.963714) +bones/35/rotation = Quaternion(-0.422483, 0.214372, -0.00100308, 0.880654) bones/36/rotation = Quaternion(-0.345783, -0.0439312, -0.261553, 0.900052) -bones/38/rotation = Quaternion(-0.389883, 0.108139, -0.120461, 0.906524) +bones/38/rotation = Quaternion(-0.389883, 0.108139, -0.120461, 0.906525) bones/39/rotation = Quaternion(-0.399909, -0.0921328, -0.130163, 0.902575) bones/44/position = Vector3(0.16719, 0.195796, -0.0454406) bones/44/rotation = Quaternion(-0.610992, 0.0971646, 0.14821, 0.771545) @@ -64,12 +64,13 @@ bones/49/position = Vector3(0.0228929, -0.0282939, -0.00824324) bones/49/rotation = Quaternion(-0.112129, 0.585203, -0.155744, 0.78785) bones/50/position = Vector3(-0.0246244, 0.246628, -0.0197923) bones/50/rotation = Quaternion(0.31578, 0.920316, 0.115311, -0.200014) -bones/51/rotation = Quaternion(0.997309, -0.00549226, 0.0715033, -0.015225) +bones/51/rotation = Quaternion(0.997309, -0.00549226, 0.0715033, -0.0152251) bones/52/rotation = Quaternion(-0.00225666, 0.00306653, -0.000453776, 0.999993) bones/53/rotation = Quaternion(0.665461, 0.000165138, -0.00238783, 0.746429) -bones/54/rotation = Quaternion(0.997309, 0.00549226, -0.0715033, -0.015225) +bones/54/rotation = Quaternion(0.997309, 0.00549227, -0.0715033, -0.0152251) bones/55/rotation = Quaternion(-0.00225666, -0.0030665, 0.000453778, 0.999993) bones/56/rotation = Quaternion(0.665461, -0.000165001, 0.00238774, 0.746429) +bones/57/position = Vector3(3.64125e-07, 0.0462301, -0.935059) bones/58/rotation = Quaternion(-2.99921e-13, 0.707107, 0.707107, -2.99921e-13) bones/59/rotation = Quaternion(2.01446e-13, 0.707107, 0.707107, 2.01446e-13) bones/60/rotation = Quaternion(-0.707107, 1.25097e-07, 1.25097e-07, 0.707107) diff --git a/models/character.blend b/models/character.blend index b422dab..bed6c3d 100644 --- a/models/character.blend +++ b/models/character.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6af4c5ae5eaccc1bec51c9dcca404fea468e5f91de39f0ccaaf9c9bbc4a96db1 -size 2928928 +oid sha256:c274f050d775614ab39ae92d2d39f9c0476b4ec6163409bd7bebafec1582b539 +size 2946428 diff --git a/models/character.blend1 b/models/character.blend1 index beedf31..ba3218d 100644 Binary files a/models/character.blend1 and b/models/character.blend1 differ diff --git a/models/modules.blend b/models/modules.blend index b9f7492..3f5aa59 100644 --- a/models/modules.blend +++ b/models/modules.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcc3c6175ad6fd2e51d750060e2205da05a760646ea735213379c43f25855425 -size 1164680 +oid sha256:2838cd50bf878480cd9e54576bc72de41bd2fbe9c46c842c69f3d438f914831b +size 1157512 diff --git a/models/modules.blend1 b/models/modules.blend1 index a034821..45e3ca4 100644 Binary files a/models/modules.blend1 and b/models/modules.blend1 differ diff --git a/models/textures/british_uniform.kra b/models/textures/british_uniform.kra new file mode 100644 index 0000000..2ba3c3c --- /dev/null +++ b/models/textures/british_uniform.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60632aea5aced7ce43159512547674a9b034b72609e4f624dd3a289783cd1347 +size 20110211 diff --git a/models/textures/british_uniform.kra~ b/models/textures/british_uniform.kra~ new file mode 100644 index 0000000..55a0a6a Binary files /dev/null and b/models/textures/british_uniform.kra~ differ diff --git a/models/textures/british_uniform.png b/models/textures/british_uniform.png new file mode 100644 index 0000000..d1c51a3 --- /dev/null +++ b/models/textures/british_uniform.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d3393b7d44d1da4a81e632dbe73d36e8e1acb496e91024b25372152f30846c8 +size 13276926 diff --git a/models/textures/british_uniform.png~ b/models/textures/british_uniform.png~ new file mode 100644 index 0000000..7897821 Binary files /dev/null and b/models/textures/british_uniform.png~ differ diff --git a/models/textures/mesh_character_uv.png b/models/textures/mesh_character_uv.png new file mode 100644 index 0000000..58d27c3 --- /dev/null +++ b/models/textures/mesh_character_uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d25e1e7a180721bbd639f5667eba32c0a11769c66eccd34998b5438b2ca530c8 +size 770154