diff options
| -rw-r--r-- | ship/ship/ship.tscn | 12 | ||||
| -rw-r--r-- | ship/staircase_1/staircase.blend | bin | 4820720 -> 4814696 bytes | |||
| -rw-r--r-- | ship/staircase_1/staircase_1.bin | bin | 12224 -> 12224 bytes | |||
| -rw-r--r-- | ship/staircase_1/staircase_1.tscn | 3 |
4 files changed, 8 insertions, 7 deletions
diff --git a/ship/ship/ship.tscn b/ship/ship/ship.tscn index afeb6b7..c4d3c2c 100644 --- a/ship/ship/ship.tscn +++ b/ship/ship/ship.tscn @@ -638,6 +638,12 @@ collision_mask = 0 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -7.72568 ) shape = SubResource( 21 ) +[node name="mast" parent="." instance=ExtResource( 17 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 15.4283, -51.0714 ) + +[node name="water_pump" parent="." instance=ExtResource( 22 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.65267, -3.96773, 18.2793 ) + [node name="below_deck" type="Viewport" parent="."] size = Vector2( 320, 180 ) hdr = false @@ -677,9 +683,3 @@ render_target_v_flip = true [node name="Camera" type="Camera" parent="to_be_decided_camera_location"] transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 7.94605, -41.0401 ) - -[node name="mast" parent="." instance=ExtResource( 17 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 15.4283, -51.0714 ) - -[node name="water_pump" parent="." instance=ExtResource( 22 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.65267, -3.96773, 18.2793 ) diff --git a/ship/staircase_1/staircase.blend b/ship/staircase_1/staircase.blend Binary files differindex 5229e83..b469076 100644 --- a/ship/staircase_1/staircase.blend +++ b/ship/staircase_1/staircase.blend diff --git a/ship/staircase_1/staircase_1.bin b/ship/staircase_1/staircase_1.bin Binary files differindex b6b08b7..9d819d1 100644 --- a/ship/staircase_1/staircase_1.bin +++ b/ship/staircase_1/staircase_1.bin diff --git a/ship/staircase_1/staircase_1.tscn b/ship/staircase_1/staircase_1.tscn index 130df2d..adc5a52 100644 --- a/ship/staircase_1/staircase_1.tscn +++ b/ship/staircase_1/staircase_1.tscn @@ -10,9 +10,10 @@ points = PoolVector3Array( -1.80455, -1.87224, -2.97945, -1.80455, -1.33747, -2. [node name="stairs" parent="." index="0"] material/0 = ExtResource( 2 ) -collision_mask = 0 [node name="StaticBody" type="StaticBody" parent="stairs" index="0"] +collision_layer = 4 +collision_mask = 0 [node name="CollisionShape" type="CollisionShape" parent="stairs/StaticBody" index="0"] shape = SubResource( 1 ) |