diff --git a/scenes/characters/blue/dummy.tscn b/scenes/characters/blue/dummy.tscn index 7265b2f..76a54e3 100644 --- a/scenes/characters/blue/dummy.tscn +++ b/scenes/characters/blue/dummy.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=28 format=4 uid="uid://1txob6jskn5s"] +[gd_scene load_steps=27 format=4 uid="uid://1txob6jskn5s"] [ext_resource type="Script" path="res://scenes/characters/blue/dummy.gd" id="1_cyeub"] [ext_resource type="Script" path="res://scenes/characters/blue/hit_collision.gd" id="2_jsfjb"] -[ext_resource type="PackedScene" uid="uid://dab7jttp7ywfh" path="res://scenes/weapon/guns/ak/gun.tscn" id="3_div6m"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_gqjtb"] resource_name = "Alpha_Joints_MAT" @@ -1404,12 +1403,12 @@ surface_material_override/0 = SubResource("StandardMaterial3D_j3emx") [node name="PhysicalBoneSimulator3D" type="PhysicalBoneSimulator3D" parent="Body/Armature/Skeleton3D" groups=["target"]] [node name="Physical Bone mixamorig_Hips" type="PhysicalBone3D" parent="Body/Armature/Skeleton3D/PhysicalBoneSimulator3D" groups=["target"]] -transform = Transform3D(82.5044, -54.0559, -16.4615, 55.0482, 83.4649, 1.8195, 12.756, -10.5629, 98.619, 1.315, 0.290634, -87.4646) +transform = Transform3D(82.5044, -54.0559, -16.4615, 55.0482, 83.4649, 1.81949, 12.756, -10.5629, 98.619, 1.315, 0.290637, -87.4646) collision_layer = 8 collision_mask = 9 joint_type = 1 -joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.49711e-07, -1.76951e-08, 0.0499957) -body_offset = Transform3D(100, -0.069519, -0.00861847, -2.6226e-05, 12.2744, -99.2438, 0.0700493, 99.2438, 12.2744, 0.000455856, 4.96176, -0.613665) +joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.87147e-07, -2.00234e-08, 0.0499957) +body_offset = Transform3D(100, -0.0695229, -0.0086199, -2.6226e-05, 12.2744, -99.2438, 0.0700493, 99.2438, 12.2744, 0.000459671, 4.96176, -0.613665) mass = 20.0 bone_name = "mixamorig_Hips" joint_constraints/bias = 0.3 @@ -1421,12 +1420,12 @@ transform = Transform3D(0.01, 0, 0, 0, -4.37114e-10, 0.01, 0, -0.01, -4.37114e-1 shape = SubResource("CapsuleShape3D_0ptuo") [node name="Physical Bone mixamorig_Spine" type="PhysicalBone3D" parent="Body/Armature/Skeleton3D/PhysicalBoneSimulator3D"] -transform = Transform3D(80.9412, -58.546, -4.56914, 57.6046, 80.6695, -13.1964, 11.4119, 8.04927, 99.0201, 2.40599, 0.973749, -98.2036) +transform = Transform3D(80.9412, -58.546, -4.56915, 57.6046, 80.6695, -13.1964, 11.4119, 8.04927, 99.0201, 2.40599, 0.973749, -98.2036) collision_layer = 8 collision_mask = 9 joint_type = 1 -joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.35753e-08, 1.01227e-08, 0.0586602) -body_offset = Transform3D(100, 1.52588e-05, 8.58307e-06, 4.76837e-06, 1.81198e-05, -100, -1.52588e-05, 100, 1.52588e-05, -2.86102e-06, 5.86602, -1.90735e-06) +joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.32957e-08, 4.52838e-09, 0.0586602) +body_offset = Transform3D(100, 1.14441e-05, 9.05991e-06, 4.76837e-06, 2.67029e-05, -100, -1.52588e-05, 100, 2.47955e-05, -2.86102e-06, 5.86602, -1.90735e-06) mass = 20.0 bone_name = "mixamorig_Spine" joint_constraints/bias = 0.3 @@ -1442,8 +1441,8 @@ transform = Transform3D(-97.8019, 4.47329, 20.366, -15.8369, -79.4709, -58.5966, collision_layer = 8 collision_mask = 9 joint_type = 1 -joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.39306e-07, 5.02914e-08, 0.0981532) -body_offset = Transform3D(-100, -0.00220013, -0.000778198, -5.24521e-06, 33.8066, -94.1122, 0.00232792, -94.1122, -33.8066, 5.24521e-05, 9.23741, 3.31823) +joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.79326e-07, 7.82311e-08, 0.0981532) +body_offset = Transform3D(-100, -0.00219822, -0.000780106, -5.24521e-06, 33.8066, -94.1122, 0.00232792, -94.1122, -33.8067, 4.86374e-05, 9.23741, 3.31824) mass = 7.0 bone_name = "mixamorig_Head" joint_constraints/bias = 0.3 @@ -1456,12 +1455,12 @@ transform = Transform3D(0.0099, 2.91038e-10, 0, -3.49246e-10, 9.31323e-10, 0.009 shape = SubResource("CapsuleShape3D_1gw5y") [node name="Physical Bone mixamorig_LeftArm" type="PhysicalBone3D" parent="Body/Armature/Skeleton3D/PhysicalBoneSimulator3D"] -transform = Transform3D(86.1165, 14.0252, -48.8594, -45.4995, 64.1262, -61.787, 22.6659, 75.4395, 61.6046, 16.1942, 31.0309, -132.592) +transform = Transform3D(86.1165, 14.0252, -48.8594, -45.4995, 64.1262, -61.787, 22.6659, 75.4396, 61.6046, 16.1942, 31.0309, -132.592) collision_layer = 8 collision_mask = 9 joint_type = 1 -joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.30788e-08, 1.57815e-07, 0.137023) -body_offset = Transform3D(100, -6.48499e-05, -2.28882e-05, 5.34058e-05, 100, -3.8147e-06, 1.52588e-05, 3.8147e-06, 100, 1.14441e-05, -1.52588e-05, -13.7023) +joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.78517e-08, 1.63042e-07, 0.137023) +body_offset = Transform3D(100, -6.67572e-05, -2.67029e-05, 5.91278e-05, 100, -7.62939e-06, 2.28882e-05, 7.62939e-06, 100, 1.14441e-05, -1.52588e-05, -13.7023) mass = 3.0 bone_name = "mixamorig_LeftArm" joint_constraints/bias = 0.3 @@ -1473,12 +1472,12 @@ transform = Transform3D(0.01, 0, 0, 0, 0.00997432, -0.000716193, 0, 0.000716193, shape = SubResource("CapsuleShape3D_krlof") [node name="Physical Bone mixamorig_LeftForeArm" type="PhysicalBone3D" parent="Body/Armature/Skeleton3D/PhysicalBoneSimulator3D"] -transform = Transform3D(-48.2566, -12.058, 86.752, -78.7312, -37.4258, -48.997, 38.3757, -91.9452, 8.56699, 1.36484, 46.9033, -104.66) +transform = Transform3D(-48.2566, -12.058, 86.752, -78.7312, -37.4258, -48.997, 38.3757, -91.9452, 8.56699, 1.36483, 46.9033, -104.66) collision_layer = 8 collision_mask = 9 joint_type = 1 -joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.57682e-07, -1.58011e-08, 0.138072) -body_offset = Transform3D(100, 3.05176e-05, -3.8147e-05, -3.8147e-05, 0, -100, -3.8147e-06, 100, 1.14441e-05, 6.10352e-05, 13.8072, 0) +joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.52414e-07, -1.05341e-08, 0.138072) +body_offset = Transform3D(100, 3.05176e-05, -4.19617e-05, -3.8147e-05, 0, -100, -3.8147e-06, 100, 7.62939e-06, 6.10352e-05, 13.8072, 0) mass = 3.0 bone_name = "mixamorig_LeftForeArm" joint_constraints/bias = 0.3 @@ -1490,12 +1489,12 @@ transform = Transform3D(0.01, 0, 0, 0, -4.37114e-10, 0.01, 0, -0.01, -4.37114e-1 shape = SubResource("CapsuleShape3D_2k34c") [node name="Physical Bone mixamorig_LeftHand" type="PhysicalBone3D" parent="Body/Armature/Skeleton3D/PhysicalBoneSimulator3D"] -transform = Transform3D(9.11563, -98.6768, 13.4089, 23.9482, -10.8976, -96.4766, 96.6612, 12.0056, 22.6379, -10.9684, 56.2242, -106.442) +transform = Transform3D(9.11563, -98.6768, 13.4089, 23.9481, -10.8976, -96.4766, 96.6612, 12.0056, 22.6379, -10.9684, 56.2242, -106.442) collision_layer = 8 collision_mask = 9 joint_type = 1 -joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.37722e-08, -9.77889e-09, 0.0264902) -body_offset = Transform3D(-58.5197, 57.9894, 56.6805, 2.19345e-05, 69.899, -71.5132, -81.0891, -41.8493, -40.9047, -1.50148, 1.8944, 1.08357) +joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.86265e-09, -4.19095e-09, 0.0264902) +body_offset = Transform3D(-58.5197, 57.9894, 56.6805, 2.28882e-05, 69.899, -71.5132, -81.0891, -41.8493, -40.9047, -1.50148, 1.8944, 1.08357) bone_name = "mixamorig_LeftHand" joint_constraints/bias = 0.3 joint_constraints/damping = 1.0 @@ -1506,12 +1505,12 @@ transform = Transform3D(0.01, 0, 0, 0, 0.00697578, 0.00716509, 0, -0.00716509, 0 shape = SubResource("CapsuleShape3D_5fgdh") [node name="Physical Bone mixamorig_RightArm" type="PhysicalBone3D" parent="Body/Armature/Skeleton3D/PhysicalBoneSimulator3D"] -transform = Transform3D(30.7246, 72.8896, 61.1809, 93.7855, -34.092, -6.48192, 16.1331, 59.3704, -78.8345, -27.5296, -1.29566, -110.13) +transform = Transform3D(30.7246, 72.8896, 61.1809, 93.7855, -34.092, -6.48191, 16.1331, 59.3704, -78.8345, -27.5296, -1.29566, -110.13) collision_layer = 8 collision_mask = 9 joint_type = 1 -joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.63344e-08, 1.16326e-07, 0.137023) -body_offset = Transform3D(100, -5.72205e-06, 1.19209e-05, 6.67572e-06, 1.07288e-05, -100, -1.90735e-06, 100, 2.64645e-05, 0, 13.7023, -1.52588e-05) +joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.43743e-08, 1.22206e-07, 0.137023) +body_offset = Transform3D(100, -5.72205e-06, 1.04904e-05, 6.67572e-06, 6.67572e-06, -100, -1.90735e-06, 100, 2.21729e-05, 0, 13.7023, -1.52588e-05) mass = 3.0 bone_name = "mixamorig_RightArm" joint_constraints/bias = 0.3 @@ -1523,12 +1522,12 @@ transform = Transform3D(0.01, 0, 0, 0, -4.37114e-10, 0.01, 0, -0.01, -4.37114e-1 shape = SubResource("CapsuleShape3D_8vkyv") [node name="Physical Bone mixamorig_RightForeArm" type="PhysicalBone3D" parent="Body/Armature/Skeleton3D/PhysicalBoneSimulator3D"] -transform = Transform3D(24.3552, 37.4063, 89.4852, -25.0101, 91.5653, -31.4688, -93.7087, -14.716, 31.6563, -48.2682, 3.9375, -103.698) +transform = Transform3D(24.3552, 37.4063, 89.4851, -25.0101, 91.5653, -31.4688, -93.7087, -14.716, 31.6563, -48.2682, 3.9375, -103.698) collision_layer = 8 collision_mask = 9 joint_type = 1 -joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.53905e-07, -1.44255e-07, 0.138072) -body_offset = Transform3D(100, 9.53674e-06, -9.53674e-07, -2.67029e-05, 100, 2.28882e-05, 1.7643e-05, -2.47955e-05, 100, -1.52588e-05, 1.12653e-05, -13.8072) +joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.64439e-07, -1.82153e-07, 0.138072) +body_offset = Transform3D(100, 1.71661e-05, -8.58307e-06, -3.24249e-05, 100, 2.09808e-05, 3.00407e-05, -2.28882e-05, 100, -1.52588e-05, 1.53184e-05, -13.8072) mass = 3.0 bone_name = "mixamorig_RightForeArm" joint_constraints/bias = 0.3 @@ -1544,7 +1543,7 @@ transform = Transform3D(89.0767, -24.8074, -38.0781, 5.05123, 88.6726, -45.9527, collision_layer = 8 collision_mask = 9 joint_type = 1 -joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.43424e-07, 3.14321e-07, 0.0264904) +joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.0396e-07, 3.1013e-07, 0.0264904) body_offset = Transform3D(-58.5197, -57.9893, -56.6805, -1.33514e-05, 69.8991, -71.5131, 81.0891, -41.8492, -40.9048, 1.5015, 1.89439, 1.08361) bone_name = "mixamorig_RightHand" joint_constraints/bias = 0.3 @@ -1556,12 +1555,12 @@ transform = Transform3D(0.01, 0, 0, 0, 0.00693402, 0.00720551, 0, -0.00720551, 0 shape = SubResource("CapsuleShape3D_1m8r5") [node name="Physical Bone mixamorig_LeftUpLeg" type="PhysicalBone3D" parent="Body/Armature/Skeleton3D/PhysicalBoneSimulator3D"] -transform = Transform3D(-96.1774, -26.2683, 7.73898, -23.4202, 64.2555, -72.957, 14.1919, -71.9806, -67.9513, 5.83708, 19.601, -60.9754) +transform = Transform3D(-96.1774, -26.2683, 7.73899, -23.4202, 64.2555, -72.957, 14.1919, -71.9806, -67.9513, 5.83709, 19.601, -60.9754) collision_layer = 8 collision_mask = 9 joint_type = 1 -joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.02254e-07, -1.71497e-09, 0.202997) -body_offset = Transform3D(100, -7.34329e-05, 2.47955e-05, 2.09808e-05, 6.10352e-05, -100, 7.53403e-05, 100, 5.72205e-05, -1.52588e-05, 20.2997, -1.14441e-05) +joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.40401e-07, 1.12726e-07, 0.202997) +body_offset = Transform3D(100, -7.34329e-05, 2.47955e-05, 2.09808e-05, 6.10352e-05, -100, 7.53403e-05, 100, 5.72205e-05, -1.90735e-05, 20.2997, -2.28882e-05) mass = 5.0 bone_name = "mixamorig_LeftUpLeg" joint_constraints/bias = 0.3 @@ -1577,8 +1576,8 @@ transform = Transform3D(-97.5216, -11.6193, -18.8291, -22.0483, 58.1427, 78.3154 collision_layer = 8 collision_mask = 9 joint_type = 1 -joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.01576e-09, -2.10753e-08, 0.210495) -body_offset = Transform3D(100, 4.76837e-06, 1.14441e-05, 5.72205e-06, 0, -100, -9.53674e-07, 100, 1.90735e-05, -1.90735e-06, 21.0495, -1.90735e-06) +joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.01575e-09, -1.30455e-08, 0.210495) +body_offset = Transform3D(100, 2.86102e-06, 1.14441e-05, 5.72205e-06, 0, -100, -9.53674e-07, 100, 1.52588e-05, -1.90735e-06, 21.0495, -1.90735e-06) mass = 5.0 bone_name = "mixamorig_LeftLeg" joint_constraints/bias = 0.3 @@ -1590,12 +1589,12 @@ transform = Transform3D(0.01, 0, 0, 0, -4.37114e-10, 0.01, 0, -0.01, -4.37114e-1 shape = SubResource("CapsuleShape3D_vwdij") [node name="Physical Bone mixamorig_LeftFoot" type="PhysicalBone3D" parent="Body/Armature/Skeleton3D/PhysicalBoneSimulator3D"] -transform = Transform3D(-93.6712, -34.5296, 5.78095, -34.9451, 91.207, -21.4506, 2.13419, -22.1132, -97.501, 11.7385, 3.12728, -14.5678) +transform = Transform3D(-93.6712, -34.5296, 5.78095, -34.9451, 91.207, -21.4506, 2.1342, -22.1132, -97.501, 11.7385, 3.12728, -14.5678) collision_layer = 8 collision_mask = 9 joint_type = 1 -joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.91287e-09, 1.35505e-07, 0.0786082) -body_offset = Transform3D(100, 2.86102e-05, 3.33786e-06, 4.29153e-06, -2.47955e-05, -100, -2.28882e-05, 100, -4.19617e-05, -9.53674e-07, 7.86082, -1.0252e-05) +joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.45754e-08, 1.53424e-07, 0.0786083) +body_offset = Transform3D(100, 3.05176e-05, 5.72205e-06, 6.67572e-06, -3.05176e-05, -100, -2.28882e-05, 100, -4.95911e-05, -1.90735e-06, 7.86083, -1.14441e-05) bone_name = "mixamorig_LeftFoot" joint_constraints/bias = 0.3 joint_constraints/damping = 1.0 @@ -1610,8 +1609,8 @@ transform = Transform3D(-83.6898, -51.5224, 18.4786, -50.5592, 59.8312, -62.161, collision_layer = 8 collision_mask = 9 joint_type = 1 -joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.08665e-08, 2.32312e-08, 0.202997) -body_offset = Transform3D(100, -1.52588e-05, 3.8147e-06, 5.72205e-06, -1.14441e-05, -100, 1.14441e-05, 100, -1.14441e-05, -2.86102e-06, 20.2997, 0) +joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.86102e-08, 1.54874e-08, 0.202997) +body_offset = Transform3D(100, -1.52588e-05, 0, 5.72205e-06, -1.14441e-05, -100, 1.14441e-05, 100, -7.62939e-06, -2.86102e-06, 20.2997, 0) mass = 5.0 bone_name = "mixamorig_RightUpLeg" joint_constraints/bias = 0.3 @@ -1627,8 +1626,8 @@ transform = Transform3D(-91.8175, -23.5086, -31.8888, -36.0102, 83.0805, 42.437, collision_layer = 8 collision_mask = 9 joint_type = 1 -joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.05739e-08, -3.49823e-07, 0.210495) -body_offset = Transform3D(100, -4.00543e-05, 1.33514e-05, 2.86102e-06, 6.10352e-05, -100, 4.57764e-05, 100, 8.01086e-05, -7.86781e-06, 21.0495, 1.81198e-05) +joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.47925e-08, -3.73912e-07, 0.210495) +body_offset = Transform3D(100, -4.95911e-05, 1.43051e-05, 2.86102e-06, 6.86646e-05, -100, 5.72205e-05, 100, 9.15527e-05, -1.04904e-05, 21.0495, 1.81198e-05) mass = 5.0 bone_name = "mixamorig_RightLeg" joint_constraints/bias = 0.3 @@ -1640,12 +1639,12 @@ transform = Transform3D(0.01, 0, 0, 0, -4.37114e-10, 0.01, 0, -0.01, -4.37114e-1 shape = SubResource("CylinderShape3D_2binp") [node name="Physical Bone mixamorig_RightFoot" type="PhysicalBone3D" parent="Body/Armature/Skeleton3D/PhysicalBoneSimulator3D" groups=["target"]] -transform = Transform3D(-88.192, -17.3351, 43.8368, -46.8549, 42.4444, -77.4796, -5.17505, -88.8705, -45.5549, -5.17837, 8.21811, -6.93437) +transform = Transform3D(-88.192, -17.3351, 43.8368, -46.8549, 42.4443, -77.4796, -5.17505, -88.8705, -45.5549, -5.17837, 8.21811, -6.93437) collision_layer = 8 collision_mask = 9 joint_type = 1 -joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.6418e-08, 1.82867e-08, 0.078608) -body_offset = Transform3D(100, 1.33514e-05, -1.52588e-05, -7.62939e-06, -6.10352e-05, -100, 0, 100, -8.39233e-05, 5.84126e-06, 7.8608, 4.76837e-06) +joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.24152e-08, 3.328e-08, 0.078608) +body_offset = Transform3D(100, 1.14441e-05, -7.62939e-06, -7.62939e-06, -7.62939e-05, -100, 0, 100, -0.000102997, 5.84126e-06, 7.8608, 4.76837e-06) bone_name = "mixamorig_RightFoot" joint_constraints/bias = 0.3 joint_constraints/damping = 1.0 @@ -1663,6 +1662,3 @@ shape = SubResource("SphereShape3D_wnhib") libraries = { "": SubResource("AnimationLibrary_dbxeu") } - -[node name="Gun" parent="." instance=ExtResource("3_div6m")] -transform = Transform3D(-0.12, 0, 1.81195e-08, 0, 0.12, 0, -1.81195e-08, 0, -0.12, -0.176084, 1.11081, 0.405023) diff --git a/scenes/maps/maps/lowpoly_tdm_2.tscn b/scenes/maps/maps/lowpoly_tdm_2.tscn index 5f17584..c10758a 100644 --- a/scenes/maps/maps/lowpoly_tdm_2.tscn +++ b/scenes/maps/maps/lowpoly_tdm_2.tscn @@ -757,7 +757,6 @@ ambient_light_color = Color(1, 1, 1, 1) reflected_light_source = 2 ssao_enabled = true glow_enabled = true -fog_enabled = true fog_density = 0.3 fog_height = 1.5 fog_height_density = 2.0 diff --git a/scenes/player/placeholder.tscn b/scenes/player/placeholder.tscn index 6644a12..318dba0 100644 --- a/scenes/player/placeholder.tscn +++ b/scenes/player/placeholder.tscn @@ -32,6 +32,9 @@ tracks/0/keys = { "values": [Vector3(0, 0, 0)] } +[sub_resource type="Animation" id="Animation_fhivu"] +resource_name = "idle" + [sub_resource type="Animation" id="Animation_mkk0p"] resource_name = "move" length = 0.5 @@ -67,9 +70,6 @@ tracks/0/keys = { "values": [Vector3(0, 0, 0), Vector3(0, -0.01, -0.01), Vector3(0, 0, 0)] } -[sub_resource type="Animation" id="Animation_fhivu"] -resource_name = "idle" - [sub_resource type="AnimationLibrary" id="AnimationLibrary_u1b6p"] _data = { "RESET": SubResource("Animation_falg4"), diff --git a/scenes/player/player_input_controller.gd b/scenes/player/player_input_controller.gd index 988bb93..b824b00 100644 --- a/scenes/player/player_input_controller.gd +++ b/scenes/player/player_input_controller.gd @@ -32,6 +32,7 @@ var look_dir: Vector2 var moving = false func _ready() -> void: global_position = $"..".initial_position + _add_legs_to_first_view() # -- TODO: It should not be hardcoded # Define a format string with placeholder '%s' var path_tmpl := "res://scenes/weapon/guns/%s/with_hands.tscn" @@ -49,7 +50,7 @@ func _ready() -> void: func _input(event): if multiplayer.get_unique_id() == get_multiplayer_authority(): if Input.is_action_just_pressed("jump"): jumping = true - if Input.is_action_pressed("shoot"): shooting = true + if Input.is_action_just_pressed("shoot"): shooting = true if Input.is_action_just_released("shoot"): shooting = false if event is InputEventMouseMotion and Input.mouse_mode == Input.MOUSE_MODE_CAPTURED: look_dir = event.relative * 1 @@ -137,7 +138,8 @@ func _add_legs_to_first_view() -> Error : var skeleton: Skeleton3D = node.find_child("Skeleton3D") var bone := skeleton.find_bone("mixamorig_Spine") if bone != -1: - skeleton.set_bone_pose_scale(bone, Vector3(0, 0, 0)) + print(bone) + skeleton.set_bone_pose_scale(bone, Vector3(0.0001, 0.0001, 0.0001)) add_child(node) var animation_node: AnimationPlayer = node.find_child("AnimationPlayer") if animation_node != null: diff --git a/scenes/weapon/bullet.gd b/scenes/weapon/bullet.gd index 8b99ec9..32e0cc7 100644 --- a/scenes/weapon/bullet.gd +++ b/scenes/weapon/bullet.gd @@ -9,6 +9,7 @@ extends Node3D # Called when the node enters the scene tree for the first time. func _ready() -> void: + set_multiplayer_authority(1) pass # Replace with function body. @@ -24,7 +25,6 @@ func _process(delta): if ray.is_colliding(): var collider = ray.get_collider() if collider != null and collider.is_in_group("target"): - print(";ala") ray.get_collider().hit(damage) rigid_body_3d.visible = false particles.emitting = true diff --git a/scenes/weapon/bullet.tscn b/scenes/weapon/bullet.tscn index 698e4d4..7d5613c 100644 --- a/scenes/weapon/bullet.tscn +++ b/scenes/weapon/bullet.tscn @@ -33,10 +33,10 @@ size = Vector3(0.05, 0.05, 0.05) [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_b8q4c"] properties/0/path = NodePath(".:position") properties/0/spawn = true -properties/0/replication_mode = 2 +properties/0/replication_mode = 1 properties/1/path = NodePath(".:rotation") properties/1/spawn = true -properties/1/replication_mode = 2 +properties/1/replication_mode = 1 [node name="Bullet" type="Node3D"] script = ExtResource("1_th28m") @@ -82,5 +82,6 @@ draw_pass_1 = SubResource("BoxMesh_mfkmi") [node name="MultiplayerSynchronizer" type="MultiplayerSynchronizer" parent="."] replication_config = SubResource("SceneReplicationConfig_b8q4c") +visibility_update_mode = 1 [connection signal="timeout" from="RigidBody3D/Timer" to="." method="_on_timer_timeout"]