diff --git a/door/door.gd.uid b/door/door.gd.uid new file mode 100644 index 0000000..f2488df --- /dev/null +++ b/door/door.gd.uid @@ -0,0 +1 @@ +uid://7v3r683kok5s diff --git a/door/door.tscn b/door/door.tscn index 190379a..7e43d84 100644 --- a/door/door.tscn +++ b/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"] diff --git a/door/model/door.dae.import b/door/model/door.dae.import index 2950e12..3b8f7c4 100644 --- a/door/model/door.dae.import +++ b/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 diff --git a/effects_shared/BlastMesh.glb.import b/effects_shared/BlastMesh.glb.import index a54e17b..1cdaf16 100644 --- a/effects_shared/BlastMesh.glb.import +++ b/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 diff --git a/enemies/red_robot/laser/BarrelSmoke.glb.import b/enemies/red_robot/laser/BarrelSmoke.glb.import index 0845b1a..46c0ac9 100644 --- a/enemies/red_robot/laser/BarrelSmoke.glb.import +++ b/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 diff --git a/enemies/red_robot/laser/LaserShader.gdshader.uid b/enemies/red_robot/laser/LaserShader.gdshader.uid new file mode 100644 index 0000000..366a992 --- /dev/null +++ b/enemies/red_robot/laser/LaserShader.gdshader.uid @@ -0,0 +1 @@ +uid://bfl0kmtf31qti diff --git a/enemies/red_robot/laser/impact_effect/EmissionAlbedoParticle.gdshader.uid b/enemies/red_robot/laser/impact_effect/EmissionAlbedoParticle.gdshader.uid new file mode 100644 index 0000000..83526e8 --- /dev/null +++ b/enemies/red_robot/laser/impact_effect/EmissionAlbedoParticle.gdshader.uid @@ -0,0 +1 @@ +uid://cdmq65xiexdf8 diff --git a/enemies/red_robot/laser/impact_effect/EmissionEmbers.gdshader.uid b/enemies/red_robot/laser/impact_effect/EmissionEmbers.gdshader.uid new file mode 100644 index 0000000..eee9ed2 --- /dev/null +++ b/enemies/red_robot/laser/impact_effect/EmissionEmbers.gdshader.uid @@ -0,0 +1 @@ +uid://cwsjytvpvrrai diff --git a/enemies/red_robot/laser/impact_effect/LightRaysMesh.glb.import b/enemies/red_robot/laser/impact_effect/LightRaysMesh.glb.import index 6226026..d817dd5 100644 --- a/enemies/red_robot/laser/impact_effect/LightRaysMesh.glb.import +++ b/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 diff --git a/enemies/red_robot/laser/impact_effect/blast.gd.uid b/enemies/red_robot/laser/impact_effect/blast.gd.uid new file mode 100644 index 0000000..f9e6666 --- /dev/null +++ b/enemies/red_robot/laser/impact_effect/blast.gd.uid @@ -0,0 +1 @@ +uid://bk20efkdq4v3m diff --git a/enemies/red_robot/laser/impact_effect/impact_effect.tscn b/enemies/red_robot/laser/impact_effect/impact_effect.tscn index 5b4cdeb..4df536b 100644 --- a/enemies/red_robot/laser/impact_effect/impact_effect.tscn +++ b/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 diff --git a/enemies/red_robot/laser/smoke.gdshader.uid b/enemies/red_robot/laser/smoke.gdshader.uid new file mode 100644 index 0000000..8149be0 --- /dev/null +++ b/enemies/red_robot/laser/smoke.gdshader.uid @@ -0,0 +1 @@ +uid://bafg2kigqpcel diff --git a/enemies/red_robot/model/red_robot.glb.import b/enemies/red_robot/model/red_robot.glb.import index 60a8042..26ab5a0 100644 --- a/enemies/red_robot/model/red_robot.glb.import +++ b/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 diff --git a/enemies/red_robot/parts/part.gd.uid b/enemies/red_robot/parts/part.gd.uid new file mode 100644 index 0000000..48cb0ea --- /dev/null +++ b/enemies/red_robot/parts/part.gd.uid @@ -0,0 +1 @@ +uid://c3vo80hyj6w6c diff --git a/enemies/red_robot/parts/part_disappear_effect/part_disappear.gd.uid b/enemies/red_robot/parts/part_disappear_effect/part_disappear.gd.uid new file mode 100644 index 0000000..7a24d8e --- /dev/null +++ b/enemies/red_robot/parts/part_disappear_effect/part_disappear.gd.uid @@ -0,0 +1 @@ +uid://dxd6xoeg627y6 diff --git a/enemies/red_robot/parts/part_disappear_effect/part_disappear.tscn b/enemies/red_robot/parts/part_disappear_effect/part_disappear.tscn index 65415de..3abcc3a 100644 --- a/enemies/red_robot/parts/part_disappear_effect/part_disappear.tscn +++ b/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 diff --git a/enemies/red_robot/parts/part_head.glb.import b/enemies/red_robot/parts/part_head.glb.import index ec9cfb4..ceaca16 100644 --- a/enemies/red_robot/parts/part_head.glb.import +++ b/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 diff --git a/enemies/red_robot/parts/part_shield.glb.import b/enemies/red_robot/parts/part_shield.glb.import index 7ff071c..97ba0ae 100644 --- a/enemies/red_robot/parts/part_shield.glb.import +++ b/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 diff --git a/enemies/red_robot/parts/ray.gdshader.uid b/enemies/red_robot/parts/ray.gdshader.uid new file mode 100644 index 0000000..c910ee2 --- /dev/null +++ b/enemies/red_robot/parts/ray.gdshader.uid @@ -0,0 +1 @@ +uid://ce73c061dn407 diff --git a/enemies/red_robot/parts/ray.glb.import b/enemies/red_robot/parts/ray.glb.import index f1b8457..5034967 100644 --- a/enemies/red_robot/parts/ray.glb.import +++ b/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 diff --git a/enemies/red_robot/parts/sparks_effect/SparkParticle.glb.import b/enemies/red_robot/parts/sparks_effect/SparkParticle.glb.import index e5bc14f..b10b6a9 100644 --- a/enemies/red_robot/parts/sparks_effect/SparkParticle.glb.import +++ b/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 diff --git a/enemies/red_robot/parts/sparks_effect/SparkShader.gdshader.uid b/enemies/red_robot/parts/sparks_effect/SparkShader.gdshader.uid new file mode 100644 index 0000000..7486905 --- /dev/null +++ b/enemies/red_robot/parts/sparks_effect/SparkShader.gdshader.uid @@ -0,0 +1 @@ +uid://hn4wm60ej8m4 diff --git a/enemies/red_robot/red_robot.gd.uid b/enemies/red_robot/red_robot.gd.uid new file mode 100644 index 0000000..5cc9199 --- /dev/null +++ b/enemies/red_robot/red_robot.gd.uid @@ -0,0 +1 @@ +uid://bf14mo0lrrvjl diff --git a/enemies/red_robot/red_robot.tscn b/enemies/red_robot/red_robot.tscn index 67578cf..8039402 100644 --- a/enemies/red_robot/red_robot.tscn +++ b/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"] diff --git a/enemies/red_robot/smoke.gdshader.uid b/enemies/red_robot/smoke.gdshader.uid new file mode 100644 index 0000000..2a28411 --- /dev/null +++ b/enemies/red_robot/smoke.gdshader.uid @@ -0,0 +1 @@ +uid://d1qh6q38gjtv3 diff --git a/level/debug.gd.uid b/level/debug.gd.uid new file mode 100644 index 0000000..630e2a5 --- /dev/null +++ b/level/debug.gd.uid @@ -0,0 +1 @@ +uid://6ec6m14rhsxi diff --git a/level/forklift/flying_forklift.gd.uid b/level/forklift/flying_forklift.gd.uid new file mode 100644 index 0000000..b1380d3 --- /dev/null +++ b/level/forklift/flying_forklift.gd.uid @@ -0,0 +1 @@ +uid://dcqnfagy55nrx diff --git a/level/forklift/flying_forklift.glb.import b/level/forklift/flying_forklift.glb.import index 7441518..5df4cbf 100644 --- a/level/forklift/flying_forklift.glb.import +++ b/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 diff --git a/level/forklift/flying_forklift.tscn b/level/forklift/flying_forklift.tscn index 25a074d..2eec807 100644 --- a/level/forklift/flying_forklift.tscn +++ b/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"] diff --git a/level/geometry/models/core.glb.import b/level/geometry/models/core.glb.import index 966bce5..3eb5727 100644 --- a/level/geometry/models/core.glb.import +++ b/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 diff --git a/level/geometry/models/lights.glb.import b/level/geometry/models/lights.glb.import index e5e20bd..c51f0cc 100644 --- a/level/geometry/models/lights.glb.import +++ b/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 diff --git a/level/geometry/models/props.glb.import b/level/geometry/models/props.glb.import index f8b1fd5..c411c65 100644 --- a/level/geometry/models/props.glb.import +++ b/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 diff --git a/level/geometry/models/structure.glb.import b/level/geometry/models/structure.glb.import index f54622c..7829a1e 100644 --- a/level/geometry/models/structure.glb.import +++ b/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 diff --git a/level/geometry/scenes/core.tscn b/level/geometry/scenes/core.tscn index 08d2f3f..b7b17c1 100644 --- a/level/geometry/scenes/core.tscn +++ b/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"] diff --git a/level/level.gd.uid b/level/level.gd.uid new file mode 100644 index 0000000..b3946aa --- /dev/null +++ b/level/level.gd.uid @@ -0,0 +1 @@ +uid://ccxbls23ev7u3 diff --git a/level/level.tscn b/level/level.tscn index 2341749..f7b3f3d 100644 --- a/level/level.tscn +++ b/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"] diff --git a/level/textures/structure/Core/CoreOutLight.glb.import b/level/textures/structure/Core/CoreOutLight.glb.import index 5d49db5..7009fd0 100644 --- a/level/textures/structure/Core/CoreOutLight.glb.import +++ b/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 diff --git a/main/main.gd.uid b/main/main.gd.uid new file mode 100644 index 0000000..b97df12 --- /dev/null +++ b/main/main.gd.uid @@ -0,0 +1 @@ +uid://chrcwbh6kvb7i diff --git a/main/main.tscn b/main/main.tscn index c48ccf5..759592c 100644 --- a/main/main.tscn +++ b/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") diff --git a/menu/font/PT_Sans-Web-Bold.ttf.import b/menu/font/PT_Sans-Web-Bold.ttf.import index fe24301..6e4955b 100644 --- a/menu/font/PT_Sans-Web-Bold.ttf.import +++ b/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=[] diff --git a/menu/menu.gd.uid b/menu/menu.gd.uid new file mode 100644 index 0000000..3eac134 --- /dev/null +++ b/menu/menu.gd.uid @@ -0,0 +1 @@ +uid://4pwshyfo5i0d diff --git a/menu/menu.tscn b/menu/menu.tscn index 0aea38c..ebf50f3 100644 --- a/menu/menu.tscn +++ b/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"] diff --git a/menu/settings.gd.uid b/menu/settings.gd.uid new file mode 100644 index 0000000..98f91f7 --- /dev/null +++ b/menu/settings.gd.uid @@ -0,0 +1 @@ +uid://b04fekxdgdq0k diff --git a/player/bullet/bullet.gd.uid b/player/bullet/bullet.gd.uid new file mode 100644 index 0000000..211514c --- /dev/null +++ b/player/bullet/bullet.gd.uid @@ -0,0 +1 @@ +uid://iybteh2g0be4 diff --git a/player/bullet/bullet.tscn b/player/bullet/bullet.tscn index d96ab8a..b12de70 100644 --- a/player/bullet/bullet.tscn +++ b/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 diff --git a/player/bullet/effect/BlastMaterial.tres b/player/bullet/effect/BlastMaterial.tres index b506411..538b21a 100644 --- a/player/bullet/effect/BlastMaterial.tres +++ b/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") diff --git a/player/camera_noise_shake_effect.gd.uid b/player/camera_noise_shake_effect.gd.uid new file mode 100644 index 0000000..f27cb73 --- /dev/null +++ b/player/camera_noise_shake_effect.gd.uid @@ -0,0 +1 @@ +uid://byrvr71jmaisi diff --git a/player/model/player.glb.import b/player/model/player.glb.import index a15afa7..410723f 100644 --- a/player/model/player.glb.import +++ b/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 diff --git a/player/player.gd.uid b/player/player.gd.uid new file mode 100644 index 0000000..f030f9e --- /dev/null +++ b/player/player.gd.uid @@ -0,0 +1 @@ +uid://ctlx3bqglonsx diff --git a/player/player.tscn b/player/player.tscn index 7aeb34a..ae88a89 100644 --- a/player/player.tscn +++ b/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"] diff --git a/player/player_input.gd.uid b/player/player_input.gd.uid new file mode 100644 index 0000000..a942d41 --- /dev/null +++ b/player/player_input.gd.uid @@ -0,0 +1 @@ +uid://m1xn31x0lssx diff --git a/project.godot b/project.godot index fc243da..d1acef4 100644 --- a/project.godot +++ b/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]