From 0215dcbb13567c2deee02b33a71a23fe456b20c5 Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Tue, 4 Mar 2025 09:16:05 +0100 Subject: [PATCH] Update to godot 4 --- .../assets/models/characters/hands.glb.import | 4 +- .../assets/models/characters/legs.glb.import | 4 +- .../assets/models/characters/model.glb.import | 4 +- .../assets/models/characters/y-bot.glb.import | 4 +- .../low_poly_weapon/M9_Bayonet.glb.import | 4 +- .../low_poly_weapon/low-poly_ak-47.glb.import | 4 +- .../low-poly_cz_bren_2_ms_5.56_11.glb.import | 4 +- ...y_desert-eagle_vii_.50_ae_black.glb.import | 4 +- .../low-poly_hk416a8.glb.import | 4 +- .../low-poly_imi_uzi.glb.import | 4 +- .../low-poly_kriss_vector.glb.import | 4 +- .../low-poly_m1_garand.glb.import | 4 +- .../low_poly_weapon/low-poly_rgd-5.glb.import | 4 +- .../low-poly_sa-58_osw.glb.import | 4 +- .../low-poly_sjogren_inertia.glb.import | 4 +- .../models/maps/lowpoly_map/map.glb.import | 4 +- godot/project.godot | 2 +- godot/rust_bindings.gdextension.uid | 1 + godot/shaders/border.gdshader.uid | 1 + .../camera/camera_mount/camera_mount.gd.uid | 1 + .../src/camera/camera_mount/camera_mount.tscn | 2 +- .../client_connector/client_connector.gd.uid | 1 + .../client_connector/client_connector.tscn | 2 +- godot/src/entrypoint.gd.uid | 1 + godot/src/entrypoint.tscn | 2 +- .../src/interfaces/main_menu/main_menu.gd.uid | 1 + godot/src/interfaces/main_menu/main_menu.tscn | 2 +- godot/src/scenes/characters/y-bot/A.tscn | 6 +- .../base/client_space/client_space.gd.uid | 1 + .../base/client_space/client_space.tscn | 2 +- .../scenes/levels/base/map_controller.gd.uid | 1 + .../player_model_space.gd.uid | 1 + .../player_model_space.tscn | 2 +- .../levels/base/spawn_controller.gd.uid | 1 + godot/src/scenes/levels/maps/br_lowpoly.tscn | 4 +- .../src/scenes/player/aiming_modifier.gd.uid | 1 + .../player/body_follows_head_modifier.gd.uid | 1 + .../player/look_forward_modifier.gd.uid | 1 + godot/src/scenes/player/player.gd | 2 +- godot/src/scenes/player/player.gd.uid | 1 + godot/src/scenes/player/player.tscn | 58 ++++++------------- .../player_controller.gd.uid | 1 + .../player_controller/player_controller.tscn | 2 +- .../src/scenes/player/player_movement.gd.uid | 1 + .../server_side_character.gd.uid | 1 + .../server_side_character.tscn | 2 +- .../scenes/player/visuals_controller.gd.uid | 1 + .../scripts/get_all_bones_positions.gd.uid | 1 + godot/src/server/server.gd.uid | 1 + godot/src/server/server.tscn | 2 +- godot/src/utils/consts.gd.uid | 1 + godot/src/utils/functions.gd.uid | 1 + godot/src/utils/logger.gd.uid | 1 + 53 files changed, 88 insertions(+), 89 deletions(-) create mode 100644 godot/rust_bindings.gdextension.uid create mode 100644 godot/shaders/border.gdshader.uid create mode 100644 godot/src/camera/camera_mount/camera_mount.gd.uid create mode 100644 godot/src/camera/client_connector/client_connector.gd.uid create mode 100644 godot/src/entrypoint.gd.uid create mode 100644 godot/src/interfaces/main_menu/main_menu.gd.uid create mode 100644 godot/src/scenes/levels/base/client_space/client_space.gd.uid create mode 100644 godot/src/scenes/levels/base/map_controller.gd.uid create mode 100644 godot/src/scenes/levels/base/player_model_space/player_model_space.gd.uid create mode 100644 godot/src/scenes/levels/base/spawn_controller.gd.uid create mode 100644 godot/src/scenes/player/aiming_modifier.gd.uid create mode 100644 godot/src/scenes/player/body_follows_head_modifier.gd.uid create mode 100644 godot/src/scenes/player/look_forward_modifier.gd.uid create mode 100644 godot/src/scenes/player/player.gd.uid create mode 100644 godot/src/scenes/player/player_controller/player_controller.gd.uid create mode 100644 godot/src/scenes/player/player_movement.gd.uid create mode 100644 godot/src/scenes/player/server_side_character/server_side_character.gd.uid create mode 100644 godot/src/scenes/player/visuals_controller.gd.uid create mode 100644 godot/src/scripts/get_all_bones_positions.gd.uid create mode 100644 godot/src/server/server.gd.uid create mode 100644 godot/src/utils/consts.gd.uid create mode 100644 godot/src/utils/functions.gd.uid create mode 100644 godot/src/utils/logger.gd.uid diff --git a/godot/assets/models/characters/hands.glb.import b/godot/assets/models/characters/hands.glb.import index e8c1e72..296cc46 100644 --- a/godot/assets/models/characters/hands.glb.import +++ b/godot/assets/models/characters/hands.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68164a9ba7b38aaf3800f6b550394334c31d28440e9fb156dd837a91a7f51ab8 -size 886 +oid sha256:cae0acdbf2080bf465a6868f4ae8bb7c87dc4028a4fcd19a7fedcfda40e4a74c +size 920 diff --git a/godot/assets/models/characters/legs.glb.import b/godot/assets/models/characters/legs.glb.import index cdee00a..efd37ae 100644 --- a/godot/assets/models/characters/legs.glb.import +++ b/godot/assets/models/characters/legs.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f1a8a42c22e1e1773a87fcb5c69eeb6f7d0cdc32a89bae1705ed47c066b1c02 -size 884 +oid sha256:1b92f3883960a076a6256cc47b8c007234ad89f64b48189557f47168ad30817b +size 918 diff --git a/godot/assets/models/characters/model.glb.import b/godot/assets/models/characters/model.glb.import index e7b6b9b..6c767a9 100644 --- a/godot/assets/models/characters/model.glb.import +++ b/godot/assets/models/characters/model.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7bdbecced889758d9819bcf36a6ef70dcddcdf8c254d42a2c47b63b456d3708a -size 887 +oid sha256:a5efbe0271060dccb93a68ea57c78564732166d749e8c9b8794721d6952bc5d4 +size 921 diff --git a/godot/assets/models/characters/y-bot.glb.import b/godot/assets/models/characters/y-bot.glb.import index 50b69dc..957d198 100644 --- a/godot/assets/models/characters/y-bot.glb.import +++ b/godot/assets/models/characters/y-bot.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28e4c43b82881e43fc4b5b680090255adabc15feed149ad0156cc6fe891c0e96 -size 175735 +oid sha256:cdd1c8a7755de6479bbb8651b1d4ae1179a0764167b686c8507b64e73ee797b8 +size 175769 diff --git a/godot/assets/models/low_poly_weapon/M9_Bayonet.glb.import b/godot/assets/models/low_poly_weapon/M9_Bayonet.glb.import index 56dc47e..14adb32 100644 --- a/godot/assets/models/low_poly_weapon/M9_Bayonet.glb.import +++ b/godot/assets/models/low_poly_weapon/M9_Bayonet.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ca7417ee10fa630588728badc9a5fa0bce702fd4337f637c3ed1f0880a0fe54 -size 906 +oid sha256:6fc5ad468af22147b270e82fa5e0e6ca4b0d7c9041ebacc140be6ecb87f5e703 +size 940 diff --git a/godot/assets/models/low_poly_weapon/low-poly_ak-47.glb.import b/godot/assets/models/low_poly_weapon/low-poly_ak-47.glb.import index 02fe68f..f3a16ed 100644 --- a/godot/assets/models/low_poly_weapon/low-poly_ak-47.glb.import +++ b/godot/assets/models/low_poly_weapon/low-poly_ak-47.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adf48fdfafef97279032f681b16559310e85a9bd756ca7bb3c71957d811895b0 -size 919 +oid sha256:a863334b0ca85d8ac90714c9d8f62dc13a1d08cf7aaece9327cd41fee518fc8c +size 953 diff --git a/godot/assets/models/low_poly_weapon/low-poly_cz_bren_2_ms_5.56_11.glb.import b/godot/assets/models/low_poly_weapon/low-poly_cz_bren_2_ms_5.56_11.glb.import index 7b87aa4..1070015 100644 --- a/godot/assets/models/low_poly_weapon/low-poly_cz_bren_2_ms_5.56_11.glb.import +++ b/godot/assets/models/low_poly_weapon/low-poly_cz_bren_2_ms_5.56_11.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d73429d5713c6df57f556d6789791eec77190668f435592aca2d8ff808dfb7e6 -size 963 +oid sha256:ef431f2f18151b91b5064829c528033533314b8ea871aa4596a28134a602aebb +size 997 diff --git a/godot/assets/models/low_poly_weapon/low-poly_desert-eagle_vii_.50_ae_black.glb.import b/godot/assets/models/low_poly_weapon/low-poly_desert-eagle_vii_.50_ae_black.glb.import index ce24304..65c2f0e 100644 --- a/godot/assets/models/low_poly_weapon/low-poly_desert-eagle_vii_.50_ae_black.glb.import +++ b/godot/assets/models/low_poly_weapon/low-poly_desert-eagle_vii_.50_ae_black.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68bfeae33ff8f3266f37762e88037a96edf761b10e03418958541ab669606e0c -size 991 +oid sha256:151473657b8a65eb8a723116979f807771610f92cfb102b5d47a914bafcf9732 +size 1025 diff --git a/godot/assets/models/low_poly_weapon/low-poly_hk416a8.glb.import b/godot/assets/models/low_poly_weapon/low-poly_hk416a8.glb.import index 1c7954f..0024c92 100644 --- a/godot/assets/models/low_poly_weapon/low-poly_hk416a8.glb.import +++ b/godot/assets/models/low_poly_weapon/low-poly_hk416a8.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c8e0892509015a938f0fc1fc93a4b508b589ffab5d77fcb5867b29b0727615a -size 925 +oid sha256:b81ba77e89a58886ce6277fa4cccb530c807956d2b6e56e2980d3adb3cbf2143 +size 959 diff --git a/godot/assets/models/low_poly_weapon/low-poly_imi_uzi.glb.import b/godot/assets/models/low_poly_weapon/low-poly_imi_uzi.glb.import index b6c49e9..ad88700 100644 --- a/godot/assets/models/low_poly_weapon/low-poly_imi_uzi.glb.import +++ b/godot/assets/models/low_poly_weapon/low-poly_imi_uzi.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ddcfc14dc0c663340db586190b6a7bb81c307f629ca7041e26d6e72e77245f3 -size 925 +oid sha256:b15d22bc304df2fd5fc23c0a83d48192055daeaba3a2b072e5d5817ade48acec +size 959 diff --git a/godot/assets/models/low_poly_weapon/low-poly_kriss_vector.glb.import b/godot/assets/models/low_poly_weapon/low-poly_kriss_vector.glb.import index 4fd3f6f..1651a39 100644 --- a/godot/assets/models/low_poly_weapon/low-poly_kriss_vector.glb.import +++ b/godot/assets/models/low_poly_weapon/low-poly_kriss_vector.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a03844a8730a54002a9b273933b0801a7f7c95cd24091e1cb8abc334c67ab1ca -size 940 +oid sha256:991b7facdd363cfad1368b884aa97c29805fdcff94db94c846570c2b9fe3f4f5 +size 974 diff --git a/godot/assets/models/low_poly_weapon/low-poly_m1_garand.glb.import b/godot/assets/models/low_poly_weapon/low-poly_m1_garand.glb.import index de12fb6..8c29c30 100644 --- a/godot/assets/models/low_poly_weapon/low-poly_m1_garand.glb.import +++ b/godot/assets/models/low_poly_weapon/low-poly_m1_garand.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c47705a93075cf683fe963e8559ecaba805c2a4dc06a49d88a6348083b432fd8 -size 931 +oid sha256:8571c8422f0e030f65b02f60369b44a4cb48baaa77987690985e67156eda064c +size 965 diff --git a/godot/assets/models/low_poly_weapon/low-poly_rgd-5.glb.import b/godot/assets/models/low_poly_weapon/low-poly_rgd-5.glb.import index 88745cb..de5cbde 100644 --- a/godot/assets/models/low_poly_weapon/low-poly_rgd-5.glb.import +++ b/godot/assets/models/low_poly_weapon/low-poly_rgd-5.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d0435e81b74f822c089a644fe1cc90b5abab760272bb51d8601b5a3a723123b -size 919 +oid sha256:a1144b9401c102c9796a9b48318f6e77b030399e031d04cece372ce00ae4ffe8 +size 953 diff --git a/godot/assets/models/low_poly_weapon/low-poly_sa-58_osw.glb.import b/godot/assets/models/low_poly_weapon/low-poly_sa-58_osw.glb.import index 1920184..3ac975c 100644 --- a/godot/assets/models/low_poly_weapon/low-poly_sa-58_osw.glb.import +++ b/godot/assets/models/low_poly_weapon/low-poly_sa-58_osw.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fe8d3c6da65c964c155e1d89ca3484c4e69abde08632108795f646186c76d64 -size 930 +oid sha256:e736833ab6ff257397360f614bff09ed0e619ffa4c4ec71adcca07f2d7414d28 +size 964 diff --git a/godot/assets/models/low_poly_weapon/low-poly_sjogren_inertia.glb.import b/godot/assets/models/low_poly_weapon/low-poly_sjogren_inertia.glb.import index 4d47e22..19e2dd0 100644 --- a/godot/assets/models/low_poly_weapon/low-poly_sjogren_inertia.glb.import +++ b/godot/assets/models/low_poly_weapon/low-poly_sjogren_inertia.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff0c8d42695c994477440251c77b38d5e72cbf5ae417f70bc8425f36dd448cd0 -size 948 +oid sha256:a59db8635ef44b9a28bec36ac46defd94158e91536c1a5d2bdb148aff206ccc2 +size 982 diff --git a/godot/assets/models/maps/lowpoly_map/map.glb.import b/godot/assets/models/maps/lowpoly_map/map.glb.import index 1cd1f30..f7bfdb5 100644 --- a/godot/assets/models/maps/lowpoly_map/map.glb.import +++ b/godot/assets/models/maps/lowpoly_map/map.glb.import @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:017b1f4281265076562d438d00bd030fd4e6697454f9da4fabd1fa7a90c4c97a -size 887 +oid sha256:ff8f1317b43ea6788b0de314d6df69a0db09b51c445c71011e8a7fb88d04f455 +size 921 diff --git a/godot/project.godot b/godot/project.godot index 0d76771..69852a2 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -13,7 +13,7 @@ config_version=5 config/name="Killbox" config/version="0.1.0" run/main_scene="res://src/entrypoint.tscn" -config/features=PackedStringArray("4.3", "Forward Plus") +config/features=PackedStringArray("4.4", "Forward Plus") config/icon="res://icon.svg" [autoload] diff --git a/godot/rust_bindings.gdextension.uid b/godot/rust_bindings.gdextension.uid new file mode 100644 index 0000000..8b418f2 --- /dev/null +++ b/godot/rust_bindings.gdextension.uid @@ -0,0 +1 @@ +uid://c0ak3db6x0f1o diff --git a/godot/shaders/border.gdshader.uid b/godot/shaders/border.gdshader.uid new file mode 100644 index 0000000..db413df --- /dev/null +++ b/godot/shaders/border.gdshader.uid @@ -0,0 +1 @@ +uid://dy8b6ptkovv57 diff --git a/godot/src/camera/camera_mount/camera_mount.gd.uid b/godot/src/camera/camera_mount/camera_mount.gd.uid new file mode 100644 index 0000000..58d3330 --- /dev/null +++ b/godot/src/camera/camera_mount/camera_mount.gd.uid @@ -0,0 +1 @@ +uid://cqk3cp4t6sg1l diff --git a/godot/src/camera/camera_mount/camera_mount.tscn b/godot/src/camera/camera_mount/camera_mount.tscn index 9b0e4fb..4da830a 100644 --- a/godot/src/camera/camera_mount/camera_mount.tscn +++ b/godot/src/camera/camera_mount/camera_mount.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://bg24niws4pbnj"] -[ext_resource type="Script" path="res://src/camera/camera_mount/camera_mount.gd" id="1_hso0b"] +[ext_resource type="Script" uid="uid://cqk3cp4t6sg1l" path="res://src/camera/camera_mount/camera_mount.gd" id="1_hso0b"] [node name="CameraMount" type="Node3D"] script = ExtResource("1_hso0b") diff --git a/godot/src/camera/client_connector/client_connector.gd.uid b/godot/src/camera/client_connector/client_connector.gd.uid new file mode 100644 index 0000000..ce9239a --- /dev/null +++ b/godot/src/camera/client_connector/client_connector.gd.uid @@ -0,0 +1 @@ +uid://b4tuqc7udn0qi diff --git a/godot/src/camera/client_connector/client_connector.tscn b/godot/src/camera/client_connector/client_connector.tscn index 5204bb9..b82a3da 100644 --- a/godot/src/camera/client_connector/client_connector.tscn +++ b/godot/src/camera/client_connector/client_connector.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://dwih53ng38mk5"] -[ext_resource type="Script" path="res://src/camera/client_connector/client_connector.gd" id="1_htv8i"] +[ext_resource type="Script" uid="uid://b4tuqc7udn0qi" path="res://src/camera/client_connector/client_connector.gd" id="1_htv8i"] [node name="ClientConnector" type="Node"] script = ExtResource("1_htv8i") diff --git a/godot/src/entrypoint.gd.uid b/godot/src/entrypoint.gd.uid new file mode 100644 index 0000000..3b19573 --- /dev/null +++ b/godot/src/entrypoint.gd.uid @@ -0,0 +1 @@ +uid://t0xcpgd86rr2 diff --git a/godot/src/entrypoint.tscn b/godot/src/entrypoint.tscn index 174b756..8762964 100644 --- a/godot/src/entrypoint.tscn +++ b/godot/src/entrypoint.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://0hsqnr1kunv5"] -[ext_resource type="Script" path="res://src/entrypoint.gd" id="1_ce80t"] +[ext_resource type="Script" uid="uid://t0xcpgd86rr2" path="res://src/entrypoint.gd" id="1_ce80t"] [ext_resource type="PackedScene" uid="uid://dt7rhpcor1wh7" path="res://src/interfaces/main_menu/main_menu.tscn" id="2_dd6gs"] [node name="Entrypoint" type="Node"] diff --git a/godot/src/interfaces/main_menu/main_menu.gd.uid b/godot/src/interfaces/main_menu/main_menu.gd.uid new file mode 100644 index 0000000..2bddd28 --- /dev/null +++ b/godot/src/interfaces/main_menu/main_menu.gd.uid @@ -0,0 +1 @@ +uid://bktyry7eyj57h diff --git a/godot/src/interfaces/main_menu/main_menu.tscn b/godot/src/interfaces/main_menu/main_menu.tscn index 3520304..06bd681 100644 --- a/godot/src/interfaces/main_menu/main_menu.tscn +++ b/godot/src/interfaces/main_menu/main_menu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://dt7rhpcor1wh7"] -[ext_resource type="Script" path="res://src/interfaces/main_menu/main_menu.gd" id="1_dfg40"] +[ext_resource type="Script" uid="uid://bktyry7eyj57h" path="res://src/interfaces/main_menu/main_menu.gd" id="1_dfg40"] [ext_resource type="Texture2D" uid="uid://dyymlervrwv87" path="res://assets/icons/home.svg" id="2_q7q32"] [ext_resource type="Texture2D" uid="uid://d0thk6bpmkkgo" path="res://assets/icons/settings.svg" id="3_7rsvq"] [ext_resource type="Texture2D" uid="uid://7pnrehlqgw0v" path="res://assets/icons/web-window-xmark.svg" id="4_svtqg"] diff --git a/godot/src/scenes/characters/y-bot/A.tscn b/godot/src/scenes/characters/y-bot/A.tscn index 5ddab62..bc6af6e 100644 --- a/godot/src/scenes/characters/y-bot/A.tscn +++ b/godot/src/scenes/characters/y-bot/A.tscn @@ -1455,9 +1455,9 @@ tracks/52/keys = PackedFloat32Array(0, 1, 0.251202, 0.0320477, 0.0148161, 0.9672 [sub_resource type="AnimationLibrary" id="AnimationLibrary_6rpno"] _data = { -"Idle": SubResource("Animation_brpqt"), -"T-Pose": SubResource("Animation_wafcl"), -"Walk": SubResource("Animation_1o0x7") +&"Idle": SubResource("Animation_brpqt"), +&"T-Pose": SubResource("Animation_wafcl"), +&"Walk": SubResource("Animation_1o0x7") } [node name="y-bot" type="Node3D"] diff --git a/godot/src/scenes/levels/base/client_space/client_space.gd.uid b/godot/src/scenes/levels/base/client_space/client_space.gd.uid new file mode 100644 index 0000000..879295b --- /dev/null +++ b/godot/src/scenes/levels/base/client_space/client_space.gd.uid @@ -0,0 +1 @@ +uid://crwitdk7hki3j diff --git a/godot/src/scenes/levels/base/client_space/client_space.tscn b/godot/src/scenes/levels/base/client_space/client_space.tscn index 9e29fd2..8c2bb65 100644 --- a/godot/src/scenes/levels/base/client_space/client_space.tscn +++ b/godot/src/scenes/levels/base/client_space/client_space.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://84qxu04nc7ue"] -[ext_resource type="Script" path="res://src/scenes/levels/base/client_space/client_space.gd" id="1_1m0ys"] +[ext_resource type="Script" uid="uid://crwitdk7hki3j" path="res://src/scenes/levels/base/client_space/client_space.gd" id="1_1m0ys"] [ext_resource type="PackedScene" uid="uid://bcxt4cnuh8u0g" path="res://src/scenes/player/player_controller/player_controller.tscn" id="2_cgrei"] [node name="ClientSpace" type="Node3D"] diff --git a/godot/src/scenes/levels/base/map_controller.gd.uid b/godot/src/scenes/levels/base/map_controller.gd.uid new file mode 100644 index 0000000..69ad199 --- /dev/null +++ b/godot/src/scenes/levels/base/map_controller.gd.uid @@ -0,0 +1 @@ +uid://ktwwe7d42vku diff --git a/godot/src/scenes/levels/base/player_model_space/player_model_space.gd.uid b/godot/src/scenes/levels/base/player_model_space/player_model_space.gd.uid new file mode 100644 index 0000000..9895376 --- /dev/null +++ b/godot/src/scenes/levels/base/player_model_space/player_model_space.gd.uid @@ -0,0 +1 @@ +uid://dvml7okm4nxrd diff --git a/godot/src/scenes/levels/base/player_model_space/player_model_space.tscn b/godot/src/scenes/levels/base/player_model_space/player_model_space.tscn index a32f275..0b78cb0 100644 --- a/godot/src/scenes/levels/base/player_model_space/player_model_space.tscn +++ b/godot/src/scenes/levels/base/player_model_space/player_model_space.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://d2am7vhli4gv8"] -[ext_resource type="Script" path="res://src/scenes/levels/base/player_model_space/player_model_space.gd" id="1_0cb1a"] +[ext_resource type="Script" uid="uid://dvml7okm4nxrd" path="res://src/scenes/levels/base/player_model_space/player_model_space.gd" id="1_0cb1a"] [node name="PlayerModelSpace" type="Node3D"] script = ExtResource("1_0cb1a") diff --git a/godot/src/scenes/levels/base/spawn_controller.gd.uid b/godot/src/scenes/levels/base/spawn_controller.gd.uid new file mode 100644 index 0000000..2c4eae7 --- /dev/null +++ b/godot/src/scenes/levels/base/spawn_controller.gd.uid @@ -0,0 +1 @@ +uid://hblvq6s178co diff --git a/godot/src/scenes/levels/maps/br_lowpoly.tscn b/godot/src/scenes/levels/maps/br_lowpoly.tscn index 89b472d..8ccc0df 100644 --- a/godot/src/scenes/levels/maps/br_lowpoly.tscn +++ b/godot/src/scenes/levels/maps/br_lowpoly.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=77 format=4 uid="uid://bmr6gia17jryx"] -[ext_resource type="Script" path="res://src/scenes/levels/base/map_controller.gd" id="1_g7bor"] +[ext_resource type="Script" uid="uid://ktwwe7d42vku" path="res://src/scenes/levels/base/map_controller.gd" id="1_g7bor"] [ext_resource type="PackedScene" uid="uid://bg24niws4pbnj" path="res://src/camera/camera_mount/camera_mount.tscn" id="2_vio63"] -[ext_resource type="Script" path="res://src/scenes/levels/base/spawn_controller.gd" id="3_ovp7d"] +[ext_resource type="Script" uid="uid://hblvq6s178co" path="res://src/scenes/levels/base/spawn_controller.gd" id="3_ovp7d"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_l214l"] resource_name = "New_Material" diff --git a/godot/src/scenes/player/aiming_modifier.gd.uid b/godot/src/scenes/player/aiming_modifier.gd.uid new file mode 100644 index 0000000..10d7931 --- /dev/null +++ b/godot/src/scenes/player/aiming_modifier.gd.uid @@ -0,0 +1 @@ +uid://bbnh6vbh5cvtq diff --git a/godot/src/scenes/player/body_follows_head_modifier.gd.uid b/godot/src/scenes/player/body_follows_head_modifier.gd.uid new file mode 100644 index 0000000..26a1d34 --- /dev/null +++ b/godot/src/scenes/player/body_follows_head_modifier.gd.uid @@ -0,0 +1 @@ +uid://cw8151er1e54y diff --git a/godot/src/scenes/player/look_forward_modifier.gd.uid b/godot/src/scenes/player/look_forward_modifier.gd.uid new file mode 100644 index 0000000..8c194f5 --- /dev/null +++ b/godot/src/scenes/player/look_forward_modifier.gd.uid @@ -0,0 +1 @@ +uid://y6hg3gyagmjh diff --git a/godot/src/scenes/player/player.gd b/godot/src/scenes/player/player.gd index 1b92215..41bdde8 100644 --- a/godot/src/scenes/player/player.gd +++ b/godot/src/scenes/player/player.gd @@ -21,7 +21,7 @@ func _input(event: InputEvent) -> void: func _physics_process(delta: float) -> void: - visual_controller.global_rotation.y = lerp_angle(visual_controller.global_rotation.y, movement_contrller.global_rotation.y, 0.3) + visual_controller.global_rotation.y = lerp_angle(visual_controller.global_rotation.y, movement_contrller.global_rotation.y, 0.2) pass func _ready() -> void: diff --git a/godot/src/scenes/player/player.gd.uid b/godot/src/scenes/player/player.gd.uid new file mode 100644 index 0000000..ecd95e5 --- /dev/null +++ b/godot/src/scenes/player/player.gd.uid @@ -0,0 +1 @@ +uid://db5kuorgtnsmg diff --git a/godot/src/scenes/player/player.tscn b/godot/src/scenes/player/player.tscn index a781fe2..8dff34e 100644 --- a/godot/src/scenes/player/player.tscn +++ b/godot/src/scenes/player/player.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=43 format=4 uid="uid://b2ogo643mvror"] +[gd_scene load_steps=42 format=4 uid="uid://b2ogo643mvror"] -[ext_resource type="Script" path="res://src/scenes/player/player.gd" id="1_ytbry"] -[ext_resource type="Script" path="res://src/camera/camera_mount/camera_mount.gd" id="2_7uvid"] -[ext_resource type="Script" path="res://src/scenes/player/player_movement.gd" id="2_300um"] -[ext_resource type="Script" path="res://src/scenes/player/look_forward_modifier.gd" id="2_hfvys"] -[ext_resource type="Script" path="res://src/scenes/player/visuals_controller.gd" id="4_2fh3g"] -[ext_resource type="Script" path="res://src/scenes/player/aiming_modifier.gd" id="5_tq4qn"] +[ext_resource type="Script" uid="uid://db5kuorgtnsmg" path="res://src/scenes/player/player.gd" id="1_ytbry"] +[ext_resource type="Script" uid="uid://cqk3cp4t6sg1l" path="res://src/camera/camera_mount/camera_mount.gd" id="2_7uvid"] +[ext_resource type="Script" uid="uid://fhu1ep8ym4ch" path="res://src/scenes/player/player_movement.gd" id="2_300um"] +[ext_resource type="Script" uid="uid://y6hg3gyagmjh" path="res://src/scenes/player/look_forward_modifier.gd" id="2_hfvys"] +[ext_resource type="Script" uid="uid://tf0b0xiedgvx" path="res://src/scenes/player/visuals_controller.gd" id="4_2fh3g"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_4kq8i"] radius = 0.4 @@ -2520,12 +2519,12 @@ tracks/52/keys = PackedFloat32Array(0, 1, 0.322708, 0.0317076, 0.0133996, 0.9458 [sub_resource type="AnimationLibrary" id="AnimationLibrary_2wvud"] _data = { -"Idle": SubResource("Animation_a3rqt"), -"Idle-Aim": SubResource("Animation_sofl1"), -"Idle-riffle": SubResource("Animation_kkfil"), -"T-Pose": SubResource("Animation_hgsh1"), -"Walk": SubResource("Animation_8uvhg"), -"Walk-aim": SubResource("Animation_pdbxf") +&"Idle": SubResource("Animation_a3rqt"), +&"Idle-Aim": SubResource("Animation_sofl1"), +&"Idle-riffle": SubResource("Animation_kkfil"), +&"T-Pose": SubResource("Animation_hgsh1"), +&"Walk": SubResource("Animation_8uvhg"), +&"Walk-aim": SubResource("Animation_pdbxf") } [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_1p8eg"] @@ -2960,8 +2959,8 @@ bones/5/name = "mixamorig_Head" bones/5/parent = 4 bones/5/rest = Transform3D(1, -2.18268e-11, 3.38872e-13, 2.18268e-11, 1, 1.21453e-08, -3.38873e-13, -1.21453e-08, 1, 2.56128e-08, 0.103218, 0.0314243) bones/5/enabled = true -bones/5/position = Vector3(2.56128e-08, 0.103218, 0.0314243) -bones/5/rotation = Quaternion(-0.0401185, 0.192201, 0.0901439, 0.976383) +bones/5/position = Vector3(2.98023e-08, 0.103218, 0.0314242) +bones/5/rotation = Quaternion(-0.0646294, -0.538836, 0.838791, -0.0436805) bones/5/scale = Vector3(1, 1, 1) bones/6/name = "mixamorig_HeadTop_End" bones/6/parent = 5 @@ -3415,36 +3414,13 @@ use_magnet = true target_node = NodePath("../../../../Weapon/Ak-47/SecondHand") max_iterations = 1 -[node name="AimingModifier" type="SkeletonModifier3D" parent="VisualsController/Model/Armature/Skeleton3D" node_paths=PackedStringArray("look_raycast", "aim_raycast")] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) -rotation_edit_mode = 0 -rotation_order = 2 -top_level = false -visible = true -visibility_parent = NodePath("") -active = true -influence = 1.0 -script = ExtResource("5_tq4qn") -look_raycast = NodePath("../../../../Camera/CameraMount/Camera3D/RayCast3D") -aim_raycast = NodePath("../../../../Weapon/Ak-47/RayCast3D") -bone = "mixamorig_RightHand" - [node name="AnimationPlayer" type="AnimationPlayer" parent="VisualsController/Model"] libraries = { -"": SubResource("AnimationLibrary_2wvud") +&"": SubResource("AnimationLibrary_2wvud") } [node name="Weapon" type="BoneAttachment3D" parent="VisualsController"] -transform = Transform3D(0.101862, -0.0272939, -0.994333, 0.989693, 0.103634, 0.0985435, 0.100361, -0.994155, 0.0375691, 0.143142, 1.33176, -0.191155) +transform = Transform3D(0.101862, -0.0272939, -0.994332, 0.989693, 0.103634, 0.098543, 0.100361, -0.994155, 0.037569, 0.143142, 1.33176, -0.191155) bone_name = "mixamorig_RightHand" bone_idx = 34 use_external_skeleton = true @@ -3537,7 +3513,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.156969, -0.0748217, 0) transform = Transform3D(-0.959214, -0.192555, -0.206956, -0.229, 0.958549, 0.169536, 0.165733, 0.210014, -0.963549, 0.172895, -0.00541341, 0) [node name="Camera" type="BoneAttachment3D" parent="VisualsController"] -transform = Transform3D(-0.999897, 2.67456e-05, -0.00528199, 5.98338e-08, 0.999959, 0.00511428, 0.00528123, 0.00511428, -0.999887, 0.0645054, 1.5075, -0.0727707) +transform = Transform3D(-0.999896, 2.67307e-05, -0.00528184, 2.30838e-10, 0.999959, 0.00511401, 0.00528105, 0.00511401, -0.999887, 0.0645052, 1.5075, -0.0727705) bone_name = "mixamorig_Head" bone_idx = 5 use_external_skeleton = true diff --git a/godot/src/scenes/player/player_controller/player_controller.gd.uid b/godot/src/scenes/player/player_controller/player_controller.gd.uid new file mode 100644 index 0000000..fcffb6e --- /dev/null +++ b/godot/src/scenes/player/player_controller/player_controller.gd.uid @@ -0,0 +1 @@ +uid://kcn87ot2iyjp diff --git a/godot/src/scenes/player/player_controller/player_controller.tscn b/godot/src/scenes/player/player_controller/player_controller.tscn index 0f390cd..c788be7 100644 --- a/godot/src/scenes/player/player_controller/player_controller.tscn +++ b/godot/src/scenes/player/player_controller/player_controller.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://bcxt4cnuh8u0g"] [ext_resource type="PackedScene" uid="uid://mv5nlhvdh14v" path="res://src/scenes/player/character/character.tscn" id="1_1fx4c"] -[ext_resource type="Script" path="res://src/scenes/player/player_controller/player_controller.gd" id="1_v31xn"] +[ext_resource type="Script" uid="uid://kcn87ot2iyjp" path="res://src/scenes/player/player_controller/player_controller.gd" id="1_v31xn"] [ext_resource type="PackedScene" uid="uid://bg24niws4pbnj" path="res://src/camera/camera_mount/camera_mount.tscn" id="2_csswn"] [node name="PlayerController" type="Node3D"] diff --git a/godot/src/scenes/player/player_movement.gd.uid b/godot/src/scenes/player/player_movement.gd.uid new file mode 100644 index 0000000..f8cc892 --- /dev/null +++ b/godot/src/scenes/player/player_movement.gd.uid @@ -0,0 +1 @@ +uid://fhu1ep8ym4ch diff --git a/godot/src/scenes/player/server_side_character/server_side_character.gd.uid b/godot/src/scenes/player/server_side_character/server_side_character.gd.uid new file mode 100644 index 0000000..2e4e674 --- /dev/null +++ b/godot/src/scenes/player/server_side_character/server_side_character.gd.uid @@ -0,0 +1 @@ +uid://3qcseqtc6hsf diff --git a/godot/src/scenes/player/server_side_character/server_side_character.tscn b/godot/src/scenes/player/server_side_character/server_side_character.tscn index 1ce601d..4ac63bd 100644 --- a/godot/src/scenes/player/server_side_character/server_side_character.tscn +++ b/godot/src/scenes/player/server_side_character/server_side_character.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://di0necvyvluy7"] [ext_resource type="PackedScene" uid="uid://mv5nlhvdh14v" path="res://src/scenes/player/character/character.tscn" id="1_n6me3"] -[ext_resource type="Script" path="res://src/scenes/player/server_side_character/server_side_character.gd" id="1_vm82e"] +[ext_resource type="Script" uid="uid://3qcseqtc6hsf" path="res://src/scenes/player/server_side_character/server_side_character.gd" id="1_vm82e"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5dqvb"] albedo_color = Color(1, 0, 1, 1) diff --git a/godot/src/scenes/player/visuals_controller.gd.uid b/godot/src/scenes/player/visuals_controller.gd.uid new file mode 100644 index 0000000..8ca532a --- /dev/null +++ b/godot/src/scenes/player/visuals_controller.gd.uid @@ -0,0 +1 @@ +uid://tf0b0xiedgvx diff --git a/godot/src/scripts/get_all_bones_positions.gd.uid b/godot/src/scripts/get_all_bones_positions.gd.uid new file mode 100644 index 0000000..61e8fad --- /dev/null +++ b/godot/src/scripts/get_all_bones_positions.gd.uid @@ -0,0 +1 @@ +uid://bt4tkvh35dqha diff --git a/godot/src/server/server.gd.uid b/godot/src/server/server.gd.uid new file mode 100644 index 0000000..5bad0bf --- /dev/null +++ b/godot/src/server/server.gd.uid @@ -0,0 +1 @@ +uid://d22agydn818xm diff --git a/godot/src/server/server.tscn b/godot/src/server/server.tscn index c1c296c..cfd504b 100644 --- a/godot/src/server/server.tscn +++ b/godot/src/server/server.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://dkvbrav2sgs7m"] -[ext_resource type="Script" path="res://src/server/server.gd" id="1_53ixn"] +[ext_resource type="Script" uid="uid://d22agydn818xm" path="res://src/server/server.gd" id="1_53ixn"] [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_mmx2d"] properties/0/path = NodePath(".:staring_map") diff --git a/godot/src/utils/consts.gd.uid b/godot/src/utils/consts.gd.uid new file mode 100644 index 0000000..3d0bc7d --- /dev/null +++ b/godot/src/utils/consts.gd.uid @@ -0,0 +1 @@ +uid://3ep4n2h50dm0 diff --git a/godot/src/utils/functions.gd.uid b/godot/src/utils/functions.gd.uid new file mode 100644 index 0000000..e9997cb --- /dev/null +++ b/godot/src/utils/functions.gd.uid @@ -0,0 +1 @@ +uid://dm1prplw1jgeh diff --git a/godot/src/utils/logger.gd.uid b/godot/src/utils/logger.gd.uid new file mode 100644 index 0000000..c1020a7 --- /dev/null +++ b/godot/src/utils/logger.gd.uid @@ -0,0 +1 @@ +uid://bafv2v3k44tcg