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/interactables/ship-helm/ship_helm.gd b/assets/core/interactables/ship-helm/ship_helm.gd index f9e2235..282889a 100644 --- a/assets/core/interactables/ship-helm/ship_helm.gd +++ b/assets/core/interactables/ship-helm/ship_helm.gd @@ -12,4 +12,4 @@ func interact(): elif parent_ship.ship_is_piloted: player_reference.set_is_piloting(false) parent_ship.remove_piloting_player() - \ No newline at end of file + diff --git a/assets/core/player-controller/scenes/player.tscn b/assets/core/player-controller/scenes/player.tscn index f193fdd..b24b739 100644 --- a/assets/core/player-controller/scenes/player.tscn +++ b/assets/core/player-controller/scenes/player.tscn @@ -24,7 +24,7 @@ shader = ExtResource("3_rakxt") [sub_resource type="ShaderMaterial" id="ShaderMaterial_0n7pd"] shader = ExtResource("3_rakxt") -[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("camera", "neck", "player_avatar_face", "body", "head")] +[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("camera", "neck", "player_avatar_face", "body", "head", "player_hud")] collision_mask = 242 script = ExtResource("1_bv7t4") camera = NodePath("Neck/Camera3D") @@ -32,6 +32,7 @@ neck = NodePath("Neck") player_avatar_face = NodePath("Neck/Camera3D/PlayerAvatarFace") body = NodePath("Body") head = NodePath("Neck/Head") +player_hud = NodePath("PlayerHUD") [node name="PlayerTag" type="Label3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.26654, 0) diff --git a/assets/core/ships/ship_script.gd b/assets/core/ships/ship_script.gd index abd5420..537f354 100644 --- a/assets/core/ships/ship_script.gd +++ b/assets/core/ships/ship_script.gd @@ -165,4 +165,4 @@ func _on_property_update(node_id: String, property_name: String, value: Variant) receive_global_rotation_update(value) else: var node = NetworkManager.node_map[node_id] - node.set(property_name, value) \ No newline at end of file + node.set(property_name, value) 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