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/staircase_1/staircase_1.gltf | |
| 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/staircase_1/staircase_1.gltf (renamed from maps/main_stage/assets/staircase_1/staircase_1.gltf) | 0 | ||||
| -rw-r--r-- | ship/staircase_1/staircase_1.gltf.import (renamed from maps/main_stage/assets/staircase_1/staircase_1.gltf.import) | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/maps/main_stage/assets/staircase_1/staircase_1.gltf b/ship/staircase_1/staircase_1.gltf index d9e2b65..d9e2b65 100644 --- a/maps/main_stage/assets/staircase_1/staircase_1.gltf +++ b/ship/staircase_1/staircase_1.gltf diff --git a/maps/main_stage/assets/staircase_1/staircase_1.gltf.import b/ship/staircase_1/staircase_1.gltf.import index f0ee805..5e1a502 100644 --- a/maps/main_stage/assets/staircase_1/staircase_1.gltf.import +++ b/ship/staircase_1/staircase_1.gltf.import @@ -2,12 +2,12 @@ importer="scene" type="PackedScene" -path="res://.import/staircase_1.gltf-d198adeb69550c5d06f2b3d3e478f880.scn" +path="res://.import/staircase_1.gltf-abd08e5fc9d19266db31d44b004b1606.scn" [deps] -source_file="res://maps/main_stage/assets/staircase_1/staircase_1.gltf" -dest_files=[ "res://.import/staircase_1.gltf-d198adeb69550c5d06f2b3d3e478f880.scn" ] +source_file="res://ship/staircase_1/staircase_1.gltf" +dest_files=[ "res://.import/staircase_1.gltf-abd08e5fc9d19266db31d44b004b1606.scn" ] [params] |