diff --git a/AutomatedTesting/Registry/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.setreg_override b/AutomatedTesting/Registry/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.setreg_override deleted file mode 100644 index aa82265c98..0000000000 --- a/AutomatedTesting/Registry/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.setreg_override +++ /dev/null @@ -1,115 +0,0 @@ -{ - "Amazon": { - "Gems": { - "PhysX": { - "PhysXSystemConfiguration": { - "CollisionConfig": { - "Layers": { - "LayerNames": [ - "Default", - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {} - ] - }, - "Groups": { - "GroupPresets": [ - { - "Name": "All", - "ReadOnly": true - }, - { - "Id": { - "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" - }, - "Name": "None", - "Group": { - "Mask": 0 - }, - "ReadOnly": true - }, - { - "Id": { - "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" - }, - "Name": "All_NoTouchBend", - "Group": { - "Mask": 9223372036854775807 - }, - "ReadOnly": true - } - ] - } - }, - "MaterialLibrary": { - "assetId": { - "guid": "{70D4A444-AFD4-57C4-9885-63F25AC3C281}" - }, - "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c15556261_physxmaterials_charactercontrollermaterialassignment/library.physmaterial" - } - } - } - } - } -} \ No newline at end of file diff --git a/AutomatedTesting/Registry/C18981526_Material_RestitutionCombinePriority.setreg_override b/AutomatedTesting/Registry/C18981526_Material_RestitutionCombinePriority.setreg_override deleted file mode 100644 index c78018bdbb..0000000000 --- a/AutomatedTesting/Registry/C18981526_Material_RestitutionCombinePriority.setreg_override +++ /dev/null @@ -1,115 +0,0 @@ -{ - "Amazon": { - "Gems": { - "PhysX": { - "PhysXSystemConfiguration": { - "CollisionConfig": { - "Layers": { - "LayerNames": [ - "Default", - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {} - ] - }, - "Groups": { - "GroupPresets": [ - { - "Name": "All", - "ReadOnly": true - }, - { - "Id": { - "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" - }, - "Name": "None", - "Group": { - "Mask": 0 - }, - "ReadOnly": true - }, - { - "Id": { - "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" - }, - "Name": "All_NoTouchBend", - "Group": { - "Mask": 9223372036854775807 - }, - "ReadOnly": true - } - ] - } - }, - "MaterialLibrary": { - "assetId": { - "guid": "{AED48B18-0F3F-5E59-A8FF-30DB134B307B}" - }, - "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c18981526_material_restitutioncombinepriority/restitution_combine.physmaterial" - } - } - } - } - } -} \ No newline at end of file diff --git a/AutomatedTesting/Registry/C4044697_Material_PerfaceMaterialValidation.setreg_override b/AutomatedTesting/Registry/C4044697_Material_PerfaceMaterialValidation.setreg_override deleted file mode 100644 index 5a93ae2314..0000000000 --- a/AutomatedTesting/Registry/C4044697_Material_PerfaceMaterialValidation.setreg_override +++ /dev/null @@ -1,115 +0,0 @@ -{ - "Amazon": { - "Gems": { - "PhysX": { - "PhysXSystemConfiguration": { - "CollisionConfig": { - "Layers": { - "LayerNames": [ - "Default", - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {} - ] - }, - "Groups": { - "GroupPresets": [ - { - "Name": "All", - "ReadOnly": true - }, - { - "Id": { - "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" - }, - "Name": "None", - "Group": { - "Mask": 0 - }, - "ReadOnly": true - }, - { - "Id": { - "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" - }, - "Name": "All_NoTouchBend", - "Group": { - "Mask": 9223372036854775807 - }, - "ReadOnly": true - } - ] - } - }, - "MaterialLibrary": { - "assetId": { - "guid": "{2E85B457-ED19-5FE3-90B4-6EFFB4D0E682}" - }, - "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c4044697_material_perfacematerialvalidation/test_library.physmaterial" - } - } - } - } - } -} \ No newline at end of file diff --git a/AutomatedTesting/Registry/editorpreferences.setreg b/AutomatedTesting/Registry/editorpreferences.setreg index b338d6acad..e76e04f9ba 100644 --- a/AutomatedTesting/Registry/editorpreferences.setreg +++ b/AutomatedTesting/Registry/editorpreferences.setreg @@ -1,7 +1,7 @@ { "Amazon": { "Preferences": { - "EnablePrefabSystem": false + "EnablePrefabSystem": true } } } \ No newline at end of file diff --git a/AutomatedTesting/Registry/C4976227_Collider_NewGroup.setreg_override b/AutomatedTesting/Registry/physx_overrides/Collider_AddingNewGroupWorks.setreg_override similarity index 100% rename from AutomatedTesting/Registry/C4976227_Collider_NewGroup.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Collider_AddingNewGroupWorks.setreg_override diff --git a/AutomatedTesting/Registry/C3510644_Collider_CollisionGroups.setreg_override b/AutomatedTesting/Registry/physx_overrides/Collider_CollisionGroupsWorkflow.setreg_override similarity index 100% rename from AutomatedTesting/Registry/C3510644_Collider_CollisionGroups.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Collider_CollisionGroupsWorkflow.setreg_override diff --git a/AutomatedTesting/Registry/C4976244_Collider_SameGroupSameLayerCollision.setreg_override b/AutomatedTesting/Registry/physx_overrides/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide.setreg_override similarity index 100% rename from AutomatedTesting/Registry/C4976244_Collider_SameGroupSameLayerCollision.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide.setreg_override diff --git a/AutomatedTesting/Registry/C4976245_PhysXCollider_CollisionLayerTest.setreg_override b/AutomatedTesting/Registry/physx_overrides/Collider_NoneCollisionGroupSameLayerNotCollide.setreg_override similarity index 100% rename from AutomatedTesting/Registry/C4976245_PhysXCollider_CollisionLayerTest.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Collider_NoneCollisionGroupSameLayerNotCollide.setreg_override diff --git a/AutomatedTesting/Registry/C4982593_PhysXCollider_CollisionLayer.setreg_override b/AutomatedTesting/Registry/physx_overrides/Collider_SameCollisionGroupSameCustomLayerCollide.setreg_override similarity index 100% rename from AutomatedTesting/Registry/C4982593_PhysXCollider_CollisionLayer.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Collider_SameCollisionGroupSameCustomLayerCollide.setreg_override diff --git a/AutomatedTesting/Registry/C4044461_Material_Restitution.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_CharacterController.setreg_override similarity index 95% rename from AutomatedTesting/Registry/C4044461_Material_Restitution.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Material_CharacterController.setreg_override index b70e0f1326..e250c2a8ec 100644 --- a/AutomatedTesting/Registry/C4044461_Material_Restitution.setreg_override +++ b/AutomatedTesting/Registry/physx_overrides/Material_CharacterController.setreg_override @@ -103,10 +103,10 @@ }, "MaterialLibrary": { "assetId": { - "guid": "{E4117B5B-8D9A-5C1D-BA1E-C36542A6588D}" + "guid": "{96A9180B-06C8-5AC2-836D-FFF518B5976A}" }, "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c4044461_material_restitution/restitution.physmaterial" + "assetHint": "levels/physics/material_charactercontroller/library.physmaterial" } } } diff --git a/AutomatedTesting/Registry/physx_overrides/Material_DefaultLibraryUpdatedAcrossLevels_after.setreg b/AutomatedTesting/Registry/physx_overrides/Material_DefaultLibraryUpdatedAcrossLevels_after.setreg new file mode 100644 index 0000000000..8d694c80d2 --- /dev/null +++ b/AutomatedTesting/Registry/physx_overrides/Material_DefaultLibraryUpdatedAcrossLevels_after.setreg @@ -0,0 +1,115 @@ +{ + "Amazon": { + "Gems": { + "PhysX": { + "PhysXSystemConfiguration": { + "CollisionConfig": { + "Layers": { + "LayerNames": [ + "Default", + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + "TouchBend" + ] + }, + "Groups": { + "GroupPresets": [ + { + "Name": "All", + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" + }, + "Name": "None", + "Group": { + "Mask": 0 + }, + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" + }, + "Name": "All_NoTouchBend", + "Group": { + "Mask": 9223372036854775807 + }, + "ReadOnly": true + } + ] + } + }, + "MaterialLibrary": { + "assetId": { + "guid": "{966C6F3D-A27F-5591-B84E-939D11DDEAC9}" + }, + "loadBehavior": "QueueLoad", + "assetHint": "levels/physics/material_defaultlibraryupdatedacrosslevels/after.physmaterial" + } + } + } + } + } +} \ No newline at end of file diff --git a/AutomatedTesting/Registry/physx_overrides/Material_DefaultLibraryUpdatedAcrossLevels_before.setreg b/AutomatedTesting/Registry/physx_overrides/Material_DefaultLibraryUpdatedAcrossLevels_before.setreg new file mode 100644 index 0000000000..ca45f7128a --- /dev/null +++ b/AutomatedTesting/Registry/physx_overrides/Material_DefaultLibraryUpdatedAcrossLevels_before.setreg @@ -0,0 +1,115 @@ +{ + "Amazon": { + "Gems": { + "PhysX": { + "PhysXSystemConfiguration": { + "CollisionConfig": { + "Layers": { + "LayerNames": [ + "Default", + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + "TouchBend" + ] + }, + "Groups": { + "GroupPresets": [ + { + "Name": "All", + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" + }, + "Name": "None", + "Group": { + "Mask": 0 + }, + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" + }, + "Name": "All_NoTouchBend", + "Group": { + "Mask": 9223372036854775807 + }, + "ReadOnly": true + } + ] + } + }, + "MaterialLibrary": { + "assetId": { + "guid": "{3E410671-6D31-51C6-951F-321EE45B8D5C}" + }, + "loadBehavior": "QueueLoad", + "assetHint": "levels/physics/material_defaultlibraryupdatedacrosslevels/before.physmaterial" + } + } + } + } + } +} \ No newline at end of file diff --git a/AutomatedTesting/Registry/C4044459_Material_DynamicFriction.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_DynamicFriction.setreg_override similarity index 95% rename from AutomatedTesting/Registry/C4044459_Material_DynamicFriction.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Material_DynamicFriction.setreg_override index 5deb5635d1..9b5c8d635d 100644 --- a/AutomatedTesting/Registry/C4044459_Material_DynamicFriction.setreg_override +++ b/AutomatedTesting/Registry/physx_overrides/Material_DynamicFriction.setreg_override @@ -103,10 +103,10 @@ }, "MaterialLibrary": { "assetId": { - "guid": "{6AA79EE4-7EC3-5717-87AE-EDD7D886FD7F}" + "guid": "{7A6CD646-26CA-5A70-AECC-4D55CA4581FE}" }, "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c4044459_material_dynamicfriction/dynamic_friction.physmaterial" + "assetHint": "levels/physics/material_dynamicfriction/dynamic_friction.physmaterial" } } } diff --git a/AutomatedTesting/Registry/C4044456_Material_FrictionCombine.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_FrictionCombine.setreg_override similarity index 95% rename from AutomatedTesting/Registry/C4044456_Material_FrictionCombine.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Material_FrictionCombine.setreg_override index 806d71a158..37c67cb5ec 100644 --- a/AutomatedTesting/Registry/C4044456_Material_FrictionCombine.setreg_override +++ b/AutomatedTesting/Registry/physx_overrides/Material_FrictionCombine.setreg_override @@ -103,10 +103,10 @@ }, "MaterialLibrary": { "assetId": { - "guid": "{8D2C4A29-E0FC-564F-82C9-24BBA30C5A90}" + "guid": "{C61EAD16-634F-5665-B9A8-37F909E7E63B}" }, "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c4044456_material_frictioncombine/friction_combine.physmaterial" + "assetHint": "levels/physics/material_frictioncombine/friction_combine.physmaterial" } } } diff --git a/AutomatedTesting/Registry/C4044457_Material_RestitutionCombine.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_FrictionCombinePriorityOrder.setreg_override similarity index 95% rename from AutomatedTesting/Registry/C4044457_Material_RestitutionCombine.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Material_FrictionCombinePriorityOrder.setreg_override index fa77daac9f..646e87bbe0 100644 --- a/AutomatedTesting/Registry/C4044457_Material_RestitutionCombine.setreg_override +++ b/AutomatedTesting/Registry/physx_overrides/Material_FrictionCombinePriorityOrder.setreg_override @@ -103,10 +103,10 @@ }, "MaterialLibrary": { "assetId": { - "guid": "{D5D6A6DE-E636-5638-B30D-6CE2FDC321F8}" + "guid": "{FBC1EFDC-2A29-5542-92BB-0389FDE72DBD}" }, "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c4044457_material_restitutioncombine/restitution_combine.physmaterial" + "assetHint": "levels/physics/material_frictioncombinepriorityorder/friction_combine.physmaterial" } } } diff --git a/AutomatedTesting/Registry/physx_overrides/Material_PerFaceMaterialGetsCorrectMaterial.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_PerFaceMaterialGetsCorrectMaterial.setreg_override new file mode 100644 index 0000000000..4fcd3899f4 --- /dev/null +++ b/AutomatedTesting/Registry/physx_overrides/Material_PerFaceMaterialGetsCorrectMaterial.setreg_override @@ -0,0 +1,115 @@ +{ + "Amazon": { + "Gems": { + "PhysX": { + "PhysXSystemConfiguration": { + "CollisionConfig": { + "Layers": { + "LayerNames": [ + "Default", + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ] + }, + "Groups": { + "GroupPresets": [ + { + "Name": "All", + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" + }, + "Name": "None", + "Group": { + "Mask": 0 + }, + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" + }, + "Name": "All_NoTouchBend", + "Group": { + "Mask": 9223372036854775807 + }, + "ReadOnly": true + } + ] + } + }, + "MaterialLibrary": { + "assetId": { + "guid": "{6FA8A773-22B5-50FB-BE16-F93936E06A9A}" + }, + "loadBehavior": "QueueLoad", + "assetHint": "levels/physics/material_perfacematerialgetscorrectmaterial/test_library.physmaterial" + } + } + } + } + } +} \ No newline at end of file diff --git a/AutomatedTesting/Registry/physx_overrides/Material_Restitution.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_Restitution.setreg_override new file mode 100644 index 0000000000..e868d98949 --- /dev/null +++ b/AutomatedTesting/Registry/physx_overrides/Material_Restitution.setreg_override @@ -0,0 +1,115 @@ +{ + "Amazon": { + "Gems": { + "PhysX": { + "PhysXSystemConfiguration": { + "CollisionConfig": { + "Layers": { + "LayerNames": [ + "Default", + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ] + }, + "Groups": { + "GroupPresets": [ + { + "Name": "All", + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" + }, + "Name": "None", + "Group": { + "Mask": 0 + }, + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" + }, + "Name": "All_NoTouchBend", + "Group": { + "Mask": 9223372036854775807 + }, + "ReadOnly": true + } + ] + } + }, + "MaterialLibrary": { + "assetId": { + "guid": "{BFE18468-C28C-5FC1-B503-8D36F966A392}" + }, + "loadBehavior": "QueueLoad", + "assetHint": "levels/physics/material_restitution/restitution.physmaterial" + } + } + } + } + } +} \ No newline at end of file diff --git a/AutomatedTesting/Registry/physx_overrides/Material_RestitutionCombine.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_RestitutionCombine.setreg_override new file mode 100644 index 0000000000..23e6e9446b --- /dev/null +++ b/AutomatedTesting/Registry/physx_overrides/Material_RestitutionCombine.setreg_override @@ -0,0 +1,115 @@ +{ + "Amazon": { + "Gems": { + "PhysX": { + "PhysXSystemConfiguration": { + "CollisionConfig": { + "Layers": { + "LayerNames": [ + "Default", + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ] + }, + "Groups": { + "GroupPresets": [ + { + "Name": "All", + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" + }, + "Name": "None", + "Group": { + "Mask": 0 + }, + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" + }, + "Name": "All_NoTouchBend", + "Group": { + "Mask": 9223372036854775807 + }, + "ReadOnly": true + } + ] + } + }, + "MaterialLibrary": { + "assetId": { + "guid": "{2A29B7DB-A736-537D-B9B2-56EF32CA4647}" + }, + "loadBehavior": "QueueLoad", + "assetHint": "levels/physics/material_restitutioncombine/restitution_combine.physmaterial" + } + } + } + } + } +} \ No newline at end of file diff --git a/AutomatedTesting/Registry/C18977601_Material_FrictionCombinePriority.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_RestitutionCombinePriorityOrder.setreg_override similarity index 95% rename from AutomatedTesting/Registry/C18977601_Material_FrictionCombinePriority.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Material_RestitutionCombinePriorityOrder.setreg_override index 7050a57206..3dc0ca972e 100644 --- a/AutomatedTesting/Registry/C18977601_Material_FrictionCombinePriority.setreg_override +++ b/AutomatedTesting/Registry/physx_overrides/Material_RestitutionCombinePriorityOrder.setreg_override @@ -103,10 +103,10 @@ }, "MaterialLibrary": { "assetId": { - "guid": "{B8749DAB-15DA-5A61-B565-C853673604CD}" + "guid": "{E973B6F4-DC8B-5CB2-B0F5-D856FE28D882}" }, "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c18977601_material_frictioncombinepriority/friction_combine.physmaterial" + "assetHint": "levels/physics/material_restitutioncombinepriorityorder/restitution_combine.physmaterial" } } } diff --git a/AutomatedTesting/Registry/C14195074_ScriptCanvas_PostUpdateEvent.setreg_override b/AutomatedTesting/Registry/physx_overrides/ScriptCanvas_PostUpdateEvent.setreg_override similarity index 100% rename from AutomatedTesting/Registry/C14195074_ScriptCanvas_PostUpdateEvent.setreg_override rename to AutomatedTesting/Registry/physx_overrides/ScriptCanvas_PostUpdateEvent.setreg_override diff --git a/AutomatedTesting/Registry/C14902097_ScriptCanvas_PreUpdateEvent.setreg_override b/AutomatedTesting/Registry/physx_overrides/ScriptCanvas_PreUpdateEvent.setreg_override similarity index 100% rename from AutomatedTesting/Registry/C14902097_ScriptCanvas_PreUpdateEvent.setreg_override rename to AutomatedTesting/Registry/physx_overrides/ScriptCanvas_PreUpdateEvent.setreg_override