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/crate.material | |
| parent | fb12038102da5f225779e9735a8ab47b880913e5 (diff) | |
| parent | f8172339721d707610f19cdb7fe14fe4f31c8318 (diff) | |
| download | godot_wildjam_49-7e9745ab47df86ecf6899ea5ae9aae3d529b91b8.tar.gz godot_wildjam_49-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/crate.material (renamed from maps/main_stage/assets/crate/crate.material) | bin | 2058 -> 2004 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/maps/main_stage/assets/crate/crate.material b/ship/crate/crate.material Binary files differindex 5e17eb7..960b98b 100644 --- a/maps/main_stage/assets/crate/crate.material +++ b/ship/crate/crate.material |