diff options
author | dusoleil <howcansocksbereal@gmail.com> | 2022-09-15 08:03:40 -0400 |
---|---|---|
committer | dusoleil <howcansocksbereal@gmail.com> | 2022-09-15 08:03:40 -0400 |
commit | 7e9745ab47df86ecf6899ea5ae9aae3d529b91b8 (patch) | |
tree | 3c3928cdca0ea695dbfb3c9396285fd139b8a361 /ship/crate/texture/planks | |
parent | fb12038102da5f225779e9735a8ab47b880913e5 (diff) | |
parent | f8172339721d707610f19cdb7fe14fe4f31c8318 (diff) | |
download | game_jam49-7e9745ab47df86ecf6899ea5ae9aae3d529b91b8.tar.gz game_jam49-7e9745ab47df86ecf6899ea5ae9aae3d529b91b8.zip |
Merge tag 'pull-level-integration' of https://normalmode.org/malf/z/godot_wildjam_49 into malf-pr
Integrate main level scenes and organize files
This branch _mostly_ captures the features of your ship_testing branch,
with the main exclusion being the door on the lower ramp.
We consolidate the "Stage" content into the "Main" scene, and remove
some unused directories now that there are no extra map scenes.
Diffstat (limited to 'ship/crate/texture/planks')
-rw-r--r-- | ship/crate/texture/planks/Planks016_2K_Color.png | bin | 0 -> 5518946 bytes | |||
-rw-r--r-- | ship/crate/texture/planks/Planks016_2K_Color.png.import | 35 | ||||
-rw-r--r-- | ship/crate/texture/planks/Planks016_2K_Metalness.png | bin | 0 -> 7493 bytes | |||
-rw-r--r-- | ship/crate/texture/planks/Planks016_2K_Metalness.png.import | 35 | ||||
-rw-r--r-- | ship/crate/texture/planks/Planks016_2K_NormalGL.png | bin | 0 -> 23031667 bytes | |||
-rw-r--r-- | ship/crate/texture/planks/Planks016_2K_NormalGL.png.import | 35 | ||||
-rw-r--r-- | ship/crate/texture/planks/Planks016_2K_Roughness.png | bin | 0 -> 2681022 bytes | |||
-rw-r--r-- | ship/crate/texture/planks/Planks016_2K_Roughness.png.import | 35 |
8 files changed, 140 insertions, 0 deletions
diff --git a/ship/crate/texture/planks/Planks016_2K_Color.png b/ship/crate/texture/planks/Planks016_2K_Color.png Binary files differnew file mode 100644 index 0000000..d5fb0fc --- /dev/null +++ b/ship/crate/texture/planks/Planks016_2K_Color.png diff --git a/ship/crate/texture/planks/Planks016_2K_Color.png.import b/ship/crate/texture/planks/Planks016_2K_Color.png.import new file mode 100644 index 0000000..54fef2a --- /dev/null +++ b/ship/crate/texture/planks/Planks016_2K_Color.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Planks016_2K_Color.png-4dcd2494903a9e20e3c21d08dcb88c1b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ship/crate/texture/planks/Planks016_2K_Color.png" +dest_files=[ "res://.import/Planks016_2K_Color.png-4dcd2494903a9e20e3c21d08dcb88c1b.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/ship/crate/texture/planks/Planks016_2K_Metalness.png b/ship/crate/texture/planks/Planks016_2K_Metalness.png Binary files differnew file mode 100644 index 0000000..b0d6f27 --- /dev/null +++ b/ship/crate/texture/planks/Planks016_2K_Metalness.png diff --git a/ship/crate/texture/planks/Planks016_2K_Metalness.png.import b/ship/crate/texture/planks/Planks016_2K_Metalness.png.import new file mode 100644 index 0000000..a296340 --- /dev/null +++ b/ship/crate/texture/planks/Planks016_2K_Metalness.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Planks016_2K_Metalness.png-a3dfeec2a019c2b69aa9680c72998872.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ship/crate/texture/planks/Planks016_2K_Metalness.png" +dest_files=[ "res://.import/Planks016_2K_Metalness.png-a3dfeec2a019c2b69aa9680c72998872.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/ship/crate/texture/planks/Planks016_2K_NormalGL.png b/ship/crate/texture/planks/Planks016_2K_NormalGL.png Binary files differnew file mode 100644 index 0000000..7242c57 --- /dev/null +++ b/ship/crate/texture/planks/Planks016_2K_NormalGL.png diff --git a/ship/crate/texture/planks/Planks016_2K_NormalGL.png.import b/ship/crate/texture/planks/Planks016_2K_NormalGL.png.import new file mode 100644 index 0000000..f3de9cb --- /dev/null +++ b/ship/crate/texture/planks/Planks016_2K_NormalGL.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Planks016_2K_NormalGL.png-2099c40638ad017c4b6122bb2d68eb11.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ship/crate/texture/planks/Planks016_2K_NormalGL.png" +dest_files=[ "res://.import/Planks016_2K_NormalGL.png-2099c40638ad017c4b6122bb2d68eb11.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/ship/crate/texture/planks/Planks016_2K_Roughness.png b/ship/crate/texture/planks/Planks016_2K_Roughness.png Binary files differnew file mode 100644 index 0000000..4c6665e --- /dev/null +++ b/ship/crate/texture/planks/Planks016_2K_Roughness.png diff --git a/ship/crate/texture/planks/Planks016_2K_Roughness.png.import b/ship/crate/texture/planks/Planks016_2K_Roughness.png.import new file mode 100644 index 0000000..7e6ac3e --- /dev/null +++ b/ship/crate/texture/planks/Planks016_2K_Roughness.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Planks016_2K_Roughness.png-0c4b693ea1c967e88fcd556340f99565.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ship/crate/texture/planks/Planks016_2K_Roughness.png" +dest_files=[ "res://.import/Planks016_2K_Roughness.png-0c4b693ea1c967e88fcd556340f99565.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 |