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/Planks016_2K_NormalGL.png | |
| 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 '')
| -rw-r--r-- | ship/crate/Planks016_2K_NormalGL.png (renamed from maps/main_stage/assets/crate/Planks016_2K_NormalGL.png) | bin | 23031667 -> 23031667 bytes | |||
| -rw-r--r-- | ship/crate/Planks016_2K_NormalGL.png.import (renamed from maps/main_stage/assets/crate/Planks016_2K_NormalGL.png.import) | 8 |
2 files changed, 4 insertions, 4 deletions
diff --git a/maps/main_stage/assets/crate/Planks016_2K_NormalGL.png b/ship/crate/Planks016_2K_NormalGL.png Binary files differindex 7242c57..7242c57 100644 --- a/maps/main_stage/assets/crate/Planks016_2K_NormalGL.png +++ b/ship/crate/Planks016_2K_NormalGL.png diff --git a/maps/main_stage/assets/crate/Planks016_2K_NormalGL.png.import b/ship/crate/Planks016_2K_NormalGL.png.import index 5ab6561..67ddfa5 100644 --- a/maps/main_stage/assets/crate/Planks016_2K_NormalGL.png.import +++ b/ship/crate/Planks016_2K_NormalGL.png.import @@ -2,8 +2,8 @@ importer="texture" type="StreamTexture" -path.s3tc="res://.import/Planks016_2K_NormalGL.png-38d65614524a46b9e514262560be8706.s3tc.stex" -path.etc2="res://.import/Planks016_2K_NormalGL.png-38d65614524a46b9e514262560be8706.etc2.stex" +path.s3tc="res://.import/Planks016_2K_NormalGL.png-eff8452b6dc30220dde8ab23a3ffbd65.s3tc.stex" +path.etc2="res://.import/Planks016_2K_NormalGL.png-eff8452b6dc30220dde8ab23a3ffbd65.etc2.stex" metadata={ "imported_formats": [ "s3tc", "etc2" ], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://maps/main_stage/assets/crate/Planks016_2K_NormalGL.png" -dest_files=[ "res://.import/Planks016_2K_NormalGL.png-38d65614524a46b9e514262560be8706.s3tc.stex", "res://.import/Planks016_2K_NormalGL.png-38d65614524a46b9e514262560be8706.etc2.stex" ] +source_file="res://ship/crate/Planks016_2K_NormalGL.png" +dest_files=[ "res://.import/Planks016_2K_NormalGL.png-eff8452b6dc30220dde8ab23a3ffbd65.s3tc.stex", "res://.import/Planks016_2K_NormalGL.png-eff8452b6dc30220dde8ab23a3ffbd65.etc2.stex" ] [params] |
