diff --git a/1.0 remaining fixes.txt b/1.0 remaining fixes.txt index e328e5a..5afe9b6 100644 --- a/1.0 remaining fixes.txt +++ b/1.0 remaining fixes.txt @@ -1,6 +1,5 @@ freeroam maps: -fix collision on balcony stage furnish kingston pike finish furnishing speedway and add to game diff --git a/Models/GenericRooms/BalconyStage/BalconyStage-StageCollide.obj b/Models/GenericRooms/BalconyStage/BalconyStage-StageCollide.obj index 7484601..19fd3fb 100644 --- a/Models/GenericRooms/BalconyStage/BalconyStage-StageCollide.obj +++ b/Models/GenericRooms/BalconyStage/BalconyStage-StageCollide.obj @@ -1,4 +1,4 @@ -# Blender 4.5.1 LTS +# Blender 4.5.3 LTS # www.blender.org o StageCollide v -3.800000 1.300000 0.400000 @@ -35,8 +35,8 @@ vn 0.7071 -0.0000 0.7071 vn -0.0000 -0.0000 1.0000 vn -0.7071 -0.0000 0.7071 vn 1.0000 -0.0000 -0.0000 -vn -0.0000 1.0000 -0.0000 vn -0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 vt 0.375000 0.000000 vt 0.625000 0.000000 vt 0.625000 0.250000 @@ -58,5 +58,19 @@ f 21/2/5 22/1/5 24/1/5 23/2/5 f 23/2/4 24/1/4 26/1/4 25/2/4 f 25/2/3 26/1/3 28/1/3 27/2/3 f 8/5/6 27/2/6 28/1/6 7/6/6 -f 2/2/7 5/2/7 9/2/7 11/2/7 13/2/7 15/2/7 17/2/7 19/2/7 21/2/7 23/2/7 25/2/7 27/2/7 8/5/7 4/3/7 -f 3/4/8 7/6/8 28/1/8 26/1/8 24/1/8 22/1/8 20/1/8 18/1/8 16/1/8 14/1/8 12/1/8 10/1/8 6/1/8 1/1/8 +f 12/1/7 3/4/7 14/1/7 +f 1/1/7 3/4/7 12/1/7 +f 20/1/7 7/6/7 22/1/7 +f 20/1/7 14/1/7 3/4/7 7/6/7 +f 20/1/7 18/1/7 16/1/7 14/1/7 +f 22/1/7 7/6/7 28/1/7 +f 28/1/7 26/1/7 24/1/7 22/1/7 +f 12/1/7 10/1/7 6/1/7 1/1/7 +f 4/3/8 2/2/8 11/2/8 +f 2/2/8 5/2/8 9/2/8 11/2/8 +f 11/2/8 13/2/8 4/3/8 +f 19/2/8 21/2/8 8/5/8 +f 19/2/8 8/5/8 4/3/8 13/2/8 +f 13/2/8 15/2/8 17/2/8 19/2/8 +f 21/2/8 27/2/8 8/5/8 +f 21/2/8 23/2/8 25/2/8 27/2/8 diff --git a/Scenes/FreeRoam/Generic/GenericBalconyStage.tscn b/Scenes/FreeRoam/Generic/GenericBalconyStage.tscn index da3a02c..1bc4c2f 100644 --- a/Scenes/FreeRoam/Generic/GenericBalconyStage.tscn +++ b/Scenes/FreeRoam/Generic/GenericBalconyStage.tscn @@ -15,14 +15,14 @@ [sub_resource type="Environment" id="Environment_w3m2i"] ambient_light_source = 1 -[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_hjn8u"] -data = PackedVector3Array(-3.8, 4, 0.4, -3.8, 1.3, 0.4, -3.8, 4, -1, -3.8, 4, -1, -3.8, 1.3, 0.4, -3.8, 1.3, -1, -3.8, 4, -1, -3.8, 1.3, -1, 3.8, 4, -1, 3.8, 4, -1, -3.8, 1.3, -1, 3.8, 1.3, -1, -2.4, 1.3, 0.7, -2.4, 4, 0.7, -2.1, 1.3, 0.4, -2.1, 1.3, 0.4, -2.4, 4, 0.7, -2.1, 4, 0.4, -3.5, 1.3, 0.7, -3.5, 4, 0.7, -2.4, 1.3, 0.7, -2.4, 1.3, 0.7, -3.5, 4, 0.7, -2.4, 4, 0.7, -2.1, 1.3, 0.4, -2.1, 4, 0.4, -0.9, 1.3, 0.4, -0.9, 1.3, 0.4, -2.1, 4, 0.4, -0.9, 4, 0.4, -3.8, 1.3, 0.4, -3.8, 4, 0.4, -3.5, 1.3, 0.7, -3.5, 1.3, 0.7, -3.8, 4, 0.4, -3.5, 4, 0.7, -0.9, 1.3, 0.4, -0.9, 4, 0.4, -0.6, 1.3, 0.7, -0.6, 1.3, 0.7, -0.9, 4, 0.4, -0.6, 4, 0.7, -0.6, 1.3, 0.7, -0.6, 4, 0.7, 0.6, 1.3, 0.7, 0.6, 1.3, 0.7, -0.6, 4, 0.7, 0.6, 4, 0.7, 0.6, 1.3, 0.7, 0.6, 4, 0.7, 0.9, 1.3, 0.4, 0.9, 1.3, 0.4, 0.6, 4, 0.7, 0.9, 4, 0.4, 0.9, 1.3, 0.4, 0.9, 4, 0.4, 2.1, 1.3, 0.4, 2.1, 1.3, 0.4, 0.9, 4, 0.4, 2.1, 4, 0.4, 2.1, 1.3, 0.4, 2.1, 4, 0.4, 2.4, 1.3, 0.7, 2.4, 1.3, 0.7, 2.1, 4, 0.4, 2.4, 4, 0.7, 2.4, 1.3, 0.7, 2.4, 4, 0.7, 3.5, 1.3, 0.7, 3.5, 1.3, 0.7, 2.4, 4, 0.7, 3.5, 4, 0.7, 3.5, 1.3, 0.7, 3.5, 4, 0.7, 3.8, 1.3, 0.4, 3.8, 1.3, 0.4, 3.5, 4, 0.7, 3.8, 4, 0.4, 3.8, 4, 0.4, 3.8, 4, -1, 3.8, 1.3, 0.4, 3.8, 1.3, 0.4, 3.8, 4, -1, 3.8, 1.3, -1, -3.5, 4, 0.7, -3.8, 4, 0.4, -2.4, 4, 0.7, -2.4, 4, 0.7, -3.8, 4, 0.4, -2.1, 4, 0.4, -2.1, 4, 0.4, -3.8, 4, 0.4, -0.9, 4, 0.4, -0.9, 4, 0.4, -3.8, 4, 0.4, -0.6, 4, 0.7, -0.6, 4, 0.7, -3.8, 4, 0.4, 0.6, 4, 0.7, 0.6, 4, 0.7, -3.8, 4, 0.4, 0.9, 4, 0.4, 0.9, 4, 0.4, -3.8, 4, 0.4, 2.1, 4, 0.4, 2.1, 4, 0.4, -3.8, 4, 0.4, 2.4, 4, 0.7, 2.4, 4, 0.7, -3.8, 4, 0.4, 3.5, 4, 0.7, 3.5, 4, 0.7, -3.8, 4, 0.4, 3.8, 4, 0.4, 3.8, 4, 0.4, -3.8, 4, 0.4, 3.8, 4, -1, 3.8, 4, -1, -3.8, 4, 0.4, -3.8, 4, -1, 3.8, 1.3, -1, -3.8, 1.3, -1, 3.8, 1.3, 0.4, 3.8, 1.3, 0.4, -3.8, 1.3, -1, 3.5, 1.3, 0.7, 3.5, 1.3, 0.7, -3.8, 1.3, -1, 2.4, 1.3, 0.7, 2.4, 1.3, 0.7, -3.8, 1.3, -1, 2.1, 1.3, 0.4, 2.1, 1.3, 0.4, -3.8, 1.3, -1, 0.9, 1.3, 0.4, 0.9, 1.3, 0.4, -3.8, 1.3, -1, 0.6, 1.3, 0.7, 0.6, 1.3, 0.7, -3.8, 1.3, -1, -0.6, 1.3, 0.7, -0.6, 1.3, 0.7, -3.8, 1.3, -1, -0.9, 1.3, 0.4, -0.9, 1.3, 0.4, -3.8, 1.3, -1, -2.1, 1.3, 0.4, -2.1, 1.3, 0.4, -3.8, 1.3, -1, -2.4, 1.3, 0.7, -2.4, 1.3, 0.7, -3.8, 1.3, -1, -3.5, 1.3, 0.7, -3.5, 1.3, 0.7, -3.8, 1.3, -1, -3.8, 1.3, 0.4) -backface_collision = true - [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_8i5le"] data = PackedVector3Array(-6.8, 4, 8, -6.8, 0, 8, -6.8, 4, 0, -6.8, 4, 0, -6.8, 0, 8, -6.8, 0, 0, -6.8, 4, 0, -6.8, 0, 0, -3.8, 4, 0, -3.8, 4, 0, -6.8, 0, 0, -3.8, 0, 0, 7.6, 0, 0, 7.6, 4, 0, 3.8, 0, 0, 3.8, 0, 0, 7.6, 4, 0, 3.8, 4, 0, 7.6, 0, 8, 7.6, 4, 8, 7.6, 0, 0, 7.6, 0, 0, 7.6, 4, 8, 7.6, 4, 0, -6.8, 0, 8, -6.8, 4, 8, 7.6, 0, 8, 7.6, 0, 8, -6.8, 4, 8, 7.6, 4, 8, 3.8, 0, 0, -3.8, 0, 0, 3.8, 1.3, 0, 3.8, 1.3, 0, -3.8, 0, 0, -3.8, 1.3, 0, -3.8, 0, 0, -6.8, 0, 0, 3.8, 0, 0, 7.6, 0, 8, -6.8, 0, 0, -6.8, 0, 8, 7.6, 0, 0, -6.8, 0, 0, 7.6, 0, 8, 3.8, 0, 0, -6.8, 0, 0, 7.6, 0, 0, 7.6, 4, 8, -6.8, 4, 8, 7.6, 4, 0, 7.6, 4, 0, -6.8, 4, 8, 3.8, 4, 0, 3.8, 4, 0, -6.8, 4, 8, -3.8, 4, 0, -3.8, 4, 0, -6.8, 4, 8, -6.8, 4, 0) backface_collision = true +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_kyqka"] +data = PackedVector3Array(-3.8, 4, 0.39999998, -3.8, 1.3, 0.39999998, -3.8, 4, -1, -3.8, 4, -1, -3.8, 1.3, 0.39999998, -3.8, 1.3, -1, -3.8, 4, -1, -3.8, 1.3, -1, 3.8, 4, -1, 3.8, 4, -1, -3.8, 1.3, -1, 3.8, 1.3, -1, -2.3999999, 1.3, 0.7, -2.3999999, 4, 0.7, -2.1, 1.3, 0.39999998, -2.1, 1.3, 0.39999998, -2.3999999, 4, 0.7, -2.1, 4, 0.39999998, -3.5, 1.3, 0.7, -3.5, 4, 0.7, -2.3999999, 1.3, 0.7, -2.3999999, 1.3, 0.7, -3.5, 4, 0.7, -2.3999999, 4, 0.7, -2.1, 1.3, 0.39999998, -2.1, 4, 0.39999998, -0.9, 1.3, 0.39999998, -0.9, 1.3, 0.39999998, -2.1, 4, 0.39999998, -0.9, 4, 0.39999998, -3.8, 1.3, 0.39999998, -3.8, 4, 0.39999998, -3.5, 1.3, 0.7, -3.5, 1.3, 0.7, -3.8, 4, 0.39999998, -3.5, 4, 0.7, -0.9, 1.3, 0.39999998, -0.9, 4, 0.39999998, -0.59999996, 1.3, 0.7, -0.59999996, 1.3, 0.7, -0.9, 4, 0.39999998, -0.59999996, 4, 0.7, -0.59999996, 1.3, 0.7, -0.59999996, 4, 0.7, 0.59999996, 1.3, 0.7, 0.59999996, 1.3, 0.7, -0.59999996, 4, 0.7, 0.59999996, 4, 0.7, 0.59999996, 1.3, 0.7, 0.59999996, 4, 0.7, 0.9, 1.3, 0.39999998, 0.9, 1.3, 0.39999998, 0.59999996, 4, 0.7, 0.9, 4, 0.39999998, 0.9, 1.3, 0.39999998, 0.9, 4, 0.39999998, 2.1, 1.3, 0.39999998, 2.1, 1.3, 0.39999998, 0.9, 4, 0.39999998, 2.1, 4, 0.39999998, 2.1, 1.3, 0.39999998, 2.1, 4, 0.39999998, 2.3999999, 1.3, 0.7, 2.3999999, 1.3, 0.7, 2.1, 4, 0.39999998, 2.3999999, 4, 0.7, 2.3999999, 1.3, 0.7, 2.3999999, 4, 0.7, 3.5, 1.3, 0.7, 3.5, 1.3, 0.7, 2.3999999, 4, 0.7, 3.5, 4, 0.7, 3.5, 1.3, 0.7, 3.5, 4, 0.7, 3.8, 1.3, 0.39999998, 3.8, 1.3, 0.39999998, 3.5, 4, 0.7, 3.8, 4, 0.39999998, 3.8, 4, 0.39999998, 3.8, 4, -1, 3.8, 1.3, 0.39999998, 3.8, 1.3, 0.39999998, 3.8, 4, -1, 3.8, 1.3, -1, -3.8, 1.3, -1, -2.1, 1.3, 0.39999998, -0.9, 1.3, 0.39999998, -3.8, 1.3, -1, -3.8, 1.3, 0.39999998, -2.1, 1.3, 0.39999998, -3.5, 1.3, 0.7, -2.1, 1.3, 0.39999998, -3.8, 1.3, 0.39999998, -2.3999999, 1.3, 0.7, -2.1, 1.3, 0.39999998, -3.5, 1.3, 0.7, -0.9, 1.3, 0.39999998, 0.9, 1.3, 0.39999998, -3.8, 1.3, -1, -0.59999996, 1.3, 0.7, 0.9, 1.3, 0.39999998, -0.9, 1.3, 0.39999998, 0.59999996, 1.3, 0.7, 0.9, 1.3, 0.39999998, -0.59999996, 1.3, 0.7, -3.8, 1.3, -1, 0.9, 1.3, 0.39999998, 3.8, 1.3, -1, 3.8, 1.3, -1, 0.9, 1.3, 0.39999998, 2.1, 1.3, 0.39999998, 3.8, 1.3, -1, 2.1, 1.3, 0.39999998, 3.8, 1.3, 0.39999998, 2.3999999, 1.3, 0.7, 3.8, 1.3, 0.39999998, 2.1, 1.3, 0.39999998, 3.5, 1.3, 0.7, 3.8, 1.3, 0.39999998, 2.3999999, 1.3, 0.7, -3.8, 4, 0.39999998, -3.8, 4, -1, -2.1, 4, 0.39999998, -2.3999999, 4, 0.7, -3.8, 4, 0.39999998, -2.1, 4, 0.39999998, -3.5, 4, 0.7, -3.8, 4, 0.39999998, -2.3999999, 4, 0.7, -0.9, 4, 0.39999998, -2.1, 4, 0.39999998, -3.8, 4, -1, -3.8, 4, -1, 0.9, 4, 0.39999998, -0.9, 4, 0.39999998, 3.8, 4, -1, 0.9, 4, 0.39999998, -3.8, 4, -1, 0.59999996, 4, 0.7, -0.9, 4, 0.39999998, 0.9, 4, 0.39999998, -0.59999996, 4, 0.7, -0.9, 4, 0.39999998, 0.59999996, 4, 0.7, 2.1, 4, 0.39999998, 0.9, 4, 0.39999998, 3.8, 4, -1, 3.8, 4, 0.39999998, 2.1, 4, 0.39999998, 3.8, 4, -1, 3.5, 4, 0.7, 2.1, 4, 0.39999998, 3.8, 4, 0.39999998, 2.3999999, 4, 0.7, 2.1, 4, 0.39999998, 3.5, 4, 0.7) +backface_collision = true + [node name="Balcony" type="Node3D"] [node name="Munch" parent="." instance=ExtResource("1_dmiku")] @@ -379,8 +379,8 @@ current_map = "Generic Balcony Stage" [node name="StaticBody3D" type="StaticBody3D" parent="."] -[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"] -shape = SubResource("ConcavePolygonShape3D_hjn8u") - [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"] shape = SubResource("ConcavePolygonShape3D_8i5le") + +[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"] +shape = SubResource("ConcavePolygonShape3D_kyqka")