badhouseplants/killbox
4
0
Fork 0
Code Issues1 Pull Requests2 Actions Packages Projects Releases Activity

Update to godot 4

Browse Source
This commit is contained in:
Nikolai Rodionov 2025-03-04 09:16:05 +01:00
parent 760a7b9f53
commit 0215dcbb13
Signed by: allanger
GPG Key ID: 09F8B434D0FDD99B
53 changed files with 88 additions and 89 deletions

BIN
godot/assets/models/characters/hands.glb.import (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/characters/legs.glb.import (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/characters/model.glb.import (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/characters/y-bot.glb.import (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/low_poly_weapon/M9_Bayonet.glb.import (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/low_poly_weapon/low-poly_ak-47.glb.import (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/low_poly_weapon/low-poly_cz_bren_2_ms_5.56_11.glb.import (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/low_poly_weapon/low-poly_desert-eagle_vii_.50_ae_black.glb.import (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/low_poly_weapon/low-poly_hk416a8.glb.import (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/low_poly_weapon/low-poly_imi_uzi.glb.import (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/low_poly_weapon/low-poly_kriss_vector.glb.import (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/low_poly_weapon/low-poly_m1_garand.glb.import (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/low_poly_weapon/low-poly_rgd-5.glb.import (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/low_poly_weapon/low-poly_sa-58_osw.glb.import (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/low_poly_weapon/low-poly_sjogren_inertia.glb.import (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/maps/lowpoly_map/map.glb.import (Stored with Git LFS)

Binary file not shown.

2
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]

1
godot/rust_bindings.gdextension.uid Normal file

@ -0,0 +1 @@
uid://c0ak3db6x0f1o

1
godot/shaders/border.gdshader.uid Normal file

@ -0,0 +1 @@
uid://dy8b6ptkovv57

1
godot/src/camera/camera_mount/camera_mount.gd.uid Normal file

@ -0,0 +1 @@
uid://cqk3cp4t6sg1l

2
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")

1
godot/src/camera/client_connector/client_connector.gd.uid Normal file

@ -0,0 +1 @@
uid://b4tuqc7udn0qi

2
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")

1
godot/src/entrypoint.gd.uid Normal file

@ -0,0 +1 @@
uid://t0xcpgd86rr2

2
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"]

1
godot/src/interfaces/main_menu/main_menu.gd.uid Normal file

@ -0,0 +1 @@
uid://bktyry7eyj57h

2
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"]

6
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"]

1
godot/src/scenes/levels/base/client_space/client_space.gd.uid Normal file

@ -0,0 +1 @@
uid://crwitdk7hki3j

2
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"]

1
godot/src/scenes/levels/base/map_controller.gd.uid Normal file

@ -0,0 +1 @@
uid://ktwwe7d42vku

1
godot/src/scenes/levels/base/player_model_space/player_model_space.gd.uid Normal file

@ -0,0 +1 @@
uid://dvml7okm4nxrd

2
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")

1
godot/src/scenes/levels/base/spawn_controller.gd.uid Normal file

@ -0,0 +1 @@
uid://hblvq6s178co

4
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"

1
godot/src/scenes/player/aiming_modifier.gd.uid Normal file

@ -0,0 +1 @@
uid://bbnh6vbh5cvtq

1
godot/src/scenes/player/body_follows_head_modifier.gd.uid Normal file

@ -0,0 +1 @@
uid://cw8151er1e54y

1
godot/src/scenes/player/look_forward_modifier.gd.uid Normal file

@ -0,0 +1 @@
uid://y6hg3gyagmjh

2
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:

1
godot/src/scenes/player/player.gd.uid Normal file

@ -0,0 +1 @@
uid://db5kuorgtnsmg

58
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

1
godot/src/scenes/player/player_controller/player_controller.gd.uid Normal file

@ -0,0 +1 @@
uid://kcn87ot2iyjp

2
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"]

1
godot/src/scenes/player/player_movement.gd.uid Normal file

@ -0,0 +1 @@
uid://fhu1ep8ym4ch

1
godot/src/scenes/player/server_side_character/server_side_character.gd.uid Normal file

@ -0,0 +1 @@
uid://3qcseqtc6hsf

2
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)

1
godot/src/scenes/player/visuals_controller.gd.uid Normal file

@ -0,0 +1 @@
uid://tf0b0xiedgvx

1
godot/src/scripts/get_all_bones_positions.gd.uid Normal file

@ -0,0 +1 @@
uid://bt4tkvh35dqha

1
godot/src/server/server.gd.uid Normal file

@ -0,0 +1 @@
uid://d22agydn818xm

2
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")

1
godot/src/utils/consts.gd.uid Normal file

@ -0,0 +1 @@
uid://3ep4n2h50dm0

1
godot/src/utils/functions.gd.uid Normal file

@ -0,0 +1 @@
uid://dm1prplw1jgeh

1
godot/src/utils/logger.gd.uid Normal file

@ -0,0 +1 @@
uid://bafv2v3k44tcg