diff --git a/assets/Models/Boombox.blend.import b/assets/Models/Boombox.blend.import index 562c039..99a6466 100644 --- a/assets/Models/Boombox.blend.import +++ b/assets/Models/Boombox.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/DecorationAssetsPt1.blend.import b/assets/Models/DecorationAssetsPt1.blend.import index 6d48d06..cf1daa2 100644 --- a/assets/Models/DecorationAssetsPt1.blend.import +++ b/assets/Models/DecorationAssetsPt1.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/Lamp.blend.import b/assets/Models/Lamp.blend.import index 33e33ca..e950f76 100644 --- a/assets/Models/Lamp.blend.import +++ b/assets/Models/Lamp.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/TOOB.blend.import b/assets/Models/TOOB.blend.import index 1581ac8..d6bd695 100644 --- a/assets/Models/TOOB.blend.import +++ b/assets/Models/TOOB.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/ammo_pickup.blend.import b/assets/Models/ammo_pickup.blend.import index c1268b8..183b2d1 100644 --- a/assets/Models/ammo_pickup.blend.import +++ b/assets/Models/ammo_pickup.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg.import b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg.import index 0cf5236..49c771a 100644 --- a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg.import +++ b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://bk8adigfqf1px" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg-895cebf0f0b0df1be7393e5c93a8643a.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg-895cebf0f0b0df1be7393e5c93a8643a.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg-895cebf0f0b0df1be7393e5c93a8643a.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg-895cebf0f0b0df1be7393e5c93a8643a.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg.import b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg.import index 02736c5..6f5d393 100644 --- a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg.import +++ b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://cjco8grw1k3gb" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg-fcf8aef7094bbc797f9deefe04f7e0b9.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg-fcf8aef7094bbc797f9deefe04f7e0b9.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg-fcf8aef7094bbc797f9deefe04f7e0b9.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg-fcf8aef7094bbc797f9deefe04f7e0b9.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg.import b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg.import index 12c5591..85bb69b 100644 --- a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg.import +++ b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://k5842mnhupgc" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg-e8d14db8e188608ba0e36c81772c8cc6.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg-e8d14db8e188608ba0e36c81772c8cc6.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg-e8d14db8e188608ba0e36c81772c8cc6.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg-e8d14db8e188608ba0e36c81772c8cc6.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=0 +compress/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg" process/fix_alpha_border=true process/premult_alpha=false process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg.import b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg.import index 0ea5ca5..e81b3f9 100644 --- a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg.import +++ b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://dtrchmgkt57sc" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg-8f54fad81cdfbc5c4d5f32a78e57379a.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg-8f54fad81cdfbc5c4d5f32a78e57379a.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg-8f54fad81cdfbc5c4d5f32a78e57379a.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg-8f54fad81cdfbc5c4d5f32a78e57379a.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg.import b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg.import index 257566d..0488386 100644 --- a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg.import +++ b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://rnbhvq3cn8qq" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg-21c555374977f63e691ac093394b5819.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg-21c555374977f63e691ac093394b5819.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg-21c555374977f63e691ac093394b5819.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg-21c555374977f63e691ac093394b5819.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg.import b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg.import index 0a96e0f..9414764 100644 --- a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg.import +++ b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://clkd11ogq3lai" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg-ac354374fa8cc1ea85615f6f1195d0c4.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg-ac354374fa8cc1ea85615f6f1195d0c4.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg-ac354374fa8cc1ea85615f6f1195d0c4.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg-ac354374fa8cc1ea85615f6f1195d0c4.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=0 +compress/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg" process/fix_alpha_border=true process/premult_alpha=false process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg.import b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg.import index 85564ad..5c07f14 100644 --- a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg.import +++ b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://bcjo4q16i4qc4" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg-4feb9655bc77180a4dec25131ce56284.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg-4feb9655bc77180a4dec25131ce56284.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg-4feb9655bc77180a4dec25131ce56284.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg-4feb9655bc77180a4dec25131ce56284.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg.import b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg.import index 6d3b8ad..94c64e1 100644 --- a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg.import +++ b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://bj46g4yxt7y14" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg-c0b8fa1618f4bb48993bd73cf2dbf55b.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg-c0b8fa1618f4bb48993bd73cf2dbf55b.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg-c0b8fa1618f4bb48993bd73cf2dbf55b.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg-c0b8fa1618f4bb48993bd73cf2dbf55b.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg.import b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg.import index 30a0f21..87f1da9 100644 --- a/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg.import +++ b/assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://dsbyt7akyi3mf" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg-9d2a88441ccf0f2d29187ed89c103301.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg-9d2a88441ccf0f2d29187ed89c103301.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg-9d2a88441ccf0f2d29187ed89c103301.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg-9d2a88441ccf0f2d29187ed89c103301.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=0 +compress/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://assets/Models/assets/models/tree_8ed2ce90-e977-4ce4-b02a-2b5f5aca566e/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg" process/fix_alpha_border=true process/premult_alpha=false process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/bottle1.blend.import b/assets/Models/bottle1.blend.import index 52b5e8d..5830352 100644 --- a/assets/Models/bottle1.blend.import +++ b/assets/Models/bottle1.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/boxcar.blend.import b/assets/Models/boxcar.blend.import index 9c4f0c5..5f1f14b 100644 --- a/assets/Models/boxcar.blend.import +++ b/assets/Models/boxcar.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/boxcar1.doors.png.import b/assets/Models/boxcar1.doors.png.import index b955d0f..dacbecf 100644 --- a/assets/Models/boxcar1.doors.png.import +++ b/assets/Models/boxcar1.doors.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b4g14i0hso7dj" +uid="uid://bdb2yv36ffmk8" path.s3tc="res://.godot/imported/boxcar1.doors.png-7378721e8cbb58b1d0fb0e0d16e93c7d.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], diff --git a/assets/Models/brick1.normal.png.import b/assets/Models/brick1.normal.png.import index fbc5edc..5370889 100644 --- a/assets/Models/brick1.normal.png.import +++ b/assets/Models/brick1.normal.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dtccywxaqkqwk" +uid="uid://bytxye2f8f05c" path.s3tc="res://.godot/imported/brick1.normal.png-01aaf16db3e9ebf93f0d29868088a593.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], diff --git a/assets/Models/bullet1.blend.import b/assets/Models/bullet1.blend.import index 9a5c572..c90d529 100644 --- a/assets/Models/bullet1.blend.import +++ b/assets/Models/bullet1.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/cannon.blend.import b/assets/Models/cannon.blend.import index f6ea08f..61b8edf 100644 --- a/assets/Models/cannon.blend.import +++ b/assets/Models/cannon.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/casing.blend.import b/assets/Models/casing.blend.import index 78d74e3..bf8a270 100644 --- a/assets/Models/casing.blend.import +++ b/assets/Models/casing.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/flare.blend.import b/assets/Models/flare.blend.import index cf96782..61d2ca0 100644 --- a/assets/Models/flare.blend.import +++ b/assets/Models/flare.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/garbagebin.lid.normal.png.import b/assets/Models/garbagebin.lid.normal.png.import index d649b23..daf7b75 100644 --- a/assets/Models/garbagebin.lid.normal.png.import +++ b/assets/Models/garbagebin.lid.normal.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dreegtc3xivsd" +uid="uid://bxrew37taf7qp" path.s3tc="res://.godot/imported/garbagebin.lid.normal.png-84ef62d4152d2a5d290861b230593a52.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], diff --git a/assets/Models/gun.blend.import b/assets/Models/gun.blend.import index 8f0ab1c..14f011e 100644 --- a/assets/Models/gun.blend.import +++ b/assets/Models/gun.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/gunbullet1.blend.import b/assets/Models/gunbullet1.blend.import index b061d88..2583e71 100644 --- a/assets/Models/gunbullet1.blend.import +++ b/assets/Models/gunbullet1.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/health_pickup.blend.import b/assets/Models/health_pickup.blend.import index 7d1a7e3..c7f968a 100644 --- a/assets/Models/health_pickup.blend.import +++ b/assets/Models/health_pickup.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/jump.blend.import b/assets/Models/jump.blend.import index 3f6361d..4e8a4a1 100644 --- a/assets/Models/jump.blend.import +++ b/assets/Models/jump.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/mac10.blend.import b/assets/Models/mac10.blend.import index f5bb190..a7c52af 100644 --- a/assets/Models/mac10.blend.import +++ b/assets/Models/mac10.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/mac10.roughness2.png.import b/assets/Models/mac10.roughness2.png.import index 976163b..636590f 100644 --- a/assets/Models/mac10.roughness2.png.import +++ b/assets/Models/mac10.roughness2.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bibvo384ycxub" +uid="uid://446yk8qkr53q" path.s3tc="res://.godot/imported/mac10.roughness2.png-77b0d965d5e6b9404dba54a97d742d86.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], diff --git a/assets/Models/mac10_2.blend.import b/assets/Models/mac10_2.blend.import index 91dfba0..b61e187 100644 --- a/assets/Models/mac10_2.blend.import +++ b/assets/Models/mac10_2.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/money1.blend.import b/assets/Models/money1.blend.import index 39d552a..82e6eaf 100644 --- a/assets/Models/money1.blend.import +++ b/assets/Models/money1.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/rat.blend.import b/assets/Models/rat.blend.import index 99b07e4..44a3894 100644 --- a/assets/Models/rat.blend.import +++ b/assets/Models/rat.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/ratDEAD.blend.import b/assets/Models/ratDEAD.blend.import index c6b3951..81e50bb 100644 --- a/assets/Models/ratDEAD.blend.import +++ b/assets/Models/ratDEAD.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/restaurant1.blend.import b/assets/Models/restaurant1.blend.import index de213fe..3938a78 100644 --- a/assets/Models/restaurant1.blend.import +++ b/assets/Models/restaurant1.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/revolver1.blend.import b/assets/Models/revolver1.blend.import index 49387c0..fd7d308 100644 --- a/assets/Models/revolver1.blend.import +++ b/assets/Models/revolver1.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/revolver1.roughness.png.import b/assets/Models/revolver1.roughness.png.import index 4d6e1d7..6280bdf 100644 --- a/assets/Models/revolver1.roughness.png.import +++ b/assets/Models/revolver1.roughness.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://blcxok1w8f4xu" +uid="uid://b36a5av7x827o" path.s3tc="res://.godot/imported/revolver1.roughness.png-f8c40214b9c261c0a4b2cd9f6a4e9a14.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], diff --git a/assets/Models/rocketlauncher.blend.import b/assets/Models/rocketlauncher.blend.import index f19d3dc..556bcac 100644 --- a/assets/Models/rocketlauncher.blend.import +++ b/assets/Models/rocketlauncher.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/setdecor.blend.import b/assets/Models/setdecor.blend.import index 410b28b..c498180 100644 --- a/assets/Models/setdecor.blend.import +++ b/assets/Models/setdecor.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/spider.blend.import b/assets/Models/spider.blend.import index 0e6aa6e..4527720 100644 --- a/assets/Models/spider.blend.import +++ b/assets/Models/spider.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/spider1.gunbarrel.albedo.png.import b/assets/Models/spider1.gunbarrel.albedo.png.import index a156f36..f613222 100644 --- a/assets/Models/spider1.gunbarrel.albedo.png.import +++ b/assets/Models/spider1.gunbarrel.albedo.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://r7awur11yerj" +uid="uid://b4s3w1qnqcmgq" path.s3tc="res://.godot/imported/spider1.gunbarrel.albedo.png-463a06da21a5a1fe75e603ecd68d425f.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], diff --git a/assets/Models/stamina_pickup.blend.import b/assets/Models/stamina_pickup.blend.import index 404aa01..8361c54 100644 --- a/assets/Models/stamina_pickup.blend.import +++ b/assets/Models/stamina_pickup.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg.import b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg.import index 5c051ba..e9c76a9 100644 --- a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg.import +++ b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://dj7a4xf0osuam" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg-97899e8b5af0659ae0b226d10cf1b073.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg-97899e8b5af0659ae0b226d10cf1b073.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg-97899e8b5af0659ae0b226d10cf1b073.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_albedo.jpg-97899e8b5af0659ae0b226d10cf1b073.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg.import b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg.import index bcaf496..b6573e6 100644 --- a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg.import +++ b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://3q3sc61d4taj" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg-a8801f3feb0ad719b77530c0296241ca.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg-a8801f3feb0ad719b77530c0296241ca.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg-a8801f3feb0ad719b77530c0296241ca.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_glossiness.jpg-a8801f3feb0ad719b77530c0296241ca.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg.import b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg.import index b110029..0fd2c5c 100644 --- a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg.import +++ b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://b154c01aqkat5" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg-7abc8a85f79d7a44242b2cc1527e56e4.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg-7abc8a85f79d7a44242b2cc1527e56e4.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg-7abc8a85f79d7a44242b2cc1527e56e4.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg-7abc8a85f79d7a44242b2cc1527e56e4.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=0 +compress/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Leaf_01_normal.jpg" process/fix_alpha_border=true process/premult_alpha=false process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg.import b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg.import index 43e078b..ea54e63 100644 --- a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg.import +++ b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://dngjigmepma8v" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg-d4254d1d3a50df011bf9083872becc22.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg-d4254d1d3a50df011bf9083872becc22.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg-d4254d1d3a50df011bf9083872becc22.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_albedo.jpg-d4254d1d3a50df011bf9083872becc22.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg.import b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg.import index e4a0499..2b843ad 100644 --- a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg.import +++ b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://b7leltcycm8jt" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg-47ed838bef96364f3772310ddc14431e.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg-47ed838bef96364f3772310ddc14431e.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg-47ed838bef96364f3772310ddc14431e.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_glossiness.jpg-47ed838bef96364f3772310ddc14431e.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg.import b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg.import index b4159e8..65b6a8b 100644 --- a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg.import +++ b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://cxxhkiw65vkum" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg-f9fca54c587c3709a2174c59500480d9.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg-f9fca54c587c3709a2174c59500480d9.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg-f9fca54c587c3709a2174c59500480d9.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg-f9fca54c587c3709a2174c59500480d9.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=0 +compress/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Petiole_01_normal.jpg" process/fix_alpha_border=true process/premult_alpha=false process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg.import b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg.import index d60b2f3..a8b87bb 100644 --- a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg.import +++ b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://d4etcu3uq4j7v" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg-0355f8fc911341252e173e4102d2b3c8.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg-0355f8fc911341252e173e4102d2b3c8.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg-0355f8fc911341252e173e4102d2b3c8.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_albedo.jpg-0355f8fc911341252e173e4102d2b3c8.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg.import b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg.import index 51c7770..bb39791 100644 --- a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg.import +++ b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://d2kqf2114mf3n" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg-88d53849883b3a851219a63800fbe0ca.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg-88d53849883b3a851219a63800fbe0ca.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg-88d53849883b3a851219a63800fbe0ca.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_glossiness.jpg-88d53849883b3a851219a63800fbe0ca.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg.import b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg.import index 908fa5f..608a05f 100644 --- a/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg.import +++ b/assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://cratv7f6shy44" -path="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg-6f093798799a95f42d65675799718ee6.ctex" +path.s3tc="res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg-6f093798799a95f42d65675799718ee6.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg" -dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg-6f093798799a95f42d65675799718ee6.ctex"] +dest_files=["res://.godot/imported/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg-6f093798799a95f42d65675799718ee6.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=0 +compress/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://assets/Models/textures/MT_PM_V60_Acer_buergerianum_01_Trunk_01_normal.jpg" process/fix_alpha_border=true process/premult_alpha=false process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/assets/Models/vendingmahcine.blend.import b/assets/Models/vendingmahcine.blend.import index 024cef7..7601f53 100644 --- a/assets/Models/vendingmahcine.blend.import +++ b/assets/Models/vendingmahcine.blend.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,11 +29,11 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 blender/nodes/visible=0 +blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true diff --git a/assets/bullet.tscn b/assets/bullet.tscn index 0a6efe6..b9f1af1 100644 --- a/assets/bullet.tscn +++ b/assets/bullet.tscn @@ -80,7 +80,7 @@ radius = 0.055 [node name="Bullet" type="RigidBody3D"] top_level = true collision_layer = 0 -collision_mask = 109 +collision_mask = 105 axis_lock_angular_x = true axis_lock_angular_y = true axis_lock_angular_z = true @@ -88,7 +88,7 @@ mass = 0.01 center_of_mass_mode = 1 continuous_cd = true contact_monitor = true -max_contacts_reported = 1 +max_contacts_reported = 3 script = ExtResource("1_oj0f5") [node name="Cylinder" type="MeshInstance3D" parent="."] diff --git a/assets/casing_2.tscn b/assets/casing_2.tscn index e4bb688..7f1e094 100644 --- a/assets/casing_2.tscn +++ b/assets/casing_2.tscn @@ -10,8 +10,8 @@ height = 0.121962 radius = 0.0314789 [node name="casing_2" type="RigidBody3D" groups=["scene_rigidbody", "spawned"]] -collision_layer = 0 -collision_mask = 5 +collision_layer = 32 +collision_mask = 37 mass = 0.1 continuous_cd = true contact_monitor = true diff --git a/assets/fonts/Plane Crash.ttf.import b/assets/fonts/Plane Crash.ttf.import index f31b697..2c27f4d 100644 --- a/assets/fonts/Plane Crash.ttf.import +++ b/assets/fonts/Plane Crash.ttf.import @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/Plane Crash.ttf-879bfaf8f4271b3924e0697f9cf9a Rendering=null antialiasing=1 generate_mipmaps=false +disable_embedded_bitmaps=true multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 diff --git a/assets/fonts/White On Black.ttf.import b/assets/fonts/White On Black.ttf.import index d08c383..8391f76 100644 --- a/assets/fonts/White On Black.ttf.import +++ b/assets/fonts/White On Black.ttf.import @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/White On Black.ttf-3ab7c22431282fb522667e604d Rendering=null antialiasing=1 generate_mipmaps=false +disable_embedded_bitmaps=true multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 diff --git a/assets/materials/prototype/tadaoando.tres b/assets/materials/prototype/tadaoando.tres index 65dd3e8..b8da5f0 100644 --- a/assets/materials/prototype/tadaoando.tres +++ b/assets/materials/prototype/tadaoando.tres @@ -13,7 +13,6 @@ normal_scale = 2.0 normal_texture = ExtResource("4_7t6g2") ao_enabled = true ao_texture = ExtResource("2_rhxpx") -heightmap_enabled = true heightmap_deep_parallax = true heightmap_min_layers = 8 heightmap_max_layers = 32 diff --git a/assets/player.tscn b/assets/player.tscn index 5fea1f5..8cf33de 100644 --- a/assets/player.tscn +++ b/assets/player.tscn @@ -38,20 +38,20 @@ shadow_color = Color(0, 0, 0, 1) [sub_resource type="ShaderMaterial" id="ShaderMaterial_ubnx7"] shader = ExtResource("14_v5svg") shader_parameter/overlay = true -shader_parameter/scanlines_opacity = 0.025 -shader_parameter/scanlines_width = 0.315 -shader_parameter/grille_opacity = 0.1 +shader_parameter/scanlines_opacity = 0.05 +shader_parameter/scanlines_width = 0.5 +shader_parameter/grille_opacity = 0.05 shader_parameter/resolution = Vector2(640, 480) shader_parameter/pixelate = false -shader_parameter/roll = false -shader_parameter/roll_speed = 1.165 -shader_parameter/roll_size = 38.883 -shader_parameter/roll_variation = 1.8 -shader_parameter/distort_intensity = 0.0 -shader_parameter/noise_opacity = 0.0 +shader_parameter/roll = true +shader_parameter/roll_speed = 1.0 +shader_parameter/roll_size = 11.0 +shader_parameter/roll_variation = 2.8 +shader_parameter/distort_intensity = 0.002 +shader_parameter/noise_opacity = 0.015 shader_parameter/noise_speed = 5.0 -shader_parameter/static_noise_intensity = 0.035 -shader_parameter/aberration = 0.00500005 +shader_parameter/static_noise_intensity = 0.005 +shader_parameter/aberration = 0.00300005 shader_parameter/brightness = 1.4 shader_parameter/discolor = true shader_parameter/warp_amount = 0.0 @@ -165,7 +165,7 @@ texture = ExtResource("8_kupqh") script = ExtResource("7_pnp4a") [node name="BulletRay" type="RayCast3D" parent="Head/Recoil/Camera3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.114122) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.462246) target_position = Vector3(0, 0, -200) collision_mask = 5 collide_with_areas = true diff --git a/scripts/LevelManager.gd b/scripts/LevelManager.gd index 64473a3..3e4ee9c 100644 --- a/scripts/LevelManager.gd +++ b/scripts/LevelManager.gd @@ -145,8 +145,7 @@ func die(): get_tree().get_root().add_child(instance_dead) instance_dead.camera.current = true player.dead = true - player.crt_filter.visible = true - player.toggle_hud(false) + player.toggle_hud(true) player.gun.visible = false player.crosshair.visible = false diff --git a/scripts/bullet.gd b/scripts/bullet.gd index 07c9d68..8c9d590 100644 --- a/scripts/bullet.gd +++ b/scripts/bullet.gd @@ -9,6 +9,7 @@ var bullet_force_mod = 1.0 var distance_from_player var player_position var player_velocity +var bullet_active = true @onready var mesh = $Cylinder @onready var particles = $GPUParticles3D @@ -37,7 +38,7 @@ func _physics_process(delta): func _on_body_entered(body: Node) -> void: - if !body.is_in_group("player"): + if !body.is_in_group("player") and bullet_active: print("BODY HIT - " + str(body)) #Break Breakable Objects @@ -47,8 +48,6 @@ func _on_body_entered(body: Node) -> void: if body.is_in_group("switch"): body.hit() - mesh.visible = false - if ray.is_colliding() and !ray.get_collider().is_in_group("player"): #Bullet Hole Effect ray.get_collider().add_child(instance_bullethole) @@ -65,4 +64,8 @@ func _on_body_entered(body: Node) -> void: SignalBus.emit_signal("enemy_hit") ray.get_collider().hit(bullet_damage) + mesh.visible = false + bullet_active = false + particles.emitting = true + await get_tree().create_timer(1).timeout queue_free() diff --git a/scripts/player.gd b/scripts/player.gd index 23d6179..acf29b2 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -410,4 +410,3 @@ func toggle_hud(hud_on): ammo_counter.visible = hud_on stamina_counter.visible = hud_on - hud_visible = !hud_visible diff --git a/scripts/recoil.gd b/scripts/recoil.gd index 4102185..6218813 100644 --- a/scripts/recoil.gd +++ b/scripts/recoil.gd @@ -17,10 +17,14 @@ func _process(delta: float) -> void: basis = Quaternion.from_euler(current_rotation) func add_recoil(recoil_amount,snap_change,speed_change) -> void: + #set to provided snap/speed changes snap_amount = snap_change speed = speed_change + + #vertical recoil and random L+R recoil within given range var recoil_x = recoil_amount.x var recoil_y = randf_range(-recoil_amount.y,recoil_amount.y) var recoil_z = randf_range(-recoil_amount.z,recoil_amount.z) + #add to target rotation target_rotation += Vector3(recoil_x, recoil_y, recoil_z) diff --git a/scripts/revolver_1.gd b/scripts/revolver_1.gd index 1e23971..6bddddb 100644 --- a/scripts/revolver_1.gd +++ b/scripts/revolver_1.gd @@ -11,6 +11,7 @@ var cycle_count @export_enum("Auto", "Single", "Burst") var fire_mode: int @export var fov_zoom_amt = .98 @export var recoil_amount : Vector3 = Vector3(1,.1,.1) +@export var recoil_speed_change : float = 4 @export var max_ammo = 15 @export var start_mags = 3 @export var bullet_damage = 1 @@ -156,7 +157,7 @@ func fire(delta): instance_bullet.player_velocity = player.velocity instance_bullet.instance_bullethole = bullethole.instantiate() get_tree().get_root().add_child(instance_bullet) - player.recoil.add_recoil(recoil_amount,10,10) + player.recoil.add_recoil(recoil_amount,10,recoil_speed_change) chamber.rotate_object_local(Vector3(0,-1,0),deg_to_rad(60)) func reload(delta):