diff --git a/blender_assets.cats.txt b/blender_assets.cats.txt index 272827f..e4421d4 100644 --- a/blender_assets.cats.txt +++ b/blender_assets.cats.txt @@ -11,5 +11,7 @@ VERSION 1 f442a275-9128-4013-a62f-bcb09bb9103c:models/paintings:models-paintings 53882271-4519-4ad2-bc6e-24e8c13bedc1:textures:textures 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 49c26a51-1841-43df-a47a-2652179f320d:textures/paintings:textures-paintings +892b461a-5bec-4bad-808d-379263f009ed:textures/wood:textures-wood diff --git a/blender_assets.cats.txt~ b/blender_assets.cats.txt~ index 272827f..e4421d4 100644 --- a/blender_assets.cats.txt~ +++ b/blender_assets.cats.txt~ @@ -11,5 +11,7 @@ VERSION 1 f442a275-9128-4013-a62f-bcb09bb9103c:models/paintings:models-paintings 53882271-4519-4ad2-bc6e-24e8c13bedc1:textures:textures 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 49c26a51-1841-43df-a47a-2652179f320d:textures/paintings:textures-paintings +892b461a-5bec-4bad-808d-379263f009ed:textures/wood:textures-wood diff --git a/maps/levelpool.blend b/maps/levelpool.blend index 9f8de56..259e5d9 100644 Binary files a/maps/levelpool.blend and b/maps/levelpool.blend differ diff --git a/maps/levelpool.blend1 b/maps/levelpool.blend1 index b847130..c9cd012 100644 Binary files a/maps/levelpool.blend1 and b/maps/levelpool.blend1 differ diff --git a/models/general/cheese.blend b/models/general/cheese.blend new file mode 100644 index 0000000..e625def Binary files /dev/null and b/models/general/cheese.blend differ diff --git a/models/general/pinkgrub.blend.import b/models/general/cheese.blend.import similarity index 82% rename from models/general/pinkgrub.blend.import rename to models/general/cheese.blend.import index 9bde6b8..824191f 100644 --- a/models/general/pinkgrub.blend.import +++ b/models/general/cheese.blend.import @@ -3,13 +3,13 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://d0xbcp1vk8apo" -path="res://.godot/imported/pinkgrub.blend-6e97267c37114e31865b1694e641bc7c.scn" +uid="uid://rwciwffvuxt1" +path="res://.godot/imported/cheese.blend-c1b0cdf13dc238e3fb8cc4ad882f9bd8.scn" [deps] -source_file="res://assets/models/general/pinkgrub.blend" -dest_files=["res://.godot/imported/pinkgrub.blend-6e97267c37114e31865b1694e641bc7c.scn"] +source_file="res://assets/models/general/cheese.blend" +dest_files=["res://.godot/imported/cheese.blend-c1b0cdf13dc238e3fb8cc4ad882f9bd8.scn"] [params] diff --git a/models/general/cheese.blend1 b/models/general/cheese.blend1 new file mode 100644 index 0000000..aa2110a Binary files /dev/null and b/models/general/cheese.blend1 differ diff --git a/models/paintings/pinkgrub_cheese.blend b/models/paintings/pinkgrub_cheese.blend new file mode 100644 index 0000000..1676890 Binary files /dev/null and b/models/paintings/pinkgrub_cheese.blend differ diff --git a/models/paintings/pinkgrub_cheese.blend.import b/models/paintings/pinkgrub_cheese.blend.import new file mode 100644 index 0000000..b03ee4d --- /dev/null +++ b/models/paintings/pinkgrub_cheese.blend.import @@ -0,0 +1,51 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://sujdb2si0k04" +path="res://.godot/imported/pinkgrub_cheese.blend-daed6ec379c7ab2beccf4ec27da3b927.scn" + +[deps] + +source_file="res://assets/models/paintings/pinkgrub_cheese.blend" +dest_files=["res://.godot/imported/pinkgrub_cheese.blend-daed6ec379c7ab2beccf4ec27da3b927.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/paintings/pinkgrub_cheese.blend1 b/models/paintings/pinkgrub_cheese.blend1 new file mode 100644 index 0000000..dc16371 Binary files /dev/null and b/models/paintings/pinkgrub_cheese.blend1 differ diff --git a/models/general/pinkgrub.blend1 b/models/paintings/pinkgrub_cheese_scene.blend similarity index 61% rename from models/general/pinkgrub.blend1 rename to models/paintings/pinkgrub_cheese_scene.blend index 9de2b09..a5c8e6e 100644 Binary files a/models/general/pinkgrub.blend1 and b/models/paintings/pinkgrub_cheese_scene.blend differ diff --git a/models/paintings/pinkgrub_cheese_scene.blend.import b/models/paintings/pinkgrub_cheese_scene.blend.import new file mode 100644 index 0000000..1cfada1 --- /dev/null +++ b/models/paintings/pinkgrub_cheese_scene.blend.import @@ -0,0 +1,51 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://d21k7meleo2t8" +path="res://.godot/imported/pinkgrub_cheese_scene.blend-dfae98b084eba02b6d507ab7387a2552.scn" + +[deps] + +source_file="res://assets/models/paintings/pinkgrub_cheese_scene.blend" +dest_files=["res://.godot/imported/pinkgrub_cheese_scene.blend-dfae98b084eba02b6d507ab7387a2552.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/paintings/pinkgrub_cheese_scene.blend1 b/models/paintings/pinkgrub_cheese_scene.blend1 new file mode 100644 index 0000000..cff3799 Binary files /dev/null and b/models/paintings/pinkgrub_cheese_scene.blend1 differ diff --git a/models/paintings/pinkgrub_player.blend b/models/paintings/pinkgrub_player.blend index a11e17c..c6f70ab 100644 Binary files a/models/paintings/pinkgrub_player.blend and b/models/paintings/pinkgrub_player.blend differ diff --git a/models/paintings/pinkgrub_player.blend.import b/models/paintings/pinkgrub_player.blend.import new file mode 100644 index 0000000..e73dcdb --- /dev/null +++ b/models/paintings/pinkgrub_player.blend.import @@ -0,0 +1,51 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dxootnwnjieny" +path="res://.godot/imported/pinkgrub_player.blend-7169dc099febc9b9ac50ecb0976ac9f2.scn" + +[deps] + +source_file="res://assets/models/paintings/pinkgrub_player.blend" +dest_files=["res://.godot/imported/pinkgrub_player.blend-7169dc099febc9b9ac50ecb0976ac9f2.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/paintings/pinkgrub_player.blend1 b/models/paintings/pinkgrub_player.blend1 index 1400e02..4107844 100644 Binary files a/models/paintings/pinkgrub_player.blend1 and b/models/paintings/pinkgrub_player.blend1 differ diff --git a/models/general/pinkgrub.blend b/models/paintings/pinkgrub_player_scene.blend similarity index 100% rename from models/general/pinkgrub.blend rename to models/paintings/pinkgrub_player_scene.blend diff --git a/models/paintings/pinkgrub_player_scene.blend.import b/models/paintings/pinkgrub_player_scene.blend.import new file mode 100644 index 0000000..72df5cc --- /dev/null +++ b/models/paintings/pinkgrub_player_scene.blend.import @@ -0,0 +1,51 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://btpb5g45xia3a" +path="res://.godot/imported/pinkgrub_player_scene.blend-62e51b746a41efe0935d9eed096528ec.scn" + +[deps] + +source_file="res://assets/models/paintings/pinkgrub_player_scene.blend" +dest_files=["res://.godot/imported/pinkgrub_player_scene.blend-62e51b746a41efe0935d9eed096528ec.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/textures/metal/rust02.png b/textures/metal/rust02.png new file mode 100755 index 0000000..4913235 Binary files /dev/null and b/textures/metal/rust02.png differ diff --git a/textures/paintings/painting01.png.import b/textures/metal/rust02.png.import similarity index 67% rename from textures/paintings/painting01.png.import rename to textures/metal/rust02.png.import index 2f03263..7042906 100644 --- a/textures/paintings/painting01.png.import +++ b/textures/metal/rust02.png.import @@ -2,8 +2,8 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bsjohtttereuk" -path.s3tc="res://.godot/imported/painting01.png-bcdb89910cacd8bb8370089be383e07b.s3tc.ctex" +uid="uid://rxfk1f83wsqd" +path.s3tc="res://.godot/imported/rust02.png-641e0f3174ef174e0c8f38ba8afd585a.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://assets/textures/paintings/painting01.png" -dest_files=["res://.godot/imported/painting01.png-bcdb89910cacd8bb8370089be383e07b.s3tc.ctex"] +source_file="res://assets/textures/metal/rust02.png" +dest_files=["res://.godot/imported/rust02.png-641e0f3174ef174e0c8f38ba8afd585a.s3tc.ctex"] [params] diff --git a/textures/paintings/pinkgrub_cheese.png b/textures/paintings/pinkgrub_cheese.png new file mode 100644 index 0000000..b892aaf Binary files /dev/null and b/textures/paintings/pinkgrub_cheese.png differ diff --git a/textures/paintings/pinkgrub_cheese.png.import b/textures/paintings/pinkgrub_cheese.png.import new file mode 100644 index 0000000..a1beaf0 --- /dev/null +++ b/textures/paintings/pinkgrub_cheese.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://brsatxfnvhrfy" +path.s3tc="res://.godot/imported/pinkgrub_cheese.png-7744aa4945f56faf7758fc3407edbe05.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/paintings/pinkgrub_cheese.png" +dest_files=["res://.godot/imported/pinkgrub_cheese.png-7744aa4945f56faf7758fc3407edbe05.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/paintings/painting01.png b/textures/paintings/pinkgrub_player.png similarity index 100% rename from textures/paintings/painting01.png rename to textures/paintings/pinkgrub_player.png diff --git a/textures/paintings/pinkgrub_player.png.import b/textures/paintings/pinkgrub_player.png.import new file mode 100644 index 0000000..c33267f --- /dev/null +++ b/textures/paintings/pinkgrub_player.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ddg4hitcvp2xe" +path.s3tc="res://.godot/imported/pinkgrub_player.png-f3e0c452faeb06f5f8e6b5e89de588d6.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/paintings/pinkgrub_player.png" +dest_files=["res://.godot/imported/pinkgrub_player.png-f3e0c452faeb06f5f8e6b5e89de588d6.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 bfd5a55..5629959 100644 Binary files a/textures/textures.blend and b/textures/textures.blend differ diff --git a/textures/textures.blend1 b/textures/textures.blend1 index 2a76f53..2e952ee 100644 Binary files a/textures/textures.blend1 and b/textures/textures.blend1 differ diff --git a/textures/wood/wood02a.png b/textures/wood/wood02a.png new file mode 100755 index 0000000..a677d6f Binary files /dev/null and b/textures/wood/wood02a.png differ diff --git a/textures/wood/wood02a.png.import b/textures/wood/wood02a.png.import new file mode 100644 index 0000000..b1c0242 --- /dev/null +++ b/textures/wood/wood02a.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bo3ggs4c5soi4" +path.s3tc="res://.godot/imported/wood02a.png-e60adb079569aeb115018247d9d8b297.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/wood/wood02a.png" +dest_files=["res://.godot/imported/wood02a.png-e60adb079569aeb115018247d9d8b297.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