diff --git a/scenes/player/placeholder.tscn b/scenes/player/placeholder.tscn index 00b76bf..e44c4c1 100644 --- a/scenes/player/placeholder.tscn +++ b/scenes/player/placeholder.tscn @@ -1,11 +1,9 @@ -[gd_scene load_steps=15 format=3 uid="uid://bmm3brgvr4d86"] +[gd_scene load_steps=13 format=3 uid="uid://bmm3brgvr4d86"] [ext_resource type="Script" path="res://scenes/player/player_input_controller.gd" id="1_m6tul"] [ext_resource type="Script" path="res://scenes/player/placeholder.gd" id="1_ts455"] [ext_resource type="Texture2D" uid="uid://oopj5mj1vdp0" path="res://assets/crosshairs/crosshair_default.png" id="3_8ulsx"] -[ext_resource type="Script" path="res://scenes/player/server_player_controller.gd" id="3_f1bhn"] [ext_resource type="PackedScene" uid="uid://dtvo21mk1webd" path="res://scenes/weapon/guns/ak/with_hands.tscn" id="3_xxv4y"] -[ext_resource type="PackedScene" uid="uid://1txob6jskn5s" path="res://scenes/characters/blue/dummy.tscn" id="6_e3cnh"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_taqso"] radius = 0.4 @@ -194,17 +192,6 @@ collide_with_areas = true [node name="Node3D" type="Node3D" parent="PlayerControlledNode"] -[node name="ServerControlledNodeBak" type="CharacterBody3D" parent="."] -collision_layer = 4 -script = ExtResource("3_f1bhn") - -[node name="Dummy" parent="ServerControlledNodeBak" instance=ExtResource("6_e3cnh")] -visible = false - -[node name="CollisionShape3D" type="CollisionShape3D" parent="ServerControlledNodeBak"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.57384, 0) -shape = SubResource("CapsuleShape3D_taqso") - [node name="MultiplayerSynchronizer" type="MultiplayerSynchronizer" parent="."] replication_config = SubResource("SceneReplicationConfig_7vlrn") @@ -218,7 +205,4 @@ collision_layer = 4 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.786919, 0) shape = SubResource("CapsuleShape3D_taqso") -[node name="CSGBox3D" type="CSGBox3D" parent="ServerControlledNode"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.47058, 0) - [connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"]