diff --git a/godot/lighting/section_2.exr b/godot/lighting/section_2.exr index abb1de6..fb0bbe8 100644 Binary files a/godot/lighting/section_2.exr and b/godot/lighting/section_2.exr differ diff --git a/godot/lighting/section_2.lmbake b/godot/lighting/section_2.lmbake index 53777f0..21a903a 100644 Binary files a/godot/lighting/section_2.lmbake and b/godot/lighting/section_2.lmbake differ diff --git a/godot/models/character.glb b/godot/models/character.glb index 500ce86..b07d806 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:e3554003c7ddce3c2ff46409d1d9b1b36da3274559dd5eb1911eb0702ce5b3dd -size 17339728 +oid sha256:7b5f8f5e23c40c452e620f0a99081f59ac2df08365044e27af415ef69738edd4 +size 20446112 diff --git a/godot/models/character_british_uniform_normal.png b/godot/models/character_british_uniform_normal.png index f9975ea..41bdbfd 100644 --- a/godot/models/character_british_uniform_normal.png +++ b/godot/models/character_british_uniform_normal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6399bd33218a159fb0fb6cf5d9e81e6fc487cd17577295bffcc4062d609bc658 -size 725950 +oid sha256:7da427239baf7fabbd8eef5a2fefe86e8a57bb55b34905621998a849e3712c6f +size 3809817 diff --git a/godot/models/character_british_uniform_normal.png.import b/godot/models/character_british_uniform_normal.png.import index e5f6f25..805687e 100644 --- a/godot/models/character_british_uniform_normal.png.import +++ b/godot/models/character_british_uniform_normal.png.import @@ -9,7 +9,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "d0467ebe79598bc929ee7b657be2020e" +"md5": "00ef98c48c2d0290114cd0cf2c51a41a" } [deps] diff --git a/godot/objects/enemy.tscn b/godot/objects/enemy.tscn index 2728d44..e25c456 100644 --- a/godot/objects/enemy.tscn +++ b/godot/objects/enemy.tscn @@ -12,77 +12,8 @@ collision_mask = 3 [node name="CharacterModel" parent="." instance=ExtResource("1_i7aop")] 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.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) -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.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.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.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.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.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.155388, -0.432411, -0.521703, 0.71882) -bones/29/rotation = Quaternion(-0.0486368, 0.0590466, -0.0759536, 0.994173) -bones/30/rotation = Quaternion(-0.0305179, 0.0130499, 0.0216153, 0.999215) -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.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/37/rotation = Quaternion(-0.0107009, 0.0076969, 0.00365465, 0.999906) -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.00134583, 0.999855) -bones/41/rotation = Quaternion(-0.0497163, 0.0839878, -0.166226, 0.981246) -bones/42/rotation = Quaternion(-0.0310475, 0.0162325, 0.00151601, 0.999385) -bones/43/rotation = Quaternion(-0.00109124, -0.0104143, 0.0283538, 0.999543) -bones/44/position = Vector3(0.16719, 0.195796, -0.0454406) -bones/44/rotation = Quaternion(-0.610992, 0.0971646, 0.14821, 0.771545) -bones/45/rotation = Quaternion(-0.82326, 4.1804e-09, -1.03579e-07, 0.567665) -bones/46/position = Vector3(8.07956e-09, 0.0363644, 0.0392254) -bones/46/rotation = Quaternion(-0.00112372, -6.23921e-08, 6.44731e-09, 0.999999) -bones/48/rotation = Quaternion(0.706312, -2.55434e-08, 6.24918e-08, 0.707901) -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/position = Vector3(0.0902225, 0.042579, 0.00142519) -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/position = Vector3(-0.0902225, 0.042579, 0.00142518) -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) -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="mesh_helmet_a" parent="CharacterModel/skeleton_character/Skeleton3D" index="1"] +visible = false [node name="BoneAttachment3D" parent="CharacterModel/skeleton_character/Skeleton3D" index="3"] transform = Transform3D(-0.999748, -0.00611106, 0.0216074, 0.0216358, -0.00461901, 0.999755, -0.00600976, 0.999971, 0.00475004, -0.156654, 1.50959, 0.292832) diff --git a/godot/objects/player.tscn b/godot/objects/player.tscn index 96682e2..13ac82d 100644 --- a/godot/objects/player.tscn +++ b/godot/objects/player.tscn @@ -88,6 +88,12 @@ 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="mesh_helmet_a_001" parent="CharacterModel/skeleton_character/Skeleton3D" index="2"] +visible = false + +[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="HitscanMuzzle" parent="CharacterModel/skeleton_character/Skeleton3D/BoneAttachment3D" index="0"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.00234e-08, 0.0436091, 0.0479187) diff --git a/godot/objects/section_2.tscn b/godot/objects/section_2.tscn index 9d9b116..cbd0ea0 100644 --- a/godot/objects/section_2.tscn +++ b/godot/objects/section_2.tscn @@ -16,8 +16,8 @@ [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_ikuna"] [sub_resource type="NavigationMesh" id="NavigationMesh_e0njj"] -vertices = PackedVector3Array(8.61544, 0.535281, -18.2397, 9.36544, 0.535281, -18.2397, 9.36544, 0.535281, -19.4897, 8.36544, 0.785281, -19.4897, 10.1154, 3.03528, -18.2397, 10.3654, 3.03528, -18.7397, 10.3654, 3.03528, -19.2397, 7.61544, 3.03528, -19.2397, 7.61544, 3.03528, -18.4897, 0.115438, 1.03528, -3.23967, -0.384562, 0.785281, -2.98967, -0.134562, 1.28528, -1.98967, 1.11544, 1.28528, -2.23967, 8.36544, 0.785281, -2.23967, 8.86544, 0.535281, 2.51033, 9.36544, 0.285281, 1.76033, 9.61544, 1.28528, -17.2397, 8.36544, 1.03528, -13.9897, 9.51929, 0.285281, -9.93197, 9.57698, 1.03528, -14.3166, 13.6154, 0.285281, 3.76033, 12.3654, 0.535281, 3.01033, 11.8654, 0.535281, 3.26033, 10.3654, 0.785281, 3.76033, 11.6154, 0.785281, 2.76033, 9.86544, 0.285281, 2.51033, 15.6154, 0.535281, 5.26033, 15.6154, 0.535281, 4.01033, 8.61544, 1.28528, -17.2397, 7.86544, 1.28528, -14.9897, 0.365438, 1.28528, -14.4897, 0.865438, 1.03528, -13.7397, 1.61544, 1.03528, -14.2397, 0.365438, 1.03528, -5.48967, 0.865438, 0.785281, -3.323, 0.990438, 0.785281, -7.98967, 1.36544, 1.53528, -14.9897, 10.3654, 3.03528, 5.01033, 10.6154, 3.03528, 4.51033, 9.86544, 3.03528, 4.76033, 11.8654, 3.03528, 6.76033, 11.8654, 3.03528, 5.76033, 6.61544, 3.03528, 4.26033, 8.36544, 3.03528, 4.01033, 6.36544, 3.03528, -6.98967, 7.61544, 3.03528, 3.01033, 7.61544, 3.03528, -7.23967, -6.13456, 3.28528, -1.48967, -5.63456, 3.03528, -0.989666, -4.88456, 3.03528, -1.23967, -4.88456, 3.28528, -3.73967, -6.13456, 3.03528, -3.73967, -3.38456, 0.535281, -2.23967, -1.13456, 0.535281, -2.23967, -0.884562, 0.785281, -2.73967, -3.63456, 0.785281, -2.98967) -polygons = [PackedInt32Array(1, 0, 2), PackedInt32Array(2, 0, 3), PackedInt32Array(5, 4, 6), PackedInt32Array(6, 4, 8), PackedInt32Array(6, 8, 7), PackedInt32Array(10, 9, 11), PackedInt32Array(11, 9, 12), PackedInt32Array(16, 19, 17), PackedInt32Array(17, 19, 18), PackedInt32Array(17, 18, 13), PackedInt32Array(13, 18, 15), PackedInt32Array(13, 15, 14), PackedInt32Array(20, 22, 21), PackedInt32Array(22, 23, 24), PackedInt32Array(24, 23, 25), PackedInt32Array(25, 23, 14), PackedInt32Array(20, 27, 26), PackedInt32Array(28, 16, 29), PackedInt32Array(29, 16, 17), PackedInt32Array(22, 20, 23), PackedInt32Array(23, 20, 26), PackedInt32Array(32, 31, 30), PackedInt32Array(12, 34, 35), PackedInt32Array(35, 34, 33), PackedInt32Array(35, 33, 31), PackedInt32Array(31, 33, 30), PackedInt32Array(30, 36, 32), PackedInt32Array(32, 36, 29), PackedInt32Array(32, 29, 17), PackedInt32Array(15, 25, 14), PackedInt32Array(12, 9, 34), PackedInt32Array(34, 9, 33), PackedInt32Array(39, 38, 37), PackedInt32Array(37, 41, 40), PackedInt32Array(39, 37, 40), PackedInt32Array(43, 39, 42), PackedInt32Array(42, 39, 40), PackedInt32Array(46, 45, 44), PackedInt32Array(44, 45, 42), PackedInt32Array(45, 43, 42), PackedInt32Array(48, 47, 49), PackedInt32Array(49, 47, 51), PackedInt32Array(49, 51, 50), PackedInt32Array(53, 52, 54), PackedInt32Array(54, 52, 55)] +vertices = PackedVector3Array(8.61544, 0.535281, -18.2397, 9.36544, 0.535281, -18.2397, 9.36544, 0.535281, -19.4897, 8.36544, 0.785281, -19.4897, 10.1154, 3.03528, -18.2397, 10.3654, 3.03528, -18.7397, 10.3654, 3.03528, -19.2397, 7.61544, 3.03528, -19.2397, 7.61544, 3.03528, -18.4897, 13.6154, 0.285281, 3.76033, 12.3654, 0.535281, 3.01033, 11.8654, 0.535281, 3.26033, 10.3654, 0.785281, 3.76033, 11.6154, 0.785281, 2.76033, 9.86544, 0.285281, 2.51033, 8.86544, 0.535281, 2.51033, 15.6154, 0.535281, 5.26033, 15.6154, 0.535281, 4.01033, 8.61544, 0.785281, -13.7397, 9.61544, 1.28528, -17.2397, 8.61544, 1.28528, -17.2397, 7.86544, 1.28528, -14.9897, 7.86544, 1.03528, -14.2397, 8.36544, 0.785281, -2.23967, 9.36544, 0.285281, 1.76033, 9.51929, 0.285281, -9.93197, 9.57698, 1.03528, -14.3166, 1.36544, 1.53528, -14.9897, 0.365438, 1.28528, -14.4897, 1.11544, 1.03528, -13.9897, 0.115438, 1.03528, -3.23967, -0.384562, 1.03528, -2.73967, 1.11544, 1.28528, -2.23967, -4.13456, 1.78528, -2.98967, -3.88456, 1.53528, -1.98967, -1.38456, 1.03528, -2.11467, 10.3654, 3.03528, 5.01033, 10.6154, 3.03528, 4.51033, 9.86544, 3.03528, 4.76033, 11.8654, 3.03528, 6.76033, 11.8654, 3.03528, 5.76033, 6.61544, 3.03528, 4.26033, 8.36544, 3.03528, 4.01033, 6.36544, 3.03528, -6.98967, 7.61544, 3.03528, 3.01033, 7.61544, 3.03528, -7.23967, -6.13456, 3.28528, -1.48967, -5.63456, 3.03528, -0.989666, -4.88456, 3.03528, -1.23967, -4.88456, 3.28528, -3.73967, -6.13456, 3.03528, -3.73967) +polygons = [PackedInt32Array(1, 0, 2), PackedInt32Array(2, 0, 3), PackedInt32Array(5, 4, 6), PackedInt32Array(6, 4, 8), PackedInt32Array(6, 8, 7), PackedInt32Array(9, 11, 10), PackedInt32Array(11, 12, 13), PackedInt32Array(13, 12, 14), PackedInt32Array(14, 12, 15), PackedInt32Array(9, 17, 16), PackedInt32Array(22, 21, 18), PackedInt32Array(18, 21, 20), PackedInt32Array(18, 20, 19), PackedInt32Array(11, 9, 12), PackedInt32Array(12, 9, 16), PackedInt32Array(19, 26, 18), PackedInt32Array(18, 26, 25), PackedInt32Array(18, 25, 23), PackedInt32Array(23, 25, 24), PackedInt32Array(23, 24, 15), PackedInt32Array(28, 27, 29), PackedInt32Array(29, 27, 22), PackedInt32Array(22, 27, 21), PackedInt32Array(32, 31, 30), PackedInt32Array(24, 14, 15), PackedInt32Array(32, 35, 31), PackedInt32Array(31, 35, 34), PackedInt32Array(31, 34, 33), PackedInt32Array(28, 29, 30), PackedInt32Array(30, 29, 32), PackedInt32Array(38, 37, 36), PackedInt32Array(36, 40, 39), PackedInt32Array(38, 36, 39), PackedInt32Array(42, 38, 41), PackedInt32Array(41, 38, 39), PackedInt32Array(45, 44, 43), PackedInt32Array(43, 44, 41), PackedInt32Array(44, 42, 41), PackedInt32Array(47, 46, 48), PackedInt32Array(48, 46, 50), PackedInt32Array(48, 50, 49)] sample_partition_type = 1 agent_height = 1.75 agent_radius = 0.25 @@ -41,10 +41,10 @@ generate_probes_subdiv = 1 light_data = ExtResource("3_h3v2c") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(-0.282662, -0.609093, 0.741018, 0.11918, 0.744235, 0.657198, -0.951787, 0.27408, -0.137775, -1.48634, 3.22867, -2.51018) +transform = Transform3D(-0.205165, -0.725053, 0.657423, 0.0262249, 0.667398, 0.744238, -0.978376, 0.169933, -0.117912, -1.48634, 3.22867, -2.51018) light_color = Color(0.95484, 0.837153, 0.722321, 1) shadow_enabled = true -shadow_bias = 0.0 +shadow_bias = 0.01 shadow_blur = 0.895 directional_shadow_split_1 = 0.317 directional_shadow_split_2 = 0.408 diff --git a/godot/occlusion/boot.occ b/godot/occlusion/boot.occ index 63047a7..9e0ec2a 100644 Binary files a/godot/occlusion/boot.occ and b/godot/occlusion/boot.occ differ diff --git a/models/character.blend b/models/character.blend index 8eeef3d..1aeb5c2 100644 --- a/models/character.blend +++ b/models/character.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86c23abd972d9225205d9f353543c421afe753c1b6439a558c0ed9609dbc82e4 -size 3236156 +oid sha256:993c505a6521e0f606347ff6a3f7bcdb3b377b150b88c94b6c3738576be36acd +size 3275580 diff --git a/models/character.blend1 b/models/character.blend1 index ead0d16..2b4b8d4 100644 Binary files a/models/character.blend1 and b/models/character.blend1 differ diff --git a/models/textures/british_uniform.kra b/models/textures/british_uniform.kra index 0c475f6..c80f1e0 100644 --- a/models/textures/british_uniform.kra +++ b/models/textures/british_uniform.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:924595789d96e4bb9fb12f441f001e2ab706f33e7880b0b5126f4fe25bd59150 -size 18803521 +oid sha256:22af35b1ff4326d63a4c8cd7cd8b97dda412fb98ae44d62d0ba2c8c889c38e29 +size 31547251 diff --git a/models/textures/british_uniform.kra~ b/models/textures/british_uniform.kra~ index a15bcc2..f8d1705 100644 Binary files a/models/textures/british_uniform.kra~ and b/models/textures/british_uniform.kra~ differ diff --git a/models/textures/british_uniform.png~ b/models/textures/british_uniform.png~ index 73ef586..73c01f3 100644 Binary files a/models/textures/british_uniform.png~ and b/models/textures/british_uniform.png~ differ diff --git a/models/textures/british_uniform_height.png b/models/textures/british_uniform_height.png index 19c68f5..cb7b281 100644 --- a/models/textures/british_uniform_height.png +++ b/models/textures/british_uniform_height.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d43bd757257b40f56a948c3dda22b0b20c92003896cde7da55979c8c3381d3a3 -size 2391472 +oid sha256:75a5c42acf64160c2693037c47fda77eeaacd680568c1f21969bd6073cc1a66d +size 12958320 diff --git a/models/textures/british_uniform_height.png~ b/models/textures/british_uniform_height.png~ index 20fd382..35940bb 100644 Binary files a/models/textures/british_uniform_height.png~ and b/models/textures/british_uniform_height.png~ differ diff --git a/models/textures/british_uniform_normal.png b/models/textures/british_uniform_normal.png index f9975ea..41bdbfd 100644 --- a/models/textures/british_uniform_normal.png +++ b/models/textures/british_uniform_normal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6399bd33218a159fb0fb6cf5d9e81e6fc487cd17577295bffcc4062d609bc658 -size 725950 +oid sha256:7da427239baf7fabbd8eef5a2fefe86e8a57bb55b34905621998a849e3712c6f +size 3809817