Bläddra i källkod

Update various resources to 4.0 format (#161)

- Fix some warnings.
- Add in missing audio.
Clay John 2 år sedan
förälder
incheckning
2beb6c4587
64 ändrade filer med 404 tillägg och 325 borttagningar
  1. 1 1
      door/model/door.blend.import
  2. 1 1
      door/model/door.dae.import
  3. 1 1
      effects_shared/BlastMesh.glb.import
  4. 1 1
      enemies/red_robot/laser/BarrelSmoke.blend.import
  5. 1 1
      enemies/red_robot/laser/BarrelSmoke.glb.import
  6. BIN
      enemies/red_robot/laser/BarrelSmoke_Plane.mesh
  7. BIN
      enemies/red_robot/laser/circle.mesh
  8. 1 1
      enemies/red_robot/laser/impact_effect/LightRaysMesh.glb.import
  9. 1 1
      enemies/red_robot/laser/impact_effect/lightray.blend.import
  10. 1 1
      enemies/red_robot/model/red_robot.blend.import
  11. 1 1
      enemies/red_robot/parts/part_head.glb.import
  12. 1 1
      enemies/red_robot/parts/part_shield.glb.import
  13. 1 1
      enemies/red_robot/parts/ray.glb.import
  14. 7 6
      enemies/red_robot/parts/sparks_effect/SparkMaterial.tres
  15. 1 1
      enemies/red_robot/parts/sparks_effect/SparkParticle.glb.import
  16. BIN
      enemies/red_robot/parts/sparks_effect/SparkParticle_Sphere.mesh
  17. 1 1
      enemies/red_robot/parts/sparks_effect/SparksParticle.blend.import
  18. 36 39
      enemies/red_robot/red_robot.tscn
  19. 1 1
      icon.png.import
  20. 1 1
      level/forklift/flying_forklift.blend.import
  21. 1 1
      level/forklift/flying_forklift.glb.import
  22. 79 0
      level/geometry/models/Test-emitter-mat.tres
  23. 1 1
      level/geometry/models/core.blend.import
  24. 1 1
      level/geometry/models/core.glb.import
  25. 1 1
      level/geometry/models/lights.blend.import
  26. 1 1
      level/geometry/models/lights.glb.import
  27. 1 1
      level/geometry/models/props.blend.import
  28. 1 1
      level/geometry/models/props.glb.import
  29. 9 14
      level/geometry/models/reactor_emitter.tres
  30. 11 17
      level/geometry/models/scifi_car.tres
  31. 4 5
      level/geometry/models/scifi_car_glass.tres
  32. 1 1
      level/geometry/models/structure.blend.import
  33. 1 1
      level/geometry/models/structure.glb.import
  34. 2 2
      level/geometry/scenes/lights.tscn
  35. 2 2
      level/level.gd
  36. 1 1
      level/level.tscn
  37. 1 1
      level/textures/props/container1_albedo.png.import
  38. 1 1
      level/textures/props/container1_normal.png.import
  39. 1 1
      level/textures/props/container1_orm.png.import
  40. 1 1
      level/textures/structure/Core/CoreOutLight.blend.import
  41. 1 1
      level/textures/structure/Core/CoreOutLight.glb.import
  42. BIN
      level/textures/structure/Core/CoreOutLight_Circle.mesh
  43. BIN
      level/textures/structure/Core/CoreOutLight_Circle001.mesh
  44. BIN
      level/textures/structure/Core/CoreOutLight_OuterRim.mesh
  45. BIN
      level/textures/structure/Core/CoreOutLight_Sphere.mesh
  46. 1 1
      level/textures/structure/tile_tech_panels_color_normal.png.import
  47. 1 1
      menu/button_play.png.import
  48. 1 1
      menu/button_play_hover.png.import
  49. 1 1
      menu/button_quit.png.import
  50. 1 1
      menu/button_quit_hover.png.import
  51. 1 1
      menu/button_settings.png.import
  52. 1 1
      menu/button_settings_hover.png.import
  53. 1 1
      menu/menu.gd
  54. 65 59
      menu/menu.tscn
  55. 1 1
      menu/settings.gd
  56. 1 1
      menu/tps_demo.png.import
  57. 5 5
      player/audio/step_random_pitch.tres
  58. 1 1
      player/bullet/effect/FlareStraight.png.import
  59. 1 1
      player/crosshair.png.import
  60. 1 1
      player/model/muzzle_flash_particle_mesh.glb.import
  61. 1 1
      player/model/player.blend.import
  62. 1 1
      player/model/player.glb.import
  63. 134 131
      player/player.tscn
  64. 5 0
      project.godot

+ 1 - 1
door/model/door.blend.import

@@ -29,7 +29,7 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1
 blender/nodes/visible=0
 blender/nodes/visible=0
 blender/nodes/punctual_lights=true
 blender/nodes/punctual_lights=true
 blender/nodes/cameras=true
 blender/nodes/cameras=true

+ 1 - 1
door/model/door.dae.import

@@ -40,4 +40,4 @@ _subresources={
 }
 }
 }
 }
 }
 }
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

+ 1 - 1
effects_shared/BlastMesh.glb.import

@@ -29,4 +29,4 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

+ 1 - 1
enemies/red_robot/laser/BarrelSmoke.blend.import

@@ -29,7 +29,7 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1
 blender/nodes/visible=0
 blender/nodes/visible=0
 blender/nodes/punctual_lights=true
 blender/nodes/punctual_lights=true
 blender/nodes/cameras=true
 blender/nodes/cameras=true

+ 1 - 1
enemies/red_robot/laser/BarrelSmoke.glb.import

@@ -29,4 +29,4 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

BIN
enemies/red_robot/laser/BarrelSmoke_Plane.mesh


BIN
enemies/red_robot/laser/circle.mesh


+ 1 - 1
enemies/red_robot/laser/impact_effect/LightRaysMesh.glb.import

@@ -29,4 +29,4 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

+ 1 - 1
enemies/red_robot/laser/impact_effect/lightray.blend.import

@@ -29,7 +29,7 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1
 blender/nodes/visible=0
 blender/nodes/visible=0
 blender/nodes/punctual_lights=true
 blender/nodes/punctual_lights=true
 blender/nodes/cameras=true
 blender/nodes/cameras=true

+ 1 - 1
enemies/red_robot/model/red_robot.blend.import

@@ -40,7 +40,7 @@ _subresources={
 }
 }
 }
 }
 }
 }
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1
 blender/nodes/visible=0
 blender/nodes/visible=0
 blender/nodes/punctual_lights=true
 blender/nodes/punctual_lights=true
 blender/nodes/cameras=true
 blender/nodes/cameras=true

+ 1 - 1
enemies/red_robot/parts/part_head.glb.import

@@ -36,4 +36,4 @@ _subresources={
 }
 }
 }
 }
 }
 }
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

+ 1 - 1
enemies/red_robot/parts/part_shield.glb.import

@@ -36,4 +36,4 @@ _subresources={
 }
 }
 }
 }
 }
 }
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

+ 1 - 1
enemies/red_robot/parts/ray.glb.import

@@ -29,4 +29,4 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

+ 7 - 6
enemies/red_robot/parts/sparks_effect/SparkMaterial.tres

@@ -1,9 +1,10 @@
-[gd_resource type="ShaderMaterial" load_steps=3 format=2]
+[gd_resource type="ShaderMaterial" load_steps=3 format=3 uid="uid://b0yi1uf4xb6ex"]
 
 
-[ext_resource path="res://enemies/red_robot/parts/sparks_effect/SparkTexture.png" type="Texture2D" id=1]
-[ext_resource path="res://enemies/red_robot/parts/sparks_effect/SparkShader.gdshader" type="Shader" id=2]
+[ext_resource type="Texture2D" uid="uid://ic4gy2igsmd4" path="res://enemies/red_robot/parts/sparks_effect/SparkTexture.png" id="1"]
+[ext_resource type="Shader" path="res://enemies/red_robot/parts/sparks_effect/SparkShader.gdshader" id="2"]
 
 
 [resource]
 [resource]
-shader = ExtResource( 2 )
-shader_param/emission_factor = 3.0
-shader_param/alpha_texture = ExtResource( 1 )
+render_priority = 0
+shader = ExtResource("2")
+shader_parameter/emission_factor = 3.0
+shader_parameter/alpha_texture = ExtResource("1")

+ 1 - 1
enemies/red_robot/parts/sparks_effect/SparkParticle.glb.import

@@ -29,4 +29,4 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

BIN
enemies/red_robot/parts/sparks_effect/SparkParticle_Sphere.mesh


+ 1 - 1
enemies/red_robot/parts/sparks_effect/SparksParticle.blend.import

@@ -29,7 +29,7 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1
 blender/nodes/visible=0
 blender/nodes/visible=0
 blender/nodes/punctual_lights=true
 blender/nodes/punctual_lights=true
 blender/nodes/cameras=true
 blender/nodes/cameras=true

+ 36 - 39
enemies/red_robot/red_robot.tscn

@@ -2,18 +2,18 @@
 
 
 [ext_resource type="Script" path="res://enemies/red_robot/red_robot.gd" id="1"]
 [ext_resource type="Script" path="res://enemies/red_robot/red_robot.gd" id="1"]
 [ext_resource type="PackedScene" uid="uid://cmy0u0gubi0bw" path="res://enemies/red_robot/model/red_robot.glb" id="2_g6060"]
 [ext_resource type="PackedScene" uid="uid://cmy0u0gubi0bw" path="res://enemies/red_robot/model/red_robot.glb" id="2_g6060"]
-[ext_resource type="ArrayMesh" path="res://enemies/red_robot/laser/circle.mesh" id="3_53w75"]
+[ext_resource type="ArrayMesh" uid="uid://b5a08lep8yhf1" path="res://enemies/red_robot/laser/circle.mesh" id="3_53w75"]
 [ext_resource type="Material" uid="uid://cfq45e1sfaycm" path="res://enemies/red_robot/laser/LaserMaterial.tres" id="4_6f0x2"]
 [ext_resource type="Material" uid="uid://cfq45e1sfaycm" path="res://enemies/red_robot/laser/LaserMaterial.tres" id="4_6f0x2"]
 [ext_resource type="ArrayMesh" uid="uid://mku55kdo1248" path="res://enemies/red_robot/laser/raymesh.mesh" id="5_knbdw"]
 [ext_resource type="ArrayMesh" uid="uid://mku55kdo1248" path="res://enemies/red_robot/laser/raymesh.mesh" id="5_knbdw"]
 [ext_resource type="Shader" path="res://enemies/red_robot/laser/LaserShader.gdshader" id="6_qwdci"]
 [ext_resource type="Shader" path="res://enemies/red_robot/laser/LaserShader.gdshader" id="6_qwdci"]
 [ext_resource type="Material" uid="uid://yxudvmlt7e3h" path="res://enemies/red_robot/laser/impact_effect/EmissionEmbers.tres" id="6_xf2ir"]
 [ext_resource type="Material" uid="uid://yxudvmlt7e3h" path="res://enemies/red_robot/laser/impact_effect/EmissionEmbers.tres" id="6_xf2ir"]
 [ext_resource type="Texture2D" uid="uid://cp4djbb113s3h" path="res://enemies/red_robot/laser/LaserBodyNoise.tres" id="7_dlm32"]
 [ext_resource type="Texture2D" uid="uid://cp4djbb113s3h" path="res://enemies/red_robot/laser/LaserBodyNoise.tres" id="7_dlm32"]
 [ext_resource type="Material" uid="uid://b2atvw0yire0x" path="res://enemies/red_robot/laser/EmberTrailCutoff.tres" id="7_nxdkr"]
 [ext_resource type="Material" uid="uid://b2atvw0yire0x" path="res://enemies/red_robot/laser/EmberTrailCutoff.tres" id="7_nxdkr"]
-[ext_resource type="Material" path="res://enemies/red_robot/parts/sparks_effect/SparkMaterial.tres" id="8"]
+[ext_resource type="Material" uid="uid://b0yi1uf4xb6ex" path="res://enemies/red_robot/parts/sparks_effect/SparkMaterial.tres" id="8"]
 [ext_resource type="Gradient" path="res://enemies/red_robot/laser/EmbersColorOverLife.tres" id="8_8q6ei"]
 [ext_resource type="Gradient" path="res://enemies/red_robot/laser/EmbersColorOverLife.tres" id="8_8q6ei"]
 [ext_resource type="AudioStream" uid="uid://bfewuxtmeylhc" path="res://enemies/red_robot/audio/charge.wav" id="9"]
 [ext_resource type="AudioStream" uid="uid://bfewuxtmeylhc" path="res://enemies/red_robot/audio/charge.wav" id="9"]
 [ext_resource type="Material" uid="uid://cqxcjajjrcqvk" path="res://enemies/red_robot/laser/LaserCenter.material" id="9_2boaq"]
 [ext_resource type="Material" uid="uid://cqxcjajjrcqvk" path="res://enemies/red_robot/laser/LaserCenter.material" id="9_2boaq"]
-[ext_resource type="ArrayMesh" path="res://enemies/red_robot/laser/BarrelSmoke_Plane.mesh" id="9_l7o07"]
+[ext_resource type="ArrayMesh" uid="uid://bcvohx7obe6ar" path="res://enemies/red_robot/laser/BarrelSmoke_Plane.mesh" id="9_l7o07"]
 [ext_resource type="AudioStream" uid="uid://vld48oqn441w" path="res://enemies/red_robot/audio/shoot.wav" id="10"]
 [ext_resource type="AudioStream" uid="uid://vld48oqn441w" path="res://enemies/red_robot/audio/shoot.wav" id="10"]
 [ext_resource type="Material" uid="uid://bhf6kwdlc7f5h" path="res://enemies/red_robot/laser/smoke.tres" id="10_bkww7"]
 [ext_resource type="Material" uid="uid://bhf6kwdlc7f5h" path="res://enemies/red_robot/laser/smoke.tres" id="10_bkww7"]
 [ext_resource type="PackedScene" uid="uid://biuwx526bcnen" path="res://enemies/red_robot/parts/part_head.glb" id="11"]
 [ext_resource type="PackedScene" uid="uid://biuwx526bcnen" path="res://enemies/red_robot/parts/part_head.glb" id="11"]
@@ -21,7 +21,7 @@
 [ext_resource type="AudioStream" uid="uid://bmmpsboaqxy4s" path="res://enemies/red_robot/audio/explosion.wav" id="17"]
 [ext_resource type="AudioStream" uid="uid://bmmpsboaqxy4s" path="res://enemies/red_robot/audio/explosion.wav" id="17"]
 [ext_resource type="AudioStream" uid="uid://h53v0p3a82ki" path="res://enemies/red_robot/audio/walk.wav" id="19"]
 [ext_resource type="AudioStream" uid="uid://h53v0p3a82ki" path="res://enemies/red_robot/audio/walk.wav" id="19"]
 [ext_resource type="AudioStream" uid="uid://iodygamtcovk" path="res://enemies/red_robot/audio/hit.wav" id="20_d1jht"]
 [ext_resource type="AudioStream" uid="uid://iodygamtcovk" path="res://enemies/red_robot/audio/hit.wav" id="20_d1jht"]
-[ext_resource type="ArrayMesh" path="res://enemies/red_robot/parts/sparks_effect/SparkParticle_Sphere.mesh" id="22"]
+[ext_resource type="ArrayMesh" uid="uid://cna0fa1wdq56d" path="res://enemies/red_robot/parts/sparks_effect/SparkParticle_Sphere.mesh" id="22"]
 [ext_resource type="Script" path="res://enemies/red_robot/parts/part.gd" id="24"]
 [ext_resource type="Script" path="res://enemies/red_robot/parts/part.gd" id="24"]
 
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_p5m1n"]
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_p5m1n"]
@@ -566,58 +566,55 @@ script = ExtResource("1")
 [node name="RedRobotModel" parent="." instance=ExtResource("2_g6060")]
 [node name="RedRobotModel" parent="." instance=ExtResource("2_g6060")]
 
 
 [node name="Skeleton3D" parent="RedRobotModel/Armature" index="0"]
 [node name="Skeleton3D" parent="RedRobotModel/Armature" index="0"]
-bones/2/position = Vector3(0.0013105, 1.19949, -0.0713953)
-bones/2/rotation = Quaternion(0.0396912, 0.232813, 0.00612397, 0.971692)
+bones/2/position = Vector3(0, 1.20114, -0.00472171)
+bones/2/rotation = Quaternion(-0.00153308, 0.031529, 0.0319448, 0.998991)
 bones/3/rotation = Quaternion(-0.499911, -0.499911, -0.500089, 0.500089)
 bones/3/rotation = Quaternion(-0.499911, -0.499911, -0.500089, 0.500089)
-bones/4/rotation = Quaternion(-0.334471, 0.244433, -0.699875, 0.581857)
-bones/5/rotation = Quaternion(7.10889e-05, 0.999996, 0.00151694, -0.00236781)
-bones/7/rotation = Quaternion(-0.109166, -0.00113482, -0.023015, 0.993756)
-bones/8/rotation = Quaternion(-0.0588085, -0.00164204, -0.0333024, 0.997712)
+bones/4/rotation = Quaternion(-0.469672, 0.468593, -0.534448, 0.523635)
+bones/5/rotation = Quaternion(-0.00748047, 0.942303, 0.334674, 0.00133683)
+bones/7/rotation = Quaternion(-0.0944425, 0.000782496, 0.0158717, 0.995404)
+bones/8/rotation = Quaternion(-0.0841591, 0.000742766, 0.0150659, 0.996338)
 bones/9/rotation = Quaternion(-0.499911, 0.499911, 0.500089, 0.500089)
 bones/9/rotation = Quaternion(-0.499911, 0.499911, 0.500089, 0.500089)
-bones/10/rotation = Quaternion(-0.248222, -0.536451, 0.450958, 0.668763)
-bones/11/rotation = Quaternion(-0.286108, 0.796875, 0.193802, -0.495553)
+bones/10/rotation = Quaternion(-0.252246, -0.213129, 0.643569, 0.690483)
+bones/11/rotation = Quaternion(-0.00158411, 0.869403, 0.00101085, -0.4941)
 bones/12/rotation = Quaternion(-1.85752e-07, -0.461677, 0.887048, -3.48556e-08)
 bones/12/rotation = Quaternion(-1.85752e-07, -0.461677, 0.887048, -3.48556e-08)
-bones/13/rotation = Quaternion(-0.0178925, -0.00309368, -0.0627477, 0.997864)
-bones/14/rotation = Quaternion(-0.106521, -0.00102886, -0.0208684, 0.994091)
+bones/13/rotation = Quaternion(-0.051257, 0.00060833, 0.0123369, 0.998609)
+bones/14/rotation = Quaternion(-0.0429339, 0.000646278, 0.0131067, 0.998992)
 bones/15/rotation = Quaternion(0.00118244, 0.707106, 0.707106, -0.00118238)
 bones/15/rotation = Quaternion(0.00118244, 0.707106, 0.707106, -0.00118238)
-bones/16/rotation = Quaternion(0.0487808, 4.36594e-08, -2.13228e-09, 0.99881)
-bones/18/rotation = Quaternion(-0.686434, -0.169729, -0.169729, 0.686434)
-bones/19/rotation = Quaternion(-0.384178, 0.0749691, -0.201214, 0.897942)
-bones/20/rotation = Quaternion(0.289802, -0.140504, 0.0292758, 0.946265)
-bones/21/rotation = Quaternion(-0.00776055, -0.888963, 0.457181, -0.0258994)
-bones/22/rotation = Quaternion(0.493971, -0.105185, 0.0603478, 0.86098)
-bones/23/rotation = Quaternion(-0.544635, -0.103551, -0.0125181, 0.832162)
-bones/24/rotation = Quaternion(0.147889, 0.111685, -0.0213631, 0.982445)
-bones/25/rotation = Quaternion(-0.00508712, -0.681436, 0.731806, -0.00889673)
-bones/26/rotation = Quaternion(0.408972, 0.108142, -0.0177517, 0.905943)
-bones/29/rotation = Quaternion(0.706675, 0.024693, -0.0246936, 0.706675)
-bones/30/scale = Vector3(1, 1, 1)
-bones/32/scale = Vector3(1, 1, 1)
+bones/16/rotation = Quaternion(0.0487809, 4.36594e-08, -2.13228e-09, 0.99881)
+bones/18/rotation = Quaternion(-0.701524, -0.0886801, -0.0886801, 0.701524)
+bones/19/rotation = Quaternion(-0.370928, 0.0822236, -0.0403818, 0.924133)
+bones/20/rotation = Quaternion(0.284293, -0.138594, 0.0321782, 0.948121)
+bones/21/rotation = Quaternion(-0.00390792, -0.916789, 0.398597, -0.0245612)
+bones/22/rotation = Quaternion(0.443683, -0.108479, 0.0542043, 0.887941)
+bones/23/rotation = Quaternion(-0.305504, -0.066367, 0.296348, 0.902463)
+bones/24/rotation = Quaternion(0.249697, 0.16183, -0.0093886, 0.954659)
+bones/25/rotation = Quaternion(0.0260091, -0.788057, 0.613474, 0.0440335)
+bones/26/rotation = Quaternion(0.343803, 0.112506, -0.0248632, 0.931946)
+bones/29/rotation = Quaternion(0.707022, -0.0109696, 0.010969, 0.707022)
 bones/36/position = Vector3(1.25983, 1.30326, 0.185817)
 bones/36/position = Vector3(1.25983, 1.30326, 0.185817)
 bones/37/rotation = Quaternion(5.33851e-08, -0.707107, 0.707107, 5.33851e-08)
 bones/37/rotation = Quaternion(5.33851e-08, -0.707107, 0.707107, 5.33851e-08)
-bones/39/rotation = Quaternion(0.97121, 0.00949873, -0.00244818, 0.238024)
-bones/41/rotation = Quaternion(0.958065, -0.000847721, 0.000218581, 0.28655)
+bones/39/rotation = Quaternion(0.998553, -0.0402177, 0.0103661, -0.0341592)
+bones/41/rotation = Quaternion(0.998887, -0.0396054, 0.0102083, -0.0234937)
 bones/42/rotation = Quaternion(-0.567204, -1.60356e-07, 1.10439e-07, 0.823577)
 bones/42/rotation = Quaternion(-0.567204, -1.60356e-07, 1.10439e-07, 0.823577)
 bones/43/rotation = Quaternion(0.5665, 0.402705, 0.616376, 0.370118)
 bones/43/rotation = Quaternion(0.5665, 0.402705, 0.616376, 0.370118)
-bones/44/rotation = Quaternion(0.579314, 0.235644, 0.69615, 0.35248)
-bones/45/position = Vector3(-0.000106425, -0.361298, 0.029623)
-bones/45/rotation = Quaternion(0.527419, 0.0716747, 0.837931, -0.120682)
+bones/44/rotation = Quaternion(0.61946, 0.267158, 0.667495, 0.315193)
+bones/45/position = Vector3(-5.02977e-05, -0.361298, 0.0299357)
+bones/45/rotation = Quaternion(0.52941, 0.0640843, 0.839999, -0.100104)
 bones/47/rotation = Quaternion(-0.599593, 0.374818, 0.599592, 0.374819)
 bones/47/rotation = Quaternion(-0.599593, 0.374818, 0.599592, 0.374819)
 bones/48/position = Vector3(-1.25983, 1.30326, 1.13517)
 bones/48/position = Vector3(-1.25983, 1.30326, 1.13517)
 bones/49/rotation = Quaternion(-5.33851e-08, -0.707107, 0.707107, -5.33851e-08)
 bones/49/rotation = Quaternion(-5.33851e-08, -0.707107, 0.707107, -5.33851e-08)
-bones/51/rotation = Quaternion(0.945999, 0.191472, -0.0493512, 0.256882)
-bones/53/rotation = Quaternion(0.963629, 0.208028, -0.0536187, 0.158959)
+bones/51/rotation = Quaternion(0.920414, -0.0382196, 0.00985076, 0.388947)
+bones/53/rotation = Quaternion(0.91713, -0.0382163, 0.00984991, 0.396631)
 bones/54/rotation = Quaternion(-0.567204, 1.60356e-07, -1.10439e-07, 0.823577)
 bones/54/rotation = Quaternion(-0.567204, 1.60356e-07, -1.10439e-07, 0.823577)
 bones/55/rotation = Quaternion(-0.630266, 0.268009, 0.685756, -0.246322)
 bones/55/rotation = Quaternion(-0.630266, 0.268009, 0.685756, -0.246322)
-bones/56/rotation = Quaternion(0.712152, -0.413199, -0.521914, 0.222962)
-bones/57/rotation = Quaternion(-0.662224, 0.0860973, 0.74367, -0.0316517)
+bones/56/rotation = Quaternion(0.614619, -0.369837, -0.599625, 0.354843)
+bones/57/rotation = Quaternion(-0.662232, 0.0768283, 0.743989, -0.0450163)
 bones/59/rotation = Quaternion(-0.396466, -0.585504, -0.396466, 0.585504)
 bones/59/rotation = Quaternion(-0.396466, -0.585504, -0.396466, 0.585504)
 bones/60/position = Vector3(0.937933, 1.23785, -1.52284)
 bones/60/position = Vector3(0.937933, 1.23785, -1.52284)
-bones/61/position = Vector3(-0.702017, 1.13607, -0.804415)
-bones/62/position = Vector3(9.42637, 3.0487, 15.6378)
+bones/61/position = Vector3(-1.05149, 1.13607, -1.48048)
 
 
 [node name="RayFrom" type="BoneAttachment3D" parent="RedRobotModel/Armature/Skeleton3D" index="4"]
 [node name="RayFrom" type="BoneAttachment3D" parent="RedRobotModel/Armature/Skeleton3D" index="4"]
-transform = Transform3D(-0.890002, 0.454381, -0.0378776, -0.0306307, 0.0233023, 0.999259, 0.454927, 0.890503, -0.0068211, 0.1014, 2.00662, 0.252279)
+transform = Transform3D(-0.995755, 0.0596829, -0.0700711, -0.0637111, 0.102512, 0.992689, 0.0664297, 0.99294, -0.098274, -0.110703, 2.02572, 0.183234)
 bone_name = "CannonAnimRecoil"
 bone_name = "CannonAnimRecoil"
 bone_idx = 17
 bone_idx = 17
 
 

+ 1 - 1
icon.png.import

@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.cte
 [params]
 [params]
 
 
 compress/mode=0
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/hdr_compression=1
-compress/bptc_ldr=0
 compress/normal_map=0
 compress/normal_map=0
 compress/channel_pack=0
 compress/channel_pack=0
 mipmaps/generate=false
 mipmaps/generate=false

+ 1 - 1
level/forklift/flying_forklift.blend.import

@@ -29,7 +29,7 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1
 blender/nodes/visible=0
 blender/nodes/visible=0
 blender/nodes/punctual_lights=true
 blender/nodes/punctual_lights=true
 blender/nodes/cameras=true
 blender/nodes/cameras=true

+ 1 - 1
level/forklift/flying_forklift.glb.import

@@ -40,4 +40,4 @@ _subresources={
 }
 }
 }
 }
 }
 }
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

+ 79 - 0
level/geometry/models/Test-emitter-mat.tres

@@ -0,0 +1,79 @@
+[gd_resource type="ShaderMaterial" load_steps=5 format=3 uid="uid://6leulkw6mvfk"]
+
+[ext_resource type="Texture2D" uid="uid://cli8k85feqor5" path="res://level/textures/structure/reactor_emitter_albedo.png" id="1_pn0mc"]
+[ext_resource type="Texture2D" uid="uid://bucygjeygvj1x" path="res://level/textures/structure/reactor_emitter_orm.png" id="2_64t2e"]
+[ext_resource type="Texture2D" uid="uid://c44vn6mh3xhta" path="res://level/textures/structure/reactor_emitter_normal.png" id="3_3gm8g"]
+
+[sub_resource type="Shader" id="Shader_uk8v0"]
+code = "// NOTE: Shader automatically converted from Godot Engine 4.0.rc1's StandardMaterial3D.
+
+shader_type spatial;
+render_mode blend_mix,depth_draw_opaque,cull_back,diffuse_burley,specular_schlick_ggx;
+uniform vec4 albedo : source_color;
+uniform sampler2D texture_albedo : source_color,filter_linear_mipmap,repeat_enable;
+uniform float point_size : hint_range(0,128);
+uniform float roughness : hint_range(0,1);
+uniform sampler2D texture_metallic : hint_default_white,filter_linear_mipmap,repeat_enable;
+uniform vec4 metallic_texture_channel;
+uniform sampler2D texture_roughness : hint_roughness_r,filter_linear_mipmap,repeat_enable;
+uniform float specular;
+uniform float metallic;
+uniform sampler2D texture_normal : hint_roughness_normal,filter_linear_mipmap,repeat_enable;
+uniform float normal_scale : hint_range(-16,16);
+uniform sampler2D texture_ambient_occlusion : hint_default_white, filter_linear_mipmap,repeat_enable;
+uniform vec4 ao_texture_channel;
+uniform float ao_light_affect;
+uniform vec3 uv1_scale;
+uniform vec3 uv1_offset;
+uniform vec3 uv2_scale;
+uniform vec3 uv2_offset;
+
+
+void vertex() {
+	UV=UV*uv1_scale.xy+uv1_offset.xy;
+}
+
+
+
+
+
+
+void fragment() {
+	vec2 base_uv = UV;
+	vec4 albedo_tex = texture(texture_albedo,base_uv);
+	ALBEDO = albedo.rgb * albedo_tex.rgb;
+	float metallic_tex = dot(texture(texture_metallic,base_uv),metallic_texture_channel);
+	METALLIC = metallic_tex * metallic;
+	vec4 roughness_texture_channel = vec4(0.0,1.0,0.0,0.0);
+	float roughness_tex = dot(texture(texture_roughness,base_uv),roughness_texture_channel);
+	ROUGHNESS = roughness_tex * roughness;
+	SPECULAR = specular;
+	NORMAL_MAP = texture(texture_normal,base_uv).rgb;
+	NORMAL_MAP_DEPTH = normal_scale;
+	AO = dot(texture(texture_ambient_occlusion,base_uv),ao_texture_channel);
+	AO_LIGHT_AFFECT = ao_light_affect;
+}
+"
+
+[resource]
+resource_name = "reactor_emitter"
+render_priority = 0
+shader = SubResource("Shader_uk8v0")
+shader_parameter/albedo = Color(1, 1, 1, 1)
+shader_parameter/point_size = null
+shader_parameter/roughness = 1.0
+shader_parameter/metallic_texture_channel = Vector4(0, 0, 1, 0)
+shader_parameter/specular = 0.5
+shader_parameter/metallic = 0.5
+shader_parameter/normal_scale = null
+shader_parameter/ao_texture_channel = Vector4(1, 0, 0, 0)
+shader_parameter/ao_light_affect = 0.7
+shader_parameter/uv1_scale = Vector3(1, 1, 1)
+shader_parameter/uv1_offset = null
+shader_parameter/uv2_scale = Vector3(1, 1, 1)
+shader_parameter/uv2_offset = null
+shader_parameter/texture_albedo = ExtResource("1_pn0mc")
+shader_parameter/texture_metallic = ExtResource("2_64t2e")
+shader_parameter/texture_roughness = ExtResource("2_64t2e")
+shader_parameter/texture_normal = ExtResource("3_3gm8g")
+shader_parameter/texture_ambient_occlusion = ExtResource("2_64t2e")

+ 1 - 1
level/geometry/models/core.blend.import

@@ -29,7 +29,7 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1
 blender/nodes/visible=0
 blender/nodes/visible=0
 blender/nodes/punctual_lights=true
 blender/nodes/punctual_lights=true
 blender/nodes/cameras=true
 blender/nodes/cameras=true

+ 1 - 1
level/geometry/models/core.glb.import

@@ -152,4 +152,4 @@ _subresources={
 }
 }
 }
 }
 }
 }
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

+ 1 - 1
level/geometry/models/lights.blend.import

@@ -29,7 +29,7 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1
 blender/nodes/visible=0
 blender/nodes/visible=0
 blender/nodes/punctual_lights=true
 blender/nodes/punctual_lights=true
 blender/nodes/cameras=true
 blender/nodes/cameras=true

+ 1 - 1
level/geometry/models/lights.glb.import

@@ -36,4 +36,4 @@ _subresources={
 }
 }
 }
 }
 }
 }
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

+ 1 - 1
level/geometry/models/props.blend.import

@@ -29,7 +29,7 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1
 blender/nodes/visible=0
 blender/nodes/visible=0
 blender/nodes/punctual_lights=true
 blender/nodes/punctual_lights=true
 blender/nodes/cameras=true
 blender/nodes/cameras=true

+ 1 - 1
level/geometry/models/props.glb.import

@@ -116,4 +116,4 @@ _subresources={
 }
 }
 }
 }
 }
 }
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

+ 9 - 14
level/geometry/models/reactor_emitter.tres

@@ -1,22 +1,17 @@
-[gd_resource type="StandardMaterial3D" load_steps=4 format=2]
+[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://bafp3svf0x3nh"]
 
 
-[ext_resource path="res://level/textures/structure/reactor_emitter_albedo.png" type="Texture2D" id=1]
-[ext_resource path="res://level/textures/structure/reactor_emitter_orm.png" type="Texture2D" id=2]
-[ext_resource path="res://level/textures/structure/reactor_emitter_normal.png" type="Texture2D" id=3]
+[ext_resource type="Texture2D" uid="uid://cli8k85feqor5" path="res://level/textures/structure/reactor_emitter_albedo.png" id="1"]
+[ext_resource type="Texture2D" uid="uid://bucygjeygvj1x" path="res://level/textures/structure/reactor_emitter_orm.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://c44vn6mh3xhta" path="res://level/textures/structure/reactor_emitter_normal.png" id="3"]
 
 
 [resource]
 [resource]
 resource_name = "reactor_emitter"
 resource_name = "reactor_emitter"
-albedo_texture = ExtResource( 1 )
-metallic = 0.5
-metallic_texture = ExtResource( 2 )
+albedo_texture = ExtResource("1")
+metallic_texture = ExtResource("2")
 metallic_texture_channel = 2
 metallic_texture_channel = 2
-roughness_texture = ExtResource( 2 )
+roughness_texture = ExtResource("2")
 roughness_texture_channel = 1
 roughness_texture_channel = 1
 normal_enabled = true
 normal_enabled = true
-normal_scale = 1.0
-normal_texture = ExtResource( 3 )
+normal_texture = ExtResource("3")
 ao_enabled = true
 ao_enabled = true
-ao_light_affect = 0.0
-ao_texture = ExtResource( 2 )
-ao_on_uv2 = false
-ao_texture_channel = 0
+ao_texture = ExtResource("2")

+ 11 - 17
level/geometry/models/scifi_car.tres

@@ -1,28 +1,22 @@
-[gd_resource type="StandardMaterial3D" load_steps=5 format=2]
+[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://b703875llvtsk"]
 
 
-[ext_resource path="res://level/textures/car/scificar_albedo.png" type="Texture2D" id=1]
-[ext_resource path="res://level/textures/car/scificar_normal.png" type="Texture2D" id=2]
-[ext_resource path="res://level/textures/car/scificar_emissive.png" type="Texture2D" id=3]
-[ext_resource path="res://level/textures/car/scificar_orm.png" type="Texture2D" id=4]
+[ext_resource type="Texture2D" uid="uid://dlgb8fuxysstd" path="res://level/textures/car/scificar_albedo.png" id="1"]
+[ext_resource type="Texture2D" uid="uid://tsfvwxlfyjbj" path="res://level/textures/car/scificar_normal.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://c74qi2ci4wf8i" path="res://level/textures/car/scificar_emissive.png" id="3"]
+[ext_resource type="Texture2D" uid="uid://cgswd68y0qby7" path="res://level/textures/car/scificar_orm.png" id="4"]
 
 
 [resource]
 [resource]
 resource_name = "scifi_car"
 resource_name = "scifi_car"
-albedo_texture = ExtResource( 1 )
+albedo_texture = ExtResource("1")
 metallic = 0.5
 metallic = 0.5
-metallic_texture = ExtResource( 4 )
+metallic_texture = ExtResource("4")
 metallic_texture_channel = 2
 metallic_texture_channel = 2
-roughness_texture = ExtResource( 4 )
+roughness_texture = ExtResource("4")
 roughness_texture_channel = 1
 roughness_texture_channel = 1
 emission_enabled = true
 emission_enabled = true
-emission = Color( 0, 0, 0, 1 )
-emission_energy = 5.0
-emission_operator = 0
-emission_on_uv2 = false
-emission_texture = ExtResource( 3 )
+emission_energy_multiplier = 5.0
+emission_texture = ExtResource("3")
 normal_enabled = true
 normal_enabled = true
-normal_scale = 1.0
-normal_texture = ExtResource( 2 )
+normal_texture = ExtResource("2")
 ao_enabled = true
 ao_enabled = true
 ao_light_affect = 0.5
 ao_light_affect = 0.5
-ao_on_uv2 = false
-ao_texture_channel = 0

+ 4 - 5
level/geometry/models/scifi_car_glass.tres

@@ -1,8 +1,7 @@
-[gd_resource type="StandardMaterial3D" format=2]
+[gd_resource type="StandardMaterial3D" format=3 uid="uid://cjn5c5md8djfr"]
 
 
 [resource]
 [resource]
 resource_name = "scifi_car_glass"
 resource_name = "scifi_car_glass"
-flags_transparent = true
-albedo_color = Color( 0.191406, 0.0710055, 0.0710055, 0.720039 )
-metallic = 1.0
-roughness = 0.0
+transparency = 1
+albedo_color = Color(0.191406, 0.0710055, 0.0710055, 0.720039)
+roughness = 0.11

+ 1 - 1
level/geometry/models/structure.blend.import

@@ -29,7 +29,7 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1
 blender/nodes/visible=0
 blender/nodes/visible=0
 blender/nodes/punctual_lights=true
 blender/nodes/punctual_lights=true
 blender/nodes/cameras=true
 blender/nodes/cameras=true

+ 1 - 1
level/geometry/models/structure.glb.import

@@ -160,4 +160,4 @@ _subresources={
 }
 }
 }
 }
 }
 }
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

+ 2 - 2
level/geometry/scenes/lights.tscn

@@ -85,7 +85,7 @@ spot_angle_attenuation = 1.0
 transform = Transform3D(1, 1.55903e-09, 6.81474e-17, 0, -4.37114e-08, 1, 1.55903e-09, -1, -4.37114e-08, -3.05176e-05, -2.994, 0)
 transform = Transform3D(1, 1.55903e-09, 6.81474e-17, 0, -4.37114e-08, 1, 1.55903e-09, -1, -4.37114e-08, -3.05176e-05, -2.994, 0)
 light_energy = 2.26
 light_energy = 2.26
 shadow_enabled = true
 shadow_enabled = true
-shadow_bias = 0.0
+shadow_bias = 0.01
 spot_range = 5.0
 spot_range = 5.0
 spot_angle = 30.8
 spot_angle = 30.8
 spot_angle_attenuation = 1.0
 spot_angle_attenuation = 1.0
@@ -94,7 +94,7 @@ spot_angle_attenuation = 1.0
 transform = Transform3D(1, 1.55903e-09, 6.81474e-17, 0, -4.37114e-08, 1, 1.55903e-09, -1, -4.37114e-08, 0, -3.04347, -3.8147e-06)
 transform = Transform3D(1, 1.55903e-09, 6.81474e-17, 0, -4.37114e-08, 1, 1.55903e-09, -1, -4.37114e-08, 0, -3.04347, -3.8147e-06)
 light_energy = 2.98
 light_energy = 2.98
 shadow_enabled = true
 shadow_enabled = true
-shadow_bias = 0.0
+shadow_bias = 0.01
 spot_range = 5.0
 spot_range = 5.0
 spot_angle = 26.8
 spot_angle = 26.8
 
 

+ 2 - 2
level/level.gd

@@ -9,9 +9,9 @@ signal replace_main_scene # Useless, but needed as there is no clean way to chec
 
 
 func _ready():
 func _ready():
 	if Settings.gi_quality == Settings.GIQuality.HIGH:
 	if Settings.gi_quality == Settings.GIQuality.HIGH:
-		ProjectSettings["rendering/quality/voxel_cone_tracing/high_quality"] = true
+		RenderingServer.voxel_gi_set_quality(RenderingServer.VOXEL_GI_QUALITY_HIGH)
 	elif Settings.gi_quality == Settings.GIQuality.LOW:
 	elif Settings.gi_quality == Settings.GIQuality.LOW:
-		ProjectSettings["rendering/quality/voxel_cone_tracing/high_quality"] = false
+		RenderingServer.voxel_gi_set_quality(RenderingServer.VOXEL_GI_QUALITY_LOW)
 	else:
 	else:
 		$VoxelGI.hide()
 		$VoxelGI.hide()
 		$ReflectionProbes.show()
 		$ReflectionProbes.show()

+ 1 - 1
level/level.tscn

@@ -73,7 +73,7 @@ size = Vector3(71.6338, 100, 129.154)
 box_projection = true
 box_projection = true
 
 
 [node name="ReflectionProbe3" type="ReflectionProbe" parent="ReflectionProbes"]
 [node name="ReflectionProbe3" type="ReflectionProbe" parent="ReflectionProbes"]
-transform = Transform3D(0.999799, 0, -0.0200534, 0, 1, 0, 0.0200534, 0, 0.999799, -0.392717, -7.57649, 0.0575469)
+transform = Transform3D(0.999799, 0, -0.0200534, 0, 1, 0, 0.0200534, 0, 0.999799, -0.204299, -8.98325, 0.0613261)
 size = Vector3(77.8268, 100, 74.2464)
 size = Vector3(77.8268, 100, 74.2464)
 
 
 [node name="Player" parent="." instance=ExtResource("6")]
 [node name="Player" parent="." instance=ExtResource("6")]

+ 1 - 1
level/textures/props/container1_albedo.png.import

@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/container1_albedo.png-0bf4da4ec1f3681da8e626c
 [params]
 [params]
 
 
 compress/mode=0
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/hdr_compression=1
-compress/bptc_ldr=0
 compress/normal_map=0
 compress/normal_map=0
 compress/channel_pack=0
 compress/channel_pack=0
 mipmaps/generate=false
 mipmaps/generate=false

+ 1 - 1
level/textures/props/container1_normal.png.import

@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/container1_normal.png-decf3878170f06308067e39
 [params]
 [params]
 
 
 compress/mode=0
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/hdr_compression=1
-compress/bptc_ldr=0
 compress/normal_map=0
 compress/normal_map=0
 compress/channel_pack=0
 compress/channel_pack=0
 mipmaps/generate=false
 mipmaps/generate=false

+ 1 - 1
level/textures/props/container1_orm.png.import

@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/container1_orm.png-3143dd3039a65fd9507cc36df0
 [params]
 [params]
 
 
 compress/mode=0
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/hdr_compression=1
-compress/bptc_ldr=0
 compress/normal_map=0
 compress/normal_map=0
 compress/channel_pack=0
 compress/channel_pack=0
 mipmaps/generate=false
 mipmaps/generate=false

+ 1 - 1
level/textures/structure/Core/CoreOutLight.blend.import

@@ -29,7 +29,7 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1
 blender/nodes/visible=0
 blender/nodes/visible=0
 blender/nodes/punctual_lights=true
 blender/nodes/punctual_lights=true
 blender/nodes/cameras=true
 blender/nodes/cameras=true

+ 1 - 1
level/textures/structure/Core/CoreOutLight.glb.import

@@ -29,4 +29,4 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

BIN
level/textures/structure/Core/CoreOutLight_Circle.mesh


BIN
level/textures/structure/Core/CoreOutLight_Circle001.mesh


BIN
level/textures/structure/Core/CoreOutLight_OuterRim.mesh


BIN
level/textures/structure/Core/CoreOutLight_Sphere.mesh


+ 1 - 1
level/textures/structure/tile_tech_panels_color_normal.png.import

@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/tile_tech_panels_color_normal.png-ec117f5e8ed
 [params]
 [params]
 
 
 compress/mode=0
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/hdr_compression=1
-compress/bptc_ldr=0
 compress/normal_map=0
 compress/normal_map=0
 compress/channel_pack=0
 compress/channel_pack=0
 mipmaps/generate=false
 mipmaps/generate=false

+ 1 - 1
menu/button_play.png.import

@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/button_play.png-7299d4317fc52b7050bffc2828101
 [params]
 [params]
 
 
 compress/mode=0
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/hdr_compression=1
-compress/bptc_ldr=0
 compress/normal_map=0
 compress/normal_map=0
 compress/channel_pack=0
 compress/channel_pack=0
 mipmaps/generate=false
 mipmaps/generate=false

+ 1 - 1
menu/button_play_hover.png.import

@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/button_play_hover.png-b9bcd8b2eb01005a0886fb6
 [params]
 [params]
 
 
 compress/mode=0
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/hdr_compression=1
-compress/bptc_ldr=0
 compress/normal_map=0
 compress/normal_map=0
 compress/channel_pack=0
 compress/channel_pack=0
 mipmaps/generate=false
 mipmaps/generate=false

+ 1 - 1
menu/button_quit.png.import

@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/button_quit.png-7f5c836f655c30d8d5235d13f9c7b
 [params]
 [params]
 
 
 compress/mode=0
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/hdr_compression=1
-compress/bptc_ldr=0
 compress/normal_map=0
 compress/normal_map=0
 compress/channel_pack=0
 compress/channel_pack=0
 mipmaps/generate=false
 mipmaps/generate=false

+ 1 - 1
menu/button_quit_hover.png.import

@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/button_quit_hover.png-88bea902fe8d3d8b23d4f57
 [params]
 [params]
 
 
 compress/mode=0
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/hdr_compression=1
-compress/bptc_ldr=0
 compress/normal_map=0
 compress/normal_map=0
 compress/channel_pack=0
 compress/channel_pack=0
 mipmaps/generate=false
 mipmaps/generate=false

+ 1 - 1
menu/button_settings.png.import

@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/button_settings.png-06b8a18804f47725df991d951
 [params]
 [params]
 
 
 compress/mode=0
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/hdr_compression=1
-compress/bptc_ldr=0
 compress/normal_map=0
 compress/normal_map=0
 compress/channel_pack=0
 compress/channel_pack=0
 mipmaps/generate=false
 mipmaps/generate=false

+ 1 - 1
menu/button_settings_hover.png.import

@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/button_settings_hover.png-294d96b6e15f7653caf
 [params]
 [params]
 
 
 compress/mode=0
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/hdr_compression=1
-compress/bptc_ldr=0
 compress/normal_map=0
 compress/normal_map=0
 compress/channel_pack=0
 compress/channel_pack=0
 mipmaps/generate=false
 mipmaps/generate=false

+ 1 - 1
menu/menu.gd

@@ -66,7 +66,7 @@ func _ready():
 	for child in sound_effects.get_children():
 	for child in sound_effects.get_children():
 		child.volume_db = -200
 		child.volume_db = -200
 
 
-func _process(delta):
+func _process(_delta):
 	if loading.visible:
 	if loading.visible:
 		var progress = []
 		var progress = []
 		var status = ResourceLoader.load_threaded_get_status(path, progress)
 		var status = ResourceLoader.load_threaded_get_status(path, progress)

+ 65 - 59
menu/menu.tscn

@@ -270,25 +270,25 @@ environment = SubResource("2")
 transform = Transform3D(0.803991, 0, 0, 0, 0.803991, 0, 0, 0, 0.803991, 0, 0, 0)
 transform = Transform3D(0.803991, 0, 0, 0, 0.803991, 0, 0, 0, 0.803991, 0, 0, 0)
 
 
 [node name="Skeleton3D" parent="PlayerModel/Robot_Skeleton" index="0"]
 [node name="Skeleton3D" parent="PlayerModel/Robot_Skeleton" index="0"]
-bones/1/position = Vector3(0.268173, 2.06057, -0.316997)
-bones/1/rotation = Quaternion(0.167882, -0.00130488, -0.00612958, 0.985787)
-bones/2/position = Vector3(4.76872e-06, 0.23956, -0.000185661)
-bones/2/rotation = Quaternion(0.00262683, 0.0555822, -0.0102384, 0.998398)
-bones/3/position = Vector3(4.7405e-06, 0.102887, 4.76659e-05)
-bones/3/rotation = Quaternion(-0.00601908, 0.0565102, 0.00089578, 0.998384)
-bones/4/position = Vector3(4.76819e-06, 0.117621, 0.000299397)
-bones/4/rotation = Quaternion(0.0570744, 0.0558017, 0.00896488, 0.996769)
+bones/1/position = Vector3(0.268173, 2.09624, -0.316997)
+bones/1/rotation = Quaternion(0.112115, -0.00164791, -0.00604639, 0.993675)
+bones/2/position = Vector3(1.99957e-05, 0.243477, -0.000598437)
+bones/2/rotation = Quaternion(0.0224407, 0.0557744, -0.00913325, 0.998149)
+bones/3/position = Vector3(1.99616e-05, 0.106811, 0.000379546)
+bones/3/rotation = Quaternion(0.0137962, 0.0564812, 0.00201712, 0.998306)
+bones/4/position = Vector3(1.99659e-05, 0.121394, 0.00142952)
+bones/4/rotation = Quaternion(0.0768452, 0.0556128, 0.0100706, 0.99544)
 bones/5/rotation = Quaternion(0.180715, -8.52238e-05, -0.00187649, 0.983534)
 bones/5/rotation = Quaternion(0.180715, -8.52238e-05, -0.00187649, 0.983534)
-bones/6/rotation = Quaternion(0.112799, 0.911037, 0.396479, 0.00964384)
-bones/10/position = Vector3(-1.43692e-08, 0.245584, 0.126631)
-bones/11/rotation = Quaternion(4.16125e-07, 0.930597, 0.366045, -5.69938e-07)
-bones/12/rotation = Quaternion(4.16773e-07, 0.930597, 0.366045, -5.69517e-07)
-bones/13/rotation = Quaternion(0.0442984, 0.958142, -0.282457, 0.0147929)
-bones/14/rotation = Quaternion(2.10382e-07, 0.959165, -0.282846, -7.20746e-07)
-bones/15/rotation = Quaternion(-0.339475, -0.352663, -0.470072, 0.73445)
-bones/16/rotation = Quaternion(-0.643717, -0.0316476, 0.0685419, 0.761531)
-bones/17/rotation = Quaternion(-0.0253187, 0.00804357, -0.353674, 0.934991)
-bones/18/rotation = Quaternion(-0.0293978, -0.000711291, -0.331542, 0.942982)
+bones/6/rotation = Quaternion(0.109393, 0.916476, 0.384813, 0.00492179)
+bones/10/position = Vector3(-2.09419e-08, 0.245584, 0.126631)
+bones/11/rotation = Quaternion(4.16747e-07, 0.930597, 0.366045, -5.69876e-07)
+bones/12/rotation = Quaternion(4.16724e-07, 0.930597, 0.366045, -5.69556e-07)
+bones/13/rotation = Quaternion(0.0442982, 0.958142, -0.282457, 0.0147928)
+bones/14/rotation = Quaternion(2.09514e-07, 0.959165, -0.282846, -7.20715e-07)
+bones/15/rotation = Quaternion(-0.336513, -0.354554, -0.465867, 0.737576)
+bones/16/rotation = Quaternion(-0.694616, -0.0213221, -0.0375774, 0.718082)
+bones/17/rotation = Quaternion(0.0407905, 0.0023125, -0.346023, 0.937336)
+bones/18/rotation = Quaternion(0.0350425, -0.00183072, -0.333551, 0.942079)
 bones/20/rotation = Quaternion(-0.0338717, -0.0177171, 0.985158, 0.167341)
 bones/20/rotation = Quaternion(-0.0338717, -0.0177171, 0.985158, 0.167341)
 bones/22/rotation = Quaternion(-0.153692, -0.0597802, 0.00318971, 0.986304)
 bones/22/rotation = Quaternion(-0.153692, -0.0597802, 0.00318971, 0.986304)
 bones/23/rotation = Quaternion(-0.131041, -0.0202512, -0.000901781, 0.99117)
 bones/23/rotation = Quaternion(-0.131041, -0.0202512, -0.000901781, 0.99117)
@@ -306,13 +306,13 @@ bones/40/rotation = Quaternion(-0.318888, -0.0177572, -0.0054272, 0.947611)
 bones/41/rotation = Quaternion(-0.450214, -0.118277, -0.0180463, 0.884869)
 bones/41/rotation = Quaternion(-0.450214, -0.118277, -0.0180463, 0.884869)
 bones/42/rotation = Quaternion(-0.447648, -0.0710501, -0.0232223, 0.89108)
 bones/42/rotation = Quaternion(-0.447648, -0.0710501, -0.0232223, 0.89108)
 bones/45/rotation = Quaternion(0.189582, -0.137612, 0.960075, 0.152896)
 bones/45/rotation = Quaternion(0.189582, -0.137612, 0.960075, 0.152896)
-bones/47/rotation = Quaternion(-0.332803, 0.0119201, 0.167382, 0.927946)
-bones/48/rotation = Quaternion(0.107043, 0.0863051, 0.546805, 0.825892)
-bones/49/rotation = Quaternion(-0.226996, -0.0457089, -0.222613, 0.94701)
-bones/50/rotation = Quaternion(-0.360432, 0.366865, 0.47182, 0.71616)
-bones/51/rotation = Quaternion(-0.347867, 0.30957, 0.163258, 0.869771)
-bones/52/rotation = Quaternion(0.314914, 0.116376, 0.433882, 0.836082)
-bones/53/rotation = Quaternion(0.279893, 0.0447914, 0.364367, 0.887068)
+bones/47/rotation = Quaternion(-0.338619, 0.0145923, 0.0624174, 0.938737)
+bones/48/rotation = Quaternion(0.0919991, 0.0976502, 0.48054, 0.86665)
+bones/49/rotation = Quaternion(-0.204467, -0.0515048, -0.308255, 0.927642)
+bones/50/rotation = Quaternion(-0.35376, 0.371418, 0.462805, 0.72299)
+bones/51/rotation = Quaternion(-0.348653, 0.356107, 0.224401, 0.837421)
+bones/52/rotation = Quaternion(0.319716, 0.137526, 0.434502, 0.830708)
+bones/53/rotation = Quaternion(0.277844, 0.0549105, 0.340938, 0.896409)
 bones/55/rotation = Quaternion(-0.00907353, -0.999945, 0.00213467, 0.00491076)
 bones/55/rotation = Quaternion(-0.00907353, -0.999945, 0.00213467, 0.00491076)
 bones/56/rotation = Quaternion(0.0138917, -0.0168912, 0.990289, 0.137295)
 bones/56/rotation = Quaternion(0.0138917, -0.0168912, 0.990289, 0.137295)
 bones/56/scale = Vector3(0.766362, 0.766362, 0.766362)
 bones/56/scale = Vector3(0.766362, 0.766362, 0.766362)
@@ -358,46 +358,46 @@ bones/89/rotation = Quaternion(-0.000405133, 0.173646, 0.984808, -0.000801945)
 bones/90/position = Vector3(5.96046e-08, 0.185297, -0.0266095)
 bones/90/position = Vector3(5.96046e-08, 0.185297, -0.0266095)
 bones/91/position = Vector3(2.98605e-08, -1.00086e-07, -0.202989)
 bones/91/position = Vector3(2.98605e-08, -1.00086e-07, -0.202989)
 bones/92/position = Vector3(-5.96046e-08, 0.0660029, 0.0266979)
 bones/92/position = Vector3(-5.96046e-08, 0.0660029, 0.0266979)
-bones/95/rotation = Quaternion(0.0354177, 0.0215246, 0.112854, 0.992747)
-bones/96/rotation = Quaternion(0.179406, -0.150174, -0.276988, 0.931954)
-bones/97/rotation = Quaternion(0.0175997, 0.115868, 0.367466, 0.922623)
-bones/98/rotation = Quaternion(0.995449, -0.08255, -0.0038372, -0.047448)
-bones/99/rotation = Quaternion(0.672327, 0.201349, 0.554359, -0.447349)
-bones/100/rotation = Quaternion(-0.0821856, -0.0919517, 0.952875, 0.277165)
-bones/101/rotation = Quaternion(-0.213927, -0.140612, 0.957085, -0.135835)
-bones/102/rotation = Quaternion(0.325872, 0.712315, -0.560499, 0.268805)
-bones/104/rotation = Quaternion(-0.547701, 0.365046, 0.621176, 0.425329)
-bones/105/rotation = Quaternion(0.0895948, -0.16206, 0.935611, -0.30057)
-bones/106/rotation = Quaternion(0.163211, -0.254852, 0.944623, -0.126883)
-bones/107/rotation = Quaternion(-0.296065, 0.61038, -0.734337, -0.0230515)
-bones/112/rotation = Quaternion(0.999532, 0.00105931, -7.20614e-05, -0.0305878)
-bones/113/rotation = Quaternion(0.997026, -0.000913598, -0.000245273, -0.0770559)
-bones/114/position = Vector3(0.105812, 0.10161, 0.140904)
-bones/114/rotation = Quaternion(0.00249108, 0.715005, 0.69911, 0.00251272)
-bones/115/position = Vector3(-0.0984763, 0.10166, 0.140891)
-bones/115/rotation = Quaternion(0.00242135, 0.714987, 0.699129, 0.00247623)
-bones/116/rotation = Quaternion(0.805592, 0.227002, -0.130306, 0.531518)
-bones/117/rotation = Quaternion(0.31774, 2.50678e-07, -8.48343e-08, 0.948178)
-bones/118/rotation = Quaternion(0.229297, -1.90783e-08, -3.05502e-09, 0.973356)
-bones/119/rotation = Quaternion(-0.564333, -0.0387848, 0.177934, 0.80521)
+bones/95/rotation = Quaternion(0.05799, 0.0219246, 0.189872, 0.97985)
+bones/96/rotation = Quaternion(0.174514, -0.158735, -0.21745, 0.947135)
+bones/97/rotation = Quaternion(0.0101153, 0.113078, 0.391096, 0.913321)
+bones/98/rotation = Quaternion(0.994392, -0.0944115, -0.00439916, -0.0474537)
+bones/99/rotation = Quaternion(0.646329, 0.235609, 0.593638, -0.417543)
+bones/100/rotation = Quaternion(-0.106422, -0.167151, 0.965412, 0.169454)
+bones/101/rotation = Quaternion(-0.222381, -0.211119, 0.930999, -0.198033)
+bones/102/rotation = Quaternion(0.328165, 0.691241, -0.597049, 0.240886)
+bones/104/rotation = Quaternion(-0.521977, 0.392636, 0.632836, 0.415807)
+bones/105/rotation = Quaternion(0.105477, -0.207515, 0.945947, -0.225825)
+bones/106/rotation = Quaternion(0.180097, -0.349346, 0.919203, -0.0242731)
+bones/107/rotation = Quaternion(-0.305892, 0.616796, -0.722653, -0.0613609)
+bones/112/rotation = Quaternion(0.999764, 0.00107883, -7.8484e-05, -0.0217104)
+bones/113/rotation = Quaternion(0.996348, -0.000928367, -0.000252604, -0.0853804)
+bones/114/position = Vector3(0.106977, 0.0982658, 0.149509)
+bones/114/rotation = Quaternion(0.0025418, 0.7006, 0.713545, 0.0024614)
+bones/115/position = Vector3(-0.0973112, 0.0983164, 0.149498)
+bones/115/rotation = Quaternion(0.00247134, 0.700582, 0.713564, 0.00242634)
+bones/116/rotation = Quaternion(0.869649, 0.214895, -0.112368, 0.430005)
+bones/117/rotation = Quaternion(0.268127, 1.68788e-07, -2.096e-08, 0.963384)
+bones/118/rotation = Quaternion(0.174225, 9.78156e-09, 2.88953e-09, 0.984706)
+bones/119/rotation = Quaternion(-0.532579, -0.0655485, 0.162004, 0.828141)
 bones/121/rotation = Quaternion(-0.384436, 5.74738e-10, -6.29245e-09, 0.923152)
 bones/121/rotation = Quaternion(-0.384436, 5.74738e-10, -6.29245e-09, 0.923152)
-bones/122/rotation = Quaternion(0.973283, -6.63195e-07, 1.9651e-08, 0.229609)
-bones/124/rotation = Quaternion(0.899058, -0.19573, 0.117464, 0.373614)
-bones/125/rotation = Quaternion(0.368391, 2.54317e-07, -7.60129e-08, 0.929671)
-bones/126/rotation = Quaternion(0.247389, 4.97235e-09, 5.24625e-09, 0.968916)
-bones/127/rotation = Quaternion(-0.71418, -0.0199217, -0.194467, 0.672111)
+bones/122/rotation = Quaternion(0.981098, -4.60151e-07, 3.14232e-08, 0.193512)
+bones/124/rotation = Quaternion(0.934119, -0.18445, 0.110726, 0.28485)
+bones/125/rotation = Quaternion(0.325729, 1.42842e-07, -4.62522e-08, 0.945463)
+bones/126/rotation = Quaternion(0.204298, -2.80244e-09, 9.61849e-09, 0.978909)
+bones/127/rotation = Quaternion(-0.683833, -0.00722431, -0.18225, 0.706473)
 bones/128/rotation = Quaternion(6.14475e-09, 0.940004, -0.341165, -4.50954e-08)
 bones/128/rotation = Quaternion(6.14475e-09, 0.940004, -0.341165, -4.50954e-08)
 bones/129/rotation = Quaternion(-0.384436, -5.74738e-10, 4.27475e-09, 0.923152)
 bones/129/rotation = Quaternion(-0.384436, -5.74738e-10, 4.27475e-09, 0.923152)
-bones/130/rotation = Quaternion(0.964089, -7.25479e-07, 2.57652e-08, 0.265581)
+bones/130/rotation = Quaternion(0.972073, -5.17376e-07, 3.08143e-08, 0.234681)
 bones/134/position = Vector3(0.735576, 1.3891, -0.136944)
 bones/134/position = Vector3(0.735576, 1.3891, -0.136944)
-bones/136/position = Vector3(3.75821, 2.63254, 6.08647)
-bones/137/position = Vector3(0.781826, 2.2695, -0.427312)
+bones/136/position = Vector3(3.75821, 2.79657, 6.08647)
+bones/137/position = Vector3(0.782667, 2.29394, -0.38149)
 bones/137/rotation = Quaternion(-0.707029, 0.0104927, -0.0104927, 0.707029)
 bones/137/rotation = Quaternion(-0.707029, 0.0104927, -0.0104927, 0.707029)
-bones/139/position = Vector3(-0.167835, 2.81955, 0.321122)
+bones/139/position = Vector3(-0.160432, 2.92309, 0.289828)
 bones/139/rotation = Quaternion(-0.707029, 0.0104927, -0.0104927, 0.707029)
 bones/139/rotation = Quaternion(-0.707029, 0.0104927, -0.0104927, 0.707029)
-bones/140/position = Vector3(-0.316536, 1.9972, -0.0890323)
-bones/143/position = Vector3(0.0110175, 3.44638, -1.24379)
-bones/143/scale = Vector3(1, 1.01842, 1)
+bones/140/position = Vector3(-0.201236, 1.9972, -0.0890323)
+bones/143/position = Vector3(0.0110175, 3.50022, -1.24379)
+bones/143/scale = Vector3(1, 1.06456, 1)
 
 
 [node name="00Robot_Body008" parent="PlayerModel/Robot_Skeleton/Skeleton3D" index="0"]
 [node name="00Robot_Body008" parent="PlayerModel/Robot_Skeleton/Skeleton3D" index="0"]
 surface_material_override/0 = ExtResource("3_xm1fn")
 surface_material_override/0 = ExtResource("3_xm1fn")
@@ -789,6 +789,12 @@ libraries = {
 [node name="ExplosionAudio" parent="BackgroundCache/Bullet" index="4"]
 [node name="ExplosionAudio" parent="BackgroundCache/Bullet" index="4"]
 volume_db = -80.0
 volume_db = -80.0
 
 
+[node name="MainBody" parent="BackgroundCache/Bullet/BulletBody" index="0"]
+emitting = false
+
+[node name="Trail" parent="BackgroundCache/Bullet/BulletBody" index="1"]
+emitting = false
+
 [connection signal="pressed" from="UI/Main/Play" to="." method="_on_play_pressed"]
 [connection signal="pressed" from="UI/Main/Play" to="." method="_on_play_pressed"]
 [connection signal="pressed" from="UI/Main/Settings" to="." method="_on_settings_pressed"]
 [connection signal="pressed" from="UI/Main/Settings" to="." method="_on_settings_pressed"]
 [connection signal="pressed" from="UI/Main/Quit" to="." method="_on_quit_pressed"]
 [connection signal="pressed" from="UI/Main/Quit" to="." method="_on_quit_pressed"]

+ 1 - 1
menu/settings.gd

@@ -95,4 +95,4 @@ func save_settings():
 	assert(not error)
 	assert(not error)
 
 
 	var d = { "gi":gi_quality, "aa":aa_quality, "shadow_enabled":shadow_enabled, "fxaa":fxaa, "ssao":ssao_quality, "bloom":bloom_quality, "resolution":resolution, "fullscreen":fullscreen }
 	var d = { "gi":gi_quality, "aa":aa_quality, "shadow_enabled":shadow_enabled, "fxaa":fxaa, "ssao":ssao_quality, "bloom":bloom_quality, "resolution":resolution, "fullscreen":fullscreen }
-	file.store_line(JSON.new().stringify(d))
+	file.store_line(JSON.stringify(d))

+ 1 - 1
menu/tps_demo.png.import

@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/tps_demo.png-0c0498c8b37a07a2e41a436998ab8217
 [params]
 [params]
 
 
 compress/mode=0
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/hdr_compression=1
-compress/bptc_ldr=0
 compress/normal_map=0
 compress/normal_map=0
 compress/channel_pack=0
 compress/channel_pack=0
 mipmaps/generate=false
 mipmaps/generate=false

+ 5 - 5
player/audio/step_random_pitch.tres

@@ -1,8 +1,8 @@
-[gd_resource type="AudioStreamRandomizer" load_steps=2 format=2]
+[gd_resource type="AudioStreamRandomizer" load_steps=2 format=3 uid="uid://do3ko5enqvvrb"]
 
 
-[ext_resource path="res://player/audio/step.wav" type="AudioStream" id=1]
+[ext_resource type="AudioStream" uid="uid://c5228twnkf1lr" path="res://player/audio/step.wav" id="1"]
 
 
 [resource]
 [resource]
-
-audio_stream = ExtResource( 1 )
-random_pitch = 1.1
+streams_count = 1
+stream_0/stream = ExtResource("1")
+stream_0/weight = 1.0

+ 1 - 1
player/bullet/effect/FlareStraight.png.import

@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/FlareStraight.png-24936fce26cd8459ce096cee17b
 [params]
 [params]
 
 
 compress/mode=0
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/hdr_compression=1
-compress/bptc_ldr=0
 compress/normal_map=0
 compress/normal_map=0
 compress/channel_pack=0
 compress/channel_pack=0
 mipmaps/generate=false
 mipmaps/generate=false

+ 1 - 1
player/crosshair.png.import

@@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/crosshair.png-297ebeb4b4366d1105121af24ebea38
 [params]
 [params]
 
 
 compress/mode=0
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/hdr_compression=1
-compress/bptc_ldr=0
 compress/normal_map=0
 compress/normal_map=0
 compress/channel_pack=0
 compress/channel_pack=0
 mipmaps/generate=false
 mipmaps/generate=false

+ 1 - 1
player/model/muzzle_flash_particle_mesh.glb.import

@@ -29,4 +29,4 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

+ 1 - 1
player/model/player.blend.import

@@ -29,7 +29,7 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 animation/remove_immutable_tracks=true
 import_script/path=""
 import_script/path=""
 _subresources={}
 _subresources={}
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1
 blender/nodes/visible=0
 blender/nodes/visible=0
 blender/nodes/punctual_lights=true
 blender/nodes/punctual_lights=true
 blender/nodes/cameras=true
 blender/nodes/cameras=true

+ 1 - 1
player/model/player.glb.import

@@ -40,4 +40,4 @@ _subresources={
 }
 }
 }
 }
 }
 }
-meshes/handle_gltf_embedded_images=1
+gltf/embedded_image_handling=1

+ 134 - 131
player/player.tscn

@@ -1,15 +1,16 @@
-[gd_scene load_steps=44 format=3 uid="uid://cs1k22tdf04k4"]
+[gd_scene load_steps=45 format=3 uid="uid://cs1k22tdf04k4"]
 
 
 [ext_resource type="Script" path="res://player/player.gd" id="1"]
 [ext_resource type="Script" path="res://player/player.gd" id="1"]
 [ext_resource type="PackedScene" uid="uid://div25sd40yx1d" path="res://player/model/player.glb" id="2"]
 [ext_resource type="PackedScene" uid="uid://div25sd40yx1d" path="res://player/model/player.glb" id="2"]
 [ext_resource type="Texture2D" uid="uid://vpkjqsku35mr" path="res://player/crosshair.png" id="3"]
 [ext_resource type="Texture2D" uid="uid://vpkjqsku35mr" path="res://player/crosshair.png" id="3"]
-[ext_resource type="AudioStream" path="res://player/audio/step_random_pitch.tres" id="4"]
+[ext_resource type="AudioStream" uid="uid://do3ko5enqvvrb" path="res://player/audio/step_random_pitch.tres" id="4"]
 [ext_resource type="AudioStream" uid="uid://evwr35k4yn6g" path="res://player/audio/jump.wav" id="5"]
 [ext_resource type="AudioStream" uid="uid://evwr35k4yn6g" path="res://player/audio/jump.wav" id="5"]
 [ext_resource type="AudioStream" uid="uid://fbnqspetw2oy" path="res://player/audio/land.wav" id="6"]
 [ext_resource type="AudioStream" uid="uid://fbnqspetw2oy" path="res://player/audio/land.wav" id="6"]
 [ext_resource type="Script" path="res://player/camera_noise_shake_effect.gd" id="8"]
 [ext_resource type="Script" path="res://player/camera_noise_shake_effect.gd" id="8"]
 [ext_resource type="Material" path="res://player/bullet/bullet_material.tres" id="9"]
 [ext_resource type="Material" path="res://player/bullet/bullet_material.tres" id="9"]
 [ext_resource type="ArrayMesh" uid="uid://pok2ib14r47b" path="res://player/model/muzzle_flash_particle_mesh_Cone.mesh" id="10"]
 [ext_resource type="ArrayMesh" uid="uid://pok2ib14r47b" path="res://player/model/muzzle_flash_particle_mesh_Cone.mesh" id="10"]
 [ext_resource type="Texture2D" uid="uid://dj46di0ip66q5" path="res://player/bullet/effect/FlarePolar.png" id="11"]
 [ext_resource type="Texture2D" uid="uid://dj46di0ip66q5" path="res://player/bullet/effect/FlarePolar.png" id="11"]
+[ext_resource type="AudioStream" uid="uid://glpjepixvmdl" path="res://player/audio/shoot.wav" id="11_cqsut"]
 
 
 [sub_resource type="SphereMesh" id="2"]
 [sub_resource type="SphereMesh" id="2"]
 radius = 0.003
 radius = 0.003
@@ -196,7 +197,7 @@ tracks/0/loop_wrap = true
 tracks/0/keys = {
 tracks/0/keys = {
 "times": PackedFloat32Array(0, 1),
 "times": PackedFloat32Array(0, 1),
 "transitions": PackedFloat32Array(0.287175, 1),
 "transitions": PackedFloat32Array(0.287175, 1),
-"update": 3,
+"update": 2,
 "values": [Vector3(0, 0, 0), Vector3(0, 0, 0)]
 "values": [Vector3(0, 0, 0), Vector3(0, 0, 0)]
 }
 }
 tracks/1/type = "value"
 tracks/1/type = "value"
@@ -208,7 +209,7 @@ tracks/1/loop_wrap = true
 tracks/1/keys = {
 tracks/1/keys = {
 "times": PackedFloat32Array(0.2),
 "times": PackedFloat32Array(0.2),
 "transitions": PackedFloat32Array(1),
 "transitions": PackedFloat32Array(1),
-"update": 3,
+"update": 2,
 "values": [Color(1, 1, 1, 0)]
 "values": [Color(1, 1, 1, 0)]
 }
 }
 
 
@@ -222,7 +223,7 @@ tracks/0/loop_wrap = true
 tracks/0/keys = {
 tracks/0/keys = {
 "times": PackedFloat32Array(0, 1),
 "times": PackedFloat32Array(0, 1),
 "transitions": PackedFloat32Array(0.233259, 1),
 "transitions": PackedFloat32Array(0.233259, 1),
-"update": 3,
+"update": 2,
 "values": [Vector3(-0.6, -0.3, 1.1), Vector3(-0.6, -0.3, 1.1)]
 "values": [Vector3(-0.6, -0.3, 1.1), Vector3(-0.6, -0.3, 1.1)]
 }
 }
 tracks/1/type = "value"
 tracks/1/type = "value"
@@ -234,7 +235,7 @@ tracks/1/loop_wrap = true
 tracks/1/keys = {
 tracks/1/keys = {
 "times": PackedFloat32Array(0.2),
 "times": PackedFloat32Array(0.2),
 "transitions": PackedFloat32Array(1),
 "transitions": PackedFloat32Array(1),
-"update": 3,
+"update": 2,
 "values": [Color(1, 1, 1, 1)]
 "values": [Color(1, 1, 1, 1)]
 }
 }
 
 
@@ -245,6 +246,9 @@ _data = {
 }
 }
 
 
 [sub_resource type="AudioStreamRandomizer" id="35"]
 [sub_resource type="AudioStreamRandomizer" id="35"]
+streams_count = 1
+stream_0/stream = ExtResource("11_cqsut")
+stream_0/weight = 1.0
 
 
 [node name="Player" type="CharacterBody3D"]
 [node name="Player" type="CharacterBody3D"]
 collision_layer = 6
 collision_layer = 6
@@ -257,92 +261,92 @@ script = ExtResource("1")
 transform = Transform3D(0.803991, 0, 0, 0, 0.803991, 0, 0, 0, 0.803991, 0, 0, 0)
 transform = Transform3D(0.803991, 0, 0, 0, 0.803991, 0, 0, 0, 0.803991, 0, 0, 0)
 
 
 [node name="Skeleton3D" parent="PlayerModel/Robot_Skeleton" index="0"]
 [node name="Skeleton3D" parent="PlayerModel/Robot_Skeleton" index="0"]
-bones/1/position = Vector3(0.112747, 2.24482, -0.179225)
-bones/1/rotation = Quaternion(0.189545, 0.0584152, -0.00816815, 0.980099)
-bones/2/position = Vector3(-2.48258e-05, 0.241017, -0.0006072)
-bones/2/rotation = Quaternion(-0.0518137, -0.0172694, 0.00241486, 0.998505)
-bones/3/position = Vector3(-2.57153e-05, 0.104105, -7.96098e-05)
-bones/3/rotation = Quaternion(-0.0604585, -0.017407, -0.00102955, 0.998018)
-bones/4/position = Vector3(-2.48531e-05, 0.119128, 0.000472652)
-bones/4/rotation = Quaternion(0.00272067, -0.017081, -0.00350736, 0.999844)
-bones/5/position = Vector3(1.20492e-07, 0.326539, -3.16789e-06)
-bones/5/rotation = Quaternion(0.180715, 8.38469e-05, 0.00184621, 0.983534)
-bones/6/rotation = Quaternion(0.0158293, 0.821855, 0.568834, -0.0270437)
-bones/7/position = Vector3(1.26679e-10, -0.000460265, -0.00927423)
-bones/7/rotation = Quaternion(-0.00308675, 0.70669, 0.707477, 0.00753341)
-bones/10/position = Vector3(-2.11634e-08, 0.245584, 0.126631)
-bones/11/rotation = Quaternion(4.16283e-07, 0.930597, 0.366045, -5.69716e-07)
-bones/12/rotation = Quaternion(4.1672e-07, 0.930597, 0.366045, -5.69714e-07)
-bones/13/rotation = Quaternion(0.0442983, 0.958142, -0.282457, 0.0147928)
-bones/14/rotation = Quaternion(2.09954e-07, 0.959165, -0.282846, -7.20701e-07)
-bones/15/rotation = Quaternion(-0.331708, -0.361759, -0.44936, 0.746442)
-bones/16/rotation = Quaternion(-0.658222, 0.00333167, 0.0200774, 0.752549)
-bones/17/rotation = Quaternion(-0.0159655, 0.0145416, -0.391928, 0.919742)
-bones/18/rotation = Quaternion(-0.0251505, 0.00492976, -0.374362, 0.926929)
-bones/20/rotation = Quaternion(-0.0256483, -0.0136225, 0.991449, 0.127222)
-bones/22/rotation = Quaternion(-0.190478, -0.0362565, -0.00114153, 0.981021)
-bones/23/rotation = Quaternion(-0.274758, -0.0199009, -0.00385725, 0.9613)
-bones/24/rotation = Quaternion(-0.374455, -0.119375, -0.00806864, 0.919493)
-bones/25/rotation = Quaternion(-0.474498, -0.0703119, -0.0253691, 0.877077)
-bones/25/scale = Vector3(0.857257, 0.857257, 0.857257)
-bones/27/rotation = Quaternion(-0.0999148, 0.0999157, -0.700015, 0.70001)
-bones/28/rotation = Quaternion(0.000152031, -0.0079222, 0.482147, 0.876055)
+bones/1/position = Vector3(0.114471, 2.19771, -0.197845)
+bones/1/rotation = Quaternion(0.191422, -0.0471201, -0.00831942, 0.980341)
+bones/2/position = Vector3(-2.59096e-05, 0.236002, 0.000347473)
+bones/2/rotation = Quaternion(-0.0580488, 0.0310587, -0.0085914, 0.997794)
+bones/3/position = Vector3(-2.18095e-05, 0.099969, -0.000196632)
+bones/3/rotation = Quaternion(-0.0666872, 0.0321419, -0.00231371, 0.997253)
+bones/4/position = Vector3(-2.59159e-05, 0.114133, -0.000581095)
+bones/4/rotation = Quaternion(-0.00354388, 0.0321425, 0.00230484, 0.999474)
+bones/5/position = Vector3(-2.43745e-05, 0.324081, -0.000340238)
+bones/5/rotation = Quaternion(0.180714, -0.000147039, -0.00323768, 0.98353)
+bones/6/rotation = Quaternion(-0.0485126, 0.842737, 0.535365, 0.0287319)
+bones/7/position = Vector3(4.04225e-10, -0.000460251, -0.0122025)
+bones/7/rotation = Quaternion(-0.00550106, 0.706892, 0.7073, -6.21308e-05)
+bones/10/position = Vector3(-1.84812e-08, 0.245584, 0.126631)
+bones/11/rotation = Quaternion(4.16221e-07, 0.930597, 0.366045, -5.69803e-07)
+bones/12/rotation = Quaternion(4.16741e-07, 0.930597, 0.366045, -5.69636e-07)
+bones/13/rotation = Quaternion(0.0442984, 0.958142, -0.282457, 0.0147929)
+bones/14/rotation = Quaternion(2.10123e-07, 0.959165, -0.282846, -7.20719e-07)
+bones/15/rotation = Quaternion(-0.32727, -0.360551, -0.468834, 0.736948)
+bones/16/rotation = Quaternion(-0.583355, 0.0257804, 0.175832, 0.792538)
+bones/17/rotation = Quaternion(-0.12544, 0.0183483, -0.297794, 0.946175)
+bones/18/rotation = Quaternion(-0.13412, 0.00169904, -0.293483, 0.946508)
+bones/20/rotation = Quaternion(-0.0333503, -0.0174486, 0.985613, 0.164775)
+bones/22/rotation = Quaternion(-0.101756, -0.0372755, 0.00205727, 0.994109)
+bones/23/rotation = Quaternion(-0.172308, -0.0201959, -0.0017465, 0.984835)
+bones/24/rotation = Quaternion(-0.293646, -0.119625, 0.00227089, 0.948397)
+bones/25/rotation = Quaternion(-0.305094, -0.0737783, -0.0120048, 0.949384)
+bones/25/scale = Vector3(0.9276, 0.9276, 0.9276)
+bones/27/rotation = Quaternion(-0.046475, 0.0464755, -0.70558, 0.705575)
+bones/28/rotation = Quaternion(1.9788e-06, -0.00804714, 0.438559, 0.898666)
 bones/28/scale = Vector3(0.999995, 1.00001, 1)
 bones/28/scale = Vector3(0.999995, 1.00001, 1)
 bones/29/rotation = Quaternion(0.00420373, 0.00610656, 0.137006, 0.990542)
 bones/29/rotation = Quaternion(0.00420373, 0.00610656, 0.137006, 0.990542)
-bones/30/rotation = Quaternion(-0.00020139, -0.00407451, 0.53883, 0.842405)
-bones/33/rotation = Quaternion(-0.129328, -0.0190031, -0.00842144, 0.991384)
-bones/34/rotation = Quaternion(-0.339353, -0.0161833, -0.00827396, 0.940484)
-bones/35/rotation = Quaternion(-0.461742, -0.11803, -0.0195909, 0.878908)
-bones/36/rotation = Quaternion(-0.482388, -0.0670355, -0.0315031, 0.87282)
-bones/36/scale = Vector3(0.780025, 0.780025, 0.780026)
-bones/39/rotation = Quaternion(-0.101031, -0.010385, -0.00257952, 0.994826)
-bones/40/rotation = Quaternion(-0.395013, -0.00855057, -0.0121898, 0.918555)
-bones/41/rotation = Quaternion(-0.534464, -0.11595, -0.029509, 0.83668)
-bones/42/rotation = Quaternion(-0.511893, -0.0691523, -0.0283786, 0.855791)
-bones/42/scale = Vector3(0.713754, 0.713754, 0.713754)
-bones/45/rotation = Quaternion(0.183996, -0.124165, 0.968448, 0.1133)
-bones/47/rotation = Quaternion(-0.385925, 0.0247654, 0.0868113, 0.918103)
-bones/48/rotation = Quaternion(0.0798031, 0.0896546, 0.516723, 0.847697)
-bones/49/rotation = Quaternion(-0.250677, -0.0331715, -0.273487, 0.928044)
-bones/50/rotation = Quaternion(-0.337279, 0.36993, 0.445825, 0.742048)
-bones/51/rotation = Quaternion(-0.60301, 0.0805616, -0.120547, 0.784447)
-bones/52/rotation = Quaternion(-0.102644, -0.0215501, 0.284704, 0.952861)
-bones/53/rotation = Quaternion(-0.0940999, -0.0201033, 0.237369, 0.966642)
+bones/30/rotation = Quaternion(-1.1035e-06, -0.00407949, 0.496822, 0.867843)
+bones/33/rotation = Quaternion(-0.114047, -0.0244369, -0.00705955, 0.99315)
+bones/34/rotation = Quaternion(-0.241326, -0.0246631, -0.00228567, 0.970128)
+bones/35/rotation = Quaternion(-0.357815, -0.119498, -0.00591506, 0.926096)
+bones/36/rotation = Quaternion(-0.380382, -0.0701734, -0.0237044, 0.921859)
+bones/36/scale = Vector3(0.88488, 0.88488, 0.88488)
+bones/39/rotation = Quaternion(-0.0892815, -0.012104, -0.00192397, 0.995931)
+bones/40/rotation = Quaternion(-0.340028, -0.0148456, -0.00704032, 0.940272)
+bones/41/rotation = Quaternion(-0.481488, -0.117558, -0.0222535, 0.868248)
+bones/42/rotation = Quaternion(-0.454956, -0.0708568, -0.0238055, 0.887371)
+bones/42/scale = Vector3(0.782288, 0.782288, 0.782288)
+bones/45/rotation = Quaternion(0.189237, -0.136731, 0.960665, 0.150386)
+bones/47/rotation = Quaternion(-0.33433, 0.0109879, 0.229722, 0.913964)
+bones/48/rotation = Quaternion(0.0988535, 0.0739998, 0.59455, 0.79452)
+bones/49/rotation = Quaternion(-0.272292, -0.0316085, -0.101694, 0.956303)
+bones/50/rotation = Quaternion(-0.352103, 0.372302, 0.466876, 0.720723)
+bones/51/rotation = Quaternion(-0.562285, 0.0470834, -0.0186427, 0.825391)
+bones/52/rotation = Quaternion(-0.136654, -0.0292199, 0.347082, 0.927365)
+bones/53/rotation = Quaternion(-0.132963, -0.0230265, 0.328781, 0.934716)
 bones/55/rotation = Quaternion(0.0015298, -0.0653359, 0.997819, 0.00923565)
 bones/55/rotation = Quaternion(0.0015298, -0.0653359, 0.997819, 0.00923565)
-bones/56/rotation = Quaternion(0.018703, -0.0176178, 0.997632, 0.0638055)
+bones/56/rotation = Quaternion(0.0141959, -0.0169523, 0.990923, 0.132601)
 bones/56/scale = Vector3(0.989954, 0.989954, 0.989954)
 bones/56/scale = Vector3(0.989954, 0.989954, 0.989954)
-bones/58/rotation = Quaternion(-0.104547, 0.0285673, 0.0205195, 0.993898)
+bones/58/rotation = Quaternion(-0.152248, 0.0295267, 0.0247152, 0.987592)
 bones/58/scale = Vector3(1, 1, 0.99999)
 bones/58/scale = Vector3(1, 1, 0.99999)
-bones/59/rotation = Quaternion(-0.247723, 0.0242187, 0.00660118, 0.968506)
+bones/59/rotation = Quaternion(-0.268975, 0.0255532, 0.00845898, 0.962771)
 bones/59/scale = Vector3(1.00001, 0.999999, 0.999989)
 bones/59/scale = Vector3(1.00001, 0.999999, 0.999989)
-bones/60/rotation = Quaternion(-0.336089, 0.113407, -0.0560752, 0.933295)
+bones/60/rotation = Quaternion(-0.333087, 0.114262, -0.0537661, 0.934402)
 bones/60/scale = Vector3(1.00003, 0.999983, 0.999974)
 bones/60/scale = Vector3(1.00003, 0.999983, 0.999974)
-bones/61/rotation = Quaternion(-0.377277, 0.0726351, 0.0176491, 0.923079)
-bones/61/scale = Vector3(0.881594, 0.881594, 0.881594)
-bones/63/rotation = Quaternion(-0.106395, -0.106392, 0.699056, 0.699058)
-bones/64/rotation = Quaternion(0.000139915, 0.00797535, -0.528362, 0.848982)
+bones/61/rotation = Quaternion(-0.433423, 0.07141, 0.0220899, 0.898086)
+bones/61/scale = Vector3(0.859692, 0.859692, 0.859692)
+bones/63/rotation = Quaternion(-0.159319, -0.159316, 0.688924, 0.688926)
+bones/64/rotation = Quaternion(6.27332e-05, 0.00805713, -0.508872, 0.860805)
 bones/64/scale = Vector3(0.999962, 1.00002, 1)
 bones/64/scale = Vector3(0.999962, 1.00002, 1)
-bones/65/rotation = Quaternion(0.00428411, -0.0058272, -0.177504, 0.984094)
+bones/65/rotation = Quaternion(0.00436191, -0.00582184, -0.181146, 0.983429)
 bones/65/scale = Vector3(0.999958, 1.00004, 0.999999)
 bones/65/scale = Vector3(0.999958, 1.00004, 0.999999)
-bones/66/rotation = Quaternion(-0.000506882, 0.00402501, -0.598442, 0.801156)
-bones/66/scale = Vector3(0.977045, 0.977045, 0.977045)
-bones/69/rotation = Quaternion(-0.108493, 0.0288984, 0.0283406, 0.993273)
+bones/66/rotation = Quaternion(-0.000422206, 0.00403478, -0.581479, 0.813551)
+bones/66/scale = Vector3(0.976474, 0.976474, 0.976474)
+bones/69/rotation = Quaternion(-0.122454, 0.0307826, 0.0316084, 0.991493)
 bones/69/scale = Vector3(1, 1, 0.99999)
 bones/69/scale = Vector3(1, 1, 0.99999)
-bones/70/rotation = Quaternion(-0.285583, 0.0249973, 0.00855111, 0.95799)
+bones/70/rotation = Quaternion(-0.341953, 0.0266894, 0.0099067, 0.939286)
 bones/70/scale = Vector3(1.00001, 0.999998, 0.999987)
 bones/70/scale = Vector3(1.00001, 0.999998, 0.999987)
-bones/71/rotation = Quaternion(-0.3736, 0.11218, -0.0605725, 0.918787)
+bones/71/rotation = Quaternion(-0.428049, 0.110344, -0.0680517, 0.894409)
 bones/71/scale = Vector3(1.00003, 0.999966, 0.999989)
 bones/71/scale = Vector3(1.00003, 0.999966, 0.999989)
-bones/72/rotation = Quaternion(-0.416664, 0.0691777, 0.0264697, 0.906038)
-bones/72/scale = Vector3(0.852956, 0.852956, 0.852956)
-bones/75/rotation = Quaternion(-0.470963, 0.0704138, 0.0250857, 0.87898)
-bones/75/scale = Vector3(0.766846, 0.766847, 0.766847)
-bones/77/rotation = Quaternion(-0.0810793, 0.0320988, 0.0227979, 0.99593)
+bones/72/rotation = Quaternion(-0.478543, 0.0671738, 0.0312071, 0.874935)
+bones/72/scale = Vector3(0.786289, 0.786289, 0.78629)
+bones/75/rotation = Quaternion(-0.528802, 0.0685746, 0.0297475, 0.845448)
+bones/75/scale = Vector3(0.706024, 0.706024, 0.706024)
+bones/77/rotation = Quaternion(-0.0976766, 0.0338585, 0.0261503, 0.994298)
 bones/77/scale = Vector3(1, 1, 0.999991)
 bones/77/scale = Vector3(1, 1, 0.999991)
-bones/78/rotation = Quaternion(-0.365816, 0.0263463, 0.0107569, 0.930252)
+bones/78/rotation = Quaternion(-0.41667, 0.0280438, 0.0114911, 0.908552)
 bones/78/scale = Vector3(1.00001, 0.999996, 0.999989)
 bones/78/scale = Vector3(1.00001, 0.999996, 0.999989)
-bones/79/rotation = Quaternion(-0.472185, 0.107543, -0.074611, 0.871727)
+bones/79/rotation = Quaternion(-0.517334, 0.105533, -0.0810188, 0.845378)
 bones/79/scale = Vector3(1.00002, 0.999944, 1.00001)
 bones/79/scale = Vector3(1.00002, 0.999944, 1.00001)
-bones/81/rotation = Quaternion(-0.153336, -0.0944361, 0.980683, 0.0763586)
+bones/81/rotation = Quaternion(-0.140881, -0.0821249, 0.975849, 0.145349)
 bones/81/scale = Vector3(1.00003, 0.999997, 0.999962)
 bones/81/scale = Vector3(1.00003, 0.999997, 0.999962)
 bones/82/scale = Vector3(0.810427, 0.733534, 0.810426)
 bones/82/scale = Vector3(0.810427, 0.733534, 0.810426)
 bones/83/rotation = Quaternion(-0.499999, -0.499999, 0.500002, 0.499999)
 bones/83/rotation = Quaternion(-0.499999, -0.499999, 0.500002, 0.499999)
@@ -356,71 +360,70 @@ bones/89/rotation = Quaternion(-1.75017e-05, 0.00750475, 0.999972, -3.4666e-05)
 bones/90/position = Vector3(-5.19271e-06, 0.109669, -0.0266081)
 bones/90/position = Vector3(-5.19271e-06, 0.109669, -0.0266081)
 bones/91/position = Vector3(0.000285693, 1.38812e-06, -0.119667)
 bones/91/position = Vector3(0.000285693, 1.38812e-06, -0.119667)
 bones/92/position = Vector3(-4.50605e-06, 0.000595327, 0.0266991)
 bones/92/position = Vector3(-4.50605e-06, 0.000595327, 0.0266991)
-bones/95/rotation = Quaternion(-0.339017, -0.00953308, -0.1438, 0.929677)
-bones/96/rotation = Quaternion(0.112655, -0.0836115, -0.546335, 0.825734)
-bones/97/rotation = Quaternion(-0.245348, 0.0450574, 0.206352, 0.946147)
-bones/98/rotation = Quaternion(0.999038, -0.0374132, -0.0124475, 0.0191926)
-bones/99/rotation = Quaternion(0.664914, 0.211576, 0.566473, -0.438444)
-bones/100/rotation = Quaternion(-0.089324, -0.206935, 0.90392, 0.363493)
-bones/101/rotation = Quaternion(-0.171816, -0.276936, 0.942562, 0.073233)
-bones/102/rotation = Quaternion(0.261421, 0.763253, -0.587778, 0.0601749)
-bones/103/rotation = Quaternion(0.0452183, -0.0326016, 0.0330358, 0.997898)
-bones/104/rotation = Quaternion(-0.673468, 0.198116, 0.53033, 0.475333)
-bones/105/rotation = Quaternion(0.0758732, -0.271487, 0.826446, -0.487366)
-bones/106/rotation = Quaternion(0.141732, -0.351994, 0.90672, -0.18404)
-bones/107/rotation = Quaternion(-0.252575, 0.813877, -0.504253, -0.139781)
-bones/108/rotation = Quaternion(0.00843133, 0.0419612, 0.00956108, 0.999038)
-bones/112/rotation = Quaternion(0.997893, -0.0300774, 0.00101918, -0.0574727)
-bones/113/rotation = Quaternion(0.998488, 0.0148551, 0.00358661, -0.0527962)
-bones/114/position = Vector3(0.0935097, 0.107868, 0.129002)
-bones/114/rotation = Quaternion(-0.0279321, 0.743286, 0.668088, 0.0200959)
-bones/115/position = Vector3(-0.107676, 0.104921, 0.120742)
-bones/115/rotation = Quaternion(-0.0191597, 0.741925, 0.66939, 0.03312)
-bones/116/rotation = Quaternion(0.972047, 0.061624, -0.00439252, 0.226511)
-bones/117/rotation = Quaternion(0.300103, 1.78184e-07, -1.55217e-07, 0.953907)
+bones/95/rotation = Quaternion(-0.275824, -0.0104757, -0.0632918, 0.959065)
+bones/96/rotation = Quaternion(0.153967, -0.108176, -0.486102, 0.853403)
+bones/97/rotation = Quaternion(-0.172637, 0.0605455, 0.284673, 0.941006)
+bones/98/rotation = Quaternion(0.999248, -0.0360589, 0.0039036, -0.0137436)
+bones/99/rotation = Quaternion(0.687696, 0.179785, 0.508445, -0.48604)
+bones/100/rotation = Quaternion(-0.112846, -0.139315, 0.980609, 0.0791448)
+bones/101/rotation = Quaternion(-0.221186, -0.167851, 0.943327, -0.181759)
+bones/102/rotation = Quaternion(0.379181, 0.545462, -0.688325, 0.291378)
+bones/103/rotation = Quaternion(0.0836281, -0.0299833, 0.0332402, 0.995491)
+bones/104/rotation = Quaternion(-0.644761, 0.23807, 0.588858, 0.425268)
+bones/105/rotation = Quaternion(0.10088, -0.0926342, 0.9822, -0.128548)
+bones/106/rotation = Quaternion(0.21469, -0.149152, 0.956349, 0.130607)
+bones/107/rotation = Quaternion(-0.36549, 0.558876, -0.70938, -0.225513)
+bones/108/rotation = Quaternion(0.0272373, 0.0359207, 0.0321342, 0.998466)
+bones/112/rotation = Quaternion(0.997193, 0.0376999, 0.000362304, -0.0646915)
+bones/113/rotation = Quaternion(0.998636, -0.0190188, -0.00395173, -0.048465)
+bones/114/position = Vector3(0.112938, 0.105986, 0.119412)
+bones/114/rotation = Quaternion(0.0309864, 0.74149, 0.6695, -0.031667)
+bones/115/position = Vector3(-0.0894714, 0.108534, 0.129812)
+bones/115/rotation = Quaternion(0.0353867, 0.742242, 0.668716, -0.0253602)
+bones/116/rotation = Quaternion(0.834077, 0.087741, -0.0734418, 0.539651)
+bones/117/rotation = Quaternion(0.301092, -8.64351e-08, 1.92925e-07, 0.953595)
 bones/117/scale = Vector3(1, 1, 0.999994)
 bones/117/scale = Vector3(1, 1, 0.999994)
-bones/118/rotation = Quaternion(0.134059, 3.52516e-11, 2.68066e-09, 0.990973)
-bones/118/scale = Vector3(1.00191, 1.00192, 1.00191)
-bones/119/rotation = Quaternion(-0.475004, -0.0651922, -0.0107088, 0.8775)
-bones/120/rotation = Quaternion(1.57656e-08, 0.955472, -0.295083, -3.95218e-08)
+bones/118/rotation = Quaternion(0.221669, -9.00512e-10, 7.85517e-10, 0.975122)
+bones/118/scale = Vector3(1.03212, 1.03212, 1.03211)
+bones/119/rotation = Quaternion(-0.601832, -0.0714571, 0.0206564, 0.795151)
+bones/120/rotation = Quaternion(1.51722e-08, 0.951214, -0.308531, -3.96825e-08)
 bones/121/rotation = Quaternion(-0.384436, 5.74738e-10, -6.29245e-09, 0.923152)
 bones/121/rotation = Quaternion(-0.384436, 5.74738e-10, -6.29245e-09, 0.923152)
-bones/122/position = Vector3(-8.91079e-08, 0.0923732, -0.12456)
-bones/122/rotation = Quaternion(0.978911, -3.69191e-07, 5.59649e-09, 0.204286)
+bones/122/position = Vector3(-1.07904e-07, 0.0866593, -0.124063)
+bones/122/rotation = Quaternion(0.976303, 1.49667e-07, -7.49494e-09, 0.216409)
 bones/122/scale = Vector3(1, 1.00001, 1.00005)
 bones/122/scale = Vector3(1, 1.00001, 1.00005)
-bones/123/position = Vector3(1.08179e-08, 0.0796492, -0.128668)
-bones/124/rotation = Quaternion(0.934235, -0.0843714, 0.0727639, 0.338809)
-bones/125/rotation = Quaternion(0.192762, 8.53866e-08, -5.95078e-08, 0.981246)
+bones/123/position = Vector3(-8.70179e-09, 0.0552025, -0.129837)
+bones/124/rotation = Quaternion(0.976531, -0.0546758, 0.0165018, 0.207665)
+bones/125/rotation = Quaternion(0.261977, -6.1263e-08, 5.79902e-08, 0.965074)
 bones/125/scale = Vector3(1, 1, 0.999998)
 bones/125/scale = Vector3(1, 1, 0.999998)
-bones/126/rotation = Quaternion(0.0886535, -2.63749e-09, 4.43804e-09, 0.996063)
-bones/126/scale = Vector3(1.03678, 1.03678, 1.03678)
+bones/126/rotation = Quaternion(0.123087, -1.43068e-09, 1.10935e-09, 0.992396)
+bones/126/scale = Vector3(1.00658, 1.00658, 1.00658)
 bones/127/position = Vector3(0.0175439, 0.447091, -0.00175865)
 bones/127/position = Vector3(0.0175439, 0.447091, -0.00175865)
-bones/127/rotation = Quaternion(-0.584915, 0.0705032, -0.050173, 0.806465)
-bones/128/rotation = Quaternion(1.6618e-08, 0.947691, -0.319189, -4.15168e-08)
+bones/127/rotation = Quaternion(-0.606413, 0.0197525, -0.057015, 0.792857)
+bones/128/rotation = Quaternion(1.46836e-08, 0.931401, -0.363995, -4.19495e-08)
 bones/129/rotation = Quaternion(-0.384436, -5.74738e-10, 4.27475e-09, 0.923152)
 bones/129/rotation = Quaternion(-0.384436, -5.74738e-10, 4.27475e-09, 0.923152)
-bones/130/position = Vector3(9.79673e-08, 0.0872379, -0.124113)
-bones/130/rotation = Quaternion(0.990448, -5.87626e-07, 2.49085e-08, 0.137887)
+bones/130/position = Vector3(9.90265e-08, 0.0885918, -0.124231)
+bones/130/rotation = Quaternion(0.982475, -1.0364e-07, 9.68408e-09, 0.186397)
 bones/130/scale = Vector3(1, 1, 1.00005)
 bones/130/scale = Vector3(1, 1, 1.00005)
-bones/131/position = Vector3(-4.18828e-09, 0.0571812, -0.129742)
-bones/132/position = Vector3(0.194228, 1.84115, 1.06563)
-bones/133/position = Vector3(-0.0815628, 1.84115, 1.06563)
-bones/134/position = Vector3(0.313751, 1.69434, -0.301888)
-bones/135/position = Vector3(-0.111964, 1.44465, -0.096249)
+bones/131/position = Vector3(-9.51459e-09, 0.0634701, -0.129441)
+bones/132/position = Vector3(0.178054, 1.84115, 1.06563)
+bones/133/position = Vector3(-0.0977371, 1.84115, 1.06563)
+bones/134/position = Vector3(0.337592, 1.47011, 0.000907764)
+bones/135/position = Vector3(-0.110983, 1.49475, -0.455707)
 bones/135/rotation = Quaternion(0.998099, -2.22234e-10, 0.0616301, 3.59907e-09)
 bones/135/rotation = Quaternion(0.998099, -2.22234e-10, 0.0616301, 3.59907e-09)
-bones/136/position = Vector3(0.641459, 1.90561, 7.47037)
-bones/137/position = Vector3(0.500003, 2.4408, -0.0622085)
+bones/136/position = Vector3(0.0303103, 2.63376, 7.7703)
+bones/137/position = Vector3(0.566637, 2.31722, -0.29608)
 bones/137/rotation = Quaternion(-0.707078, 0.00643217, -0.00643217, 0.707078)
 bones/137/rotation = Quaternion(-0.707078, 0.00643217, -0.00643217, 0.707078)
-bones/138/position = Vector3(0.720185, 2.4899, -0.397703)
-bones/139/position = Vector3(-0.345821, 2.44671, -0.127596)
-bones/139/rotation = Quaternion(-0.707079, 0.0062912, -0.0062912, 0.707079)
-bones/140/position = Vector3(-0.280271, 2.77166, -0.370498)
-bones/141/position = Vector3(0.137896, 1.38012, -0.626978)
-bones/142/position = Vector3(-0.137896, 1.386, -0.626978)
-bones/143/position = Vector3(-0.0104, 3.27435, -1.24379)
-bones/143/rotation = Quaternion(0.998812, 0, 0.0487269, 0)
-bones/143/scale = Vector3(1, 1.03343, 1)
+bones/138/position = Vector3(0.541324, 2.71162, -0.402817)
+bones/139/position = Vector3(-0.318382, 2.36747, 0.064695)
+bones/139/rotation = Quaternion(-0.707081, 0.005988, -0.005988, 0.707081)
+bones/140/position = Vector3(-0.507284, 2.54251, -0.363702)
+bones/142/position = Vector3(-0.137896, 1.38137, -0.626978)
+bones/143/position = Vector3(0.018793, 3.23785, -1.24379)
+bones/143/rotation = Quaternion(0.997911, 0, -0.0646097, 0)
+bones/143/scale = Vector3(1, 0.975162, 1)
 
 
 [node name="GunBone" type="BoneAttachment3D" parent="PlayerModel/Robot_Skeleton/Skeleton3D" index="5"]
 [node name="GunBone" type="BoneAttachment3D" parent="PlayerModel/Robot_Skeleton/Skeleton3D" index="5"]
-transform = Transform3D(-0.0198853, 0.546856, -0.836998, 0.269946, 0.809008, 0.522166, 0.962802, -0.215533, -0.16369, -0.444207, 1.139, -0.144542)
+transform = Transform3D(0.333531, 0.128981, -0.933896, 0.567174, 0.763886, 0.308015, 0.753209, -0.632331, 0.181604, -0.323915, 1.07098, 0.0497144)
 bone_name = "hand.R"
 bone_name = "hand.R"
 bone_idx = 55
 bone_idx = 55
 
 

+ 5 - 0
project.godot

@@ -32,6 +32,10 @@ window/size/fullscreen=true
 
 
 import/use_multiple_threads=false
 import/use_multiple_threads=false
 
 
+[filesystem]
+
+import/blender/enabled=false
+
 [input]
 [input]
 
 
 ui_accept={
 ui_accept={
@@ -214,5 +218,6 @@ common/physics_interpolation=true
 [rendering]
 [rendering]
 
 
 reflections/sky_reflections/texture_array_reflections=false
 reflections/sky_reflections/texture_array_reflections=false
+environment/ssao/half_size=false
 anti_aliasing/quality/msaa_3d=3
 anti_aliasing/quality/msaa_3d=3
 environment/default_environment="res://default_env.tres"
 environment/default_environment="res://default_env.tres"