inventory bug fixes, multiplayer pickup sync
This commit is contained in:
parent
04a9a299d7
commit
000269875a
14 changed files with 88 additions and 43 deletions
|
|
@ -1,13 +1,13 @@
|
|||
[gd_scene load_steps=26 format=3 uid="uid://cc1m2a1obsyn4"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://c1um4tmthbbpk" path="res://Scripts/fpc/character.gd" id="1_0t4e8"]
|
||||
[ext_resource type="Script" uid="uid://darcj1vokaiv2" path="res://Scripts/Resources/inventory.gd" id="2_bmlhv"]
|
||||
[ext_resource type="Script" uid="uid://c5g0jt1apb2al" path="res://Scripts/fpc/EditorModule.gd" id="3_v3ckk"]
|
||||
[ext_resource type="Script" uid="uid://bhfftu01dsfk7" path="res://Scripts/fpc/debug.gd" id="3_x1wcc"]
|
||||
[ext_resource type="PackedScene" uid="uid://01ujg1e7atlb" path="res://Scenes/Menu/InventoryMenu.tscn" id="4_8j081"]
|
||||
[ext_resource type="Script" uid="uid://c1um4tmthbbpk" path="res://Scripts/fpc/player.gd" id="1_vk0jd"]
|
||||
[ext_resource type="Script" uid="uid://darcj1vokaiv2" path="res://Scripts/Resources/inventory.gd" id="2_v5t36"]
|
||||
[ext_resource type="Script" uid="uid://bhfftu01dsfk7" path="res://Scripts/fpc/debug.gd" id="3_y73r6"]
|
||||
[ext_resource type="PackedScene" uid="uid://01ujg1e7atlb" path="res://Scenes/Menu/InventoryMenu.tscn" id="4_pbnxc"]
|
||||
[ext_resource type="Script" uid="uid://c5g0jt1apb2al" path="res://Scripts/fpc/EditorModule.gd" id="5_v2gla"]
|
||||
|
||||
[sub_resource type="Resource" id="Resource_jcsm3"]
|
||||
script = ExtResource("2_bmlhv")
|
||||
script = ExtResource("2_v5t36")
|
||||
metadata/_custom_type_script = "uid://darcj1vokaiv2"
|
||||
|
||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_kp17n"]
|
||||
|
|
@ -397,9 +397,9 @@ properties/2/path = NodePath("Head:rotation")
|
|||
properties/2/spawn = true
|
||||
properties/2/replication_mode = 1
|
||||
|
||||
[node name="Character" type="CharacterBody3D" node_paths=PackedStringArray("HEAD", "CAMERA", "CAMERA_RAYCAST", "HEADBOB_ANIMATION", "JUMP_ANIMATION", "CROUCH_ANIMATION", "COLLISION_MESH")]
|
||||
[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("HEAD", "CAMERA", "CAMERA_RAYCAST", "HEADBOB_ANIMATION", "JUMP_ANIMATION", "CROUCH_ANIMATION", "COLLISION_MESH")]
|
||||
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 0)
|
||||
script = ExtResource("1_0t4e8")
|
||||
script = ExtResource("1_vk0jd")
|
||||
HEAD = NodePath("Head")
|
||||
CAMERA = NodePath("Head/Camera")
|
||||
CAMERA_RAYCAST = NodePath("Head/Camera/CamRayCast3D")
|
||||
|
|
@ -461,7 +461,7 @@ offset_top = 10.0
|
|||
offset_right = 453.0
|
||||
offset_bottom = 50.0
|
||||
theme = SubResource("Theme_wdf0f")
|
||||
script = ExtResource("3_x1wcc")
|
||||
script = ExtResource("3_y73r6")
|
||||
|
||||
[node name="MarginContainer" type="MarginContainer" parent="UserInterface/DebugPanel"]
|
||||
layout_mode = 2
|
||||
|
|
@ -469,7 +469,7 @@ layout_mode = 2
|
|||
[node name="VBoxContainer" type="VBoxContainer" parent="UserInterface/DebugPanel/MarginContainer"]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="InventoryMenu" parent="UserInterface" instance=ExtResource("4_8j081")]
|
||||
[node name="InventoryMenu" parent="UserInterface" instance=ExtResource("4_pbnxc")]
|
||||
|
||||
[node name="CrouchCeilingDetection" type="ShapeCast3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
|
||||
|
|
@ -477,7 +477,10 @@ shape = SubResource("SphereShape3D_k4wwl")
|
|||
target_position = Vector3(0, 0.5, 0)
|
||||
|
||||
[node name="EditorModule" type="Node" parent="."]
|
||||
script = ExtResource("3_v3ckk")
|
||||
script = ExtResource("5_v2gla")
|
||||
|
||||
[node name="MultiplayerSynchronizer" type="MultiplayerSynchronizer" parent="."]
|
||||
replication_config = SubResource("SceneReplicationConfig_a88hh")
|
||||
|
||||
[node name="Item_holster" type="Marker3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.623649, 1.15944, 2.72606e-08)
|
||||
Loading…
Add table
Add a link
Reference in a new issue