collision layers not perfect but good enough to merge back into main branch

This commit is contained in:
derek
2024-10-01 13:45:29 -05:00
parent 884f0c5788
commit 291e27904b
15 changed files with 311 additions and 23 deletions

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=118 format=4 uid="uid://bicj5x7nc8tby"]
[gd_scene load_steps=119 format=4 uid="uid://bicj5x7nc8tby"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_wls0y"]
[ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_8r4nh"]
@@ -38,6 +38,7 @@
[ext_resource type="PackedScene" uid="uid://0xs247hfvkml" path="res://assets/rat.tscn" id="36_clv86"]
[ext_resource type="PackedScene" uid="uid://6rhnl7vbvvr4" path="res://assets/rat_hole.tscn" id="37_kjvv4"]
[ext_resource type="PackedScene" uid="uid://b3t8fra7evqfb" path="res://assets/Models/building_1.tscn" id="38_8r1eg"]
[ext_resource type="PackedScene" uid="uid://dvlpc0mrx16l" path="res://assets/table1.tscn" id="39_wl4fl"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_nb6x7"]
sky_top_color = Color(0.500562, 0.697334, 0.809889, 1)
@@ -1167,6 +1168,7 @@ health_drop_enabled = false
[node name="Player" parent="." instance=ExtResource("4_1cxxb")]
transform = Transform3D(-0.866025, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866025, -16.0295, 1.4435, 12.1166)
AUDIO = false
JUMP_VELOCITY = 6
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
@@ -1578,3 +1580,6 @@ transform = Transform3D(-1.39645, 0, 0.0996578, 0, 1.4, 0, -0.0996578, 0, -1.396
[node name="Building5" parent="Building4" instance=ExtResource("38_8r1eg")]
transform = Transform3D(-1.39645, 0, 0.0996578, 0, 1.4, 0, -0.0996578, 0, -1.39645, 7.03891, 0.0535234, 26.5338)
[node name="table1" parent="." instance=ExtResource("39_wl4fl")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.44938, 0.134235, 12.2243)