Huge amount of updates

This commit is contained in:
2025-02-12 13:07:21 +01:00
parent 349b6b7226
commit 687c2ae1f5
96 changed files with 15637 additions and 156 deletions

View File

@ -1,8 +1,8 @@
[gd_scene load_steps=12 format=3 uid="uid://btlkodvngm634"]
[ext_resource type="Script" path="res://scenes/player/hud.gd" id="1_1ffy2"]
[ext_resource type="Script" path="res://scenes_old/player/hud.gd" id="1_1ffy2"]
[ext_resource type="Texture2D" uid="uid://oopj5mj1vdp0" path="res://assets/crosshairs/crosshair_default.png" id="1_u13st"]
[ext_resource type="Script" path="res://scenes/player/gun_mount.gd" id="3_qmcsd"]
[ext_resource type="Script" path="res://scenes_old/player/gun_mount.gd" id="3_qmcsd"]
[sub_resource type="LabelSettings" id="LabelSettings_3bk8i"]
font_size = 70

View File

@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=3 uid="uid://bm80m5x5me4mp"]
[ext_resource type="Script" path="res://scenes/player/server_node.gd" id="1_djt0m"]
[ext_resource type="PackedScene" uid="uid://ddwrs0so7swxn" path="res://scenes/characters/y-bot/character.tscn" id="2_a22jl"]
[ext_resource type="Script" path="res://scenes_old/player/server_node.gd" id="1_djt0m"]
[ext_resource type="PackedScene" uid="uid://ddwrs0so7swxn" path="res://scenes_old/characters/y-bot/character.tscn" id="2_a22jl"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_1v0rt"]
height = 1.8

View File

@ -1,6 +1,6 @@
[gd_scene load_steps=3 format=3 uid="uid://d3ohhfsnbspsm"]
[ext_resource type="Script" path="res://scenes/player/player_node.gd" id="1_8uxms"]
[ext_resource type="Script" path="res://scenes_old/player/player_node.gd" id="1_8uxms"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_uacs5"]

View File

@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=3 uid="uid://conlvf1vqni6c"]
[ext_resource type="Script" path="res://scenes/player/player_node.gd" id="1_q00bg"]
[ext_resource type="PackedScene" uid="uid://cirun2v34nfpg" path="res://scenes/player/shared_node.tscn" id="2_4mkad"]
[ext_resource type="Script" path="res://scenes_old/player/player_node.gd" id="1_q00bg"]
[ext_resource type="PackedScene" uid="uid://cirun2v34nfpg" path="res://scenes_old/player/shared_node.tscn" id="2_4mkad"]
[node name="PlayerNode" type="Node3D"]
script = ExtResource("1_q00bg")

View File

@ -23,7 +23,7 @@ func _ready() -> void:
shared_node.set_collision_mask_value(3, true)
map_controller = find_parent("Map")
_load_weapon()
map_controller.spawn_player_model(shared_node, owner_id)
#map_controller.spawn_player_model(shared_node, owner_id)
# Load the default weapon and set the current attack properties
func _load_weapon() -> void:
@ -86,8 +86,8 @@ func set_rotation_y(y: float):
func _on_reconciliation_timer_timeout() -> void:
if multiplayer.is_server():
_veryfy_position_and_rotation.rpc_id(owner_id)
update_position.rpc(shared_node.global_transform.origin)
#_veryfy_position_and_rotation.rpc_id(owner_id)
#update_position.rpc(shared_node.global_transform.origin)
$ReconciliationTimer.start()
@rpc("any_peer", "call_local", "reliable")

View File

@ -1,6 +1,6 @@
[gd_scene load_steps=4 format=3 uid="uid://clq0b7tbincut"]
[ext_resource type="Script" path="res://scenes/player/server_node.gd" id="1_bau14"]
[ext_resource type="Script" path="res://scenes/player/server_node.gd" id="1_wco3t"]
[ext_resource type="PackedScene" uid="uid://cirun2v34nfpg" path="res://scenes/player/shared_node.tscn" id="1_ybp5y"]
[sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_2dhi2"]
@ -18,7 +18,7 @@ properties/3/spawn = true
properties/3/replication_mode = 2
[node name="ServerNode" type="Node3D"]
script = ExtResource("1_bau14")
script = ExtResource("1_wco3t")
[node name="SharedNode" parent="." instance=ExtResource("1_ybp5y")]