Przeglądaj źródła

Update to Godot 4.4 (#203)

Aaron Franke 4 miesięcy temu
rodzic
commit
bd9b9ef2fd
52 zmienionych plików z 95 dodań i 56 usunięć
  1. 1 0
      door/door.gd.uid
  2. 1 1
      door/door.tscn
  3. 1 0
      door/model/door.dae.import
  4. 1 0
      effects_shared/BlastMesh.glb.import
  5. 1 0
      enemies/red_robot/laser/BarrelSmoke.glb.import
  6. 1 0
      enemies/red_robot/laser/LaserShader.gdshader.uid
  7. 1 0
      enemies/red_robot/laser/impact_effect/EmissionAlbedoParticle.gdshader.uid
  8. 1 0
      enemies/red_robot/laser/impact_effect/EmissionEmbers.gdshader.uid
  9. 1 0
      enemies/red_robot/laser/impact_effect/LightRaysMesh.glb.import
  10. 1 0
      enemies/red_robot/laser/impact_effect/blast.gd.uid
  11. 5 5
      enemies/red_robot/laser/impact_effect/impact_effect.tscn
  12. 1 0
      enemies/red_robot/laser/smoke.gdshader.uid
  13. 1 0
      enemies/red_robot/model/red_robot.glb.import
  14. 1 0
      enemies/red_robot/parts/part.gd.uid
  15. 1 0
      enemies/red_robot/parts/part_disappear_effect/part_disappear.gd.uid
  16. 1 1
      enemies/red_robot/parts/part_disappear_effect/part_disappear.tscn
  17. 1 0
      enemies/red_robot/parts/part_head.glb.import
  18. 1 0
      enemies/red_robot/parts/part_shield.glb.import
  19. 1 0
      enemies/red_robot/parts/ray.gdshader.uid
  20. 1 0
      enemies/red_robot/parts/ray.glb.import
  21. 1 0
      enemies/red_robot/parts/sparks_effect/SparkParticle.glb.import
  22. 1 0
      enemies/red_robot/parts/sparks_effect/SparkShader.gdshader.uid
  23. 1 0
      enemies/red_robot/red_robot.gd.uid
  24. 26 26
      enemies/red_robot/red_robot.tscn
  25. 1 0
      enemies/red_robot/smoke.gdshader.uid
  26. 1 0
      level/debug.gd.uid
  27. 1 0
      level/forklift/flying_forklift.gd.uid
  28. 1 0
      level/forklift/flying_forklift.glb.import
  29. 1 1
      level/forklift/flying_forklift.tscn
  30. 1 0
      level/geometry/models/core.glb.import
  31. 1 0
      level/geometry/models/lights.glb.import
  32. 1 0
      level/geometry/models/props.glb.import
  33. 1 0
      level/geometry/models/structure.glb.import
  34. 4 4
      level/geometry/scenes/core.tscn
  35. 1 0
      level/level.gd.uid
  36. 3 3
      level/level.tscn
  37. 1 0
      level/textures/structure/Core/CoreOutLight.glb.import
  38. 1 0
      main/main.gd.uid
  39. 1 1
      main/main.tscn
  40. 1 0
      menu/font/PT_Sans-Web-Bold.ttf.import
  41. 1 0
      menu/menu.gd.uid
  42. 1 1
      menu/menu.tscn
  43. 1 0
      menu/settings.gd.uid
  44. 1 0
      player/bullet/bullet.gd.uid
  45. 5 5
      player/bullet/bullet.tscn
  46. 1 1
      player/bullet/effect/BlastMaterial.tres
  47. 1 0
      player/camera_noise_shake_effect.gd.uid
  48. 1 0
      player/model/player.glb.import
  49. 1 0
      player/player.gd.uid
  50. 6 6
      player/player.tscn
  51. 1 0
      player/player_input.gd.uid
  52. 1 1
      project.godot

+ 1 - 0
door/door.gd.uid

@@ -0,0 +1 @@
+uid://7v3r683kok5s

+ 1 - 1
door/door.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=3 uid="uid://bcnpdinrepean"]
 
-[ext_resource type="Script" path="res://door/door.gd" id="1"]
+[ext_resource type="Script" uid="uid://7v3r683kok5s" path="res://door/door.gd" id="1"]
 [ext_resource type="PackedScene" uid="uid://bivo3ncbyf02f" path="res://door/model/door.dae" id="2"]
 [ext_resource type="AudioStream" uid="uid://c2nls7s14emyc" path="res://door/open_close.wav" id="3"]
 

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

@@ -18,6 +18,7 @@ nodes/root_name="DoorModel"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

+ 1 - 0
effects_shared/BlastMesh.glb.import

@@ -18,6 +18,7 @@ nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

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

@@ -18,6 +18,7 @@ nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

+ 1 - 0
enemies/red_robot/laser/LaserShader.gdshader.uid

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

+ 1 - 0
enemies/red_robot/laser/impact_effect/EmissionAlbedoParticle.gdshader.uid

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

+ 1 - 0
enemies/red_robot/laser/impact_effect/EmissionEmbers.gdshader.uid

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

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

@@ -18,6 +18,7 @@ nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

+ 1 - 0
enemies/red_robot/laser/impact_effect/blast.gd.uid

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

+ 5 - 5
enemies/red_robot/laser/impact_effect/impact_effect.tscn

@@ -4,8 +4,8 @@
 [ext_resource type="Texture2D" uid="uid://bpm6frbylo5an" path="res://effects_shared/BlastTexture.png" id="2"]
 [ext_resource type="ArrayMesh" uid="uid://dsxo5so87px6f" path="res://enemies/red_robot/laser/impact_effect/LightRaysMesh_Plane.mesh" id="3"]
 [ext_resource type="Texture2D" uid="uid://clqkmuqdlo4rh" path="res://enemies/red_robot/laser/impact_effect/LightRays.png" id="4"]
-[ext_resource type="Script" path="res://enemies/red_robot/laser/impact_effect/blast.gd" id="5"]
-[ext_resource type="Shader" path="res://enemies/red_robot/laser/impact_effect/EmissionAlbedoParticle.gdshader" id="6"]
+[ext_resource type="Script" uid="uid://bk20efkdq4v3m" path="res://enemies/red_robot/laser/impact_effect/blast.gd" id="5"]
+[ext_resource type="Shader" uid="uid://cdmq65xiexdf8" path="res://enemies/red_robot/laser/impact_effect/EmissionAlbedoParticle.gdshader" id="6"]
 [ext_resource type="Material" uid="uid://yxudvmlt7e3h" path="res://enemies/red_robot/laser/impact_effect/EmissionEmbers.tres" id="8"]
 [ext_resource type="Texture2D" uid="uid://crq55yidge8wt" path="res://enemies/red_robot/laser/impact_effect/SmokePuffNormals.png" id="10"]
 [ext_resource type="Texture2D" uid="uid://bb6a2c0n7pgsk" path="res://enemies/red_robot/laser/impact_effect/SmokePuff.png" id="11"]
@@ -75,7 +75,7 @@ tracks/4/keys = {
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_y0aew"]
 _data = {
-"blast": SubResource("Animation_sfsol")
+&"blast": SubResource("Animation_sfsol")
 }
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_l7bxa"]
@@ -90,7 +90,7 @@ particles_anim_v_frames = 1
 particles_anim_loop = false
 
 [sub_resource type="Curve" id="Curve_3v6v7"]
-max_value = 5.0
+_limits = [0.0, 5.0, 0.0, 1.0]
 _data = [Vector2(0, 1.2), 0.0, 0.0, 0, 0, Vector2(1, 5), 7.54685, 0.0, 0, 0]
 point_count = 2
 
@@ -101,6 +101,7 @@ colors = PackedColorArray(1, 1, 1, 1, 1, 0, 0, 1)
 render_priority = 0
 shader = ExtResource("6")
 shader_parameter/albedo = Color(1, 1, 1, 1)
+shader_parameter/texture_albedo = ExtResource("4")
 shader_parameter/specular = 0.5
 shader_parameter/metallic = 0.0
 shader_parameter/roughness = 1.0
@@ -111,7 +112,6 @@ shader_parameter/uv1_scale = Vector3(1, 1, 1)
 shader_parameter/uv1_offset = Vector3(0, 0, 0)
 shader_parameter/uv2_scale = Vector3(1, 1, 1)
 shader_parameter/uv2_offset = Vector3(0, 0, 0)
-shader_parameter/texture_albedo = ExtResource("4")
 
 [sub_resource type="Curve" id="Curve_bo81s"]
 bake_resolution = 16

+ 1 - 0
enemies/red_robot/laser/smoke.gdshader.uid

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

+ 1 - 0
enemies/red_robot/model/red_robot.glb.import

@@ -18,6 +18,7 @@ nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

+ 1 - 0
enemies/red_robot/parts/part.gd.uid

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

+ 1 - 0
enemies/red_robot/parts/part_disappear_effect/part_disappear.gd.uid

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

+ 1 - 1
enemies/red_robot/parts/part_disappear_effect/part_disappear.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="Texture2D" uid="uid://bb6a2c0n7pgsk" path="res://enemies/red_robot/laser/impact_effect/SmokePuff.png" id="1"]
 [ext_resource type="Texture2D" uid="uid://crq55yidge8wt" path="res://enemies/red_robot/laser/impact_effect/SmokePuffNormals.png" id="2"]
-[ext_resource type="Script" path="res://enemies/red_robot/parts/part_disappear_effect/part_disappear.gd" id="3"]
+[ext_resource type="Script" uid="uid://dxd6xoeg627y6" path="res://enemies/red_robot/parts/part_disappear_effect/part_disappear.gd" id="3"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_7wgk7"]
 transparency = 1

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

@@ -18,6 +18,7 @@ nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

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

@@ -18,6 +18,7 @@ nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

+ 1 - 0
enemies/red_robot/parts/ray.gdshader.uid

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

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

@@ -18,6 +18,7 @@ nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

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

@@ -18,6 +18,7 @@ nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

+ 1 - 0
enemies/red_robot/parts/sparks_effect/SparkShader.gdshader.uid

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

+ 1 - 0
enemies/red_robot/red_robot.gd.uid

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

+ 26 - 26
enemies/red_robot/red_robot.tscn

@@ -1,11 +1,11 @@
 [gd_scene load_steps=99 format=3 uid="uid://byi6b08jpb2iw"]
 
-[ext_resource type="Script" path="res://enemies/red_robot/red_robot.gd" id="1"]
+[ext_resource type="Script" uid="uid://bf14mo0lrrvjl" 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="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="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" uid="uid://bfl0kmtf31qti" 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="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"]
@@ -23,7 +23,7 @@
 [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="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" uid="uid://c3vo80hyj6w6c" path="res://enemies/red_robot/parts/part.gd" id="24"]
 [ext_resource type="PackedScene" uid="uid://kl4f3mi24xdv" path="res://enemies/red_robot/laser/impact_effect/impact_effect.tscn" id="25_2mhnh"]
 
 [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_h6xi0"]
@@ -10054,27 +10054,27 @@ tracks/67/use_blend = true
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_cj6rv"]
 _data = {
-"Cannon-D": SubResource("Animation_ndf42"),
-"Cannon-L": SubResource("Animation_awjuk"),
-"Cannon-N": SubResource("Animation_p76sd"),
-"Cannon-R": SubResource("Animation_tcso2"),
-"Cannon-U": SubResource("Animation_lxh56"),
-"Cannon_Fire_Recoil": SubResource("Animation_fa0nr"),
-"Damage_heavy": SubResource("Animation_ogt1m"),
-"Damage_take1": SubResource("Animation_ilmtl"),
-"Damage_take2": SubResource("Animation_3sxtr"),
-"Idle": SubResource("Animation_c2h1b"),
-"Idle-Eyes": SubResource("Animation_1s7dt"),
-"NOEXP-DefaultPose-noexp": SubResource("Animation_uo7rk"),
-"NOEXP-TurnLeft45-noexp": SubResource("Animation_n6n3k"),
-"NOEXP-TurnRight45-noexp": SubResource("Animation_tooho"),
-"NOEXP-noexp": SubResource("Animation_mplp0"),
-"TurnLeft": SubResource("Animation_wlwqc"),
-"TurnLeft-cycle-noexp": SubResource("Animation_0u1xn"),
-"TurnLeft-start-cycle-noexp": SubResource("Animation_n3g31"),
-"TurnRight": SubResource("Animation_bwl45"),
-"TurnRight-start-noexp": SubResource("Animation_hyyrh"),
-"Walk": SubResource("Animation_arqgx")
+&"Cannon-D": SubResource("Animation_ndf42"),
+&"Cannon-L": SubResource("Animation_awjuk"),
+&"Cannon-N": SubResource("Animation_p76sd"),
+&"Cannon-R": SubResource("Animation_tcso2"),
+&"Cannon-U": SubResource("Animation_lxh56"),
+&"Cannon_Fire_Recoil": SubResource("Animation_fa0nr"),
+&"Damage_heavy": SubResource("Animation_ogt1m"),
+&"Damage_take1": SubResource("Animation_ilmtl"),
+&"Damage_take2": SubResource("Animation_3sxtr"),
+&"Idle": SubResource("Animation_c2h1b"),
+&"Idle-Eyes": SubResource("Animation_1s7dt"),
+&"NOEXP-DefaultPose-noexp": SubResource("Animation_uo7rk"),
+&"NOEXP-TurnLeft45-noexp": SubResource("Animation_n6n3k"),
+&"NOEXP-TurnRight45-noexp": SubResource("Animation_tooho"),
+&"NOEXP-noexp": SubResource("Animation_mplp0"),
+&"TurnLeft": SubResource("Animation_wlwqc"),
+&"TurnLeft-cycle-noexp": SubResource("Animation_0u1xn"),
+&"TurnLeft-start-cycle-noexp": SubResource("Animation_n3g31"),
+&"TurnRight": SubResource("Animation_bwl45"),
+&"TurnRight-start-noexp": SubResource("Animation_hyyrh"),
+&"Walk": SubResource("Animation_arqgx")
 }
 
 [sub_resource type="AnimationNodeAnimation" id="34"]
@@ -10405,7 +10405,7 @@ tracks/14/keys = {
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_oexr2"]
 _data = {
-"shoot": SubResource("55")
+&"shoot": SubResource("55")
 }
 
 [sub_resource type="PhysicsMaterial" id="56"]
@@ -10557,7 +10557,7 @@ tracks/7/keys = {
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_m5v3c"]
 _data = {
-"kaboom": SubResource("67")
+&"kaboom": SubResource("67")
 }
 
 [sub_resource type="StandardMaterial3D" id="68"]

+ 1 - 0
enemies/red_robot/smoke.gdshader.uid

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

+ 1 - 0
level/debug.gd.uid

@@ -0,0 +1 @@
+uid://6ec6m14rhsxi

+ 1 - 0
level/forklift/flying_forklift.gd.uid

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

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

@@ -18,6 +18,7 @@ nodes/root_name="FlyingForkliftModel"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

+ 1 - 1
level/forklift/flying_forklift.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="PackedScene" uid="uid://b3kcdt0p1pr74" path="res://level/forklift/flying_forklift.glb" id="1"]
 [ext_resource type="Texture2D" uid="uid://8lj2sib517fx" path="res://level/forklift/dot.png" id="2"]
-[ext_resource type="Script" path="res://level/forklift/flying_forklift.gd" id="3"]
+[ext_resource type="Script" uid="uid://dcqnfagy55nrx" path="res://level/forklift/flying_forklift.gd" id="3"]
 [ext_resource type="Texture2D" uid="uid://biye81cs18sdp" path="res://effects_shared/spotlight_projector.png" id="4_47076"]
 
 [sub_resource type="BoxShape3D" id="1"]

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

@@ -18,6 +18,7 @@ nodes/root_name="CoreModel"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

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

@@ -18,6 +18,7 @@ nodes/root_name="LightsModel"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

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

@@ -18,6 +18,7 @@ nodes/root_name="PropsModel"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

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

@@ -18,6 +18,7 @@ nodes/root_name="StructureModel"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

+ 4 - 4
level/geometry/scenes/core.tscn

@@ -44,9 +44,9 @@ render_priority = 0
 shader = SubResource("11")
 shader_parameter/offset = Vector2(0, -1)
 shader_parameter/speed = Vector2(0, 2)
+shader_parameter/tex = ExtResource("6")
 shader_parameter/emission = 3.0
 shader_parameter/alpha = 0.106
-shader_parameter/tex = ExtResource("6")
 
 [sub_resource type="Curve" id="13"]
 _data = [Vector2(0, 0), 0.0, 2.78182, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0]
@@ -121,16 +121,16 @@ curve = SubResource("18")
 [sub_resource type="ShaderMaterial" id="15"]
 render_priority = 0
 shader = SubResource("14")
+shader_parameter/tex1 = ExtResource("9")
+shader_parameter/tex2 = ExtResource("8")
 shader_parameter/time_scale_1 = 0.288
 shader_parameter/time_scale_2 = -0.31
 shader_parameter/rim_color = Color(1, 0.678431, 0, 1)
 shader_parameter/inner_color = Color(0.517647, 0.0196078, 0.219608, 1)
 shader_parameter/core_color = Color(1, 0, 0, 1)
 shader_parameter/rim_pow = 1.167
-shader_parameter/core_radius = 0.294
-shader_parameter/tex1 = ExtResource("9")
-shader_parameter/tex2 = ExtResource("8")
 shader_parameter/noise = SubResource("17")
+shader_parameter/core_radius = 0.294
 shader_parameter/remap_curve = SubResource("19")
 
 [sub_resource type="StandardMaterial3D" id="20"]

+ 1 - 0
level/level.gd.uid

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

+ 3 - 3
level/level.tscn

@@ -1,10 +1,10 @@
 [gd_scene load_steps=15 format=3 uid="uid://b51qillnxp84r"]
 
-[ext_resource type="Script" uid="uid://fw0dmocxub4o" path="res://level/level.gd" id="1"]
+[ext_resource type="Script" uid="uid://ccxbls23ev7u3" path="res://level/level.gd" id="1"]
 [ext_resource type="PackedScene" uid="uid://bpihm2o3g658" path="res://level/geometry/scenes/props.tscn" id="2"]
 [ext_resource type="VoxelGIData" uid="uid://bw86lhn5p1ovp" path="res://level/geometry/giprobe_data.res" id="5"]
 [ext_resource type="AudioStream" uid="uid://vxxm8xm1fr6y" path="res://level/level_music.ogg" id="8"]
-[ext_resource type="Script" uid="uid://bdsm3xm0yox74" path="res://level/debug.gd" id="9"]
+[ext_resource type="Script" uid="uid://6ec6m14rhsxi" path="res://level/debug.gd" id="9"]
 [ext_resource type="CompressedTexture3D" uid="uid://b2x2pkclq230n" path="res://level/level.GPUParticlesCollisionSDF3D_data.exr" id="11_mt3nw"]
 [ext_resource type="PackedScene" uid="uid://dln4kthc3tvfv" path="res://level/forklift/flying_forklift.tscn" id="12"]
 [ext_resource type="PackedScene" uid="uid://dgvowmn3iop44" path="res://level/geometry/scenes/lights.tscn" id="13"]
@@ -35,7 +35,7 @@ tracks/0/keys = {
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_35gwb"]
 _data = {
-"mawaru": SubResource("2")
+&"mawaru": SubResource("2")
 }
 
 [node name="Level" type="Node3D"]

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

@@ -18,6 +18,7 @@ nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

+ 1 - 0
main/main.gd.uid

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

+ 1 - 1
main/main.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://dmp13e1xswsm0"]
 
-[ext_resource type="Script" path="res://main/main.gd" id="1"]
+[ext_resource type="Script" uid="uid://chrcwbh6kvb7i" path="res://main/main.gd" id="1"]
 
 [node name="main" type="Node"]
 script = ExtResource("1")

+ 1 - 0
menu/font/PT_Sans-Web-Bold.ttf.import

@@ -23,6 +23,7 @@ allow_system_fallback=true
 force_autohinter=false
 hinting=1
 subpixel_positioning=1
+keep_rounding_remainders=true
 oversampling=0.0
 Fallbacks=null
 fallbacks=[]

+ 1 - 0
menu/menu.gd.uid

@@ -0,0 +1 @@
+uid://4pwshyfo5i0d

+ 1 - 1
menu/menu.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=25 format=3 uid="uid://c80nbk7u633n6"]
 
-[ext_resource type="Script" path="res://menu/menu.gd" id="1"]
+[ext_resource type="Script" uid="uid://4pwshyfo5i0d" path="res://menu/menu.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://gnsovrtic7g4" path="res://menu/experiment.hdr" id="2_bpuaq"]
 [ext_resource type="PackedScene" uid="uid://div25sd40yx1d" path="res://player/model/player.glb" id="3"]
 [ext_resource type="AudioStream" uid="uid://bfq26n228ipa" path="res://menu/menu_intro_music.ogg" id="5"]

+ 1 - 0
menu/settings.gd.uid

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

+ 1 - 0
player/bullet/bullet.gd.uid

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

+ 5 - 5
player/bullet/bullet.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=57 format=3 uid="uid://jphgr3qep5"]
 
-[ext_resource type="Script" path="res://player/bullet/bullet.gd" id="1"]
+[ext_resource type="Script" uid="uid://iybteh2g0be4" path="res://player/bullet/bullet.gd" id="1"]
 [ext_resource type="ArrayMesh" uid="uid://dqkkefcnt0erw" path="res://effects_shared/BlastMesh_Sphere.mesh" id="2"]
 [ext_resource type="AudioStream" uid="uid://c0bpunl6shvlr" path="res://player/bullet/bullet_explode.wav" id="3"]
 [ext_resource type="Material" uid="uid://bxjcw6j767jtn" path="res://player/bullet/effect/BlastMaterial.tres" id="4"]
@@ -239,8 +239,8 @@ tracks/12/keys = {
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_dbep6"]
 _data = {
-"RESET": SubResource("Animation_gjuvs"),
-"explode": SubResource("Animation_8lnsf")
+&"RESET": SubResource("Animation_gjuvs"),
+&"explode": SubResource("Animation_8lnsf")
 }
 
 [sub_resource type="Gradient" id="Gradient_jp56w"]
@@ -356,7 +356,7 @@ proximity_fade_enabled = true
 proximity_fade_distance = 0.25
 
 [sub_resource type="Curve" id="Curve_s4ylr"]
-min_value = -1.0
+_limits = [-1.0, 1.0, 0.0, 1.0]
 _data = [Vector2(0, 0.890909), 0.0, 0.0, 0, 0, Vector2(1, -0.0545454), 0.0, 0.0, 0, 0]
 point_count = 2
 
@@ -464,7 +464,7 @@ radial_segments = 16
 rings = 8
 
 [sub_resource type="Curve" id="Curve_s8ihl"]
-max_value = 4.0
+_limits = [0.0, 4.0, 0.0, 1.0]
 _data = [Vector2(0.150987, 4), 0.0, 0.0, 0, 0, Vector2(1, 0.6936), 0.0, 0.0, 0, 0]
 point_count = 2
 

+ 1 - 1
player/bullet/effect/BlastMaterial.tres

@@ -45,6 +45,7 @@ void fragment() {
 render_priority = 0
 shader = SubResource("1")
 shader_parameter/albedo = Color(0, 1, 1, 1)
+shader_parameter/texture_albedo = ExtResource("1_1ujtj")
 shader_parameter/specular = 0.0
 shader_parameter/metallic = 0.0
 shader_parameter/roughness = 1.0
@@ -56,4 +57,3 @@ shader_parameter/uv1_scale = Vector3(1, 1, 1)
 shader_parameter/uv1_offset = Vector3(0, 0, 0)
 shader_parameter/uv2_scale = Vector3(1, 1, 1)
 shader_parameter/uv2_offset = Vector3(0, 0, 0)
-shader_parameter/texture_albedo = ExtResource("1_1ujtj")

+ 1 - 0
player/camera_noise_shake_effect.gd.uid

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

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

@@ -18,6 +18,7 @@ nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
 nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

+ 1 - 0
player/player.gd.uid

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

+ 6 - 6
player/player.tscn

@@ -1,14 +1,14 @@
 [gd_scene load_steps=51 format=3 uid="uid://cs1k22tdf04k4"]
 
-[ext_resource type="Script" path="res://player/player.gd" id="1"]
+[ext_resource type="Script" uid="uid://ctlx3bqglonsx" 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="Script" path="res://player/player_input.gd" id="2_g11dy"]
+[ext_resource type="Script" uid="uid://m1xn31x0lssx" path="res://player/player_input.gd" id="2_g11dy"]
 [ext_resource type="Texture2D" uid="uid://vpkjqsku35mr" path="res://player/crosshair.png" id="3"]
 [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://fbnqspetw2oy" path="res://player/audio/land.wav" id="6"]
 [ext_resource type="Texture2D" uid="uid://8d78kbpqjumj" path="res://effects_shared/blob_shadow.tres" id="7_5auco"]
-[ext_resource type="Script" path="res://player/camera_noise_shake_effect.gd" id="8"]
+[ext_resource type="Script" uid="uid://byrvr71jmaisi" path="res://player/camera_noise_shake_effect.gd" id="8"]
 [ext_resource type="Material" uid="uid://byb8a73wgvytk" 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="Texture2D" uid="uid://dj46di0ip66q5" path="res://player/bullet/effect/FlarePolar.png" id="11"]
@@ -314,9 +314,9 @@ tracks/1/keys = {
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_keqb5"]
 _data = {
-"RESET": SubResource("Animation_daexs"),
-"far": SubResource("33"),
-"shoot": SubResource("34")
+&"RESET": SubResource("Animation_daexs"),
+&"far": SubResource("33"),
+&"shoot": SubResource("34")
 }
 
 [sub_resource type="AudioStreamRandomizer" id="35"]

+ 1 - 0
player/player_input.gd.uid

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

+ 1 - 1
project.godot

@@ -13,7 +13,7 @@ config_version=5
 config/name="Godot Third-Person Shooter Demo"
 config/description="Godot Third Person Shooter with high quality assets and lighting"
 run/main_scene="res://main/main.tscn"
-config/features=PackedStringArray("4.3")
+config/features=PackedStringArray("4.4")
 config/icon="res://icon.png"
 
 [autoload]