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/ladder | |
| 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/ladder/ladder.blend (renamed from maps/main_stage/assets/ladder/ladder.blend) | bin | 828492 -> 828492 bytes | |||
| -rw-r--r-- | ship/ladder/ladder.gltf (renamed from maps/main_stage/assets/ladder/ladder.gltf) | 0 | ||||
| -rw-r--r-- | ship/ladder/ladder.gltf.import (renamed from maps/main_stage/assets/ladder/ladder.gltf.import) | 6 | ||||
| -rw-r--r-- | ship/ladder/ladder.tres (renamed from maps/main_stage/assets/ladder/ladder.tres) | 0 | ||||
| -rw-r--r-- | ship/ladder/ladder.tscn (renamed from maps/main_stage/assets/ladder/ladder.tscn) | 4 |
5 files changed, 5 insertions, 5 deletions
diff --git a/maps/main_stage/assets/ladder/ladder.blend b/ship/ladder/ladder.blend Binary files differindex 2b34851..2b34851 100644 --- a/maps/main_stage/assets/ladder/ladder.blend +++ b/ship/ladder/ladder.blend diff --git a/maps/main_stage/assets/ladder/ladder.gltf b/ship/ladder/ladder.gltf index 09af58a..09af58a 100644 --- a/maps/main_stage/assets/ladder/ladder.gltf +++ b/ship/ladder/ladder.gltf diff --git a/maps/main_stage/assets/ladder/ladder.gltf.import b/ship/ladder/ladder.gltf.import index 0f862a8..45bc275 100644 --- a/maps/main_stage/assets/ladder/ladder.gltf.import +++ b/ship/ladder/ladder.gltf.import @@ -2,12 +2,12 @@ importer="scene" type="PackedScene" -path="res://.import/ladder.gltf-7bc339ae5cc681b9028206062174dce3.scn" +path="res://.import/ladder.gltf-0b6340ab46537fc6947b83d4e6aedd5b.scn" [deps] -source_file="res://maps/main_stage/assets/ladder/ladder.gltf" -dest_files=[ "res://.import/ladder.gltf-7bc339ae5cc681b9028206062174dce3.scn" ] +source_file="res://ship/ladder/ladder.gltf" +dest_files=[ "res://.import/ladder.gltf-0b6340ab46537fc6947b83d4e6aedd5b.scn" ] [params] diff --git a/maps/main_stage/assets/ladder/ladder.tres b/ship/ladder/ladder.tres index 23cadda..23cadda 100644 --- a/maps/main_stage/assets/ladder/ladder.tres +++ b/ship/ladder/ladder.tres diff --git a/maps/main_stage/assets/ladder/ladder.tscn b/ship/ladder/ladder.tscn index 11771c5..763a233 100644 --- a/maps/main_stage/assets/ladder/ladder.tscn +++ b/ship/ladder/ladder.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://maps/main_stage/assets/ladder/ladder.gltf" type="PackedScene" id=1] -[ext_resource path="res://maps/main_stage/assets/ladder/ladder.tres" type="Material" id=2] +[ext_resource path="res://ship/ladder/ladder.gltf" type="PackedScene" id=1] +[ext_resource path="res://ship/ladder/ladder.tres" type="Material" id=2] [sub_resource type="ConvexPolygonShape" id=2] points = PoolVector3Array( -2.63751e-05, 17, 1.1522, 0.134708, 17, 1.07459, -0.134708, 17, 1.07459, -2.63751e-05, -1, 1.1522, 0.134708, 17, -1.07481, 0.134708, -1, 1.07459, -0.134708, 17, -1.07481, -0.134708, -1, 1.07459, -2.63751e-05, 17, -1.15243, 0.134708, -1, -1.07481, -0.134708, -1, -1.07481, -2.63751e-05, -1, -1.15243 ) |