From 02de1b12793a2860d88621855037605101e41b3a Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 31 Aug 2020 08:42:44 -0400 Subject: [PATCH 1/9] [Neighborhood] Fixed small stairwell toe-stub. - 'CollisionGeom': Fixed reduced steepness of collider to prevent avatar blockage. --- compiled/dat/Neighborhood_District_nb01.prp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiled/dat/Neighborhood_District_nb01.prp b/compiled/dat/Neighborhood_District_nb01.prp index ff640def..9f4f86da 100644 --- a/compiled/dat/Neighborhood_District_nb01.prp +++ b/compiled/dat/Neighborhood_District_nb01.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:183e3abc06b4891248ca9f71a907a4b1659eb73bafaccf110e1c9ffc195921ae -size 7365835 +oid sha256:093331feebb7d96e594a8c85e235eff775a6284897ba480e7869bef8a06a8cb9 +size 7132387 From 1c9ec576f708cd20c442d8a4731f036729ee5f9f Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 31 Aug 2020 09:24:11 -0400 Subject: [PATCH 2/9] [Personal] Adjusted colliders causing issues with the avatar. - 'HutInteriorFloor': Added step-up ramp for the main bookshelf. - 'LampCollision01', 'LampCollision02', 'LampCollision05', 'LampCollision06': Extended colliders down slightly to prevent the avatar from getting stuck between the lamp and the ground. --- compiled/dat/Personal_District_psnlMYSTII.prp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiled/dat/Personal_District_psnlMYSTII.prp b/compiled/dat/Personal_District_psnlMYSTII.prp index e4e237b0..a5022382 100644 --- a/compiled/dat/Personal_District_psnlMYSTII.prp +++ b/compiled/dat/Personal_District_psnlMYSTII.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8789a1be7dc27f5fe0a2d74a92202b50cb9f85cd93ad350c5e1178df759e253 -size 8876286 +oid sha256:d0a1ed89b8ce8e403e994ead165328d08c1bfbb61afc50830209f25a2996c244 +size 8590225 From 0f78575d7924b6b92f0e5e488e0e191c808b0343 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 2 Sep 2020 13:03:54 -0400 Subject: [PATCH 3/9] [Ercana] Fix toe-stub points. - 'StairCollider2', 'StairCollisionPlane': Extended stair colliders for the control room to properly reach the lower floor. - 'PelletRmFloor': Added step-up ramps. - 'TunnelCollision': Reduced slope of step-up ramp. - 'HallExtent': Removed collision geometry exactly matching the drawable stairs and replaced with a step-up ramp. - 'HallExtent01': Deleted physical - it was an exact duplicate of the drawable geometry. The object 'HallExtent02Proxy' is coincident with this object. - 'HallExtent02Proxy': Corrected step-up ramp to extend to the top of the stairs. --- compiled/dat/Ercana_District_Bakery.prp | 4 ++-- compiled/dat/Ercana_District_ControlRoom.prp | 4 ++-- compiled/dat/Ercana_District_PelletRm.prp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiled/dat/Ercana_District_Bakery.prp b/compiled/dat/Ercana_District_Bakery.prp index 550d734c..e3e7582c 100644 --- a/compiled/dat/Ercana_District_Bakery.prp +++ b/compiled/dat/Ercana_District_Bakery.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a988a99b272f1e250ee9d8784193f82d469a1b5e4022c3769eb8b9d2eb7f527 -size 1410675 +oid sha256:cdac769264cbd9aa9525deb37bd3e15fb03b032b654da79e2c7ec8654acf0c11 +size 1296964 diff --git a/compiled/dat/Ercana_District_ControlRoom.prp b/compiled/dat/Ercana_District_ControlRoom.prp index 80fa6538..b39e547f 100644 --- a/compiled/dat/Ercana_District_ControlRoom.prp +++ b/compiled/dat/Ercana_District_ControlRoom.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e350d7e011cdc66777223a19fd630579deabbda34871799b77b1c422c72ba971 -size 960139 +oid sha256:484a76a2151c2a96e6c4070ed406f4fb1aaad28a609684bbcbf46cf3a6329923 +size 925703 diff --git a/compiled/dat/Ercana_District_PelletRm.prp b/compiled/dat/Ercana_District_PelletRm.prp index 226ebc2d..07c74662 100644 --- a/compiled/dat/Ercana_District_PelletRm.prp +++ b/compiled/dat/Ercana_District_PelletRm.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b29761db386b59b0a93c6fc22a3e7bdf649edf6739f4baebc3873ea7e512d81 -size 830781 +oid sha256:f50e7183d96ee1d8417eebf1d62d9e4f73bd8c8cdff1b5cdb098bc6ba7632138 +size 800382 From 77f8e0a3b05817545ab79a4e1bd244bd70d692dd Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 2 Sep 2020 16:08:47 -0400 Subject: [PATCH 4/9] [Kadish] Correct toe-stubs in colliders. - 'kdshCourtyardCollision': Corrected many toe-stubs by adding step-up ramps and reducing slopes as needed. - 'LowerProxyTerrain': Corrected a toe-stub at the entry to the red herring cave by shifting the step-up ramp's edge away from a coincident edge in another collider. --- compiled/dat/Kadish_District_kdshCourtyard.prp | 4 ++-- compiled/dat/Kadish_District_kdshPillars.prp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiled/dat/Kadish_District_kdshCourtyard.prp b/compiled/dat/Kadish_District_kdshCourtyard.prp index 1015ae24..df6b9fb2 100644 --- a/compiled/dat/Kadish_District_kdshCourtyard.prp +++ b/compiled/dat/Kadish_District_kdshCourtyard.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc686972db81206f67d838baed18e450056592fca567966a2fb4af6db351b2a8 -size 982775 +oid sha256:48f8dc77a604843885749708283f58313c2dc04e13aacfb934957410eda91cca +size 957509 diff --git a/compiled/dat/Kadish_District_kdshPillars.prp b/compiled/dat/Kadish_District_kdshPillars.prp index 5a761167..69d136fb 100644 --- a/compiled/dat/Kadish_District_kdshPillars.prp +++ b/compiled/dat/Kadish_District_kdshPillars.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e53dc5cc9d24cc158e43b8d18f16d2e592f9aaeb70c58a3b8c576aa31193fd2 -size 2989803 +oid sha256:c3c2ad9c1f4481481e2a8b16d8d743eaa29e79b4d7df029ece81a537af433211 +size 2887352 From ce5d33067728e8494ad097fdd7e5d9edd1735cc6 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 2 Sep 2020 16:12:07 -0400 Subject: [PATCH 5/9] [GreatZero] Improved stair collision mesh. - 'CollisionMesh01': Improved toe-stubbing around the curved stairwells near the protractor by reducing the slope of the step-up ramp and making the slope consistent among the ramp faces. --- compiled/dat/GreatZero_District_GreatZero.prp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiled/dat/GreatZero_District_GreatZero.prp b/compiled/dat/GreatZero_District_GreatZero.prp index 62137b0c..84bd63de 100644 --- a/compiled/dat/GreatZero_District_GreatZero.prp +++ b/compiled/dat/GreatZero_District_GreatZero.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c74821d931b79d4af0e2644b675a6f0d91eb18243ee1c94c0eae11b4db4eed60 -size 2328525 +oid sha256:3bdf702402fbb10a5b2fcb5441624b694bd9b3085b458d4da2d7a40d512fb12a +size 2310983 From b71734e42ac8f3ebeae05a247b151465c11eb57b Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Thu, 3 Sep 2020 17:19:34 -0400 Subject: [PATCH 6/9] [city] Adjusted problematic colliders. - 'RubbleCollideBox', 'RubbleCollideBox02', 'RubbleCollideBox04', 'RubbleCollideBox08', 'RubbleCollideBox09', 'RubbleCollideBox10', 'RubbleCollideBox11', 'RubbleCollideBox12', 'RubbleCollideBox13': Adjusted ferry rubble colliders to include a slope upward to prevent blocking the avatar. - 'SandBAgCollide', 'SandBAgCollide01', 'SandBAgCollide02': Adjusted collision of sandbags in courtyard to include a slope upward to prevent blocking the avatar. - 'MuseumInteriorCollision': Extended the step-up ramp to the courtyard collider, removing a perpendicular intersection that blocked the avatar. - '15StairsCollision': Adjusted the canyon mall collision by making the step-up slope shallower and adding step-up ramps on each side, allowing the avatar to not be blocked by a minor step-up in the visual mesh. - 'CanyonProxyTerrain': Adjusted the collision near the courtyard that was easy to get stuck on when hugging the wall. - 'CourtyardCollisionArena', 'AlleyCollisionArena01': Adjusted collision where the great stairs, timeline, and courtyard met -- the colliders were at slightly different heights, introducing a potential toe-stub. - 'Boulder04': Added proxy collision to canyon mall boulder that was previously intangible. --- compiled/dat/city_District_MuseumInteriorPage.prp | 4 ++-- compiled/dat/city_District_canyon.prp | 4 ++-- compiled/dat/city_District_courtyard.prp | 4 ++-- compiled/dat/city_District_ferry.prp | 4 ++-- compiled/dat/city_District_greatstair.prp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/compiled/dat/city_District_MuseumInteriorPage.prp b/compiled/dat/city_District_MuseumInteriorPage.prp index 2ab95611..1a05a3c1 100644 --- a/compiled/dat/city_District_MuseumInteriorPage.prp +++ b/compiled/dat/city_District_MuseumInteriorPage.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6da8fb126da1f281b9c689143bd708d374253a0dbccccb0fd24596a46875d9db -size 1118092 +oid sha256:425967f0bfdbae51e9bde5aef71512728fc5c618fd27a3ddcac2257c8acb115f +size 1084270 diff --git a/compiled/dat/city_District_canyon.prp b/compiled/dat/city_District_canyon.prp index e0997768..d347363e 100644 --- a/compiled/dat/city_District_canyon.prp +++ b/compiled/dat/city_District_canyon.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c80c53f4ad2662cd581a2b7abe4ba9718cc6f72b495863d2cfad40ad2d42c7a -size 3095259 +oid sha256:a9c8208090d26c5cb3d640f344c0f8f199d26cbe60edff2c0d7c68cd638325b2 +size 2999513 diff --git a/compiled/dat/city_District_courtyard.prp b/compiled/dat/city_District_courtyard.prp index 0e8f3cf9..9f9857d9 100644 --- a/compiled/dat/city_District_courtyard.prp +++ b/compiled/dat/city_District_courtyard.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55048e5328c1622cb755be11e8a0c529ff793e0d420c84f68f7a7b3e8a63fddc -size 2896851 +oid sha256:256ea6f05c54ca57f25348d98a3e12b670e12d5eadb08a297fd667cfb6cace59 +size 2793132 diff --git a/compiled/dat/city_District_ferry.prp b/compiled/dat/city_District_ferry.prp index f56c6350..adb5a4d7 100644 --- a/compiled/dat/city_District_ferry.prp +++ b/compiled/dat/city_District_ferry.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c9ed52ceac64f1d07708758c66c490a397a7be168b4d7078605034d26e93785 -size 3075919 +oid sha256:4044f906e878c0c2231291184698c110ffdf951078a3d966b92aece636b300b4 +size 3003221 diff --git a/compiled/dat/city_District_greatstair.prp b/compiled/dat/city_District_greatstair.prp index 6c4b7105..ddb111d1 100644 --- a/compiled/dat/city_District_greatstair.prp +++ b/compiled/dat/city_District_greatstair.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e4077e87b3e0b677617f8d240f8128f2b1853d9e3f93510189b329fdc868630 -size 2864872 +oid sha256:ea8776ebbea5e3d1b70473646ba33d755495c0825460be951733453f57eadb44 +size 2543581 From 76889a37b48b76f68a9d1db2a7614562c4e66aff Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Thu, 3 Sep 2020 18:45:05 -0400 Subject: [PATCH 7/9] [Neighborhood02] Adjust collision. - 'kirelLinkRoomDoorNEW06': Added proxy collision for visual mesh -- previously there was no collision. - 'kirelCollisionGeom': Adjusted collision to include both sides of 'kirelLinkRoomDoorNEW08' - 'kirelCollisionGeom': Adjusted small curved stairwell step-up ramp near firemarbles to reduce the steepness, allowing the avatar to climb the stairs. --- compiled/dat/Neighborhood02_District_krelKirel.prp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiled/dat/Neighborhood02_District_krelKirel.prp b/compiled/dat/Neighborhood02_District_krelKirel.prp index 369f094a..3d86feb8 100644 --- a/compiled/dat/Neighborhood02_District_krelKirel.prp +++ b/compiled/dat/Neighborhood02_District_krelKirel.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67632f91096c890229c67c84b1bab2ad3b48d4a4aa61c6dba67bfa14e418c434 -size 7510880 +oid sha256:a1a09044ccf3f36b8670e738d42cdf85b7d577d6e34d665d5078eb871b7d43eb +size 7351721 From bb594ece45cc33a213991ac9f09f6033fa18f7ea Mon Sep 17 00:00:00 2001 From: Patrick Dulebohn Date: Wed, 9 Sep 2020 09:31:08 -0400 Subject: [PATCH 8/9] [city] Corrected rock collision proxies on the docks. - "ProxyRubblePiece", "ProxyRubblePiece01", "ProxyRubblePiece02", "ProxyRubblePiece03", "ProxyRubblePiece04" --- compiled/dat/city_District_ferry.prp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiled/dat/city_District_ferry.prp b/compiled/dat/city_District_ferry.prp index adb5a4d7..5f3b067b 100644 --- a/compiled/dat/city_District_ferry.prp +++ b/compiled/dat/city_District_ferry.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4044f906e878c0c2231291184698c110ffdf951078a3d966b92aece636b300b4 -size 3003221 +oid sha256:4ffea779b1f101811f52814dd9595df8995490ecb1471954f9fe79e0fb20ec50 +size 3004421 From ac19f450da83ead381a6398103c5db93d82fba08 Mon Sep 17 00:00:00 2001 From: Patrick Dulebohn Date: Wed, 9 Sep 2020 09:32:04 -0400 Subject: [PATCH 9/9] [city] Corrected rock proxy colliders around the library. - 'RubbleColBox01' through 'RubbleColBox43' --- compiled/dat/city_District_library.prp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiled/dat/city_District_library.prp b/compiled/dat/city_District_library.prp index 313ea817..6ff38329 100644 --- a/compiled/dat/city_District_library.prp +++ b/compiled/dat/city_District_library.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48de88b79ab6e7da829cf0ef5cb8b8539f4b53c179e351453c3a9128359ce0cb -size 3519840 +oid sha256:47a3fabd4a9ec3f7a11f19155aed7a12f09f6677a925af5d21744f46fdf9cc39 +size 3383934