Fix overlapping walls issue, change pillar column collision shapes to cylinder to get stuck on them less

This commit is contained in:
2025-04-01 20:54:30 -07:00
parent 762444fe2c
commit f6a2d28dde
34 changed files with 490 additions and 626 deletions

View File

@@ -29,7 +29,7 @@
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4oyst"]
resource_name = "COLUMN WHITE"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("2_egkxs")
@@ -69,37 +69,37 @@ shadow_mesh = SubResource("ArrayMesh_6nbut")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_id3eh"]
resource_name = "A2 MAIN "
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("3_sfnee")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_nqkft"]
resource_name = "A2 TILE"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("4_utkqh")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_483aw"]
resource_name = "A2 TILE 3"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("5_oqcwc")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_eapvp"]
resource_name = "A2 TILE 2"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("6_f0q5s")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ns6l2"]
resource_name = "WHITE BRICK"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("7_1davs")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_yxf2d"]
resource_name = "MARBLE"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("8_v2xvs")
@@ -283,13 +283,13 @@ shadow_mesh = SubResource("ArrayMesh_s7p6n")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_yfiih"]
resource_name = "SWIRLED"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("9_weetq")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_gcr7v"]
resource_name = "A2 HAND TILE"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("10_57q1h")
@@ -298,7 +298,7 @@ resource_name = "A2 MOTHER"
transparency = 2
alpha_scissor_threshold = 0.5
alpha_antialiasing_mode = 0
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("11_y26hv")
@@ -406,7 +406,7 @@ shadow_mesh = SubResource("ArrayMesh_rqt7b")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0n8c2"]
resource_name = "A2 MAIN STONE 2"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("12_wo03q")
@@ -479,13 +479,13 @@ shadow_mesh = SubResource("ArrayMesh_cmq71")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_wy8dd"]
resource_name = "AREA 2 CORRIDOR TRIM"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("13_d5bj7")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jwani"]
resource_name = "WHITE TILE"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("14_gpqil")
@@ -661,7 +661,7 @@ shadow_mesh = SubResource("ArrayMesh_kcblo")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_cqc6b"]
resource_name = "HAND LIME"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("10_57q1h")
@@ -839,7 +839,7 @@ shadow_mesh = SubResource("ArrayMesh_8on1a")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_i3ftr"]
resource_name = "A2 DARKER STONE"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("15_g11te")
texture_filter = 2
@@ -914,33 +914,33 @@ shadow_mesh = SubResource("ArrayMesh_s1yj6")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xoxtd"]
resource_name = "AREA 2 FLOOR"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("5_oqcwc")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jfrd3"]
resource_name = "AREA 2 STUCCO"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("16_l6lac")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_v4iuw"]
resource_name = "AREA 2 DARK "
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("17_w36g2")
texture_filter = 2
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_fd687"]
resource_name = "AREA 2 FLOOR VARIATION"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("6_f0q5s")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6s383"]
resource_name = "A2 STONE PANEL"
transparency = 4
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("18_vkld8")
texture_filter = 2
@@ -950,20 +950,20 @@ resource_name = "HAND CYCLE"
transparency = 2
alpha_scissor_threshold = 0.5
alpha_antialiasing_mode = 0
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("19_ydosv")
texture_filter = 2
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_n5ffv"]
resource_name = "Material.010"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("20_28gy6")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_msj5l"]
resource_name = "Material.006"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("21_tt5wf")
@@ -1350,7 +1350,7 @@ resource_name = "Material.008"
transparency = 2
alpha_scissor_threshold = 0.5
alpha_antialiasing_mode = 0
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("22_ddrwt")
@@ -1388,7 +1388,7 @@ shadow_mesh = SubResource("ArrayMesh_7f5nk")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a5xuq"]
resource_name = "Material"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("23_rke2f")
@@ -1429,7 +1429,7 @@ resource_name = "Material.002"
transparency = 2
alpha_scissor_threshold = 0.5
alpha_antialiasing_mode = 0
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("24_k805n")
texture_filter = 2
@@ -1500,7 +1500,7 @@ shadow_mesh = SubResource("ArrayMesh_rgh1o")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_pc5d1"]
resource_name = "AREA 2 STUCCO 2"
cull_mode = 2
cull_mode = 0
shading_mode = 0
albedo_texture = ExtResource("2_egkxs")