Ship mostly works #10

Merged
chrisbell merged 60 commits from feature/ship-syncing into develop 2024-12-29 04:35:51 +00:00
4 changed files with 8 additions and 8 deletions
Showing only changes of commit 904141e541 - Show all commits

View File

@ -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")

View File

@ -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: