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 | |
| parent | fb12038102da5f225779e9735a8ab47b880913e5 (diff) | |
| parent | f8172339721d707610f19cdb7fe14fe4f31c8318 (diff) | |
| download | godot_wildjam_49-dev.tar.gz godot_wildjam_49-dev.zip | |
Merge tag 'pull-level-integration' of https://normalmode.org/malf/z/godot_wildjam_49 into malf-prHEADdev
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.blend (renamed from maps/main_stage/assets/staircase_1/staircase.blend) | bin | 832604 -> 832604 bytes | |||
| -rw-r--r-- | ship/staircase_1/staircase.material (renamed from maps/main_stage/assets/staircase_1/staircase.material) | bin | 422866 -> 422866 bytes | |||
| -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 | ||||
| -rw-r--r-- | ship/staircase_1/staircase_1.tscn (renamed from maps/main_stage/assets/staircase_1/staircase_1.tscn) | 4 |
5 files changed, 5 insertions, 5 deletions
diff --git a/maps/main_stage/assets/staircase_1/staircase.blend b/ship/staircase_1/staircase.blend Binary files differindex aa68e0a..aa68e0a 100644 --- a/maps/main_stage/assets/staircase_1/staircase.blend +++ b/ship/staircase_1/staircase.blend diff --git a/maps/main_stage/assets/staircase_1/staircase.material b/ship/staircase_1/staircase.material Binary files differindex 237330b..237330b 100644 --- a/maps/main_stage/assets/staircase_1/staircase.material +++ b/ship/staircase_1/staircase.material 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] diff --git a/maps/main_stage/assets/staircase_1/staircase_1.tscn b/ship/staircase_1/staircase_1.tscn index f4a4f29..f7e7649 100644 --- a/maps/main_stage/assets/staircase_1/staircase_1.tscn +++ b/ship/staircase_1/staircase_1.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://maps/main_stage/assets/staircase_1/staircase_1.gltf" type="PackedScene" id=1] -[ext_resource path="res://maps/main_stage/assets/staircase_1/staircase.material" type="Material" id=2] +[ext_resource path="res://ship/staircase_1/staircase_1.gltf" type="PackedScene" id=1] +[ext_resource path="res://ship/staircase_1/staircase.material" type="Material" id=2] [sub_resource type="ArrayMesh" id=1] resource_name = "staircase_1_Cube001" |