diff --git a/blender_assets.cats.txt b/blender_assets.cats.txt index e4421d4..85b3a27 100644 --- a/blender_assets.cats.txt +++ b/blender_assets.cats.txt @@ -10,6 +10,7 @@ VERSION 1 4c17a9ae-9ce0-4244-801d-5de230574082:models/general:models-general f442a275-9128-4013-a62f-bcb09bb9103c:models/paintings:models-paintings 53882271-4519-4ad2-bc6e-24e8c13bedc1:textures:textures +68423b75-93b2-4572-9639-48f56ed100c8:textures/concrete:textures-concrete aacd3110-beaf-41fe-83fc-e4b96bc584e4:textures/dev:textures-dev f38a2905-eb61-4b61-a5e8-a63f8f288e01:textures/metal:textures-metal 95f1e260-50a9-4d0b-b24a-75bfcd12a7b7:textures/models:textures-models diff --git a/blender_assets.cats.txt~ b/blender_assets.cats.txt~ index e4421d4..85b3a27 100644 --- a/blender_assets.cats.txt~ +++ b/blender_assets.cats.txt~ @@ -10,6 +10,7 @@ VERSION 1 4c17a9ae-9ce0-4244-801d-5de230574082:models/general:models-general f442a275-9128-4013-a62f-bcb09bb9103c:models/paintings:models-paintings 53882271-4519-4ad2-bc6e-24e8c13bedc1:textures:textures +68423b75-93b2-4572-9639-48f56ed100c8:textures/concrete:textures-concrete aacd3110-beaf-41fe-83fc-e4b96bc584e4:textures/dev:textures-dev f38a2905-eb61-4b61-a5e8-a63f8f288e01:textures/metal:textures-metal 95f1e260-50a9-4d0b-b24a-75bfcd12a7b7:textures/models:textures-models diff --git a/maps/levelpool.blend b/maps/levelpool.blend index 259e5d9..0de0446 100644 Binary files a/maps/levelpool.blend and b/maps/levelpool.blend differ diff --git a/maps/levelpool.blend1 b/maps/levelpool.blend1 index c9cd012..33fc735 100644 Binary files a/maps/levelpool.blend1 and b/maps/levelpool.blend1 differ diff --git a/models/concrete/fish_scene.blend b/models/concrete/fish_scene.blend new file mode 100644 index 0000000..71bcdf1 Binary files /dev/null and b/models/concrete/fish_scene.blend differ diff --git a/models/concrete/fish_scene.blend.import b/models/concrete/fish_scene.blend.import new file mode 100644 index 0000000..0dc490c --- /dev/null +++ b/models/concrete/fish_scene.blend.import @@ -0,0 +1,51 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://c4t1p5tvypvs6" +path="res://.godot/imported/fish_scene.blend-8e54cf617800240d81f6b373891bbf90.scn" + +[deps] + +source_file="res://assets/models/concrete/fish_scene.blend" +dest_files=["res://.godot/imported/fish_scene.blend-8e54cf617800240d81f6b373891bbf90.scn"] + +[params] + +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 +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +blender/nodes/visible=0 +blender/nodes/active_collection_only=false +blender/nodes/punctual_lights=true +blender/nodes/cameras=true +blender/nodes/custom_properties=true +blender/nodes/modifiers=1 +blender/meshes/colors=false +blender/meshes/uvs=true +blender/meshes/normals=true +blender/meshes/tangents=true +blender/meshes/skins=2 +blender/meshes/export_bones_deforming_mesh_only=false +blender/materials/unpack_enabled=true +blender/materials/export_materials=1 +blender/animation/limit_playback=true +blender/animation/always_sample=true +blender/animation/group_tracks=true diff --git a/models/general/monitor01.blend b/models/general/monitor01.blend index 2ba99a8..29160b7 100644 Binary files a/models/general/monitor01.blend and b/models/general/monitor01.blend differ diff --git a/models/general/monitor01.blend1 b/models/general/monitor01.blend1 index 58f5418..f361da0 100644 Binary files a/models/general/monitor01.blend1 and b/models/general/monitor01.blend1 differ diff --git a/models/paintings/pinkgrub_cheese.blend b/models/paintings/pinkgrub_cheese.blend index 1676890..7ba555a 100644 Binary files a/models/paintings/pinkgrub_cheese.blend and b/models/paintings/pinkgrub_cheese.blend differ diff --git a/models/paintings/pinkgrub_cheese.blend1 b/models/paintings/pinkgrub_cheese.blend1 index dc16371..47d21d8 100644 Binary files a/models/paintings/pinkgrub_cheese.blend1 and b/models/paintings/pinkgrub_cheese.blend1 differ diff --git a/models/paintings/pinkgrub_player.blend b/models/paintings/pinkgrub_player.blend index c6f70ab..8160d02 100644 Binary files a/models/paintings/pinkgrub_player.blend and b/models/paintings/pinkgrub_player.blend differ diff --git a/models/paintings/pinkgrub_player.blend1 b/models/paintings/pinkgrub_player.blend1 index 4107844..50ad6a9 100644 Binary files a/models/paintings/pinkgrub_player.blend1 and b/models/paintings/pinkgrub_player.blend1 differ diff --git a/textures/concrete/concrete01.png b/textures/concrete/concrete01.png new file mode 100755 index 0000000..f768f0f Binary files /dev/null and b/textures/concrete/concrete01.png differ diff --git a/textures/concrete/concrete01.png.import b/textures/concrete/concrete01.png.import new file mode 100644 index 0000000..2adc6a6 --- /dev/null +++ b/textures/concrete/concrete01.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://0hrt3d182r4d" +path.s3tc="res://.godot/imported/concrete01.png-8e6af4ebe87914cdc31e97dcc6fe397d.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/concrete/concrete01.png" +dest_files=["res://.godot/imported/concrete01.png-8e6af4ebe87914cdc31e97dcc6fe397d.s3tc.ctex"] + +[params] + +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=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +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=0 diff --git a/textures/concrete/concrete01_fish.png b/textures/concrete/concrete01_fish.png new file mode 100644 index 0000000..700102f Binary files /dev/null and b/textures/concrete/concrete01_fish.png differ diff --git a/textures/concrete/concrete01_fish.png.import b/textures/concrete/concrete01_fish.png.import new file mode 100644 index 0000000..400fbec --- /dev/null +++ b/textures/concrete/concrete01_fish.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ih8gy62uvdan" +path.s3tc="res://.godot/imported/concrete01_fish.png-a9d682ffc749073d50978a712d8d2383.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/concrete/concrete01_fish.png" +dest_files=["res://.godot/imported/concrete01_fish.png-a9d682ffc749073d50978a712d8d2383.s3tc.ctex"] + +[params] + +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=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +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=0 diff --git a/textures/concrete/concrete01_fish.xcf b/textures/concrete/concrete01_fish.xcf new file mode 100644 index 0000000..bf89101 Binary files /dev/null and b/textures/concrete/concrete01_fish.xcf differ diff --git a/textures/concrete/fish.png b/textures/concrete/fish.png new file mode 100644 index 0000000..fd02577 Binary files /dev/null and b/textures/concrete/fish.png differ diff --git a/textures/concrete/fish.png.import b/textures/concrete/fish.png.import new file mode 100644 index 0000000..d0f496f --- /dev/null +++ b/textures/concrete/fish.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bnem8work7pw3" +path="res://.godot/imported/fish.png-167e12482d7490939235700f95bb7cfc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/concrete/fish.png" +dest_files=["res://.godot/imported/fish.png-167e12482d7490939235700f95bb7cfc.ctex"] + +[params] + +compress/mode=0 +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/limit=-1 +roughness/mode=0 +roughness/src_normal="" +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 diff --git a/textures/metal/hazardstripes.png b/textures/metal/hazardstripes.png new file mode 100755 index 0000000..182427d Binary files /dev/null and b/textures/metal/hazardstripes.png differ diff --git a/textures/metal/hazardstripes.png.import b/textures/metal/hazardstripes.png.import new file mode 100644 index 0000000..f7c5aa2 --- /dev/null +++ b/textures/metal/hazardstripes.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://gxs0slqqfpb8" +path.s3tc="res://.godot/imported/hazardstripes.png-d0f76d6b95c433cb5ded4e495ed28262.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/metal/hazardstripes.png" +dest_files=["res://.godot/imported/hazardstripes.png-d0f76d6b95c433cb5ded4e495ed28262.s3tc.ctex"] + +[params] + +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=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +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=0 diff --git a/textures/textures.blend b/textures/textures.blend index 5629959..e01b2d9 100644 Binary files a/textures/textures.blend and b/textures/textures.blend differ diff --git a/textures/textures.blend1 b/textures/textures.blend1 index 2e952ee..6a8d099 100644 Binary files a/textures/textures.blend1 and b/textures/textures.blend1 differ