Sara/wave-survival
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: upgraded project to godot 4.6

Browse source
This commit is contained in:
Sara Gerretsen 2025-11-08 16:35:20 +01:00
parent c4bd5edb54
commit 504f3dbef0
42 changed files with 700 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
project/assets/animations/enemies/wretched/RESET.res
View file

Binary file not shown.

BIN
project/assets/animations/enemies/wretched/attack.res
View file

Binary file not shown.

BIN
project/assets/animations/enemies/wretched/ready.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/revolver/equip.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/revolver/fire_double.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/revolver/fire_single.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/revolver/idle_double.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/revolver/idle_single.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/revolver/to_single.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/RESET.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/aim.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/aim_to_hip.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/equip.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/fire_aim.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/fire_hip.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/hip.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/hip_to_aim.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/hip_to_run.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/reload.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/run.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/run_to_aim.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/run_to_hip.res
View file

Binary file not shown.

BIN
project/assets/models/base_character.blend
View file

Binary file not shown.

1
project/assets/models/base_character.blend.import
View file

@ -48,6 +48,7 @@ blender/meshes/colors=false
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false

24
project/assets/models/enemies/model_scenes/wretched.tscn
View file

@ -15,41 +15,41 @@ size = Vector3(0.24902344, 0.42858887, 0.2619629)
[sub_resource type="BoxShape3D" id="BoxShape3D_yvqru"]
size = Vector3(0.35500336, 0.107666016, 0.11816406)
[node name="wretched" instance=ExtResource("1_w0sx6")]
[node name="wretched" unique_id=1505510221 instance=ExtResource("1_w0sx6")]
[node name="Hitbox" type="Hitbox" parent="Character/Skeleton3D" index="2"]
[node name="Hitbox" type="Hitbox" parent="Character/Skeleton3D" index="2" unique_id=333008962]
transform = Transform3D(1, 2.1910389e-16, -2.2202524e-16, -2.2202514e-16, 0.9999124, -0.013243958, 2.1910394e-16, 0.01324396, 0.9999123, 6.209e-17, 0.097789526, 0.004007945)
collision_layer = 6
collision_mask = 0
monitoring = false
impact_effect = ExtResource("2_a12c4")
[node name="CollisionShape3D2" type="CollisionShape3D" parent="Character/Skeleton3D/Hitbox" index="0"]
[node name="CollisionShape3D2" type="CollisionShape3D" parent="Character/Skeleton3D/Hitbox" index="0" unique_id=602827216]
transform = Transform3D(1, 6.5504433e-21, 0, 6.2038546e-25, 1.0000037, 0, 0, 0, 1.0000037, -2.2362435e-16, 0.35283393, -0.013339132)
shape = SubResource("BoxShape3D_w0sx6")
[node name="SpineAttach" type="BoneAttachment3D" parent="Character/Skeleton3D" index="3"]
[node name="SpineAttach" type="BoneAttachment3D" parent="Character/Skeleton3D" index="3" unique_id=1651916591]
transform = Transform3D(1, -2.2202518e-16, 2.1910394e-16, 2.1910388e-16, 0.9999122, 0.013243958, -2.220252e-16, -0.01324396, 0.99991226, -4.1256417e-17, 1.1546816, -0.0027124756)
bone_name = "spine.002"
bone_idx = 3
[node name="Hitbox" type="Hitbox" parent="Character/Skeleton3D/SpineAttach" index="0"]
[node name="Hitbox" type="Hitbox" parent="Character/Skeleton3D/SpineAttach" index="0" unique_id=1070250681]
transform = Transform3D(1, 2.1910389e-16, -2.2202524e-16, -2.2202514e-16, 0.9999124, -0.013243958, 2.1910394e-16, 0.01324396, 0.9999123, -2.1234107e-16, -1.1546164, -0.012580322)
collision_layer = 4
collision_mask = 0
monitoring = false
impact_effect = ExtResource("2_a12c4")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Character/Skeleton3D/SpineAttach/Hitbox" index="0"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Character/Skeleton3D/SpineAttach/Hitbox" index="0" unique_id=1643914600]
transform = Transform3D(1, -2.2202515e-16, 2.1910396e-16, 2.1910385e-16, 0.9999122, 0.0132439565, -2.2202522e-16, -0.013243958, 0.99991226, 0.0023498535, 1.1967317, -0.0032694251)
shape = SubResource("BoxShape3D_a12c4")
[node name="HeadAttach" type="BoneAttachment3D" parent="Character/Skeleton3D" index="4"]
[node name="HeadAttach" type="BoneAttachment3D" parent="Character/Skeleton3D" index="4" unique_id=1057907260]
transform = Transform3D(0.9999988, -0.0007823897, 0.0013344375, 0.0007271601, 0.99916273, 0.04089782, -0.0013653187, -0.040896803, 0.9991622, -1.3069549e-16, 1.5574794, -0.004068734)
bone_name = "Neck"
bone_idx = 5
[node name="Hitbox" type="Hitbox" parent="Character/Skeleton3D/HeadAttach" index="0"]
[node name="Hitbox" type="Hitbox" parent="Character/Skeleton3D/HeadAttach" index="0" unique_id=1188667481]
transform = Transform3D(1, 2.1910389e-16, -2.2202524e-16, -2.2202514e-16, 0.9999124, -0.013243958, 2.1910394e-16, 0.01324396, 0.9999123, -2.1234107e-16, -1.1546164, -0.012580322)
collision_layer = 4
collision_mask = 0
@ -57,22 +57,22 @@ monitoring = false
damage_modifier = 2.0
impact_effect = ExtResource("2_a12c4")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Character/Skeleton3D/HeadAttach/Hitbox" index="0"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Character/Skeleton3D/HeadAttach/Hitbox" index="0" unique_id=1923399941]
transform = Transform3D(1, -2.2202515e-16, 2.1910393e-16, 2.1910723e-16, 0.9999161, 0.013243863, -2.2202641e-16, -0.013243858, 0.9999161, -7.644832e-17, 1.3035276, -0.01432839)
shape = SubResource("BoxShape3D_2le77")
[node name="BoneAttachment3D" type="BoneAttachment3D" parent="Character/Skeleton3D" index="5"]
[node name="BoneAttachment3D" type="BoneAttachment3D" parent="Character/Skeleton3D" index="5" unique_id=2139322499]
transform = Transform3D(0.10797773, -0.79005337, 0.60345376, 0.4003794, 0.5901581, 0.70100564, -0.9099653, 0.16591746, 0.38004512, 0.28507733, 1.5014915, -0.21731633)
bone_name = "hand.R"
bone_idx = 9
[node name="DamageBox" type="DamageBox" parent="Character/Skeleton3D/BoneAttachment3D" index="0"]
[node name="DamageBox" type="DamageBox" parent="Character/Skeleton3D/BoneAttachment3D" index="0" unique_id=51031781]
transform = Transform3D(0.8168715, 0.42058483, 0.39475223, -0.47940335, 0.87559944, 0.059143633, -0.32076997, -0.2375583, 0.91688204, -0.0065350886, 0.06456717, -0.0151789)
collision_layer = 0
collision_mask = 8
monitoring = false
monitorable = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="Character/Skeleton3D/BoneAttachment3D/DamageBox" index="0"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Character/Skeleton3D/BoneAttachment3D/DamageBox" index="0" unique_id=1793068779]
transform = Transform3D(1, -1.1175919e-06, -1.7881156e-06, 1.1175778e-06, 1, -7.912447e-06, 1.7881245e-06, 7.912445e-06, 1, -0.20445287, -3.5762787e-07, -2.682209e-07)
shape = SubResource("BoxShape3D_yvqru")

1
project/assets/models/enemies/rifleman.blend.import
View file

@ -48,6 +48,7 @@ blender/meshes/colors=false
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false

1
project/assets/models/enemies/wretched.blend.import
View file

@ -6219,6 +6219,7 @@ blender/meshes/colors=false
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false

BIN
project/assets/models/weapons/revolver.blend
View file

Binary file not shown.

1
project/assets/models/weapons/revolver.blend.import
View file

@ -12404,6 +12404,7 @@ blender/meshes/colors=false
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false

BIN
project/assets/models/weapons/revolver.blend1
View file

Binary file not shown.

1
project/assets/models/weapons/rifle.blend.import
View file

@ -26796,6 +26796,7 @@ blender/meshes/colors=false
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false