diff --git a/addons/godotsteam/win64/~libgodotsteam.windows.template_debug.x86_64.dll b/addons/godotsteam/win64/~libgodotsteam.windows.template_debug.x86_64.dll deleted file mode 100644 index c80cff6..0000000 Binary files a/addons/godotsteam/win64/~libgodotsteam.windows.template_debug.x86_64.dll and /dev/null differ diff --git a/assets/core/player-controller/scenes/player.tscn b/assets/core/player-controller/scenes/player.tscn index 3c9eb95..f193fdd 100644 --- a/assets/core/player-controller/scenes/player.tscn +++ b/assets/core/player-controller/scenes/player.tscn @@ -29,9 +29,9 @@ collision_mask = 242 script = ExtResource("1_bv7t4") camera = NodePath("Neck/Camera3D") neck = NodePath("Neck") -player_avatar_face = NodePath("Neck/PlayerAvatarFace") +player_avatar_face = NodePath("Neck/Camera3D/PlayerAvatarFace") body = NodePath("Body") -head = NodePath("Neck/Camera3D/Head") +head = NodePath("Neck/Head") [node name="PlayerTag" type="Label3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.26654, 0) @@ -58,17 +58,16 @@ collision_mask = 256 script = ExtResource("2_wvu3d") player = NodePath("../../..") -[node name="Head" type="MeshInstance3D" parent="Neck/Camera3D"] -mesh = SubResource("SphereMesh_vu2l8") -skeleton = NodePath("../..") - -[node name="PlayerAvatarFace" type="Sprite3D" parent="Neck"] +[node name="PlayerAvatarFace" type="Sprite3D" parent="Neck/Camera3D"] transform = Transform3D(-0.1, 0, -8.74228e-09, 0, 0.1, 0, 8.74228e-09, 0, -0.1, 0, 0, -0.349588) flip_h = true shaded = true double_sided = false texture = ExtResource("2_omgn1") +[node name="Head" type="MeshInstance3D" parent="Neck"] +mesh = SubResource("SphereMesh_vu2l8") + [node name="PlayerHUD" type="CanvasLayer" parent="." node_paths=PackedStringArray("fps_label")] script = ExtResource("3_02ne1") fps_label = NodePath("Debug/HBoxContainer/VBoxContainer/MarginContainer/FPSLabel") diff --git a/assets/core/player-controller/scripts/player.gd b/assets/core/player-controller/scripts/player.gd index 8cd756a..4a48ed9 100644 --- a/assets/core/player-controller/scripts/player.gd +++ b/assets/core/player-controller/scripts/player.gd @@ -49,8 +49,9 @@ func _ready() -> void: if is_network_authority: camera.make_current() body.hide() - head.hdie() + head.hide() player_avatar_face.hide() + func _unhandled_input(event: InputEvent) -> void: diff --git a/godot-jolt/windows/~godot-jolt_windows-x64_editor.dll b/godot-jolt/windows/~godot-jolt_windows-x64_editor.dll deleted file mode 100644 index c05d288..0000000 Binary files a/godot-jolt/windows/~godot-jolt_windows-x64_editor.dll and /dev/null differ