diff --git a/Editor/CryDesigner_TimeOfDay.xml b/Assets/Editor/CryDesigner_TimeOfDay.xml
similarity index 100%
rename from Editor/CryDesigner_TimeOfDay.xml
rename to Assets/Editor/CryDesigner_TimeOfDay.xml
diff --git a/Editor/Editor.tip b/Assets/Editor/Editor.tip
similarity index 100%
rename from Editor/Editor.tip
rename to Assets/Editor/Editor.tip
diff --git a/Gems/ScriptCanvas/Assets/Editor/Icons/AssetBrowser/ScriptCanvas_16.png b/Assets/Editor/Editor/Icons/AssetBrowser/ScriptCanvas_16.png
similarity index 100%
rename from Gems/ScriptCanvas/Assets/Editor/Icons/AssetBrowser/ScriptCanvas_16.png
rename to Assets/Editor/Editor/Icons/AssetBrowser/ScriptCanvas_16.png
diff --git a/Editor/EditorParticlePanels.xml b/Assets/Editor/EditorParticlePanels.xml
similarity index 100%
rename from Editor/EditorParticlePanels.xml
rename to Assets/Editor/EditorParticlePanels.xml
diff --git a/Editor/EditorParticlePanelsDefault.xml b/Assets/Editor/EditorParticlePanelsDefault.xml
similarity index 100%
rename from Editor/EditorParticlePanelsDefault.xml
rename to Assets/Editor/EditorParticlePanelsDefault.xml
diff --git a/Editor/Fonts/Open_Sans/LICENSE.txt b/Assets/Editor/Fonts/Open_Sans/LICENSE.txt
similarity index 100%
rename from Editor/Fonts/Open_Sans/LICENSE.txt
rename to Assets/Editor/Fonts/Open_Sans/LICENSE.txt
diff --git a/Editor/Fonts/Open_Sans/OpenSans-Bold.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-Bold.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-Bold.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-Bold.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-BoldItalic.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-BoldItalic.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-BoldItalic.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-BoldItalic.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-ExtraBold.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-ExtraBold.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-ExtraBold.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-ExtraBold.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-Italic.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-Italic.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-Italic.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-Italic.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-Light.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-Light.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-Light.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-Light.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-LightItalic.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-LightItalic.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-LightItalic.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-LightItalic.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-Regular.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-Regular.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-Regular.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-Regular.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-Semibold.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-Semibold.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-Semibold.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-Semibold.ttf
diff --git a/Editor/Fonts/Open_Sans/OpenSans-SemiboldItalic.ttf b/Assets/Editor/Fonts/Open_Sans/OpenSans-SemiboldItalic.ttf
similarity index 100%
rename from Editor/Fonts/Open_Sans/OpenSans-SemiboldItalic.ttf
rename to Assets/Editor/Fonts/Open_Sans/OpenSans-SemiboldItalic.ttf
diff --git a/Editor/Icons/AssetBrowser/ABC_16.svg b/Assets/Editor/Icons/AssetBrowser/ABC_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/ABC_16.svg
rename to Assets/Editor/Icons/AssetBrowser/ABC_16.svg
diff --git a/Editor/Icons/AssetBrowser/Audio_16.svg b/Assets/Editor/Icons/AssetBrowser/Audio_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Audio_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Audio_16.svg
diff --git a/Editor/Icons/AssetBrowser/CaretClosed_16.svg b/Assets/Editor/Icons/AssetBrowser/CaretClosed_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/CaretClosed_16.svg
rename to Assets/Editor/Icons/AssetBrowser/CaretClosed_16.svg
diff --git a/Editor/Icons/AssetBrowser/CaretOpen_16.svg b/Assets/Editor/Icons/AssetBrowser/CaretOpen_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/CaretOpen_16.svg
rename to Assets/Editor/Icons/AssetBrowser/CaretOpen_16.svg
diff --git a/Editor/Icons/AssetBrowser/DefaultProduct_16.svg b/Assets/Editor/Icons/AssetBrowser/DefaultProduct_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/DefaultProduct_16.svg
rename to Assets/Editor/Icons/AssetBrowser/DefaultProduct_16.svg
diff --git a/Editor/Icons/AssetBrowser/Default_16.svg b/Assets/Editor/Icons/AssetBrowser/Default_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Default_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Default_16.svg
diff --git a/Editor/Icons/AssetBrowser/FBX_16.svg b/Assets/Editor/Icons/AssetBrowser/FBX_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/FBX_16.svg
rename to Assets/Editor/Icons/AssetBrowser/FBX_16.svg
diff --git a/Editor/Icons/AssetBrowser/Folder_16.svg b/Assets/Editor/Icons/AssetBrowser/Folder_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Folder_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Folder_16.svg
diff --git a/Editor/Icons/AssetBrowser/Font_16.svg b/Assets/Editor/Icons/AssetBrowser/Font_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Font_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Font_16.svg
diff --git a/Editor/Icons/AssetBrowser/GemFolder_16.svg b/Assets/Editor/Icons/AssetBrowser/GemFolder_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/GemFolder_16.svg
rename to Assets/Editor/Icons/AssetBrowser/GemFolder_16.svg
diff --git a/Editor/Icons/AssetBrowser/Image_16.svg b/Assets/Editor/Icons/AssetBrowser/Image_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Image_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Image_16.svg
diff --git a/Editor/Icons/AssetBrowser/InputBindings_16.svg b/Assets/Editor/Icons/AssetBrowser/InputBindings_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/InputBindings_16.svg
rename to Assets/Editor/Icons/AssetBrowser/InputBindings_16.svg
diff --git a/Editor/Icons/AssetBrowser/LegacyAnimation_16.svg b/Assets/Editor/Icons/AssetBrowser/LegacyAnimation_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/LegacyAnimation_16.svg
rename to Assets/Editor/Icons/AssetBrowser/LegacyAnimation_16.svg
diff --git a/Editor/Icons/AssetBrowser/LegacyMesh_16.svg b/Assets/Editor/Icons/AssetBrowser/LegacyMesh_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/LegacyMesh_16.svg
rename to Assets/Editor/Icons/AssetBrowser/LegacyMesh_16.svg
diff --git a/Editor/Icons/AssetBrowser/LegacySkin_16.svg b/Assets/Editor/Icons/AssetBrowser/LegacySkin_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/LegacySkin_16.svg
rename to Assets/Editor/Icons/AssetBrowser/LegacySkin_16.svg
diff --git a/Editor/Icons/AssetBrowser/LensFlare_16.svg b/Assets/Editor/Icons/AssetBrowser/LensFlare_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/LensFlare_16.svg
rename to Assets/Editor/Icons/AssetBrowser/LensFlare_16.svg
diff --git a/Editor/Icons/AssetBrowser/Lua_16.svg b/Assets/Editor/Icons/AssetBrowser/Lua_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Lua_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Lua_16.svg
diff --git a/Editor/Icons/AssetBrowser/Material_16.svg b/Assets/Editor/Icons/AssetBrowser/Material_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Material_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Material_16.svg
diff --git a/Editor/Icons/AssetBrowser/NonWritable_16.svg b/Assets/Editor/Icons/AssetBrowser/NonWritable_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/NonWritable_16.svg
rename to Assets/Editor/Icons/AssetBrowser/NonWritable_16.svg
diff --git a/Editor/Icons/AssetBrowser/Particle_16.svg b/Assets/Editor/Icons/AssetBrowser/Particle_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Particle_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Particle_16.svg
diff --git a/Editor/Icons/AssetBrowser/Slice_16.svg b/Assets/Editor/Icons/AssetBrowser/Slice_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Slice_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Slice_16.svg
diff --git a/Editor/Icons/AssetBrowser/Writable_16.svg b/Assets/Editor/Icons/AssetBrowser/Writable_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/Writable_16.svg
rename to Assets/Editor/Icons/AssetBrowser/Writable_16.svg
diff --git a/Editor/Icons/AssetBrowser/XML_16.svg b/Assets/Editor/Icons/AssetBrowser/XML_16.svg
similarity index 100%
rename from Editor/Icons/AssetBrowser/XML_16.svg
rename to Assets/Editor/Icons/AssetBrowser/XML_16.svg
diff --git a/Editor/Icons/AssetBrowser/in_progress.gif b/Assets/Editor/Icons/AssetBrowser/in_progress.gif
similarity index 100%
rename from Editor/Icons/AssetBrowser/in_progress.gif
rename to Assets/Editor/Icons/AssetBrowser/in_progress.gif
diff --git a/Editor/Icons/AssetImporter/animation.png b/Assets/Editor/Icons/AssetImporter/animation.png
similarity index 100%
rename from Editor/Icons/AssetImporter/animation.png
rename to Assets/Editor/Icons/AssetImporter/animation.png
diff --git a/Editor/Icons/AssetImporter/animation_on.png b/Assets/Editor/Icons/AssetImporter/animation_on.png
similarity index 100%
rename from Editor/Icons/AssetImporter/animation_on.png
rename to Assets/Editor/Icons/AssetImporter/animation_on.png
diff --git a/Editor/Icons/AssetImporter/group_icon.png b/Assets/Editor/Icons/AssetImporter/group_icon.png
similarity index 100%
rename from Editor/Icons/AssetImporter/group_icon.png
rename to Assets/Editor/Icons/AssetImporter/group_icon.png
diff --git a/Editor/Icons/AssetImporter/mesh.png b/Assets/Editor/Icons/AssetImporter/mesh.png
similarity index 100%
rename from Editor/Icons/AssetImporter/mesh.png
rename to Assets/Editor/Icons/AssetImporter/mesh.png
diff --git a/Editor/Icons/AssetImporter/mesh_on.png b/Assets/Editor/Icons/AssetImporter/mesh_on.png
similarity index 100%
rename from Editor/Icons/AssetImporter/mesh_on.png
rename to Assets/Editor/Icons/AssetImporter/mesh_on.png
diff --git a/Editor/Icons/AssetImporter/skeleton.png b/Assets/Editor/Icons/AssetImporter/skeleton.png
similarity index 100%
rename from Editor/Icons/AssetImporter/skeleton.png
rename to Assets/Editor/Icons/AssetImporter/skeleton.png
diff --git a/Editor/Icons/AssetImporter/skeleton_on.png b/Assets/Editor/Icons/AssetImporter/skeleton_on.png
similarity index 100%
rename from Editor/Icons/AssetImporter/skeleton_on.png
rename to Assets/Editor/Icons/AssetImporter/skeleton_on.png
diff --git a/Editor/Icons/AssetImporter/skin.png b/Assets/Editor/Icons/AssetImporter/skin.png
similarity index 100%
rename from Editor/Icons/AssetImporter/skin.png
rename to Assets/Editor/Icons/AssetImporter/skin.png
diff --git a/Editor/Icons/AssetImporter/skin_on.png b/Assets/Editor/Icons/AssetImporter/skin_on.png
similarity index 100%
rename from Editor/Icons/AssetImporter/skin_on.png
rename to Assets/Editor/Icons/AssetImporter/skin_on.png
diff --git a/Editor/Icons/AssetImporter/tree.png b/Assets/Editor/Icons/AssetImporter/tree.png
similarity index 100%
rename from Editor/Icons/AssetImporter/tree.png
rename to Assets/Editor/Icons/AssetImporter/tree.png
diff --git a/Editor/Icons/Assets/InputBindings.png b/Assets/Editor/Icons/Assets/InputBindings.png
similarity index 100%
rename from Editor/Icons/Assets/InputBindings.png
rename to Assets/Editor/Icons/Assets/InputBindings.png
diff --git a/Editor/Icons/Assets/Lua.png b/Assets/Editor/Icons/Assets/Lua.png
similarity index 100%
rename from Editor/Icons/Assets/Lua.png
rename to Assets/Editor/Icons/Assets/Lua.png
diff --git a/Editor/Icons/Assets/PhysicsMaterial.png b/Assets/Editor/Icons/Assets/PhysicsMaterial.png
similarity index 100%
rename from Editor/Icons/Assets/PhysicsMaterial.png
rename to Assets/Editor/Icons/Assets/PhysicsMaterial.png
diff --git a/Editor/Icons/Components/AreaLight.svg b/Assets/Editor/Icons/Components/AreaLight.svg
similarity index 100%
rename from Editor/Icons/Components/AreaLight.svg
rename to Assets/Editor/Icons/Components/AreaLight.svg
diff --git a/Editor/Icons/Components/Attachment.svg b/Assets/Editor/Icons/Components/Attachment.svg
similarity index 100%
rename from Editor/Icons/Components/Attachment.svg
rename to Assets/Editor/Icons/Components/Attachment.svg
diff --git a/Editor/Icons/Components/AudioAnimation.svg b/Assets/Editor/Icons/Components/AudioAnimation.svg
similarity index 100%
rename from Editor/Icons/Components/AudioAnimation.svg
rename to Assets/Editor/Icons/Components/AudioAnimation.svg
diff --git a/Editor/Icons/Components/AudioAnimationEventsProxy.svg b/Assets/Editor/Icons/Components/AudioAnimationEventsProxy.svg
similarity index 100%
rename from Editor/Icons/Components/AudioAnimationEventsProxy.svg
rename to Assets/Editor/Icons/Components/AudioAnimationEventsProxy.svg
diff --git a/Editor/Icons/Components/AudioArea.png b/Assets/Editor/Icons/Components/AudioArea.png
similarity index 100%
rename from Editor/Icons/Components/AudioArea.png
rename to Assets/Editor/Icons/Components/AudioArea.png
diff --git a/Editor/Icons/Components/AudioAreaEnvironment.svg b/Assets/Editor/Icons/Components/AudioAreaEnvironment.svg
similarity index 100%
rename from Editor/Icons/Components/AudioAreaEnvironment.svg
rename to Assets/Editor/Icons/Components/AudioAreaEnvironment.svg
diff --git a/Editor/Icons/Components/AudioEnvironment.svg b/Assets/Editor/Icons/Components/AudioEnvironment.svg
similarity index 100%
rename from Editor/Icons/Components/AudioEnvironment.svg
rename to Assets/Editor/Icons/Components/AudioEnvironment.svg
diff --git a/Editor/Icons/Components/AudioListener.svg b/Assets/Editor/Icons/Components/AudioListener.svg
similarity index 100%
rename from Editor/Icons/Components/AudioListener.svg
rename to Assets/Editor/Icons/Components/AudioListener.svg
diff --git a/Editor/Icons/Components/AudioMultiPosition.png b/Assets/Editor/Icons/Components/AudioMultiPosition.png
similarity index 100%
rename from Editor/Icons/Components/AudioMultiPosition.png
rename to Assets/Editor/Icons/Components/AudioMultiPosition.png
diff --git a/Editor/Icons/Components/AudioPreload.svg b/Assets/Editor/Icons/Components/AudioPreload.svg
similarity index 100%
rename from Editor/Icons/Components/AudioPreload.svg
rename to Assets/Editor/Icons/Components/AudioPreload.svg
diff --git a/Editor/Icons/Components/AudioProxy.svg b/Assets/Editor/Icons/Components/AudioProxy.svg
similarity index 100%
rename from Editor/Icons/Components/AudioProxy.svg
rename to Assets/Editor/Icons/Components/AudioProxy.svg
diff --git a/Editor/Icons/Components/AudioRtpc.svg b/Assets/Editor/Icons/Components/AudioRtpc.svg
similarity index 100%
rename from Editor/Icons/Components/AudioRtpc.svg
rename to Assets/Editor/Icons/Components/AudioRtpc.svg
diff --git a/Editor/Icons/Components/AudioSwitch.svg b/Assets/Editor/Icons/Components/AudioSwitch.svg
similarity index 100%
rename from Editor/Icons/Components/AudioSwitch.svg
rename to Assets/Editor/Icons/Components/AudioSwitch.svg
diff --git a/Editor/Icons/Components/AudioTrigger.svg b/Assets/Editor/Icons/Components/AudioTrigger.svg
similarity index 100%
rename from Editor/Icons/Components/AudioTrigger.svg
rename to Assets/Editor/Icons/Components/AudioTrigger.svg
diff --git a/Editor/Icons/Components/BehaviorTree.svg b/Assets/Editor/Icons/Components/BehaviorTree.svg
similarity index 100%
rename from Editor/Icons/Components/BehaviorTree.svg
rename to Assets/Editor/Icons/Components/BehaviorTree.svg
diff --git a/Editor/Icons/Components/Box.png b/Assets/Editor/Icons/Components/Box.png
similarity index 100%
rename from Editor/Icons/Components/Box.png
rename to Assets/Editor/Icons/Components/Box.png
diff --git a/Editor/Icons/Components/Box_Shape.svg b/Assets/Editor/Icons/Components/Box_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Box_Shape.svg
rename to Assets/Editor/Icons/Components/Box_Shape.svg
diff --git a/Editor/Icons/Components/Capsule_Shape.svg b/Assets/Editor/Icons/Components/Capsule_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Capsule_Shape.svg
rename to Assets/Editor/Icons/Components/Capsule_Shape.svg
diff --git a/Editor/Icons/Components/CharacterPhysics.svg b/Assets/Editor/Icons/Components/CharacterPhysics.svg
similarity index 100%
rename from Editor/Icons/Components/CharacterPhysics.svg
rename to Assets/Editor/Icons/Components/CharacterPhysics.svg
diff --git a/Editor/Icons/Components/Cloth.svg b/Assets/Editor/Icons/Components/Cloth.svg
similarity index 100%
rename from Editor/Icons/Components/Cloth.svg
rename to Assets/Editor/Icons/Components/Cloth.svg
diff --git a/Editor/Icons/Components/CloudGemMessageOfTheDay.svg b/Assets/Editor/Icons/Components/CloudGemMessageOfTheDay.svg
similarity index 100%
rename from Editor/Icons/Components/CloudGemMessageOfTheDay.svg
rename to Assets/Editor/Icons/Components/CloudGemMessageOfTheDay.svg
diff --git a/Editor/Icons/Components/ColliderBox.png b/Assets/Editor/Icons/Components/ColliderBox.png
similarity index 100%
rename from Editor/Icons/Components/ColliderBox.png
rename to Assets/Editor/Icons/Components/ColliderBox.png
diff --git a/Editor/Icons/Components/ColliderCapsule.png b/Assets/Editor/Icons/Components/ColliderCapsule.png
similarity index 100%
rename from Editor/Icons/Components/ColliderCapsule.png
rename to Assets/Editor/Icons/Components/ColliderCapsule.png
diff --git a/Editor/Icons/Components/ColliderCylinder.png b/Assets/Editor/Icons/Components/ColliderCylinder.png
similarity index 100%
rename from Editor/Icons/Components/ColliderCylinder.png
rename to Assets/Editor/Icons/Components/ColliderCylinder.png
diff --git a/Editor/Icons/Components/ColliderMesh.svg b/Assets/Editor/Icons/Components/ColliderMesh.svg
similarity index 100%
rename from Editor/Icons/Components/ColliderMesh.svg
rename to Assets/Editor/Icons/Components/ColliderMesh.svg
diff --git a/Editor/Icons/Components/ColliderSphere.png b/Assets/Editor/Icons/Components/ColliderSphere.png
similarity index 100%
rename from Editor/Icons/Components/ColliderSphere.png
rename to Assets/Editor/Icons/Components/ColliderSphere.png
diff --git a/Editor/Icons/Components/Comment.svg b/Assets/Editor/Icons/Components/Comment.svg
similarity index 100%
rename from Editor/Icons/Components/Comment.svg
rename to Assets/Editor/Icons/Components/Comment.svg
diff --git a/Editor/Icons/Components/Component_Placeholder.svg b/Assets/Editor/Icons/Components/Component_Placeholder.svg
similarity index 100%
rename from Editor/Icons/Components/Component_Placeholder.svg
rename to Assets/Editor/Icons/Components/Component_Placeholder.svg
diff --git a/Editor/Icons/Components/Compound_Shape.svg b/Assets/Editor/Icons/Components/Compound_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Compound_Shape.svg
rename to Assets/Editor/Icons/Components/Compound_Shape.svg
diff --git a/Editor/Icons/Components/Cylinder.png b/Assets/Editor/Icons/Components/Cylinder.png
similarity index 100%
rename from Editor/Icons/Components/Cylinder.png
rename to Assets/Editor/Icons/Components/Cylinder.png
diff --git a/Editor/Icons/Components/Cylinder_Shape.svg b/Assets/Editor/Icons/Components/Cylinder_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Cylinder_Shape.svg
rename to Assets/Editor/Icons/Components/Cylinder_Shape.svg
diff --git a/Editor/Icons/Components/DebugDrawLine.svg b/Assets/Editor/Icons/Components/DebugDrawLine.svg
similarity index 100%
rename from Editor/Icons/Components/DebugDrawLine.svg
rename to Assets/Editor/Icons/Components/DebugDrawLine.svg
diff --git a/Editor/Icons/Components/DebugDrawObb.svg b/Assets/Editor/Icons/Components/DebugDrawObb.svg
similarity index 100%
rename from Editor/Icons/Components/DebugDrawObb.svg
rename to Assets/Editor/Icons/Components/DebugDrawObb.svg
diff --git a/Editor/Icons/Components/DebugDrawRay.svg b/Assets/Editor/Icons/Components/DebugDrawRay.svg
similarity index 100%
rename from Editor/Icons/Components/DebugDrawRay.svg
rename to Assets/Editor/Icons/Components/DebugDrawRay.svg
diff --git a/Editor/Icons/Components/DebugDrawSphere.svg b/Assets/Editor/Icons/Components/DebugDrawSphere.svg
similarity index 100%
rename from Editor/Icons/Components/DebugDrawSphere.svg
rename to Assets/Editor/Icons/Components/DebugDrawSphere.svg
diff --git a/Editor/Icons/Components/DebugDrawText.svg b/Assets/Editor/Icons/Components/DebugDrawText.svg
similarity index 100%
rename from Editor/Icons/Components/DebugDrawText.svg
rename to Assets/Editor/Icons/Components/DebugDrawText.svg
diff --git a/Editor/Icons/Components/Decal.svg b/Assets/Editor/Icons/Components/Decal.svg
similarity index 100%
rename from Editor/Icons/Components/Decal.svg
rename to Assets/Editor/Icons/Components/Decal.svg
diff --git a/Editor/Icons/Components/Disabled/Animation_white.png b/Assets/Editor/Icons/Components/Disabled/Animation_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Animation_white.png
rename to Assets/Editor/Icons/Components/Disabled/Animation_white.png
diff --git a/Editor/Icons/Components/Disabled/Attachment_white.png b/Assets/Editor/Icons/Components/Disabled/Attachment_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Attachment_white.png
rename to Assets/Editor/Icons/Components/Disabled/Attachment_white.png
diff --git a/Editor/Icons/Components/Disabled/AudioAreaEnvironment_white.png b/Assets/Editor/Icons/Components/Disabled/AudioAreaEnvironment_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/AudioAreaEnvironment_white.png
rename to Assets/Editor/Icons/Components/Disabled/AudioAreaEnvironment_white.png
diff --git a/Editor/Icons/Components/Disabled/AudioArea_white.png b/Assets/Editor/Icons/Components/Disabled/AudioArea_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/AudioArea_white.png
rename to Assets/Editor/Icons/Components/Disabled/AudioArea_white.png
diff --git a/Editor/Icons/Components/Disabled/AudioEnvironment_white.png b/Assets/Editor/Icons/Components/Disabled/AudioEnvironment_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/AudioEnvironment_white.png
rename to Assets/Editor/Icons/Components/Disabled/AudioEnvironment_white.png
diff --git a/Editor/Icons/Components/Disabled/AudioListener_white.png b/Assets/Editor/Icons/Components/Disabled/AudioListener_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/AudioListener_white.png
rename to Assets/Editor/Icons/Components/Disabled/AudioListener_white.png
diff --git a/Editor/Icons/Components/Disabled/AudioRtpc_white.png b/Assets/Editor/Icons/Components/Disabled/AudioRtpc_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/AudioRtpc_white.png
rename to Assets/Editor/Icons/Components/Disabled/AudioRtpc_white.png
diff --git a/Editor/Icons/Components/Disabled/AudioSwitch_white.png b/Assets/Editor/Icons/Components/Disabled/AudioSwitch_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/AudioSwitch_white.png
rename to Assets/Editor/Icons/Components/Disabled/AudioSwitch_white.png
diff --git a/Editor/Icons/Components/Disabled/AudioTrigger_white.png b/Assets/Editor/Icons/Components/Disabled/AudioTrigger_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/AudioTrigger_white.png
rename to Assets/Editor/Icons/Components/Disabled/AudioTrigger_white.png
diff --git a/Editor/Icons/Components/Disabled/BehaviorTree_white.png b/Assets/Editor/Icons/Components/Disabled/BehaviorTree_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/BehaviorTree_white.png
rename to Assets/Editor/Icons/Components/Disabled/BehaviorTree_white.png
diff --git a/Editor/Icons/Components/Disabled/Box_Shape_white.png b/Assets/Editor/Icons/Components/Disabled/Box_Shape_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Box_Shape_white.png
rename to Assets/Editor/Icons/Components/Disabled/Box_Shape_white.png
diff --git a/Editor/Icons/Components/Disabled/Box_collider_white.png b/Assets/Editor/Icons/Components/Disabled/Box_collider_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Box_collider_white.png
rename to Assets/Editor/Icons/Components/Disabled/Box_collider_white.png
diff --git a/Editor/Icons/Components/Disabled/Box_white.png b/Assets/Editor/Icons/Components/Disabled/Box_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Box_white.png
rename to Assets/Editor/Icons/Components/Disabled/Box_white.png
diff --git a/Editor/Icons/Components/Disabled/Capsule_Shape_white.png b/Assets/Editor/Icons/Components/Disabled/Capsule_Shape_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Capsule_Shape_white.png
rename to Assets/Editor/Icons/Components/Disabled/Capsule_Shape_white.png
diff --git a/Editor/Icons/Components/Disabled/Capsule_white.png b/Assets/Editor/Icons/Components/Disabled/Capsule_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Capsule_white.png
rename to Assets/Editor/Icons/Components/Disabled/Capsule_white.png
diff --git a/Editor/Icons/Components/Disabled/CharacterPhysics_white.png b/Assets/Editor/Icons/Components/Disabled/CharacterPhysics_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/CharacterPhysics_white.png
rename to Assets/Editor/Icons/Components/Disabled/CharacterPhysics_white.png
diff --git a/Editor/Icons/Components/Disabled/Comment.png b/Assets/Editor/Icons/Components/Disabled/Comment.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Comment.png
rename to Assets/Editor/Icons/Components/Disabled/Comment.png
diff --git a/Editor/Icons/Components/Disabled/ComponentPlaceholder_white.png b/Assets/Editor/Icons/Components/Disabled/ComponentPlaceholder_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/ComponentPlaceholder_white.png
rename to Assets/Editor/Icons/Components/Disabled/ComponentPlaceholder_white.png
diff --git a/Editor/Icons/Components/Disabled/Component_Placeholder_white.png b/Assets/Editor/Icons/Components/Disabled/Component_Placeholder_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Component_Placeholder_white.png
rename to Assets/Editor/Icons/Components/Disabled/Component_Placeholder_white.png
diff --git a/Editor/Icons/Components/Disabled/Cylinder_Shape_white.png b/Assets/Editor/Icons/Components/Disabled/Cylinder_Shape_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Cylinder_Shape_white.png
rename to Assets/Editor/Icons/Components/Disabled/Cylinder_Shape_white.png
diff --git a/Editor/Icons/Components/Disabled/Cylinder_white.png b/Assets/Editor/Icons/Components/Disabled/Cylinder_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Cylinder_white.png
rename to Assets/Editor/Icons/Components/Disabled/Cylinder_white.png
diff --git a/Editor/Icons/Components/Disabled/Decal_white.png b/Assets/Editor/Icons/Components/Disabled/Decal_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Decal_white.png
rename to Assets/Editor/Icons/Components/Disabled/Decal_white.png
diff --git a/Editor/Icons/Components/Disabled/DynamicContent_white.png b/Assets/Editor/Icons/Components/Disabled/DynamicContent_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/DynamicContent_white.png
rename to Assets/Editor/Icons/Components/Disabled/DynamicContent_white.png
diff --git a/Editor/Icons/Components/Disabled/DynamicMesh_white.png b/Assets/Editor/Icons/Components/Disabled/DynamicMesh_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/DynamicMesh_white.png
rename to Assets/Editor/Icons/Components/Disabled/DynamicMesh_white.png
diff --git a/Editor/Icons/Components/Disabled/EntityInSlice_white.png b/Assets/Editor/Icons/Components/Disabled/EntityInSlice_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/EntityInSlice_white.png
rename to Assets/Editor/Icons/Components/Disabled/EntityInSlice_white.png
diff --git a/Editor/Icons/Components/Disabled/Entity_white.png b/Assets/Editor/Icons/Components/Disabled/Entity_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Entity_white.png
rename to Assets/Editor/Icons/Components/Disabled/Entity_white.png
diff --git a/Editor/Icons/Components/Disabled/FogVolume_white.png b/Assets/Editor/Icons/Components/Disabled/FogVolume_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/FogVolume_white.png
rename to Assets/Editor/Icons/Components/Disabled/FogVolume_white.png
diff --git a/Editor/Icons/Components/Disabled/ForceVolume_white.png b/Assets/Editor/Icons/Components/Disabled/ForceVolume_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/ForceVolume_white.png
rename to Assets/Editor/Icons/Components/Disabled/ForceVolume_white.png
diff --git a/Editor/Icons/Components/Disabled/GeometryCache_white.png b/Assets/Editor/Icons/Components/Disabled/GeometryCache_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/GeometryCache_white.png
rename to Assets/Editor/Icons/Components/Disabled/GeometryCache_white.png
diff --git a/Editor/Icons/Components/Disabled/HttpClientComponent_white.png b/Assets/Editor/Icons/Components/Disabled/HttpClientComponent_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/HttpClientComponent_white.png
rename to Assets/Editor/Icons/Components/Disabled/HttpClientComponent_white.png
diff --git a/Editor/Icons/Components/Disabled/LensFlare_white.png b/Assets/Editor/Icons/Components/Disabled/LensFlare_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/LensFlare_white.png
rename to Assets/Editor/Icons/Components/Disabled/LensFlare_white.png
diff --git a/Editor/Icons/Components/Disabled/Light_white.png b/Assets/Editor/Icons/Components/Disabled/Light_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Light_white.png
rename to Assets/Editor/Icons/Components/Disabled/Light_white.png
diff --git a/Editor/Icons/Components/Disabled/LightningArc_white.png b/Assets/Editor/Icons/Components/Disabled/LightningArc_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/LightningArc_white.png
rename to Assets/Editor/Icons/Components/Disabled/LightningArc_white.png
diff --git a/Editor/Icons/Components/Disabled/Lightning_white.png b/Assets/Editor/Icons/Components/Disabled/Lightning_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Lightning_white.png
rename to Assets/Editor/Icons/Components/Disabled/Lightning_white.png
diff --git a/Editor/Icons/Components/Disabled/LookAt_white.png b/Assets/Editor/Icons/Components/Disabled/LookAt_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/LookAt_white.png
rename to Assets/Editor/Icons/Components/Disabled/LookAt_white.png
diff --git a/Editor/Icons/Components/Disabled/MannequinScopeContext_white.png b/Assets/Editor/Icons/Components/Disabled/MannequinScopeContext_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/MannequinScopeContext_white.png
rename to Assets/Editor/Icons/Components/Disabled/MannequinScopeContext_white.png
diff --git a/Editor/Icons/Components/Disabled/Mannequin_white.png b/Assets/Editor/Icons/Components/Disabled/Mannequin_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Mannequin_white.png
rename to Assets/Editor/Icons/Components/Disabled/Mannequin_white.png
diff --git a/Editor/Icons/Components/Disabled/Mesh_collidaer_white 2.png b/Assets/Editor/Icons/Components/Disabled/Mesh_collidaer_white 2.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Mesh_collidaer_white 2.png
rename to Assets/Editor/Icons/Components/Disabled/Mesh_collidaer_white 2.png
diff --git a/Editor/Icons/Components/Disabled/NavigationArea_white.png b/Assets/Editor/Icons/Components/Disabled/NavigationArea_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/NavigationArea_white.png
rename to Assets/Editor/Icons/Components/Disabled/NavigationArea_white.png
diff --git a/Editor/Icons/Components/Disabled/NavigationSeed_white.png b/Assets/Editor/Icons/Components/Disabled/NavigationSeed_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/NavigationSeed_white.png
rename to Assets/Editor/Icons/Components/Disabled/NavigationSeed_white.png
diff --git a/Editor/Icons/Components/Disabled/Navigation_white.png b/Assets/Editor/Icons/Components/Disabled/Navigation_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Navigation_white.png
rename to Assets/Editor/Icons/Components/Disabled/Navigation_white.png
diff --git a/Editor/Icons/Components/Disabled/NetBinding_white.png b/Assets/Editor/Icons/Components/Disabled/NetBinding_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/NetBinding_white.png
rename to Assets/Editor/Icons/Components/Disabled/NetBinding_white.png
diff --git a/Editor/Icons/Components/Disabled/ObjectAvoidance_white.png b/Assets/Editor/Icons/Components/Disabled/ObjectAvoidance_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/ObjectAvoidance_white.png
rename to Assets/Editor/Icons/Components/Disabled/ObjectAvoidance_white.png
diff --git a/Editor/Icons/Components/Disabled/Particle_white.png b/Assets/Editor/Icons/Components/Disabled/Particle_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Particle_white.png
rename to Assets/Editor/Icons/Components/Disabled/Particle_white.png
diff --git a/Editor/Icons/Components/Disabled/PhysicsConstraint_white.png b/Assets/Editor/Icons/Components/Disabled/PhysicsConstraint_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/PhysicsConstraint_white.png
rename to Assets/Editor/Icons/Components/Disabled/PhysicsConstraint_white.png
diff --git a/Editor/Icons/Components/Disabled/PolygonPrism_white.png b/Assets/Editor/Icons/Components/Disabled/PolygonPrism_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/PolygonPrism_white.png
rename to Assets/Editor/Icons/Components/Disabled/PolygonPrism_white.png
diff --git a/Editor/Icons/Components/Disabled/PrimitiveCollider_white.png b/Assets/Editor/Icons/Components/Disabled/PrimitiveCollider_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/PrimitiveCollider_white.png
rename to Assets/Editor/Icons/Components/Disabled/PrimitiveCollider_white.png
diff --git a/Editor/Icons/Components/Disabled/Ragdoll.png b/Assets/Editor/Icons/Components/Disabled/Ragdoll.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Ragdoll.png
rename to Assets/Editor/Icons/Components/Disabled/Ragdoll.png
diff --git a/Editor/Icons/Components/Disabled/Ragdoll_white.png b/Assets/Editor/Icons/Components/Disabled/Ragdoll_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Ragdoll_white.png
rename to Assets/Editor/Icons/Components/Disabled/Ragdoll_white.png
diff --git a/Editor/Icons/Components/Disabled/RandomTimedSpawner_white.png b/Assets/Editor/Icons/Components/Disabled/RandomTimedSpawner_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/RandomTimedSpawner_white.png
rename to Assets/Editor/Icons/Components/Disabled/RandomTimedSpawner_white.png
diff --git a/Editor/Icons/Components/Disabled/RigidPhysics_white.png b/Assets/Editor/Icons/Components/Disabled/RigidPhysics_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/RigidPhysics_white.png
rename to Assets/Editor/Icons/Components/Disabled/RigidPhysics_white.png
diff --git a/Editor/Icons/Components/Disabled/Script_white.png b/Assets/Editor/Icons/Components/Disabled/Script_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Script_white.png
rename to Assets/Editor/Icons/Components/Disabled/Script_white.png
diff --git a/Editor/Icons/Components/Disabled/SequenceAgent_white.png b/Assets/Editor/Icons/Components/Disabled/SequenceAgent_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/SequenceAgent_white.png
rename to Assets/Editor/Icons/Components/Disabled/SequenceAgent_white.png
diff --git a/Editor/Icons/Components/Disabled/Sequence_white.png b/Assets/Editor/Icons/Components/Disabled/Sequence_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Sequence_white.png
rename to Assets/Editor/Icons/Components/Disabled/Sequence_white.png
diff --git a/Editor/Icons/Components/Disabled/Shadow.png b/Assets/Editor/Icons/Components/Disabled/Shadow.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Shadow.png
rename to Assets/Editor/Icons/Components/Disabled/Shadow.png
diff --git a/Editor/Icons/Components/Disabled/SimpleState_white.png b/Assets/Editor/Icons/Components/Disabled/SimpleState_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/SimpleState_white.png
rename to Assets/Editor/Icons/Components/Disabled/SimpleState_white.png
diff --git a/Editor/Icons/Components/Disabled/SkinnedMesh_white.png b/Assets/Editor/Icons/Components/Disabled/SkinnedMesh_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/SkinnedMesh_white.png
rename to Assets/Editor/Icons/Components/Disabled/SkinnedMesh_white.png
diff --git a/Editor/Icons/Components/Disabled/SkyHighlight_white.png b/Assets/Editor/Icons/Components/Disabled/SkyHighlight_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/SkyHighlight_white.png
rename to Assets/Editor/Icons/Components/Disabled/SkyHighlight_white.png
diff --git a/Editor/Icons/Components/Disabled/Snow_white.png b/Assets/Editor/Icons/Components/Disabled/Snow_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Snow_white.png
rename to Assets/Editor/Icons/Components/Disabled/Snow_white.png
diff --git a/Editor/Icons/Components/Disabled/Spawner_white.png b/Assets/Editor/Icons/Components/Disabled/Spawner_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Spawner_white.png
rename to Assets/Editor/Icons/Components/Disabled/Spawner_white.png
diff --git a/Editor/Icons/Components/Disabled/Sphere_Shape_white.png b/Assets/Editor/Icons/Components/Disabled/Sphere_Shape_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Sphere_Shape_white.png
rename to Assets/Editor/Icons/Components/Disabled/Sphere_Shape_white.png
diff --git a/Editor/Icons/Components/Disabled/Sphere_white.png b/Assets/Editor/Icons/Components/Disabled/Sphere_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Sphere_white.png
rename to Assets/Editor/Icons/Components/Disabled/Sphere_white.png
diff --git a/Editor/Icons/Components/Disabled/Spline_white.png b/Assets/Editor/Icons/Components/Disabled/Spline_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Spline_white.png
rename to Assets/Editor/Icons/Components/Disabled/Spline_white.png
diff --git a/Editor/Icons/Components/Disabled/StaticData_white.png b/Assets/Editor/Icons/Components/Disabled/StaticData_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/StaticData_white.png
rename to Assets/Editor/Icons/Components/Disabled/StaticData_white.png
diff --git a/Editor/Icons/Components/Disabled/StaticMesh_white.png b/Assets/Editor/Icons/Components/Disabled/StaticMesh_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/StaticMesh_white.png
rename to Assets/Editor/Icons/Components/Disabled/StaticMesh_white.png
diff --git a/Editor/Icons/Components/Disabled/StaticPhysics_white.png b/Assets/Editor/Icons/Components/Disabled/StaticPhysics_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/StaticPhysics_white.png
rename to Assets/Editor/Icons/Components/Disabled/StaticPhysics_white.png
diff --git a/Editor/Icons/Components/Disabled/Tag_white.png b/Assets/Editor/Icons/Components/Disabled/Tag_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Tag_white.png
rename to Assets/Editor/Icons/Components/Disabled/Tag_white.png
diff --git a/Editor/Icons/Components/Disabled/Transform_white.png b/Assets/Editor/Icons/Components/Disabled/Transform_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Transform_white.png
rename to Assets/Editor/Icons/Components/Disabled/Transform_white.png
diff --git a/Editor/Icons/Components/Disabled/Trigger_white.png b/Assets/Editor/Icons/Components/Disabled/Trigger_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/Trigger_white.png
rename to Assets/Editor/Icons/Components/Disabled/Trigger_white.png
diff --git a/Editor/Icons/Components/Disabled/UiCanvasOnMesh_white.png b/Assets/Editor/Icons/Components/Disabled/UiCanvasOnMesh_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/UiCanvasOnMesh_white.png
rename to Assets/Editor/Icons/Components/Disabled/UiCanvasOnMesh_white.png
diff --git a/Editor/Icons/Components/Disabled/UiCanvasRef_white.png b/Assets/Editor/Icons/Components/Disabled/UiCanvasRef_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/UiCanvasRef_white.png
rename to Assets/Editor/Icons/Components/Disabled/UiCanvasRef_white.png
diff --git a/Editor/Icons/Components/Disabled/WaterVolume_white.png b/Assets/Editor/Icons/Components/Disabled/WaterVolume_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/WaterVolume_white.png
rename to Assets/Editor/Icons/Components/Disabled/WaterVolume_white.png
diff --git a/Editor/Icons/Components/Disabled/WindVolume_white.png b/Assets/Editor/Icons/Components/Disabled/WindVolume_white.png
similarity index 100%
rename from Editor/Icons/Components/Disabled/WindVolume_white.png
rename to Assets/Editor/Icons/Components/Disabled/WindVolume_white.png
diff --git a/Editor/Icons/Components/Disk_Shape.svg b/Assets/Editor/Icons/Components/Disk_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Disk_Shape.svg
rename to Assets/Editor/Icons/Components/Disk_Shape.svg
diff --git a/Editor/Icons/Components/DynamicContent.png b/Assets/Editor/Icons/Components/DynamicContent.png
similarity index 100%
rename from Editor/Icons/Components/DynamicContent.png
rename to Assets/Editor/Icons/Components/DynamicContent.png
diff --git a/Editor/Icons/Components/DynamicMesh.png b/Assets/Editor/Icons/Components/DynamicMesh.png
similarity index 100%
rename from Editor/Icons/Components/DynamicMesh.png
rename to Assets/Editor/Icons/Components/DynamicMesh.png
diff --git a/Editor/Icons/Components/Entity.png b/Assets/Editor/Icons/Components/Entity.png
similarity index 100%
rename from Editor/Icons/Components/Entity.png
rename to Assets/Editor/Icons/Components/Entity.png
diff --git a/Editor/Icons/Components/EntityInSlice.png b/Assets/Editor/Icons/Components/EntityInSlice.png
similarity index 100%
rename from Editor/Icons/Components/EntityInSlice.png
rename to Assets/Editor/Icons/Components/EntityInSlice.png
diff --git a/Editor/Icons/Components/EnvironmentProbe.svg b/Assets/Editor/Icons/Components/EnvironmentProbe.svg
similarity index 100%
rename from Editor/Icons/Components/EnvironmentProbe.svg
rename to Assets/Editor/Icons/Components/EnvironmentProbe.svg
diff --git a/Editor/Icons/Components/Flipbook.png b/Assets/Editor/Icons/Components/Flipbook.png
similarity index 100%
rename from Editor/Icons/Components/Flipbook.png
rename to Assets/Editor/Icons/Components/Flipbook.png
diff --git a/Editor/Icons/Components/FogVolume.svg b/Assets/Editor/Icons/Components/FogVolume.svg
similarity index 100%
rename from Editor/Icons/Components/FogVolume.svg
rename to Assets/Editor/Icons/Components/FogVolume.svg
diff --git a/Editor/Icons/Components/Footstep1.svg b/Assets/Editor/Icons/Components/Footstep1.svg
similarity index 100%
rename from Editor/Icons/Components/Footstep1.svg
rename to Assets/Editor/Icons/Components/Footstep1.svg
diff --git a/Editor/Icons/Components/ForceRegion.png b/Assets/Editor/Icons/Components/ForceRegion.png
similarity index 100%
rename from Editor/Icons/Components/ForceRegion.png
rename to Assets/Editor/Icons/Components/ForceRegion.png
diff --git a/Editor/Icons/Components/ForceVolume.svg b/Assets/Editor/Icons/Components/ForceVolume.svg
similarity index 100%
rename from Editor/Icons/Components/ForceVolume.svg
rename to Assets/Editor/Icons/Components/ForceVolume.svg
diff --git a/Editor/Icons/Components/GeometryCache.svg b/Assets/Editor/Icons/Components/GeometryCache.svg
similarity index 100%
rename from Editor/Icons/Components/GeometryCache.svg
rename to Assets/Editor/Icons/Components/GeometryCache.svg
diff --git a/Editor/Icons/Components/HttpClientComponent.png b/Assets/Editor/Icons/Components/HttpClientComponent.png
similarity index 100%
rename from Editor/Icons/Components/HttpClientComponent.png
rename to Assets/Editor/Icons/Components/HttpClientComponent.png
diff --git a/Editor/Icons/Components/Layers.svg b/Assets/Editor/Icons/Components/Layers.svg
similarity index 100%
rename from Editor/Icons/Components/Layers.svg
rename to Assets/Editor/Icons/Components/Layers.svg
diff --git a/Editor/Icons/Components/LegacyTerrain.svg b/Assets/Editor/Icons/Components/LegacyTerrain.svg
similarity index 100%
rename from Editor/Icons/Components/LegacyTerrain.svg
rename to Assets/Editor/Icons/Components/LegacyTerrain.svg
diff --git a/Editor/Icons/Components/LensFlare.svg b/Assets/Editor/Icons/Components/LensFlare.svg
similarity index 100%
rename from Editor/Icons/Components/LensFlare.svg
rename to Assets/Editor/Icons/Components/LensFlare.svg
diff --git a/Editor/Icons/Components/Light.png b/Assets/Editor/Icons/Components/Light.png
similarity index 100%
rename from Editor/Icons/Components/Light.png
rename to Assets/Editor/Icons/Components/Light.png
diff --git a/Editor/Icons/Components/Lightning.svg b/Assets/Editor/Icons/Components/Lightning.svg
similarity index 100%
rename from Editor/Icons/Components/Lightning.svg
rename to Assets/Editor/Icons/Components/Lightning.svg
diff --git a/Editor/Icons/Components/LightningArc.svg b/Assets/Editor/Icons/Components/LightningArc.svg
similarity index 100%
rename from Editor/Icons/Components/LightningArc.svg
rename to Assets/Editor/Icons/Components/LightningArc.svg
diff --git a/Editor/Icons/Components/LookAt.png b/Assets/Editor/Icons/Components/LookAt.png
similarity index 100%
rename from Editor/Icons/Components/LookAt.png
rename to Assets/Editor/Icons/Components/LookAt.png
diff --git a/Editor/Icons/Components/LuaScript.svg b/Assets/Editor/Icons/Components/LuaScript.svg
similarity index 100%
rename from Editor/Icons/Components/LuaScript.svg
rename to Assets/Editor/Icons/Components/LuaScript.svg
diff --git a/Editor/Icons/Components/Mannequin.svg b/Assets/Editor/Icons/Components/Mannequin.svg
similarity index 100%
rename from Editor/Icons/Components/Mannequin.svg
rename to Assets/Editor/Icons/Components/Mannequin.svg
diff --git a/Editor/Icons/Components/MannequinScopeContext.svg b/Assets/Editor/Icons/Components/MannequinScopeContext.svg
similarity index 100%
rename from Editor/Icons/Components/MannequinScopeContext.svg
rename to Assets/Editor/Icons/Components/MannequinScopeContext.svg
diff --git a/Editor/Icons/Components/MotionParameterSmoothing.svg b/Assets/Editor/Icons/Components/MotionParameterSmoothing.svg
similarity index 100%
rename from Editor/Icons/Components/MotionParameterSmoothing.svg
rename to Assets/Editor/Icons/Components/MotionParameterSmoothing.svg
diff --git a/Editor/Icons/Components/Navigation.svg b/Assets/Editor/Icons/Components/Navigation.svg
similarity index 100%
rename from Editor/Icons/Components/Navigation.svg
rename to Assets/Editor/Icons/Components/Navigation.svg
diff --git a/Editor/Icons/Components/NavigationArea.svg b/Assets/Editor/Icons/Components/NavigationArea.svg
similarity index 100%
rename from Editor/Icons/Components/NavigationArea.svg
rename to Assets/Editor/Icons/Components/NavigationArea.svg
diff --git a/Editor/Icons/Components/NavigationSeed.svg b/Assets/Editor/Icons/Components/NavigationSeed.svg
similarity index 100%
rename from Editor/Icons/Components/NavigationSeed.svg
rename to Assets/Editor/Icons/Components/NavigationSeed.svg
diff --git a/Editor/Icons/Components/NetBinding.svg b/Assets/Editor/Icons/Components/NetBinding.svg
similarity index 100%
rename from Editor/Icons/Components/NetBinding.svg
rename to Assets/Editor/Icons/Components/NetBinding.svg
diff --git a/Assets/Editor/Icons/Components/NonUniformScale.svg b/Assets/Editor/Icons/Components/NonUniformScale.svg
new file mode 100644
index 0000000000..f377232d62
--- /dev/null
+++ b/Assets/Editor/Icons/Components/NonUniformScale.svg
@@ -0,0 +1,27 @@
+
+
\ No newline at end of file
diff --git a/Editor/Icons/Components/ObjectAvoidance.png b/Assets/Editor/Icons/Components/ObjectAvoidance.png
similarity index 100%
rename from Editor/Icons/Components/ObjectAvoidance.png
rename to Assets/Editor/Icons/Components/ObjectAvoidance.png
diff --git a/Editor/Icons/Components/Particle.svg b/Assets/Editor/Icons/Components/Particle.svg
similarity index 100%
rename from Editor/Icons/Components/Particle.svg
rename to Assets/Editor/Icons/Components/Particle.svg
diff --git a/Editor/Icons/Components/PhysXCharacter.svg b/Assets/Editor/Icons/Components/PhysXCharacter.svg
similarity index 100%
rename from Editor/Icons/Components/PhysXCharacter.svg
rename to Assets/Editor/Icons/Components/PhysXCharacter.svg
diff --git a/Editor/Icons/Components/PhysXCollider.svg b/Assets/Editor/Icons/Components/PhysXCollider.svg
similarity index 100%
rename from Editor/Icons/Components/PhysXCollider.svg
rename to Assets/Editor/Icons/Components/PhysXCollider.svg
diff --git a/Editor/Icons/Components/PhysXRagdoll.svg b/Assets/Editor/Icons/Components/PhysXRagdoll.svg
similarity index 100%
rename from Editor/Icons/Components/PhysXRagdoll.svg
rename to Assets/Editor/Icons/Components/PhysXRagdoll.svg
diff --git a/Editor/Icons/Components/PhysXRigidBody.svg b/Assets/Editor/Icons/Components/PhysXRigidBody.svg
similarity index 100%
rename from Editor/Icons/Components/PhysXRigidBody.svg
rename to Assets/Editor/Icons/Components/PhysXRigidBody.svg
diff --git a/Editor/Icons/Components/PhysXTerrain.svg b/Assets/Editor/Icons/Components/PhysXTerrain.svg
similarity index 100%
rename from Editor/Icons/Components/PhysXTerrain.svg
rename to Assets/Editor/Icons/Components/PhysXTerrain.svg
diff --git a/Editor/Icons/Components/Physics.png b/Assets/Editor/Icons/Components/Physics.png
similarity index 100%
rename from Editor/Icons/Components/Physics.png
rename to Assets/Editor/Icons/Components/Physics.png
diff --git a/Editor/Icons/Components/PhysicsConstraint.svg b/Assets/Editor/Icons/Components/PhysicsConstraint.svg
similarity index 100%
rename from Editor/Icons/Components/PhysicsConstraint.svg
rename to Assets/Editor/Icons/Components/PhysicsConstraint.svg
diff --git a/Editor/Icons/Components/PointLight.svg b/Assets/Editor/Icons/Components/PointLight.svg
similarity index 100%
rename from Editor/Icons/Components/PointLight.svg
rename to Assets/Editor/Icons/Components/PointLight.svg
diff --git a/Editor/Icons/Components/PolygonPrism.svg b/Assets/Editor/Icons/Components/PolygonPrism.svg
similarity index 100%
rename from Editor/Icons/Components/PolygonPrism.svg
rename to Assets/Editor/Icons/Components/PolygonPrism.svg
diff --git a/Editor/Icons/Components/PrimitiveCollider.svg b/Assets/Editor/Icons/Components/PrimitiveCollider.svg
similarity index 100%
rename from Editor/Icons/Components/PrimitiveCollider.svg
rename to Assets/Editor/Icons/Components/PrimitiveCollider.svg
diff --git a/Editor/Icons/Components/ProjectorLight.svg b/Assets/Editor/Icons/Components/ProjectorLight.svg
similarity index 100%
rename from Editor/Icons/Components/ProjectorLight.svg
rename to Assets/Editor/Icons/Components/ProjectorLight.svg
diff --git a/Editor/Icons/Components/Quad_Shape.svg b/Assets/Editor/Icons/Components/Quad_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Quad_Shape.svg
rename to Assets/Editor/Icons/Components/Quad_Shape.svg
diff --git a/Editor/Icons/Components/Ragdoll.png b/Assets/Editor/Icons/Components/Ragdoll.png
similarity index 100%
rename from Editor/Icons/Components/Ragdoll.png
rename to Assets/Editor/Icons/Components/Ragdoll.png
diff --git a/Editor/Icons/Components/RandomTimedSpawner.svg b/Assets/Editor/Icons/Components/RandomTimedSpawner.svg
similarity index 100%
rename from Editor/Icons/Components/RandomTimedSpawner.svg
rename to Assets/Editor/Icons/Components/RandomTimedSpawner.svg
diff --git a/Editor/Icons/Components/RigidPhysics.svg b/Assets/Editor/Icons/Components/RigidPhysics.svg
similarity index 100%
rename from Editor/Icons/Components/RigidPhysics.svg
rename to Assets/Editor/Icons/Components/RigidPhysics.svg
diff --git a/Editor/Icons/Components/ScriptEventAssetReference.png b/Assets/Editor/Icons/Components/ScriptEventAssetReference.png
similarity index 100%
rename from Editor/Icons/Components/ScriptEventAssetReference.png
rename to Assets/Editor/Icons/Components/ScriptEventAssetReference.png
diff --git a/Editor/Icons/Components/Sequence.png b/Assets/Editor/Icons/Components/Sequence.png
similarity index 100%
rename from Editor/Icons/Components/Sequence.png
rename to Assets/Editor/Icons/Components/Sequence.png
diff --git a/Editor/Icons/Components/SequenceAgent.png b/Assets/Editor/Icons/Components/SequenceAgent.png
similarity index 100%
rename from Editor/Icons/Components/SequenceAgent.png
rename to Assets/Editor/Icons/Components/SequenceAgent.png
diff --git a/Editor/Icons/Components/Shadow.svg b/Assets/Editor/Icons/Components/Shadow.svg
similarity index 100%
rename from Editor/Icons/Components/Shadow.svg
rename to Assets/Editor/Icons/Components/Shadow.svg
diff --git a/Editor/Icons/Components/SimpleAnimation.svg b/Assets/Editor/Icons/Components/SimpleAnimation.svg
similarity index 100%
rename from Editor/Icons/Components/SimpleAnimation.svg
rename to Assets/Editor/Icons/Components/SimpleAnimation.svg
diff --git a/Editor/Icons/Components/SimpleLODDistance.svg b/Assets/Editor/Icons/Components/SimpleLODDistance.svg
similarity index 100%
rename from Editor/Icons/Components/SimpleLODDistance.svg
rename to Assets/Editor/Icons/Components/SimpleLODDistance.svg
diff --git a/Editor/Icons/Components/SimpleMotion.svg b/Assets/Editor/Icons/Components/SimpleMotion.svg
similarity index 100%
rename from Editor/Icons/Components/SimpleMotion.svg
rename to Assets/Editor/Icons/Components/SimpleMotion.svg
diff --git a/Editor/Icons/Components/SimpleState.svg b/Assets/Editor/Icons/Components/SimpleState.svg
similarity index 100%
rename from Editor/Icons/Components/SimpleState.svg
rename to Assets/Editor/Icons/Components/SimpleState.svg
diff --git a/Editor/Icons/Components/SkinnedMesh.svg b/Assets/Editor/Icons/Components/SkinnedMesh.svg
similarity index 100%
rename from Editor/Icons/Components/SkinnedMesh.svg
rename to Assets/Editor/Icons/Components/SkinnedMesh.svg
diff --git a/Editor/Icons/Components/SkyHighlight.svg b/Assets/Editor/Icons/Components/SkyHighlight.svg
similarity index 100%
rename from Editor/Icons/Components/SkyHighlight.svg
rename to Assets/Editor/Icons/Components/SkyHighlight.svg
diff --git a/Editor/Icons/Components/Snow.svg b/Assets/Editor/Icons/Components/Snow.svg
similarity index 100%
rename from Editor/Icons/Components/Snow.svg
rename to Assets/Editor/Icons/Components/Snow.svg
diff --git a/Editor/Icons/Components/Spawner.svg b/Assets/Editor/Icons/Components/Spawner.svg
similarity index 100%
rename from Editor/Icons/Components/Spawner.svg
rename to Assets/Editor/Icons/Components/Spawner.svg
diff --git a/Editor/Icons/Components/Sphere.png b/Assets/Editor/Icons/Components/Sphere.png
similarity index 100%
rename from Editor/Icons/Components/Sphere.png
rename to Assets/Editor/Icons/Components/Sphere.png
diff --git a/Editor/Icons/Components/Sphere_Shape.svg b/Assets/Editor/Icons/Components/Sphere_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Sphere_Shape.svg
rename to Assets/Editor/Icons/Components/Sphere_Shape.svg
diff --git a/Editor/Icons/Components/Spline.svg b/Assets/Editor/Icons/Components/Spline.svg
similarity index 100%
rename from Editor/Icons/Components/Spline.svg
rename to Assets/Editor/Icons/Components/Spline.svg
diff --git a/Editor/Icons/Components/StaticData.png b/Assets/Editor/Icons/Components/StaticData.png
similarity index 100%
rename from Editor/Icons/Components/StaticData.png
rename to Assets/Editor/Icons/Components/StaticData.png
diff --git a/Editor/Icons/Components/StaticMesh.svg b/Assets/Editor/Icons/Components/StaticMesh.svg
similarity index 100%
rename from Editor/Icons/Components/StaticMesh.svg
rename to Assets/Editor/Icons/Components/StaticMesh.svg
diff --git a/Editor/Icons/Components/StaticPhysics.svg b/Assets/Editor/Icons/Components/StaticPhysics.svg
similarity index 100%
rename from Editor/Icons/Components/StaticPhysics.svg
rename to Assets/Editor/Icons/Components/StaticPhysics.svg
diff --git a/Editor/Icons/Components/Tag.svg b/Assets/Editor/Icons/Components/Tag.svg
similarity index 100%
rename from Editor/Icons/Components/Tag.svg
rename to Assets/Editor/Icons/Components/Tag.svg
diff --git a/Editor/Icons/Components/Transform.svg b/Assets/Editor/Icons/Components/Transform.svg
similarity index 100%
rename from Editor/Icons/Components/Transform.svg
rename to Assets/Editor/Icons/Components/Transform.svg
diff --git a/Editor/Icons/Components/TriggerArea.svg b/Assets/Editor/Icons/Components/TriggerArea.svg
similarity index 100%
rename from Editor/Icons/Components/TriggerArea.svg
rename to Assets/Editor/Icons/Components/TriggerArea.svg
diff --git a/Editor/Icons/Components/Tube_Shape.svg b/Assets/Editor/Icons/Components/Tube_Shape.svg
similarity index 100%
rename from Editor/Icons/Components/Tube_Shape.svg
rename to Assets/Editor/Icons/Components/Tube_Shape.svg
diff --git a/Editor/Icons/Components/UICanvasAssetRef.svg b/Assets/Editor/Icons/Components/UICanvasAssetRef.svg
similarity index 100%
rename from Editor/Icons/Components/UICanvasAssetRef.svg
rename to Assets/Editor/Icons/Components/UICanvasAssetRef.svg
diff --git a/Editor/Icons/Components/UICanvasOnMesh.svg b/Assets/Editor/Icons/Components/UICanvasOnMesh.svg
similarity index 100%
rename from Editor/Icons/Components/UICanvasOnMesh.svg
rename to Assets/Editor/Icons/Components/UICanvasOnMesh.svg
diff --git a/Editor/Icons/Components/UICanvasProxyRef.svg b/Assets/Editor/Icons/Components/UICanvasProxyRef.svg
similarity index 100%
rename from Editor/Icons/Components/UICanvasProxyRef.svg
rename to Assets/Editor/Icons/Components/UICanvasProxyRef.svg
diff --git a/Editor/Icons/Components/VRPreview.svg b/Assets/Editor/Icons/Components/VRPreview.svg
similarity index 100%
rename from Editor/Icons/Components/VRPreview.svg
rename to Assets/Editor/Icons/Components/VRPreview.svg
diff --git a/Editor/Icons/Components/Viewport/Animation.png b/Assets/Editor/Icons/Components/Viewport/Animation.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Animation.png
rename to Assets/Editor/Icons/Components/Viewport/Animation.png
diff --git a/Editor/Icons/Components/Viewport/AreaLight.png b/Assets/Editor/Icons/Components/Viewport/AreaLight.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AreaLight.png
rename to Assets/Editor/Icons/Components/Viewport/AreaLight.png
diff --git a/Editor/Icons/Components/Viewport/Attachment.png b/Assets/Editor/Icons/Components/Viewport/Attachment.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Attachment.png
rename to Assets/Editor/Icons/Components/Viewport/Attachment.png
diff --git a/Editor/Icons/Components/Viewport/AudioArea.png b/Assets/Editor/Icons/Components/Viewport/AudioArea.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioArea.png
rename to Assets/Editor/Icons/Components/Viewport/AudioArea.png
diff --git a/Editor/Icons/Components/Viewport/AudioAreaEnvironment.png b/Assets/Editor/Icons/Components/Viewport/AudioAreaEnvironment.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioAreaEnvironment.png
rename to Assets/Editor/Icons/Components/Viewport/AudioAreaEnvironment.png
diff --git a/Editor/Icons/Components/Viewport/AudioEnvironment.png b/Assets/Editor/Icons/Components/Viewport/AudioEnvironment.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioEnvironment.png
rename to Assets/Editor/Icons/Components/Viewport/AudioEnvironment.png
diff --git a/Editor/Icons/Components/Viewport/AudioListener.png b/Assets/Editor/Icons/Components/Viewport/AudioListener.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioListener.png
rename to Assets/Editor/Icons/Components/Viewport/AudioListener.png
diff --git a/Editor/Icons/Components/Viewport/AudioMultiPosition.png b/Assets/Editor/Icons/Components/Viewport/AudioMultiPosition.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioMultiPosition.png
rename to Assets/Editor/Icons/Components/Viewport/AudioMultiPosition.png
diff --git a/Editor/Icons/Components/Viewport/AudioRtpc.png b/Assets/Editor/Icons/Components/Viewport/AudioRtpc.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioRtpc.png
rename to Assets/Editor/Icons/Components/Viewport/AudioRtpc.png
diff --git a/Editor/Icons/Components/Viewport/AudioSwitch.png b/Assets/Editor/Icons/Components/Viewport/AudioSwitch.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioSwitch.png
rename to Assets/Editor/Icons/Components/Viewport/AudioSwitch.png
diff --git a/Editor/Icons/Components/Viewport/AudioTrigger.png b/Assets/Editor/Icons/Components/Viewport/AudioTrigger.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/AudioTrigger.png
rename to Assets/Editor/Icons/Components/Viewport/AudioTrigger.png
diff --git a/Editor/Icons/Components/Viewport/BehaviorTree.png b/Assets/Editor/Icons/Components/Viewport/BehaviorTree.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/BehaviorTree.png
rename to Assets/Editor/Icons/Components/Viewport/BehaviorTree.png
diff --git a/Editor/Icons/Components/Viewport/Box.png b/Assets/Editor/Icons/Components/Viewport/Box.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Box.png
rename to Assets/Editor/Icons/Components/Viewport/Box.png
diff --git a/Editor/Icons/Components/Viewport/Box_Shape.png b/Assets/Editor/Icons/Components/Viewport/Box_Shape.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Box_Shape.png
rename to Assets/Editor/Icons/Components/Viewport/Box_Shape.png
diff --git a/Editor/Icons/Components/Viewport/Capsule.png b/Assets/Editor/Icons/Components/Viewport/Capsule.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Capsule.png
rename to Assets/Editor/Icons/Components/Viewport/Capsule.png
diff --git a/Editor/Icons/Components/Viewport/Capsule_Shape.png b/Assets/Editor/Icons/Components/Viewport/Capsule_Shape.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Capsule_Shape.png
rename to Assets/Editor/Icons/Components/Viewport/Capsule_Shape.png
diff --git a/Editor/Icons/Components/Viewport/CharacterPhysics.png b/Assets/Editor/Icons/Components/Viewport/CharacterPhysics.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/CharacterPhysics.png
rename to Assets/Editor/Icons/Components/Viewport/CharacterPhysics.png
diff --git a/Editor/Icons/Components/Viewport/Comment.png b/Assets/Editor/Icons/Components/Viewport/Comment.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Comment.png
rename to Assets/Editor/Icons/Components/Viewport/Comment.png
diff --git a/Editor/Icons/Components/Viewport/ComponentPlaceholder.png b/Assets/Editor/Icons/Components/Viewport/ComponentPlaceholder.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/ComponentPlaceholder.png
rename to Assets/Editor/Icons/Components/Viewport/ComponentPlaceholder.png
diff --git a/Editor/Icons/Components/Viewport/Component_Placeholder.png b/Assets/Editor/Icons/Components/Viewport/Component_Placeholder.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Component_Placeholder.png
rename to Assets/Editor/Icons/Components/Viewport/Component_Placeholder.png
diff --git a/Editor/Icons/Components/Viewport/Cylinder.png b/Assets/Editor/Icons/Components/Viewport/Cylinder.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Cylinder.png
rename to Assets/Editor/Icons/Components/Viewport/Cylinder.png
diff --git a/Editor/Icons/Components/Viewport/Cylinder_Shape.png b/Assets/Editor/Icons/Components/Viewport/Cylinder_Shape.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Cylinder_Shape.png
rename to Assets/Editor/Icons/Components/Viewport/Cylinder_Shape.png
diff --git a/Editor/Icons/Components/Viewport/Decal.png b/Assets/Editor/Icons/Components/Viewport/Decal.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Decal.png
rename to Assets/Editor/Icons/Components/Viewport/Decal.png
diff --git a/Editor/Icons/Components/Viewport/Disk_Shape.png b/Assets/Editor/Icons/Components/Viewport/Disk_Shape.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Disk_Shape.png
rename to Assets/Editor/Icons/Components/Viewport/Disk_Shape.png
diff --git a/Editor/Icons/Components/Viewport/DynamicContent.png b/Assets/Editor/Icons/Components/Viewport/DynamicContent.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/DynamicContent.png
rename to Assets/Editor/Icons/Components/Viewport/DynamicContent.png
diff --git a/Editor/Icons/Components/Viewport/DynamicMesh.png b/Assets/Editor/Icons/Components/Viewport/DynamicMesh.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/DynamicMesh.png
rename to Assets/Editor/Icons/Components/Viewport/DynamicMesh.png
diff --git a/Editor/Icons/Components/Viewport/Entity.png b/Assets/Editor/Icons/Components/Viewport/Entity.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Entity.png
rename to Assets/Editor/Icons/Components/Viewport/Entity.png
diff --git a/Editor/Icons/Components/Viewport/EntityInSlice.png b/Assets/Editor/Icons/Components/Viewport/EntityInSlice.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/EntityInSlice.png
rename to Assets/Editor/Icons/Components/Viewport/EntityInSlice.png
diff --git a/Editor/Icons/Components/Viewport/EnvironmentProbe.png b/Assets/Editor/Icons/Components/Viewport/EnvironmentProbe.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/EnvironmentProbe.png
rename to Assets/Editor/Icons/Components/Viewport/EnvironmentProbe.png
diff --git a/Editor/Icons/Components/Viewport/Flipbook.png b/Assets/Editor/Icons/Components/Viewport/Flipbook.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Flipbook.png
rename to Assets/Editor/Icons/Components/Viewport/Flipbook.png
diff --git a/Editor/Icons/Components/Viewport/FogVolume.png b/Assets/Editor/Icons/Components/Viewport/FogVolume.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/FogVolume.png
rename to Assets/Editor/Icons/Components/Viewport/FogVolume.png
diff --git a/Editor/Icons/Components/Viewport/ForceVolume.png b/Assets/Editor/Icons/Components/Viewport/ForceVolume.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/ForceVolume.png
rename to Assets/Editor/Icons/Components/Viewport/ForceVolume.png
diff --git a/Editor/Icons/Components/Viewport/GeometryCache.png b/Assets/Editor/Icons/Components/Viewport/GeometryCache.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/GeometryCache.png
rename to Assets/Editor/Icons/Components/Viewport/GeometryCache.png
diff --git a/Editor/Icons/Components/Viewport/HttpClientComponent.png b/Assets/Editor/Icons/Components/Viewport/HttpClientComponent.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/HttpClientComponent.png
rename to Assets/Editor/Icons/Components/Viewport/HttpClientComponent.png
diff --git a/Editor/Icons/Components/Viewport/LensFlare.png b/Assets/Editor/Icons/Components/Viewport/LensFlare.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/LensFlare.png
rename to Assets/Editor/Icons/Components/Viewport/LensFlare.png
diff --git a/Editor/Icons/Components/Viewport/Light.png b/Assets/Editor/Icons/Components/Viewport/Light.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Light.png
rename to Assets/Editor/Icons/Components/Viewport/Light.png
diff --git a/Editor/Icons/Components/Viewport/Lightning.png b/Assets/Editor/Icons/Components/Viewport/Lightning.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Lightning.png
rename to Assets/Editor/Icons/Components/Viewport/Lightning.png
diff --git a/Editor/Icons/Components/Viewport/LightningArc.png b/Assets/Editor/Icons/Components/Viewport/LightningArc.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/LightningArc.png
rename to Assets/Editor/Icons/Components/Viewport/LightningArc.png
diff --git a/Editor/Icons/Components/Viewport/LookAt.png b/Assets/Editor/Icons/Components/Viewport/LookAt.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/LookAt.png
rename to Assets/Editor/Icons/Components/Viewport/LookAt.png
diff --git a/Editor/Icons/Components/Viewport/Mannequin.png b/Assets/Editor/Icons/Components/Viewport/Mannequin.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Mannequin.png
rename to Assets/Editor/Icons/Components/Viewport/Mannequin.png
diff --git a/Editor/Icons/Components/Viewport/MannequinScopeContext.png b/Assets/Editor/Icons/Components/Viewport/MannequinScopeContext.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/MannequinScopeContext.png
rename to Assets/Editor/Icons/Components/Viewport/MannequinScopeContext.png
diff --git a/Editor/Icons/Components/Viewport/MeshCollider.png b/Assets/Editor/Icons/Components/Viewport/MeshCollider.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/MeshCollider.png
rename to Assets/Editor/Icons/Components/Viewport/MeshCollider.png
diff --git a/Editor/Icons/Components/Viewport/MotionParameterSmoothing.png b/Assets/Editor/Icons/Components/Viewport/MotionParameterSmoothing.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/MotionParameterSmoothing.png
rename to Assets/Editor/Icons/Components/Viewport/MotionParameterSmoothing.png
diff --git a/Editor/Icons/Components/Viewport/Navigation.png b/Assets/Editor/Icons/Components/Viewport/Navigation.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Navigation.png
rename to Assets/Editor/Icons/Components/Viewport/Navigation.png
diff --git a/Editor/Icons/Components/Viewport/NavigationArea.png b/Assets/Editor/Icons/Components/Viewport/NavigationArea.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/NavigationArea.png
rename to Assets/Editor/Icons/Components/Viewport/NavigationArea.png
diff --git a/Editor/Icons/Components/Viewport/NavigationSeed.png b/Assets/Editor/Icons/Components/Viewport/NavigationSeed.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/NavigationSeed.png
rename to Assets/Editor/Icons/Components/Viewport/NavigationSeed.png
diff --git a/Editor/Icons/Components/Viewport/NetBinding.png b/Assets/Editor/Icons/Components/Viewport/NetBinding.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/NetBinding.png
rename to Assets/Editor/Icons/Components/Viewport/NetBinding.png
diff --git a/Editor/Icons/Components/Viewport/Nova.png b/Assets/Editor/Icons/Components/Viewport/Nova.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Nova.png
rename to Assets/Editor/Icons/Components/Viewport/Nova.png
diff --git a/Editor/Icons/Components/Viewport/ObjectAvoidance.png b/Assets/Editor/Icons/Components/Viewport/ObjectAvoidance.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/ObjectAvoidance.png
rename to Assets/Editor/Icons/Components/Viewport/ObjectAvoidance.png
diff --git a/Editor/Icons/Components/Viewport/Particle.png b/Assets/Editor/Icons/Components/Viewport/Particle.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Particle.png
rename to Assets/Editor/Icons/Components/Viewport/Particle.png
diff --git a/Editor/Icons/Components/Viewport/Physics.png b/Assets/Editor/Icons/Components/Viewport/Physics.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Physics.png
rename to Assets/Editor/Icons/Components/Viewport/Physics.png
diff --git a/Editor/Icons/Components/Viewport/PhysicsConstraint.png b/Assets/Editor/Icons/Components/Viewport/PhysicsConstraint.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/PhysicsConstraint.png
rename to Assets/Editor/Icons/Components/Viewport/PhysicsConstraint.png
diff --git a/Editor/Icons/Components/Viewport/PointLight.png b/Assets/Editor/Icons/Components/Viewport/PointLight.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/PointLight.png
rename to Assets/Editor/Icons/Components/Viewport/PointLight.png
diff --git a/Editor/Icons/Components/Viewport/PolygonPrism.png b/Assets/Editor/Icons/Components/Viewport/PolygonPrism.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/PolygonPrism.png
rename to Assets/Editor/Icons/Components/Viewport/PolygonPrism.png
diff --git a/Editor/Icons/Components/Viewport/Primitive Collider.png b/Assets/Editor/Icons/Components/Viewport/Primitive Collider.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Primitive Collider.png
rename to Assets/Editor/Icons/Components/Viewport/Primitive Collider.png
diff --git a/Editor/Icons/Components/Viewport/PrimitiveCollider.png b/Assets/Editor/Icons/Components/Viewport/PrimitiveCollider.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/PrimitiveCollider.png
rename to Assets/Editor/Icons/Components/Viewport/PrimitiveCollider.png
diff --git a/Editor/Icons/Components/Viewport/ProjectorLight.png b/Assets/Editor/Icons/Components/Viewport/ProjectorLight.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/ProjectorLight.png
rename to Assets/Editor/Icons/Components/Viewport/ProjectorLight.png
diff --git a/Editor/Icons/Components/Viewport/Quad_Shape.png b/Assets/Editor/Icons/Components/Viewport/Quad_Shape.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Quad_Shape.png
rename to Assets/Editor/Icons/Components/Viewport/Quad_Shape.png
diff --git a/Editor/Icons/Components/Viewport/Ragdoll.png b/Assets/Editor/Icons/Components/Viewport/Ragdoll.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Ragdoll.png
rename to Assets/Editor/Icons/Components/Viewport/Ragdoll.png
diff --git a/Editor/Icons/Components/Viewport/RandomTimedSpawner.png b/Assets/Editor/Icons/Components/Viewport/RandomTimedSpawner.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/RandomTimedSpawner.png
rename to Assets/Editor/Icons/Components/Viewport/RandomTimedSpawner.png
diff --git a/Editor/Icons/Components/Viewport/RigidPhysics.png b/Assets/Editor/Icons/Components/Viewport/RigidPhysics.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/RigidPhysics.png
rename to Assets/Editor/Icons/Components/Viewport/RigidPhysics.png
diff --git a/Editor/Icons/Components/Viewport/Script.png b/Assets/Editor/Icons/Components/Viewport/Script.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Script.png
rename to Assets/Editor/Icons/Components/Viewport/Script.png
diff --git a/Editor/Icons/Components/Viewport/ScriptEventAssetReference.png b/Assets/Editor/Icons/Components/Viewport/ScriptEventAssetReference.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/ScriptEventAssetReference.png
rename to Assets/Editor/Icons/Components/Viewport/ScriptEventAssetReference.png
diff --git a/Editor/Icons/Components/Viewport/Sequence.png b/Assets/Editor/Icons/Components/Viewport/Sequence.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Sequence.png
rename to Assets/Editor/Icons/Components/Viewport/Sequence.png
diff --git a/Editor/Icons/Components/Viewport/SequenceAgent.png b/Assets/Editor/Icons/Components/Viewport/SequenceAgent.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/SequenceAgent.png
rename to Assets/Editor/Icons/Components/Viewport/SequenceAgent.png
diff --git a/Editor/Icons/Components/Viewport/Shadow.png b/Assets/Editor/Icons/Components/Viewport/Shadow.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Shadow.png
rename to Assets/Editor/Icons/Components/Viewport/Shadow.png
diff --git a/Editor/Icons/Components/Viewport/SimpleState.png b/Assets/Editor/Icons/Components/Viewport/SimpleState.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/SimpleState.png
rename to Assets/Editor/Icons/Components/Viewport/SimpleState.png
diff --git a/Editor/Icons/Components/Viewport/SkinnedMesh.png b/Assets/Editor/Icons/Components/Viewport/SkinnedMesh.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/SkinnedMesh.png
rename to Assets/Editor/Icons/Components/Viewport/SkinnedMesh.png
diff --git a/Editor/Icons/Components/Viewport/SkyHighlight.png b/Assets/Editor/Icons/Components/Viewport/SkyHighlight.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/SkyHighlight.png
rename to Assets/Editor/Icons/Components/Viewport/SkyHighlight.png
diff --git a/Editor/Icons/Components/Viewport/Snow.png b/Assets/Editor/Icons/Components/Viewport/Snow.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Snow.png
rename to Assets/Editor/Icons/Components/Viewport/Snow.png
diff --git a/Editor/Icons/Components/Viewport/Spawner.png b/Assets/Editor/Icons/Components/Viewport/Spawner.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Spawner.png
rename to Assets/Editor/Icons/Components/Viewport/Spawner.png
diff --git a/Editor/Icons/Components/Viewport/Sphere.png b/Assets/Editor/Icons/Components/Viewport/Sphere.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Sphere.png
rename to Assets/Editor/Icons/Components/Viewport/Sphere.png
diff --git a/Editor/Icons/Components/Viewport/Sphere_Shape.png b/Assets/Editor/Icons/Components/Viewport/Sphere_Shape.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Sphere_Shape.png
rename to Assets/Editor/Icons/Components/Viewport/Sphere_Shape.png
diff --git a/Editor/Icons/Components/Viewport/Spline.png b/Assets/Editor/Icons/Components/Viewport/Spline.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Spline.png
rename to Assets/Editor/Icons/Components/Viewport/Spline.png
diff --git a/Editor/Icons/Components/Viewport/StaticData.png b/Assets/Editor/Icons/Components/Viewport/StaticData.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/StaticData.png
rename to Assets/Editor/Icons/Components/Viewport/StaticData.png
diff --git a/Editor/Icons/Components/Viewport/StaticMesh.png b/Assets/Editor/Icons/Components/Viewport/StaticMesh.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/StaticMesh.png
rename to Assets/Editor/Icons/Components/Viewport/StaticMesh.png
diff --git a/Editor/Icons/Components/Viewport/StaticPhysics.png b/Assets/Editor/Icons/Components/Viewport/StaticPhysics.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/StaticPhysics.png
rename to Assets/Editor/Icons/Components/Viewport/StaticPhysics.png
diff --git a/Editor/Icons/Components/Viewport/Tag.png b/Assets/Editor/Icons/Components/Viewport/Tag.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Tag.png
rename to Assets/Editor/Icons/Components/Viewport/Tag.png
diff --git a/Editor/Icons/Components/Viewport/TerrainPhysics.png b/Assets/Editor/Icons/Components/Viewport/TerrainPhysics.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/TerrainPhysics.png
rename to Assets/Editor/Icons/Components/Viewport/TerrainPhysics.png
diff --git a/Editor/Icons/Components/Viewport/Transform.png b/Assets/Editor/Icons/Components/Viewport/Transform.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Transform.png
rename to Assets/Editor/Icons/Components/Viewport/Transform.png
diff --git a/Editor/Icons/Components/Viewport/Trigger.png b/Assets/Editor/Icons/Components/Viewport/Trigger.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Trigger.png
rename to Assets/Editor/Icons/Components/Viewport/Trigger.png
diff --git a/Editor/Icons/Components/Viewport/Tube_Shape.png b/Assets/Editor/Icons/Components/Viewport/Tube_Shape.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/Tube_Shape.png
rename to Assets/Editor/Icons/Components/Viewport/Tube_Shape.png
diff --git a/Editor/Icons/Components/Viewport/UiCanvasOnMesh.png b/Assets/Editor/Icons/Components/Viewport/UiCanvasOnMesh.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/UiCanvasOnMesh.png
rename to Assets/Editor/Icons/Components/Viewport/UiCanvasOnMesh.png
diff --git a/Editor/Icons/Components/Viewport/UiCanvasRef.png b/Assets/Editor/Icons/Components/Viewport/UiCanvasRef.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/UiCanvasRef.png
rename to Assets/Editor/Icons/Components/Viewport/UiCanvasRef.png
diff --git a/Editor/Icons/Components/Viewport/VRPreview.png b/Assets/Editor/Icons/Components/Viewport/VRPreview.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/VRPreview.png
rename to Assets/Editor/Icons/Components/Viewport/VRPreview.png
diff --git a/Editor/Icons/Components/Viewport/WaterVolume.png b/Assets/Editor/Icons/Components/Viewport/WaterVolume.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/WaterVolume.png
rename to Assets/Editor/Icons/Components/Viewport/WaterVolume.png
diff --git a/Editor/Icons/Components/Viewport/WindVolume.png b/Assets/Editor/Icons/Components/Viewport/WindVolume.png
similarity index 100%
rename from Editor/Icons/Components/Viewport/WindVolume.png
rename to Assets/Editor/Icons/Components/Viewport/WindVolume.png
diff --git a/Editor/Icons/Components/WaterRippleGenerator.svg b/Assets/Editor/Icons/Components/WaterRippleGenerator.svg
similarity index 100%
rename from Editor/Icons/Components/WaterRippleGenerator.svg
rename to Assets/Editor/Icons/Components/WaterRippleGenerator.svg
diff --git a/Editor/Icons/Components/WaterVolume.svg b/Assets/Editor/Icons/Components/WaterVolume.svg
similarity index 100%
rename from Editor/Icons/Components/WaterVolume.svg
rename to Assets/Editor/Icons/Components/WaterVolume.svg
diff --git a/Editor/Icons/Components/WindVolume.svg b/Assets/Editor/Icons/Components/WindVolume.svg
similarity index 100%
rename from Editor/Icons/Components/WindVolume.svg
rename to Assets/Editor/Icons/Components/WindVolume.svg
diff --git a/Editor/Icons/PhysX/Move.svg b/Assets/Editor/Icons/PhysX/Move.svg
similarity index 100%
rename from Editor/Icons/PhysX/Move.svg
rename to Assets/Editor/Icons/PhysX/Move.svg
diff --git a/Editor/Icons/PhysX/Rotate.svg b/Assets/Editor/Icons/PhysX/Rotate.svg
similarity index 100%
rename from Editor/Icons/PhysX/Rotate.svg
rename to Assets/Editor/Icons/PhysX/Rotate.svg
diff --git a/Editor/Icons/PhysX/Scale.svg b/Assets/Editor/Icons/PhysX/Scale.svg
similarity index 100%
rename from Editor/Icons/PhysX/Scale.svg
rename to Assets/Editor/Icons/PhysX/Scale.svg
diff --git a/Editor/Icons/PropertyEditor/Browse.png b/Assets/Editor/Icons/PropertyEditor/Browse.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/Browse.png
rename to Assets/Editor/Icons/PropertyEditor/Browse.png
diff --git a/Editor/Icons/PropertyEditor/Browse_on.png b/Assets/Editor/Icons/PropertyEditor/Browse_on.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/Browse_on.png
rename to Assets/Editor/Icons/PropertyEditor/Browse_on.png
diff --git a/Editor/Icons/PropertyEditor/add.png b/Assets/Editor/Icons/PropertyEditor/add.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/add.png
rename to Assets/Editor/Icons/PropertyEditor/add.png
diff --git a/Editor/Icons/PropertyEditor/cross-circle-small.png b/Assets/Editor/Icons/PropertyEditor/cross-circle-small.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/cross-circle-small.png
rename to Assets/Editor/Icons/PropertyEditor/cross-circle-small.png
diff --git a/Editor/Icons/PropertyEditor/cross-small.png b/Assets/Editor/Icons/PropertyEditor/cross-small.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/cross-small.png
rename to Assets/Editor/Icons/PropertyEditor/cross-small.png
diff --git a/Editor/Icons/PropertyEditor/error_icon.png b/Assets/Editor/Icons/PropertyEditor/error_icon.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/error_icon.png
rename to Assets/Editor/Icons/PropertyEditor/error_icon.png
diff --git a/Editor/Icons/PropertyEditor/group_closed.png b/Assets/Editor/Icons/PropertyEditor/group_closed.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/group_closed.png
rename to Assets/Editor/Icons/PropertyEditor/group_closed.png
diff --git a/Editor/Icons/PropertyEditor/group_open.png b/Assets/Editor/Icons/PropertyEditor/group_open.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/group_open.png
rename to Assets/Editor/Icons/PropertyEditor/group_open.png
diff --git a/Editor/Icons/PropertyEditor/image_icon.svg b/Assets/Editor/Icons/PropertyEditor/image_icon.svg
similarity index 100%
rename from Editor/Icons/PropertyEditor/image_icon.svg
rename to Assets/Editor/Icons/PropertyEditor/image_icon.svg
diff --git a/Editor/Icons/PropertyEditor/list-add-small.png b/Assets/Editor/Icons/PropertyEditor/list-add-small.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/list-add-small.png
rename to Assets/Editor/Icons/PropertyEditor/list-add-small.png
diff --git a/Editor/Icons/PropertyEditor/open_in.png b/Assets/Editor/Icons/PropertyEditor/open_in.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/open_in.png
rename to Assets/Editor/Icons/PropertyEditor/open_in.png
diff --git a/Editor/Icons/PropertyEditor/point_hand.png b/Assets/Editor/Icons/PropertyEditor/point_hand.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/point_hand.png
rename to Assets/Editor/Icons/PropertyEditor/point_hand.png
diff --git a/Editor/Icons/PropertyEditor/remove.png b/Assets/Editor/Icons/PropertyEditor/remove.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/remove.png
rename to Assets/Editor/Icons/PropertyEditor/remove.png
diff --git a/Editor/Icons/PropertyEditor/reset_icon.png b/Assets/Editor/Icons/PropertyEditor/reset_icon.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/reset_icon.png
rename to Assets/Editor/Icons/PropertyEditor/reset_icon.png
diff --git a/Editor/Icons/PropertyEditor/tool_cancel.png b/Assets/Editor/Icons/PropertyEditor/tool_cancel.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/tool_cancel.png
rename to Assets/Editor/Icons/PropertyEditor/tool_cancel.png
diff --git a/Editor/Icons/PropertyEditor/tool_cancel_highlight.png b/Assets/Editor/Icons/PropertyEditor/tool_cancel_highlight.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/tool_cancel_highlight.png
rename to Assets/Editor/Icons/PropertyEditor/tool_cancel_highlight.png
diff --git a/Editor/Icons/PropertyEditor/tool_cancel_hover.png b/Assets/Editor/Icons/PropertyEditor/tool_cancel_hover.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/tool_cancel_hover.png
rename to Assets/Editor/Icons/PropertyEditor/tool_cancel_hover.png
diff --git a/Editor/Icons/PropertyEditor/trash-small.png b/Assets/Editor/Icons/PropertyEditor/trash-small.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/trash-small.png
rename to Assets/Editor/Icons/PropertyEditor/trash-small.png
diff --git a/Editor/Icons/PropertyEditor/tree_closed.png b/Assets/Editor/Icons/PropertyEditor/tree_closed.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/tree_closed.png
rename to Assets/Editor/Icons/PropertyEditor/tree_closed.png
diff --git a/Editor/Icons/PropertyEditor/tree_open.png b/Assets/Editor/Icons/PropertyEditor/tree_open.png
similarity index 100%
rename from Editor/Icons/PropertyEditor/tree_open.png
rename to Assets/Editor/Icons/PropertyEditor/tree_open.png
diff --git a/Editor/Icons/RotationWarning.png b/Assets/Editor/Icons/RotationWarning.png
similarity index 100%
rename from Editor/Icons/RotationWarning.png
rename to Assets/Editor/Icons/RotationWarning.png
diff --git a/Editor/Icons/ScaleWarning.png b/Assets/Editor/Icons/ScaleWarning.png
similarity index 100%
rename from Editor/Icons/ScaleWarning.png
rename to Assets/Editor/Icons/ScaleWarning.png
diff --git a/Editor/Icons/ScriptCanvas/Add.png b/Assets/Editor/Icons/ScriptCanvas/Add.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Add.png
rename to Assets/Editor/Icons/ScriptCanvas/Add.png
diff --git a/Editor/Icons/ScriptCanvas/And.png b/Assets/Editor/Icons/ScriptCanvas/And.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/And.png
rename to Assets/Editor/Icons/ScriptCanvas/And.png
diff --git a/Editor/Icons/ScriptCanvas/Boolean.png b/Assets/Editor/Icons/ScriptCanvas/Boolean.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Boolean.png
rename to Assets/Editor/Icons/ScriptCanvas/Boolean.png
diff --git a/Editor/Icons/ScriptCanvas/Breakpoint.png b/Assets/Editor/Icons/ScriptCanvas/Breakpoint.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Breakpoint.png
rename to Assets/Editor/Icons/ScriptCanvas/Breakpoint.png
diff --git a/Editor/Icons/ScriptCanvas/Bus.png b/Assets/Editor/Icons/ScriptCanvas/Bus.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Bus.png
rename to Assets/Editor/Icons/ScriptCanvas/Bus.png
diff --git a/Editor/Icons/ScriptCanvas/Connect.png b/Assets/Editor/Icons/ScriptCanvas/Connect.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Connect.png
rename to Assets/Editor/Icons/ScriptCanvas/Connect.png
diff --git a/Editor/Icons/ScriptCanvas/Delay.png b/Assets/Editor/Icons/ScriptCanvas/Delay.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Delay.png
rename to Assets/Editor/Icons/ScriptCanvas/Delay.png
diff --git a/Editor/Icons/ScriptCanvas/Disabled/ScriptCanvas_white.png b/Assets/Editor/Icons/ScriptCanvas/Disabled/ScriptCanvas_white.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Disabled/ScriptCanvas_white.png
rename to Assets/Editor/Icons/ScriptCanvas/Disabled/ScriptCanvas_white.png
diff --git a/Editor/Icons/ScriptCanvas/Disconnect.png b/Assets/Editor/Icons/ScriptCanvas/Disconnect.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Disconnect.png
rename to Assets/Editor/Icons/ScriptCanvas/Disconnect.png
diff --git a/Editor/Icons/ScriptCanvas/Divide.png b/Assets/Editor/Icons/ScriptCanvas/Divide.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Divide.png
rename to Assets/Editor/Icons/ScriptCanvas/Divide.png
diff --git a/Editor/Icons/ScriptCanvas/EntityRef.png b/Assets/Editor/Icons/ScriptCanvas/EntityRef.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/EntityRef.png
rename to Assets/Editor/Icons/ScriptCanvas/EntityRef.png
diff --git a/Editor/Icons/ScriptCanvas/Libraries/All.png b/Assets/Editor/Icons/ScriptCanvas/Libraries/All.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Libraries/All.png
rename to Assets/Editor/Icons/ScriptCanvas/Libraries/All.png
diff --git a/Editor/Icons/ScriptCanvas/Libraries/Core.png b/Assets/Editor/Icons/ScriptCanvas/Libraries/Core.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Libraries/Core.png
rename to Assets/Editor/Icons/ScriptCanvas/Libraries/Core.png
diff --git a/Editor/Icons/ScriptCanvas/Libraries/Entity.png b/Assets/Editor/Icons/ScriptCanvas/Libraries/Entity.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Libraries/Entity.png
rename to Assets/Editor/Icons/ScriptCanvas/Libraries/Entity.png
diff --git a/Editor/Icons/ScriptCanvas/Libraries/Logic.png b/Assets/Editor/Icons/ScriptCanvas/Libraries/Logic.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Libraries/Logic.png
rename to Assets/Editor/Icons/ScriptCanvas/Libraries/Logic.png
diff --git a/Editor/Icons/ScriptCanvas/Libraries/Math.png b/Assets/Editor/Icons/ScriptCanvas/Libraries/Math.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Libraries/Math.png
rename to Assets/Editor/Icons/ScriptCanvas/Libraries/Math.png
diff --git a/Editor/Icons/ScriptCanvas/Multiply.png b/Assets/Editor/Icons/ScriptCanvas/Multiply.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Multiply.png
rename to Assets/Editor/Icons/ScriptCanvas/Multiply.png
diff --git a/Editor/Icons/ScriptCanvas/Not.png b/Assets/Editor/Icons/ScriptCanvas/Not.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Not.png
rename to Assets/Editor/Icons/ScriptCanvas/Not.png
diff --git a/Editor/Icons/ScriptCanvas/Number.png b/Assets/Editor/Icons/ScriptCanvas/Number.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Number.png
rename to Assets/Editor/Icons/ScriptCanvas/Number.png
diff --git a/Editor/Icons/ScriptCanvas/Or.png b/Assets/Editor/Icons/ScriptCanvas/Or.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Or.png
rename to Assets/Editor/Icons/ScriptCanvas/Or.png
diff --git a/Editor/Icons/ScriptCanvas/Placeholder.png b/Assets/Editor/Icons/ScriptCanvas/Placeholder.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Placeholder.png
rename to Assets/Editor/Icons/ScriptCanvas/Placeholder.png
diff --git a/Editor/Icons/ScriptCanvas/Print.png b/Assets/Editor/Icons/ScriptCanvas/Print.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Print.png
rename to Assets/Editor/Icons/ScriptCanvas/Print.png
diff --git a/Editor/Icons/ScriptCanvas/Random.png b/Assets/Editor/Icons/ScriptCanvas/Random.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Random.png
rename to Assets/Editor/Icons/ScriptCanvas/Random.png
diff --git a/Editor/Icons/ScriptCanvas/Rotate.png b/Assets/Editor/Icons/ScriptCanvas/Rotate.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Rotate.png
rename to Assets/Editor/Icons/ScriptCanvas/Rotate.png
diff --git a/Editor/Icons/ScriptCanvas/ScriptCanvas.svg b/Assets/Editor/Icons/ScriptCanvas/ScriptCanvas.svg
similarity index 100%
rename from Editor/Icons/ScriptCanvas/ScriptCanvas.svg
rename to Assets/Editor/Icons/ScriptCanvas/ScriptCanvas.svg
diff --git a/Editor/Icons/ScriptCanvas/Start.png b/Assets/Editor/Icons/ScriptCanvas/Start.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Start.png
rename to Assets/Editor/Icons/ScriptCanvas/Start.png
diff --git a/Editor/Icons/ScriptCanvas/Step In.png b/Assets/Editor/Icons/ScriptCanvas/Step In.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Step In.png
rename to Assets/Editor/Icons/ScriptCanvas/Step In.png
diff --git a/Editor/Icons/ScriptCanvas/Step Over.png b/Assets/Editor/Icons/ScriptCanvas/Step Over.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Step Over.png
rename to Assets/Editor/Icons/ScriptCanvas/Step Over.png
diff --git a/Editor/Icons/ScriptCanvas/String.png b/Assets/Editor/Icons/ScriptCanvas/String.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/String.png
rename to Assets/Editor/Icons/ScriptCanvas/String.png
diff --git a/Editor/Icons/ScriptCanvas/Subtract.png b/Assets/Editor/Icons/ScriptCanvas/Subtract.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Subtract.png
rename to Assets/Editor/Icons/ScriptCanvas/Subtract.png
diff --git a/Editor/Icons/ScriptCanvas/Sum.png b/Assets/Editor/Icons/ScriptCanvas/Sum.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Sum.png
rename to Assets/Editor/Icons/ScriptCanvas/Sum.png
diff --git a/Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.png b/Assets/Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.png
rename to Assets/Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.png
diff --git a/Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas_Function.png b/Assets/Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas_Function.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas_Function.png
rename to Assets/Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas_Function.png
diff --git a/Editor/Icons/ScriptCanvas/Xor.png b/Assets/Editor/Icons/ScriptCanvas/Xor.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/Xor.png
rename to Assets/Editor/Icons/ScriptCanvas/Xor.png
diff --git a/Editor/Icons/ScriptCanvas/settings.png b/Assets/Editor/Icons/ScriptCanvas/settings.png
similarity index 100%
rename from Editor/Icons/ScriptCanvas/settings.png
rename to Assets/Editor/Icons/ScriptCanvas/settings.png
diff --git a/Editor/Icons/WhiteBox/Move.svg b/Assets/Editor/Icons/WhiteBox/Move.svg
similarity index 100%
rename from Editor/Icons/WhiteBox/Move.svg
rename to Assets/Editor/Icons/WhiteBox/Move.svg
diff --git a/Editor/Icons/WhiteBox/RestoreMode.svg b/Assets/Editor/Icons/WhiteBox/RestoreMode.svg
similarity index 100%
rename from Editor/Icons/WhiteBox/RestoreMode.svg
rename to Assets/Editor/Icons/WhiteBox/RestoreMode.svg
diff --git a/Editor/Icons/WhiteBox/Rotate.svg b/Assets/Editor/Icons/WhiteBox/Rotate.svg
similarity index 100%
rename from Editor/Icons/WhiteBox/Rotate.svg
rename to Assets/Editor/Icons/WhiteBox/Rotate.svg
diff --git a/Editor/Icons/WhiteBox/Scale.svg b/Assets/Editor/Icons/WhiteBox/Scale.svg
similarity index 100%
rename from Editor/Icons/WhiteBox/Scale.svg
rename to Assets/Editor/Icons/WhiteBox/Scale.svg
diff --git a/Editor/Icons/WhiteBox/SketchMode.svg b/Assets/Editor/Icons/WhiteBox/SketchMode.svg
similarity index 100%
rename from Editor/Icons/WhiteBox/SketchMode.svg
rename to Assets/Editor/Icons/WhiteBox/SketchMode.svg
diff --git a/Editor/Icons/animation/add.png b/Assets/Editor/Icons/animation/add.png
similarity index 100%
rename from Editor/Icons/animation/add.png
rename to Assets/Editor/Icons/animation/add.png
diff --git a/Editor/Icons/animation/animation.png b/Assets/Editor/Icons/animation/animation.png
similarity index 100%
rename from Editor/Icons/animation/animation.png
rename to Assets/Editor/Icons/animation/animation.png
diff --git a/Editor/Icons/animation/animation_additive.png b/Assets/Editor/Icons/animation/animation_additive.png
similarity index 100%
rename from Editor/Icons/animation/animation_additive.png
rename to Assets/Editor/Icons/animation/animation_additive.png
diff --git a/Editor/Icons/animation/animation_aimpose.png b/Assets/Editor/Icons/animation/animation_aimpose.png
similarity index 100%
rename from Editor/Icons/animation/animation_aimpose.png
rename to Assets/Editor/Icons/animation/animation_aimpose.png
diff --git a/Editor/Icons/animation/animation_bspace.png b/Assets/Editor/Icons/animation/animation_bspace.png
similarity index 100%
rename from Editor/Icons/animation/animation_bspace.png
rename to Assets/Editor/Icons/animation/animation_bspace.png
diff --git a/Editor/Icons/animation/animation_comb.png b/Assets/Editor/Icons/animation/animation_comb.png
similarity index 100%
rename from Editor/Icons/animation/animation_comb.png
rename to Assets/Editor/Icons/animation/animation_comb.png
diff --git a/Editor/Icons/animation/animation_lookpose.png b/Assets/Editor/Icons/animation/animation_lookpose.png
similarity index 100%
rename from Editor/Icons/animation/animation_lookpose.png
rename to Assets/Editor/Icons/animation/animation_lookpose.png
diff --git a/Editor/Icons/animation/animation_offline.png b/Assets/Editor/Icons/animation/animation_offline.png
similarity index 100%
rename from Editor/Icons/animation/animation_offline.png
rename to Assets/Editor/Icons/animation/animation_offline.png
diff --git a/Editor/Icons/animation/attachment.png b/Assets/Editor/Icons/animation/attachment.png
similarity index 100%
rename from Editor/Icons/animation/attachment.png
rename to Assets/Editor/Icons/animation/attachment.png
diff --git a/Editor/Icons/animation/audio_event_16.png b/Assets/Editor/Icons/animation/audio_event_16.png
similarity index 100%
rename from Editor/Icons/animation/audio_event_16.png
rename to Assets/Editor/Icons/animation/audio_event_16.png
diff --git a/Editor/Icons/animation/back_16.png b/Assets/Editor/Icons/animation/back_16.png
similarity index 100%
rename from Editor/Icons/animation/back_16.png
rename to Assets/Editor/Icons/animation/back_16.png
diff --git a/Editor/Icons/animation/bind_pose.png b/Assets/Editor/Icons/animation/bind_pose.png
similarity index 100%
rename from Editor/Icons/animation/bind_pose.png
rename to Assets/Editor/Icons/animation/bind_pose.png
diff --git a/Editor/Icons/animation/bone.png b/Assets/Editor/Icons/animation/bone.png
similarity index 100%
rename from Editor/Icons/animation/bone.png
rename to Assets/Editor/Icons/animation/bone.png
diff --git a/Editor/Icons/animation/build.png b/Assets/Editor/Icons/animation/build.png
similarity index 100%
rename from Editor/Icons/animation/build.png
rename to Assets/Editor/Icons/animation/build.png
diff --git a/Editor/Icons/animation/character.png b/Assets/Editor/Icons/animation/character.png
similarity index 100%
rename from Editor/Icons/animation/character.png
rename to Assets/Editor/Icons/animation/character.png
diff --git a/Editor/Icons/animation/close.png b/Assets/Editor/Icons/animation/close.png
similarity index 100%
rename from Editor/Icons/animation/close.png
rename to Assets/Editor/Icons/animation/close.png
diff --git a/Editor/Icons/animation/close_highlight.png b/Assets/Editor/Icons/animation/close_highlight.png
similarity index 100%
rename from Editor/Icons/animation/close_highlight.png
rename to Assets/Editor/Icons/animation/close_highlight.png
diff --git a/Editor/Icons/animation/create_cdf.png b/Assets/Editor/Icons/animation/create_cdf.png
similarity index 100%
rename from Editor/Icons/animation/create_cdf.png
rename to Assets/Editor/Icons/animation/create_cdf.png
diff --git a/Editor/Icons/animation/display_options.png b/Assets/Editor/Icons/animation/display_options.png
similarity index 100%
rename from Editor/Icons/animation/display_options.png
rename to Assets/Editor/Icons/animation/display_options.png
diff --git a/Editor/Icons/animation/filter_16.png b/Assets/Editor/Icons/animation/filter_16.png
similarity index 100%
rename from Editor/Icons/animation/filter_16.png
rename to Assets/Editor/Icons/animation/filter_16.png
diff --git a/Editor/Icons/animation/footsteps.png b/Assets/Editor/Icons/animation/footsteps.png
similarity index 100%
rename from Editor/Icons/animation/footsteps.png
rename to Assets/Editor/Icons/animation/footsteps.png
diff --git a/Editor/Icons/animation/force_recompile.png b/Assets/Editor/Icons/animation/force_recompile.png
similarity index 100%
rename from Editor/Icons/animation/force_recompile.png
rename to Assets/Editor/Icons/animation/force_recompile.png
diff --git a/Editor/Icons/animation/forward_16.png b/Assets/Editor/Icons/animation/forward_16.png
similarity index 100%
rename from Editor/Icons/animation/forward_16.png
rename to Assets/Editor/Icons/animation/forward_16.png
diff --git a/Editor/Icons/animation/gizmo_location.png b/Assets/Editor/Icons/animation/gizmo_location.png
similarity index 100%
rename from Editor/Icons/animation/gizmo_location.png
rename to Assets/Editor/Icons/animation/gizmo_location.png
diff --git a/Editor/Icons/animation/grid.png b/Assets/Editor/Icons/animation/grid.png
similarity index 100%
rename from Editor/Icons/animation/grid.png
rename to Assets/Editor/Icons/animation/grid.png
diff --git a/Editor/Icons/animation/group.png b/Assets/Editor/Icons/animation/group.png
similarity index 100%
rename from Editor/Icons/animation/group.png
rename to Assets/Editor/Icons/animation/group.png
diff --git a/Editor/Icons/animation/import.png b/Assets/Editor/Icons/animation/import.png
similarity index 100%
rename from Editor/Icons/animation/import.png
rename to Assets/Editor/Icons/animation/import.png
diff --git a/Editor/Icons/animation/in_folder_16.png b/Assets/Editor/Icons/animation/in_folder_16.png
similarity index 100%
rename from Editor/Icons/animation/in_folder_16.png
rename to Assets/Editor/Icons/animation/in_folder_16.png
diff --git a/Editor/Icons/animation/in_folder_and_pak_16.png b/Assets/Editor/Icons/animation/in_folder_and_pak_16.png
similarity index 100%
rename from Editor/Icons/animation/in_folder_and_pak_16.png
rename to Assets/Editor/Icons/animation/in_folder_and_pak_16.png
diff --git a/Editor/Icons/animation/in_pak_16.png b/Assets/Editor/Icons/animation/in_pak_16.png
similarity index 100%
rename from Editor/Icons/animation/in_pak_16.png
rename to Assets/Editor/Icons/animation/in_pak_16.png
diff --git a/Editor/Icons/animation/lock_16.png b/Assets/Editor/Icons/animation/lock_16.png
similarity index 100%
rename from Editor/Icons/animation/lock_16.png
rename to Assets/Editor/Icons/animation/lock_16.png
diff --git a/Editor/Icons/animation/new_animation.png b/Assets/Editor/Icons/animation/new_animation.png
similarity index 100%
rename from Editor/Icons/animation/new_animation.png
rename to Assets/Editor/Icons/animation/new_animation.png
diff --git a/Editor/Icons/animation/physics.png b/Assets/Editor/Icons/animation/physics.png
similarity index 100%
rename from Editor/Icons/animation/physics.png
rename to Assets/Editor/Icons/animation/physics.png
diff --git a/Editor/Icons/animation/playback_options.png b/Assets/Editor/Icons/animation/playback_options.png
similarity index 100%
rename from Editor/Icons/animation/playback_options.png
rename to Assets/Editor/Icons/animation/playback_options.png
diff --git a/Editor/Icons/animation/redo.png b/Assets/Editor/Icons/animation/redo.png
similarity index 100%
rename from Editor/Icons/animation/redo.png
rename to Assets/Editor/Icons/animation/redo.png
diff --git a/Editor/Icons/animation/revert.png b/Assets/Editor/Icons/animation/revert.png
similarity index 100%
rename from Editor/Icons/animation/revert.png
rename to Assets/Editor/Icons/animation/revert.png
diff --git a/Editor/Icons/animation/rig.png b/Assets/Editor/Icons/animation/rig.png
similarity index 100%
rename from Editor/Icons/animation/rig.png
rename to Assets/Editor/Icons/animation/rig.png
diff --git a/Editor/Icons/animation/save.png b/Assets/Editor/Icons/animation/save.png
similarity index 100%
rename from Editor/Icons/animation/save.png
rename to Assets/Editor/Icons/animation/save.png
diff --git a/Editor/Icons/animation/selection_16.png b/Assets/Editor/Icons/animation/selection_16.png
similarity index 100%
rename from Editor/Icons/animation/selection_16.png
rename to Assets/Editor/Icons/animation/selection_16.png
diff --git a/Editor/Icons/animation/show_in_explorer.png b/Assets/Editor/Icons/animation/show_in_explorer.png
similarity index 100%
rename from Editor/Icons/animation/show_in_explorer.png
rename to Assets/Editor/Icons/animation/show_in_explorer.png
diff --git a/Editor/Icons/animation/skeleton.png b/Assets/Editor/Icons/animation/skeleton.png
similarity index 100%
rename from Editor/Icons/animation/skeleton.png
rename to Assets/Editor/Icons/animation/skeleton.png
diff --git a/Editor/Icons/animation/skin.png b/Assets/Editor/Icons/animation/skin.png
similarity index 100%
rename from Editor/Icons/animation/skin.png
rename to Assets/Editor/Icons/animation/skin.png
diff --git a/Editor/Icons/animation/source_asset_16.png b/Assets/Editor/Icons/animation/source_asset_16.png
similarity index 100%
rename from Editor/Icons/animation/source_asset_16.png
rename to Assets/Editor/Icons/animation/source_asset_16.png
diff --git a/Editor/Icons/animation/tool_move.png b/Assets/Editor/Icons/animation/tool_move.png
similarity index 100%
rename from Editor/Icons/animation/tool_move.png
rename to Assets/Editor/Icons/animation/tool_move.png
diff --git a/Editor/Icons/animation/tool_rotate.png b/Assets/Editor/Icons/animation/tool_rotate.png
similarity index 100%
rename from Editor/Icons/animation/tool_rotate.png
rename to Assets/Editor/Icons/animation/tool_rotate.png
diff --git a/Editor/Icons/animation/tool_scale.png b/Assets/Editor/Icons/animation/tool_scale.png
similarity index 100%
rename from Editor/Icons/animation/tool_scale.png
rename to Assets/Editor/Icons/animation/tool_scale.png
diff --git a/Editor/Icons/animation/tool_select.png b/Assets/Editor/Icons/animation/tool_select.png
similarity index 100%
rename from Editor/Icons/animation/tool_select.png
rename to Assets/Editor/Icons/animation/tool_select.png
diff --git a/Editor/Icons/animation/undo.png b/Assets/Editor/Icons/animation/undo.png
similarity index 100%
rename from Editor/Icons/animation/undo.png
rename to Assets/Editor/Icons/animation/undo.png
diff --git a/Editor/Icons/checkmark_checked.png b/Assets/Editor/Icons/checkmark_checked.png
similarity index 100%
rename from Editor/Icons/checkmark_checked.png
rename to Assets/Editor/Icons/checkmark_checked.png
diff --git a/Editor/Icons/checkmark_checked_hover.png b/Assets/Editor/Icons/checkmark_checked_hover.png
similarity index 100%
rename from Editor/Icons/checkmark_checked_hover.png
rename to Assets/Editor/Icons/checkmark_checked_hover.png
diff --git a/Editor/Icons/checkmark_unchecked_hover.png b/Assets/Editor/Icons/checkmark_unchecked_hover.png
similarity index 100%
rename from Editor/Icons/checkmark_unchecked_hover.png
rename to Assets/Editor/Icons/checkmark_unchecked_hover.png
diff --git a/Editor/Icons/close.png b/Assets/Editor/Icons/close.png
similarity index 100%
rename from Editor/Icons/close.png
rename to Assets/Editor/Icons/close.png
diff --git a/Editor/Icons/float.png b/Assets/Editor/Icons/float.png
similarity index 100%
rename from Editor/Icons/float.png
rename to Assets/Editor/Icons/float.png
diff --git a/Editor/Icons/lc_camera.png b/Assets/Editor/Icons/lc_camera.png
similarity index 100%
rename from Editor/Icons/lc_camera.png
rename to Assets/Editor/Icons/lc_camera.png
diff --git a/Editor/Icons/lc_exportandlaunch.png b/Assets/Editor/Icons/lc_exportandlaunch.png
similarity index 100%
rename from Editor/Icons/lc_exportandlaunch.png
rename to Assets/Editor/Icons/lc_exportandlaunch.png
diff --git a/Editor/Icons/lc_pc.png b/Assets/Editor/Icons/lc_pc.png
similarity index 100%
rename from Editor/Icons/lc_pc.png
rename to Assets/Editor/Icons/lc_pc.png
diff --git a/Editor/Icons/lc_power.png b/Assets/Editor/Icons/lc_power.png
similarity index 100%
rename from Editor/Icons/lc_power.png
rename to Assets/Editor/Icons/lc_power.png
diff --git a/Editor/Icons/lc_sshot.png b/Assets/Editor/Icons/lc_sshot.png
similarity index 100%
rename from Editor/Icons/lc_sshot.png
rename to Assets/Editor/Icons/lc_sshot.png
diff --git a/Editor/Icons/lc_sync.png b/Assets/Editor/Icons/lc_sync.png
similarity index 100%
rename from Editor/Icons/lc_sync.png
rename to Assets/Editor/Icons/lc_sync.png
diff --git a/Editor/Icons/reset.png b/Assets/Editor/Icons/reset.png
similarity index 100%
rename from Editor/Icons/reset.png
rename to Assets/Editor/Icons/reset.png
diff --git a/Editor/Icons/split.png b/Assets/Editor/Icons/split.png
similarity index 100%
rename from Editor/Icons/split.png
rename to Assets/Editor/Icons/split.png
diff --git a/Editor/LambdaFunctions/LwALambdaFunction.js b/Assets/Editor/LambdaFunctions/LwALambdaFunction.js
similarity index 100%
rename from Editor/LambdaFunctions/LwALambdaFunction.js
rename to Assets/Editor/LambdaFunctions/LwALambdaFunction.js
diff --git a/Editor/LambdaFunctions/LwFacebookLambdaFunction.js b/Assets/Editor/LambdaFunctions/LwFacebookLambdaFunction.js
similarity index 100%
rename from Editor/LambdaFunctions/LwFacebookLambdaFunction.js
rename to Assets/Editor/LambdaFunctions/LwFacebookLambdaFunction.js
diff --git a/Editor/LambdaFunctions/LwGenericOpenIdConnectLambdaFunction.js b/Assets/Editor/LambdaFunctions/LwGenericOpenIdConnectLambdaFunction.js
similarity index 100%
rename from Editor/LambdaFunctions/LwGenericOpenIdConnectLambdaFunction.js
rename to Assets/Editor/LambdaFunctions/LwGenericOpenIdConnectLambdaFunction.js
diff --git a/Editor/LambdaFunctions/LwGoogleLambdaFunction.js b/Assets/Editor/LambdaFunctions/LwGoogleLambdaFunction.js
similarity index 100%
rename from Editor/LambdaFunctions/LwGoogleLambdaFunction.js
rename to Assets/Editor/LambdaFunctions/LwGoogleLambdaFunction.js
diff --git a/Editor/LevelTemplates.xml b/Assets/Editor/LevelTemplates.xml
similarity index 100%
rename from Editor/LevelTemplates.xml
rename to Assets/Editor/LevelTemplates.xml
diff --git a/Editor/MapScreenshotSettings.xml b/Assets/Editor/MapScreenshotSettings.xml
similarity index 100%
rename from Editor/MapScreenshotSettings.xml
rename to Assets/Editor/MapScreenshotSettings.xml
diff --git a/Editor/Materials/ShaderList.xml b/Assets/Editor/Materials/ShaderList.xml
similarity index 100%
rename from Editor/Materials/ShaderList.xml
rename to Assets/Editor/Materials/ShaderList.xml
diff --git a/Editor/Materials/Stripes.tif b/Assets/Editor/Materials/Stripes.tif
similarity index 100%
rename from Editor/Materials/Stripes.tif
rename to Assets/Editor/Materials/Stripes.tif
diff --git a/Editor/Materials/Stripes.tif.exportsettings b/Assets/Editor/Materials/Stripes.tif.exportsettings
similarity index 100%
rename from Editor/Materials/Stripes.tif.exportsettings
rename to Assets/Editor/Materials/Stripes.tif.exportsettings
diff --git a/Editor/Materials/areasolid.dds b/Assets/Editor/Materials/areasolid.dds
similarity index 100%
rename from Editor/Materials/areasolid.dds
rename to Assets/Editor/Materials/areasolid.dds
diff --git a/Editor/Materials/areasolid.mtl b/Assets/Editor/Materials/areasolid.mtl
similarity index 100%
rename from Editor/Materials/areasolid.mtl
rename to Assets/Editor/Materials/areasolid.mtl
diff --git a/Editor/Materials/crydesigner_selection.mtl b/Assets/Editor/Materials/crydesigner_selection.mtl
similarity index 100%
rename from Editor/Materials/crydesigner_selection.mtl
rename to Assets/Editor/Materials/crydesigner_selection.mtl
diff --git a/Editor/Materials/default_rope.mtl b/Assets/Editor/Materials/default_rope.mtl
similarity index 100%
rename from Editor/Materials/default_rope.mtl
rename to Assets/Editor/Materials/default_rope.mtl
diff --git a/Editor/Materials/lodgen_template.mtl b/Assets/Editor/Materials/lodgen_template.mtl
similarity index 54%
rename from Editor/Materials/lodgen_template.mtl
rename to Assets/Editor/Materials/lodgen_template.mtl
index 0866c7b28b..761eff9154 100644
--- a/Editor/Materials/lodgen_template.mtl
+++ b/Assets/Editor/Materials/lodgen_template.mtl
@@ -1,8 +1,8 @@
-
-
-
+
+
+
diff --git a/Editor/Materials/refpicture.mtl b/Assets/Editor/Materials/refpicture.mtl
similarity index 100%
rename from Editor/Materials/refpicture.mtl
rename to Assets/Editor/Materials/refpicture.mtl
diff --git a/Editor/Materials/voxel_editor.mtl b/Assets/Editor/Materials/voxel_editor.mtl
similarity index 100%
rename from Editor/Materials/voxel_editor.mtl
rename to Assets/Editor/Materials/voxel_editor.mtl
diff --git a/Editor/Materials/voxel_editor.png b/Assets/Editor/Materials/voxel_editor.png
similarity index 100%
rename from Editor/Materials/voxel_editor.png
rename to Assets/Editor/Materials/voxel_editor.png
diff --git a/Editor/Materials/voxel_editor.png.exportsettings b/Assets/Editor/Materials/voxel_editor.png.exportsettings
similarity index 100%
rename from Editor/Materials/voxel_editor.png.exportsettings
rename to Assets/Editor/Materials/voxel_editor.png.exportsettings
diff --git a/Editor/MissionTemplate.lua b/Assets/Editor/MissionTemplate.lua
similarity index 100%
rename from Editor/MissionTemplate.lua
rename to Assets/Editor/MissionTemplate.lua
diff --git a/Editor/ModellingPanel.xml b/Assets/Editor/ModellingPanel.xml
similarity index 100%
rename from Editor/ModellingPanel.xml
rename to Assets/Editor/ModellingPanel.xml
diff --git a/Editor/NewEntityTemplate.ent_template b/Assets/Editor/NewEntityTemplate.ent_template
similarity index 100%
rename from Editor/NewEntityTemplate.ent_template
rename to Assets/Editor/NewEntityTemplate.ent_template
diff --git a/Editor/NewEntityTemplate.lua_template b/Assets/Editor/NewEntityTemplate.lua_template
similarity index 100%
rename from Editor/NewEntityTemplate.lua_template
rename to Assets/Editor/NewEntityTemplate.lua_template
diff --git a/Editor/ObjectIcons/AreaTrigger.bmp b/Assets/Editor/ObjectIcons/AreaTrigger.bmp
similarity index 100%
rename from Editor/ObjectIcons/AreaTrigger.bmp
rename to Assets/Editor/ObjectIcons/AreaTrigger.bmp
diff --git a/Editor/ObjectIcons/AudioAreaAmbience.bmp b/Assets/Editor/ObjectIcons/AudioAreaAmbience.bmp
similarity index 100%
rename from Editor/ObjectIcons/AudioAreaAmbience.bmp
rename to Assets/Editor/ObjectIcons/AudioAreaAmbience.bmp
diff --git a/Editor/ObjectIcons/AudioAreaEntity.bmp b/Assets/Editor/ObjectIcons/AudioAreaEntity.bmp
similarity index 100%
rename from Editor/ObjectIcons/AudioAreaEntity.bmp
rename to Assets/Editor/ObjectIcons/AudioAreaEntity.bmp
diff --git a/Editor/ObjectIcons/AudioAreaRandom.bmp b/Assets/Editor/ObjectIcons/AudioAreaRandom.bmp
similarity index 100%
rename from Editor/ObjectIcons/AudioAreaRandom.bmp
rename to Assets/Editor/ObjectIcons/AudioAreaRandom.bmp
diff --git a/Editor/ObjectIcons/Camera.bmp b/Assets/Editor/ObjectIcons/Camera.bmp
similarity index 100%
rename from Editor/ObjectIcons/Camera.bmp
rename to Assets/Editor/ObjectIcons/Camera.bmp
diff --git a/Editor/ObjectIcons/Checkpoint.bmp b/Assets/Editor/ObjectIcons/Checkpoint.bmp
similarity index 100%
rename from Editor/ObjectIcons/Checkpoint.bmp
rename to Assets/Editor/ObjectIcons/Checkpoint.bmp
diff --git a/Editor/ObjectIcons/ClipVolume.bmp b/Assets/Editor/ObjectIcons/ClipVolume.bmp
similarity index 100%
rename from Editor/ObjectIcons/ClipVolume.bmp
rename to Assets/Editor/ObjectIcons/ClipVolume.bmp
diff --git a/Editor/ObjectIcons/Clock.bmp b/Assets/Editor/ObjectIcons/Clock.bmp
similarity index 100%
rename from Editor/ObjectIcons/Clock.bmp
rename to Assets/Editor/ObjectIcons/Clock.bmp
diff --git a/Editor/ObjectIcons/Clouds.bmp b/Assets/Editor/ObjectIcons/Clouds.bmp
similarity index 100%
rename from Editor/ObjectIcons/Clouds.bmp
rename to Assets/Editor/ObjectIcons/Clouds.bmp
diff --git a/Editor/ObjectIcons/Comment.bmp b/Assets/Editor/ObjectIcons/Comment.bmp
similarity index 100%
rename from Editor/ObjectIcons/Comment.bmp
rename to Assets/Editor/ObjectIcons/Comment.bmp
diff --git a/Editor/ObjectIcons/DeadBody.bmp b/Assets/Editor/ObjectIcons/DeadBody.bmp
similarity index 100%
rename from Editor/ObjectIcons/DeadBody.bmp
rename to Assets/Editor/ObjectIcons/DeadBody.bmp
diff --git a/Editor/ObjectIcons/Decal.bmp b/Assets/Editor/ObjectIcons/Decal.bmp
similarity index 100%
rename from Editor/ObjectIcons/Decal.bmp
rename to Assets/Editor/ObjectIcons/Decal.bmp
diff --git a/Editor/ObjectIcons/Dialog.bmp b/Assets/Editor/ObjectIcons/Dialog.bmp
similarity index 100%
rename from Editor/ObjectIcons/Dialog.bmp
rename to Assets/Editor/ObjectIcons/Dialog.bmp
diff --git a/Editor/ObjectIcons/Flash.bmp b/Assets/Editor/ObjectIcons/Flash.bmp
similarity index 100%
rename from Editor/ObjectIcons/Flash.bmp
rename to Assets/Editor/ObjectIcons/Flash.bmp
diff --git a/Editor/ObjectIcons/Fog.bmp b/Assets/Editor/ObjectIcons/Fog.bmp
similarity index 100%
rename from Editor/ObjectIcons/Fog.bmp
rename to Assets/Editor/ObjectIcons/Fog.bmp
diff --git a/Editor/ObjectIcons/FogVolume.bmp b/Assets/Editor/ObjectIcons/FogVolume.bmp
similarity index 100%
rename from Editor/ObjectIcons/FogVolume.bmp
rename to Assets/Editor/ObjectIcons/FogVolume.bmp
diff --git a/Editor/ObjectIcons/GravitySphere.bmp b/Assets/Editor/ObjectIcons/GravitySphere.bmp
similarity index 100%
rename from Editor/ObjectIcons/GravitySphere.bmp
rename to Assets/Editor/ObjectIcons/GravitySphere.bmp
diff --git a/Editor/ObjectIcons/Item.bmp b/Assets/Editor/ObjectIcons/Item.bmp
similarity index 100%
rename from Editor/ObjectIcons/Item.bmp
rename to Assets/Editor/ObjectIcons/Item.bmp
diff --git a/Editor/ObjectIcons/Ladder.bmp b/Assets/Editor/ObjectIcons/Ladder.bmp
similarity index 100%
rename from Editor/ObjectIcons/Ladder.bmp
rename to Assets/Editor/ObjectIcons/Ladder.bmp
diff --git a/Editor/ObjectIcons/Light.bmp b/Assets/Editor/ObjectIcons/Light.bmp
similarity index 100%
rename from Editor/ObjectIcons/Light.bmp
rename to Assets/Editor/ObjectIcons/Light.bmp
diff --git a/Editor/ObjectIcons/LightPropagationVolume.bmp b/Assets/Editor/ObjectIcons/LightPropagationVolume.bmp
similarity index 100%
rename from Editor/ObjectIcons/LightPropagationVolume.bmp
rename to Assets/Editor/ObjectIcons/LightPropagationVolume.bmp
diff --git a/Editor/ObjectIcons/Lightning.bmp b/Assets/Editor/ObjectIcons/Lightning.bmp
similarity index 100%
rename from Editor/ObjectIcons/Lightning.bmp
rename to Assets/Editor/ObjectIcons/Lightning.bmp
diff --git a/Editor/ObjectIcons/Magnet.bmp b/Assets/Editor/ObjectIcons/Magnet.bmp
similarity index 100%
rename from Editor/ObjectIcons/Magnet.bmp
rename to Assets/Editor/ObjectIcons/Magnet.bmp
diff --git a/Editor/ObjectIcons/MultiTrigger.bmp b/Assets/Editor/ObjectIcons/MultiTrigger.bmp
similarity index 100%
rename from Editor/ObjectIcons/MultiTrigger.bmp
rename to Assets/Editor/ObjectIcons/MultiTrigger.bmp
diff --git a/Editor/ObjectIcons/ODD.bmp b/Assets/Editor/ObjectIcons/ODD.bmp
similarity index 100%
rename from Editor/ObjectIcons/ODD.bmp
rename to Assets/Editor/ObjectIcons/ODD.bmp
diff --git a/Editor/ObjectIcons/Particles.bmp b/Assets/Editor/ObjectIcons/Particles.bmp
similarity index 100%
rename from Editor/ObjectIcons/Particles.bmp
rename to Assets/Editor/ObjectIcons/Particles.bmp
diff --git a/Editor/ObjectIcons/PrecacheCamera.bmp b/Assets/Editor/ObjectIcons/PrecacheCamera.bmp
similarity index 100%
rename from Editor/ObjectIcons/PrecacheCamera.bmp
rename to Assets/Editor/ObjectIcons/PrecacheCamera.bmp
diff --git a/Editor/ObjectIcons/Prefab.bmp b/Assets/Editor/ObjectIcons/Prefab.bmp
similarity index 100%
rename from Editor/ObjectIcons/Prefab.bmp
rename to Assets/Editor/ObjectIcons/Prefab.bmp
diff --git a/Editor/ObjectIcons/Prompt.bmp b/Assets/Editor/ObjectIcons/Prompt.bmp
similarity index 100%
rename from Editor/ObjectIcons/Prompt.bmp
rename to Assets/Editor/ObjectIcons/Prompt.bmp
diff --git a/Editor/ObjectIcons/SavePoint.bmp b/Assets/Editor/ObjectIcons/SavePoint.bmp
similarity index 100%
rename from Editor/ObjectIcons/SavePoint.bmp
rename to Assets/Editor/ObjectIcons/SavePoint.bmp
diff --git a/Editor/ObjectIcons/Seed.bmp b/Assets/Editor/ObjectIcons/Seed.bmp
similarity index 100%
rename from Editor/ObjectIcons/Seed.bmp
rename to Assets/Editor/ObjectIcons/Seed.bmp
diff --git a/Editor/ObjectIcons/Sound.bmp b/Assets/Editor/ObjectIcons/Sound.bmp
similarity index 100%
rename from Editor/ObjectIcons/Sound.bmp
rename to Assets/Editor/ObjectIcons/Sound.bmp
diff --git a/Editor/ObjectIcons/SpawnPoint.bmp b/Assets/Editor/ObjectIcons/SpawnPoint.bmp
similarity index 100%
rename from Editor/ObjectIcons/SpawnPoint.bmp
rename to Assets/Editor/ObjectIcons/SpawnPoint.bmp
diff --git a/Editor/ObjectIcons/T.bmp b/Assets/Editor/ObjectIcons/T.bmp
similarity index 100%
rename from Editor/ObjectIcons/T.bmp
rename to Assets/Editor/ObjectIcons/T.bmp
diff --git a/Editor/ObjectIcons/TagPoint.bmp b/Assets/Editor/ObjectIcons/TagPoint.bmp
similarity index 100%
rename from Editor/ObjectIcons/TagPoint.bmp
rename to Assets/Editor/ObjectIcons/TagPoint.bmp
diff --git a/Editor/ObjectIcons/Trigger.bmp b/Assets/Editor/ObjectIcons/Trigger.bmp
similarity index 100%
rename from Editor/ObjectIcons/Trigger.bmp
rename to Assets/Editor/ObjectIcons/Trigger.bmp
diff --git a/Editor/ObjectIcons/UiCanvasRefEntity.bmp b/Assets/Editor/ObjectIcons/UiCanvasRefEntity.bmp
similarity index 100%
rename from Editor/ObjectIcons/UiCanvasRefEntity.bmp
rename to Assets/Editor/ObjectIcons/UiCanvasRefEntity.bmp
diff --git a/Editor/ObjectIcons/User.bmp b/Assets/Editor/ObjectIcons/User.bmp
similarity index 100%
rename from Editor/ObjectIcons/User.bmp
rename to Assets/Editor/ObjectIcons/User.bmp
diff --git a/Editor/ObjectIcons/VVVArea.bmp b/Assets/Editor/ObjectIcons/VVVArea.bmp
similarity index 100%
rename from Editor/ObjectIcons/VVVArea.bmp
rename to Assets/Editor/ObjectIcons/VVVArea.bmp
diff --git a/Editor/ObjectIcons/W.bmp b/Assets/Editor/ObjectIcons/W.bmp
similarity index 100%
rename from Editor/ObjectIcons/W.bmp
rename to Assets/Editor/ObjectIcons/W.bmp
diff --git a/Editor/ObjectIcons/Water.bmp b/Assets/Editor/ObjectIcons/Water.bmp
similarity index 100%
rename from Editor/ObjectIcons/Water.bmp
rename to Assets/Editor/ObjectIcons/Water.bmp
diff --git a/Editor/ObjectIcons/animobject.bmp b/Assets/Editor/ObjectIcons/animobject.bmp
similarity index 100%
rename from Editor/ObjectIcons/animobject.bmp
rename to Assets/Editor/ObjectIcons/animobject.bmp
diff --git a/Editor/ObjectIcons/bird.bmp b/Assets/Editor/ObjectIcons/bird.bmp
similarity index 100%
rename from Editor/ObjectIcons/bird.bmp
rename to Assets/Editor/ObjectIcons/bird.bmp
diff --git a/Editor/ObjectIcons/bug.bmp b/Assets/Editor/ObjectIcons/bug.bmp
similarity index 100%
rename from Editor/ObjectIcons/bug.bmp
rename to Assets/Editor/ObjectIcons/bug.bmp
diff --git a/Editor/ObjectIcons/character.bmp b/Assets/Editor/ObjectIcons/character.bmp
similarity index 100%
rename from Editor/ObjectIcons/character.bmp
rename to Assets/Editor/ObjectIcons/character.bmp
diff --git a/Editor/ObjectIcons/death.bmp b/Assets/Editor/ObjectIcons/death.bmp
similarity index 100%
rename from Editor/ObjectIcons/death.bmp
rename to Assets/Editor/ObjectIcons/death.bmp
diff --git a/Editor/ObjectIcons/door.bmp b/Assets/Editor/ObjectIcons/door.bmp
similarity index 100%
rename from Editor/ObjectIcons/door.bmp
rename to Assets/Editor/ObjectIcons/door.bmp
diff --git a/Editor/ObjectIcons/elevator.bmp b/Assets/Editor/ObjectIcons/elevator.bmp
similarity index 100%
rename from Editor/ObjectIcons/elevator.bmp
rename to Assets/Editor/ObjectIcons/elevator.bmp
diff --git a/Editor/ObjectIcons/environmentProbe.bmp b/Assets/Editor/ObjectIcons/environmentProbe.bmp
similarity index 100%
rename from Editor/ObjectIcons/environmentProbe.bmp
rename to Assets/Editor/ObjectIcons/environmentProbe.bmp
diff --git a/Editor/ObjectIcons/explosion.bmp b/Assets/Editor/ObjectIcons/explosion.bmp
similarity index 100%
rename from Editor/ObjectIcons/explosion.bmp
rename to Assets/Editor/ObjectIcons/explosion.bmp
diff --git a/Editor/ObjectIcons/fish.bmp b/Assets/Editor/ObjectIcons/fish.bmp
similarity index 100%
rename from Editor/ObjectIcons/fish.bmp
rename to Assets/Editor/ObjectIcons/fish.bmp
diff --git a/Editor/ObjectIcons/forbiddenarea.bmp b/Assets/Editor/ObjectIcons/forbiddenarea.bmp
similarity index 100%
rename from Editor/ObjectIcons/forbiddenarea.bmp
rename to Assets/Editor/ObjectIcons/forbiddenarea.bmp
diff --git a/Editor/ObjectIcons/hazard.bmp b/Assets/Editor/ObjectIcons/hazard.bmp
similarity index 100%
rename from Editor/ObjectIcons/hazard.bmp
rename to Assets/Editor/ObjectIcons/hazard.bmp
diff --git a/Editor/ObjectIcons/health.bmp b/Assets/Editor/ObjectIcons/health.bmp
similarity index 100%
rename from Editor/ObjectIcons/health.bmp
rename to Assets/Editor/ObjectIcons/health.bmp
diff --git a/Editor/ObjectIcons/ledge.bmp b/Assets/Editor/ObjectIcons/ledge.bmp
similarity index 100%
rename from Editor/ObjectIcons/ledge.bmp
rename to Assets/Editor/ObjectIcons/ledge.bmp
diff --git a/Editor/ObjectIcons/mine.bmp b/Assets/Editor/ObjectIcons/mine.bmp
similarity index 100%
rename from Editor/ObjectIcons/mine.bmp
rename to Assets/Editor/ObjectIcons/mine.bmp
diff --git a/Editor/ObjectIcons/physicsobject.bmp b/Assets/Editor/ObjectIcons/physicsobject.bmp
similarity index 100%
rename from Editor/ObjectIcons/physicsobject.bmp
rename to Assets/Editor/ObjectIcons/physicsobject.bmp
diff --git a/Editor/ObjectIcons/prefabbuilding.bmp b/Assets/Editor/ObjectIcons/prefabbuilding.bmp
similarity index 100%
rename from Editor/ObjectIcons/prefabbuilding.bmp
rename to Assets/Editor/ObjectIcons/prefabbuilding.bmp
diff --git a/Editor/ObjectIcons/proceduralbuilding.bmp b/Assets/Editor/ObjectIcons/proceduralbuilding.bmp
similarity index 100%
rename from Editor/ObjectIcons/proceduralbuilding.bmp
rename to Assets/Editor/ObjectIcons/proceduralbuilding.bmp
diff --git a/Editor/ObjectIcons/proceduralobject.bmp b/Assets/Editor/ObjectIcons/proceduralobject.bmp
similarity index 100%
rename from Editor/ObjectIcons/proceduralobject.bmp
rename to Assets/Editor/ObjectIcons/proceduralobject.bmp
diff --git a/Editor/ObjectIcons/proximitytrigger.bmp b/Assets/Editor/ObjectIcons/proximitytrigger.bmp
similarity index 100%
rename from Editor/ObjectIcons/proximitytrigger.bmp
rename to Assets/Editor/ObjectIcons/proximitytrigger.bmp
diff --git a/Editor/ObjectIcons/river.bmp b/Assets/Editor/ObjectIcons/river.bmp
similarity index 100%
rename from Editor/ObjectIcons/river.bmp
rename to Assets/Editor/ObjectIcons/river.bmp
diff --git a/Editor/ObjectIcons/road.bmp b/Assets/Editor/ObjectIcons/road.bmp
similarity index 100%
rename from Editor/ObjectIcons/road.bmp
rename to Assets/Editor/ObjectIcons/road.bmp
diff --git a/Editor/ObjectIcons/rope.bmp b/Assets/Editor/ObjectIcons/rope.bmp
similarity index 100%
rename from Editor/ObjectIcons/rope.bmp
rename to Assets/Editor/ObjectIcons/rope.bmp
diff --git a/Editor/ObjectIcons/sequence.bmp b/Assets/Editor/ObjectIcons/sequence.bmp
similarity index 100%
rename from Editor/ObjectIcons/sequence.bmp
rename to Assets/Editor/ObjectIcons/sequence.bmp
diff --git a/Editor/ObjectIcons/shake.bmp b/Assets/Editor/ObjectIcons/shake.bmp
similarity index 100%
rename from Editor/ObjectIcons/shake.bmp
rename to Assets/Editor/ObjectIcons/shake.bmp
diff --git a/Editor/ObjectIcons/smartobject.bmp b/Assets/Editor/ObjectIcons/smartobject.bmp
similarity index 100%
rename from Editor/ObjectIcons/smartobject.bmp
rename to Assets/Editor/ObjectIcons/smartobject.bmp
diff --git a/Editor/ObjectIcons/spawngroup.bmp b/Assets/Editor/ObjectIcons/spawngroup.bmp
similarity index 100%
rename from Editor/ObjectIcons/spawngroup.bmp
rename to Assets/Editor/ObjectIcons/spawngroup.bmp
diff --git a/Editor/ObjectIcons/spectator.bmp b/Assets/Editor/ObjectIcons/spectator.bmp
similarity index 100%
rename from Editor/ObjectIcons/spectator.bmp
rename to Assets/Editor/ObjectIcons/spectator.bmp
diff --git a/Editor/ObjectIcons/switch.bmp b/Assets/Editor/ObjectIcons/switch.bmp
similarity index 100%
rename from Editor/ObjectIcons/switch.bmp
rename to Assets/Editor/ObjectIcons/switch.bmp
diff --git a/Editor/ObjectIcons/territory.bmp b/Assets/Editor/ObjectIcons/territory.bmp
similarity index 100%
rename from Editor/ObjectIcons/territory.bmp
rename to Assets/Editor/ObjectIcons/territory.bmp
diff --git a/Editor/ObjectIcons/tornado.bmp b/Assets/Editor/ObjectIcons/tornado.bmp
similarity index 100%
rename from Editor/ObjectIcons/tornado.bmp
rename to Assets/Editor/ObjectIcons/tornado.bmp
diff --git a/Editor/ObjectIcons/vehicle.bmp b/Assets/Editor/ObjectIcons/vehicle.bmp
similarity index 100%
rename from Editor/ObjectIcons/vehicle.bmp
rename to Assets/Editor/ObjectIcons/vehicle.bmp
diff --git a/Editor/ObjectIcons/voxel.bmp b/Assets/Editor/ObjectIcons/voxel.bmp
similarity index 100%
rename from Editor/ObjectIcons/voxel.bmp
rename to Assets/Editor/ObjectIcons/voxel.bmp
diff --git a/Editor/ObjectIcons/wave.bmp b/Assets/Editor/ObjectIcons/wave.bmp
similarity index 100%
rename from Editor/ObjectIcons/wave.bmp
rename to Assets/Editor/ObjectIcons/wave.bmp
diff --git a/Editor/ObjectTemplates.xml b/Assets/Editor/ObjectTemplates.xml
similarity index 100%
rename from Editor/ObjectTemplates.xml
rename to Assets/Editor/ObjectTemplates.xml
diff --git a/Editor/Objects/Arrow.cgf b/Assets/Editor/Objects/Arrow.cgf
similarity index 100%
rename from Editor/Objects/Arrow.cgf
rename to Assets/Editor/Objects/Arrow.cgf
diff --git a/Editor/Objects/Axis.cgf b/Assets/Editor/Objects/Axis.cgf
similarity index 100%
rename from Editor/Objects/Axis.cgf
rename to Assets/Editor/Objects/Axis.cgf
diff --git a/Editor/Objects/Clock.cgf b/Assets/Editor/Objects/Clock.cgf
similarity index 100%
rename from Editor/Objects/Clock.cgf
rename to Assets/Editor/Objects/Clock.cgf
diff --git a/Editor/Objects/Comment.cgf b/Assets/Editor/Objects/Comment.cgf
similarity index 100%
rename from Editor/Objects/Comment.cgf
rename to Assets/Editor/Objects/Comment.cgf
diff --git a/Editor/Objects/CryDesigner_camera.grp b/Assets/Editor/Objects/CryDesigner_camera.grp
similarity index 100%
rename from Editor/Objects/CryDesigner_camera.grp
rename to Assets/Editor/Objects/CryDesigner_camera.grp
diff --git a/Editor/Objects/M.cgf b/Assets/Editor/Objects/M.cgf
similarity index 100%
rename from Editor/Objects/M.cgf
rename to Assets/Editor/Objects/M.cgf
diff --git a/Editor/Objects/MtlBox.cgf b/Assets/Editor/Objects/MtlBox.cgf
similarity index 100%
rename from Editor/Objects/MtlBox.cgf
rename to Assets/Editor/Objects/MtlBox.cgf
diff --git a/Editor/Objects/MtlObjects.max b/Assets/Editor/Objects/MtlObjects.max
similarity index 100%
rename from Editor/Objects/MtlObjects.max
rename to Assets/Editor/Objects/MtlObjects.max
diff --git a/Editor/Objects/MtlPlane.cgf b/Assets/Editor/Objects/MtlPlane.cgf
similarity index 100%
rename from Editor/Objects/MtlPlane.cgf
rename to Assets/Editor/Objects/MtlPlane.cgf
diff --git a/Editor/Objects/MtlSphere.cgf b/Assets/Editor/Objects/MtlSphere.cgf
similarity index 100%
rename from Editor/Objects/MtlSphere.cgf
rename to Assets/Editor/Objects/MtlSphere.cgf
diff --git a/Editor/Objects/MtlSwatch.cgf b/Assets/Editor/Objects/MtlSwatch.cgf
similarity index 100%
rename from Editor/Objects/MtlSwatch.cgf
rename to Assets/Editor/Objects/MtlSwatch.cgf
diff --git a/Editor/Objects/MtlTeapot.cgf b/Assets/Editor/Objects/MtlTeapot.cgf
similarity index 100%
rename from Editor/Objects/MtlTeapot.cgf
rename to Assets/Editor/Objects/MtlTeapot.cgf
diff --git a/Editor/Objects/MusicTheme.cgf b/Assets/Editor/Objects/MusicTheme.cgf
similarity index 100%
rename from Editor/Objects/MusicTheme.cgf
rename to Assets/Editor/Objects/MusicTheme.cgf
diff --git a/Editor/Objects/Particles.cgf b/Assets/Editor/Objects/Particles.cgf
similarity index 100%
rename from Editor/Objects/Particles.cgf
rename to Assets/Editor/Objects/Particles.cgf
diff --git a/Editor/Objects/Pyramid.cgf b/Assets/Editor/Objects/Pyramid.cgf
similarity index 100%
rename from Editor/Objects/Pyramid.cgf
rename to Assets/Editor/Objects/Pyramid.cgf
diff --git a/Editor/Objects/S.cgf b/Assets/Editor/Objects/S.cgf
similarity index 100%
rename from Editor/Objects/S.cgf
rename to Assets/Editor/Objects/S.cgf
diff --git a/Editor/Objects/Sound.cgf b/Assets/Editor/Objects/Sound.cgf
similarity index 100%
rename from Editor/Objects/Sound.cgf
rename to Assets/Editor/Objects/Sound.cgf
diff --git a/Editor/Objects/Sphere.cgf b/Assets/Editor/Objects/Sphere.cgf
similarity index 100%
rename from Editor/Objects/Sphere.cgf
rename to Assets/Editor/Objects/Sphere.cgf
diff --git a/Editor/Objects/T.cgf b/Assets/Editor/Objects/T.cgf
similarity index 100%
rename from Editor/Objects/T.cgf
rename to Assets/Editor/Objects/T.cgf
diff --git a/Editor/Objects/Vis.cgf b/Assets/Editor/Objects/Vis.cgf
similarity index 100%
rename from Editor/Objects/Vis.cgf
rename to Assets/Editor/Objects/Vis.cgf
diff --git a/Editor/Objects/W.cgf b/Assets/Editor/Objects/W.cgf
similarity index 100%
rename from Editor/Objects/W.cgf
rename to Assets/Editor/Objects/W.cgf
diff --git a/Editor/Objects/ai_hide_point.cgf b/Assets/Editor/Objects/ai_hide_point.cgf
similarity index 100%
rename from Editor/Objects/ai_hide_point.cgf
rename to Assets/Editor/Objects/ai_hide_point.cgf
diff --git a/Editor/Objects/anchor.cgf b/Assets/Editor/Objects/anchor.cgf
similarity index 100%
rename from Editor/Objects/anchor.cgf
rename to Assets/Editor/Objects/anchor.cgf
diff --git a/Editor/Objects/assaultspawn.cgf b/Assets/Editor/Objects/assaultspawn.cgf
similarity index 100%
rename from Editor/Objects/assaultspawn.cgf
rename to Assets/Editor/Objects/assaultspawn.cgf
diff --git a/Editor/Objects/border.cgf b/Assets/Editor/Objects/border.cgf
similarity index 100%
rename from Editor/Objects/border.cgf
rename to Assets/Editor/Objects/border.cgf
diff --git a/Editor/Objects/box.cgf b/Assets/Editor/Objects/box.cgf
similarity index 100%
rename from Editor/Objects/box.cgf
rename to Assets/Editor/Objects/box.cgf
diff --git a/Editor/Objects/box_nodraw.cgf b/Assets/Editor/Objects/box_nodraw.cgf
similarity index 100%
rename from Editor/Objects/box_nodraw.cgf
rename to Assets/Editor/Objects/box_nodraw.cgf
diff --git a/Editor/Objects/buyzone.cgf b/Assets/Editor/Objects/buyzone.cgf
similarity index 100%
rename from Editor/Objects/buyzone.cgf
rename to Assets/Editor/Objects/buyzone.cgf
diff --git a/Editor/Objects/c2_car_jump_cross.cgf b/Assets/Editor/Objects/c2_car_jump_cross.cgf
similarity index 100%
rename from Editor/Objects/c2_car_jump_cross.cgf
rename to Assets/Editor/Objects/c2_car_jump_cross.cgf
diff --git a/Editor/Objects/c2_crawl_h150.cgf b/Assets/Editor/Objects/c2_crawl_h150.cgf
similarity index 100%
rename from Editor/Objects/c2_crawl_h150.cgf
rename to Assets/Editor/Objects/c2_crawl_h150.cgf
diff --git a/Editor/Objects/c2_duck_v125.cgf b/Assets/Editor/Objects/c2_duck_v125.cgf
similarity index 100%
rename from Editor/Objects/c2_duck_v125.cgf
rename to Assets/Editor/Objects/c2_duck_v125.cgf
diff --git a/Editor/Objects/c2_jump_h1200.cgf b/Assets/Editor/Objects/c2_jump_h1200.cgf
similarity index 100%
rename from Editor/Objects/c2_jump_h1200.cgf
rename to Assets/Editor/Objects/c2_jump_h1200.cgf
diff --git a/Editor/Objects/c2_jump_h500.cgf b/Assets/Editor/Objects/c2_jump_h500.cgf
similarity index 100%
rename from Editor/Objects/c2_jump_h500.cgf
rename to Assets/Editor/Objects/c2_jump_h500.cgf
diff --git a/Editor/Objects/c2_jump_h900.cgf b/Assets/Editor/Objects/c2_jump_h900.cgf
similarity index 100%
rename from Editor/Objects/c2_jump_h900.cgf
rename to Assets/Editor/Objects/c2_jump_h900.cgf
diff --git a/Editor/Objects/c2_jump_h900_v150.cgf b/Assets/Editor/Objects/c2_jump_h900_v150.cgf
similarity index 100%
rename from Editor/Objects/c2_jump_h900_v150.cgf
rename to Assets/Editor/Objects/c2_jump_h900_v150.cgf
diff --git a/Editor/Objects/c2_jump_v150.cgf b/Assets/Editor/Objects/c2_jump_v150.cgf
similarity index 100%
rename from Editor/Objects/c2_jump_v150.cgf
rename to Assets/Editor/Objects/c2_jump_v150.cgf
diff --git a/Editor/Objects/c2_jump_v300.cgf b/Assets/Editor/Objects/c2_jump_v300.cgf
similarity index 100%
rename from Editor/Objects/c2_jump_v300.cgf
rename to Assets/Editor/Objects/c2_jump_v300.cgf
diff --git a/Editor/Objects/c2_jump_v450.cgf b/Assets/Editor/Objects/c2_jump_v450.cgf
similarity index 100%
rename from Editor/Objects/c2_jump_v450.cgf
rename to Assets/Editor/Objects/c2_jump_v450.cgf
diff --git a/Editor/Objects/c2_jumpdown_v900.cgf b/Assets/Editor/Objects/c2_jumpdown_v900.cgf
similarity index 100%
rename from Editor/Objects/c2_jumpdown_v900.cgf
rename to Assets/Editor/Objects/c2_jumpdown_v900.cgf
diff --git a/Editor/Objects/c2_jumpwindow_combo_v550.cgf b/Assets/Editor/Objects/c2_jumpwindow_combo_v550.cgf
similarity index 100%
rename from Editor/Objects/c2_jumpwindow_combo_v550.cgf
rename to Assets/Editor/Objects/c2_jumpwindow_combo_v550.cgf
diff --git a/Editor/Objects/c2_jumpwindow_v550.cgf b/Assets/Editor/Objects/c2_jumpwindow_v550.cgf
similarity index 100%
rename from Editor/Objects/c2_jumpwindow_v550.cgf
rename to Assets/Editor/Objects/c2_jumpwindow_v550.cgf
diff --git a/Editor/Objects/c2_jumpzigzag_v300_v750_lft.cgf b/Assets/Editor/Objects/c2_jumpzigzag_v300_v750_lft.cgf
similarity index 100%
rename from Editor/Objects/c2_jumpzigzag_v300_v750_lft.cgf
rename to Assets/Editor/Objects/c2_jumpzigzag_v300_v750_lft.cgf
diff --git a/Editor/Objects/c2_jumpzigzag_v300_v750_rgt.cgf b/Assets/Editor/Objects/c2_jumpzigzag_v300_v750_rgt.cgf
similarity index 100%
rename from Editor/Objects/c2_jumpzigzag_v300_v750_rgt.cgf
rename to Assets/Editor/Objects/c2_jumpzigzag_v300_v750_rgt.cgf
diff --git a/Editor/Objects/c2_slide_h400.cgf b/Assets/Editor/Objects/c2_slide_h400.cgf
similarity index 100%
rename from Editor/Objects/c2_slide_h400.cgf
rename to Assets/Editor/Objects/c2_slide_h400.cgf
diff --git a/Editor/Objects/c2_slidedown_v1800.cgf b/Assets/Editor/Objects/c2_slidedown_v1800.cgf
similarity index 100%
rename from Editor/Objects/c2_slidedown_v1800.cgf
rename to Assets/Editor/Objects/c2_slidedown_v1800.cgf
diff --git a/Editor/Objects/c2_vault_v125.cgf b/Assets/Editor/Objects/c2_vault_v125.cgf
similarity index 100%
rename from Editor/Objects/c2_vault_v125.cgf
rename to Assets/Editor/Objects/c2_vault_v125.cgf
diff --git a/Editor/Objects/c2_vault_v800.cgf b/Assets/Editor/Objects/c2_vault_v800.cgf
similarity index 100%
rename from Editor/Objects/c2_vault_v800.cgf
rename to Assets/Editor/Objects/c2_vault_v800.cgf
diff --git a/Editor/Objects/c2_wall_jump_h900_v450.cgf b/Assets/Editor/Objects/c2_wall_jump_h900_v450.cgf
similarity index 100%
rename from Editor/Objects/c2_wall_jump_h900_v450.cgf
rename to Assets/Editor/Objects/c2_wall_jump_h900_v450.cgf
diff --git a/Editor/Objects/c2_wall_run_h900_v300.cgf b/Assets/Editor/Objects/c2_wall_run_h900_v300.cgf
similarity index 100%
rename from Editor/Objects/c2_wall_run_h900_v300.cgf
rename to Assets/Editor/Objects/c2_wall_run_h900_v300.cgf
diff --git a/Editor/Objects/c3_dive_h900.cgf b/Assets/Editor/Objects/c3_dive_h900.cgf
similarity index 100%
rename from Editor/Objects/c3_dive_h900.cgf
rename to Assets/Editor/Objects/c3_dive_h900.cgf
diff --git a/Editor/Objects/c3_doorbreak_human.cgf b/Assets/Editor/Objects/c3_doorbreak_human.cgf
similarity index 100%
rename from Editor/Objects/c3_doorbreak_human.cgf
rename to Assets/Editor/Objects/c3_doorbreak_human.cgf
diff --git a/Editor/Objects/c3_doorframe.cgf b/Assets/Editor/Objects/c3_doorframe.cgf
similarity index 100%
rename from Editor/Objects/c3_doorframe.cgf
rename to Assets/Editor/Objects/c3_doorframe.cgf
diff --git a/Editor/Objects/c3_jump_v150_large.cgf b/Assets/Editor/Objects/c3_jump_v150_large.cgf
similarity index 100%
rename from Editor/Objects/c3_jump_v150_large.cgf
rename to Assets/Editor/Objects/c3_jump_v150_large.cgf
diff --git a/Editor/Objects/c3_jump_v300_large.cgf b/Assets/Editor/Objects/c3_jump_v300_large.cgf
similarity index 100%
rename from Editor/Objects/c3_jump_v300_large.cgf
rename to Assets/Editor/Objects/c3_jump_v300_large.cgf
diff --git a/Editor/Objects/c3_jump_v450_large.cgf b/Assets/Editor/Objects/c3_jump_v450_large.cgf
similarity index 100%
rename from Editor/Objects/c3_jump_v450_large.cgf
rename to Assets/Editor/Objects/c3_jump_v450_large.cgf
diff --git a/Editor/Objects/c3_repeldown_v2600.cgf b/Assets/Editor/Objects/c3_repeldown_v2600.cgf
similarity index 100%
rename from Editor/Objects/c3_repeldown_v2600.cgf
rename to Assets/Editor/Objects/c3_repeldown_v2600.cgf
diff --git a/Editor/Objects/c3_repeldown_v900.cgf b/Assets/Editor/Objects/c3_repeldown_v900.cgf
similarity index 100%
rename from Editor/Objects/c3_repeldown_v900.cgf
rename to Assets/Editor/Objects/c3_repeldown_v900.cgf
diff --git a/Editor/Objects/c3_so_cornerPopOutSearchLeft.cgf b/Assets/Editor/Objects/c3_so_cornerPopOutSearchLeft.cgf
similarity index 100%
rename from Editor/Objects/c3_so_cornerPopOutSearchLeft.cgf
rename to Assets/Editor/Objects/c3_so_cornerPopOutSearchLeft.cgf
diff --git a/Editor/Objects/c3_so_cornerPopOutSearchRight.cgf b/Assets/Editor/Objects/c3_so_cornerPopOutSearchRight.cgf
similarity index 100%
rename from Editor/Objects/c3_so_cornerPopOutSearchRight.cgf
rename to Assets/Editor/Objects/c3_so_cornerPopOutSearchRight.cgf
diff --git a/Editor/Objects/c3_vault_v125_large.cgf b/Assets/Editor/Objects/c3_vault_v125_large.cgf
similarity index 100%
rename from Editor/Objects/c3_vault_v125_large.cgf
rename to Assets/Editor/Objects/c3_vault_v125_large.cgf
diff --git a/Editor/Objects/c3_zipline_7500_15.cgf b/Assets/Editor/Objects/c3_zipline_7500_15.cgf
similarity index 100%
rename from Editor/Objects/c3_zipline_7500_15.cgf
rename to Assets/Editor/Objects/c3_zipline_7500_15.cgf
diff --git a/Editor/Objects/collision_dummy_100x50.cgf b/Assets/Editor/Objects/collision_dummy_100x50.cgf
similarity index 100%
rename from Editor/Objects/collision_dummy_100x50.cgf
rename to Assets/Editor/Objects/collision_dummy_100x50.cgf
diff --git a/Editor/Objects/collision_dummy_25x50.cgf b/Assets/Editor/Objects/collision_dummy_25x50.cgf
similarity index 100%
rename from Editor/Objects/collision_dummy_25x50.cgf
rename to Assets/Editor/Objects/collision_dummy_25x50.cgf
diff --git a/Editor/Objects/collision_dummy_50x50.cgf b/Assets/Editor/Objects/collision_dummy_50x50.cgf
similarity index 100%
rename from Editor/Objects/collision_dummy_50x50.cgf
rename to Assets/Editor/Objects/collision_dummy_50x50.cgf
diff --git a/Editor/Objects/corner270.cgf b/Assets/Editor/Objects/corner270.cgf
similarity index 100%
rename from Editor/Objects/corner270.cgf
rename to Assets/Editor/Objects/corner270.cgf
diff --git a/Editor/Objects/editor_helpers.max b/Assets/Editor/Objects/editor_helpers.max
similarity index 100%
rename from Editor/Objects/editor_helpers.max
rename to Assets/Editor/Objects/editor_helpers.max
diff --git a/Editor/Objects/energypoint.cgf b/Assets/Editor/Objects/energypoint.cgf
similarity index 100%
rename from Editor/Objects/energypoint.cgf
rename to Assets/Editor/Objects/energypoint.cgf
diff --git a/Editor/Objects/entrypoint.cgf b/Assets/Editor/Objects/entrypoint.cgf
similarity index 100%
rename from Editor/Objects/entrypoint.cgf
rename to Assets/Editor/Objects/entrypoint.cgf
diff --git a/Editor/Objects/envcube.cgf b/Assets/Editor/Objects/envcube.cgf
similarity index 100%
rename from Editor/Objects/envcube.cgf
rename to Assets/Editor/Objects/envcube.cgf
diff --git a/Editor/Objects/envcube.max b/Assets/Editor/Objects/envcube.max
similarity index 100%
rename from Editor/Objects/envcube.max
rename to Assets/Editor/Objects/envcube.max
diff --git a/Editor/Objects/envcube.mtl b/Assets/Editor/Objects/envcube.mtl
similarity index 100%
rename from Editor/Objects/envcube.mtl
rename to Assets/Editor/Objects/envcube.mtl
diff --git a/Editor/Objects/factory.cgf b/Assets/Editor/Objects/factory.cgf
similarity index 100%
rename from Editor/Objects/factory.cgf
rename to Assets/Editor/Objects/factory.cgf
diff --git a/Editor/Objects/flock.cgf b/Assets/Editor/Objects/flock.cgf
similarity index 100%
rename from Editor/Objects/flock.cgf
rename to Assets/Editor/Objects/flock.cgf
diff --git a/Editor/Objects/forbiddenarea.cgf b/Assets/Editor/Objects/forbiddenarea.cgf
similarity index 100%
rename from Editor/Objects/forbiddenarea.cgf
rename to Assets/Editor/Objects/forbiddenarea.cgf
diff --git a/Editor/Objects/gradb.dds b/Assets/Editor/Objects/gradb.dds
similarity index 100%
rename from Editor/Objects/gradb.dds
rename to Assets/Editor/Objects/gradb.dds
diff --git a/Editor/Objects/gradf.dds b/Assets/Editor/Objects/gradf.dds
similarity index 100%
rename from Editor/Objects/gradf.dds
rename to Assets/Editor/Objects/gradf.dds
diff --git a/Editor/Objects/helper.mtl b/Assets/Editor/Objects/helper.mtl
similarity index 100%
rename from Editor/Objects/helper.mtl
rename to Assets/Editor/Objects/helper.mtl
diff --git a/Editor/Objects/helper_illum.mtl b/Assets/Editor/Objects/helper_illum.mtl
similarity index 100%
rename from Editor/Objects/helper_illum.mtl
rename to Assets/Editor/Objects/helper_illum.mtl
diff --git a/Editor/Objects/hidepoint.cgf b/Assets/Editor/Objects/hidepoint.cgf
similarity index 100%
rename from Editor/Objects/hidepoint.cgf
rename to Assets/Editor/Objects/hidepoint.cgf
diff --git a/Editor/Objects/hidepoint_sec.cgf b/Assets/Editor/Objects/hidepoint_sec.cgf
similarity index 100%
rename from Editor/Objects/hidepoint_sec.cgf
rename to Assets/Editor/Objects/hidepoint_sec.cgf
diff --git a/Editor/Objects/highvault.cgf b/Assets/Editor/Objects/highvault.cgf
similarity index 100%
rename from Editor/Objects/highvault.cgf
rename to Assets/Editor/Objects/highvault.cgf
diff --git a/Editor/Objects/hq.cgf b/Assets/Editor/Objects/hq.cgf
similarity index 100%
rename from Editor/Objects/hq.cgf
rename to Assets/Editor/Objects/hq.cgf
diff --git a/Editor/Objects/invisiblebox.cgf b/Assets/Editor/Objects/invisiblebox.cgf
similarity index 100%
rename from Editor/Objects/invisiblebox.cgf
rename to Assets/Editor/Objects/invisiblebox.cgf
diff --git a/Editor/Objects/invisibleobstruct.cgf b/Assets/Editor/Objects/invisibleobstruct.cgf
similarity index 100%
rename from Editor/Objects/invisibleobstruct.cgf
rename to Assets/Editor/Objects/invisibleobstruct.cgf
diff --git a/Editor/Objects/invisibleocclude.cgf b/Assets/Editor/Objects/invisibleocclude.cgf
similarity index 100%
rename from Editor/Objects/invisibleocclude.cgf
rename to Assets/Editor/Objects/invisibleocclude.cgf
diff --git a/Editor/Objects/invisiblewall.cgf b/Assets/Editor/Objects/invisiblewall.cgf
similarity index 100%
rename from Editor/Objects/invisiblewall.cgf
rename to Assets/Editor/Objects/invisiblewall.cgf
diff --git a/Editor/Objects/jump_150.cgf b/Assets/Editor/Objects/jump_150.cgf
similarity index 100%
rename from Editor/Objects/jump_150.cgf
rename to Assets/Editor/Objects/jump_150.cgf
diff --git a/Editor/Objects/jump_300.cgf b/Assets/Editor/Objects/jump_300.cgf
similarity index 100%
rename from Editor/Objects/jump_300.cgf
rename to Assets/Editor/Objects/jump_300.cgf
diff --git a/Editor/Objects/jump_450.cgf b/Assets/Editor/Objects/jump_450.cgf
similarity index 100%
rename from Editor/Objects/jump_450.cgf
rename to Assets/Editor/Objects/jump_450.cgf
diff --git a/Editor/Objects/leap_1000.cgf b/Assets/Editor/Objects/leap_1000.cgf
similarity index 100%
rename from Editor/Objects/leap_1000.cgf
rename to Assets/Editor/Objects/leap_1000.cgf
diff --git a/Editor/Objects/leap_500.cgf b/Assets/Editor/Objects/leap_500.cgf
similarity index 100%
rename from Editor/Objects/leap_500.cgf
rename to Assets/Editor/Objects/leap_500.cgf
diff --git a/Editor/Objects/light_omni.cgf b/Assets/Editor/Objects/light_omni.cgf
similarity index 100%
rename from Editor/Objects/light_omni.cgf
rename to Assets/Editor/Objects/light_omni.cgf
diff --git a/Editor/Objects/light_spot.cgf b/Assets/Editor/Objects/light_spot.cgf
similarity index 100%
rename from Editor/Objects/light_spot.cgf
rename to Assets/Editor/Objects/light_spot.cgf
diff --git a/Editor/Objects/lightsphere.cgf b/Assets/Editor/Objects/lightsphere.cgf
similarity index 100%
rename from Editor/Objects/lightsphere.cgf
rename to Assets/Editor/Objects/lightsphere.cgf
diff --git a/Editor/Objects/measurehelper_A.cgf b/Assets/Editor/Objects/measurehelper_A.cgf
similarity index 100%
rename from Editor/Objects/measurehelper_A.cgf
rename to Assets/Editor/Objects/measurehelper_A.cgf
diff --git a/Editor/Objects/measurehelper_B.cgf b/Assets/Editor/Objects/measurehelper_B.cgf
similarity index 100%
rename from Editor/Objects/measurehelper_B.cgf
rename to Assets/Editor/Objects/measurehelper_B.cgf
diff --git a/Editor/Objects/mtlbox.mtl b/Assets/Editor/Objects/mtlbox.mtl
similarity index 100%
rename from Editor/Objects/mtlbox.mtl
rename to Assets/Editor/Objects/mtlbox.mtl
diff --git a/Editor/Objects/mtlobjects.mtl b/Assets/Editor/Objects/mtlobjects.mtl
similarity index 100%
rename from Editor/Objects/mtlobjects.mtl
rename to Assets/Editor/Objects/mtlobjects.mtl
diff --git a/Editor/Objects/objective.cgf b/Assets/Editor/Objects/objective.cgf
similarity index 100%
rename from Editor/Objects/objective.cgf
rename to Assets/Editor/Objects/objective.cgf
diff --git a/Editor/Objects/phoenix.cgf b/Assets/Editor/Objects/phoenix.cgf
similarity index 100%
rename from Editor/Objects/phoenix.cgf
rename to Assets/Editor/Objects/phoenix.cgf
diff --git a/Editor/Objects/refpicture.cgf b/Assets/Editor/Objects/refpicture.cgf
similarity index 100%
rename from Editor/Objects/refpicture.cgf
rename to Assets/Editor/Objects/refpicture.cgf
diff --git a/Editor/Objects/refpicture.max b/Assets/Editor/Objects/refpicture.max
similarity index 100%
rename from Editor/Objects/refpicture.max
rename to Assets/Editor/Objects/refpicture.max
diff --git a/Editor/Objects/reinforcement_point.cgf b/Assets/Editor/Objects/reinforcement_point.cgf
similarity index 100%
rename from Editor/Objects/reinforcement_point.cgf
rename to Assets/Editor/Objects/reinforcement_point.cgf
diff --git a/Editor/Objects/smartobject_helper.max b/Assets/Editor/Objects/smartobject_helper.max
similarity index 100%
rename from Editor/Objects/smartobject_helper.max
rename to Assets/Editor/Objects/smartobject_helper.max
diff --git a/Editor/Objects/spawngroup.cgf b/Assets/Editor/Objects/spawngroup.cgf
similarity index 100%
rename from Editor/Objects/spawngroup.cgf
rename to Assets/Editor/Objects/spawngroup.cgf
diff --git a/Editor/Objects/spawnpointhelper.cgf b/Assets/Editor/Objects/spawnpointhelper.cgf
similarity index 100%
rename from Editor/Objects/spawnpointhelper.cgf
rename to Assets/Editor/Objects/spawnpointhelper.cgf
diff --git a/Editor/Objects/spawnpointhelper.mtl b/Assets/Editor/Objects/spawnpointhelper.mtl
similarity index 100%
rename from Editor/Objects/spawnpointhelper.mtl
rename to Assets/Editor/Objects/spawnpointhelper.mtl
diff --git a/Editor/Objects/stayOnWallFire_left.cgf b/Assets/Editor/Objects/stayOnWallFire_left.cgf
similarity index 100%
rename from Editor/Objects/stayOnWallFire_left.cgf
rename to Assets/Editor/Objects/stayOnWallFire_left.cgf
diff --git a/Editor/Objects/suit_jump_300.cgf b/Assets/Editor/Objects/suit_jump_300.cgf
similarity index 100%
rename from Editor/Objects/suit_jump_300.cgf
rename to Assets/Editor/Objects/suit_jump_300.cgf
diff --git a/Editor/Objects/suit_jump_800.cgf b/Assets/Editor/Objects/suit_jump_800.cgf
similarity index 100%
rename from Editor/Objects/suit_jump_800.cgf
rename to Assets/Editor/Objects/suit_jump_800.cgf
diff --git a/Editor/Objects/suit_leap_800.cgf b/Assets/Editor/Objects/suit_leap_800.cgf
similarity index 100%
rename from Editor/Objects/suit_leap_800.cgf
rename to Assets/Editor/Objects/suit_leap_800.cgf
diff --git a/Editor/Plugins/ParticleEditorPlugin/defaults/DefaultParticleEmitters.xml b/Assets/Editor/Plugins/ParticleEditorPlugin/defaults/DefaultParticleEmitters.xml
similarity index 100%
rename from Editor/Plugins/ParticleEditorPlugin/defaults/DefaultParticleEmitters.xml
rename to Assets/Editor/Plugins/ParticleEditorPlugin/defaults/DefaultParticleEmitters.xml
diff --git a/Editor/Plugins/ParticleEditorPlugin/defaults/defaultParticle.dds b/Assets/Editor/Plugins/ParticleEditorPlugin/defaults/defaultParticle.dds
similarity index 100%
rename from Editor/Plugins/ParticleEditorPlugin/defaults/defaultParticle.dds
rename to Assets/Editor/Plugins/ParticleEditorPlugin/defaults/defaultParticle.dds
diff --git a/Editor/Plugins/ParticleEditorPlugin/defaults/feather01.tif b/Assets/Editor/Plugins/ParticleEditorPlugin/defaults/feather01.tif
similarity index 100%
rename from Editor/Plugins/ParticleEditorPlugin/defaults/feather01.tif
rename to Assets/Editor/Plugins/ParticleEditorPlugin/defaults/feather01.tif
diff --git a/Editor/Plugins/ParticleEditorPlugin/defaults/puffup01.tif b/Assets/Editor/Plugins/ParticleEditorPlugin/defaults/puffup01.tif
similarity index 100%
rename from Editor/Plugins/ParticleEditorPlugin/defaults/puffup01.tif
rename to Assets/Editor/Plugins/ParticleEditorPlugin/defaults/puffup01.tif
diff --git a/Editor/Plugins/ParticleEditorPlugin/settings/ToolTips.xml b/Assets/Editor/Plugins/ParticleEditorPlugin/settings/ToolTips.xml
similarity index 100%
rename from Editor/Plugins/ParticleEditorPlugin/settings/ToolTips.xml
rename to Assets/Editor/Plugins/ParticleEditorPlugin/settings/ToolTips.xml
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Left.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Left.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Left.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Left.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_TopLeft.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_TopLeft.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_TopLeft.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_TopLeft.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Whole.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Whole.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Whole.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Anchor_Whole.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Selected.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Selected.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Selected.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Selected.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Unselected.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Unselected.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Unselected.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Border_Unselected.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Canvas_Background.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Canvas_Background.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Canvas_Background.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Canvas_Background.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/DottedLine.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/DottedLine.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/DottedLine.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/DottedLine.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Pivot.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Pivot.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Pivot.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Pivot.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Center_Square.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Center_Square.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Center_Square.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Center_Square.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Circle.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Circle.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Circle.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Circle.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_X.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_X.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_X.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_X.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_Y.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_Y.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_Y.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Square_Y.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_X.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_X.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_X.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_X.tif
diff --git a/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_Y.tif b/Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_Y.tif
similarity index 100%
rename from Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_Y.tif
rename to Assets/Editor/Plugins/UiCanvasEditor/CanvasIcons/Transform_Gizmo_Line_Triangle_Y.tif
diff --git a/Editor/Presets/MobileSettings/GPUAndDriverLists.json b/Assets/Editor/Presets/MobileSettings/GPUAndDriverLists.json
similarity index 100%
rename from Editor/Presets/MobileSettings/GPUAndDriverLists.json
rename to Assets/Editor/Presets/MobileSettings/GPUAndDriverLists.json
diff --git a/Editor/Presets/MobileSettings/IPhone7.lms b/Assets/Editor/Presets/MobileSettings/IPhone7.lms
similarity index 100%
rename from Editor/Presets/MobileSettings/IPhone7.lms
rename to Assets/Editor/Presets/MobileSettings/IPhone7.lms
diff --git a/Editor/Presets/MobileSettings/IpadPro.lms b/Assets/Editor/Presets/MobileSettings/IpadPro.lms
similarity index 100%
rename from Editor/Presets/MobileSettings/IpadPro.lms
rename to Assets/Editor/Presets/MobileSettings/IpadPro.lms
diff --git a/Editor/Presets/MobileSettings/MobileFeatureBlackList.json b/Assets/Editor/Presets/MobileSettings/MobileFeatureBlackList.json
similarity index 100%
rename from Editor/Presets/MobileSettings/MobileFeatureBlackList.json
rename to Assets/Editor/Presets/MobileSettings/MobileFeatureBlackList.json
diff --git a/Editor/Presets/MobileSettings/Nexus9.lms b/Assets/Editor/Presets/MobileSettings/Nexus9.lms
similarity index 100%
rename from Editor/Presets/MobileSettings/Nexus9.lms
rename to Assets/Editor/Presets/MobileSettings/Nexus9.lms
diff --git a/Editor/Presets/MobileSettings/SamsungGalaxyS7_Mali.lms b/Assets/Editor/Presets/MobileSettings/SamsungGalaxyS7_Mali.lms
similarity index 100%
rename from Editor/Presets/MobileSettings/SamsungGalaxyS7_Mali.lms
rename to Assets/Editor/Presets/MobileSettings/SamsungGalaxyS7_Mali.lms
diff --git a/Editor/Presets/MobileSettings/SamsungGalaxyS7_Qualcomm.lms b/Assets/Editor/Presets/MobileSettings/SamsungGalaxyS7_Qualcomm.lms
similarity index 100%
rename from Editor/Presets/MobileSettings/SamsungGalaxyS7_Qualcomm.lms
rename to Assets/Editor/Presets/MobileSettings/SamsungGalaxyS7_Qualcomm.lms
diff --git a/Editor/PropertyEnumerations.xml b/Assets/Editor/PropertyEnumerations.xml
similarity index 100%
rename from Editor/PropertyEnumerations.xml
rename to Assets/Editor/PropertyEnumerations.xml
diff --git a/Editor/Scripts/Shelves/icons/Albedo.png b/Assets/Editor/Scripts/Shelves/icons/Albedo.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Albedo.png
rename to Assets/Editor/Scripts/Shelves/icons/Albedo.png
diff --git a/Editor/Scripts/Shelves/icons/Diffuse_Lighting.png b/Assets/Editor/Scripts/Shelves/icons/Diffuse_Lighting.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Diffuse_Lighting.png
rename to Assets/Editor/Scripts/Shelves/icons/Diffuse_Lighting.png
diff --git a/Editor/Scripts/Shelves/icons/Diffuse_Texture_Res_360.png b/Assets/Editor/Scripts/Shelves/icons/Diffuse_Texture_Res_360.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Diffuse_Texture_Res_360.png
rename to Assets/Editor/Scripts/Shelves/icons/Diffuse_Texture_Res_360.png
diff --git a/Editor/Scripts/Shelves/icons/Empty_Wireframe.png b/Assets/Editor/Scripts/Shelves/icons/Empty_Wireframe.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Empty_Wireframe.png
rename to Assets/Editor/Scripts/Shelves/icons/Empty_Wireframe.png
diff --git a/Editor/Scripts/Shelves/icons/Exit.png b/Assets/Editor/Scripts/Shelves/icons/Exit.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Exit.png
rename to Assets/Editor/Scripts/Shelves/icons/Exit.png
diff --git a/Editor/Scripts/Shelves/icons/Fuzziness.png b/Assets/Editor/Scripts/Shelves/icons/Fuzziness.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Fuzziness.png
rename to Assets/Editor/Scripts/Shelves/icons/Fuzziness.png
diff --git a/Editor/Scripts/Shelves/icons/Gloss.png b/Assets/Editor/Scripts/Shelves/icons/Gloss.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Gloss.png
rename to Assets/Editor/Scripts/Shelves/icons/Gloss.png
diff --git a/Editor/Scripts/Shelves/icons/Normal_Texture_Res_360.png b/Assets/Editor/Scripts/Shelves/icons/Normal_Texture_Res_360.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Normal_Texture_Res_360.png
rename to Assets/Editor/Scripts/Shelves/icons/Normal_Texture_Res_360.png
diff --git a/Editor/Scripts/Shelves/icons/PrefabAddLibrary.png b/Assets/Editor/Scripts/Shelves/icons/PrefabAddLibrary.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/PrefabAddLibrary.png
rename to Assets/Editor/Scripts/Shelves/icons/PrefabAddLibrary.png
diff --git a/Editor/Scripts/Shelves/icons/PrefabAddSelection.png b/Assets/Editor/Scripts/Shelves/icons/PrefabAddSelection.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/PrefabAddSelection.png
rename to Assets/Editor/Scripts/Shelves/icons/PrefabAddSelection.png
diff --git a/Editor/Scripts/Shelves/icons/PrefabBreak.png b/Assets/Editor/Scripts/Shelves/icons/PrefabBreak.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/PrefabBreak.png
rename to Assets/Editor/Scripts/Shelves/icons/PrefabBreak.png
diff --git a/Editor/Scripts/Shelves/icons/PrefabConvert.png b/Assets/Editor/Scripts/Shelves/icons/PrefabConvert.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/PrefabConvert.png
rename to Assets/Editor/Scripts/Shelves/icons/PrefabConvert.png
diff --git a/Editor/Scripts/Shelves/icons/PrefabCreate.png b/Assets/Editor/Scripts/Shelves/icons/PrefabCreate.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/PrefabCreate.png
rename to Assets/Editor/Scripts/Shelves/icons/PrefabCreate.png
diff --git a/Editor/Scripts/Shelves/icons/PrefabIsolate.png b/Assets/Editor/Scripts/Shelves/icons/PrefabIsolate.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/PrefabIsolate.png
rename to Assets/Editor/Scripts/Shelves/icons/PrefabIsolate.png
diff --git a/Editor/Scripts/Shelves/icons/Scattering.png b/Assets/Editor/Scripts/Shelves/icons/Scattering.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Scattering.png
rename to Assets/Editor/Scripts/Shelves/icons/Scattering.png
diff --git a/Editor/Scripts/Shelves/icons/Solid_Wireframe.png b/Assets/Editor/Scripts/Shelves/icons/Solid_Wireframe.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Solid_Wireframe.png
rename to Assets/Editor/Scripts/Shelves/icons/Solid_Wireframe.png
diff --git a/Editor/Scripts/Shelves/icons/Spec_Amount.png b/Assets/Editor/Scripts/Shelves/icons/Spec_Amount.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Spec_Amount.png
rename to Assets/Editor/Scripts/Shelves/icons/Spec_Amount.png
diff --git a/Editor/Scripts/Shelves/icons/Spec_Lighting.png b/Assets/Editor/Scripts/Shelves/icons/Spec_Lighting.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Spec_Lighting.png
rename to Assets/Editor/Scripts/Shelves/icons/Spec_Lighting.png
diff --git a/Editor/Scripts/Shelves/icons/Texel_Per_Meter_1024.png b/Assets/Editor/Scripts/Shelves/icons/Texel_Per_Meter_1024.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Texel_Per_Meter_1024.png
rename to Assets/Editor/Scripts/Shelves/icons/Texel_Per_Meter_1024.png
diff --git a/Editor/Scripts/Shelves/icons/Texel_Per_Meter_256.png b/Assets/Editor/Scripts/Shelves/icons/Texel_Per_Meter_256.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Texel_Per_Meter_256.png
rename to Assets/Editor/Scripts/Shelves/icons/Texel_Per_Meter_256.png
diff --git a/Editor/Scripts/Shelves/icons/Texel_Per_Meter_512.png b/Assets/Editor/Scripts/Shelves/icons/Texel_Per_Meter_512.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/Texel_Per_Meter_512.png
rename to Assets/Editor/Scripts/Shelves/icons/Texel_Per_Meter_512.png
diff --git a/Editor/Scripts/Shelves/icons/all.png b/Assets/Editor/Scripts/Shelves/icons/all.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/all.png
rename to Assets/Editor/Scripts/Shelves/icons/all.png
diff --git a/Editor/Scripts/Shelves/icons/beams.png b/Assets/Editor/Scripts/Shelves/icons/beams.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/beams.png
rename to Assets/Editor/Scripts/Shelves/icons/beams.png
diff --git a/Editor/Scripts/Shelves/icons/blanker.png b/Assets/Editor/Scripts/Shelves/icons/blanker.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/blanker.png
rename to Assets/Editor/Scripts/Shelves/icons/blanker.png
diff --git a/Editor/Scripts/Shelves/icons/bounding_box.png b/Assets/Editor/Scripts/Shelves/icons/bounding_box.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/bounding_box.png
rename to Assets/Editor/Scripts/Shelves/icons/bounding_box.png
diff --git a/Editor/Scripts/Shelves/icons/brushes.png b/Assets/Editor/Scripts/Shelves/icons/brushes.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/brushes.png
rename to Assets/Editor/Scripts/Shelves/icons/brushes.png
diff --git a/Editor/Scripts/Shelves/icons/cloud.png b/Assets/Editor/Scripts/Shelves/icons/cloud.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/cloud.png
rename to Assets/Editor/Scripts/Shelves/icons/cloud.png
diff --git a/Editor/Scripts/Shelves/icons/cloud_dark.png b/Assets/Editor/Scripts/Shelves/icons/cloud_dark.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/cloud_dark.png
rename to Assets/Editor/Scripts/Shelves/icons/cloud_dark.png
diff --git a/Editor/Scripts/Shelves/icons/cloud_dark_rain.png b/Assets/Editor/Scripts/Shelves/icons/cloud_dark_rain.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/cloud_dark_rain.png
rename to Assets/Editor/Scripts/Shelves/icons/cloud_dark_rain.png
diff --git a/Editor/Scripts/Shelves/icons/collisions.png b/Assets/Editor/Scripts/Shelves/icons/collisions.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/collisions.png
rename to Assets/Editor/Scripts/Shelves/icons/collisions.png
diff --git a/Editor/Scripts/Shelves/icons/create_ao_volume_box.png b/Assets/Editor/Scripts/Shelves/icons/create_ao_volume_box.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/create_ao_volume_box.png
rename to Assets/Editor/Scripts/Shelves/icons/create_ao_volume_box.png
diff --git a/Editor/Scripts/Shelves/icons/create_both_vis_box_envprobe.png b/Assets/Editor/Scripts/Shelves/icons/create_both_vis_box_envprobe.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/create_both_vis_box_envprobe.png
rename to Assets/Editor/Scripts/Shelves/icons/create_both_vis_box_envprobe.png
diff --git a/Editor/Scripts/Shelves/icons/create_envprobe.png b/Assets/Editor/Scripts/Shelves/icons/create_envprobe.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/create_envprobe.png
rename to Assets/Editor/Scripts/Shelves/icons/create_envprobe.png
diff --git a/Editor/Scripts/Shelves/icons/create_portal_box.png b/Assets/Editor/Scripts/Shelves/icons/create_portal_box.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/create_portal_box.png
rename to Assets/Editor/Scripts/Shelves/icons/create_portal_box.png
diff --git a/Editor/Scripts/Shelves/icons/create_vis_box.png b/Assets/Editor/Scripts/Shelves/icons/create_vis_box.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/create_vis_box.png
rename to Assets/Editor/Scripts/Shelves/icons/create_vis_box.png
diff --git a/Editor/Scripts/Shelves/icons/create_vis_box_and_portal_box.png b/Assets/Editor/Scripts/Shelves/icons/create_vis_box_and_portal_box.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/create_vis_box_and_portal_box.png
rename to Assets/Editor/Scripts/Shelves/icons/create_vis_box_and_portal_box.png
diff --git a/Editor/Scripts/Shelves/icons/create_vis_box_env_probe_and_portal.png b/Assets/Editor/Scripts/Shelves/icons/create_vis_box_env_probe_and_portal.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/create_vis_box_env_probe_and_portal.png
rename to Assets/Editor/Scripts/Shelves/icons/create_vis_box_env_probe_and_portal.png
diff --git a/Editor/Scripts/Shelves/icons/cubemap.png b/Assets/Editor/Scripts/Shelves/icons/cubemap.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/cubemap.png
rename to Assets/Editor/Scripts/Shelves/icons/cubemap.png
diff --git a/Editor/Scripts/Shelves/icons/decals.png b/Assets/Editor/Scripts/Shelves/icons/decals.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/decals.png
rename to Assets/Editor/Scripts/Shelves/icons/decals.png
diff --git a/Editor/Scripts/Shelves/icons/default_material.png b/Assets/Editor/Scripts/Shelves/icons/default_material.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/default_material.png
rename to Assets/Editor/Scripts/Shelves/icons/default_material.png
diff --git a/Editor/Scripts/Shelves/icons/default_material_with_normals.png b/Assets/Editor/Scripts/Shelves/icons/default_material_with_normals.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/default_material_with_normals.png
rename to Assets/Editor/Scripts/Shelves/icons/default_material_with_normals.png
diff --git a/Editor/Scripts/Shelves/icons/designer.png b/Assets/Editor/Scripts/Shelves/icons/designer.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/designer.png
rename to Assets/Editor/Scripts/Shelves/icons/designer.png
diff --git a/Editor/Scripts/Shelves/icons/diff_acc.png b/Assets/Editor/Scripts/Shelves/icons/diff_acc.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/diff_acc.png
rename to Assets/Editor/Scripts/Shelves/icons/diff_acc.png
diff --git a/Editor/Scripts/Shelves/icons/display_info.png b/Assets/Editor/Scripts/Shelves/icons/display_info.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/display_info.png
rename to Assets/Editor/Scripts/Shelves/icons/display_info.png
diff --git a/Editor/Scripts/Shelves/icons/dual_layer_mask.png b/Assets/Editor/Scripts/Shelves/icons/dual_layer_mask.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/dual_layer_mask.png
rename to Assets/Editor/Scripts/Shelves/icons/dual_layer_mask.png
diff --git a/Editor/Scripts/Shelves/icons/dynamiclights.png b/Assets/Editor/Scripts/Shelves/icons/dynamiclights.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/dynamiclights.png
rename to Assets/Editor/Scripts/Shelves/icons/dynamiclights.png
diff --git a/Editor/Scripts/Shelves/icons/entities.png b/Assets/Editor/Scripts/Shelves/icons/entities.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/entities.png
rename to Assets/Editor/Scripts/Shelves/icons/entities.png
diff --git a/Editor/Scripts/Shelves/icons/eye_adaptation_speed.png b/Assets/Editor/Scripts/Shelves/icons/eye_adaptation_speed.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/eye_adaptation_speed.png
rename to Assets/Editor/Scripts/Shelves/icons/eye_adaptation_speed.png
diff --git a/Editor/Scripts/Shelves/icons/fog.png b/Assets/Editor/Scripts/Shelves/icons/fog.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/fog.png
rename to Assets/Editor/Scripts/Shelves/icons/fog.png
diff --git a/Editor/Scripts/Shelves/icons/fogvolumes.png b/Assets/Editor/Scripts/Shelves/icons/fogvolumes.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/fogvolumes.png
rename to Assets/Editor/Scripts/Shelves/icons/fogvolumes.png
diff --git a/Editor/Scripts/Shelves/icons/freeze_particles.png b/Assets/Editor/Scripts/Shelves/icons/freeze_particles.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/freeze_particles.png
rename to Assets/Editor/Scripts/Shelves/icons/freeze_particles.png
diff --git a/Editor/Scripts/Shelves/icons/full_shading.png b/Assets/Editor/Scripts/Shelves/icons/full_shading.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/full_shading.png
rename to Assets/Editor/Scripts/Shelves/icons/full_shading.png
diff --git a/Editor/Scripts/Shelves/icons/gamma.png b/Assets/Editor/Scripts/Shelves/icons/gamma.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/gamma.png
rename to Assets/Editor/Scripts/Shelves/icons/gamma.png
diff --git a/Editor/Scripts/Shelves/icons/gi.png b/Assets/Editor/Scripts/Shelves/icons/gi.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/gi.png
rename to Assets/Editor/Scripts/Shelves/icons/gi.png
diff --git a/Editor/Scripts/Shelves/icons/lens_flare.png b/Assets/Editor/Scripts/Shelves/icons/lens_flare.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/lens_flare.png
rename to Assets/Editor/Scripts/Shelves/icons/lens_flare.png
diff --git a/Editor/Scripts/Shelves/icons/lighting_only.png b/Assets/Editor/Scripts/Shelves/icons/lighting_only.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/lighting_only.png
rename to Assets/Editor/Scripts/Shelves/icons/lighting_only.png
diff --git a/Editor/Scripts/Shelves/icons/lods.png b/Assets/Editor/Scripts/Shelves/icons/lods.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/lods.png
rename to Assets/Editor/Scripts/Shelves/icons/lods.png
diff --git a/Editor/Scripts/Shelves/icons/lsao.png b/Assets/Editor/Scripts/Shelves/icons/lsao.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/lsao.png
rename to Assets/Editor/Scripts/Shelves/icons/lsao.png
diff --git a/Editor/Scripts/Shelves/icons/lsao_toggle.png b/Assets/Editor/Scripts/Shelves/icons/lsao_toggle.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/lsao_toggle.png
rename to Assets/Editor/Scripts/Shelves/icons/lsao_toggle.png
diff --git a/Editor/Scripts/Shelves/icons/lsro.png b/Assets/Editor/Scripts/Shelves/icons/lsro.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/lsro.png
rename to Assets/Editor/Scripts/Shelves/icons/lsro.png
diff --git a/Editor/Scripts/Shelves/icons/normals.png b/Assets/Editor/Scripts/Shelves/icons/normals.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/normals.png
rename to Assets/Editor/Scripts/Shelves/icons/normals.png
diff --git a/Editor/Scripts/Shelves/icons/normals_x.png b/Assets/Editor/Scripts/Shelves/icons/normals_x.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/normals_x.png
rename to Assets/Editor/Scripts/Shelves/icons/normals_x.png
diff --git a/Editor/Scripts/Shelves/icons/normals_y.png b/Assets/Editor/Scripts/Shelves/icons/normals_y.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/normals_y.png
rename to Assets/Editor/Scripts/Shelves/icons/normals_y.png
diff --git a/Editor/Scripts/Shelves/icons/normals_z.png b/Assets/Editor/Scripts/Shelves/icons/normals_z.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/normals_z.png
rename to Assets/Editor/Scripts/Shelves/icons/normals_z.png
diff --git a/Editor/Scripts/Shelves/icons/ocean.png b/Assets/Editor/Scripts/Shelves/icons/ocean.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/ocean.png
rename to Assets/Editor/Scripts/Shelves/icons/ocean.png
diff --git a/Editor/Scripts/Shelves/icons/particles.png b/Assets/Editor/Scripts/Shelves/icons/particles.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/particles.png
rename to Assets/Editor/Scripts/Shelves/icons/particles.png
diff --git a/Editor/Scripts/Shelves/icons/particles_bounds.png b/Assets/Editor/Scripts/Shelves/icons/particles_bounds.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/particles_bounds.png
rename to Assets/Editor/Scripts/Shelves/icons/particles_bounds.png
diff --git a/Editor/Scripts/Shelves/icons/particles_off.png b/Assets/Editor/Scripts/Shelves/icons/particles_off.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/particles_off.png
rename to Assets/Editor/Scripts/Shelves/icons/particles_off.png
diff --git a/Editor/Scripts/Shelves/icons/particles_overdraw.png b/Assets/Editor/Scripts/Shelves/icons/particles_overdraw.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/particles_overdraw.png
rename to Assets/Editor/Scripts/Shelves/icons/particles_overdraw.png
diff --git a/Editor/Scripts/Shelves/icons/particles_screen_coverage.png b/Assets/Editor/Scripts/Shelves/icons/particles_screen_coverage.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/particles_screen_coverage.png
rename to Assets/Editor/Scripts/Shelves/icons/particles_screen_coverage.png
diff --git a/Editor/Scripts/Shelves/icons/placeholder.png b/Assets/Editor/Scripts/Shelves/icons/placeholder.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/placeholder.png
rename to Assets/Editor/Scripts/Shelves/icons/placeholder.png
diff --git a/Editor/Scripts/Shelves/icons/prefab.png b/Assets/Editor/Scripts/Shelves/icons/prefab.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/prefab.png
rename to Assets/Editor/Scripts/Shelves/icons/prefab.png
diff --git a/Editor/Scripts/Shelves/icons/reflections.png b/Assets/Editor/Scripts/Shelves/icons/reflections.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/reflections.png
rename to Assets/Editor/Scripts/Shelves/icons/reflections.png
diff --git a/Editor/Scripts/Shelves/icons/reset.png b/Assets/Editor/Scripts/Shelves/icons/reset.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/reset.png
rename to Assets/Editor/Scripts/Shelves/icons/reset.png
diff --git a/Editor/Scripts/Shelves/icons/selfocc.png b/Assets/Editor/Scripts/Shelves/icons/selfocc.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/selfocc.png
rename to Assets/Editor/Scripts/Shelves/icons/selfocc.png
diff --git a/Editor/Scripts/Shelves/icons/shaded_wireframe.png b/Assets/Editor/Scripts/Shelves/icons/shaded_wireframe.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/shaded_wireframe.png
rename to Assets/Editor/Scripts/Shelves/icons/shaded_wireframe.png
diff --git a/Editor/Scripts/Shelves/icons/shadows.png b/Assets/Editor/Scripts/Shelves/icons/shadows.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/shadows.png
rename to Assets/Editor/Scripts/Shelves/icons/shadows.png
diff --git a/Editor/Scripts/Shelves/icons/showlines.png b/Assets/Editor/Scripts/Shelves/icons/showlines.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/showlines.png
rename to Assets/Editor/Scripts/Shelves/icons/showlines.png
diff --git a/Editor/Scripts/Shelves/icons/sky.png b/Assets/Editor/Scripts/Shelves/icons/sky.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/sky.png
rename to Assets/Editor/Scripts/Shelves/icons/sky.png
diff --git a/Editor/Scripts/Shelves/icons/spec_acc.png b/Assets/Editor/Scripts/Shelves/icons/spec_acc.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/spec_acc.png
rename to Assets/Editor/Scripts/Shelves/icons/spec_acc.png
diff --git a/Editor/Scripts/Shelves/icons/spec_lum.png b/Assets/Editor/Scripts/Shelves/icons/spec_lum.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/spec_lum.png
rename to Assets/Editor/Scripts/Shelves/icons/spec_lum.png
diff --git a/Editor/Scripts/Shelves/icons/spec_occ.png b/Assets/Editor/Scripts/Shelves/icons/spec_occ.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/spec_occ.png
rename to Assets/Editor/Scripts/Shelves/icons/spec_occ.png
diff --git a/Editor/Scripts/Shelves/icons/ssao.png b/Assets/Editor/Scripts/Shelves/icons/ssao.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/ssao.png
rename to Assets/Editor/Scripts/Shelves/icons/ssao.png
diff --git a/Editor/Scripts/Shelves/icons/ssdo.png b/Assets/Editor/Scripts/Shelves/icons/ssdo.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/ssdo.png
rename to Assets/Editor/Scripts/Shelves/icons/ssdo.png
diff --git a/Editor/Scripts/Shelves/icons/ssdo_toggle.png b/Assets/Editor/Scripts/Shelves/icons/ssdo_toggle.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/ssdo_toggle.png
rename to Assets/Editor/Scripts/Shelves/icons/ssdo_toggle.png
diff --git a/Editor/Scripts/Shelves/icons/sun.big.png b/Assets/Editor/Scripts/Shelves/icons/sun.big.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/sun.big.png
rename to Assets/Editor/Scripts/Shelves/icons/sun.big.png
diff --git a/Editor/Scripts/Shelves/icons/tangents.png b/Assets/Editor/Scripts/Shelves/icons/tangents.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/tangents.png
rename to Assets/Editor/Scripts/Shelves/icons/tangents.png
diff --git a/Editor/Scripts/Shelves/icons/terrain.png b/Assets/Editor/Scripts/Shelves/icons/terrain.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/terrain.png
rename to Assets/Editor/Scripts/Shelves/icons/terrain.png
diff --git a/Editor/Scripts/Shelves/icons/time_scale_double.png b/Assets/Editor/Scripts/Shelves/icons/time_scale_double.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/time_scale_double.png
rename to Assets/Editor/Scripts/Shelves/icons/time_scale_double.png
diff --git a/Editor/Scripts/Shelves/icons/time_scale_frozen.png b/Assets/Editor/Scripts/Shelves/icons/time_scale_frozen.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/time_scale_frozen.png
rename to Assets/Editor/Scripts/Shelves/icons/time_scale_frozen.png
diff --git a/Editor/Scripts/Shelves/icons/time_scale_half.png b/Assets/Editor/Scripts/Shelves/icons/time_scale_half.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/time_scale_half.png
rename to Assets/Editor/Scripts/Shelves/icons/time_scale_half.png
diff --git a/Editor/Scripts/Shelves/icons/time_scale_quarter.png b/Assets/Editor/Scripts/Shelves/icons/time_scale_quarter.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/time_scale_quarter.png
rename to Assets/Editor/Scripts/Shelves/icons/time_scale_quarter.png
diff --git a/Editor/Scripts/Shelves/icons/time_scale_tenth.png b/Assets/Editor/Scripts/Shelves/icons/time_scale_tenth.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/time_scale_tenth.png
rename to Assets/Editor/Scripts/Shelves/icons/time_scale_tenth.png
diff --git a/Editor/Scripts/Shelves/icons/tod.png b/Assets/Editor/Scripts/Shelves/icons/tod.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/tod.png
rename to Assets/Editor/Scripts/Shelves/icons/tod.png
diff --git a/Editor/Scripts/Shelves/icons/translucency.png b/Assets/Editor/Scripts/Shelves/icons/translucency.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/translucency.png
rename to Assets/Editor/Scripts/Shelves/icons/translucency.png
diff --git a/Editor/Scripts/Shelves/icons/transparency.png b/Assets/Editor/Scripts/Shelves/icons/transparency.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/transparency.png
rename to Assets/Editor/Scripts/Shelves/icons/transparency.png
diff --git a/Editor/Scripts/Shelves/icons/valid_albedo.png b/Assets/Editor/Scripts/Shelves/icons/valid_albedo.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/valid_albedo.png
rename to Assets/Editor/Scripts/Shelves/icons/valid_albedo.png
diff --git a/Editor/Scripts/Shelves/icons/valid_spec_lum.png b/Assets/Editor/Scripts/Shelves/icons/valid_spec_lum.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/valid_spec_lum.png
rename to Assets/Editor/Scripts/Shelves/icons/valid_spec_lum.png
diff --git a/Editor/Scripts/Shelves/icons/vegetation.png b/Assets/Editor/Scripts/Shelves/icons/vegetation.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/vegetation.png
rename to Assets/Editor/Scripts/Shelves/icons/vegetation.png
diff --git a/Editor/Scripts/Shelves/icons/vertex_normals.png b/Assets/Editor/Scripts/Shelves/icons/vertex_normals.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/vertex_normals.png
rename to Assets/Editor/Scripts/Shelves/icons/vertex_normals.png
diff --git a/Editor/Scripts/Shelves/icons/vis_area.png b/Assets/Editor/Scripts/Shelves/icons/vis_area.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/vis_area.png
rename to Assets/Editor/Scripts/Shelves/icons/vis_area.png
diff --git a/Editor/Scripts/Shelves/icons/water_volume.png b/Assets/Editor/Scripts/Shelves/icons/water_volume.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/water_volume.png
rename to Assets/Editor/Scripts/Shelves/icons/water_volume.png
diff --git a/Editor/Scripts/Shelves/icons/wind.png b/Assets/Editor/Scripts/Shelves/icons/wind.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/wind.png
rename to Assets/Editor/Scripts/Shelves/icons/wind.png
diff --git a/Editor/Scripts/Shelves/icons/wireframe.png b/Assets/Editor/Scripts/Shelves/icons/wireframe.png
similarity index 100%
rename from Editor/Scripts/Shelves/icons/wireframe.png
rename to Assets/Editor/Scripts/Shelves/icons/wireframe.png
diff --git a/Editor/Scripts/TrackView/example.py b/Assets/Editor/Scripts/TrackView/example.py
similarity index 100%
rename from Editor/Scripts/TrackView/example.py
rename to Assets/Editor/Scripts/TrackView/example.py
diff --git a/Editor/Scripts/editor_script_validation.py b/Assets/Editor/Scripts/editor_script_validation.py
similarity index 100%
rename from Editor/Scripts/editor_script_validation.py
rename to Assets/Editor/Scripts/editor_script_validation.py
diff --git a/Editor/Scripts/export_all_project_levels.py b/Assets/Editor/Scripts/export_all_project_levels.py
similarity index 100%
rename from Editor/Scripts/export_all_project_levels.py
rename to Assets/Editor/Scripts/export_all_project_levels.py
diff --git a/Editor/Scripts/generatelod.py b/Assets/Editor/Scripts/generatelod.py
similarity index 100%
rename from Editor/Scripts/generatelod.py
rename to Assets/Editor/Scripts/generatelod.py
diff --git a/Editor/Scripts/rename_cgf.py b/Assets/Editor/Scripts/rename_cgf.py
similarity index 100%
rename from Editor/Scripts/rename_cgf.py
rename to Assets/Editor/Scripts/rename_cgf.py
diff --git a/Editor/Scripts/select_story_anim_objects.py b/Assets/Editor/Scripts/select_story_anim_objects.py
similarity index 100%
rename from Editor/Scripts/select_story_anim_objects.py
rename to Assets/Editor/Scripts/select_story_anim_objects.py
diff --git a/Editor/Scripts/tools_shelf_actions.py b/Assets/Editor/Scripts/tools_shelf_actions.py
similarity index 100%
rename from Editor/Scripts/tools_shelf_actions.py
rename to Assets/Editor/Scripts/tools_shelf_actions.py
diff --git a/Editor/SoundTemplates.xml b/Assets/Editor/SoundTemplates.xml
similarity index 100%
rename from Editor/SoundTemplates.xml
rename to Assets/Editor/SoundTemplates.xml
diff --git a/Editor/Styles/AssetImporterWindow.qss b/Assets/Editor/Styles/AssetImporterWindow.qss
similarity index 100%
rename from Editor/Styles/AssetImporterWindow.qss
rename to Assets/Editor/Styles/AssetImporterWindow.qss
diff --git a/Editor/Styles/AssetProcessor.qss b/Assets/Editor/Styles/AssetProcessor.qss
similarity index 100%
rename from Editor/Styles/AssetProcessor.qss
rename to Assets/Editor/Styles/AssetProcessor.qss
diff --git a/Editor/Styles/AssetProcessorGlobalStyleSheet.qss b/Assets/Editor/Styles/AssetProcessorGlobalStyleSheet.qss
similarity index 100%
rename from Editor/Styles/AssetProcessorGlobalStyleSheet.qss
rename to Assets/Editor/Styles/AssetProcessorGlobalStyleSheet.qss
diff --git a/Editor/Styles/AssetProcessorGlobalStyleSheetVariables.json b/Assets/Editor/Styles/AssetProcessorGlobalStyleSheetVariables.json
similarity index 100%
rename from Editor/Styles/AssetProcessorGlobalStyleSheetVariables.json
rename to Assets/Editor/Styles/AssetProcessorGlobalStyleSheetVariables.json
diff --git a/Editor/Styles/CryDark.cjstyles b/Assets/Editor/Styles/CryDark.cjstyles
similarity index 100%
rename from Editor/Styles/CryDark.cjstyles
rename to Assets/Editor/Styles/CryDark.cjstyles
diff --git a/Editor/Styles/CryLight.cjstyles b/Assets/Editor/Styles/CryLight.cjstyles
similarity index 100%
rename from Editor/Styles/CryLight.cjstyles
rename to Assets/Editor/Styles/CryLight.cjstyles
diff --git a/Editor/Styles/MultiMeshSelectionPane.qss b/Assets/Editor/Styles/MultiMeshSelectionPane.qss
similarity index 100%
rename from Editor/Styles/MultiMeshSelectionPane.qss
rename to Assets/Editor/Styles/MultiMeshSelectionPane.qss
diff --git a/Editor/Styles/Office2007.dll b/Assets/Editor/Styles/Office2007.dll
similarity index 100%
rename from Editor/Styles/Office2007.dll
rename to Assets/Editor/Styles/Office2007.dll
diff --git a/Editor/Styles/Office2007Black.dll b/Assets/Editor/Styles/Office2007Black.dll
similarity index 100%
rename from Editor/Styles/Office2007Black.dll
rename to Assets/Editor/Styles/Office2007Black.dll
diff --git a/Editor/Styles/Office2007Silver.dll b/Assets/Editor/Styles/Office2007Silver.dll
similarity index 100%
rename from Editor/Styles/Office2007Silver.dll
rename to Assets/Editor/Styles/Office2007Silver.dll
diff --git a/Editor/Styles/StyleSheetImages/Validation_icon.png b/Assets/Editor/Styles/StyleSheetImages/Validation_icon.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/Validation_icon.png
rename to Assets/Editor/Styles/StyleSheetImages/Validation_icon.png
diff --git a/Editor/Styles/StyleSheetImages/about_dark.png b/Assets/Editor/Styles/StyleSheetImages/about_dark.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/about_dark.png
rename to Assets/Editor/Styles/StyleSheetImages/about_dark.png
diff --git a/Editor/Styles/StyleSheetImages/about_light.png b/Assets/Editor/Styles/StyleSheetImages/about_light.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/about_light.png
rename to Assets/Editor/Styles/StyleSheetImages/about_light.png
diff --git a/Editor/Styles/StyleSheetImages/arrow_down_V2.png b/Assets/Editor/Styles/StyleSheetImages/arrow_down_V2.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/arrow_down_V2.png
rename to Assets/Editor/Styles/StyleSheetImages/arrow_down_V2.png
diff --git a/Editor/Styles/StyleSheetImages/arrow_left_V2.png b/Assets/Editor/Styles/StyleSheetImages/arrow_left_V2.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/arrow_left_V2.png
rename to Assets/Editor/Styles/StyleSheetImages/arrow_left_V2.png
diff --git a/Editor/Styles/StyleSheetImages/arrow_right_V2.png b/Assets/Editor/Styles/StyleSheetImages/arrow_right_V2.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/arrow_right_V2.png
rename to Assets/Editor/Styles/StyleSheetImages/arrow_right_V2.png
diff --git a/Editor/Styles/StyleSheetImages/arrow_up_V2.png b/Assets/Editor/Styles/StyleSheetImages/arrow_up_V2.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/arrow_up_V2.png
rename to Assets/Editor/Styles/StyleSheetImages/arrow_up_V2.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_checked.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_checked.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_checked.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_checked.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_checked_disabled.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_checked_disabled.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_checked_disabled.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_checked_disabled.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_checked_hover.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_checked_hover.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_checked_hover.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_checked_hover.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_checked_pressed.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_checked_pressed.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_checked_pressed.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_checked_pressed.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_indeterminate_hover .png b/Assets/Editor/Styles/StyleSheetImages/checkbox_indeterminate_hover .png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_indeterminate_hover .png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_indeterminate_hover .png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_indeterminate_pressed.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_indeterminate_pressed.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_indeterminate_pressed.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_indeterminate_pressed.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_unchecked.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_unchecked.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_unchecked_disabled.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked_disabled.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_unchecked_disabled.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked_disabled.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_unchecked_hover.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked_hover.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_unchecked_hover.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked_hover.png
diff --git a/Editor/Styles/StyleSheetImages/checkbox_unchecked_pressed.png b/Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked_pressed.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/checkbox_unchecked_pressed.png
rename to Assets/Editor/Styles/StyleSheetImages/checkbox_unchecked_pressed.png
diff --git a/Editor/Styles/StyleSheetImages/dropdown_arrow.png b/Assets/Editor/Styles/StyleSheetImages/dropdown_arrow.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/dropdown_arrow.png
rename to Assets/Editor/Styles/StyleSheetImages/dropdown_arrow.png
diff --git a/Editor/Styles/StyleSheetImages/error_icon.png b/Assets/Editor/Styles/StyleSheetImages/error_icon.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/error_icon.png
rename to Assets/Editor/Styles/StyleSheetImages/error_icon.png
diff --git a/Editor/Styles/StyleSheetImages/help.png b/Assets/Editor/Styles/StyleSheetImages/help.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/help.png
rename to Assets/Editor/Styles/StyleSheetImages/help.png
diff --git a/Editor/Styles/StyleSheetImages/info_icon.png b/Assets/Editor/Styles/StyleSheetImages/info_icon.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/info_icon.png
rename to Assets/Editor/Styles/StyleSheetImages/info_icon.png
diff --git a/Editor/Styles/StyleSheetImages/radiobutton_checked.png b/Assets/Editor/Styles/StyleSheetImages/radiobutton_checked.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/radiobutton_checked.png
rename to Assets/Editor/Styles/StyleSheetImages/radiobutton_checked.png
diff --git a/Editor/Styles/StyleSheetImages/radiobutton_checked_disabled.png b/Assets/Editor/Styles/StyleSheetImages/radiobutton_checked_disabled.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/radiobutton_checked_disabled.png
rename to Assets/Editor/Styles/StyleSheetImages/radiobutton_checked_disabled.png
diff --git a/Editor/Styles/StyleSheetImages/radiobutton_unchecked.png b/Assets/Editor/Styles/StyleSheetImages/radiobutton_unchecked.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/radiobutton_unchecked.png
rename to Assets/Editor/Styles/StyleSheetImages/radiobutton_unchecked.png
diff --git a/Editor/Styles/StyleSheetImages/radiobutton_unchecked_disabled.png b/Assets/Editor/Styles/StyleSheetImages/radiobutton_unchecked_disabled.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/radiobutton_unchecked_disabled.png
rename to Assets/Editor/Styles/StyleSheetImages/radiobutton_unchecked_disabled.png
diff --git a/Editor/Styles/StyleSheetImages/spinbox_down.png b/Assets/Editor/Styles/StyleSheetImages/spinbox_down.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/spinbox_down.png
rename to Assets/Editor/Styles/StyleSheetImages/spinbox_down.png
diff --git a/Editor/Styles/StyleSheetImages/spinbox_up.png b/Assets/Editor/Styles/StyleSheetImages/spinbox_up.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/spinbox_up.png
rename to Assets/Editor/Styles/StyleSheetImages/spinbox_up.png
diff --git a/Editor/Styles/StyleSheetImages/treeview_arrow_down.png b/Assets/Editor/Styles/StyleSheetImages/treeview_arrow_down.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/treeview_arrow_down.png
rename to Assets/Editor/Styles/StyleSheetImages/treeview_arrow_down.png
diff --git a/Editor/Styles/StyleSheetImages/treeview_arrow_right.png b/Assets/Editor/Styles/StyleSheetImages/treeview_arrow_right.png
similarity index 100%
rename from Editor/Styles/StyleSheetImages/treeview_arrow_right.png
rename to Assets/Editor/Styles/StyleSheetImages/treeview_arrow_right.png
diff --git a/Editor/Styles/stylesheet_Dark.qss b/Assets/Editor/Styles/stylesheet_Dark.qss
similarity index 100%
rename from Editor/Styles/stylesheet_Dark.qss
rename to Assets/Editor/Styles/stylesheet_Dark.qss
diff --git a/Editor/Styles/stylesheet_Light.qss b/Assets/Editor/Styles/stylesheet_Light.qss
similarity index 100%
rename from Editor/Styles/stylesheet_Light.qss
rename to Assets/Editor/Styles/stylesheet_Light.qss
diff --git a/Editor/ToolBox.xml b/Assets/Editor/ToolBox.xml
similarity index 100%
rename from Editor/ToolBox.xml
rename to Assets/Editor/ToolBox.xml
diff --git a/Editor/Translation/scriptcanvas_en_us.ts b/Assets/Editor/Translation/scriptcanvas_en_us.ts
similarity index 100%
rename from Editor/Translation/scriptcanvas_en_us.ts
rename to Assets/Editor/Translation/scriptcanvas_en_us.ts
diff --git a/Editor/UI/AssetBrowserRibbon.xml b/Assets/Editor/UI/AssetBrowserRibbon.xml
similarity index 100%
rename from Editor/UI/AssetBrowserRibbon.xml
rename to Assets/Editor/UI/AssetBrowserRibbon.xml
diff --git a/Editor/UI/Icons/AddSel.png b/Assets/Editor/UI/Icons/AddSel.png
similarity index 100%
rename from Editor/UI/Icons/AddSel.png
rename to Assets/Editor/UI/Icons/AddSel.png
diff --git a/Editor/UI/Icons/AlObjGrid.png b/Assets/Editor/UI/Icons/AlObjGrid.png
similarity index 100%
rename from Editor/UI/Icons/AlObjGrid.png
rename to Assets/Editor/UI/Icons/AlObjGrid.png
diff --git a/Editor/UI/Icons/AlObjSurf.png b/Assets/Editor/UI/Icons/AlObjSurf.png
similarity index 100%
rename from Editor/UI/Icons/AlObjSurf.png
rename to Assets/Editor/UI/Icons/AlObjSurf.png
diff --git a/Editor/UI/Icons/AlSelect.png b/Assets/Editor/UI/Icons/AlSelect.png
similarity index 100%
rename from Editor/UI/Icons/AlSelect.png
rename to Assets/Editor/UI/Icons/AlSelect.png
diff --git a/Editor/UI/Icons/Animation Graph.png b/Assets/Editor/UI/Icons/Animation Graph.png
similarity index 100%
rename from Editor/UI/Icons/Animation Graph.png
rename to Assets/Editor/UI/Icons/Animation Graph.png
diff --git a/Editor/UI/Icons/Asset Browser.png b/Assets/Editor/UI/Icons/Asset Browser.png
similarity index 100%
rename from Editor/UI/Icons/Asset Browser.png
rename to Assets/Editor/UI/Icons/Asset Browser.png
diff --git a/Editor/UI/Icons/AssetBrowserCheckers.png b/Assets/Editor/UI/Icons/AssetBrowserCheckers.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserCheckers.png
rename to Assets/Editor/UI/Icons/AssetBrowserCheckers.png
diff --git a/Editor/UI/Icons/AssetBrowserFilterPresets.png b/Assets/Editor/UI/Icons/AssetBrowserFilterPresets.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserFilterPresets.png
rename to Assets/Editor/UI/Icons/AssetBrowserFilterPresets.png
diff --git a/Editor/UI/Icons/AssetBrowserFromViewportSel.png b/Assets/Editor/UI/Icons/AssetBrowserFromViewportSel.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserFromViewportSel.png
rename to Assets/Editor/UI/Icons/AssetBrowserFromViewportSel.png
diff --git a/Editor/UI/Icons/AssetBrowserRefresh.png b/Assets/Editor/UI/Icons/AssetBrowserRefresh.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserRefresh.png
rename to Assets/Editor/UI/Icons/AssetBrowserRefresh.png
diff --git a/Editor/UI/Icons/AssetBrowserSelectInViewport.png b/Assets/Editor/UI/Icons/AssetBrowserSelectInViewport.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserSelectInViewport.png
rename to Assets/Editor/UI/Icons/AssetBrowserSelectInViewport.png
diff --git a/Editor/UI/Icons/AssetBrowserSound.png b/Assets/Editor/UI/Icons/AssetBrowserSound.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserSound.png
rename to Assets/Editor/UI/Icons/AssetBrowserSound.png
diff --git a/Editor/UI/Icons/AssetBrowserThumbInvalid.png b/Assets/Editor/UI/Icons/AssetBrowserThumbInvalid.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserThumbInvalid.png
rename to Assets/Editor/UI/Icons/AssetBrowserThumbInvalid.png
diff --git a/Editor/UI/Icons/AssetBrowserThumbLoading.png b/Assets/Editor/UI/Icons/AssetBrowserThumbLoading.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserThumbLoading.png
rename to Assets/Editor/UI/Icons/AssetBrowserThumbLoading.png
diff --git a/Editor/UI/Icons/AssetBrowserTooltipShadow.png b/Assets/Editor/UI/Icons/AssetBrowserTooltipShadow.png
similarity index 100%
rename from Editor/UI/Icons/AssetBrowserTooltipShadow.png
rename to Assets/Editor/UI/Icons/AssetBrowserTooltipShadow.png
diff --git a/Editor/UI/Icons/AssetFav.png b/Assets/Editor/UI/Icons/AssetFav.png
similarity index 100%
rename from Editor/UI/Icons/AssetFav.png
rename to Assets/Editor/UI/Icons/AssetFav.png
diff --git a/Editor/UI/Icons/AssetTag.png b/Assets/Editor/UI/Icons/AssetTag.png
similarity index 100%
rename from Editor/UI/Icons/AssetTag.png
rename to Assets/Editor/UI/Icons/AssetTag.png
diff --git a/Editor/UI/Icons/Attach.png b/Assets/Editor/UI/Icons/Attach.png
similarity index 100%
rename from Editor/UI/Icons/Attach.png
rename to Assets/Editor/UI/Icons/Attach.png
diff --git a/Editor/UI/Icons/AutoSync.png b/Assets/Editor/UI/Icons/AutoSync.png
similarity index 100%
rename from Editor/UI/Icons/AutoSync.png
rename to Assets/Editor/UI/Icons/AutoSync.png
diff --git a/Editor/UI/Icons/Character Tool.png b/Assets/Editor/UI/Icons/Character Tool.png
similarity index 100%
rename from Editor/UI/Icons/Character Tool.png
rename to Assets/Editor/UI/Icons/Character Tool.png
diff --git a/Editor/UI/Icons/Clone.png b/Assets/Editor/UI/Icons/Clone.png
similarity index 100%
rename from Editor/UI/Icons/Clone.png
rename to Assets/Editor/UI/Icons/Clone.png
diff --git a/Editor/UI/Icons/CloseGroup.png b/Assets/Editor/UI/Icons/CloseGroup.png
similarity index 100%
rename from Editor/UI/Icons/CloseGroup.png
rename to Assets/Editor/UI/Icons/CloseGroup.png
diff --git a/Editor/UI/Icons/Cloud.png b/Assets/Editor/UI/Icons/Cloud.png
similarity index 100%
rename from Editor/UI/Icons/Cloud.png
rename to Assets/Editor/UI/Icons/Cloud.png
diff --git a/Editor/UI/Icons/ConOpt.png b/Assets/Editor/UI/Icons/ConOpt.png
similarity index 100%
rename from Editor/UI/Icons/ConOpt.png
rename to Assets/Editor/UI/Icons/ConOpt.png
diff --git a/Editor/UI/Icons/ConvertSelToBrushes.png b/Assets/Editor/UI/Icons/ConvertSelToBrushes.png
similarity index 100%
rename from Editor/UI/Icons/ConvertSelToBrushes.png
rename to Assets/Editor/UI/Icons/ConvertSelToBrushes.png
diff --git a/Editor/UI/Icons/ConvertSelToDesigner.png b/Assets/Editor/UI/Icons/ConvertSelToDesigner.png
similarity index 100%
rename from Editor/UI/Icons/ConvertSelToDesigner.png
rename to Assets/Editor/UI/Icons/ConvertSelToDesigner.png
diff --git a/Editor/UI/Icons/ConvertSelToSimpleEntity.png b/Assets/Editor/UI/Icons/ConvertSelToSimpleEntity.png
similarity index 100%
rename from Editor/UI/Icons/ConvertSelToSimpleEntity.png
rename to Assets/Editor/UI/Icons/ConvertSelToSimpleEntity.png
diff --git a/Editor/UI/Icons/ConvertSelToStaticEntity.png b/Assets/Editor/UI/Icons/ConvertSelToStaticEntity.png
similarity index 100%
rename from Editor/UI/Icons/ConvertSelToStaticEntity.png
rename to Assets/Editor/UI/Icons/ConvertSelToStaticEntity.png
diff --git a/Editor/UI/Icons/Database View.png b/Assets/Editor/UI/Icons/Database View.png
similarity index 100%
rename from Editor/UI/Icons/Database View.png
rename to Assets/Editor/UI/Icons/Database View.png
diff --git a/Editor/UI/Icons/DelSel.png b/Assets/Editor/UI/Icons/DelSel.png
similarity index 100%
rename from Editor/UI/Icons/DelSel.png
rename to Assets/Editor/UI/Icons/DelSel.png
diff --git a/Editor/UI/Icons/Delete.png b/Assets/Editor/UI/Icons/Delete.png
similarity index 100%
rename from Editor/UI/Icons/Delete.png
rename to Assets/Editor/UI/Icons/Delete.png
diff --git a/Editor/UI/Icons/Detach.png b/Assets/Editor/UI/Icons/Detach.png
similarity index 100%
rename from Editor/UI/Icons/Detach.png
rename to Assets/Editor/UI/Icons/Detach.png
diff --git a/Editor/UI/Icons/Dialog Editor.png b/Assets/Editor/UI/Icons/Dialog Editor.png
similarity index 100%
rename from Editor/UI/Icons/Dialog Editor.png
rename to Assets/Editor/UI/Icons/Dialog Editor.png
diff --git a/Editor/UI/Icons/Edit Terrain Lighting.png b/Assets/Editor/UI/Icons/Edit Terrain Lighting.png
similarity index 100%
rename from Editor/UI/Icons/Edit Terrain Lighting.png
rename to Assets/Editor/UI/Icons/Edit Terrain Lighting.png
diff --git a/Editor/UI/Icons/Edit Vegetation.png b/Assets/Editor/UI/Icons/Edit Vegetation.png
similarity index 100%
rename from Editor/UI/Icons/Edit Vegetation.png
rename to Assets/Editor/UI/Icons/Edit Vegetation.png
diff --git a/Editor/UI/Icons/Editor Settings Manager.png b/Assets/Editor/UI/Icons/Editor Settings Manager.png
similarity index 100%
rename from Editor/UI/Icons/Editor Settings Manager.png
rename to Assets/Editor/UI/Icons/Editor Settings Manager.png
diff --git a/Editor/UI/Icons/Error Report.png b/Assets/Editor/UI/Icons/Error Report.png
similarity index 100%
rename from Editor/UI/Icons/Error Report.png
rename to Assets/Editor/UI/Icons/Error Report.png
diff --git a/Editor/UI/Icons/Export Block.png b/Assets/Editor/UI/Icons/Export Block.png
similarity index 100%
rename from Editor/UI/Icons/Export Block.png
rename to Assets/Editor/UI/Icons/Export Block.png
diff --git a/Editor/UI/Icons/Facial Editor.png b/Assets/Editor/UI/Icons/Facial Editor.png
similarity index 100%
rename from Editor/UI/Icons/Facial Editor.png
rename to Assets/Editor/UI/Icons/Facial Editor.png
diff --git a/Editor/UI/Icons/Fetch.png b/Assets/Editor/UI/Icons/Fetch.png
similarity index 100%
rename from Editor/UI/Icons/Fetch.png
rename to Assets/Editor/UI/Icons/Fetch.png
diff --git a/Editor/UI/Icons/Flatten Terrain.png b/Assets/Editor/UI/Icons/Flatten Terrain.png
similarity index 100%
rename from Editor/UI/Icons/Flatten Terrain.png
rename to Assets/Editor/UI/Icons/Flatten Terrain.png
diff --git a/Editor/UI/Icons/Follow.png b/Assets/Editor/UI/Icons/Follow.png
similarity index 100%
rename from Editor/UI/Icons/Follow.png
rename to Assets/Editor/UI/Icons/Follow.png
diff --git a/Editor/UI/Icons/FollowSnap.png b/Assets/Editor/UI/Icons/FollowSnap.png
similarity index 100%
rename from Editor/UI/Icons/FollowSnap.png
rename to Assets/Editor/UI/Icons/FollowSnap.png
diff --git a/Editor/UI/Icons/ForceSyncLevelToConsole.png b/Assets/Editor/UI/Icons/ForceSyncLevelToConsole.png
similarity index 100%
rename from Editor/UI/Icons/ForceSyncLevelToConsole.png
rename to Assets/Editor/UI/Icons/ForceSyncLevelToConsole.png
diff --git a/Editor/UI/Icons/Freeze.png b/Assets/Editor/UI/Icons/Freeze.png
similarity index 100%
rename from Editor/UI/Icons/Freeze.png
rename to Assets/Editor/UI/Icons/Freeze.png
diff --git a/Editor/UI/Icons/Front.png b/Assets/Editor/UI/Icons/Front.png
similarity index 100%
rename from Editor/UI/Icons/Front.png
rename to Assets/Editor/UI/Icons/Front.png
diff --git a/Editor/UI/Icons/GetPhysics.png b/Assets/Editor/UI/Icons/GetPhysics.png
similarity index 100%
rename from Editor/UI/Icons/GetPhysics.png
rename to Assets/Editor/UI/Icons/GetPhysics.png
diff --git a/Editor/UI/Icons/GoToObj.png b/Assets/Editor/UI/Icons/GoToObj.png
similarity index 100%
rename from Editor/UI/Icons/GoToObj.png
rename to Assets/Editor/UI/Icons/GoToObj.png
diff --git a/Editor/UI/Icons/GotoTagPoint.png b/Assets/Editor/UI/Icons/GotoTagPoint.png
similarity index 100%
rename from Editor/UI/Icons/GotoTagPoint.png
rename to Assets/Editor/UI/Icons/GotoTagPoint.png
diff --git a/Editor/UI/Icons/Group.png b/Assets/Editor/UI/Icons/Group.png
similarity index 100%
rename from Editor/UI/Icons/Group.png
rename to Assets/Editor/UI/Icons/Group.png
diff --git a/Editor/UI/Icons/Hide.png b/Assets/Editor/UI/Icons/Hide.png
similarity index 100%
rename from Editor/UI/Icons/Hide.png
rename to Assets/Editor/UI/Icons/Hide.png
diff --git a/Editor/UI/Icons/Hold.png b/Assets/Editor/UI/Icons/Hold.png
similarity index 100%
rename from Editor/UI/Icons/Hold.png
rename to Assets/Editor/UI/Icons/Hold.png
diff --git a/Editor/UI/Icons/Import Block.png b/Assets/Editor/UI/Icons/Import Block.png
similarity index 100%
rename from Editor/UI/Icons/Import Block.png
rename to Assets/Editor/UI/Icons/Import Block.png
diff --git a/Editor/UI/Icons/ImportExport Terrain Texture.png b/Assets/Editor/UI/Icons/ImportExport Terrain Texture.png
similarity index 100%
rename from Editor/UI/Icons/ImportExport Terrain Texture.png
rename to Assets/Editor/UI/Icons/ImportExport Terrain Texture.png
diff --git a/Editor/UI/Icons/Invert.png b/Assets/Editor/UI/Icons/Invert.png
similarity index 100%
rename from Editor/UI/Icons/Invert.png
rename to Assets/Editor/UI/Icons/Invert.png
diff --git a/Editor/UI/Icons/LNM Editor.png b/Assets/Editor/UI/Icons/LNM Editor.png
similarity index 100%
rename from Editor/UI/Icons/LNM Editor.png
rename to Assets/Editor/UI/Icons/LNM Editor.png
diff --git a/Editor/UI/Icons/LaunchLevel.png b/Assets/Editor/UI/Icons/LaunchLevel.png
similarity index 100%
rename from Editor/UI/Icons/LaunchLevel.png
rename to Assets/Editor/UI/Icons/LaunchLevel.png
diff --git a/Editor/UI/Icons/Layer Editor.png b/Assets/Editor/UI/Icons/Layer Editor.png
similarity index 100%
rename from Editor/UI/Icons/Layer Editor.png
rename to Assets/Editor/UI/Icons/Layer Editor.png
diff --git a/Editor/UI/Icons/Layer.png b/Assets/Editor/UI/Icons/Layer.png
similarity index 100%
rename from Editor/UI/Icons/Layer.png
rename to Assets/Editor/UI/Icons/Layer.png
diff --git a/Editor/UI/Icons/Left.png b/Assets/Editor/UI/Icons/Left.png
similarity index 100%
rename from Editor/UI/Icons/Left.png
rename to Assets/Editor/UI/Icons/Left.png
diff --git a/Editor/UI/Icons/Lighting Tool.png b/Assets/Editor/UI/Icons/Lighting Tool.png
similarity index 100%
rename from Editor/UI/Icons/Lighting Tool.png
rename to Assets/Editor/UI/Icons/Lighting Tool.png
diff --git a/Editor/UI/Icons/Link.png b/Assets/Editor/UI/Icons/Link.png
similarity index 100%
rename from Editor/UI/Icons/Link.png
rename to Assets/Editor/UI/Icons/Link.png
diff --git a/Editor/UI/Icons/LoadGameLevel.png b/Assets/Editor/UI/Icons/LoadGameLevel.png
similarity index 100%
rename from Editor/UI/Icons/LoadGameLevel.png
rename to Assets/Editor/UI/Icons/LoadGameLevel.png
diff --git a/Editor/UI/Icons/LoadGameLevel_16x16.png b/Assets/Editor/UI/Icons/LoadGameLevel_16x16.png
similarity index 100%
rename from Editor/UI/Icons/LoadGameLevel_16x16.png
rename to Assets/Editor/UI/Icons/LoadGameLevel_16x16.png
diff --git a/Editor/UI/Icons/LoadLevel.png b/Assets/Editor/UI/Icons/LoadLevel.png
similarity index 100%
rename from Editor/UI/Icons/LoadLevel.png
rename to Assets/Editor/UI/Icons/LoadLevel.png
diff --git a/Editor/UI/Icons/LoadSelObj.png b/Assets/Editor/UI/Icons/LoadSelObj.png
similarity index 100%
rename from Editor/UI/Icons/LoadSelObj.png
rename to Assets/Editor/UI/Icons/LoadSelObj.png
diff --git a/Editor/UI/Icons/LoadSelObj_16x16.png b/Assets/Editor/UI/Icons/LoadSelObj_16x16.png
similarity index 100%
rename from Editor/UI/Icons/LoadSelObj_16x16.png
rename to Assets/Editor/UI/Icons/LoadSelObj_16x16.png
diff --git a/Editor/UI/Icons/MakePref.png b/Assets/Editor/UI/Icons/MakePref.png
similarity index 100%
rename from Editor/UI/Icons/MakePref.png
rename to Assets/Editor/UI/Icons/MakePref.png
diff --git a/Editor/UI/Icons/Mannequin Editor.png b/Assets/Editor/UI/Icons/Mannequin Editor.png
similarity index 100%
rename from Editor/UI/Icons/Mannequin Editor.png
rename to Assets/Editor/UI/Icons/Mannequin Editor.png
diff --git a/Editor/UI/Icons/Mannequin.png b/Assets/Editor/UI/Icons/Mannequin.png
similarity index 100%
rename from Editor/UI/Icons/Mannequin.png
rename to Assets/Editor/UI/Icons/Mannequin.png
diff --git a/Editor/UI/Icons/Map.png b/Assets/Editor/UI/Icons/Map.png
similarity index 100%
rename from Editor/UI/Icons/Map.png
rename to Assets/Editor/UI/Icons/Map.png
diff --git a/Editor/UI/Icons/Material Editor.png b/Assets/Editor/UI/Icons/Material Editor.png
similarity index 100%
rename from Editor/UI/Icons/Material Editor.png
rename to Assets/Editor/UI/Icons/Material Editor.png
diff --git a/Editor/UI/Icons/Material_Editor_16x16.png b/Assets/Editor/UI/Icons/Material_Editor_16x16.png
similarity index 100%
rename from Editor/UI/Icons/Material_Editor_16x16.png
rename to Assets/Editor/UI/Icons/Material_Editor_16x16.png
diff --git a/Editor/UI/Icons/Measurement System Tool.png b/Assets/Editor/UI/Icons/Measurement System Tool.png
similarity index 100%
rename from Editor/UI/Icons/Measurement System Tool.png
rename to Assets/Editor/UI/Icons/Measurement System Tool.png
diff --git a/Editor/UI/Icons/Missing Asset Resolver.png b/Assets/Editor/UI/Icons/Missing Asset Resolver.png
similarity index 100%
rename from Editor/UI/Icons/Missing Asset Resolver.png
rename to Assets/Editor/UI/Icons/Missing Asset Resolver.png
diff --git a/Editor/UI/Icons/Model Preview.png b/Assets/Editor/UI/Icons/Model Preview.png
similarity index 100%
rename from Editor/UI/Icons/Model Preview.png
rename to Assets/Editor/UI/Icons/Model Preview.png
diff --git a/Editor/UI/Icons/Modular Editor.png b/Assets/Editor/UI/Icons/Modular Editor.png
similarity index 100%
rename from Editor/UI/Icons/Modular Editor.png
rename to Assets/Editor/UI/Icons/Modular Editor.png
diff --git a/Editor/UI/Icons/Move.png b/Assets/Editor/UI/Icons/Move.png
similarity index 100%
rename from Editor/UI/Icons/Move.png
rename to Assets/Editor/UI/Icons/Move.png
diff --git a/Editor/UI/Icons/NavContinuousUpdate.png b/Assets/Editor/UI/Icons/NavContinuousUpdate.png
similarity index 100%
rename from Editor/UI/Icons/NavContinuousUpdate.png
rename to Assets/Editor/UI/Icons/NavContinuousUpdate.png
diff --git a/Editor/UI/Icons/NavContinuousUpdate2.png b/Assets/Editor/UI/Icons/NavContinuousUpdate2.png
similarity index 100%
rename from Editor/UI/Icons/NavContinuousUpdate2.png
rename to Assets/Editor/UI/Icons/NavContinuousUpdate2.png
diff --git a/Editor/UI/Icons/NavDebugDisplay.png b/Assets/Editor/UI/Icons/NavDebugDisplay.png
similarity index 100%
rename from Editor/UI/Icons/NavDebugDisplay.png
rename to Assets/Editor/UI/Icons/NavDebugDisplay.png
diff --git a/Editor/UI/Icons/NavNewArea.png b/Assets/Editor/UI/Icons/NavNewArea.png
similarity index 100%
rename from Editor/UI/Icons/NavNewArea.png
rename to Assets/Editor/UI/Icons/NavNewArea.png
diff --git a/Editor/UI/Icons/NavNewSeed.png b/Assets/Editor/UI/Icons/NavNewSeed.png
similarity index 100%
rename from Editor/UI/Icons/NavNewSeed.png
rename to Assets/Editor/UI/Icons/NavNewSeed.png
diff --git a/Editor/UI/Icons/NavShowAreas.png b/Assets/Editor/UI/Icons/NavShowAreas.png
similarity index 100%
rename from Editor/UI/Icons/NavShowAreas.png
rename to Assets/Editor/UI/Icons/NavShowAreas.png
diff --git a/Editor/UI/Icons/NavShowAreas2.png b/Assets/Editor/UI/Icons/NavShowAreas2.png
similarity index 100%
rename from Editor/UI/Icons/NavShowAreas2.png
rename to Assets/Editor/UI/Icons/NavShowAreas2.png
diff --git a/Editor/UI/Icons/OpenGroup.png b/Assets/Editor/UI/Icons/OpenGroup.png
similarity index 100%
rename from Editor/UI/Icons/OpenGroup.png
rename to Assets/Editor/UI/Icons/OpenGroup.png
diff --git a/Editor/UI/Icons/Perspective.png b/Assets/Editor/UI/Icons/Perspective.png
similarity index 100%
rename from Editor/UI/Icons/Perspective.png
rename to Assets/Editor/UI/Icons/Perspective.png
diff --git a/Editor/UI/Icons/QCollapsePanel/collapsed.png b/Assets/Editor/UI/Icons/QCollapsePanel/collapsed.png
similarity index 100%
rename from Editor/UI/Icons/QCollapsePanel/collapsed.png
rename to Assets/Editor/UI/Icons/QCollapsePanel/collapsed.png
diff --git a/Editor/UI/Icons/QCollapsePanel/open.png b/Assets/Editor/UI/Icons/QCollapsePanel/open.png
similarity index 100%
rename from Editor/UI/Icons/QCollapsePanel/open.png
rename to Assets/Editor/UI/Icons/QCollapsePanel/open.png
diff --git a/Editor/UI/Icons/QEditorCollapseGroup/arrow_down_V2.png b/Assets/Editor/UI/Icons/QEditorCollapseGroup/arrow_down_V2.png
similarity index 100%
rename from Editor/UI/Icons/QEditorCollapseGroup/arrow_down_V2.png
rename to Assets/Editor/UI/Icons/QEditorCollapseGroup/arrow_down_V2.png
diff --git a/Editor/UI/Icons/QEditorCollapseGroup/arrow_right_V2.png b/Assets/Editor/UI/Icons/QEditorCollapseGroup/arrow_right_V2.png
similarity index 100%
rename from Editor/UI/Icons/QEditorCollapseGroup/arrow_right_V2.png
rename to Assets/Editor/UI/Icons/QEditorCollapseGroup/arrow_right_V2.png
diff --git a/Editor/UI/Icons/Redo.png b/Assets/Editor/UI/Icons/Redo.png
similarity index 100%
rename from Editor/UI/Icons/Redo.png
rename to Assets/Editor/UI/Icons/Redo.png
diff --git a/Editor/UI/Icons/RefCoord.png b/Assets/Editor/UI/Icons/RefCoord.png
similarity index 100%
rename from Editor/UI/Icons/RefCoord.png
rename to Assets/Editor/UI/Icons/RefCoord.png
diff --git a/Editor/UI/Icons/Reload Terrain-.png b/Assets/Editor/UI/Icons/Reload Terrain-.png
similarity index 100%
rename from Editor/UI/Icons/Reload Terrain-.png
rename to Assets/Editor/UI/Icons/Reload Terrain-.png
diff --git a/Editor/UI/Icons/Reload Terrain.png b/Assets/Editor/UI/Icons/Reload Terrain.png
similarity index 100%
rename from Editor/UI/Icons/Reload Terrain.png
rename to Assets/Editor/UI/Icons/Reload Terrain.png
diff --git a/Editor/UI/Icons/ReloadAll.png b/Assets/Editor/UI/Icons/ReloadAll.png
similarity index 100%
rename from Editor/UI/Icons/ReloadAll.png
rename to Assets/Editor/UI/Icons/ReloadAll.png
diff --git a/Editor/UI/Icons/Rename.png b/Assets/Editor/UI/Icons/Rename.png
similarity index 100%
rename from Editor/UI/Icons/Rename.png
rename to Assets/Editor/UI/Icons/Rename.png
diff --git a/Editor/UI/Icons/ResetPhysics.png b/Assets/Editor/UI/Icons/ResetPhysics.png
similarity index 100%
rename from Editor/UI/Icons/ResetPhysics.png
rename to Assets/Editor/UI/Icons/ResetPhysics.png
diff --git a/Editor/UI/Icons/Resize Terrain.png b/Assets/Editor/UI/Icons/Resize Terrain.png
similarity index 100%
rename from Editor/UI/Icons/Resize Terrain.png
rename to Assets/Editor/UI/Icons/Resize Terrain.png
diff --git a/Editor/UI/Icons/Rotate.png b/Assets/Editor/UI/Icons/Rotate.png
similarity index 100%
rename from Editor/UI/Icons/Rotate.png
rename to Assets/Editor/UI/Icons/Rotate.png
diff --git a/Editor/UI/Icons/Ruler.png b/Assets/Editor/UI/Icons/Ruler.png
similarity index 100%
rename from Editor/UI/Icons/Ruler.png
rename to Assets/Editor/UI/Icons/Ruler.png
diff --git a/Editor/UI/Icons/Save as Geometry.png b/Assets/Editor/UI/Icons/Save as Geometry.png
similarity index 100%
rename from Editor/UI/Icons/Save as Geometry.png
rename to Assets/Editor/UI/Icons/Save as Geometry.png
diff --git a/Editor/UI/Icons/SaveGameLevel.png b/Assets/Editor/UI/Icons/SaveGameLevel.png
similarity index 100%
rename from Editor/UI/Icons/SaveGameLevel.png
rename to Assets/Editor/UI/Icons/SaveGameLevel.png
diff --git a/Editor/UI/Icons/SaveSelObj.png b/Assets/Editor/UI/Icons/SaveSelObj.png
similarity index 100%
rename from Editor/UI/Icons/SaveSelObj.png
rename to Assets/Editor/UI/Icons/SaveSelObj.png
diff --git a/Editor/UI/Icons/SaveTagPoint.png b/Assets/Editor/UI/Icons/SaveTagPoint.png
similarity index 100%
rename from Editor/UI/Icons/SaveTagPoint.png
rename to Assets/Editor/UI/Icons/SaveTagPoint.png
diff --git a/Editor/UI/Icons/Scale.png b/Assets/Editor/UI/Icons/Scale.png
similarity index 100%
rename from Editor/UI/Icons/Scale.png
rename to Assets/Editor/UI/Icons/Scale.png
diff --git a/Editor/UI/Icons/SelObjType.png b/Assets/Editor/UI/Icons/SelObjType.png
similarity index 100%
rename from Editor/UI/Icons/SelObjType.png
rename to Assets/Editor/UI/Icons/SelObjType.png
diff --git a/Editor/UI/Icons/Select Objects.png b/Assets/Editor/UI/Icons/Select Objects.png
similarity index 100%
rename from Editor/UI/Icons/Select Objects.png
rename to Assets/Editor/UI/Icons/Select Objects.png
diff --git a/Editor/UI/Icons/Select.png b/Assets/Editor/UI/Icons/Select.png
similarity index 100%
rename from Editor/UI/Icons/Select.png
rename to Assets/Editor/UI/Icons/Select.png
diff --git a/Editor/UI/Icons/SelectAll.png b/Assets/Editor/UI/Icons/SelectAll.png
similarity index 100%
rename from Editor/UI/Icons/SelectAll.png
rename to Assets/Editor/UI/Icons/SelectAll.png
diff --git a/Editor/UI/Icons/SelectNone.png b/Assets/Editor/UI/Icons/SelectNone.png
similarity index 100%
rename from Editor/UI/Icons/SelectNone.png
rename to Assets/Editor/UI/Icons/SelectNone.png
diff --git a/Editor/UI/Icons/SelectObjects.png b/Assets/Editor/UI/Icons/SelectObjects.png
similarity index 100%
rename from Editor/UI/Icons/SelectObjects.png
rename to Assets/Editor/UI/Icons/SelectObjects.png
diff --git a/Editor/UI/Icons/SelectTerrainArea.png b/Assets/Editor/UI/Icons/SelectTerrainArea.png
similarity index 100%
rename from Editor/UI/Icons/SelectTerrainArea.png
rename to Assets/Editor/UI/Icons/SelectTerrainArea.png
diff --git a/Editor/UI/Icons/SelectionMask.bmp b/Assets/Editor/UI/Icons/SelectionMask.bmp
similarity index 100%
rename from Editor/UI/Icons/SelectionMask.bmp
rename to Assets/Editor/UI/Icons/SelectionMask.bmp
diff --git a/Editor/UI/Icons/SetHeight.png b/Assets/Editor/UI/Icons/SetHeight.png
similarity index 100%
rename from Editor/UI/Icons/SetHeight.png
rename to Assets/Editor/UI/Icons/SetHeight.png
diff --git a/Editor/UI/Icons/ShowRollup.png b/Assets/Editor/UI/Icons/ShowRollup.png
similarity index 100%
rename from Editor/UI/Icons/ShowRollup.png
rename to Assets/Editor/UI/Icons/ShowRollup.png
diff --git a/Editor/UI/Icons/SimObj.png b/Assets/Editor/UI/Icons/SimObj.png
similarity index 100%
rename from Editor/UI/Icons/SimObj.png
rename to Assets/Editor/UI/Icons/SimObj.png
diff --git a/Editor/UI/Icons/Smart Objects Editor.png b/Assets/Editor/UI/Icons/Smart Objects Editor.png
similarity index 100%
rename from Editor/UI/Icons/Smart Objects Editor.png
rename to Assets/Editor/UI/Icons/Smart Objects Editor.png
diff --git a/Editor/UI/Icons/Smooth Terrain.png b/Assets/Editor/UI/Icons/Smooth Terrain.png
similarity index 100%
rename from Editor/UI/Icons/Smooth Terrain.png
rename to Assets/Editor/UI/Icons/Smooth Terrain.png
diff --git a/Editor/UI/Icons/SnapAngle.png b/Assets/Editor/UI/Icons/SnapAngle.png
similarity index 100%
rename from Editor/UI/Icons/SnapAngle.png
rename to Assets/Editor/UI/Icons/SnapAngle.png
diff --git a/Editor/UI/Icons/SnapGrid.png b/Assets/Editor/UI/Icons/SnapGrid.png
similarity index 100%
rename from Editor/UI/Icons/SnapGrid.png
rename to Assets/Editor/UI/Icons/SnapGrid.png
diff --git a/Editor/UI/Icons/SyncCamera.png b/Assets/Editor/UI/Icons/SyncCamera.png
similarity index 100%
rename from Editor/UI/Icons/SyncCamera.png
rename to Assets/Editor/UI/Icons/SyncCamera.png
diff --git a/Editor/UI/Icons/SyncData.png b/Assets/Editor/UI/Icons/SyncData.png
similarity index 100%
rename from Editor/UI/Icons/SyncData.png
rename to Assets/Editor/UI/Icons/SyncData.png
diff --git a/Editor/UI/Icons/Terrain Editor.png b/Assets/Editor/UI/Icons/Terrain Editor.png
similarity index 100%
rename from Editor/UI/Icons/Terrain Editor.png
rename to Assets/Editor/UI/Icons/Terrain Editor.png
diff --git a/Editor/UI/Icons/Terrain Texture Layers.png b/Assets/Editor/UI/Icons/Terrain Texture Layers.png
similarity index 100%
rename from Editor/UI/Icons/Terrain Texture Layers.png
rename to Assets/Editor/UI/Icons/Terrain Texture Layers.png
diff --git a/Editor/UI/Icons/Time of Day.png b/Assets/Editor/UI/Icons/Time of Day.png
similarity index 100%
rename from Editor/UI/Icons/Time of Day.png
rename to Assets/Editor/UI/Icons/Time of Day.png
diff --git a/Editor/UI/Icons/Top.png b/Assets/Editor/UI/Icons/Top.png
similarity index 100%
rename from Editor/UI/Icons/Top.png
rename to Assets/Editor/UI/Icons/Top.png
diff --git a/Editor/UI/Icons/Track View.png b/Assets/Editor/UI/Icons/Track View.png
similarity index 100%
rename from Editor/UI/Icons/Track View.png
rename to Assets/Editor/UI/Icons/Track View.png
diff --git a/Editor/UI/Icons/UI Emulator.png b/Assets/Editor/UI/Icons/UI Emulator.png
similarity index 100%
rename from Editor/UI/Icons/UI Emulator.png
rename to Assets/Editor/UI/Icons/UI Emulator.png
diff --git a/Editor/UI/Icons/Undo.png b/Assets/Editor/UI/Icons/Undo.png
similarity index 100%
rename from Editor/UI/Icons/Undo.png
rename to Assets/Editor/UI/Icons/Undo.png
diff --git a/Editor/UI/Icons/Unfreeze.png b/Assets/Editor/UI/Icons/Unfreeze.png
similarity index 100%
rename from Editor/UI/Icons/Unfreeze.png
rename to Assets/Editor/UI/Icons/Unfreeze.png
diff --git a/Editor/UI/Icons/Ungroup.png b/Assets/Editor/UI/Icons/Ungroup.png
similarity index 100%
rename from Editor/UI/Icons/Ungroup.png
rename to Assets/Editor/UI/Icons/Ungroup.png
diff --git a/Editor/UI/Icons/UnhideAll.png b/Assets/Editor/UI/Icons/UnhideAll.png
similarity index 100%
rename from Editor/UI/Icons/UnhideAll.png
rename to Assets/Editor/UI/Icons/UnhideAll.png
diff --git a/Editor/UI/Icons/UnhideAll_32.png b/Assets/Editor/UI/Icons/UnhideAll_32.png
similarity index 100%
rename from Editor/UI/Icons/UnhideAll_32.png
rename to Assets/Editor/UI/Icons/UnhideAll_32.png
diff --git a/Editor/UI/Icons/Unlink.png b/Assets/Editor/UI/Icons/Unlink.png
similarity index 100%
rename from Editor/UI/Icons/Unlink.png
rename to Assets/Editor/UI/Icons/Unlink.png
diff --git a/Editor/UI/Icons/UploadFilesToConsole.png b/Assets/Editor/UI/Icons/UploadFilesToConsole.png
similarity index 100%
rename from Editor/UI/Icons/UploadFilesToConsole.png
rename to Assets/Editor/UI/Icons/UploadFilesToConsole.png
diff --git a/Editor/UI/Icons/Vehicle Editor.png b/Assets/Editor/UI/Icons/Vehicle Editor.png
similarity index 100%
rename from Editor/UI/Icons/Vehicle Editor.png
rename to Assets/Editor/UI/Icons/Vehicle Editor.png
diff --git a/Editor/UI/Icons/VertexSnapping.png b/Assets/Editor/UI/Icons/VertexSnapping.png
similarity index 100%
rename from Editor/UI/Icons/VertexSnapping.png
rename to Assets/Editor/UI/Icons/VertexSnapping.png
diff --git a/Editor/UI/Icons/Visual Log Viewer.png b/Assets/Editor/UI/Icons/Visual Log Viewer.png
similarity index 100%
rename from Editor/UI/Icons/Visual Log Viewer.png
rename to Assets/Editor/UI/Icons/Visual Log Viewer.png
diff --git a/Editor/UI/Icons/VisualBudgetSystemAnalyzeOne.png b/Assets/Editor/UI/Icons/VisualBudgetSystemAnalyzeOne.png
similarity index 100%
rename from Editor/UI/Icons/VisualBudgetSystemAnalyzeOne.png
rename to Assets/Editor/UI/Icons/VisualBudgetSystemAnalyzeOne.png
diff --git a/Editor/UI/Icons/VisualBudgetSystemShow.png b/Assets/Editor/UI/Icons/VisualBudgetSystemShow.png
similarity index 100%
rename from Editor/UI/Icons/VisualBudgetSystemShow.png
rename to Assets/Editor/UI/Icons/VisualBudgetSystemShow.png
diff --git a/Editor/UI/Icons/VisualizeNavigationAccessibility.png b/Assets/Editor/UI/Icons/VisualizeNavigationAccessibility.png
similarity index 100%
rename from Editor/UI/Icons/VisualizeNavigationAccessibility.png
rename to Assets/Editor/UI/Icons/VisualizeNavigationAccessibility.png
diff --git a/Editor/UI/Icons/XAxis.png b/Assets/Editor/UI/Icons/XAxis.png
similarity index 100%
rename from Editor/UI/Icons/XAxis.png
rename to Assets/Editor/UI/Icons/XAxis.png
diff --git a/Editor/UI/Icons/XYAxis.png b/Assets/Editor/UI/Icons/XYAxis.png
similarity index 100%
rename from Editor/UI/Icons/XYAxis.png
rename to Assets/Editor/UI/Icons/XYAxis.png
diff --git a/Editor/UI/Icons/YAxis.png b/Assets/Editor/UI/Icons/YAxis.png
similarity index 100%
rename from Editor/UI/Icons/YAxis.png
rename to Assets/Editor/UI/Icons/YAxis.png
diff --git a/Editor/UI/Icons/Z View.png b/Assets/Editor/UI/Icons/Z View.png
similarity index 100%
rename from Editor/UI/Icons/Z View.png
rename to Assets/Editor/UI/Icons/Z View.png
diff --git a/Editor/UI/Icons/ZAxis.png b/Assets/Editor/UI/Icons/ZAxis.png
similarity index 100%
rename from Editor/UI/Icons/ZAxis.png
rename to Assets/Editor/UI/Icons/ZAxis.png
diff --git a/Editor/UI/Icons/asset_animated_geom.png b/Assets/Editor/UI/Icons/asset_animated_geom.png
similarity index 100%
rename from Editor/UI/Icons/asset_animated_geom.png
rename to Assets/Editor/UI/Icons/asset_animated_geom.png
diff --git a/Editor/UI/Icons/asset_character.png b/Assets/Editor/UI/Icons/asset_character.png
similarity index 100%
rename from Editor/UI/Icons/asset_character.png
rename to Assets/Editor/UI/Icons/asset_character.png
diff --git a/Editor/UI/Icons/asset_material.png b/Assets/Editor/UI/Icons/asset_material.png
similarity index 100%
rename from Editor/UI/Icons/asset_material.png
rename to Assets/Editor/UI/Icons/asset_material.png
diff --git a/Editor/UI/Icons/asset_missing_thumb.png b/Assets/Editor/UI/Icons/asset_missing_thumb.png
similarity index 100%
rename from Editor/UI/Icons/asset_missing_thumb.png
rename to Assets/Editor/UI/Icons/asset_missing_thumb.png
diff --git a/Editor/UI/Icons/asset_model.png b/Assets/Editor/UI/Icons/asset_model.png
similarity index 100%
rename from Editor/UI/Icons/asset_model.png
rename to Assets/Editor/UI/Icons/asset_model.png
diff --git a/Editor/UI/Icons/asset_sound.png b/Assets/Editor/UI/Icons/asset_sound.png
similarity index 100%
rename from Editor/UI/Icons/asset_sound.png
rename to Assets/Editor/UI/Icons/asset_sound.png
diff --git a/Editor/UI/Icons/asset_texture.png b/Assets/Editor/UI/Icons/asset_texture.png
similarity index 100%
rename from Editor/UI/Icons/asset_texture.png
rename to Assets/Editor/UI/Icons/asset_texture.png
diff --git a/Editor/UI/Icons/mann_clip.png b/Assets/Editor/UI/Icons/mann_clip.png
similarity index 100%
rename from Editor/UI/Icons/mann_clip.png
rename to Assets/Editor/UI/Icons/mann_clip.png
diff --git a/Editor/UI/Icons/mann_folder.png b/Assets/Editor/UI/Icons/mann_folder.png
similarity index 100%
rename from Editor/UI/Icons/mann_folder.png
rename to Assets/Editor/UI/Icons/mann_folder.png
diff --git a/Editor/UI/Icons/mann_tag.png b/Assets/Editor/UI/Icons/mann_tag.png
similarity index 100%
rename from Editor/UI/Icons/mann_tag.png
rename to Assets/Editor/UI/Icons/mann_tag.png
diff --git a/Editor/UI/Icons/toolbar/Load_Icon.png b/Assets/Editor/UI/Icons/toolbar/Load_Icon.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/Load_Icon.png
rename to Assets/Editor/UI/Icons/toolbar/Load_Icon.png
diff --git a/Editor/UI/Icons/toolbar/itemAdd.png b/Assets/Editor/UI/Icons/toolbar/itemAdd.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/itemAdd.png
rename to Assets/Editor/UI/Icons/toolbar/itemAdd.png
diff --git a/Editor/UI/Icons/toolbar/itemAssign.png b/Assets/Editor/UI/Icons/toolbar/itemAssign.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/itemAssign.png
rename to Assets/Editor/UI/Icons/toolbar/itemAssign.png
diff --git a/Editor/UI/Icons/toolbar/itemClone.png b/Assets/Editor/UI/Icons/toolbar/itemClone.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/itemClone.png
rename to Assets/Editor/UI/Icons/toolbar/itemClone.png
diff --git a/Editor/UI/Icons/toolbar/itemGetProperties.png b/Assets/Editor/UI/Icons/toolbar/itemGetProperties.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/itemGetProperties.png
rename to Assets/Editor/UI/Icons/toolbar/itemGetProperties.png
diff --git a/Editor/UI/Icons/toolbar/itemReload.png b/Assets/Editor/UI/Icons/toolbar/itemReload.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/itemReload.png
rename to Assets/Editor/UI/Icons/toolbar/itemReload.png
diff --git a/Editor/UI/Icons/toolbar/itemRemove.png b/Assets/Editor/UI/Icons/toolbar/itemRemove.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/itemRemove.png
rename to Assets/Editor/UI/Icons/toolbar/itemRemove.png
diff --git a/Editor/UI/Icons/toolbar/libraryAdd.png b/Assets/Editor/UI/Icons/toolbar/libraryAdd.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/libraryAdd.png
rename to Assets/Editor/UI/Icons/toolbar/libraryAdd.png
diff --git a/Editor/UI/Icons/toolbar/libraryLoad.png b/Assets/Editor/UI/Icons/toolbar/libraryLoad.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/libraryLoad.png
rename to Assets/Editor/UI/Icons/toolbar/libraryLoad.png
diff --git a/Editor/UI/Icons/toolbar/libraryReload.png b/Assets/Editor/UI/Icons/toolbar/libraryReload.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/libraryReload.png
rename to Assets/Editor/UI/Icons/toolbar/libraryReload.png
diff --git a/Editor/UI/Icons/toolbar/libraryRemove.png b/Assets/Editor/UI/Icons/toolbar/libraryRemove.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/libraryRemove.png
rename to Assets/Editor/UI/Icons/toolbar/libraryRemove.png
diff --git a/Editor/UI/Icons/toolbar/librarySave.png b/Assets/Editor/UI/Icons/toolbar/librarySave.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/librarySave.png
rename to Assets/Editor/UI/Icons/toolbar/librarySave.png
diff --git a/Editor/UI/Icons/toolbar/particleSpecialActivate.png b/Assets/Editor/UI/Icons/toolbar/particleSpecialActivate.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/particleSpecialActivate.png
rename to Assets/Editor/UI/Icons/toolbar/particleSpecialActivate.png
diff --git a/Editor/UI/Icons/toolbar/particleSpecialReset.png b/Assets/Editor/UI/Icons/toolbar/particleSpecialReset.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/particleSpecialReset.png
rename to Assets/Editor/UI/Icons/toolbar/particleSpecialReset.png
diff --git a/Editor/UI/Icons/toolbar/standardCopy.png b/Assets/Editor/UI/Icons/toolbar/standardCopy.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/standardCopy.png
rename to Assets/Editor/UI/Icons/toolbar/standardCopy.png
diff --git a/Editor/UI/Icons/toolbar/standardPaste.png b/Assets/Editor/UI/Icons/toolbar/standardPaste.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/standardPaste.png
rename to Assets/Editor/UI/Icons/toolbar/standardPaste.png
diff --git a/Editor/UI/Icons/toolbar/standardRedo.png b/Assets/Editor/UI/Icons/toolbar/standardRedo.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/standardRedo.png
rename to Assets/Editor/UI/Icons/toolbar/standardRedo.png
diff --git a/Editor/UI/Icons/toolbar/standardUndo.png b/Assets/Editor/UI/Icons/toolbar/standardUndo.png
similarity index 100%
rename from Editor/UI/Icons/toolbar/standardUndo.png
rename to Assets/Editor/UI/Icons/toolbar/standardUndo.png
diff --git a/Editor/UI/Icons/treeview/ParticleEditor/empty_icon.png b/Assets/Editor/UI/Icons/treeview/ParticleEditor/empty_icon.png
similarity index 100%
rename from Editor/UI/Icons/treeview/ParticleEditor/empty_icon.png
rename to Assets/Editor/UI/Icons/treeview/ParticleEditor/empty_icon.png
diff --git a/Editor/UI/Icons/treeview/ParticleEditor/group_icon.png b/Assets/Editor/UI/Icons/treeview/ParticleEditor/group_icon.png
similarity index 100%
rename from Editor/UI/Icons/treeview/ParticleEditor/group_icon.png
rename to Assets/Editor/UI/Icons/treeview/ParticleEditor/group_icon.png
diff --git a/Editor/UI/Icons/treeview/ParticleEditor/group_with_lod_icon.png b/Assets/Editor/UI/Icons/treeview/ParticleEditor/group_with_lod_icon.png
similarity index 100%
rename from Editor/UI/Icons/treeview/ParticleEditor/group_with_lod_icon.png
rename to Assets/Editor/UI/Icons/treeview/ParticleEditor/group_with_lod_icon.png
diff --git a/Editor/UI/Icons/treeview/ParticleEditor/lod_icon.png b/Assets/Editor/UI/Icons/treeview/ParticleEditor/lod_icon.png
similarity index 100%
rename from Editor/UI/Icons/treeview/ParticleEditor/lod_icon.png
rename to Assets/Editor/UI/Icons/treeview/ParticleEditor/lod_icon.png
diff --git a/Editor/UI/Icons/treeview/group.png b/Assets/Editor/UI/Icons/treeview/group.png
similarity index 100%
rename from Editor/UI/Icons/treeview/group.png
rename to Assets/Editor/UI/Icons/treeview/group.png
diff --git a/Editor/UI/Icons/treeview/group_inactive.png b/Assets/Editor/UI/Icons/treeview/group_inactive.png
similarity index 100%
rename from Editor/UI/Icons/treeview/group_inactive.png
rename to Assets/Editor/UI/Icons/treeview/group_inactive.png
diff --git a/Editor/UI/Icons/treeview/item.png b/Assets/Editor/UI/Icons/treeview/item.png
similarity index 100%
rename from Editor/UI/Icons/treeview/item.png
rename to Assets/Editor/UI/Icons/treeview/item.png
diff --git a/Editor/UI/Icons/treeview/item_inactive.png b/Assets/Editor/UI/Icons/treeview/item_inactive.png
similarity index 100%
rename from Editor/UI/Icons/treeview/item_inactive.png
rename to Assets/Editor/UI/Icons/treeview/item_inactive.png
diff --git a/Editor/UI/WipFeatures.xml b/Assets/Editor/UI/WipFeatures.xml
similarity index 100%
rename from Editor/UI/WipFeatures.xml
rename to Assets/Editor/UI/WipFeatures.xml
diff --git a/Editor/UI/releaseTranslations.py b/Assets/Editor/UI/releaseTranslations.py
similarity index 100%
rename from Editor/UI/releaseTranslations.py
rename to Assets/Editor/UI/releaseTranslations.py
diff --git a/Editor/UI/removeTranslationFiles.py b/Assets/Editor/UI/removeTranslationFiles.py
similarity index 100%
rename from Editor/UI/removeTranslationFiles.py
rename to Assets/Editor/UI/removeTranslationFiles.py
diff --git a/Editor/UI/updateTranslatableText.py b/Assets/Editor/UI/updateTranslatableText.py
similarity index 100%
rename from Editor/UI/updateTranslatableText.py
rename to Assets/Editor/UI/updateTranslatableText.py
diff --git a/Editor/UserTools.xml b/Assets/Editor/UserTools.xml
similarity index 100%
rename from Editor/UserTools.xml
rename to Assets/Editor/UserTools.xml
diff --git a/Editor/asset_thumbnail.tod b/Assets/Editor/asset_thumbnail.tod
similarity index 100%
rename from Editor/asset_thumbnail.tod
rename to Assets/Editor/asset_thumbnail.tod
diff --git a/Editor/default_time_of_day.xml b/Assets/Editor/default_time_of_day.xml
similarity index 100%
rename from Editor/default_time_of_day.xml
rename to Assets/Editor/default_time_of_day.xml
diff --git a/Editor/uiCanvasEditorResolutionPresets.xml b/Assets/Editor/uiCanvasEditorResolutionPresets.xml
similarity index 100%
rename from Editor/uiCanvasEditorResolutionPresets.xml
rename to Assets/Editor/uiCanvasEditorResolutionPresets.xml
diff --git a/Engine/Config/AutoTestChain.cfg b/Assets/Engine/Config/AutoTestChain.cfg
similarity index 100%
rename from Engine/Config/AutoTestChain.cfg
rename to Assets/Engine/Config/AutoTestChain.cfg
diff --git a/Engine/Config/AutoTestTimeDemo.cfg b/Assets/Engine/Config/AutoTestTimeDemo.cfg
similarity index 100%
rename from Engine/Config/AutoTestTimeDemo.cfg
rename to Assets/Engine/Config/AutoTestTimeDemo.cfg
diff --git a/Engine/Config/AutotestPlaythrough.cfg b/Assets/Engine/Config/AutotestPlaythrough.cfg
similarity index 100%
rename from Engine/Config/AutotestPlaythrough.cfg
rename to Assets/Engine/Config/AutotestPlaythrough.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Full.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Full.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Full.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Full.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_GameEffects.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_GameEffects.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_GameEffects.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_GameEffects.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_ObjectDetail.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_ObjectDetail.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_ObjectDetail.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_ObjectDetail.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Particles.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Particles.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Particles.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Particles.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Physics.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Physics.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Physics.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Physics.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_PostProcessing.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_PostProcessing.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_PostProcessing.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_PostProcessing.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Quality.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Quality.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Quality.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Quality.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Shading.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Shading.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Shading.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Shading.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Shadows.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Shadows.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Shadows.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Shadows.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Sound.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Sound.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Sound.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Sound.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Texture.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Texture.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Texture.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Texture.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_TextureResolution.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_TextureResolution.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_TextureResolution.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_TextureResolution.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_VolumetricEffects.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_VolumetricEffects.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_VolumetricEffects.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_VolumetricEffects.cfg
diff --git a/Engine/Config/CVarGroups/sys_spec_Water.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Water.cfg
similarity index 100%
rename from Engine/Config/CVarGroups/sys_spec_Water.cfg
rename to Assets/Engine/Config/CVarGroups/sys_spec_Water.cfg
diff --git a/Engine/Config/HDD_cache.xml b/Assets/Engine/Config/HDD_cache.xml
similarity index 100%
rename from Engine/Config/HDD_cache.xml
rename to Assets/Engine/Config/HDD_cache.xml
diff --git a/Engine/Config/PerfHud_PC.xml b/Assets/Engine/Config/PerfHud_PC.xml
similarity index 100%
rename from Engine/Config/PerfHud_PC.xml
rename to Assets/Engine/Config/PerfHud_PC.xml
diff --git a/Engine/Config/aidebug.cfg b/Assets/Engine/Config/aidebug.cfg
similarity index 100%
rename from Engine/Config/aidebug.cfg
rename to Assets/Engine/Config/aidebug.cfg
diff --git a/Engine/Config/artprof.cfg b/Assets/Engine/Config/artprof.cfg
similarity index 100%
rename from Engine/Config/artprof.cfg
rename to Assets/Engine/Config/artprof.cfg
diff --git a/Engine/Config/artprof_user.cfg b/Assets/Engine/Config/artprof_user.cfg
similarity index 100%
rename from Engine/Config/artprof_user.cfg
rename to Assets/Engine/Config/artprof_user.cfg
diff --git a/Engine/Config/benchmark_cpu.cfg b/Assets/Engine/Config/benchmark_cpu.cfg
similarity index 100%
rename from Engine/Config/benchmark_cpu.cfg
rename to Assets/Engine/Config/benchmark_cpu.cfg
diff --git a/Engine/Config/benchmark_gpu.cfg b/Assets/Engine/Config/benchmark_gpu.cfg
similarity index 100%
rename from Engine/Config/benchmark_gpu.cfg
rename to Assets/Engine/Config/benchmark_gpu.cfg
diff --git a/Engine/Config/config.dat b/Assets/Engine/Config/config.dat
similarity index 100%
rename from Engine/Config/config.dat
rename to Assets/Engine/Config/config.dat
diff --git a/Engine/Config/engine_core.thread_config b/Assets/Engine/Config/engine_core.thread_config
similarity index 100%
rename from Engine/Config/engine_core.thread_config
rename to Assets/Engine/Config/engine_core.thread_config
diff --git a/Engine/Config/engine_sandbox.thread_config b/Assets/Engine/Config/engine_sandbox.thread_config
similarity index 100%
rename from Engine/Config/engine_sandbox.thread_config
rename to Assets/Engine/Config/engine_sandbox.thread_config
diff --git a/Engine/Config/gpu/amd.txt b/Assets/Engine/Config/gpu/amd.txt
similarity index 100%
rename from Engine/Config/gpu/amd.txt
rename to Assets/Engine/Config/gpu/amd.txt
diff --git a/Engine/Config/gpu/android_gpus.xml b/Assets/Engine/Config/gpu/android_gpus.xml
similarity index 100%
rename from Engine/Config/gpu/android_gpus.xml
rename to Assets/Engine/Config/gpu/android_gpus.xml
diff --git a/Engine/Config/gpu/android_models.xml b/Assets/Engine/Config/gpu/android_models.xml
similarity index 100%
rename from Engine/Config/gpu/android_models.xml
rename to Assets/Engine/Config/gpu/android_models.xml
diff --git a/Engine/Config/gpu/intel.txt b/Assets/Engine/Config/gpu/intel.txt
similarity index 100%
rename from Engine/Config/gpu/intel.txt
rename to Assets/Engine/Config/gpu/intel.txt
diff --git a/Engine/Config/gpu/ios_models.xml b/Assets/Engine/Config/gpu/ios_models.xml
similarity index 100%
rename from Engine/Config/gpu/ios_models.xml
rename to Assets/Engine/Config/gpu/ios_models.xml
diff --git a/Engine/Config/gpu/nvidia.txt b/Assets/Engine/Config/gpu/nvidia.txt
similarity index 100%
rename from Engine/Config/gpu/nvidia.txt
rename to Assets/Engine/Config/gpu/nvidia.txt
diff --git a/Engine/Config/mgpu.cfg b/Assets/Engine/Config/mgpu.cfg
similarity index 100%
rename from Engine/Config/mgpu.cfg
rename to Assets/Engine/Config/mgpu.cfg
diff --git a/Engine/Config/multiplayer.cfg b/Assets/Engine/Config/multiplayer.cfg
similarity index 100%
rename from Engine/Config/multiplayer.cfg
rename to Assets/Engine/Config/multiplayer.cfg
diff --git a/Engine/Config/multiplayer_console.cfg b/Assets/Engine/Config/multiplayer_console.cfg
similarity index 100%
rename from Engine/Config/multiplayer_console.cfg
rename to Assets/Engine/Config/multiplayer_console.cfg
diff --git a/Engine/Config/multiplayer_pc.cfg b/Assets/Engine/Config/multiplayer_pc.cfg
similarity index 100%
rename from Engine/Config/multiplayer_pc.cfg
rename to Assets/Engine/Config/multiplayer_pc.cfg
diff --git a/Engine/Config/performance.cfg b/Assets/Engine/Config/performance.cfg
similarity index 100%
rename from Engine/Config/performance.cfg
rename to Assets/Engine/Config/performance.cfg
diff --git a/Engine/Config/recording.cfg b/Assets/Engine/Config/recording.cfg
similarity index 100%
rename from Engine/Config/recording.cfg
rename to Assets/Engine/Config/recording.cfg
diff --git a/Engine/Config/singleplayer.cfg b/Assets/Engine/Config/singleplayer.cfg
similarity index 100%
rename from Engine/Config/singleplayer.cfg
rename to Assets/Engine/Config/singleplayer.cfg
diff --git a/Engine/Config/sketch_off.cfg b/Assets/Engine/Config/sketch_off.cfg
similarity index 100%
rename from Engine/Config/sketch_off.cfg
rename to Assets/Engine/Config/sketch_off.cfg
diff --git a/Engine/Config/sketch_on.cfg b/Assets/Engine/Config/sketch_on.cfg
similarity index 100%
rename from Engine/Config/sketch_on.cfg
rename to Assets/Engine/Config/sketch_on.cfg
diff --git a/Engine/Config/spec/android_MaliT760.cfg b/Assets/Engine/Config/spec/android_MaliT760.cfg
similarity index 100%
rename from Engine/Config/spec/android_MaliT760.cfg
rename to Assets/Engine/Config/spec/android_MaliT760.cfg
diff --git a/Engine/Config/spec/android_high.cfg b/Assets/Engine/Config/spec/android_high.cfg
similarity index 100%
rename from Engine/Config/spec/android_high.cfg
rename to Assets/Engine/Config/spec/android_high.cfg
diff --git a/Engine/Config/spec/android_high_nogmem.cfg b/Assets/Engine/Config/spec/android_high_nogmem.cfg
similarity index 100%
rename from Engine/Config/spec/android_high_nogmem.cfg
rename to Assets/Engine/Config/spec/android_high_nogmem.cfg
diff --git a/Engine/Config/spec/android_low.cfg b/Assets/Engine/Config/spec/android_low.cfg
similarity index 100%
rename from Engine/Config/spec/android_low.cfg
rename to Assets/Engine/Config/spec/android_low.cfg
diff --git a/Engine/Config/spec/android_medium.cfg b/Assets/Engine/Config/spec/android_medium.cfg
similarity index 100%
rename from Engine/Config/spec/android_medium.cfg
rename to Assets/Engine/Config/spec/android_medium.cfg
diff --git a/Engine/Config/spec/android_veryhigh.cfg b/Assets/Engine/Config/spec/android_veryhigh.cfg
similarity index 100%
rename from Engine/Config/spec/android_veryhigh.cfg
rename to Assets/Engine/Config/spec/android_veryhigh.cfg
diff --git a/Engine/Config/spec/ios_high.cfg b/Assets/Engine/Config/spec/ios_high.cfg
similarity index 100%
rename from Engine/Config/spec/ios_high.cfg
rename to Assets/Engine/Config/spec/ios_high.cfg
diff --git a/Engine/Config/spec/ios_low.cfg b/Assets/Engine/Config/spec/ios_low.cfg
similarity index 100%
rename from Engine/Config/spec/ios_low.cfg
rename to Assets/Engine/Config/spec/ios_low.cfg
diff --git a/Engine/Config/spec/ios_medium.cfg b/Assets/Engine/Config/spec/ios_medium.cfg
similarity index 100%
rename from Engine/Config/spec/ios_medium.cfg
rename to Assets/Engine/Config/spec/ios_medium.cfg
diff --git a/Engine/Config/spec/ios_veryhigh.cfg b/Assets/Engine/Config/spec/ios_veryhigh.cfg
similarity index 100%
rename from Engine/Config/spec/ios_veryhigh.cfg
rename to Assets/Engine/Config/spec/ios_veryhigh.cfg
diff --git a/Engine/Config/spec/osx_metal_high.cfg b/Assets/Engine/Config/spec/osx_metal_high.cfg
similarity index 100%
rename from Engine/Config/spec/osx_metal_high.cfg
rename to Assets/Engine/Config/spec/osx_metal_high.cfg
diff --git a/Engine/Config/spec/osx_metal_low.cfg b/Assets/Engine/Config/spec/osx_metal_low.cfg
similarity index 100%
rename from Engine/Config/spec/osx_metal_low.cfg
rename to Assets/Engine/Config/spec/osx_metal_low.cfg
diff --git a/Engine/Config/spec/osx_metal_medium.cfg b/Assets/Engine/Config/spec/osx_metal_medium.cfg
similarity index 100%
rename from Engine/Config/spec/osx_metal_medium.cfg
rename to Assets/Engine/Config/spec/osx_metal_medium.cfg
diff --git a/Engine/Config/spec/osx_metal_veryhigh.cfg b/Assets/Engine/Config/spec/osx_metal_veryhigh.cfg
similarity index 100%
rename from Engine/Config/spec/osx_metal_veryhigh.cfg
rename to Assets/Engine/Config/spec/osx_metal_veryhigh.cfg
diff --git a/Engine/Config/spec/pc_high.cfg b/Assets/Engine/Config/spec/pc_high.cfg
similarity index 100%
rename from Engine/Config/spec/pc_high.cfg
rename to Assets/Engine/Config/spec/pc_high.cfg
diff --git a/Engine/Config/spec/pc_low.cfg b/Assets/Engine/Config/spec/pc_low.cfg
similarity index 100%
rename from Engine/Config/spec/pc_low.cfg
rename to Assets/Engine/Config/spec/pc_low.cfg
diff --git a/Engine/Config/spec/pc_medium.cfg b/Assets/Engine/Config/spec/pc_medium.cfg
similarity index 100%
rename from Engine/Config/spec/pc_medium.cfg
rename to Assets/Engine/Config/spec/pc_medium.cfg
diff --git a/Engine/Config/spec/pc_veryhigh.cfg b/Assets/Engine/Config/spec/pc_veryhigh.cfg
similarity index 100%
rename from Engine/Config/spec/pc_veryhigh.cfg
rename to Assets/Engine/Config/spec/pc_veryhigh.cfg
diff --git a/Engine/Config/statoscope.cfg b/Assets/Engine/Config/statoscope.cfg
similarity index 100%
rename from Engine/Config/statoscope.cfg
rename to Assets/Engine/Config/statoscope.cfg
diff --git a/Engine/Config/user.cfg b/Assets/Engine/Config/user.cfg
similarity index 100%
rename from Engine/Config/user.cfg
rename to Assets/Engine/Config/user.cfg
diff --git a/Engine/Config/vid_capture_reset.cfg b/Assets/Engine/Config/vid_capture_reset.cfg
similarity index 100%
rename from Engine/Config/vid_capture_reset.cfg
rename to Assets/Engine/Config/vid_capture_reset.cfg
diff --git a/Engine/Config/vid_capture_setup.cfg b/Assets/Engine/Config/vid_capture_setup.cfg
similarity index 100%
rename from Engine/Config/vid_capture_setup.cfg
rename to Assets/Engine/Config/vid_capture_setup.cfg
diff --git a/Engine/Config/vid_capture_start.cfg b/Assets/Engine/Config/vid_capture_start.cfg
similarity index 100%
rename from Engine/Config/vid_capture_start.cfg
rename to Assets/Engine/Config/vid_capture_start.cfg
diff --git a/Engine/Config/vid_capture_stop.cfg b/Assets/Engine/Config/vid_capture_stop.cfg
similarity index 100%
rename from Engine/Config/vid_capture_stop.cfg
rename to Assets/Engine/Config/vid_capture_stop.cfg
diff --git a/Engine/Config/vr.cfg b/Assets/Engine/Config/vr.cfg
similarity index 100%
rename from Engine/Config/vr.cfg
rename to Assets/Engine/Config/vr.cfg
diff --git a/Engine/EngineAssets/Animated/WaterVolume.dds b/Assets/Engine/EngineAssets/Animated/WaterVolume.dds
similarity index 100%
rename from Engine/EngineAssets/Animated/WaterVolume.dds
rename to Assets/Engine/EngineAssets/Animated/WaterVolume.dds
diff --git a/Engine/EngineAssets/CodeCoverage/hit.tif b/Assets/Engine/EngineAssets/CodeCoverage/hit.tif
similarity index 100%
rename from Engine/EngineAssets/CodeCoverage/hit.tif
rename to Assets/Engine/EngineAssets/CodeCoverage/hit.tif
diff --git a/Engine/EngineAssets/CodeCoverage/hit.tif.exportsettings b/Assets/Engine/EngineAssets/CodeCoverage/hit.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/CodeCoverage/hit.tif.exportsettings
rename to Assets/Engine/EngineAssets/CodeCoverage/hit.tif.exportsettings
diff --git a/Engine/EngineAssets/CodeCoverage/pbar.tif b/Assets/Engine/EngineAssets/CodeCoverage/pbar.tif
similarity index 100%
rename from Engine/EngineAssets/CodeCoverage/pbar.tif
rename to Assets/Engine/EngineAssets/CodeCoverage/pbar.tif
diff --git a/Engine/EngineAssets/CodeCoverage/pbar.tif.exportsettings b/Assets/Engine/EngineAssets/CodeCoverage/pbar.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/CodeCoverage/pbar.tif.exportsettings
rename to Assets/Engine/EngineAssets/CodeCoverage/pbar.tif.exportsettings
diff --git a/Engine/EngineAssets/CodeCoverage/unexpected.tif b/Assets/Engine/EngineAssets/CodeCoverage/unexpected.tif
similarity index 100%
rename from Engine/EngineAssets/CodeCoverage/unexpected.tif
rename to Assets/Engine/EngineAssets/CodeCoverage/unexpected.tif
diff --git a/Engine/EngineAssets/CodeCoverage/unexpected.tif.exportsettings b/Assets/Engine/EngineAssets/CodeCoverage/unexpected.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/CodeCoverage/unexpected.tif.exportsettings
rename to Assets/Engine/EngineAssets/CodeCoverage/unexpected.tif.exportsettings
diff --git a/Engine/EngineAssets/Icons/AverageMemoryUsage.TIF b/Assets/Engine/EngineAssets/Icons/AverageMemoryUsage.TIF
similarity index 100%
rename from Engine/EngineAssets/Icons/AverageMemoryUsage.TIF
rename to Assets/Engine/EngineAssets/Icons/AverageMemoryUsage.TIF
diff --git a/Engine/EngineAssets/Icons/AverageMemoryUsage.TIF.exportsettings b/Assets/Engine/EngineAssets/Icons/AverageMemoryUsage.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/AverageMemoryUsage.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Icons/AverageMemoryUsage.TIF.exportsettings
diff --git a/Engine/EngineAssets/Icons/HighMemoryUsage.TIF b/Assets/Engine/EngineAssets/Icons/HighMemoryUsage.TIF
similarity index 100%
rename from Engine/EngineAssets/Icons/HighMemoryUsage.TIF
rename to Assets/Engine/EngineAssets/Icons/HighMemoryUsage.TIF
diff --git a/Engine/EngineAssets/Icons/HighMemoryUsage.TIF.exportsettings b/Assets/Engine/EngineAssets/Icons/HighMemoryUsage.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/HighMemoryUsage.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Icons/HighMemoryUsage.TIF.exportsettings
diff --git a/Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif b/Assets/Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif
similarity index 100%
rename from Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif
rename to Assets/Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif
diff --git a/Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif.exportsettings b/Assets/Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif.exportsettings
rename to Assets/Engine/EngineAssets/Icons/LevelShaderCacheMiss.tif.exportsettings
diff --git a/Engine/EngineAssets/Icons/LivePreview.TIF b/Assets/Engine/EngineAssets/Icons/LivePreview.TIF
similarity index 100%
rename from Engine/EngineAssets/Icons/LivePreview.TIF
rename to Assets/Engine/EngineAssets/Icons/LivePreview.TIF
diff --git a/Engine/EngineAssets/Icons/LivePreview.TIF.exportsettings b/Assets/Engine/EngineAssets/Icons/LivePreview.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/LivePreview.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Icons/LivePreview.TIF.exportsettings
diff --git a/Engine/EngineAssets/Icons/LowMemoryUsage.TIF b/Assets/Engine/EngineAssets/Icons/LowMemoryUsage.TIF
similarity index 100%
rename from Engine/EngineAssets/Icons/LowMemoryUsage.TIF
rename to Assets/Engine/EngineAssets/Icons/LowMemoryUsage.TIF
diff --git a/Engine/EngineAssets/Icons/LowMemoryUsage.TIF.exportsettings b/Assets/Engine/EngineAssets/Icons/LowMemoryUsage.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/LowMemoryUsage.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Icons/LowMemoryUsage.TIF.exportsettings
diff --git a/Engine/EngineAssets/Icons/NavigationProcessing.tif b/Assets/Engine/EngineAssets/Icons/NavigationProcessing.tif
similarity index 100%
rename from Engine/EngineAssets/Icons/NavigationProcessing.tif
rename to Assets/Engine/EngineAssets/Icons/NavigationProcessing.tif
diff --git a/Engine/EngineAssets/Icons/NavigationProcessing.tif.exportsettings b/Assets/Engine/EngineAssets/Icons/NavigationProcessing.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/NavigationProcessing.tif.exportsettings
rename to Assets/Engine/EngineAssets/Icons/NavigationProcessing.tif.exportsettings
diff --git a/Engine/EngineAssets/Icons/NullSoundSystem.tif b/Assets/Engine/EngineAssets/Icons/NullSoundSystem.tif
similarity index 100%
rename from Engine/EngineAssets/Icons/NullSoundSystem.tif
rename to Assets/Engine/EngineAssets/Icons/NullSoundSystem.tif
diff --git a/Engine/EngineAssets/Icons/NullSoundSystem.tif.exportsettings b/Assets/Engine/EngineAssets/Icons/NullSoundSystem.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/NullSoundSystem.tif.exportsettings
rename to Assets/Engine/EngineAssets/Icons/NullSoundSystem.tif.exportsettings
diff --git a/Engine/EngineAssets/Icons/ShaderCompiling.tif b/Assets/Engine/EngineAssets/Icons/ShaderCompiling.tif
similarity index 100%
rename from Engine/EngineAssets/Icons/ShaderCompiling.tif
rename to Assets/Engine/EngineAssets/Icons/ShaderCompiling.tif
diff --git a/Engine/EngineAssets/Icons/ShaderCompiling.tif.exportsettings b/Assets/Engine/EngineAssets/Icons/ShaderCompiling.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/ShaderCompiling.tif.exportsettings
rename to Assets/Engine/EngineAssets/Icons/ShaderCompiling.tif.exportsettings
diff --git a/Engine/EngineAssets/Icons/Streaming.tif b/Assets/Engine/EngineAssets/Icons/Streaming.tif
similarity index 100%
rename from Engine/EngineAssets/Icons/Streaming.tif
rename to Assets/Engine/EngineAssets/Icons/Streaming.tif
diff --git a/Engine/EngineAssets/Icons/Streaming.tif.exportsettings b/Assets/Engine/EngineAssets/Icons/Streaming.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/Streaming.tif.exportsettings
rename to Assets/Engine/EngineAssets/Icons/Streaming.tif.exportsettings
diff --git a/Engine/EngineAssets/Icons/StreamingTerrain.tif b/Assets/Engine/EngineAssets/Icons/StreamingTerrain.tif
similarity index 100%
rename from Engine/EngineAssets/Icons/StreamingTerrain.tif
rename to Assets/Engine/EngineAssets/Icons/StreamingTerrain.tif
diff --git a/Engine/EngineAssets/Icons/StreamingTerrain.tif.exportsettings b/Assets/Engine/EngineAssets/Icons/StreamingTerrain.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Icons/StreamingTerrain.tif.exportsettings
rename to Assets/Engine/EngineAssets/Icons/StreamingTerrain.tif.exportsettings
diff --git a/Engine/EngineAssets/LevelForSliceEditing/LevelForSliceEditing.ly b/Assets/Engine/EngineAssets/LevelForSliceEditing/LevelForSliceEditing.ly
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/LevelForSliceEditing.ly
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/LevelForSliceEditing.ly
diff --git a/Engine/EngineAssets/LevelForSliceEditing/filelist.xml b/Assets/Engine/EngineAssets/LevelForSliceEditing/filelist.xml
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/filelist.xml
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/filelist.xml
diff --git a/Engine/EngineAssets/LevelForSliceEditing/level.pak b/Assets/Engine/EngineAssets/LevelForSliceEditing/level.pak
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/level.pak
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/level.pak
diff --git a/Engine/EngineAssets/LevelForSliceEditing/leveldata/environment.xml b/Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/environment.xml
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/leveldata/environment.xml
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/environment.xml
diff --git a/Engine/EngineAssets/LevelForSliceEditing/leveldata/heightmap.dat b/Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/heightmap.dat
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/leveldata/heightmap.dat
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/heightmap.dat
diff --git a/Engine/EngineAssets/LevelForSliceEditing/leveldata/terraintexture.xml b/Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/terraintexture.xml
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/leveldata/terraintexture.xml
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/terraintexture.xml
diff --git a/Engine/EngineAssets/LevelForSliceEditing/leveldata/timeofday.xml b/Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/timeofday.xml
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/leveldata/timeofday.xml
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/timeofday.xml
diff --git a/Engine/EngineAssets/LevelForSliceEditing/leveldata/vegetationmap.dat b/Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/vegetationmap.dat
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/leveldata/vegetationmap.dat
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/leveldata/vegetationmap.dat
diff --git a/Engine/EngineAssets/LevelForSliceEditing/tags.txt b/Assets/Engine/EngineAssets/LevelForSliceEditing/tags.txt
similarity index 100%
rename from Engine/EngineAssets/LevelForSliceEditing/tags.txt
rename to Assets/Engine/EngineAssets/LevelForSliceEditing/tags.txt
diff --git a/Engine/EngineAssets/Materials/Fog/FogVolumeBox.mtl b/Assets/Engine/EngineAssets/Materials/Fog/FogVolumeBox.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/FogVolumeBox.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/FogVolumeBox.mtl
diff --git a/Engine/EngineAssets/Materials/Fog/FogVolumeEllipsoid.mtl b/Assets/Engine/EngineAssets/Materials/Fog/FogVolumeEllipsoid.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/FogVolumeEllipsoid.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/FogVolumeEllipsoid.mtl
diff --git a/Engine/EngineAssets/Materials/Fog/OceanInto.mtl b/Assets/Engine/EngineAssets/Materials/Fog/OceanInto.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/OceanInto.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/OceanInto.mtl
diff --git a/Engine/EngineAssets/Materials/Fog/OceanIntoLowSpec.mtl b/Assets/Engine/EngineAssets/Materials/Fog/OceanIntoLowSpec.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/OceanIntoLowSpec.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/OceanIntoLowSpec.mtl
diff --git a/Engine/EngineAssets/Materials/Fog/OceanOutof.mtl b/Assets/Engine/EngineAssets/Materials/Fog/OceanOutof.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/OceanOutof.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/OceanOutof.mtl
diff --git a/Engine/EngineAssets/Materials/Fog/OceanOutofLowSpec.mtl b/Assets/Engine/EngineAssets/Materials/Fog/OceanOutofLowSpec.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/OceanOutofLowSpec.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/OceanOutofLowSpec.mtl
diff --git a/Engine/EngineAssets/Materials/Fog/WaterFogVolumeInto.mtl b/Assets/Engine/EngineAssets/Materials/Fog/WaterFogVolumeInto.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/WaterFogVolumeInto.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/WaterFogVolumeInto.mtl
diff --git a/Engine/EngineAssets/Materials/Fog/WaterFogVolumeOutof.mtl b/Assets/Engine/EngineAssets/Materials/Fog/WaterFogVolumeOutof.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Fog/WaterFogVolumeOutof.mtl
rename to Assets/Engine/EngineAssets/Materials/Fog/WaterFogVolumeOutof.mtl
diff --git a/Engine/EngineAssets/Materials/PhysProxyTooBig.mtl b/Assets/Engine/EngineAssets/Materials/PhysProxyTooBig.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/PhysProxyTooBig.mtl
rename to Assets/Engine/EngineAssets/Materials/PhysProxyTooBig.mtl
diff --git a/Engine/EngineAssets/Materials/Water/WaterOceanBottom.mtl b/Assets/Engine/EngineAssets/Materials/Water/WaterOceanBottom.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Water/WaterOceanBottom.mtl
rename to Assets/Engine/EngineAssets/Materials/Water/WaterOceanBottom.mtl
diff --git a/Engine/EngineAssets/Materials/Water/ocean_default.mtl b/Assets/Engine/EngineAssets/Materials/Water/ocean_default.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/Water/ocean_default.mtl
rename to Assets/Engine/EngineAssets/Materials/Water/ocean_default.mtl
diff --git a/Engine/EngineAssets/Materials/collision_proxy_entitiesonly.mtl b/Assets/Engine/EngineAssets/Materials/collision_proxy_entitiesonly.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/collision_proxy_entitiesonly.mtl
rename to Assets/Engine/EngineAssets/Materials/collision_proxy_entitiesonly.mtl
diff --git a/Engine/EngineAssets/Materials/decals/default.mtl b/Assets/Engine/EngineAssets/Materials/decals/default.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/decals/default.mtl
rename to Assets/Engine/EngineAssets/Materials/decals/default.mtl
diff --git a/Engine/EngineAssets/Materials/lens_optics.mtl b/Assets/Engine/EngineAssets/Materials/lens_optics.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/lens_optics.mtl
rename to Assets/Engine/EngineAssets/Materials/lens_optics.mtl
diff --git a/Engine/EngineAssets/Materials/sky/sky.mtl b/Assets/Engine/EngineAssets/Materials/sky/sky.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/sky/sky.mtl
rename to Assets/Engine/EngineAssets/Materials/sky/sky.mtl
diff --git a/Engine/EngineAssets/Materials/test/Holotest/hologram.mtl b/Assets/Engine/EngineAssets/Materials/test/Holotest/hologram.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/Holotest/hologram.mtl
rename to Assets/Engine/EngineAssets/Materials/test/Holotest/hologram.mtl
diff --git a/Engine/EngineAssets/Materials/test/Holotest/test2.tif b/Assets/Engine/EngineAssets/Materials/test/Holotest/test2.tif
similarity index 100%
rename from Engine/EngineAssets/Materials/test/Holotest/test2.tif
rename to Assets/Engine/EngineAssets/Materials/test/Holotest/test2.tif
diff --git a/Engine/EngineAssets/Materials/test/Holotest/test2.tif.exportsettings b/Assets/Engine/EngineAssets/Materials/test/Holotest/test2.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Materials/test/Holotest/test2.tif.exportsettings
rename to Assets/Engine/EngineAssets/Materials/test/Holotest/test2.tif.exportsettings
diff --git a/Engine/EngineAssets/Materials/test/Holotest/tews1.tif b/Assets/Engine/EngineAssets/Materials/test/Holotest/tews1.tif
similarity index 100%
rename from Engine/EngineAssets/Materials/test/Holotest/tews1.tif
rename to Assets/Engine/EngineAssets/Materials/test/Holotest/tews1.tif
diff --git a/Engine/EngineAssets/Materials/test/Holotest/tews1.tif.exportsettings b/Assets/Engine/EngineAssets/Materials/test/Holotest/tews1.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Materials/test/Holotest/tews1.tif.exportsettings
rename to Assets/Engine/EngineAssets/Materials/test/Holotest/tews1.tif.exportsettings
diff --git a/Engine/EngineAssets/Materials/test/Holotest/tile1.cgf b/Assets/Engine/EngineAssets/Materials/test/Holotest/tile1.cgf
similarity index 100%
rename from Engine/EngineAssets/Materials/test/Holotest/tile1.cgf
rename to Assets/Engine/EngineAssets/Materials/test/Holotest/tile1.cgf
diff --git a/Engine/EngineAssets/Materials/test/Holotest/tile1.max b/Assets/Engine/EngineAssets/Materials/test/Holotest/tile1.max
similarity index 100%
rename from Engine/EngineAssets/Materials/test/Holotest/tile1.max
rename to Assets/Engine/EngineAssets/Materials/test/Holotest/tile1.max
diff --git a/Engine/EngineAssets/Materials/test/chromium.mtl b/Assets/Engine/EngineAssets/Materials/test/chromium.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/chromium.mtl
rename to Assets/Engine/EngineAssets/Materials/test/chromium.mtl
diff --git a/Engine/EngineAssets/Materials/test/glass2.mtl b/Assets/Engine/EngineAssets/Materials/test/glass2.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/glass2.mtl
rename to Assets/Engine/EngineAssets/Materials/test/glass2.mtl
diff --git a/Engine/EngineAssets/Materials/test/hologram.mtl b/Assets/Engine/EngineAssets/Materials/test/hologram.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/hologram.mtl
rename to Assets/Engine/EngineAssets/Materials/test/hologram.mtl
diff --git a/Engine/EngineAssets/Materials/test/lightbeam.mtl b/Assets/Engine/EngineAssets/Materials/test/lightbeam.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/lightbeam.mtl
rename to Assets/Engine/EngineAssets/Materials/test/lightbeam.mtl
diff --git a/Engine/EngineAssets/Materials/test/lightbeam_floodlight.mtl b/Assets/Engine/EngineAssets/Materials/test/lightbeam_floodlight.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/lightbeam_floodlight.mtl
rename to Assets/Engine/EngineAssets/Materials/test/lightbeam_floodlight.mtl
diff --git a/Engine/EngineAssets/Materials/test/lighthouseBeam.mtl b/Assets/Engine/EngineAssets/Materials/test/lighthouseBeam.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/lighthouseBeam.mtl
rename to Assets/Engine/EngineAssets/Materials/test/lighthouseBeam.mtl
diff --git a/Engine/EngineAssets/Materials/test/lighthousetemplebeam.mtl b/Assets/Engine/EngineAssets/Materials/test/lighthousetemplebeam.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/lighthousetemplebeam.mtl
rename to Assets/Engine/EngineAssets/Materials/test/lighthousetemplebeam.mtl
diff --git a/Engine/EngineAssets/Materials/test/nodraw.mtl b/Assets/Engine/EngineAssets/Materials/test/nodraw.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/nodraw.mtl
rename to Assets/Engine/EngineAssets/Materials/test/nodraw.mtl
diff --git a/Engine/EngineAssets/Materials/test/sky.mtl b/Assets/Engine/EngineAssets/Materials/test/sky.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/sky.mtl
rename to Assets/Engine/EngineAssets/Materials/test/sky.mtl
diff --git a/Engine/EngineAssets/Materials/test/skyHDR.mtl b/Assets/Engine/EngineAssets/Materials/test/skyHDR.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/skyHDR.mtl
rename to Assets/Engine/EngineAssets/Materials/test/skyHDR.mtl
diff --git a/Engine/EngineAssets/Materials/test/textures/glass_wall_ddn.tif b/Assets/Engine/EngineAssets/Materials/test/textures/glass_wall_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Materials/test/textures/glass_wall_ddn.tif
rename to Assets/Engine/EngineAssets/Materials/test/textures/glass_wall_ddn.tif
diff --git a/Engine/EngineAssets/Materials/test/textures/templeBeam.tif b/Assets/Engine/EngineAssets/Materials/test/textures/templeBeam.tif
similarity index 100%
rename from Engine/EngineAssets/Materials/test/textures/templeBeam.tif
rename to Assets/Engine/EngineAssets/Materials/test/textures/templeBeam.tif
diff --git a/Engine/EngineAssets/Materials/test/textures/templeBeam.tif.exportsettings b/Assets/Engine/EngineAssets/Materials/test/textures/templeBeam.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Materials/test/textures/templeBeam.tif.exportsettings
rename to Assets/Engine/EngineAssets/Materials/test/textures/templeBeam.tif.exportsettings
diff --git a/Engine/EngineAssets/Materials/test/volumeObject.mtl b/Assets/Engine/EngineAssets/Materials/test/volumeObject.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/volumeObject.mtl
rename to Assets/Engine/EngineAssets/Materials/test/volumeObject.mtl
diff --git a/Engine/EngineAssets/Materials/test/volumeObject2.mtl b/Assets/Engine/EngineAssets/Materials/test/volumeObject2.mtl
similarity index 100%
rename from Engine/EngineAssets/Materials/test/volumeObject2.mtl
rename to Assets/Engine/EngineAssets/Materials/test/volumeObject2.mtl
diff --git a/Engine/EngineAssets/Objects/Default.cgf b/Assets/Engine/EngineAssets/Objects/Default.cgf
similarity index 100%
rename from Engine/EngineAssets/Objects/Default.cgf
rename to Assets/Engine/EngineAssets/Objects/Default.cgf
diff --git a/Engine/EngineAssets/Objects/helper.mtl b/Assets/Engine/EngineAssets/Objects/helper.mtl
similarity index 100%
rename from Engine/EngineAssets/Objects/helper.mtl
rename to Assets/Engine/EngineAssets/Objects/helper.mtl
diff --git a/Engine/EngineAssets/Production/MidGray.tif b/Assets/Engine/EngineAssets/Production/MidGray.tif
similarity index 100%
rename from Engine/EngineAssets/Production/MidGray.tif
rename to Assets/Engine/EngineAssets/Production/MidGray.tif
diff --git a/Engine/EngineAssets/Production/MidGray.tif.exportsettings b/Assets/Engine/EngineAssets/Production/MidGray.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Production/MidGray.tif.exportsettings
rename to Assets/Engine/EngineAssets/Production/MidGray.tif.exportsettings
diff --git a/Engine/EngineAssets/Production/TangentReference_ddn.tif b/Assets/Engine/EngineAssets/Production/TangentReference_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Production/TangentReference_ddn.tif
rename to Assets/Engine/EngineAssets/Production/TangentReference_ddn.tif
diff --git a/Engine/EngineAssets/Production/TangentReference_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/Production/TangentReference_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Production/TangentReference_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/Production/TangentReference_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/Production/UV.tif b/Assets/Engine/EngineAssets/Production/UV.tif
similarity index 100%
rename from Engine/EngineAssets/Production/UV.tif
rename to Assets/Engine/EngineAssets/Production/UV.tif
diff --git a/Engine/EngineAssets/Production/UV.tif.exportsettings b/Assets/Engine/EngineAssets/Production/UV.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Production/UV.tif.exportsettings
rename to Assets/Engine/EngineAssets/Production/UV.tif.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/AreaTex.dds b/Assets/Engine/EngineAssets/ScreenSpace/AreaTex.dds
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/AreaTex.dds
rename to Assets/Engine/EngineAssets/ScreenSpace/AreaTex.dds
diff --git a/Engine/EngineAssets/ScreenSpace/NormalsFitting.dds b/Assets/Engine/EngineAssets/ScreenSpace/NormalsFitting.dds
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/NormalsFitting.dds
rename to Assets/Engine/EngineAssets/ScreenSpace/NormalsFitting.dds
diff --git a/Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif b/Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif
rename to Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif
diff --git a/Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphere4x4.tif.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif b/Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif
rename to Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif
diff --git a/Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/PointsOnSphereVO4x4.tif.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/SearchTex.dds b/Assets/Engine/EngineAssets/ScreenSpace/SearchTex.dds
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/SearchTex.dds
rename to Assets/Engine/EngineAssets/ScreenSpace/SearchTex.dds
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_love.TIF b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_love.TIF
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_love.TIF
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_love.TIF
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_love.TIF.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_love.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_love.TIF.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_love.TIF.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_music.TIF b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_music.TIF
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_music.TIF
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_music.TIF
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_music.TIF.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_music.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_music.TIF.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_music.TIF.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_pentagon.TIF.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_spherical.TIF.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_square.TIF b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_square.TIF
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_square.TIF
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_square.TIF
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_square.TIF.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_square.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_square.TIF.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_square.TIF.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_star.TIF b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_star.TIF
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_star.TIF
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_star.TIF
diff --git a/Engine/EngineAssets/ScreenSpace/bokeh_star.TIF.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/bokeh_star.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/bokeh_star.TIF.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/bokeh_star.TIF.exportsettings
diff --git a/Engine/EngineAssets/ScreenSpace/film_grain.dds b/Assets/Engine/EngineAssets/ScreenSpace/film_grain.dds
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/film_grain.dds
rename to Assets/Engine/EngineAssets/ScreenSpace/film_grain.dds
diff --git a/Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif b/Assets/Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif
rename to Assets/Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif
diff --git a/Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif.exportsettings b/Assets/Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif.exportsettings
rename to Assets/Engine/EngineAssets/ScreenSpace/grain_bayer_mul.tif.exportsettings
diff --git a/Engine/EngineAssets/Shading/SonarVisionGradient.TIF b/Assets/Engine/EngineAssets/Shading/SonarVisionGradient.TIF
similarity index 100%
rename from Engine/EngineAssets/Shading/SonarVisionGradient.TIF
rename to Assets/Engine/EngineAssets/Shading/SonarVisionGradient.TIF
diff --git a/Engine/EngineAssets/Shading/SonarVisionGradient.TIF.exportsettings b/Assets/Engine/EngineAssets/Shading/SonarVisionGradient.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/SonarVisionGradient.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Shading/SonarVisionGradient.TIF.exportsettings
diff --git a/Engine/EngineAssets/Shading/ThermalVisionGradient.tif b/Assets/Engine/EngineAssets/Shading/ThermalVisionGradient.tif
similarity index 100%
rename from Engine/EngineAssets/Shading/ThermalVisionGradient.tif
rename to Assets/Engine/EngineAssets/Shading/ThermalVisionGradient.tif
diff --git a/Engine/EngineAssets/Shading/ThermalVisionGradient.tif.exportsettings b/Assets/Engine/EngineAssets/Shading/ThermalVisionGradient.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/ThermalVisionGradient.tif.exportsettings
rename to Assets/Engine/EngineAssets/Shading/ThermalVisionGradient.tif.exportsettings
diff --git a/Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF b/Assets/Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF
similarity index 100%
rename from Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF
rename to Assets/Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF
diff --git a/Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF.exportsettings b/Assets/Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Shading/ThermalVisionGradient02.TIF.exportsettings
diff --git a/Engine/EngineAssets/Shading/WaterFoam.TIF b/Assets/Engine/EngineAssets/Shading/WaterFoam.TIF
similarity index 100%
rename from Engine/EngineAssets/Shading/WaterFoam.TIF
rename to Assets/Engine/EngineAssets/Shading/WaterFoam.TIF
diff --git a/Engine/EngineAssets/Shading/WaterFoam.TIF.exportsettings b/Assets/Engine/EngineAssets/Shading/WaterFoam.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/WaterFoam.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Shading/WaterFoam.TIF.exportsettings
diff --git a/Engine/EngineAssets/Shading/cook_d_sampler_G16R16F.dds b/Assets/Engine/EngineAssets/Shading/cook_d_sampler_G16R16F.dds
similarity index 100%
rename from Engine/EngineAssets/Shading/cook_d_sampler_G16R16F.dds
rename to Assets/Engine/EngineAssets/Shading/cook_d_sampler_G16R16F.dds
diff --git a/Engine/EngineAssets/Shading/defaultProbe_cm.tif b/Assets/Engine/EngineAssets/Shading/defaultProbe_cm.tif
similarity index 100%
rename from Engine/EngineAssets/Shading/defaultProbe_cm.tif
rename to Assets/Engine/EngineAssets/Shading/defaultProbe_cm.tif
diff --git a/Engine/EngineAssets/Shading/environmentBRDF.tif b/Assets/Engine/EngineAssets/Shading/environmentBRDF.tif
similarity index 100%
rename from Engine/EngineAssets/Shading/environmentBRDF.tif
rename to Assets/Engine/EngineAssets/Shading/environmentBRDF.tif
diff --git a/Engine/EngineAssets/Shading/generic_reflections.tif b/Assets/Engine/EngineAssets/Shading/generic_reflections.tif
similarity index 100%
rename from Engine/EngineAssets/Shading/generic_reflections.tif
rename to Assets/Engine/EngineAssets/Shading/generic_reflections.tif
diff --git a/Engine/EngineAssets/Shading/generic_reflections.tif.exportsettings b/Assets/Engine/EngineAssets/Shading/generic_reflections.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/generic_reflections.tif.exportsettings
rename to Assets/Engine/EngineAssets/Shading/generic_reflections.tif.exportsettings
diff --git a/Engine/EngineAssets/Shading/layer_effect_anim_function.tif b/Assets/Engine/EngineAssets/Shading/layer_effect_anim_function.tif
similarity index 100%
rename from Engine/EngineAssets/Shading/layer_effect_anim_function.tif
rename to Assets/Engine/EngineAssets/Shading/layer_effect_anim_function.tif
diff --git a/Engine/EngineAssets/Shading/layer_effect_anim_function.tif.exportsettings b/Assets/Engine/EngineAssets/Shading/layer_effect_anim_function.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/layer_effect_anim_function.tif.exportsettings
rename to Assets/Engine/EngineAssets/Shading/layer_effect_anim_function.tif.exportsettings
diff --git a/Engine/EngineAssets/Shading/nanosuit_mask.TIF b/Assets/Engine/EngineAssets/Shading/nanosuit_mask.TIF
similarity index 100%
rename from Engine/EngineAssets/Shading/nanosuit_mask.TIF
rename to Assets/Engine/EngineAssets/Shading/nanosuit_mask.TIF
diff --git a/Engine/EngineAssets/Shading/nanosuit_mask.TIF.exportsettings b/Assets/Engine/EngineAssets/Shading/nanosuit_mask.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/nanosuit_mask.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Shading/nanosuit_mask.TIF.exportsettings
diff --git a/Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF b/Assets/Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF
similarity index 100%
rename from Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF
rename to Assets/Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF
diff --git a/Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF.exportsettings b/Assets/Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Shading/nanosuit_modes_grads.TIF.exportsettings
diff --git a/Engine/EngineAssets/Shading/vignetting.TIF b/Assets/Engine/EngineAssets/Shading/vignetting.TIF
similarity index 100%
rename from Engine/EngineAssets/Shading/vignetting.TIF
rename to Assets/Engine/EngineAssets/Shading/vignetting.TIF
diff --git a/Engine/EngineAssets/Shading/vignetting.TIF.exportsettings b/Assets/Engine/EngineAssets/Shading/vignetting.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Shading/vignetting.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Shading/vignetting.TIF.exportsettings
diff --git a/Engine/EngineAssets/Sky/optical.lut b/Assets/Engine/EngineAssets/Sky/optical.lut
similarity index 100%
rename from Engine/EngineAssets/Sky/optical.lut
rename to Assets/Engine/EngineAssets/Sky/optical.lut
diff --git a/Engine/EngineAssets/Sky/stars.dat b/Assets/Engine/EngineAssets/Sky/stars.dat
similarity index 100%
rename from Engine/EngineAssets/Sky/stars.dat
rename to Assets/Engine/EngineAssets/Sky/stars.dat
diff --git a/Engine/EngineAssets/Slices/DefaultLevelSetup.slice b/Assets/Engine/EngineAssets/Slices/DefaultLevelSetup.slice
similarity index 100%
rename from Engine/EngineAssets/Slices/DefaultLevelSetup.slice
rename to Assets/Engine/EngineAssets/Slices/DefaultLevelSetup.slice
diff --git a/Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif b/Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif
diff --git a/Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/DefaultNoUVs_ddn.tif b/Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultNoUVs_ddn.tif
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs_ddn.tif
diff --git a/Engine/EngineAssets/TextureMsg/DefaultNoUVs_spec.tif b/Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs_spec.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultNoUVs_spec.tif
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultNoUVs_spec.tif
diff --git a/Engine/EngineAssets/TextureMsg/DefaultSolids.mtl b/Assets/Engine/EngineAssets/TextureMsg/DefaultSolids.mtl
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultSolids.mtl
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultSolids.mtl
diff --git a/Engine/EngineAssets/TextureMsg/DefaultSolids_ddn.tif b/Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultSolids_ddn.tif
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_ddn.tif
diff --git a/Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif b/Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif
diff --git a/Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_diff.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/DefaultSolids_spec.tif b/Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_spec.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/DefaultSolids_spec.tif
rename to Assets/Engine/EngineAssets/TextureMsg/DefaultSolids_spec.tif
diff --git a/Engine/EngineAssets/TextureMsg/NotFound.psd b/Assets/Engine/EngineAssets/TextureMsg/NotFound.psd
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/NotFound.psd
rename to Assets/Engine/EngineAssets/TextureMsg/NotFound.psd
diff --git a/Engine/EngineAssets/TextureMsg/NotFound.tif b/Assets/Engine/EngineAssets/TextureMsg/NotFound.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/NotFound.tif
rename to Assets/Engine/EngineAssets/TextureMsg/NotFound.tif
diff --git a/Engine/EngineAssets/TextureMsg/NotFound_a.tif b/Assets/Engine/EngineAssets/TextureMsg/NotFound_a.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/NotFound_a.tif
rename to Assets/Engine/EngineAssets/TextureMsg/NotFound_a.tif
diff --git a/Engine/EngineAssets/TextureMsg/NotFound_cm.tif b/Assets/Engine/EngineAssets/TextureMsg/NotFound_cm.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/NotFound_cm.tif
rename to Assets/Engine/EngineAssets/TextureMsg/NotFound_cm.tif
diff --git a/Engine/EngineAssets/TextureMsg/NotFound_ddn.tif b/Assets/Engine/EngineAssets/TextureMsg/NotFound_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/NotFound_ddn.tif
rename to Assets/Engine/EngineAssets/TextureMsg/NotFound_ddn.tif
diff --git a/Engine/EngineAssets/TextureMsg/NotFound_ddna.tif b/Assets/Engine/EngineAssets/TextureMsg/NotFound_ddna.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/NotFound_ddna.tif
rename to Assets/Engine/EngineAssets/TextureMsg/NotFound_ddna.tif
diff --git a/Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif b/Assets/Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif
rename to Assets/Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif
diff --git a/Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/PhysProxyTooBig.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/RCError.psd b/Assets/Engine/EngineAssets/TextureMsg/RCError.psd
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError.psd
rename to Assets/Engine/EngineAssets/TextureMsg/RCError.psd
diff --git a/Engine/EngineAssets/TextureMsg/RCError.tif b/Assets/Engine/EngineAssets/TextureMsg/RCError.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError.tif
rename to Assets/Engine/EngineAssets/TextureMsg/RCError.tif
diff --git a/Engine/EngineAssets/TextureMsg/RCError_a.tif b/Assets/Engine/EngineAssets/TextureMsg/RCError_a.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError_a.tif
rename to Assets/Engine/EngineAssets/TextureMsg/RCError_a.tif
diff --git a/Engine/EngineAssets/TextureMsg/RCError_a.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/RCError_a.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError_a.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/RCError_a.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/RCError_cm.tif b/Assets/Engine/EngineAssets/TextureMsg/RCError_cm.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError_cm.tif
rename to Assets/Engine/EngineAssets/TextureMsg/RCError_cm.tif
diff --git a/Engine/EngineAssets/TextureMsg/RCError_ddn.tif b/Assets/Engine/EngineAssets/TextureMsg/RCError_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError_ddn.tif
rename to Assets/Engine/EngineAssets/TextureMsg/RCError_ddn.tif
diff --git a/Engine/EngineAssets/TextureMsg/RCError_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/RCError_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/RCError_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/RCError_ddna.tif b/Assets/Engine/EngineAssets/TextureMsg/RCError_ddna.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError_ddna.tif
rename to Assets/Engine/EngineAssets/TextureMsg/RCError_ddna.tif
diff --git a/Engine/EngineAssets/TextureMsg/RCError_ddna.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/RCError_ddna.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/RCError_ddna.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/RCError_ddna.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/ReplaceMe.tif b/Assets/Engine/EngineAssets/TextureMsg/ReplaceMe.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ReplaceMe.tif
rename to Assets/Engine/EngineAssets/TextureMsg/ReplaceMe.tif
diff --git a/Engine/EngineAssets/TextureMsg/ReplaceMe.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/ReplaceMe.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ReplaceMe.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/ReplaceMe.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif b/Assets/Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif
rename to Assets/Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif
diff --git a/Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/ReplaceMeCm.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif b/Assets/Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif
rename to Assets/Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif
diff --git a/Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/ReplaceMeRelease.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/ShaderCompiling.tif b/Assets/Engine/EngineAssets/TextureMsg/ShaderCompiling.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ShaderCompiling.tif
rename to Assets/Engine/EngineAssets/TextureMsg/ShaderCompiling.tif
diff --git a/Engine/EngineAssets/TextureMsg/ShaderCompiling.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/ShaderCompiling.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ShaderCompiling.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/ShaderCompiling.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/ShaderError.tif b/Assets/Engine/EngineAssets/TextureMsg/ShaderError.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ShaderError.tif
rename to Assets/Engine/EngineAssets/TextureMsg/ShaderError.tif
diff --git a/Engine/EngineAssets/TextureMsg/ShaderError.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/ShaderError.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/ShaderError.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/ShaderError.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling.tif b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling.tif
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling.tif
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_a.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling_cm.tif b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_cm.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling_cm.tif
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_cm.tif
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif
diff --git a/Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif.exportsettings b/Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif.exportsettings
rename to Assets/Engine/EngineAssets/TextureMsg/TextureCompiling_ddna.tif.exportsettings
diff --git a/Engine/EngineAssets/TextureMsg/color_Black.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Black.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Black.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Black.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Blue.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Blue.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Blue.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Blue.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Cyan.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Cyan.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Cyan.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Cyan.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Green.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Green.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Green.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Green.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Magenta.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Magenta.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Magenta.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Magenta.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Orange.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Orange.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Orange.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Orange.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Purple.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Purple.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Purple.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Purple.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Red.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Red.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Red.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Red.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_White.tif b/Assets/Engine/EngineAssets/TextureMsg/color_White.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_White.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_White.tif
diff --git a/Engine/EngineAssets/TextureMsg/color_Yellow.tif b/Assets/Engine/EngineAssets/TextureMsg/color_Yellow.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/color_Yellow.tif
rename to Assets/Engine/EngineAssets/TextureMsg/color_Yellow.tif
diff --git a/Engine/EngineAssets/TextureMsg/mipmapdebug.tif b/Assets/Engine/EngineAssets/TextureMsg/mipmapdebug.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/mipmapdebug.tif
rename to Assets/Engine/EngineAssets/TextureMsg/mipmapdebug.tif
diff --git a/Engine/EngineAssets/TextureMsg/orange_for_designer.tif b/Assets/Engine/EngineAssets/TextureMsg/orange_for_designer.tif
similarity index 100%
rename from Engine/EngineAssets/TextureMsg/orange_for_designer.tif
rename to Assets/Engine/EngineAssets/TextureMsg/orange_for_designer.tif
diff --git a/Engine/EngineAssets/Textures/BlackAlpha.tif b/Assets/Engine/EngineAssets/Textures/BlackAlpha.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/BlackAlpha.tif
rename to Assets/Engine/EngineAssets/Textures/BlackAlpha.tif
diff --git a/Engine/EngineAssets/Textures/BlackCM.tif b/Assets/Engine/EngineAssets/Textures/BlackCM.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/BlackCM.tif
rename to Assets/Engine/EngineAssets/Textures/BlackCM.tif
diff --git a/Engine/EngineAssets/Textures/BlackCM.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/BlackCM.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/BlackCM.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/BlackCM.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/Cubemap/default_level_cubemap.tif b/Assets/Engine/EngineAssets/Textures/Cubemap/default_level_cubemap.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/Cubemap/default_level_cubemap.tif
rename to Assets/Engine/EngineAssets/Textures/Cubemap/default_level_cubemap.tif
diff --git a/Engine/EngineAssets/Textures/Cursor_Green.tif b/Assets/Engine/EngineAssets/Textures/Cursor_Green.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/Cursor_Green.tif
rename to Assets/Engine/EngineAssets/Textures/Cursor_Green.tif
diff --git a/Engine/EngineAssets/Textures/Cursor_Green.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/Cursor_Green.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/Cursor_Green.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/Cursor_Green.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/FogVolShadowJitter.tif b/Assets/Engine/EngineAssets/Textures/FogVolShadowJitter.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/FogVolShadowJitter.tif
rename to Assets/Engine/EngineAssets/Textures/FogVolShadowJitter.tif
diff --git a/Engine/EngineAssets/Textures/FogVolShadowJitter.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/FogVolShadowJitter.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/FogVolShadowJitter.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/FogVolShadowJitter.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/Frozen/frost_noise3.dds b/Assets/Engine/EngineAssets/Textures/Frozen/frost_noise3.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/Frozen/frost_noise3.dds
rename to Assets/Engine/EngineAssets/Textures/Frozen/frost_noise3.dds
diff --git a/Engine/EngineAssets/Textures/Frozen/frost_noise4.tif b/Assets/Engine/EngineAssets/Textures/Frozen/frost_noise4.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/Frozen/frost_noise4.tif
rename to Assets/Engine/EngineAssets/Textures/Frozen/frost_noise4.tif
diff --git a/Engine/EngineAssets/Textures/Frozen/snow_spatter.tif b/Assets/Engine/EngineAssets/Textures/Frozen/snow_spatter.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/Frozen/snow_spatter.tif
rename to Assets/Engine/EngineAssets/Textures/Frozen/snow_spatter.tif
diff --git a/Engine/EngineAssets/Textures/GreyAlpha.tif b/Assets/Engine/EngineAssets/Textures/GreyAlpha.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/GreyAlpha.tif
rename to Assets/Engine/EngineAssets/Textures/GreyAlpha.tif
diff --git a/Engine/EngineAssets/Textures/GreyAlpha.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/GreyAlpha.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/GreyAlpha.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/GreyAlpha.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/Palette/cloak_interlation.dds b/Assets/Engine/EngineAssets/Textures/Palette/cloak_interlation.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/Palette/cloak_interlation.dds
rename to Assets/Engine/EngineAssets/Textures/Palette/cloak_interlation.dds
diff --git a/Engine/EngineAssets/Textures/Palette/cloak_palette.tif b/Assets/Engine/EngineAssets/Textures/Palette/cloak_palette.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/Palette/cloak_palette.tif
rename to Assets/Engine/EngineAssets/Textures/Palette/cloak_palette.tif
diff --git a/Engine/EngineAssets/Textures/Palette/cloak_palette.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/Palette/cloak_palette.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/Palette/cloak_palette.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/Palette/cloak_palette.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/Palette/cloak_sparks.dds b/Assets/Engine/EngineAssets/Textures/Palette/cloak_sparks.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/Palette/cloak_sparks.dds
rename to Assets/Engine/EngineAssets/Textures/Palette/cloak_sparks.dds
diff --git a/Engine/EngineAssets/Textures/Palette/cloak_transition.dds b/Assets/Engine/EngineAssets/Textures/Palette/cloak_transition.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/Palette/cloak_transition.dds
rename to Assets/Engine/EngineAssets/Textures/Palette/cloak_transition.dds
diff --git a/Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif b/Assets/Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif
rename to Assets/Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif
diff --git a/Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/TexelsPerMeterGrad.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/VolumeRaster.tif b/Assets/Engine/EngineAssets/Textures/VolumeRaster.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/VolumeRaster.tif
rename to Assets/Engine/EngineAssets/Textures/VolumeRaster.tif
diff --git a/Engine/EngineAssets/Textures/VolumeRaster.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/VolumeRaster.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/VolumeRaster.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/VolumeRaster.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/alienhud_distortionimage.tif b/Assets/Engine/EngineAssets/Textures/alienhud_distortionimage.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/alienhud_distortionimage.tif
rename to Assets/Engine/EngineAssets/Textures/alienhud_distortionimage.tif
diff --git a/Engine/EngineAssets/Textures/alienhud_distortionimage.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/alienhud_distortionimage.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/alienhud_distortionimage.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/alienhud_distortionimage.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/alienhud_noise1.tif b/Assets/Engine/EngineAssets/Textures/alienhud_noise1.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/alienhud_noise1.tif
rename to Assets/Engine/EngineAssets/Textures/alienhud_noise1.tif
diff --git a/Engine/EngineAssets/Textures/alienhud_noise1.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/alienhud_noise1.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/alienhud_noise1.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/alienhud_noise1.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/black.tif b/Assets/Engine/EngineAssets/Textures/black.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/black.tif
rename to Assets/Engine/EngineAssets/Textures/black.tif
diff --git a/Engine/EngineAssets/Textures/black.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/black.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/black.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/black.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/caustics_sampler.dds b/Assets/Engine/EngineAssets/Textures/caustics_sampler.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/caustics_sampler.dds
rename to Assets/Engine/EngineAssets/Textures/caustics_sampler.dds
diff --git a/Engine/EngineAssets/Textures/color.tif b/Assets/Engine/EngineAssets/Textures/color.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/color.tif
rename to Assets/Engine/EngineAssets/Textures/color.tif
diff --git a/Engine/EngineAssets/Textures/default_cch.tif b/Assets/Engine/EngineAssets/Textures/default_cch.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/default_cch.tif
rename to Assets/Engine/EngineAssets/Textures/default_cch.tif
diff --git a/Engine/EngineAssets/Textures/default_cch.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/default_cch.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/default_cch.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/default_cch.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/defaults/16_12.tif b/Assets/Engine/EngineAssets/Textures/defaults/16_12.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/defaults/16_12.tif
rename to Assets/Engine/EngineAssets/Textures/defaults/16_12.tif
diff --git a/Engine/EngineAssets/Textures/defaults/16_34.tif b/Assets/Engine/EngineAssets/Textures/defaults/16_34.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/defaults/16_34.tif
rename to Assets/Engine/EngineAssets/Textures/defaults/16_34.tif
diff --git a/Engine/EngineAssets/Textures/defaults/16_5.tif b/Assets/Engine/EngineAssets/Textures/defaults/16_5.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/defaults/16_5.tif
rename to Assets/Engine/EngineAssets/Textures/defaults/16_5.tif
diff --git a/Engine/EngineAssets/Textures/defaults/16_grey.tif b/Assets/Engine/EngineAssets/Textures/defaults/16_grey.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/defaults/16_grey.tif
rename to Assets/Engine/EngineAssets/Textures/defaults/16_grey.tif
diff --git a/Engine/EngineAssets/Textures/defaults/spot_default.tif b/Assets/Engine/EngineAssets/Textures/defaults/spot_default.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/defaults/spot_default.tif
rename to Assets/Engine/EngineAssets/Textures/defaults/spot_default.tif
diff --git a/Engine/EngineAssets/Textures/detailDecalVariation.tif b/Assets/Engine/EngineAssets/Textures/detailDecalVariation.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/detailDecalVariation.tif
rename to Assets/Engine/EngineAssets/Textures/detailDecalVariation.tif
diff --git a/Engine/EngineAssets/Textures/dither_2.dds b/Assets/Engine/EngineAssets/Textures/dither_2.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/dither_2.dds
rename to Assets/Engine/EngineAssets/Textures/dither_2.dds
diff --git a/Engine/EngineAssets/Textures/dither_pattern_2d.dds b/Assets/Engine/EngineAssets/Textures/dither_pattern_2d.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/dither_pattern_2d.dds
rename to Assets/Engine/EngineAssets/Textures/dither_pattern_2d.dds
diff --git a/Engine/EngineAssets/Textures/flares/Flare_Glow001.tif b/Assets/Engine/EngineAssets/Textures/flares/Flare_Glow001.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/Flare_Glow001.tif
rename to Assets/Engine/EngineAssets/Textures/flares/Flare_Glow001.tif
diff --git a/Engine/EngineAssets/Textures/flares/Flare_Glow002.tif b/Assets/Engine/EngineAssets/Textures/flares/Flare_Glow002.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/Flare_Glow002.tif
rename to Assets/Engine/EngineAssets/Textures/flares/Flare_Glow002.tif
diff --git a/Engine/EngineAssets/Textures/flares/Flare_Orbs001.tif b/Assets/Engine/EngineAssets/Textures/flares/Flare_Orbs001.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/Flare_Orbs001.tif
rename to Assets/Engine/EngineAssets/Textures/flares/Flare_Orbs001.tif
diff --git a/Engine/EngineAssets/Textures/flares/Flare_SoftSpot001.tif b/Assets/Engine/EngineAssets/Textures/flares/Flare_SoftSpot001.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/Flare_SoftSpot001.tif
rename to Assets/Engine/EngineAssets/Textures/flares/Flare_SoftSpot001.tif
diff --git a/Engine/EngineAssets/Textures/flares/Flare_SoftSpot002.tif b/Assets/Engine/EngineAssets/Textures/flares/Flare_SoftSpot002.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/Flare_SoftSpot002.tif
rename to Assets/Engine/EngineAssets/Textures/flares/Flare_SoftSpot002.tif
diff --git a/Engine/EngineAssets/Textures/flares/Flare_Sun001.tif b/Assets/Engine/EngineAssets/Textures/flares/Flare_Sun001.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/Flare_Sun001.tif
rename to Assets/Engine/EngineAssets/Textures/flares/Flare_Sun001.tif
diff --git a/Engine/EngineAssets/Textures/flares/flare01.tif b/Assets/Engine/EngineAssets/Textures/flares/flare01.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/flare01.tif
rename to Assets/Engine/EngineAssets/Textures/flares/flare01.tif
diff --git a/Engine/EngineAssets/Textures/flares/flare02.tif b/Assets/Engine/EngineAssets/Textures/flares/flare02.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/flare02.tif
rename to Assets/Engine/EngineAssets/Textures/flares/flare02.tif
diff --git a/Engine/EngineAssets/Textures/flares/ghost_grey.tif b/Assets/Engine/EngineAssets/Textures/flares/ghost_grey.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/ghost_grey.tif
rename to Assets/Engine/EngineAssets/Textures/flares/ghost_grey.tif
diff --git a/Engine/EngineAssets/Textures/flares/ghost_multicolor.tif b/Assets/Engine/EngineAssets/Textures/flares/ghost_multicolor.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/ghost_multicolor.tif
rename to Assets/Engine/EngineAssets/Textures/flares/ghost_multicolor.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/ghost.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/ghost.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/ghost.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/ghost.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/ghost.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/ghost.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/ghost.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/ghost.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/icons/glow.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/glow.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/glow.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/glow.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/glow.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/glow.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/glow.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/glow.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/iris_shafts.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/multi_ghost.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/icons/orbs.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/orbs.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/orbs.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/orbs.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/orbs.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/orbs.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/orbs.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/orbs.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/icons/ring.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/ring.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/ring.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/ring.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/ring.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/ring.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/ring.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/ring.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/icons/test_demo.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/test_demo.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/test_demo.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/test_demo.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/test_demo.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/test_demo.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/test_demo.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/test_demo.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif b/Assets/Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif
rename to Assets/Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif
diff --git a/Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/flares/icons/vol_shafts.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/flares/iris_shaft.tif b/Assets/Engine/EngineAssets/Textures/flares/iris_shaft.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/iris_shaft.tif
rename to Assets/Engine/EngineAssets/Textures/flares/iris_shaft.tif
diff --git a/Engine/EngineAssets/Textures/flares/lens_blurshape.tif b/Assets/Engine/EngineAssets/Textures/flares/lens_blurshape.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/lens_blurshape.tif
rename to Assets/Engine/EngineAssets/Textures/flares/lens_blurshape.tif
diff --git a/Engine/EngineAssets/Textures/flares/lens_dirtyglass.tif b/Assets/Engine/EngineAssets/Textures/flares/lens_dirtyglass.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/lens_dirtyglass.tif
rename to Assets/Engine/EngineAssets/Textures/flares/lens_dirtyglass.tif
diff --git a/Engine/EngineAssets/Textures/flares/lens_noise01.tif b/Assets/Engine/EngineAssets/Textures/flares/lens_noise01.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/lens_noise01.tif
rename to Assets/Engine/EngineAssets/Textures/flares/lens_noise01.tif
diff --git a/Engine/EngineAssets/Textures/flares/lens_raindrops.tif b/Assets/Engine/EngineAssets/Textures/flares/lens_raindrops.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/lens_raindrops.tif
rename to Assets/Engine/EngineAssets/Textures/flares/lens_raindrops.tif
diff --git a/Engine/EngineAssets/Textures/flares/lens_raindrops02.tif b/Assets/Engine/EngineAssets/Textures/flares/lens_raindrops02.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/lens_raindrops02.tif
rename to Assets/Engine/EngineAssets/Textures/flares/lens_raindrops02.tif
diff --git a/Engine/EngineAssets/Textures/flares/orb_01.tif b/Assets/Engine/EngineAssets/Textures/flares/orb_01.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/orb_01.tif
rename to Assets/Engine/EngineAssets/Textures/flares/orb_01.tif
diff --git a/Engine/EngineAssets/Textures/flares/orb_cell01.tif b/Assets/Engine/EngineAssets/Textures/flares/orb_cell01.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/orb_cell01.tif
rename to Assets/Engine/EngineAssets/Textures/flares/orb_cell01.tif
diff --git a/Engine/EngineAssets/Textures/flares/orb_cell02.tif b/Assets/Engine/EngineAssets/Textures/flares/orb_cell02.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/orb_cell02.tif
rename to Assets/Engine/EngineAssets/Textures/flares/orb_cell02.tif
diff --git a/Engine/EngineAssets/Textures/flares/orb_cell03.tif b/Assets/Engine/EngineAssets/Textures/flares/orb_cell03.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/orb_cell03.tif
rename to Assets/Engine/EngineAssets/Textures/flares/orb_cell03.tif
diff --git a/Engine/EngineAssets/Textures/flares/orb_cell04.tif b/Assets/Engine/EngineAssets/Textures/flares/orb_cell04.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/orb_cell04.tif
rename to Assets/Engine/EngineAssets/Textures/flares/orb_cell04.tif
diff --git a/Engine/EngineAssets/Textures/flares/spectrum_full.tif b/Assets/Engine/EngineAssets/Textures/flares/spectrum_full.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/spectrum_full.tif
rename to Assets/Engine/EngineAssets/Textures/flares/spectrum_full.tif
diff --git a/Engine/EngineAssets/Textures/flares/spectrum_half.tif b/Assets/Engine/EngineAssets/Textures/flares/spectrum_half.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/spectrum_half.tif
rename to Assets/Engine/EngineAssets/Textures/flares/spectrum_half.tif
diff --git a/Engine/EngineAssets/Textures/flares/spectrum_quater.tif b/Assets/Engine/EngineAssets/Textures/flares/spectrum_quater.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/spectrum_quater.tif
rename to Assets/Engine/EngineAssets/Textures/flares/spectrum_quater.tif
diff --git a/Engine/EngineAssets/Textures/flares/spectrum_specs.tif b/Assets/Engine/EngineAssets/Textures/flares/spectrum_specs.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/spectrum_specs.tif
rename to Assets/Engine/EngineAssets/Textures/flares/spectrum_specs.tif
diff --git a/Engine/EngineAssets/Textures/flares/streak01.tif b/Assets/Engine/EngineAssets/Textures/flares/streak01.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/streak01.tif
rename to Assets/Engine/EngineAssets/Textures/flares/streak01.tif
diff --git a/Engine/EngineAssets/Textures/flares/visor_scratch.tif b/Assets/Engine/EngineAssets/Textures/flares/visor_scratch.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/flares/visor_scratch.tif
rename to Assets/Engine/EngineAssets/Textures/flares/visor_scratch.tif
diff --git a/Engine/EngineAssets/Textures/fresnel_sampler.dds b/Assets/Engine/EngineAssets/Textures/fresnel_sampler.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/fresnel_sampler.dds
rename to Assets/Engine/EngineAssets/Textures/fresnel_sampler.dds
diff --git a/Engine/EngineAssets/Textures/fringe_map.dds b/Assets/Engine/EngineAssets/Textures/fringe_map.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/fringe_map.dds
rename to Assets/Engine/EngineAssets/Textures/fringe_map.dds
diff --git a/Engine/EngineAssets/Textures/frost_refl2.tif b/Assets/Engine/EngineAssets/Textures/frost_refl2.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/frost_refl2.tif
rename to Assets/Engine/EngineAssets/Textures/frost_refl2.tif
diff --git a/Engine/EngineAssets/Textures/frost_refl2.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/frost_refl2.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/frost_refl2.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/frost_refl2.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/fuzzy_pow_sampler_merged.dds b/Assets/Engine/EngineAssets/Textures/fuzzy_pow_sampler_merged.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/fuzzy_pow_sampler_merged.dds
rename to Assets/Engine/EngineAssets/Textures/fuzzy_pow_sampler_merged.dds
diff --git a/Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif b/Assets/Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif
rename to Assets/Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif
diff --git a/Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/glass_decalatlas_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/glass_decalatlas_diff.tif b/Assets/Engine/EngineAssets/Textures/glass_decalatlas_diff.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/glass_decalatlas_diff.tif
rename to Assets/Engine/EngineAssets/Textures/glass_decalatlas_diff.tif
diff --git a/Engine/EngineAssets/Textures/glass_decalatlas_diff.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/glass_decalatlas_diff.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/glass_decalatlas_diff.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/glass_decalatlas_diff.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/grey.dds b/Assets/Engine/EngineAssets/Textures/grey.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/grey.dds
rename to Assets/Engine/EngineAssets/Textures/grey.dds
diff --git a/Engine/EngineAssets/Textures/hex.tif b/Assets/Engine/EngineAssets/Textures/hex.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hex.tif
rename to Assets/Engine/EngineAssets/Textures/hex.tif
diff --git a/Engine/EngineAssets/Textures/hex.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hex.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hex.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hex.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hex_ddn.tif b/Assets/Engine/EngineAssets/Textures/hex_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_ddn.tif
rename to Assets/Engine/EngineAssets/Textures/hex_ddn.tif
diff --git a/Engine/EngineAssets/Textures/hex_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hex_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hex_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hex_grad.tif b/Assets/Engine/EngineAssets/Textures/hex_grad.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_grad.tif
rename to Assets/Engine/EngineAssets/Textures/hex_grad.tif
diff --git a/Engine/EngineAssets/Textures/hex_grad.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hex_grad.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_grad.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hex_grad.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hex_line.tif b/Assets/Engine/EngineAssets/Textures/hex_line.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_line.tif
rename to Assets/Engine/EngineAssets/Textures/hex_line.tif
diff --git a/Engine/EngineAssets/Textures/hex_line.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hex_line.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_line.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hex_line.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hex_rand.tif b/Assets/Engine/EngineAssets/Textures/hex_rand.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_rand.tif
rename to Assets/Engine/EngineAssets/Textures/hex_rand.tif
diff --git a/Engine/EngineAssets/Textures/hex_rand.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hex_rand.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hex_rand.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hex_rand.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hiteffect_areas.tif b/Assets/Engine/EngineAssets/Textures/hiteffect_areas.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_areas.tif
rename to Assets/Engine/EngineAssets/Textures/hiteffect_areas.tif
diff --git a/Engine/EngineAssets/Textures/hiteffect_areas.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hiteffect_areas.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_areas.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hiteffect_areas.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif b/Assets/Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif
rename to Assets/Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif
diff --git a/Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hiteffect_blurmask_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hiteffect_healthgradient.tif b/Assets/Engine/EngineAssets/Textures/hiteffect_healthgradient.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_healthgradient.tif
rename to Assets/Engine/EngineAssets/Textures/hiteffect_healthgradient.tif
diff --git a/Engine/EngineAssets/Textures/hiteffect_healthgradient.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hiteffect_healthgradient.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_healthgradient.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hiteffect_healthgradient.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif b/Assets/Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif
rename to Assets/Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif
diff --git a/Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hiteffect_lvlgradient.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hiteffect_round.tif b/Assets/Engine/EngineAssets/Textures/hiteffect_round.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_round.tif
rename to Assets/Engine/EngineAssets/Textures/hiteffect_round.tif
diff --git a/Engine/EngineAssets/Textures/hiteffect_round.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hiteffect_round.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_round.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hiteffect_round.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/hiteffect_veinsblood.tif b/Assets/Engine/EngineAssets/Textures/hiteffect_veinsblood.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_veinsblood.tif
rename to Assets/Engine/EngineAssets/Textures/hiteffect_veinsblood.tif
diff --git a/Engine/EngineAssets/Textures/hiteffect_veinsblood.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/hiteffect_veinsblood.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/hiteffect_veinsblood.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/hiteffect_veinsblood.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/interference.dds b/Assets/Engine/EngineAssets/Textures/interference.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/interference.dds
rename to Assets/Engine/EngineAssets/Textures/interference.dds
diff --git a/Engine/EngineAssets/Textures/jumpnoisehighfrequency_x27y19.dds b/Assets/Engine/EngineAssets/Textures/jumpnoisehighfrequency_x27y19.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/jumpnoisehighfrequency_x27y19.dds
rename to Assets/Engine/EngineAssets/Textures/jumpnoisehighfrequency_x27y19.dds
diff --git a/Engine/EngineAssets/Textures/moisturedroplets.tif b/Assets/Engine/EngineAssets/Textures/moisturedroplets.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/moisturedroplets.tif
rename to Assets/Engine/EngineAssets/Textures/moisturedroplets.tif
diff --git a/Engine/EngineAssets/Textures/moisturedroplets.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/moisturedroplets.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/moisturedroplets.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/moisturedroplets.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/nightvis_grad.tif b/Assets/Engine/EngineAssets/Textures/nightvis_grad.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/nightvis_grad.tif
rename to Assets/Engine/EngineAssets/Textures/nightvis_grad.tif
diff --git a/Engine/EngineAssets/Textures/nightvis_grad.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/nightvis_grad.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/nightvis_grad.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/nightvis_grad.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/noise.tif b/Assets/Engine/EngineAssets/Textures/noise.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/noise.tif
rename to Assets/Engine/EngineAssets/Textures/noise.tif
diff --git a/Engine/EngineAssets/Textures/noise3d.dds b/Assets/Engine/EngineAssets/Textures/noise3d.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/noise3d.dds
rename to Assets/Engine/EngineAssets/Textures/noise3d.dds
diff --git a/Engine/EngineAssets/Textures/oceanwaves_ddn.tif b/Assets/Engine/EngineAssets/Textures/oceanwaves_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/oceanwaves_ddn.tif
rename to Assets/Engine/EngineAssets/Textures/oceanwaves_ddn.tif
diff --git a/Engine/EngineAssets/Textures/oceanwaves_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/oceanwaves_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/oceanwaves_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/oceanwaves_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/palletteInst.dds b/Assets/Engine/EngineAssets/Textures/palletteInst.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/palletteInst.dds
rename to Assets/Engine/EngineAssets/Textures/palletteInst.dds
diff --git a/Engine/EngineAssets/Textures/perlinNoise2d.tif b/Assets/Engine/EngineAssets/Textures/perlinNoise2d.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoise2d.tif
rename to Assets/Engine/EngineAssets/Textures/perlinNoise2d.tif
diff --git a/Engine/EngineAssets/Textures/perlinNoise2d.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/perlinNoise2d.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoise2d.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/perlinNoise2d.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif b/Assets/Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif
rename to Assets/Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif
diff --git a/Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/perlinNoiseDerivatives.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif b/Assets/Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif
rename to Assets/Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif
diff --git a/Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/perlinNoiseNormal_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/perlinNoise_sum.tif b/Assets/Engine/EngineAssets/Textures/perlinNoise_sum.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoise_sum.tif
rename to Assets/Engine/EngineAssets/Textures/perlinNoise_sum.tif
diff --git a/Engine/EngineAssets/Textures/perlinNoise_sum.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/perlinNoise_sum.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoise_sum.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/perlinNoise_sum.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/perlinNoise_sum_small.tif b/Assets/Engine/EngineAssets/Textures/perlinNoise_sum_small.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoise_sum_small.tif
rename to Assets/Engine/EngineAssets/Textures/perlinNoise_sum_small.tif
diff --git a/Engine/EngineAssets/Textures/perlinNoise_sum_small.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/perlinNoise_sum_small.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/perlinNoise_sum_small.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/perlinNoise_sum_small.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/pixeltex.dds b/Assets/Engine/EngineAssets/Textures/pixeltex.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/pixeltex.dds
rename to Assets/Engine/EngineAssets/Textures/pixeltex.dds
diff --git a/Engine/EngineAssets/Textures/rotrandomcm.dds b/Assets/Engine/EngineAssets/Textures/rotrandomcm.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/rotrandomcm.dds
rename to Assets/Engine/EngineAssets/Textures/rotrandomcm.dds
diff --git a/Engine/EngineAssets/Textures/scratch.tif b/Assets/Engine/EngineAssets/Textures/scratch.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/scratch.tif
rename to Assets/Engine/EngineAssets/Textures/scratch.tif
diff --git a/Engine/EngineAssets/Textures/scratch.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/scratch.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/scratch.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/scratch.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/scratch_ddn.tif b/Assets/Engine/EngineAssets/Textures/scratch_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/scratch_ddn.tif
rename to Assets/Engine/EngineAssets/Textures/scratch_ddn.tif
diff --git a/Engine/EngineAssets/Textures/scratch_ddn.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/scratch_ddn.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/scratch_ddn.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/scratch_ddn.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/screen_noisy_bump.dds b/Assets/Engine/EngineAssets/Textures/screen_noisy_bump.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/screen_noisy_bump.dds
rename to Assets/Engine/EngineAssets/Textures/screen_noisy_bump.dds
diff --git a/Engine/EngineAssets/Textures/screenfrost_alpha.TIF b/Assets/Engine/EngineAssets/Textures/screenfrost_alpha.TIF
similarity index 100%
rename from Engine/EngineAssets/Textures/screenfrost_alpha.TIF
rename to Assets/Engine/EngineAssets/Textures/screenfrost_alpha.TIF
diff --git a/Engine/EngineAssets/Textures/screenfrost_alpha.TIF.exportsettings b/Assets/Engine/EngineAssets/Textures/screenfrost_alpha.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/screenfrost_alpha.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Textures/screenfrost_alpha.TIF.exportsettings
diff --git a/Engine/EngineAssets/Textures/screenfrost_ddn.TIF b/Assets/Engine/EngineAssets/Textures/screenfrost_ddn.TIF
similarity index 100%
rename from Engine/EngineAssets/Textures/screenfrost_ddn.TIF
rename to Assets/Engine/EngineAssets/Textures/screenfrost_ddn.TIF
diff --git a/Engine/EngineAssets/Textures/screenfrost_ddn.TIF.exportsettings b/Assets/Engine/EngineAssets/Textures/screenfrost_ddn.TIF.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/screenfrost_ddn.TIF.exportsettings
rename to Assets/Engine/EngineAssets/Textures/screenfrost_ddn.TIF.exportsettings
diff --git a/Engine/EngineAssets/Textures/snowflakes.tif b/Assets/Engine/EngineAssets/Textures/snowflakes.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/snowflakes.tif
rename to Assets/Engine/EngineAssets/Textures/snowflakes.tif
diff --git a/Engine/EngineAssets/Textures/snowflakes.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/snowflakes.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/snowflakes.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/snowflakes.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/startscreen.tif b/Assets/Engine/EngineAssets/Textures/startscreen.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/startscreen.tif
rename to Assets/Engine/EngineAssets/Textures/startscreen.tif
diff --git a/Engine/EngineAssets/Textures/startscreen.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/startscreen.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/startscreen.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/startscreen.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/user_tex1.tif b/Assets/Engine/EngineAssets/Textures/user_tex1.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/user_tex1.tif
rename to Assets/Engine/EngineAssets/Textures/user_tex1.tif
diff --git a/Engine/EngineAssets/Textures/user_tex2.tif b/Assets/Engine/EngineAssets/Textures/user_tex2.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/user_tex2.tif
rename to Assets/Engine/EngineAssets/Textures/user_tex2.tif
diff --git a/Engine/EngineAssets/Textures/vector_noise.dds b/Assets/Engine/EngineAssets/Textures/vector_noise.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/vector_noise.dds
rename to Assets/Engine/EngineAssets/Textures/vector_noise.dds
diff --git a/Engine/EngineAssets/Textures/water_droplets.dds b/Assets/Engine/EngineAssets/Textures/water_droplets.dds
similarity index 100%
rename from Engine/EngineAssets/Textures/water_droplets.dds
rename to Assets/Engine/EngineAssets/Textures/water_droplets.dds
diff --git a/Engine/EngineAssets/Textures/water_gloss.tif b/Assets/Engine/EngineAssets/Textures/water_gloss.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/water_gloss.tif
rename to Assets/Engine/EngineAssets/Textures/water_gloss.tif
diff --git a/Engine/EngineAssets/Textures/water_gloss.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/water_gloss.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/water_gloss.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/water_gloss.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/white.tif b/Assets/Engine/EngineAssets/Textures/white.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/white.tif
rename to Assets/Engine/EngineAssets/Textures/white.tif
diff --git a/Engine/EngineAssets/Textures/white.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/white.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/white.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/white.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/white_cm.tif b/Assets/Engine/EngineAssets/Textures/white_cm.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/white_cm.tif
rename to Assets/Engine/EngineAssets/Textures/white_cm.tif
diff --git a/Engine/EngineAssets/Textures/white_cm.tif.exportsettings b/Assets/Engine/EngineAssets/Textures/white_cm.tif.exportsettings
similarity index 100%
rename from Engine/EngineAssets/Textures/white_cm.tif.exportsettings
rename to Assets/Engine/EngineAssets/Textures/white_cm.tif.exportsettings
diff --git a/Engine/EngineAssets/Textures/white_ddn.tif b/Assets/Engine/EngineAssets/Textures/white_ddn.tif
similarity index 100%
rename from Engine/EngineAssets/Textures/white_ddn.tif
rename to Assets/Engine/EngineAssets/Textures/white_ddn.tif
diff --git a/Engine/EngineAssets/defaulttextures.xml b/Assets/Engine/EngineAssets/defaulttextures.xml
similarity index 100%
rename from Engine/EngineAssets/defaulttextures.xml
rename to Assets/Engine/EngineAssets/defaulttextures.xml
diff --git a/Engine/Engine_Dependencies.xml b/Assets/Engine/Engine_Dependencies.xml
similarity index 100%
rename from Engine/Engine_Dependencies.xml
rename to Assets/Engine/Engine_Dependencies.xml
diff --git a/Engine/Entities/AnimObject.ent b/Assets/Engine/Entities/AnimObject.ent
similarity index 100%
rename from Engine/Entities/AnimObject.ent
rename to Assets/Engine/Entities/AnimObject.ent
diff --git a/Engine/Entities/AreaBezierVolume.ent b/Assets/Engine/Entities/AreaBezierVolume.ent
similarity index 100%
rename from Engine/Entities/AreaBezierVolume.ent
rename to Assets/Engine/Entities/AreaBezierVolume.ent
diff --git a/Engine/Entities/AreaBox.ent b/Assets/Engine/Entities/AreaBox.ent
similarity index 100%
rename from Engine/Entities/AreaBox.ent
rename to Assets/Engine/Entities/AreaBox.ent
diff --git a/Engine/Entities/AreaShape.ent b/Assets/Engine/Entities/AreaShape.ent
similarity index 100%
rename from Engine/Entities/AreaShape.ent
rename to Assets/Engine/Entities/AreaShape.ent
diff --git a/Engine/Entities/AreaSolid.ent b/Assets/Engine/Entities/AreaSolid.ent
similarity index 100%
rename from Engine/Entities/AreaSolid.ent
rename to Assets/Engine/Entities/AreaSolid.ent
diff --git a/Engine/Entities/AreaSphere.ent b/Assets/Engine/Entities/AreaSphere.ent
similarity index 100%
rename from Engine/Entities/AreaSphere.ent
rename to Assets/Engine/Entities/AreaSphere.ent
diff --git a/Engine/Entities/AreaTrigger.ent b/Assets/Engine/Entities/AreaTrigger.ent
similarity index 100%
rename from Engine/Entities/AreaTrigger.ent
rename to Assets/Engine/Entities/AreaTrigger.ent
diff --git a/Engine/Entities/AudioAreaAmbience.ent b/Assets/Engine/Entities/AudioAreaAmbience.ent
similarity index 100%
rename from Engine/Entities/AudioAreaAmbience.ent
rename to Assets/Engine/Entities/AudioAreaAmbience.ent
diff --git a/Engine/Entities/AudioAreaEntity.ent b/Assets/Engine/Entities/AudioAreaEntity.ent
similarity index 100%
rename from Engine/Entities/AudioAreaEntity.ent
rename to Assets/Engine/Entities/AudioAreaEntity.ent
diff --git a/Engine/Entities/AudioAreaRandom.ent b/Assets/Engine/Entities/AudioAreaRandom.ent
similarity index 100%
rename from Engine/Entities/AudioAreaRandom.ent
rename to Assets/Engine/Entities/AudioAreaRandom.ent
diff --git a/Engine/Entities/AudioTriggerSpot.ent b/Assets/Engine/Entities/AudioTriggerSpot.ent
similarity index 100%
rename from Engine/Entities/AudioTriggerSpot.ent
rename to Assets/Engine/Entities/AudioTriggerSpot.ent
diff --git a/Engine/Entities/BasicEntity.ent b/Assets/Engine/Entities/BasicEntity.ent
similarity index 100%
rename from Engine/Entities/BasicEntity.ent
rename to Assets/Engine/Entities/BasicEntity.ent
diff --git a/Engine/Entities/CActorWrapper.ent b/Assets/Engine/Entities/CActorWrapper.ent
similarity index 100%
rename from Engine/Entities/CActorWrapper.ent
rename to Assets/Engine/Entities/CActorWrapper.ent
diff --git a/Engine/Entities/CameraSource.ent b/Assets/Engine/Entities/CameraSource.ent
similarity index 100%
rename from Engine/Entities/CameraSource.ent
rename to Assets/Engine/Entities/CameraSource.ent
diff --git a/Engine/Entities/CameraTarget.ent b/Assets/Engine/Entities/CameraTarget.ent
similarity index 100%
rename from Engine/Entities/CameraTarget.ent
rename to Assets/Engine/Entities/CameraTarget.ent
diff --git a/Engine/Entities/Comment.ent b/Assets/Engine/Entities/Comment.ent
similarity index 100%
rename from Engine/Entities/Comment.ent
rename to Assets/Engine/Entities/Comment.ent
diff --git a/Engine/Entities/EnvironmentLight.ent b/Assets/Engine/Entities/EnvironmentLight.ent
similarity index 100%
rename from Engine/Entities/EnvironmentLight.ent
rename to Assets/Engine/Entities/EnvironmentLight.ent
diff --git a/Engine/Entities/FogVolume.ent b/Assets/Engine/Entities/FogVolume.ent
similarity index 100%
rename from Engine/Entities/FogVolume.ent
rename to Assets/Engine/Entities/FogVolume.ent
diff --git a/Engine/Entities/GeomCache.ent b/Assets/Engine/Entities/GeomCache.ent
similarity index 100%
rename from Engine/Entities/GeomCache.ent
rename to Assets/Engine/Entities/GeomCache.ent
diff --git a/Engine/Entities/Light.ent b/Assets/Engine/Entities/Light.ent
similarity index 100%
rename from Engine/Entities/Light.ent
rename to Assets/Engine/Entities/Light.ent
diff --git a/Engine/Entities/LivingEntity.ent b/Assets/Engine/Entities/LivingEntity.ent
similarity index 100%
rename from Engine/Entities/LivingEntity.ent
rename to Assets/Engine/Entities/LivingEntity.ent
diff --git a/Engine/Entities/NavigationSeedPoint.ent b/Assets/Engine/Entities/NavigationSeedPoint.ent
similarity index 100%
rename from Engine/Entities/NavigationSeedPoint.ent
rename to Assets/Engine/Entities/NavigationSeedPoint.ent
diff --git a/Engine/Entities/ParticleEffect.ent b/Assets/Engine/Entities/ParticleEffect.ent
similarity index 100%
rename from Engine/Entities/ParticleEffect.ent
rename to Assets/Engine/Entities/ParticleEffect.ent
diff --git a/Engine/Entities/ProceduralObject.ent b/Assets/Engine/Entities/ProceduralObject.ent
similarity index 100%
rename from Engine/Entities/ProceduralObject.ent
rename to Assets/Engine/Entities/ProceduralObject.ent
diff --git a/Engine/Entities/ProximityTrigger.ent b/Assets/Engine/Entities/ProximityTrigger.ent
similarity index 100%
rename from Engine/Entities/ProximityTrigger.ent
rename to Assets/Engine/Entities/ProximityTrigger.ent
diff --git a/Engine/Entities/RigidBody.ent b/Assets/Engine/Entities/RigidBody.ent
similarity index 100%
rename from Engine/Entities/RigidBody.ent
rename to Assets/Engine/Entities/RigidBody.ent
diff --git a/Engine/Entities/RigidBodyEx.ent b/Assets/Engine/Entities/RigidBodyEx.ent
similarity index 100%
rename from Engine/Entities/RigidBodyEx.ent
rename to Assets/Engine/Entities/RigidBodyEx.ent
diff --git a/Engine/Entities/SmartObject.ent b/Assets/Engine/Entities/SmartObject.ent
similarity index 100%
rename from Engine/Entities/SmartObject.ent
rename to Assets/Engine/Entities/SmartObject.ent
diff --git a/Engine/Entities/TagPoint.ent b/Assets/Engine/Entities/TagPoint.ent
similarity index 100%
rename from Engine/Entities/TagPoint.ent
rename to Assets/Engine/Entities/TagPoint.ent
diff --git a/Engine/Entities/UiCanvasRef.ent b/Assets/Engine/Entities/UiCanvasRef.ent
similarity index 100%
rename from Engine/Entities/UiCanvasRef.ent
rename to Assets/Engine/Entities/UiCanvasRef.ent
diff --git a/Engine/Fonts/Vera.ttf b/Assets/Engine/Fonts/Vera.ttf
similarity index 100%
rename from Engine/Fonts/Vera.ttf
rename to Assets/Engine/Fonts/Vera.ttf
diff --git a/Engine/Fonts/VeraMono.ttf b/Assets/Engine/Fonts/VeraMono.ttf
similarity index 100%
rename from Engine/Fonts/VeraMono.ttf
rename to Assets/Engine/Fonts/VeraMono.ttf
diff --git a/Engine/Fonts/Vera_COPYRIGHT.TXT b/Assets/Engine/Fonts/Vera_COPYRIGHT.TXT
similarity index 100%
rename from Engine/Fonts/Vera_COPYRIGHT.TXT
rename to Assets/Engine/Fonts/Vera_COPYRIGHT.TXT
diff --git a/Engine/Fonts/Vera_RELEASENOTES.TXT b/Assets/Engine/Fonts/Vera_RELEASENOTES.TXT
similarity index 100%
rename from Engine/Fonts/Vera_RELEASENOTES.TXT
rename to Assets/Engine/Fonts/Vera_RELEASENOTES.TXT
diff --git a/Engine/Fonts/console.font b/Assets/Engine/Fonts/console.font
similarity index 100%
rename from Engine/Fonts/console.font
rename to Assets/Engine/Fonts/console.font
diff --git a/Engine/Fonts/console.xml b/Assets/Engine/Fonts/console.xml
similarity index 100%
rename from Engine/Fonts/console.xml
rename to Assets/Engine/Fonts/console.xml
diff --git a/Engine/Fonts/default-ui.font b/Assets/Engine/Fonts/default-ui.font
similarity index 100%
rename from Engine/Fonts/default-ui.font
rename to Assets/Engine/Fonts/default-ui.font
diff --git a/Engine/Fonts/default-ui.xml b/Assets/Engine/Fonts/default-ui.xml
similarity index 100%
rename from Engine/Fonts/default-ui.xml
rename to Assets/Engine/Fonts/default-ui.xml
diff --git a/Engine/Fonts/default.font b/Assets/Engine/Fonts/default.font
similarity index 100%
rename from Engine/Fonts/default.font
rename to Assets/Engine/Fonts/default.font
diff --git a/Engine/Fonts/default.xml b/Assets/Engine/Fonts/default.xml
similarity index 100%
rename from Engine/Fonts/default.xml
rename to Assets/Engine/Fonts/default.xml
diff --git a/Engine/Fonts/hud.font b/Assets/Engine/Fonts/hud.font
similarity index 100%
rename from Engine/Fonts/hud.font
rename to Assets/Engine/Fonts/hud.font
diff --git a/Engine/Fonts/hud.xml b/Assets/Engine/Fonts/hud.xml
similarity index 100%
rename from Engine/Fonts/hud.xml
rename to Assets/Engine/Fonts/hud.xml
diff --git a/Engine/Libs/MaterialEffects/FXLibs/collisions.xml b/Assets/Engine/Libs/MaterialEffects/FXLibs/collisions.xml
similarity index 100%
rename from Engine/Libs/MaterialEffects/FXLibs/collisions.xml
rename to Assets/Engine/Libs/MaterialEffects/FXLibs/collisions.xml
diff --git a/Engine/Libs/MaterialEffects/materialeffects.xml b/Assets/Engine/Libs/MaterialEffects/materialeffects.xml
similarity index 100%
rename from Engine/Libs/MaterialEffects/materialeffects.xml
rename to Assets/Engine/Libs/MaterialEffects/materialeffects.xml
diff --git a/Engine/Libs/MaterialEffects/surfacetypes.xml b/Assets/Engine/Libs/MaterialEffects/surfacetypes.xml
similarity index 100%
rename from Engine/Libs/MaterialEffects/surfacetypes.xml
rename to Assets/Engine/Libs/MaterialEffects/surfacetypes.xml
diff --git a/Engine/Libs/PostEffectGroups/Default.xml b/Assets/Engine/Libs/PostEffectGroups/Default.xml
similarity index 100%
rename from Engine/Libs/PostEffectGroups/Default.xml
rename to Assets/Engine/Libs/PostEffectGroups/Default.xml
diff --git a/Engine/Objects/default/editorprimitive.mtl b/Assets/Engine/Objects/default/editorprimitive.mtl
similarity index 100%
rename from Engine/Objects/default/editorprimitive.mtl
rename to Assets/Engine/Objects/default/editorprimitive.mtl
diff --git a/Engine/Objects/default/primitive_capsule.cgf b/Assets/Engine/Objects/default/primitive_capsule.cgf
similarity index 100%
rename from Engine/Objects/default/primitive_capsule.cgf
rename to Assets/Engine/Objects/default/primitive_capsule.cgf
diff --git a/Engine/Objects/default/primitive_cube.cgf b/Assets/Engine/Objects/default/primitive_cube.cgf
similarity index 100%
rename from Engine/Objects/default/primitive_cube.cgf
rename to Assets/Engine/Objects/default/primitive_cube.cgf
diff --git a/Engine/Objects/default/primitive_plane.cgf b/Assets/Engine/Objects/default/primitive_plane.cgf
similarity index 100%
rename from Engine/Objects/default/primitive_plane.cgf
rename to Assets/Engine/Objects/default/primitive_plane.cgf
diff --git a/Engine/Objects/default/primitive_sphere.cgf b/Assets/Engine/Objects/default/primitive_sphere.cgf
similarity index 100%
rename from Engine/Objects/default/primitive_sphere.cgf
rename to Assets/Engine/Objects/default/primitive_sphere.cgf
diff --git a/Engine/Schema/Environment.xmlschema b/Assets/Engine/Schema/Environment.xmlschema
similarity index 100%
rename from Engine/Schema/Environment.xmlschema
rename to Assets/Engine/Schema/Environment.xmlschema
diff --git a/Engine/Schema/FlaresLibrary.xmlschema b/Assets/Engine/Schema/FlaresLibrary.xmlschema
similarity index 100%
rename from Engine/Schema/FlaresLibrary.xmlschema
rename to Assets/Engine/Schema/FlaresLibrary.xmlschema
diff --git a/Engine/Schema/Font.xmlschema b/Assets/Engine/Schema/Font.xmlschema
similarity index 100%
rename from Engine/Schema/Font.xmlschema
rename to Assets/Engine/Schema/Font.xmlschema
diff --git a/Engine/Schema/ParticleLibrary.xmlschema b/Assets/Engine/Schema/ParticleLibrary.xmlschema
similarity index 100%
rename from Engine/Schema/ParticleLibrary.xmlschema
rename to Assets/Engine/Schema/ParticleLibrary.xmlschema
diff --git a/Engine/Schema/cloudlibrary.xmlschema b/Assets/Engine/Schema/cloudlibrary.xmlschema
similarity index 100%
rename from Engine/Schema/cloudlibrary.xmlschema
rename to Assets/Engine/Schema/cloudlibrary.xmlschema
diff --git a/Engine/Schema/editorappdescriptor.xmlschema b/Assets/Engine/Schema/editorappdescriptor.xmlschema
similarity index 100%
rename from Engine/Schema/editorappdescriptor.xmlschema
rename to Assets/Engine/Schema/editorappdescriptor.xmlschema
diff --git a/Engine/Schema/enginedependency.xmlschema b/Assets/Engine/Schema/enginedependency.xmlschema
similarity index 100%
rename from Engine/Schema/enginedependency.xmlschema
rename to Assets/Engine/Schema/enginedependency.xmlschema
diff --git a/Engine/Schema/ent.xmlschema b/Assets/Engine/Schema/ent.xmlschema
similarity index 100%
rename from Engine/Schema/ent.xmlschema
rename to Assets/Engine/Schema/ent.xmlschema
diff --git a/Engine/Schema/gameappdescriptor.xmlschema b/Assets/Engine/Schema/gameappdescriptor.xmlschema
similarity index 100%
rename from Engine/Schema/gameappdescriptor.xmlschema
rename to Assets/Engine/Schema/gameappdescriptor.xmlschema
diff --git a/Engine/Schema/materialeffectlibrary.xmlschema b/Assets/Engine/Schema/materialeffectlibrary.xmlschema
similarity index 100%
rename from Engine/Schema/materialeffectlibrary.xmlschema
rename to Assets/Engine/Schema/materialeffectlibrary.xmlschema
diff --git a/Engine/Schema/materialeffects.xmlschema b/Assets/Engine/Schema/materialeffects.xmlschema
similarity index 100%
rename from Engine/Schema/materialeffects.xmlschema
rename to Assets/Engine/Schema/materialeffects.xmlschema
diff --git a/Engine/Schema/rainandsnowtextures.xmlschema b/Assets/Engine/Schema/rainandsnowtextures.xmlschema
similarity index 100%
rename from Engine/Schema/rainandsnowtextures.xmlschema
rename to Assets/Engine/Schema/rainandsnowtextures.xmlschema
diff --git a/Engine/Schema/surfacetypes.xmlschema b/Assets/Engine/Schema/surfacetypes.xmlschema
similarity index 100%
rename from Engine/Schema/surfacetypes.xmlschema
rename to Assets/Engine/Schema/surfacetypes.xmlschema
diff --git a/Engine/Schema/vegdescriptorlist.xmlschema b/Assets/Engine/Schema/vegdescriptorlist.xmlschema
similarity index 100%
rename from Engine/Schema/vegdescriptorlist.xmlschema
rename to Assets/Engine/Schema/vegdescriptorlist.xmlschema
diff --git a/Engine/Scripts/EngineCommon.lua b/Assets/Engine/Scripts/EngineCommon.lua
similarity index 100%
rename from Engine/Scripts/EngineCommon.lua
rename to Assets/Engine/Scripts/EngineCommon.lua
diff --git a/Engine/Scripts/Entities/AI/NavigationSeedPoint.lua b/Assets/Engine/Scripts/Entities/AI/NavigationSeedPoint.lua
similarity index 100%
rename from Engine/Scripts/Entities/AI/NavigationSeedPoint.lua
rename to Assets/Engine/Scripts/Entities/AI/NavigationSeedPoint.lua
diff --git a/Engine/Scripts/Entities/AI/SmartObject.lua b/Assets/Engine/Scripts/Entities/AI/SmartObject.lua
similarity index 100%
rename from Engine/Scripts/Entities/AI/SmartObject.lua
rename to Assets/Engine/Scripts/Entities/AI/SmartObject.lua
diff --git a/Engine/Scripts/Entities/AI/TagPoint.lua b/Assets/Engine/Scripts/Entities/AI/TagPoint.lua
similarity index 100%
rename from Engine/Scripts/Entities/AI/TagPoint.lua
rename to Assets/Engine/Scripts/Entities/AI/TagPoint.lua
diff --git a/Engine/Scripts/Entities/Actor/CActorWrapper.lua b/Assets/Engine/Scripts/Entities/Actor/CActorWrapper.lua
similarity index 100%
rename from Engine/Scripts/Entities/Actor/CActorWrapper.lua
rename to Assets/Engine/Scripts/Entities/Actor/CActorWrapper.lua
diff --git a/Engine/Scripts/Entities/Anim/MannequinObject.lua b/Assets/Engine/Scripts/Entities/Anim/MannequinObject.lua
similarity index 100%
rename from Engine/Scripts/Entities/Anim/MannequinObject.lua
rename to Assets/Engine/Scripts/Entities/Anim/MannequinObject.lua
diff --git a/Engine/Scripts/Entities/Default/GeomEntity.lua b/Assets/Engine/Scripts/Entities/Default/GeomEntity.lua
similarity index 100%
rename from Engine/Scripts/Entities/Default/GeomEntity.lua
rename to Assets/Engine/Scripts/Entities/Default/GeomEntity.lua
diff --git a/Engine/Scripts/Entities/Default/RopeEntity.lua b/Assets/Engine/Scripts/Entities/Default/RopeEntity.lua
similarity index 100%
rename from Engine/Scripts/Entities/Default/RopeEntity.lua
rename to Assets/Engine/Scripts/Entities/Default/RopeEntity.lua
diff --git a/Engine/Scripts/Entities/Environment/WaterVolume.lua b/Assets/Engine/Scripts/Entities/Environment/WaterVolume.lua
similarity index 100%
rename from Engine/Scripts/Entities/Environment/WaterVolume.lua
rename to Assets/Engine/Scripts/Entities/Environment/WaterVolume.lua
diff --git a/Engine/Scripts/Entities/Lights/EnvironmentLight.lua b/Assets/Engine/Scripts/Entities/Lights/EnvironmentLight.lua
similarity index 100%
rename from Engine/Scripts/Entities/Lights/EnvironmentLight.lua
rename to Assets/Engine/Scripts/Entities/Lights/EnvironmentLight.lua
diff --git a/Engine/Scripts/Entities/Lights/Light.lua b/Assets/Engine/Scripts/Entities/Lights/Light.lua
similarity index 100%
rename from Engine/Scripts/Entities/Lights/Light.lua
rename to Assets/Engine/Scripts/Entities/Lights/Light.lua
diff --git a/Engine/Scripts/Entities/Others/CameraSource.lua b/Assets/Engine/Scripts/Entities/Others/CameraSource.lua
similarity index 100%
rename from Engine/Scripts/Entities/Others/CameraSource.lua
rename to Assets/Engine/Scripts/Entities/Others/CameraSource.lua
diff --git a/Engine/Scripts/Entities/Others/CameraTarget.lua b/Assets/Engine/Scripts/Entities/Others/CameraTarget.lua
similarity index 100%
rename from Engine/Scripts/Entities/Others/CameraTarget.lua
rename to Assets/Engine/Scripts/Entities/Others/CameraTarget.lua
diff --git a/Engine/Scripts/Entities/Others/Comment.lua b/Assets/Engine/Scripts/Entities/Others/Comment.lua
similarity index 100%
rename from Engine/Scripts/Entities/Others/Comment.lua
rename to Assets/Engine/Scripts/Entities/Others/Comment.lua
diff --git a/Engine/Scripts/Entities/Others/ProceduralObject.lua b/Assets/Engine/Scripts/Entities/Others/ProceduralObject.lua
similarity index 100%
rename from Engine/Scripts/Entities/Others/ProceduralObject.lua
rename to Assets/Engine/Scripts/Entities/Others/ProceduralObject.lua
diff --git a/Engine/Scripts/Entities/Others/RigidBody.lua b/Assets/Engine/Scripts/Entities/Others/RigidBody.lua
similarity index 100%
rename from Engine/Scripts/Entities/Others/RigidBody.lua
rename to Assets/Engine/Scripts/Entities/Others/RigidBody.lua
diff --git a/Engine/Scripts/Entities/Particle/ParticleEffect.lua b/Assets/Engine/Scripts/Entities/Particle/ParticleEffect.lua
similarity index 100%
rename from Engine/Scripts/Entities/Particle/ParticleEffect.lua
rename to Assets/Engine/Scripts/Entities/Particle/ParticleEffect.lua
diff --git a/Engine/Scripts/Entities/Physics/AnimObject.lua b/Assets/Engine/Scripts/Entities/Physics/AnimObject.lua
similarity index 100%
rename from Engine/Scripts/Entities/Physics/AnimObject.lua
rename to Assets/Engine/Scripts/Entities/Physics/AnimObject.lua
diff --git a/Engine/Scripts/Entities/Physics/AreaBezierVolume.lua b/Assets/Engine/Scripts/Entities/Physics/AreaBezierVolume.lua
similarity index 100%
rename from Engine/Scripts/Entities/Physics/AreaBezierVolume.lua
rename to Assets/Engine/Scripts/Entities/Physics/AreaBezierVolume.lua
diff --git a/Engine/Scripts/Entities/Physics/BasicEntity.lua b/Assets/Engine/Scripts/Entities/Physics/BasicEntity.lua
similarity index 100%
rename from Engine/Scripts/Entities/Physics/BasicEntity.lua
rename to Assets/Engine/Scripts/Entities/Physics/BasicEntity.lua
diff --git a/Engine/Scripts/Entities/Physics/LivingEntity.lua b/Assets/Engine/Scripts/Entities/Physics/LivingEntity.lua
similarity index 100%
rename from Engine/Scripts/Entities/Physics/LivingEntity.lua
rename to Assets/Engine/Scripts/Entities/Physics/LivingEntity.lua
diff --git a/Engine/Scripts/Entities/Physics/RigidBodyEx.lua b/Assets/Engine/Scripts/Entities/Physics/RigidBodyEx.lua
similarity index 100%
rename from Engine/Scripts/Entities/Physics/RigidBodyEx.lua
rename to Assets/Engine/Scripts/Entities/Physics/RigidBodyEx.lua
diff --git a/Engine/Scripts/Entities/Render/FogVolume.lua b/Assets/Engine/Scripts/Entities/Render/FogVolume.lua
similarity index 100%
rename from Engine/Scripts/Entities/Render/FogVolume.lua
rename to Assets/Engine/Scripts/Entities/Render/FogVolume.lua
diff --git a/Engine/Scripts/Entities/Render/GeomCache.lua b/Assets/Engine/Scripts/Entities/Render/GeomCache.lua
similarity index 100%
rename from Engine/Scripts/Entities/Render/GeomCache.lua
rename to Assets/Engine/Scripts/Entities/Render/GeomCache.lua
diff --git a/Engine/Scripts/Entities/Sound/AudioAreaAmbience.lua b/Assets/Engine/Scripts/Entities/Sound/AudioAreaAmbience.lua
similarity index 100%
rename from Engine/Scripts/Entities/Sound/AudioAreaAmbience.lua
rename to Assets/Engine/Scripts/Entities/Sound/AudioAreaAmbience.lua
diff --git a/Engine/Scripts/Entities/Sound/AudioAreaEntity.lua b/Assets/Engine/Scripts/Entities/Sound/AudioAreaEntity.lua
similarity index 100%
rename from Engine/Scripts/Entities/Sound/AudioAreaEntity.lua
rename to Assets/Engine/Scripts/Entities/Sound/AudioAreaEntity.lua
diff --git a/Engine/Scripts/Entities/Sound/AudioAreaRandom.lua b/Assets/Engine/Scripts/Entities/Sound/AudioAreaRandom.lua
similarity index 100%
rename from Engine/Scripts/Entities/Sound/AudioAreaRandom.lua
rename to Assets/Engine/Scripts/Entities/Sound/AudioAreaRandom.lua
diff --git a/Engine/Scripts/Entities/Sound/AudioTriggerSpot.lua b/Assets/Engine/Scripts/Entities/Sound/AudioTriggerSpot.lua
similarity index 100%
rename from Engine/Scripts/Entities/Sound/AudioTriggerSpot.lua
rename to Assets/Engine/Scripts/Entities/Sound/AudioTriggerSpot.lua
diff --git a/Engine/Scripts/Entities/Sound/Shared/AudioUtils.lua b/Assets/Engine/Scripts/Entities/Sound/Shared/AudioUtils.lua
similarity index 100%
rename from Engine/Scripts/Entities/Sound/Shared/AudioUtils.lua
rename to Assets/Engine/Scripts/Entities/Sound/Shared/AudioUtils.lua
diff --git a/Engine/Scripts/Entities/Triggers/AreaTrigger.lua b/Assets/Engine/Scripts/Entities/Triggers/AreaTrigger.lua
similarity index 100%
rename from Engine/Scripts/Entities/Triggers/AreaTrigger.lua
rename to Assets/Engine/Scripts/Entities/Triggers/AreaTrigger.lua
diff --git a/Engine/Scripts/Entities/Triggers/ProximityTrigger.lua b/Assets/Engine/Scripts/Entities/Triggers/ProximityTrigger.lua
similarity index 100%
rename from Engine/Scripts/Entities/Triggers/ProximityTrigger.lua
rename to Assets/Engine/Scripts/Entities/Triggers/ProximityTrigger.lua
diff --git a/Engine/Scripts/Entities/UI/UiCanvasRefEntity.lua b/Assets/Engine/Scripts/Entities/UI/UiCanvasRefEntity.lua
similarity index 100%
rename from Engine/Scripts/Entities/UI/UiCanvasRefEntity.lua
rename to Assets/Engine/Scripts/Entities/UI/UiCanvasRefEntity.lua
diff --git a/Engine/Scripts/Utils/Components/GameplayUtils.lua b/Assets/Engine/Scripts/Utils/Components/GameplayUtils.lua
similarity index 100%
rename from Engine/Scripts/Utils/Components/GameplayUtils.lua
rename to Assets/Engine/Scripts/Utils/Components/GameplayUtils.lua
diff --git a/Engine/Scripts/Utils/Components/InputUtils.lua b/Assets/Engine/Scripts/Utils/Components/InputUtils.lua
similarity index 100%
rename from Engine/Scripts/Utils/Components/InputUtils.lua
rename to Assets/Engine/Scripts/Utils/Components/InputUtils.lua
diff --git a/Engine/Scripts/Utils/Components/MultiHandlers.lua b/Assets/Engine/Scripts/Utils/Components/MultiHandlers.lua
similarity index 100%
rename from Engine/Scripts/Utils/Components/MultiHandlers.lua
rename to Assets/Engine/Scripts/Utils/Components/MultiHandlers.lua
diff --git a/Engine/Scripts/Utils/Containers.lua b/Assets/Engine/Scripts/Utils/Containers.lua
similarity index 100%
rename from Engine/Scripts/Utils/Containers.lua
rename to Assets/Engine/Scripts/Utils/Containers.lua
diff --git a/Engine/Scripts/Utils/EntityUtils.lua b/Assets/Engine/Scripts/Utils/EntityUtils.lua
similarity index 100%
rename from Engine/Scripts/Utils/EntityUtils.lua
rename to Assets/Engine/Scripts/Utils/EntityUtils.lua
diff --git a/Engine/Scripts/Utils/Math.lua b/Assets/Engine/Scripts/Utils/Math.lua
similarity index 100%
rename from Engine/Scripts/Utils/Math.lua
rename to Assets/Engine/Scripts/Utils/Math.lua
diff --git a/Engine/SeedAssetList.seed b/Assets/Engine/SeedAssetList.seed
similarity index 100%
rename from Engine/SeedAssetList.seed
rename to Assets/Engine/SeedAssetList.seed
diff --git a/Engine/Shaders/DistanceClouds.ext b/Assets/Engine/Shaders/DistanceClouds.ext
similarity index 100%
rename from Engine/Shaders/DistanceClouds.ext
rename to Assets/Engine/Shaders/DistanceClouds.ext
diff --git a/Engine/Shaders/Eye.ext b/Assets/Engine/Shaders/Eye.ext
similarity index 100%
rename from Engine/Shaders/Eye.ext
rename to Assets/Engine/Shaders/Eye.ext
diff --git a/Engine/Shaders/Fur.ext b/Assets/Engine/Shaders/Fur.ext
similarity index 100%
rename from Engine/Shaders/Fur.ext
rename to Assets/Engine/Shaders/Fur.ext
diff --git a/Engine/Shaders/GeometryBeam.ext b/Assets/Engine/Shaders/GeometryBeam.ext
similarity index 100%
rename from Engine/Shaders/GeometryBeam.ext
rename to Assets/Engine/Shaders/GeometryBeam.ext
diff --git a/Engine/Shaders/Glass.ext b/Assets/Engine/Shaders/Glass.ext
similarity index 100%
rename from Engine/Shaders/Glass.ext
rename to Assets/Engine/Shaders/Glass.ext
diff --git a/Engine/Shaders/HWScripts/CryFX/AuxGeom.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/AuxGeom.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/AuxGeom.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/AuxGeom.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Clouds.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Clouds.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Clouds.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Clouds.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Common.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/Common.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Common.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/Common.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Common.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Common.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Common.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Common.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonDebugPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonDebugPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonDebugPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonDebugPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPassTess.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPassTess.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPassTess.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonMotionBlurPassTess.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonSVO.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonSVO.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonSVO.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonSVO.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonShadowGenPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonShadowGenPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonShadowGenPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonShadowGenPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonShadowGenPassTess.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonShadowGenPassTess.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonShadowGenPassTess.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonShadowGenPassTess.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonTessellation.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonTessellation.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonTessellation.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonTessellation.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonViewsPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonViewsPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonViewsPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonViewsPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonViewsPassTess.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonViewsPassTess.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonViewsPassTess.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonViewsPassTess.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonZPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonZPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonZPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonZPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonZPassTess.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonZPassTess.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonZPassTess.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonZPassTess.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/CommonZPrePass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/CommonZPrePass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/CommonZPrePass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/CommonZPrePass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/DXTCompress.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DXTCompress.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DXTCompress.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DXTCompress.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Debug.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Debug.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Debug.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Debug.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/DebugLight.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DebugLight.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DebugLight.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DebugLight.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/DeferredCaustics.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DeferredCaustics.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DeferredCaustics.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DeferredCaustics.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/DeferredRain.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DeferredRain.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DeferredRain.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DeferredRain.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/DeferredShading.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DeferredShading.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DeferredShading.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DeferredShading.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/DeferredShadows.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/DeferredShadows.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DeferredShadows.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/DeferredShadows.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/DeferredSnow.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DeferredSnow.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DeferredSnow.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DeferredSnow.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/DepthOfField.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DepthOfField.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DepthOfField.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DepthOfField.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/DistanceClouds.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/DistanceClouds.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/DistanceClouds.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/DistanceClouds.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Eye.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Eye.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Eye.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Eye.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/FXConstantDefs.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/FXConstantDefs.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FXConstantDefs.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/FXConstantDefs.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/FXSamplerDefs.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/FXSamplerDefs.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FXSamplerDefs.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/FXSamplerDefs.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/FXStreamDefs.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/FXStreamDefs.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FXStreamDefs.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/FXStreamDefs.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/FallBack.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/FallBack.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FallBack.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/FallBack.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/FixedPipelineEmu.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/FixedPipelineEmu.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FixedPipelineEmu.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/FixedPipelineEmu.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/FogVolume.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/FogVolume.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FogVolume.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/FogVolume.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Fur.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Fur.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Fur.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Fur.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/FurFinPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/FurFinPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FurFinPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/FurFinPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/FurObliteratePass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/FurObliteratePass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FurObliteratePass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/FurObliteratePass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/FurZPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/FurZPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/FurZPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/FurZPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticle.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticle.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticle.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticle.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleBegin.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBegin.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleBegin.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBegin.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSort.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSort.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSort.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSort.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortGlobal2048.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortGlobal2048.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortGlobal2048.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortGlobal2048.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortLocal.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortLocal.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortLocal.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleBitonicSortLocal.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleCurves.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleCurves.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleCurves.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleCurves.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleEmit.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleEmit.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleEmit.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleEmit.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleGatherSortDistance.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleGatherSortDistance.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleGatherSortDistance.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleGatherSortDistance.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleHelpers.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleHelpers.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleHelpers.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleHelpers.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleOddEvenSort.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleOddEvenSort.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleOddEvenSort.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleOddEvenSort.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleRenderNoGS.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleRenderNoGS.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleRenderNoGS.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleRenderNoGS.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GPUParticleUpdate.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleUpdate.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GPUParticleUpdate.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GPUParticleUpdate.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/GeometryBeam.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/GeometryBeam.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/GeometryBeam.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/GeometryBeam.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Glass.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Glass.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Glass.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Glass.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass0.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass0.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass0.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass0.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass1.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass1.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass1.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/HDRDolbyMetadataPass1.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/HDRPostProcess.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/HDRPostProcess.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/HDRPostProcess.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/HDRPostProcess.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/HDRPostProcessDolby.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/HDRPostProcessDolby.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/HDRPostProcessDolby.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/HDRPostProcessDolby.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Hair.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Hair.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Hair.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Hair.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Helper.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Helper.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Helper.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Helper.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Hud3D.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Hud3D.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Hud3D.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Hud3D.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/HumanSkin.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/HumanSkin.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/HumanSkin.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/HumanSkin.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/HumanSkinTess.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/HumanSkinTess.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/HumanSkinTess.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/HumanSkinTess.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/HumanSkinValidations.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/HumanSkinValidations.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/HumanSkinValidations.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/HumanSkinValidations.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Illum.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Illum.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Illum.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Illum.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/IllumTess.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/IllumTess.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/IllumTess.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/IllumTess.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/IllumValidations.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/IllumValidations.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/IllumValidations.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/IllumValidations.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/LensOptics.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/LensOptics.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/LensOptics.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/LensOptics.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Light.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Light.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Light.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Light.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/LightBeam.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/LightBeam.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/LightBeam.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/LightBeam.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/LightVolumes.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/LightVolumes.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/LightVolumes.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/LightVolumes.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/MeshBaker.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/MeshBaker.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/MeshBaker.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/MeshBaker.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/MeshBakerDilate.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/MeshBakerDilate.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/MeshBakerDilate.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/MeshBakerDilate.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ModificatorTC.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/ModificatorTC.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ModificatorTC.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/ModificatorTC.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/ModificatorVT.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/ModificatorVT.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ModificatorVT.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/ModificatorVT.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Monitor.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Monitor.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Monitor.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Monitor.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/MotionBlur.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/MotionBlur.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/MotionBlur.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/MotionBlur.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/MultiLayerAlphaBlend.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/MultiLayerAlphaBlend.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/MultiLayerAlphaBlend.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/MultiLayerAlphaBlend.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/NoDraw.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/NoDraw.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/NoDraw.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/NoDraw.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/OcclusionTest.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/OcclusionTest.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/OcclusionTest.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/OcclusionTest.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ParticleImposter.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/ParticleImposter.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ParticleImposter.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/ParticleImposter.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ParticleVT.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/ParticleVT.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ParticleVT.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/ParticleVT.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Particles.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/Particles.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Particles.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/Particles.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Particles.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Particles.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Particles.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Particles.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ParticlesCustomPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/ParticlesCustomPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ParticlesCustomPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/ParticlesCustomPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/ParticlesNoMat.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/ParticlesNoMat.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ParticlesNoMat.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/ParticlesNoMat.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ParticlesNoMatMirror.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/ParticlesNoMatMirror.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ParticlesNoMatMirror.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/ParticlesNoMatMirror.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ParticlesShadowPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/ParticlesShadowPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ParticlesShadowPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/ParticlesShadowPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/PostAA.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/PostAA.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/PostAA.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/PostAA.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/PostEffects.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/PostEffects.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/PostEffects.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/PostEffects.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/PostEffectsGame.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/PostEffectsGame.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/PostEffectsGame.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/PostEffectsGame.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/PostEffectsLib.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/PostEffectsLib.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/PostEffectsLib.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/PostEffectsLib.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/ReferenceImage.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/ReferenceImage.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ReferenceImage.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/ReferenceImage.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ReferenceImageHDR.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/ReferenceImageHDR.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ReferenceImageHDR.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/ReferenceImageHDR.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Scopes.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Scopes.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Scopes.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Scopes.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ShadowBlur.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/ShadowBlur.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ShadowBlur.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/ShadowBlur.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/ShadowCommon.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/ShadowCommon.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ShadowCommon.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/ShadowCommon.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/ShadowMaskGen.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/ShadowMaskGen.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/ShadowMaskGen.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/ShadowMaskGen.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Sketch.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Sketch.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Sketch.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Sketch.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/SketchTerrain.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/SketchTerrain.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/SketchTerrain.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/SketchTerrain.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Sky.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Sky.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Sky.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Sky.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/SkyHDR.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/SkyHDR.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/SkyHDR.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/SkyHDR.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/SoftOcclusionQuery.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/SoftOcclusionQuery.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/SoftOcclusionQuery.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/SoftOcclusionQuery.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Stars.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Stars.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Stars.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Stars.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/StarterGame_GeometryBeamScaling.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/StarterGame_GeometryBeamScaling.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/StarterGame_GeometryBeamScaling.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/StarterGame_GeometryBeamScaling.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Stereo.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Stereo.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Stereo.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Stereo.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Sunshafts.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Sunshafts.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Sunshafts.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Sunshafts.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/TemplBeamProc.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/TemplBeamProc.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/TemplBeamProc.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/TemplBeamProc.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Terrain.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Terrain.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Terrain.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Terrain.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/TerrainValidations.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/TerrainValidations.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/TerrainValidations.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/TerrainValidations.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/TiledShading.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/TiledShading.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/TiledShading.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/TiledShading.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Total_Illumination.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Total_Illumination.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Total_Illumination.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Total_Illumination.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/UI.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/UI.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/UI.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/UI.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Vegetation.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Vegetation.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Vegetation.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Vegetation.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/VegetationTess.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/VegetationTess.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/VegetationTess.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/VegetationTess.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/VegetationValidations.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/VegetationValidations.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/VegetationValidations.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/VegetationValidations.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Video.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Video.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Video.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Video.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/VolumeLighting.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/VolumeLighting.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/VolumeLighting.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/VolumeLighting.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/VolumeObject.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/VolumeObject.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/VolumeObject.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/VolumeObject.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/VolumetricFog.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/VolumetricFog.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/VolumetricFog.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/VolumetricFog.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/Water.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Water.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Water.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Water.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/WaterCausticsPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/WaterCausticsPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/WaterCausticsPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/WaterCausticsPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/WaterFogVolume.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/WaterFogVolume.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/WaterFogVolume.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/WaterFogVolume.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/WaterOceanBottom.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/WaterOceanBottom.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/WaterOceanBottom.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/WaterOceanBottom.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/WaterReflectionsPass.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/WaterReflectionsPass.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/WaterReflectionsPass.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/WaterReflectionsPass.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/WaterVolume.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/WaterVolume.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/WaterVolume.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/WaterVolume.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/Waterfall.cfx b/Assets/Engine/Shaders/HWScripts/CryFX/Waterfall.cfx
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/Waterfall.cfx
rename to Assets/Engine/Shaders/HWScripts/CryFX/Waterfall.cfx
diff --git a/Engine/Shaders/HWScripts/CryFX/fragLib.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/fragLib.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/fragLib.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/fragLib.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/shadeLib.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/shadeLib.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/shadeLib.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/shadeLib.cfi
diff --git a/Engine/Shaders/HWScripts/CryFX/vertexLib.cfi b/Assets/Engine/Shaders/HWScripts/CryFX/vertexLib.cfi
similarity index 100%
rename from Engine/Shaders/HWScripts/CryFX/vertexLib.cfi
rename to Assets/Engine/Shaders/HWScripts/CryFX/vertexLib.cfi
diff --git a/Engine/Shaders/Hair.ext b/Assets/Engine/Shaders/Hair.ext
similarity index 100%
rename from Engine/Shaders/Hair.ext
rename to Assets/Engine/Shaders/Hair.ext
diff --git a/Engine/Shaders/HumanSkin.ext b/Assets/Engine/Shaders/HumanSkin.ext
similarity index 100%
rename from Engine/Shaders/HumanSkin.ext
rename to Assets/Engine/Shaders/HumanSkin.ext
diff --git a/Engine/Shaders/Illum.ext b/Assets/Engine/Shaders/Illum.ext
similarity index 100%
rename from Engine/Shaders/Illum.ext
rename to Assets/Engine/Shaders/Illum.ext
diff --git a/Engine/Shaders/LensOptics.ext b/Assets/Engine/Shaders/LensOptics.ext
similarity index 100%
rename from Engine/Shaders/LensOptics.ext
rename to Assets/Engine/Shaders/LensOptics.ext
diff --git a/Engine/Shaders/LightBeam.ext b/Assets/Engine/Shaders/LightBeam.ext
similarity index 100%
rename from Engine/Shaders/LightBeam.ext
rename to Assets/Engine/Shaders/LightBeam.ext
diff --git a/Engine/Shaders/Monitor.ext b/Assets/Engine/Shaders/Monitor.ext
similarity index 100%
rename from Engine/Shaders/Monitor.ext
rename to Assets/Engine/Shaders/Monitor.ext
diff --git a/Engine/Shaders/ParticleImposter.ext b/Assets/Engine/Shaders/ParticleImposter.ext
similarity index 100%
rename from Engine/Shaders/ParticleImposter.ext
rename to Assets/Engine/Shaders/ParticleImposter.ext
diff --git a/Engine/Shaders/Particles.ext b/Assets/Engine/Shaders/Particles.ext
similarity index 100%
rename from Engine/Shaders/Particles.ext
rename to Assets/Engine/Shaders/Particles.ext
diff --git a/Engine/Shaders/RunTime.ext b/Assets/Engine/Shaders/RunTime.ext
similarity index 100%
rename from Engine/Shaders/RunTime.ext
rename to Assets/Engine/Shaders/RunTime.ext
diff --git a/Engine/Shaders/Scopes.ext b/Assets/Engine/Shaders/Scopes.ext
similarity index 100%
rename from Engine/Shaders/Scopes.ext
rename to Assets/Engine/Shaders/Scopes.ext
diff --git a/Engine/Shaders/ShaderProfiles.txt b/Assets/Engine/Shaders/ShaderProfiles.txt
similarity index 100%
rename from Engine/Shaders/ShaderProfiles.txt
rename to Assets/Engine/Shaders/ShaderProfiles.txt
diff --git a/Engine/Shaders/ShadowMaskGen.ext b/Assets/Engine/Shaders/ShadowMaskGen.ext
similarity index 100%
rename from Engine/Shaders/ShadowMaskGen.ext
rename to Assets/Engine/Shaders/ShadowMaskGen.ext
diff --git a/Engine/Shaders/SketchTerrain.ext b/Assets/Engine/Shaders/SketchTerrain.ext
similarity index 100%
rename from Engine/Shaders/SketchTerrain.ext
rename to Assets/Engine/Shaders/SketchTerrain.ext
diff --git a/Engine/Shaders/SkyHDR.ext b/Assets/Engine/Shaders/SkyHDR.ext
similarity index 100%
rename from Engine/Shaders/SkyHDR.ext
rename to Assets/Engine/Shaders/SkyHDR.ext
diff --git a/Engine/Shaders/StarterGame_GeometryBeamScaling.ext b/Assets/Engine/Shaders/StarterGame_GeometryBeamScaling.ext
similarity index 100%
rename from Engine/Shaders/StarterGame_GeometryBeamScaling.ext
rename to Assets/Engine/Shaders/StarterGame_GeometryBeamScaling.ext
diff --git a/Engine/Shaders/Statics.ext b/Assets/Engine/Shaders/Statics.ext
similarity index 100%
rename from Engine/Shaders/Statics.ext
rename to Assets/Engine/Shaders/Statics.ext
diff --git a/Engine/Shaders/TemplBeamProc.ext b/Assets/Engine/Shaders/TemplBeamProc.ext
similarity index 100%
rename from Engine/Shaders/TemplBeamProc.ext
rename to Assets/Engine/Shaders/TemplBeamProc.ext
diff --git a/Engine/Shaders/Terrain.ext b/Assets/Engine/Shaders/Terrain.ext
similarity index 100%
rename from Engine/Shaders/Terrain.ext
rename to Assets/Engine/Shaders/Terrain.ext
diff --git a/Engine/Shaders/Vegetation.ext b/Assets/Engine/Shaders/Vegetation.ext
similarity index 100%
rename from Engine/Shaders/Vegetation.ext
rename to Assets/Engine/Shaders/Vegetation.ext
diff --git a/Engine/Shaders/VolumeObject.ext b/Assets/Engine/Shaders/VolumeObject.ext
similarity index 100%
rename from Engine/Shaders/VolumeObject.ext
rename to Assets/Engine/Shaders/VolumeObject.ext
diff --git a/Engine/Shaders/Water.ext b/Assets/Engine/Shaders/Water.ext
similarity index 100%
rename from Engine/Shaders/Water.ext
rename to Assets/Engine/Shaders/Water.ext
diff --git a/Engine/Shaders/WaterVolume.ext b/Assets/Engine/Shaders/WaterVolume.ext
similarity index 100%
rename from Engine/Shaders/WaterVolume.ext
rename to Assets/Engine/Shaders/WaterVolume.ext
diff --git a/Engine/Shaders/Waterfall.ext b/Assets/Engine/Shaders/Waterfall.ext
similarity index 100%
rename from Engine/Shaders/Waterfall.ext
rename to Assets/Engine/Shaders/Waterfall.ext
diff --git a/Engine/exclude.filetag b/Assets/Engine/exclude.filetag
similarity index 100%
rename from Engine/exclude.filetag
rename to Assets/Engine/exclude.filetag
diff --git a/Engine/include.filetag b/Assets/Engine/include.filetag
similarity index 100%
rename from Engine/include.filetag
rename to Assets/Engine/include.filetag
diff --git a/Engine/materials/material_layers_default.mtl b/Assets/Engine/materials/material_layers_default.mtl
similarity index 100%
rename from Engine/materials/material_layers_default.mtl
rename to Assets/Engine/materials/material_layers_default.mtl
diff --git a/Engine/materials/material_terrain_default.mtl b/Assets/Engine/materials/material_terrain_default.mtl
similarity index 100%
rename from Engine/materials/material_terrain_default.mtl
rename to Assets/Engine/materials/material_terrain_default.mtl
diff --git a/Engine/textures/default_icon.png b/Assets/Engine/textures/default_icon.png
similarity index 100%
rename from Engine/textures/default_icon.png
rename to Assets/Engine/textures/default_icon.png
diff --git a/Engine/textures/default_icon.png.exportsettings b/Assets/Engine/textures/default_icon.png.exportsettings
similarity index 100%
rename from Engine/textures/default_icon.png.exportsettings
rename to Assets/Engine/textures/default_icon.png.exportsettings
diff --git a/Engine/textures/defaults/defaultnouvs.tif b/Assets/Engine/textures/defaults/defaultnouvs.tif
similarity index 100%
rename from Engine/textures/defaults/defaultnouvs.tif
rename to Assets/Engine/textures/defaults/defaultnouvs.tif
diff --git a/Engine/textures/defaults/grey.tif b/Assets/Engine/textures/defaults/grey.tif
similarity index 100%
rename from Engine/textures/defaults/grey.tif
rename to Assets/Engine/textures/defaults/grey.tif
diff --git a/Engine/textures/skys/night/half_moon.tif b/Assets/Engine/textures/skys/night/half_moon.tif
similarity index 100%
rename from Engine/textures/skys/night/half_moon.tif
rename to Assets/Engine/textures/skys/night/half_moon.tif
diff --git a/AutomatedTesting/EngineFinder.cmake b/AutomatedTesting/EngineFinder.cmake
new file mode 100644
index 0000000000..1fdcef2b56
--- /dev/null
+++ b/AutomatedTesting/EngineFinder.cmake
@@ -0,0 +1,50 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+# This file is copied during engine registration. Edits to this file will be lost next
+# time a registration happens.
+
+include_guard()
+
+# Read the engine name from the project_json file
+file(READ ${CMAKE_CURRENT_LIST_DIR}/project.json project_json)
+string(JSON LY_ENGINE_NAME_TO_USE ERROR_VARIABLE json_error GET ${project_json} engine)
+if(json_error)
+ message(FATAL_ERROR "Unable to read key 'engine' from 'project.json', error: ${json_error}")
+endif()
+
+# Read the list of paths from ~.o3de/o3de_manifest.json
+file(TO_CMAKE_PATH "$ENV{USERPROFILE}" home_directory) # Windows
+if((NOT home_directory) OR (NOT EXISTS ${home_directory}))
+ file(TO_CMAKE_PATH "$ENV{HOME}" home_directory)# Unix
+endif()
+
+if (NOT home_directory)
+ message(FATAL_ERROR "Cannot find user home directory, the o3de manifest cannot be found")
+endif()
+# Set manifest path to path in the user home directory
+set(manifest_path ${home_directory}/.o3de/o3de_manifest.json)
+
+if(EXISTS ${manifest_path})
+ file(READ ${manifest_path} manifest_json)
+ string(JSON engines_count ERROR_VARIABLE json_error LENGTH ${manifest_json} engines)
+ if(json_error)
+ message(FATAL_ERROR "Unable to read key 'engines' from '${manifest_path}', error: ${json_error}")
+ endif()
+
+ math(EXPR engines_count "${engines_count}-1")
+ foreach(engine_path_index RANGE ${engines_count})
+ string(JSON engine_path ERROR_VARIABLE json_error GET ${manifest_json} engines ${engine_path_index})
+ if(${json_error})
+ message(FATAL_ERROR "Unable to read engines[${engine_path_index}] '${manifest_path}', error: ${json_error}")
+ endif()
+ list(APPEND CMAKE_MODULE_PATH "${engine_path}/cmake")
+ endforeach()
+endif()
diff --git a/AutomatedTesting/Gem/Code/Platform/Mac/runtime_dependencies.cmake b/AutomatedTesting/Gem/Code/Platform/Mac/runtime_dependencies.cmake
index 4d5680a30d..f9d1e60dda 100644
--- a/AutomatedTesting/Gem/Code/Platform/Mac/runtime_dependencies.cmake
+++ b/AutomatedTesting/Gem/Code/Platform/Mac/runtime_dependencies.cmake
@@ -8,3 +8,8 @@
# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#
+
+set(GEM_DEPENDENCIES
+ Gem::Atom_RHI_Metal.Private
+ Gem::Atom_RHI_Null.Private
+)
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/Code/Platform/Mac/tool_dependencies.cmake b/AutomatedTesting/Gem/Code/Platform/Mac/tool_dependencies.cmake
index 4d5680a30d..2e9d450ab8 100644
--- a/AutomatedTesting/Gem/Code/Platform/Mac/tool_dependencies.cmake
+++ b/AutomatedTesting/Gem/Code/Platform/Mac/tool_dependencies.cmake
@@ -8,3 +8,12 @@
# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#
+
+set(GEM_DEPENDENCIES
+ Gem::Atom_RHI_Null.Private
+ Gem::Atom_RHI_Null.Builders
+ Gem::Atom_RHI_Metal.Private
+ Gem::Atom_RHI_Metal.Builders
+ Gem::Atom_RHI_Vulkan.Builders
+ Gem::Atom_RHI_DX12.Builders
+)
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/Code/runtime_dependencies.cmake b/AutomatedTesting/Gem/Code/runtime_dependencies.cmake
index c8e66740e4..62a6ed7f8c 100644
--- a/AutomatedTesting/Gem/Code/runtime_dependencies.cmake
+++ b/AutomatedTesting/Gem/Code/runtime_dependencies.cmake
@@ -53,5 +53,6 @@ set(GEM_DEPENDENCIES
Gem::ImguiAtom
Gem::Atom_AtomBridge
Gem::AtomFont
+ Gem::NvCloth
Gem::Blast
)
diff --git a/AutomatedTesting/Gem/Code/tool_dependencies.cmake b/AutomatedTesting/Gem/Code/tool_dependencies.cmake
index 8c5da63f42..a6bbeee350 100644
--- a/AutomatedTesting/Gem/Code/tool_dependencies.cmake
+++ b/AutomatedTesting/Gem/Code/tool_dependencies.cmake
@@ -68,5 +68,6 @@ set(GEM_DEPENDENCIES
Gem::ImguiAtom
Gem::AtomFont
Gem::AtomToolsFramework.Editor
+ Gem::NvCloth.Editor
Gem::Blast.Editor
)
diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py
index a961ccdc52..7ed47d0b58 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py
@@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
from ActorSplitsAfterDamage import Tests
-def run():
- from ActorSplitsAfterDamage import run as internal_run
- from editor_python_test_tools.utils import Constants
+def ActorSplitsAfterCapsuleDamage():
+ from ActorSplitsAfterDamage import base_run as internal_run
+ from BlastUtils import Constants
def CapsuleDamage(target_id, position0):
position1 = azlmbr.object.construct('Vector3', position0.x + 1.0, position0.y, position0.z)
@@ -30,4 +30,8 @@ def run():
if __name__ == "__main__":
- run()
+ import ImportPathHelper as imports
+ imports.init()
+
+ from editor_python_test_tools.utils import Report
+ Report.start_test(ActorSplitsAfterCapsuleDamage)
diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py
index 5692773d6d..a75aae21f0 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py
@@ -22,7 +22,7 @@ class Tests():
# fmt: on
-def run():
+def ActorSplitsAfterCollision():
"""
Summary:
@@ -60,8 +60,8 @@ def run():
import azlmbr.legacy.general as general
import azlmbr.bus
- from editor_python_test_tools.utils import CollisionHandler
- from editor_python_test_tools.utils import BlastNotificationHandler
+ from BlastUtils import CollisionHandler
+ from BlastUtils import BlastNotificationHandler
# Constants
TIMEOUT = 2.0
@@ -107,4 +107,8 @@ def run():
if __name__ == "__main__":
- run()
+ import ImportPathHelper as imports
+ imports.init()
+
+ from editor_python_test_tools.utils import Report
+ Report.start_test(ActorSplitsAfterCollision)
diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py
index ddd90ca89a..d71f17c958 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py
@@ -20,7 +20,7 @@ class Tests():
# fmt: on
-def run(damage_func):
+def base_run(damage_func):
"""
Summary:
@@ -56,7 +56,7 @@ def run(damage_func):
import azlmbr.legacy.general as general
import azlmbr.bus
- from editor_python_test_tools.utils import BlastNotificationHandler
+ from BlastUtils import BlastNotificationHandler
# Constants
TIMEOUT = 2.0
diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py
index 9b3fd1e596..e2783ef605 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py
@@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
from ActorSplitsAfterDamage import Tests
-def run():
- from ActorSplitsAfterDamage import run as internal_run
- from editor_python_test_tools.utils import Constants
+def ActorSplitsAfterImpactSpreadDamage():
+ from ActorSplitsAfterDamage import base_run as internal_run
+ from BlastUtils import Constants
def ImpactSpreadDamage(target_id, position):
azlmbr.destruction.BlastFamilyDamageRequestBus(azlmbr.bus.Event, "Impact Spread Damage", target_id,
@@ -28,4 +28,8 @@ def run():
if __name__ == "__main__":
- run()
+ import ImportPathHelper as imports
+ imports.init()
+
+ from editor_python_test_tools.utils import Report
+ Report.start_test(ActorSplitsAfterImpactSpreadDamage)
diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py
index a219e63d34..f89a322bec 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py
@@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
from ActorSplitsAfterDamage import Tests
-def run():
- from ActorSplitsAfterDamage import run as internal_run
- from editor_python_test_tools.utils import Constants
+def ActorSplitsAfterRadialDamage():
+ from ActorSplitsAfterDamage import base_run as internal_run
+ from BlastUtils import Constants
def RadialDamage(target_id, position):
azlmbr.destruction.BlastFamilyDamageRequestBus(azlmbr.bus.Event, "Radial Damage", target_id,
@@ -28,4 +28,8 @@ def run():
if __name__ == "__main__":
- run()
+ import ImportPathHelper as imports
+ imports.init()
+
+ from editor_python_test_tools.utils import Report
+ Report.start_test(ActorSplitsAfterRadialDamage)
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py
index e775be302d..5d2b6db1f3 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py
@@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
from ActorSplitsAfterDamage import Tests
-def run():
- from ActorSplitsAfterDamage import run as internal_run
- from editor_python_test_tools.utils import Constants
+def ActorSplitsAfterShearDamage():
+ from ActorSplitsAfterDamage import base_run as internal_run
+ from BlastUtils import Constants
def ShearDamage(target_id, position):
normal = azlmbr.object.construct('Vector3', 1.0, 0.0, 0.0)
@@ -29,4 +29,8 @@ def run():
if __name__ == "__main__":
- run()
+ import ImportPathHelper as imports
+ imports.init()
+
+ from editor_python_test_tools.utils import Report
+ Report.start_test(ActorSplitsAfterShearDamage)
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py
index 0195190348..bfbbde259a 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py
@@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
from ActorSplitsAfterDamage import Tests
-def run():
- from ActorSplitsAfterDamage import run as internal_run
- from editor_python_test_tools.utils import Constants
+def ActorSplitsAfterStressDamage():
+ from ActorSplitsAfterDamage import base_run as internal_run
+ from BlastUtils import Constants
def StressDamage(target_id, position):
force = azlmbr.object.construct('Vector3', 0.0, 0.0, -100.0) # Should be enough to break `brittle` objects
@@ -28,4 +28,8 @@ def run():
if __name__ == "__main__":
- run()
+ import ImportPathHelper as imports
+ imports.init()
+
+ from editor_python_test_tools.utils import Report
+ Report.start_test(ActorSplitsAfterStressDamage)
diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py
index 0351fe42e2..e8f44bbc77 100755
--- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py
@@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
from ActorSplitsAfterDamage import Tests
-def run():
- from ActorSplitsAfterDamage import run as internal_run
- from editor_python_test_tools.utils import Constants
+def ActorSplitsAfterTriangleDamage():
+ from ActorSplitsAfterDamage import base_run as internal_run
+ from BlastUtils import Constants
def TriangleDamage(target_id, position):
# Some points that form a triangle that contains the given position
@@ -32,4 +32,8 @@ def run():
if __name__ == "__main__":
- run()
+ import ImportPathHelper as imports
+ imports.init()
+
+ from editor_python_test_tools.utils import Report
+ Report.start_test(ActorSplitsAfterTriangleDamage)
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/Blast/Utils.py b/AutomatedTesting/Gem/PythonTests/Blast/BlastUtils.py
old mode 100755
new mode 100644
similarity index 100%
rename from AutomatedTesting/Gem/PythonTests/Blast/Utils.py
rename to AutomatedTesting/Gem/PythonTests/Blast/BlastUtils.py
diff --git a/AutomatedTesting/Gem/PythonTests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
index 260d5ea1b1..3124f1048a 100644
--- a/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
@@ -25,10 +25,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE main
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/physics/TestSuite_Main.py
- TIMEOUT 3600
+ TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
- Legacy::CryRenderNULL
AZ::AssetProcessor
AutomatedTesting.Assets
COMPONENT
@@ -39,10 +38,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE periodic
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/physics/TestSuite_Periodic.py
- TIMEOUT 3600
+ TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
- Legacy::CryRenderNULL
AZ::AssetProcessor
AutomatedTesting.Assets
COMPONENT
@@ -53,10 +51,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE sandbox
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/physics/TestSuite_Sandbox.py
- TIMEOUT 3600
+ TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
- Legacy::CryRenderNULL
AZ::AssetProcessor
AutomatedTesting.Assets
COMPONENT
@@ -71,10 +68,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE periodic
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/scripting/TestSuite_Active.py
- TIMEOUT 3600
+ TIMEOUT 3000
RUNTIME_DEPENDENCIES
Legacy::Editor
- Legacy::CryRenderNULL
AZ::AssetProcessor
AutomatedTesting.Assets
COMPONENT
@@ -85,10 +81,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE sandbox
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/scripting/TestSuite_Sandbox.py
- TIMEOUT 3600
+ TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
- Legacy::CryRenderNULL
AZ::AssetProcessor
AutomatedTesting.Assets
)
@@ -101,10 +96,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE main
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/WhiteBox/TestSuite_Active.py
- TIMEOUT 3600
+ TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
- Legacy::CryRenderNULL
AZ::AssetProcessor
AutomatedTesting.Assets
COMPONENT
@@ -113,21 +107,21 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
endif()
## NvCloth ##
-# [TODO LYN-1928] Enable when AutomatedTesting runs with Atom
-#if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
-# ly_add_pytest(
-# NAME AutomatedTesting::NvClothTests
-# TEST_SUITE main
-# TEST_SERIAL
-# PATH ${CMAKE_CURRENT_LIST_DIR}/NvCloth/TestSuite_Active.py
-# TIMEOUT 3600
-# RUNTIME_DEPENDENCIES
-# Legacy::Editor
-# Legacy::CryRenderNULL
-# AZ::AssetProcessor
-# AutomatedTesting.Assets
-# )
-#endif()
+if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
+ ly_add_pytest(
+ NAME AutomatedTesting::NvClothTests_Main
+ TEST_SUITE main
+ TEST_SERIAL
+ PATH ${CMAKE_CURRENT_LIST_DIR}/NvCloth/TestSuite_Active.py
+ TIMEOUT 1500
+ RUNTIME_DEPENDENCIES
+ Legacy::Editor
+ AZ::AssetProcessor
+ AutomatedTesting.Assets
+ COMPONENT
+ NvCloth
+ )
+endif()
## Editor Python Bindings ##
if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
@@ -136,10 +130,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE sandbox
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/EditorPythonBindings
- TIMEOUT 3600
+ TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
- Legacy::CryRenderNULL
AZ::AssetProcessor
AutomatedTesting.Assets
Gem::EditorPythonBindings.Editor
@@ -154,10 +147,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE periodic
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/PythonAssetBuilder
- TIMEOUT 3600
+ TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
- Legacy::CryRenderNULL
AZ::AssetProcessor
AutomatedTesting.Assets
Gem::EditorPythonBindings.Editor
@@ -170,14 +162,15 @@ endif()
if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_pytest(
NAME AutomatedTesting::BlastTests
- TEST_SUITE periodic
+ TEST_SUITE main
TEST_SERIAL TRUE
PATH ${CMAKE_CURRENT_LIST_DIR}/Blast/TestSuite_Active.py
- TIMEOUT 3600
+ TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
AZ::AssetProcessor
AutomatedTesting.Assets
+ COMPONENT Blast
)
endif()
@@ -189,21 +182,23 @@ include(${pal_dir}/PAL_traits_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_LARGE_WORLDS_TEST_SUPPORTED)
## DynVeg ##
- ly_add_pytest(
- NAME AutomatedTesting::DynamicVegetationTests_Main
- TEST_SERIAL
- TEST_SUITE main
- PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/dyn_veg
- PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
- TIMEOUT 36000
- RUNTIME_DEPENDENCIES
- AZ::AssetProcessor
- Legacy::Editor
- AutomatedTesting.GameLauncher
- AutomatedTesting.Assets
- COMPONENT
- LargeWorlds
- )
+ # Temporarily moving all tests to periodic suite - SPEC-6553
+ #ly_add_pytest(
+ # NAME AutomatedTesting::DynamicVegetationTests_Main
+ # TEST_SERIAL
+ # TEST_SUITE main
+ # PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/dyn_veg
+ # PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
+ # TIMEOUT 1500
+ # RUNTIME_DEPENDENCIES
+ # AZ::AssetProcessor
+ # Legacy::Editor
+ # AutomatedTesting.GameLauncher
+ # AutomatedTesting.Assets
+ # COMPONENT
+ # LargeWorlds
+ #)
+
ly_add_pytest(
NAME AutomatedTesting::DynamicVegetationTests_Sandbox
@@ -211,7 +206,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SUITE sandbox
PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/dyn_veg
PYTEST_MARKS "SUITE_sandbox"
- TIMEOUT 36000
+ TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
@@ -222,12 +217,12 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
)
ly_add_pytest(
- NAME AutomatedTesting::DynamicVegetationTests_Periodic
+ NAME AutomatedTesting::DynamicVegetationFilterTests_Periodic
TEST_SERIAL
TEST_SUITE periodic
PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/dyn_veg
- PYTEST_MARKS "SUITE_periodic"
- TIMEOUT 3600
+ PYTEST_MARKS "SUITE_periodic and dynveg_filter"
+ TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
@@ -236,29 +231,104 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
LargeWorlds
)
-## LandscapeCanvas ##
ly_add_pytest(
- NAME AutomatedTesting::LandscapeCanvasTests_Main
+ NAME AutomatedTesting::DynamicVegetationModifierTests_Periodic
TEST_SERIAL
- TEST_SUITE main
- PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/landscape_canvas
- PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
- TIMEOUT 3600
+ TEST_SUITE periodic
+ PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/dyn_veg
+ PYTEST_MARKS "SUITE_periodic and dynveg_modifier"
+ TIMEOUT 1500
RUNTIME_DEPENDENCIES
- AZ::AssetProcessor
- Legacy::Editor
- AutomatedTesting.Assets
+ AZ::AssetProcessor
+ Legacy::Editor
+ AutomatedTesting.Assets
COMPONENT
LargeWorlds
)
+ ly_add_pytest(
+ NAME AutomatedTesting::DynamicVegetationRegressionTests_Periodic
+ TEST_SERIAL
+ TEST_SUITE periodic
+ PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/dyn_veg
+ PYTEST_MARKS "SUITE_periodic and dynveg_regression"
+ TIMEOUT 1500
+ RUNTIME_DEPENDENCIES
+ AZ::AssetProcessor
+ Legacy::Editor
+ AutomatedTesting.Assets
+ COMPONENT
+ LargeWorlds
+ )
+
+ ly_add_pytest(
+ NAME AutomatedTesting::DynamicVegetationAreaTests_Periodic
+ TEST_SERIAL
+ TEST_SUITE periodic
+ PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/dyn_veg
+ PYTEST_MARKS "SUITE_periodic and dynveg_area"
+ TIMEOUT 1500
+ RUNTIME_DEPENDENCIES
+ AZ::AssetProcessor
+ Legacy::Editor
+ AutomatedTesting.Assets
+ COMPONENT
+ LargeWorlds
+ )
+
+ ly_add_pytest(
+ NAME AutomatedTesting::DynamicVegetationMiscTests_Periodic
+ TEST_SERIAL
+ TEST_SUITE periodic
+ PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/dyn_veg
+ PYTEST_MARKS "SUITE_periodic and dynveg_misc"
+ TIMEOUT 1500
+ RUNTIME_DEPENDENCIES
+ AZ::AssetProcessor
+ Legacy::Editor
+ AutomatedTesting.Assets
+ COMPONENT
+ LargeWorlds
+ )
+
+ ly_add_pytest(
+ NAME AutomatedTesting::DynamicVegetationSurfaceTagTests_Periodic
+ TEST_SERIAL
+ TEST_SUITE periodic
+ PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/dyn_veg
+ PYTEST_MARKS "SUITE_periodic and dynveg_surfacetagemitter"
+ TIMEOUT 1500
+ RUNTIME_DEPENDENCIES
+ AZ::AssetProcessor
+ Legacy::Editor
+ AutomatedTesting.Assets
+ COMPONENT
+ LargeWorlds
+ )
+## LandscapeCanvas ##
+ # Temporarily moving all tests to periodic suite - SPEC-6553
+ #ly_add_pytest(
+ # NAME AutomatedTesting::LandscapeCanvasTests_Main
+ # TEST_SERIAL
+ # TEST_SUITE main
+ # PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/landscape_canvas
+ # PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
+ # TIMEOUT 1500
+ # RUNTIME_DEPENDENCIES
+ # AZ::AssetProcessor
+ # Legacy::Editor
+ # AutomatedTesting.Assets
+ # COMPONENT
+ # LargeWorlds
+ #)
+
ly_add_pytest(
NAME AutomatedTesting::LandscapeCanvasTests_Periodic
TEST_SERIAL
TEST_SUITE periodic
PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/landscape_canvas
PYTEST_MARKS "SUITE_periodic"
- TIMEOUT 3600
+ TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
@@ -273,7 +343,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SERIAL
TEST_SUITE periodic
PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/gradient_signal
- TIMEOUT 3600
+ TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
@@ -291,10 +361,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SUITE periodic
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/editor
- TIMEOUT 3600
+ TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
- Legacy::CryRenderNULL
AZ::AssetProcessor
AutomatedTesting.Assets
COMPONENT
@@ -313,7 +382,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
# AZ::AssetProcessor
# AZ::AssetProcessorBatch
# AutomatedTesting.GameLauncher
- # Legacy::CryRenderNULL
#)
endif()
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/CryMaterialsCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/CryMaterialsCommands_test.py
deleted file mode 100755
index 41ae0608a4..0000000000
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/CryMaterialsCommands_test.py
+++ /dev/null
@@ -1,75 +0,0 @@
-"""
-All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-its licensors.
-
-For complete copyright and license terms please see the LICENSE at the root of this
-distribution (the "License"). All use of this software is governed by the License,
-or, if provided, by the license below or the license accompanying this file. Do not
-remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-"""
-
-#
-# This is a pytest module to test the in-Editor Python API from ViewPane.h
-#
-import pytest
-pytest.importorskip('ly_test_tools')
-
-import sys
-import os
-sys.path.append(os.path.dirname(__file__))
-from hydra_utils import launch_test_case
-
-
-@pytest.mark.SUITE_sandbox
-@pytest.mark.parametrize('launcher_platform', ['windows_editor'])
-@pytest.mark.parametrize('project', ['AutomatedTesting'])
-@pytest.mark.parametrize('level', ['auto_test'])
-class TestLegacyCryMaterialsCommandsAutomation(object):
-
- def test_Legacy_CryMaterials(self, request, editor, level, launcher_platform):
-
- unexpected_lines=[]
- expected_lines = [
- # "Material Settings/Shader updated correctly", # Disabled, SPEC-3590
- # "Material Settings/Surface Type updated correctly", # Disabled, SPEC-3590
- "Texture Maps/Diffuse/Tiling/IsTileU updated correctly",
- "Texture Maps/Diffuse/Tiling/TileU updated correctly",
- "Texture Maps/Diffuse/Rotator/Type updated correctly",
- "Texture Maps/Diffuse/Rotator/Amplitude updated correctly",
- "Texture Maps/Diffuse/Oscillator/AmplitudeU updated correctly",
- "Opacity Settings/Opacity updated correctly",
- "Opacity Settings/AlphaTest updated correctly",
- "Opacity Settings/Additive updated correctly",
- "Lighting Settings/Diffuse Color updated correctly",
- "Lighting Settings/Specular Color updated correctly",
- "Lighting Settings/Emissive Intensity updated correctly",
- "Lighting Settings/Emissive Color updated correctly",
- "Advanced/Allow layer activation updated correctly",
- "Advanced/2 Sided updated correctly",
- "Advanced/No Shadow updated correctly",
- "Advanced/Use Scattering updated correctly",
- "Advanced/Hide After Breaking updated correctly",
- "Advanced/Fog Volume Shading Quality High updated correctly",
- "Advanced/Blend Terrain Color updated correctly",
- "Advanced/Voxel Coverage updated correctly",
- "Advanced/Propagate Opacity Settings updated correctly",
- "Advanced/Propagate Lighting Settings updated correctly",
- "Advanced/Propagate Advanced Settings updated correctly",
- "Advanced/Propagate Texture Maps updated correctly",
- "Advanced/Propagate Shader Params updated correctly",
- "Advanced/Propagate Shader Generation updated correctly",
- "Advanced/Propagate Vertex Deformation updated correctly",
- # "Shader Params/Blend Factor updated correctly", # Disabled, SPEC-3590
- # "Shader Params/Indirect bounce color updated correctly", # Disabled, SPEC-3590
- "Vertex Deformation/Type updated correctly",
- "Vertex Deformation/Wave Length X updated correctly",
- "Vertex Deformation/Wave X/Level updated correctly",
- "Vertex Deformation/Wave X/Amplitude updated correctly",
- "Vertex Deformation/Wave X/Phase updated correctly",
- "Vertex Deformation/Wave X/Frequency updated correctly"
- ]
-
- test_case_file = os.path.join(os.path.dirname(__file__), 'CryMaterialsCommands_test_case.py')
- launch_test_case(editor, test_case_file, expected_lines, unexpected_lines)
-
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/CryMaterialsCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/CryMaterialsCommands_test_case.py
deleted file mode 100755
index 913b1ace24..0000000000
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/CryMaterialsCommands_test_case.py
+++ /dev/null
@@ -1,116 +0,0 @@
-"""
-All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-its licensors.
-
-For complete copyright and license terms please see the LICENSE at the root of this
-distribution (the "License"). All use of this software is governed by the License,
-or, if provided, by the license below or the license accompanying this file. Do not
-remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-"""
-
-# Tests the legacy Python API for CryMaterials while the Editor is running
-
-import azlmbr.bus as bus
-import azlmbr.editor as editor
-import azlmbr.legacy.material as material
-import azlmbr.math as math
-
-materialName = 'materials/ter_layer_green'
-print(f'Starting CryMaterial test case using material {materialName}')
-
-
-def MaterialPropertyTest(property, value, doReset=True):
- try:
- # get old value and attempt to set new value
- oldValue = material.get_property(materialName, property)
- if oldValue == value:
- print(f'>>> `{property}` already set to {oldValue}')
- return
- material.set_property(materialName, property, value)
-
- # test that the set new value worked
- newValue = material.get_property(materialName, property)
- if oldValue != newValue:
- print(f"{property} updated correctly")
-
- # reset back to old value
- if doReset:
- material.set_property(materialName, property, oldValue)
- except:
- print(f'!!! hit an exception when setting `{property}` to {value}')
-
-
-color = math.Color()
-color.r = 255.0
-color.g = 128.0
-color.b = 64.0
-color.a = 0.0
-
-# Material Settings
-# MaterialPropertyTest("Material Settings/Shader", "Geometrybeam") # Disabled, SPEC-3590
-# MaterialPropertyTest("Material Settings/Surface Type", "grass") # Disabled, SPEC-3590
-
-# Texture Maps
-MaterialPropertyTest("Texture Maps/Diffuse/Tiling/IsTileU", False)
-MaterialPropertyTest("Texture Maps/Diffuse/Tiling/IsTileV", False)
-MaterialPropertyTest("Texture Maps/Diffuse/Tiling/TileU", 0.42)
-MaterialPropertyTest("Texture Maps/Diffuse/Rotator/Type", 'Oscillated Rotation')
-MaterialPropertyTest("Texture Maps/Diffuse/Rotator/Amplitude", 42.0)
-MaterialPropertyTest("Texture Maps/Diffuse/Oscillator/TypeU", 'Fixed Moving')
-MaterialPropertyTest("Texture Maps/Diffuse/Oscillator/AmplitudeU", 42.0)
-
-# Vertex Deformation
-MaterialPropertyTest("Vertex Deformation/Type", 'Sin Wave')
-MaterialPropertyTest("Vertex Deformation/Wave Length X", 42.0)
-MaterialPropertyTest("Vertex Deformation/Type", 'Perlin 3D')
-MaterialPropertyTest("Vertex Deformation/Noise Scale", math.Vector3(1.1, 2.2, 3.3))
-
-# Opacity Settings
-MaterialPropertyTest("Opacity Settings/Opacity", 42)
-MaterialPropertyTest("Opacity Settings/AlphaTest", 2)
-MaterialPropertyTest("Opacity Settings/Additive", True)
-
-# Lighting Settings
-MaterialPropertyTest("Lighting Settings/Diffuse Color", color)
-MaterialPropertyTest("Lighting Settings/Specular Color", color)
-MaterialPropertyTest("Lighting Settings/Emissive Intensity", 42.0)
-MaterialPropertyTest("Lighting Settings/Emissive Color", color)
-MaterialPropertyTest("Lighting Settings/Specular Level", 2.0)
-
-# Advanced
-MaterialPropertyTest("Advanced/Allow layer activation", False)
-MaterialPropertyTest("Advanced/2 Sided", True)
-MaterialPropertyTest("Advanced/No Shadow", True)
-MaterialPropertyTest("Advanced/Use Scattering", True)
-MaterialPropertyTest("Advanced/Hide After Breaking", True)
-MaterialPropertyTest("Advanced/Fog Volume Shading Quality High", True)
-MaterialPropertyTest("Advanced/Blend Terrain Color", True)
-MaterialPropertyTest("Advanced/Voxel Coverage", 0.42)
-# --- MaterialPropertyTest("Advanced/Link to Material", "materials/ter_layer_blue") # Works, but clears on UI refresh
-MaterialPropertyTest("Advanced/Propagate Opacity Settings", True)
-MaterialPropertyTest("Advanced/Propagate Lighting Settings", True)
-MaterialPropertyTest("Advanced/Propagate Advanced Settings", True)
-MaterialPropertyTest("Advanced/Propagate Texture Maps", True)
-MaterialPropertyTest("Advanced/Propagate Shader Params", True)
-MaterialPropertyTest("Advanced/Propagate Shader Generation", True)
-MaterialPropertyTest("Advanced/Propagate Vertex Deformation", True)
-
-# Shader parameters vary with each Shader, just testing a couple of them...
-# MaterialPropertyTest("Shader Params/Blend Factor", 7.0, False) # Disabled, SPEC-3590
-# MaterialPropertyTest("Shader Params/Indirect bounce color", color, False) # Disabled, SPEC-3590
-
-### These values are reset to False when set. Left them here commented for reference.
-# MaterialPropertyTest("Shader Generation Params/Dust & Turbulence", True)
-# MaterialPropertyTest("Shader Generation Params/Receive Shadows", True)
-# MaterialPropertyTest("Shader Generation Params/UV Vignetting", True)
-
-# Vertex Deformation
-MaterialPropertyTest("Vertex Deformation/Type", "Sin Wave")
-MaterialPropertyTest("Vertex Deformation/Wave Length X", 42.0)
-MaterialPropertyTest("Vertex Deformation/Wave X/Level", 42.0)
-MaterialPropertyTest("Vertex Deformation/Wave X/Amplitude", 42.0)
-MaterialPropertyTest("Vertex Deformation/Wave X/Phase", 42.0)
-MaterialPropertyTest("Vertex Deformation/Wave X/Frequency", 42.0)
-
-editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'ExitNoPrompt')
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
index a9f6d0aa02..c7f1aba031 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
@@ -265,6 +265,7 @@ class Tracer:
self.warnings = []
self.errors = []
self.asserts = []
+ self.prints = []
self.has_warnings = False
self.has_errors = False
self.has_asserts = False
@@ -310,6 +311,11 @@ class Tracer:
def __repr__(self):
return f"[Assert: {self.message}]"
+
+ class PrintInfo:
+ def __init__(self, args):
+ self.window = args[0]
+ self.message = args[1]
def _on_warning(self, args):
warningInfo = Tracer.WarningInfo(args)
@@ -331,13 +337,19 @@ class Tracer:
Report.info("Tracer caught Assert: %s:%i[%s] \"%s\"" % (assertInfo.filename, assertInfo.line, assertInfo.function, assertInfo.message))
self.has_asserts = True
return False
-
+
+ def _on_printf(self, args):
+ printInfo = Tracer.PrintInfo(args)
+ self.prints.append(printInfo)
+ return False
+
def __enter__(self):
self.handler = azlmbr.debug.TraceMessageBusHandler()
self.handler.connect(None)
self.handler.add_callback("OnPreAssert", self._on_assert)
self.handler.add_callback("OnPreWarning", self._on_warning)
self.handler.add_callback("OnPreError", self._on_error)
+ self.handler.add_callback("OnPrintf", self._on_printf)
return self
def __exit__(self, type, value, traceback):
diff --git a/AutomatedTesting/Gem/PythonTests/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh.py b/AutomatedTesting/Gem/PythonTests/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh.py
index 2677ba5605..625c9772bd 100755
--- a/AutomatedTesting/Gem/PythonTests/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh.py
+++ b/AutomatedTesting/Gem/PythonTests/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh.py
@@ -20,7 +20,7 @@ class Tests:
exit_game_mode = ("Exited game mode", "Failed to exit game mode")
# fmt: on
-def run():
+def C18977329_NvCloth_AddClothSimulationToMesh():
"""
Summary:
Load level with Entity having Mesh and Cloth components already setup. Verify that editor remains stable in Game mode.
@@ -89,4 +89,7 @@ def run():
helper.close_editor()
if __name__ == "__main__":
- run()
+ import ImportPathHelper as imports
+ imports.init()
+ from editor_python_test_tools.utils import Report
+ Report.start_test(C18977329_NvCloth_AddClothSimulationToMesh)
diff --git a/AutomatedTesting/Gem/PythonTests/NvCloth/C18977330_NvCloth_AddClothSimulationToActor.py b/AutomatedTesting/Gem/PythonTests/NvCloth/C18977330_NvCloth_AddClothSimulationToActor.py
index 2d4fa4e325..9b3135cd2b 100755
--- a/AutomatedTesting/Gem/PythonTests/NvCloth/C18977330_NvCloth_AddClothSimulationToActor.py
+++ b/AutomatedTesting/Gem/PythonTests/NvCloth/C18977330_NvCloth_AddClothSimulationToActor.py
@@ -20,7 +20,7 @@ class Tests:
exit_game_mode = ("Exited game mode", "Failed to exit game mode")
# fmt: on
-def run():
+def C18977330_NvCloth_AddClothSimulationToActor():
"""
Summary:
Load level with Entity having Actor and Cloth components already setup. Verify that editor remains stable in Game mode.
@@ -89,4 +89,7 @@ def run():
helper.close_editor()
if __name__ == "__main__":
- run()
+ import ImportPathHelper as imports
+ imports.init()
+ from editor_python_test_tools.utils import Report
+ Report.start_test(C18977330_NvCloth_AddClothSimulationToActor)
diff --git a/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Active.py b/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Active.py
index 162c54afc8..86bfc48636 100755
--- a/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Active.py
+++ b/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Active.py
@@ -21,14 +21,15 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesti
from base import TestAutomationBase
-@pytest.mark.SUITE_main
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
@pytest.mark.parametrize("project", ["AutomatedTesting"])
class TestAutomation(TestAutomationBase):
+ @pytest.mark.xfail(reason="Running with atom null renderer is causing this test to fail")
def test_C18977329_NvCloth_AddClothSimulationToMesh(self, request, workspace, editor, launcher_platform):
from . import C18977329_NvCloth_AddClothSimulationToMesh as test_module
self._run_test(request, workspace, editor, test_module)
+ @pytest.mark.xfail(reason="Running with atom null renderer is causing this test to fail")
def test_C18977330_NvCloth_AddClothSimulationToActor(self, request, workspace, editor, launcher_platform):
from . import C18977330_NvCloth_AddClothSimulationToActor as test_module
self._run_test(request, workspace, editor, test_module)
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
index de3e04e67e..6a865ee690 100644
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
@@ -100,7 +100,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
PATH ${CMAKE_CURRENT_LIST_DIR}/asset_bundler_batch_tests.py
EXCLUDE_TEST_RUN_TARGET_FROM_IDE
TEST_SERIAL
- TIMEOUT 3600
+ TIMEOUT 1500
TEST_SUITE periodic
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
@@ -123,7 +123,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
PATH ${CMAKE_CURRENT_LIST_DIR}/missing_dependency_tests.py
EXCLUDE_TEST_RUN_TARGET_FROM_IDE
TEST_SERIAL
- TIMEOUT 3600
+ TIMEOUT 1500
TEST_SUITE periodic
RUNTIME_DEPENDENCIES
AZ::AssetProcessorBatch
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests.py
index cfd088adc0..e329846554 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_dependency_tests.py
@@ -71,9 +71,9 @@ class TestsAssetProcessorBatch_DependenycyTests(object):
env = ap_setup_fixture
BATCH_LOG_PATH = env["ap_batch_log_file"]
asset_processor.create_temp_asset_root()
- asset_processor.add_relative_source_asset(os.path.join("Engine", "engine_dependencies.xml"))
- asset_processor.add_scan_folder("Engine")
- asset_processor.add_relative_source_asset(os.path.join("Engine", "Libs", "MaterialEffects", "surfacetypes.xml"))
+ asset_processor.add_relative_source_asset(os.path.join("Assets", "Engine", "engine_dependencies.xml"))
+ asset_processor.add_scan_folder(os.path.join("Assets", "Engine"))
+ asset_processor.add_relative_source_asset(os.path.join("Assets", "Engine", "Libs", "MaterialEffects", "surfacetypes.xml"))
# Precondition: Assets are all processed
asset_processor.batch_process()
@@ -103,7 +103,7 @@ class TestsAssetProcessorBatch_DependenycyTests(object):
assert surfacetypes_missing_logline, "Surfacetypes.xml not seen in the batch log as missing."
# Add the schema file which allows our xml parser to understand dependencies for our engine_dependencies file
- asset_processor.add_relative_source_asset(os.path.join("Engine", "Schema", "enginedependency.xmlschema"))
+ asset_processor.add_relative_source_asset(os.path.join("Assets", "Engine", "Schema", "enginedependency.xmlschema"))
asset_processor.batch_process()
_, output = asset_processor.batch_process(capture_output=True,
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_gui_tests_2.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_gui_tests_2.py
index 7c7b6b2452..b25ee081a1 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_gui_tests_2.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_gui_tests_2.py
@@ -205,10 +205,13 @@ class TestsAssetProcessorGUI_AllPlatforms(object):
env = ap_setup_fixture
# Copy test assets to new folder in dev folder
# This new folder will be created outside the default project folder and will not be added as a scan folder
- # by default, instead we'll modify the temporary AssetProcessorPlatformConfig.ini to add it
test_assets_folder, cache_folder = asset_processor.prepare_test_environment(env["tests_dir"], "C4874115",
relative_asset_root='',
add_scan_folder=False)
+ # The AssetProcessor internal _cache_folder path is updated to point at the cache root in order
+ # to allow the comparison between the source asset path of "/C4874115" to match the cache assets
+ # in
+ asset_processor._cache_folder = os.path.dirname(cache_folder)
assert os.path.exists(test_assets_folder), f"Test assets folder was not found {test_assets_folder}"
# Run AP Batch
@@ -226,7 +229,6 @@ class TestsAssetProcessorGUI_AllPlatforms(object):
test_scan_folder_root_key = f"{ASSET_PROCESSOR_SETTINGS_ROOT_KEY}/ScanFolder C4874115"
test_scan_folder_params.append(f'--regset="{test_scan_folder_root_key}/watch=@ROOT@/C4874115"')
- test_scan_folder_params.append(f'--regset="{test_scan_folder_root_key}/output=C4874115"')
test_scan_folder_params.append(f'--regset="{test_scan_folder_root_key}/recursive=1"')
test_scan_folder_params.append(f'--regset="{test_scan_folder_root_key}/order=5000"')
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C4874115/C4874115_test_asset.txt b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C4874115/C4874115/C4874115_test_asset.txt
similarity index 100%
rename from AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C4874115/C4874115_test_asset.txt
rename to AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/C4874115/C4874115/C4874115_test_asset.txt
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
index 8701d2f211..e701ff8d16 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
@@ -7,25 +7,10 @@ distribution (the "License"). All use of this software is governed by the Licens
or, if provided, by the license below or the license accompanying this file. Do not
remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Hydra script that creates an entity and attaches Atom components to it for test verification.
"""
-# This module does a bulk test and update of many components at once.
-# Each test case is listed below in the format:
-# "Test Case ID: Test Case Title (URL)"
-
-# C32078130: Tone Mapper (https://testrail.agscollab.com/index.php?/cases/view/32078130)
-# C32078129: Light (https://testrail.agscollab.com/index.php?/cases/view/32078129)
-# C32078131: Radius Weight Modifier (https://testrail.agscollab.com/index.php?/cases/view/32078131)
-# C32078127: PostFX Layer (https://testrail.agscollab.com/index.php?/cases/view/32078127)
-# C32078126: Point Light (https://testrail.agscollab.com/index.php?/cases/view/32078126)
-# C32078125: Physical Sky (https://testrail.agscollab.com/index.php?/cases/view/32078125)
-# C32078115: Global Skylight (IBL) (https://testrail.agscollab.com/index.php?/cases/view/32078115)
-# C32078121: Exposure Control (https://testrail.agscollab.com/index.php?/cases/view/32078121)
-# C32078120: Directional Light (https://testrail.agscollab.com/index.php?/cases/view/32078120)
-# C32078119: DepthOfField (https://testrail.agscollab.com/index.php?/cases/view/32078119)
-# C32078118: Decal (https://testrail.agscollab.com/index.php?/cases/view/32078118)
-# C32078117: Area Light (https://testrail.agscollab.com/index.php?/cases/view/32078117)
-
import os
import sys
@@ -41,10 +26,6 @@ sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "P
import editor_python_test_tools.hydra_editor_utils as hydra
from editor_python_test_tools.utils import TestHelper
-from editor_python_test_tools.editor_test_helper import EditorTestHelper
-
-
-EditorTestHelper = EditorTestHelper(log_prefix="AtomEditorComponents")
def run():
@@ -151,28 +132,6 @@ def run():
# Wait for Editor idle loop before executing Python hydra scripts.
TestHelper.init_idle()
- # Create a new level.
- new_level_name = "tmp_level" # Specified in TestAllComponentsBasicTests.py
- heightmap_resolution = 512
- heightmap_meters_per_pixel = 1
- terrain_texture_resolution = 412
- use_terrain = False
-
- # Return codes are ECreateLevelResult defined in CryEdit.h
- return_code = general.create_level_no_prompt(
- new_level_name, heightmap_resolution, heightmap_meters_per_pixel, terrain_texture_resolution, use_terrain)
- if return_code == 1:
- general.log(f"{new_level_name} level already exists")
- elif return_code == 2:
- general.log("Failed to create directory")
- elif return_code == 3:
- general.log("Directory length is too long")
- elif return_code != 0:
- general.log("Unknown error, failed to create level")
- else:
- general.log(f"{new_level_name} level created successfully")
- EditorTestHelper.after_level_load(bypass_viewport_resize=True)
-
# Delete all existing entities initially
search_filter = azlmbr.entity.SearchFilter()
all_entities = entity.SearchBus(azlmbr.bus.Broadcast, "SearchEntities", search_filter)
@@ -202,20 +161,6 @@ def run():
# Deletion/Undo/Redo test
verify_deletion_undo_redo(self.component_name, entity_obj)
- # Area Light Component
- area_light = "Area Light"
- ComponentTests(
- area_light, lambda entity_obj: verify_required_component_addition(
- entity_obj, ["Capsule Shape"], area_light))
-
- # Decal Component
- material_asset_path = os.path.join("Materials", "decal", "aiirship_nose_number_decal.material")
- material_asset = asset.AssetCatalogRequestBus(
- bus.Broadcast, "GetAssetIdByPath", material_asset_path, math.Uuid(), False)
- ComponentTests(
- "Decal", lambda entity_obj: verify_set_property(
- entity_obj, "Settings|Decal Settings|Material", material_asset))
-
# DepthOfField Component
camera_entity = hydra.Entity("camera_entity")
camera_entity.create_entity(math.Vector3(512.0, 512.0, 34.0), ["Camera"])
@@ -226,6 +171,14 @@ def run():
lambda entity_obj: verify_set_property(
entity_obj, "Controller|Configuration|Camera Entity", camera_entity.id))
+ # Decal Component
+ material_asset_path = os.path.join("AutomatedTesting", "Materials", "basic_grey.material")
+ material_asset = asset.AssetCatalogRequestBus(
+ bus.Broadcast, "GetAssetIdByPath", material_asset_path, math.Uuid(), False)
+ ComponentTests(
+ "Decal (Atom)", lambda entity_obj: verify_set_property(
+ entity_obj, "Controller|Configuration|Material", material_asset))
+
# Directional Light Component
ComponentTests(
"Directional Light",
@@ -254,18 +207,18 @@ def run():
# Physical Sky Component
ComponentTests("Physical Sky")
- # Point Light Component
- ComponentTests("Point Light")
-
# PostFX Layer Component
ComponentTests("PostFX Layer")
# Radius Weight Modifier Component
ComponentTests("Radius Weight Modifier")
- # Spot Light Component
+ # Light Component
ComponentTests("Light")
+ # Display Mapper Component
+ ComponentTests("Display Mapper")
+
if __name__ == "__main__":
run()
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
index 8031d7e65d..f84e367d1d 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
@@ -7,38 +7,175 @@ distribution (the "License"). All use of this software is governed by the Licens
or, if provided, by the license below or the license accompanying this file. Do not
remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-"""
+Main suite tests for the Atom renderer.
+"""
import logging
import os
-import pytest
-import ly_test_tools.environment.file_system as file_system
+import pytest
import editor_python_test_tools.hydra_test_utils as hydra
logger = logging.getLogger(__name__)
-EDITOR_TIMEOUT = 60
+EDITOR_TIMEOUT = 120
TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "atom_hydra_scripts")
@pytest.mark.parametrize("project", ["AutomatedTesting"])
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
-@pytest.mark.parametrize("level", ["tmp_level"])
-class TestAtomEditorComponents(object):
- @pytest.fixture(autouse=True)
- def setup_teardown(self, request, workspace, project, level):
- # Cleanup our temp level
- file_system.delete(
- [os.path.join(workspace.paths.engine_root(), project, "Levels", "AtomLevels", level)], True, True)
+@pytest.mark.parametrize("level", ["auto_test"])
+class TestAtomEditorComponentsMain(object):
- def teardown():
- # Cleanup our temp level
- file_system.delete(
- [os.path.join(workspace.paths.engine_root(), project, "Levels", "AtomLevels", level)], True, True)
+ @pytest.mark.test_case_id(
+ "C32078130", # Display Mapper
+ "C32078129", # Light
+ "C32078131", # Radius Weight Modifier
+ "C32078127", # PostFX Layer
+ "C32078125", # Physical Sky
+ "C32078115", # Global Skylight (IBL)
+ "C32078121", # Exposure Control
+ "C32078120", # Directional Light
+ "C32078119", # DepthOfField
+ "C32078118") # Decal (Atom)
+ def test_AtomEditorComponents_AddedToEntity(self, request, editor, level, workspace, project, launcher_platform):
+ cfg_args = [level]
- request.addfinalizer(teardown)
+ expected_lines = [
+ # Decal (Atom) Component
+ "Decal (Atom) Entity successfully created",
+ "Decal (Atom)_test: Component added to the entity: True",
+ "Decal (Atom)_test: Component removed after UNDO: True",
+ "Decal (Atom)_test: Component added after REDO: True",
+ "Decal (Atom)_test: Entered game mode: True",
+ "Decal (Atom)_test: Exit game mode: True",
+ "Decal (Atom) Controller|Configuration|Material: SUCCESS",
+ "Decal (Atom)_test: Entity is hidden: True",
+ "Decal (Atom)_test: Entity is shown: True",
+ "Decal (Atom)_test: Entity deleted: True",
+ "Decal (Atom)_test: UNDO entity deletion works: True",
+ "Decal (Atom)_test: REDO entity deletion works: True",
+ # DepthOfField Component
+ "DepthOfField Entity successfully created",
+ "DepthOfField_test: Component added to the entity: True",
+ "DepthOfField_test: Component removed after UNDO: True",
+ "DepthOfField_test: Component added after REDO: True",
+ "DepthOfField_test: Entered game mode: True",
+ "DepthOfField_test: Exit game mode: True",
+ "DepthOfField_test: Entity disabled initially: True",
+ "DepthOfField_test: Entity enabled after adding required components: True",
+ "DepthOfField Controller|Configuration|Camera Entity: SUCCESS",
+ "DepthOfField_test: Entity is hidden: True",
+ "DepthOfField_test: Entity is shown: True",
+ "DepthOfField_test: Entity deleted: True",
+ "DepthOfField_test: UNDO entity deletion works: True",
+ "DepthOfField_test: REDO entity deletion works: True",
+ # Exposure Control Component
+ "Exposure Control Entity successfully created",
+ "Exposure Control_test: Component added to the entity: True",
+ "Exposure Control_test: Component removed after UNDO: True",
+ "Exposure Control_test: Component added after REDO: True",
+ "Exposure Control_test: Entered game mode: True",
+ "Exposure Control_test: Exit game mode: True",
+ "Exposure Control_test: Entity disabled initially: True",
+ "Exposure Control_test: Entity enabled after adding required components: True",
+ "Exposure Control_test: Entity is hidden: True",
+ "Exposure Control_test: Entity is shown: True",
+ "Exposure Control_test: Entity deleted: True",
+ "Exposure Control_test: UNDO entity deletion works: True",
+ "Exposure Control_test: REDO entity deletion works: True",
+ # Global Skylight (IBL) Component
+ "Global Skylight (IBL) Entity successfully created",
+ "Global Skylight (IBL)_test: Component added to the entity: True",
+ "Global Skylight (IBL)_test: Component removed after UNDO: True",
+ "Global Skylight (IBL)_test: Component added after REDO: True",
+ "Global Skylight (IBL)_test: Entered game mode: True",
+ "Global Skylight (IBL)_test: Exit game mode: True",
+ "Global Skylight (IBL) Controller|Configuration|Diffuse Image: SUCCESS",
+ "Global Skylight (IBL) Controller|Configuration|Specular Image: SUCCESS",
+ "Global Skylight (IBL)_test: Entity is hidden: True",
+ "Global Skylight (IBL)_test: Entity is shown: True",
+ "Global Skylight (IBL)_test: Entity deleted: True",
+ "Global Skylight (IBL)_test: UNDO entity deletion works: True",
+ "Global Skylight (IBL)_test: REDO entity deletion works: True",
+ # Physical Sky Component
+ "Physical Sky Entity successfully created",
+ "Physical Sky component was added to entity",
+ "Entity has a Physical Sky component",
+ "Physical Sky_test: Component added to the entity: True",
+ "Physical Sky_test: Component removed after UNDO: True",
+ "Physical Sky_test: Component added after REDO: True",
+ "Physical Sky_test: Entered game mode: True",
+ "Physical Sky_test: Exit game mode: True",
+ "Physical Sky_test: Entity is hidden: True",
+ "Physical Sky_test: Entity is shown: True",
+ "Physical Sky_test: Entity deleted: True",
+ "Physical Sky_test: UNDO entity deletion works: True",
+ "Physical Sky_test: REDO entity deletion works: True",
+ # PostFX Layer Component
+ "PostFX Layer Entity successfully created",
+ "PostFX Layer_test: Component added to the entity: True",
+ "PostFX Layer_test: Component removed after UNDO: True",
+ "PostFX Layer_test: Component added after REDO: True",
+ "PostFX Layer_test: Entered game mode: True",
+ "PostFX Layer_test: Exit game mode: True",
+ "PostFX Layer_test: Entity is hidden: True",
+ "PostFX Layer_test: Entity is shown: True",
+ "PostFX Layer_test: Entity deleted: True",
+ "PostFX Layer_test: UNDO entity deletion works: True",
+ "PostFX Layer_test: REDO entity deletion works: True",
+ # Radius Weight Modifier Component
+ "Radius Weight Modifier Entity successfully created",
+ "Radius Weight Modifier_test: Component added to the entity: True",
+ "Radius Weight Modifier_test: Component removed after UNDO: True",
+ "Radius Weight Modifier_test: Component added after REDO: True",
+ "Radius Weight Modifier_test: Entered game mode: True",
+ "Radius Weight Modifier_test: Exit game mode: True",
+ "Radius Weight Modifier_test: Entity is hidden: True",
+ "Radius Weight Modifier_test: Entity is shown: True",
+ "Radius Weight Modifier_test: Entity deleted: True",
+ "Radius Weight Modifier_test: UNDO entity deletion works: True",
+ "Radius Weight Modifier_test: REDO entity deletion works: True",
+ # Light Component
+ "Light Entity successfully created",
+ "Light_test: Component added to the entity: True",
+ "Light_test: Component removed after UNDO: True",
+ "Light_test: Component added after REDO: True",
+ "Light_test: Entered game mode: True",
+ "Light_test: Exit game mode: True",
+ "Light_test: Entity is hidden: True",
+ "Light_test: Entity is shown: True",
+ "Light_test: Entity deleted: True",
+ "Light_test: UNDO entity deletion works: True",
+ "Light_test: REDO entity deletion works: True",
+ # Display Mapper Component
+ "Display Mapper Entity successfully created",
+ "Display Mapper_test: Component added to the entity: True",
+ "Display Mapper_test: Component removed after UNDO: True",
+ "Display Mapper_test: Component added after REDO: True",
+ "Display Mapper_test: Entered game mode: True",
+ "Display Mapper_test: Exit game mode: True",
+ "Display Mapper_test: Entity is hidden: True",
+ "Display Mapper_test: Entity is shown: True",
+ "Display Mapper_test: Entity deleted: True",
+ "Display Mapper_test: UNDO entity deletion works: True",
+ "Display Mapper_test: REDO entity deletion works: True",
+ ]
- # It requires at least one test
- def test_Dummy(self, request, editor, level, workspace, project, launcher_platform):
- pass
+ unexpected_lines = [
+ "failed to open",
+ "Traceback (most recent call last):",
+ ]
+
+ hydra.launch_and_validate_results(
+ request,
+ TEST_DIRECTORY,
+ editor,
+ "hydra_AtomEditorComponents_AddedToEntity.py",
+ timeout=EDITOR_TIMEOUT,
+ expected_lines=expected_lines,
+ unexpected_lines=unexpected_lines,
+ halt_on_unexpected=True,
+ null_renderer=True,
+ cfg_args=cfg_args,
+ )
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py
index a82d5c5fd4..0fb873e677 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py
@@ -7,213 +7,18 @@ distribution (the "License"). All use of this software is governed by the Licens
or, if provided, by the license below or the license accompanying this file. Do not
remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Sandbox suite tests for the Atom renderer.
"""
-import logging
-import os
import pytest
-import ly_test_tools.environment.file_system as file_system
-
-import editor_python_test_tools.hydra_test_utils as hydra
-
-logger = logging.getLogger(__name__)
-EDITOR_TIMEOUT = 60
-TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "atom_hydra_scripts")
-
@pytest.mark.parametrize("project", ["AutomatedTesting"])
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
-@pytest.mark.parametrize("level", ["tmp_level"])
-class TestAtomEditorComponents(object):
- @pytest.fixture(autouse=True)
- def setup_teardown(self, request, workspace, project, level):
- # Cleanup our temp level
- file_system.delete(
- [os.path.join(workspace.paths.engine_root(), project, "Levels", "AtomLevels", level)], True, True)
+@pytest.mark.parametrize("level", ["auto_test"])
+class TestAtomEditorComponentsSandbox(object):
- def teardown():
- # Cleanup our temp level
- file_system.delete(
- [os.path.join(workspace.paths.engine_root(), project, "Levels", "AtomLevels", level)], True, True)
-
- request.addfinalizer(teardown)
-
- @pytest.mark.test_case_id(
- "C32078130", # Tone Mapper
- "C32078129", # Light
- "C32078131", # Radius Weight Modifier
- "C32078127", # PostFX Layer
- "C32078126", # Point Light
- "C32078125", # Physical Sky
- "C32078115", # Global Skylight (IBL)
- "C32078121", # Exposure Control
- "C32078120", # Directional Light
- "C32078119", # DepthOfField
- "C32078118") # Decal
- def test_AtomEditorComponents_AddedToEntity(self, request, editor, level, workspace, project, launcher_platform):
- cfg_args = [level]
-
- expected_lines = [
- # Area Light Component
- "Area Light Entity successfully created",
- "Area Light_test: Component added to the entity: True",
- "Area Light_test: Component removed after UNDO: True",
- "Area Light_test: Component added after REDO: True",
- "Area Light_test: Entered game mode: True",
- "Area Light_test: Entity enabled after adding required components: True",
- "Area Light_test: Entity is hidden: True",
- "Area Light_test: Entity is shown: True",
- "Area Light_test: Entity deleted: True",
- "Area Light_test: UNDO entity deletion works: True",
- "Area Light_test: REDO entity deletion works: True",
- # Decal Component
- "Decal Entity successfully created",
- "Decal_test: Component added to the entity: True",
- "Decal_test: Component removed after UNDO: True",
- "Decal_test: Component added after REDO: True",
- "Decal_test: Entered game mode: True",
- "Decal_test: Exit game mode: True",
- "Decal Settings|Decal Settings|Material: SUCCESS",
- "Decal_test: Entity is hidden: True",
- "Decal_test: Entity is shown: True",
- "Decal_test: Entity deleted: True",
- "Decal_test: UNDO entity deletion works: True",
- "Decal_test: REDO entity deletion works: True",
- # DepthOfField Component
- "DepthOfField Entity successfully created",
- "DepthOfField_test: Component added to the entity: True",
- "DepthOfField_test: Component removed after UNDO: True",
- "DepthOfField_test: Component added after REDO: True",
- "DepthOfField_test: Entered game mode: True",
- "DepthOfField_test: Exit game mode: True",
- "DepthOfField_test: Entity disabled initially: True",
- "DepthOfField_test: Entity enabled after adding required components: True",
- "DepthOfField Controller|Configuration|Camera Entity: SUCCESS",
- "DepthOfField_test: Entity is hidden: True",
- "DepthOfField_test: Entity is shown: True",
- "DepthOfField_test: Entity deleted: True",
- "DepthOfField_test: UNDO entity deletion works: True",
- "DepthOfField_test: REDO entity deletion works: True",
- # Directional Light Component
- "Directional Light Entity successfully created",
- "Directional Light_test: Component added to the entity: True",
- "Directional Light_test: Component removed after UNDO: True",
- "Directional Light_test: Component added after REDO: True",
- "Directional Light_test: Entered game mode: True",
- "Directional Light_test: Exit game mode: True",
- "Directional Light Controller|Configuration|Shadow|Camera: SUCCESS",
- "Directional Light_test: Entity is hidden: True",
- "Directional Light_test: Entity is shown: True",
- "Directional Light_test: Entity deleted: True",
- "Directional Light_test: UNDO entity deletion works: True",
- "Directional Light_test: REDO entity deletion works: True",
- # Exposure Control Component
- "Exposure Control Entity successfully created",
- "Exposure Control_test: Component added to the entity: True",
- "Exposure Control_test: Component removed after UNDO: True",
- "Exposure Control_test: Component added after REDO: True",
- "Exposure Control_test: Entered game mode: True",
- "Exposure Control_test: Exit game mode: True",
- "Exposure Control_test: Entity disabled initially: True",
- "Exposure Control_test: Entity enabled after adding required components: True",
- "Exposure Control_test: Entity is hidden: True",
- "Exposure Control_test: Entity is shown: True",
- "Exposure Control_test: Entity deleted: True",
- "Exposure Control_test: UNDO entity deletion works: True",
- "Exposure Control_test: REDO entity deletion works: True",
- # Global Skylight (IBL) Component
- "Global Skylight (IBL) Entity successfully created",
- "Global Skylight (IBL)_test: Component added to the entity: True",
- "Global Skylight (IBL)_test: Component removed after UNDO: True",
- "Global Skylight (IBL)_test: Component added after REDO: True",
- "Global Skylight (IBL)_test: Entered game mode: True",
- "Global Skylight (IBL)_test: Exit game mode: True",
- "Global Skylight (IBL) Controller|Configuration|Diffuse Image: SUCCESS",
- "Global Skylight (IBL) Controller|Configuration|Specular Image: SUCCESS",
- "Global Skylight (IBL)_test: Entity is hidden: True",
- "Global Skylight (IBL)_test: Entity is shown: True",
- "Global Skylight (IBL)_test: Entity deleted: True",
- "Global Skylight (IBL)_test: UNDO entity deletion works: True",
- "Global Skylight (IBL)_test: REDO entity deletion works: True",
- # Physical Sky Component
- "Physical Sky Entity successfully created",
- "Physical Sky component was added to entity",
- "Entity has a Physical Sky component",
- "Physical Sky_test: Component added to the entity: True",
- "Physical Sky_test: Component removed after UNDO: True",
- "Physical Sky_test: Component added after REDO: True",
- "Physical Sky_test: Entered game mode: True",
- "Physical Sky_test: Exit game mode: True",
- "Physical Sky_test: Entity is hidden: True",
- "Physical Sky_test: Entity is shown: True",
- "Physical Sky_test: Entity deleted: True",
- "Physical Sky_test: UNDO entity deletion works: True",
- "Physical Sky_test: REDO entity deletion works: True",
- # Point Light Component
- "Point Light Entity successfully created",
- "Point Light_test: Component added to the entity: True",
- "Point Light_test: Component removed after UNDO: True",
- "Point Light_test: Component added after REDO: True",
- "Point Light_test: Entered game mode: True",
- "Point Light_test: Exit game mode: True",
- "Point Light_test: Entity is hidden: True",
- "Point Light_test: Entity is shown: True",
- "Point Light_test: Entity deleted: True",
- "Point Light_test: UNDO entity deletion works: True",
- "Point Light_test: REDO entity deletion works: True",
- # PostFX Layer Component
- "PostFX Layer Entity successfully created",
- "PostFX Layer_test: Component added to the entity: True",
- "PostFX Layer_test: Component removed after UNDO: True",
- "PostFX Layer_test: Component added after REDO: True",
- "PostFX Layer_test: Entered game mode: True",
- "PostFX Layer_test: Exit game mode: True",
- "PostFX Layer_test: Entity is hidden: True",
- "PostFX Layer_test: Entity is shown: True",
- "PostFX Layer_test: Entity deleted: True",
- "PostFX Layer_test: UNDO entity deletion works: True",
- "PostFX Layer_test: REDO entity deletion works: True",
- # Radius Weight Modifier Component
- "Radius Weight Modifier Entity successfully created",
- "Radius Weight Modifier_test: Component added to the entity: True",
- "Radius Weight Modifier_test: Component removed after UNDO: True",
- "Radius Weight Modifier_test: Component added after REDO: True",
- "Radius Weight Modifier_test: Entered game mode: True",
- "Radius Weight Modifier_test: Exit game mode: True",
- "Radius Weight Modifier_test: Entity is hidden: True",
- "Radius Weight Modifier_test: Entity is shown: True",
- "Radius Weight Modifier_test: Entity deleted: True",
- "Radius Weight Modifier_test: UNDO entity deletion works: True",
- "Radius Weight Modifier_test: REDO entity deletion works: True",
- # Light Component
- "Light Entity successfully created",
- "Light_test: Component added to the entity: True",
- "Light_test: Component removed after UNDO: True",
- "Light_test: Component added after REDO: True",
- "Light_test: Entered game mode: True",
- "Light_test: Exit game mode: True",
- "Light_test: Entity is hidden: True",
- "Light_test: Entity is shown: True",
- "Light_test: Entity deleted: True",
- "Light_test: UNDO entity deletion works: True",
- "Light_test: REDO entity deletion works: True",
- ]
-
- unexpected_lines = [
- "failed to open",
- "Traceback (most recent call last):",
- ]
-
- hydra.launch_and_validate_results(
- request,
- TEST_DIRECTORY,
- editor,
- "hydra_AtomEditorComponents_AddedToEntity.py",
- timeout=EDITOR_TIMEOUT,
- expected_lines=expected_lines,
- unexpected_lines=unexpected_lines,
- halt_on_unexpected=True,
- null_renderer=True,
- cfg_args=cfg_args,
- )
+ # It requires at least one test
+ def test_Dummy(self, request, editor, level, workspace, project, launcher_platform):
+ pass
diff --git a/AutomatedTesting/Gem/PythonTests/editor/test_AssetPicker.py b/AutomatedTesting/Gem/PythonTests/editor/test_AssetPicker.py
index ac499d734f..90ca3690e4 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/test_AssetPicker.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/test_AssetPicker.py
@@ -42,6 +42,7 @@ class TestAssetPicker(object):
@pytest.mark.test_case_id("C13751579", "C1508814")
@pytest.mark.SUITE_periodic
+ @pytest.mark.xfail # ATOM-15493
def test_AssetPicker_UI_UX(self, request, editor, level, launcher_platform):
expected_lines = [
"TestEntity Entity successfully created",
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks.py
index 0be220cad0..466cd610e4 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks.py
@@ -114,11 +114,8 @@ class TestDynamicSliceInstanceSpawner(EditorTestHelper):
# This should result in 400 instances, since our box is 16 m x 16 m and by default the veg system plants
# 20 instances per 16 meters
spawner_entity.get_set_test(0, 'Configuration|Allow Empty Assets', True)
- general.idle_wait(1.0)
num_expected_instances = 20 * 20
- box = azlmbr.shape.ShapeComponentRequestsBus(bus.Event, 'GetEncompassingAabb', spawner_entity.id)
- num_found = azlmbr.areasystem.AreaSystemRequestBus(bus.Broadcast, 'GetInstanceCountInAabb', box)
- property_tree_success = property_tree_success and (num_found == num_expected_instances)
+ property_tree_success = property_tree_success and self.wait_for_condition(lambda: dynveg.validate_instance_count_in_entity_shape(spawner_entity.id, num_expected_instances), 5.0)
self.test_success = self.test_success and property_tree_success
self.log(f'Property Tree spawner type test: {property_tree_success}')
@@ -127,10 +124,8 @@ class TestDynamicSliceInstanceSpawner(EditorTestHelper):
# Since we have an empty slice path, we should have 0 instances once we disable 'Allow Empty Assets'
num_expected_instances = 0
allow_empty_assets_success = allow_empty_assets_success and spawner_entity.get_set_test(0, 'Configuration|Allow Empty Assets', False)
- general.idle_wait(1.0)
- num_found = azlmbr.areasystem.AreaSystemRequestBus(bus.Broadcast, 'GetInstanceCountInAabb', box)
- self.log(f'Allow Empty Assets test: Found {num_found} instances -- Expected {num_expected_instances} instances')
- allow_empty_assets_success = allow_empty_assets_success and (num_found == num_expected_instances)
+ self.log('Allow Empty Assets test:')
+ allow_empty_assets_success = allow_empty_assets_success and self.wait_for_condition(lambda: dynveg.validate_instance_count_in_entity_shape(spawner_entity.id, num_expected_instances), 5.0)
self.test_success = self.test_success and allow_empty_assets_success
self.log(f'Allow Empty Assets test: {allow_empty_assets_success}')
@@ -143,10 +138,8 @@ class TestDynamicSliceInstanceSpawner(EditorTestHelper):
descriptor = hydra.get_component_property_value(spawner_entity.components[2], 'Configuration|Embedded Assets|[0]')
descriptor.spawner = dynamic_slice_spawner
spawns_slices_success = spawns_slices_success and spawner_entity.get_set_test(2, "Configuration|Embedded Assets|[0]", descriptor)
- general.idle_wait(1.0)
- num_found = azlmbr.areasystem.AreaSystemRequestBus(bus.Broadcast, 'GetInstanceCountInAabb', box)
- self.log(f'Spawn dynamic slices test: Found {num_found} instances -- Expected {num_expected_instances} instances')
- spawns_slices_success = spawns_slices_success and (num_found == num_expected_instances)
+ self.log('Spawn dynamic slices test:')
+ spawns_slices_success = spawns_slices_success and self.wait_for_condition(lambda: dynveg.validate_instance_count_in_entity_shape(spawner_entity.id, num_expected_instances), 5.0)
self.test_success = self.test_success and spawns_slices_success
self.log(f'Spawn dynamic slices test: {spawns_slices_success}')
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/EmptyInstanceSpawner_EmptySpawnerWorks.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/EmptyInstanceSpawner_EmptySpawnerWorks.py
index 161ad038a5..dc353aca1a 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/EmptyInstanceSpawner_EmptySpawnerWorks.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/EmptyInstanceSpawner_EmptySpawnerWorks.py
@@ -100,21 +100,15 @@ class TestEmptyInstanceSpawner(EditorTestHelper):
# This should result in 400 instances, since our box is 16 m x 16 m and by default the veg system plants
# 20 instances per 16 meters
- general.idle_wait(2.0)
num_expected_instances = 20 * 20
- box = azlmbr.shape.ShapeComponentRequestsBus(bus.Event, 'GetEncompassingAabb', spawner_entity.id)
- num_found = azlmbr.areasystem.AreaSystemRequestBus(bus.Broadcast, 'GetInstanceCountInAabb', box)
- property_tree_success = property_tree_success and (num_found == num_expected_instances)
+ property_tree_success = property_tree_success and self.wait_for_condition(lambda: dynveg.validate_instance_count_in_entity_shape(spawner_entity.id, num_expected_instances), 5.0)
self.test_success = self.test_success and property_tree_success
- self.log(f'Found {num_found} instances -- Expected {num_expected_instances} instances')
self.log(f'Property Tree spawner type test: {property_tree_success}')
# 6) Validate that the "Allow Empty Assets" setting doesn't affect the EmptyInstanceSpawner
allow_empty_assets_success = True
spawner_entity.get_set_test(0, 'Configuration|Allow Empty Assets', False)
- general.idle_wait(2.0)
- num_found = azlmbr.areasystem.AreaSystemRequestBus(bus.Broadcast, 'GetInstanceCountInAabb', box)
- allow_empty_assets_success = allow_empty_assets_success and (num_found == num_expected_instances)
+ allow_empty_assets_success = allow_empty_assets_success and self.wait_for_condition(lambda: dynveg.validate_instance_count_in_entity_shape(spawner_entity.id, num_expected_instances), 5.0)
self.test_success = self.test_success and allow_empty_assets_success
self.log(f'Allow Empty Assets test: {allow_empty_assets_success}')
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py
index 2db8534696..17a5f72863 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py
@@ -37,6 +37,7 @@ class TestAltitudeFilter(object):
@pytest.mark.test_case_id('C4814463', 'C4847477')
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_filter
def test_AltitudeFilter_ComponentAndOverrides_InstancesPlantAtSpecifiedAltitude(self, request, editor, level,
launcher_platform):
@@ -61,6 +62,7 @@ class TestAltitudeFilter(object):
@pytest.mark.test_case_id("C4847476")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_filter
def test_AltitudeFilter_ShapeSample_InstancesPlantAtSpecifiedAltitude(self, request, editor, level,
launcher_platform):
@@ -85,6 +87,7 @@ class TestAltitudeFilter(object):
@pytest.mark.test_case_id("C4847478")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_filter
@pytest.mark.xfail # LYN-3275
def test_AltitudeFilter_FilterStageToggle(self, request, editor, level, workspace, launcher_platform):
cfg_args = [level]
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AreaComponentSlices.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AreaComponentSlices.py
index 1353efbf2e..5f42fc6de0 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AreaComponentSlices.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AreaComponentSlices.py
@@ -52,6 +52,7 @@ class TestAreaComponents(object):
@pytest.mark.test_case_id("C2627900", "C2627905", "C2627904")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_misc
def test_AreaComponents_SliceCreationVisibilityToggleWorks(self, request, editor, level, workspace,
launcher_platform):
cfg_args = [level]
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetListCombiner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetListCombiner.py
index ad0917ca22..b40d99b100 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetListCombiner.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetListCombiner.py
@@ -38,6 +38,7 @@ class TestAssetListCombiner(object):
@pytest.mark.test_case_id("C4762374", "C4762373")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_misc
def test_AssetListCombiner_CombinedDescriptorsExpressInConfiguredArea(self, request, editor, level,
launcher_platform):
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetWeightSelector.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetWeightSelector.py
index 65472df3bc..7b34a10d66 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetWeightSelector.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetWeightSelector.py
@@ -42,6 +42,7 @@ class TestAssetWeightSelector(object):
@pytest.mark.test_case_id("C6269654", "C4762368")
@pytest.mark.SUITE_sandbox
+ @pytest.mark.dynveg_filter
def test_AssetWeightSelector_InstancesExpressBasedOnWeight(self, request, editor, level, launcher_platform):
expected_lines = [
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_Debugger.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_Debugger.py
index 45518b71fc..7466089173 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_Debugger.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_Debugger.py
@@ -40,6 +40,7 @@ class TestDebugger(object):
@pytest.mark.test_case_id("C2789148")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_misc
def test_Debugger_DebugCVarsWork(self, request, editor, level, workspace, launcher_platform):
cfg_args = [level]
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DistanceBetweenFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DistanceBetweenFilter.py
index 3171cc032f..191f27fca0 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DistanceBetweenFilter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DistanceBetweenFilter.py
@@ -38,6 +38,7 @@ class TestDistanceBetweenFilter(object):
@pytest.mark.test_case_id("C4851066")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_filter
def test_DistanceBetweenFilter_InstancesPlantAtSpecifiedRadius(self, request, editor, level, launcher_platform):
expected_lines = [
@@ -58,6 +59,7 @@ class TestDistanceBetweenFilter(object):
@pytest.mark.test_case_id("C4814458")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_filter
def test_DistanceBetweenFilterOverrides_InstancesPlantAtSpecifiedRadius(self, request, editor, level,
launcher_platform):
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynVeg_Regressions.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynVeg_Regressions.py
index b3cf344b2b..5c6e034a12 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynVeg_Regressions.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynVeg_Regressions.py
@@ -40,6 +40,7 @@ class Test_DynVeg_Regressions(object):
@pytest.mark.test_case_id("C29470845")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_regression
def test_SurfaceDataRefreshes_RemainsStable(self, request, editor, level, launcher_platform):
expected_lines = [
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py
index c5b8046f73..9898570692 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py
@@ -41,7 +41,8 @@ class TestDynamicSliceInstanceSpawner(object):
return console
@pytest.mark.test_case_id("C28851763")
- @pytest.mark.SUITE_main
+ @pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_area
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
def test_DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks(self, request, editor, level, workspace, project,
launcher_platform):
@@ -66,6 +67,7 @@ class TestDynamicSliceInstanceSpawner(object):
@pytest.mark.test_case_id('C2574330')
@pytest.mark.BAT
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_area
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
def test_DynamicSliceInstanceSpawner_Embedded_E2E_Editor(self, workspace, request, editor, level, project,
launcher_platform):
@@ -85,6 +87,7 @@ class TestDynamicSliceInstanceSpawner(object):
@pytest.mark.test_case_id('C2574330')
@pytest.mark.BAT
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_area
@pytest.mark.parametrize("launcher_platform", ['windows'])
@pytest.mark.skip # ATOM-14703
def test_DynamicSliceInstanceSpawner_Embedded_E2E_Launcher(self, workspace, launcher, level,
@@ -101,6 +104,7 @@ class TestDynamicSliceInstanceSpawner(object):
@pytest.mark.test_case_id('C4762367')
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_area
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
def test_DynamicSliceInstanceSpawner_External_E2E_Editor(self, workspace, request, editor, level, project,
launcher_platform):
@@ -119,6 +123,7 @@ class TestDynamicSliceInstanceSpawner(object):
@pytest.mark.test_case_id('C4762367')
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_area
@pytest.mark.parametrize("launcher_platform", ['windows'])
@pytest.mark.skip # ATOM-14703
def test_DynamicSliceInstanceSpawner_External_E2E_Launcher(self, workspace, launcher, level,
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py
index a7f221b780..7bd8484cf4 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py
@@ -37,7 +37,8 @@ class TestEmptyInstanceSpawner(object):
file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True)
@pytest.mark.test_case_id("C28851762")
- @pytest.mark.SUITE_main
+ @pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_area
def test_EmptyInstanceSpawner_EmptySpawnerWorks(self, request, editor, level, launcher_platform):
cfg_args = [level]
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_InstanceSpawnerPriority.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_InstanceSpawnerPriority.py
index d04b827985..53b5c3b760 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_InstanceSpawnerPriority.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_InstanceSpawnerPriority.py
@@ -43,6 +43,7 @@ class TestInstanceSpawnerPriority(object):
@pytest.mark.test_case_id("C5747383", "C4762382")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_misc
def test_InstanceSpawnerPriority_LayerAndSubPriority_HigherValuesPlantOverLower(self, request, editor, level,
launcher_platform):
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py
index 2286238364..76b8b3cd3a 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py
@@ -20,17 +20,10 @@ import pytest
pytest.importorskip("ly_test_tools")
-import time as time
-
-import editor_python_test_tools.hydra_test_utils as hydra
-import ly_test_tools.launchers.launcher_helper as launcher_helper
+import ly_remote_console.remote_console_commands as remote_console_commands
import ly_test_tools.environment.waiter as waiter
import ly_test_tools.environment.file_system as file_system
-import ly_remote_console.remote_console_commands as remote_console_commands
-from ly_remote_console.remote_console_commands import send_command_and_expect_response as send_command_and_expect_response
-
-import automatedtesting_shared.screenshot_utils as screenshot_utils
-from automatedtesting_shared.network_utils import check_for_listening_port
+import editor_python_test_tools.hydra_test_utils as hydra
test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts")
@@ -58,6 +51,7 @@ class TestLayerBlender(object):
@pytest.mark.test_case_id("C2627906")
@pytest.mark.BAT
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_area
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
def test_LayerBlender_E2E_Editor(self, workspace, request, editor, project, level, launcher_platform):
# Make sure temp level doesn't already exist
@@ -95,6 +89,7 @@ class TestLayerBlender(object):
@pytest.mark.test_case_id("C2627906")
@pytest.mark.BAT
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_area
@pytest.mark.xfail
@pytest.mark.parametrize("launcher_platform", ['windows'])
def test_LayerBlender_E2E_Launcher(self, workspace, project, launcher, level, remote_console_instance,
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlocker.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlocker.py
index 6da0cdd6db..308f4480c5 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlocker.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlocker.py
@@ -38,6 +38,7 @@ class TestLayerBlocker(object):
@pytest.mark.test_case_id("C2793772")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_area
def test_LayerBlocker_InstancesBlockedInConfiguredArea(self, request, editor, level, launcher_platform):
expected_lines = [
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py
index 93149c9490..d206a962da 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py
@@ -40,6 +40,7 @@ class TestLayerSpawner(object):
@pytest.mark.test_case_id("C4762381")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_misc
def test_LayerSpawner_InheritBehaviorFlag(self, request, editor, level, workspace, launcher_platform):
expected_lines = [
@@ -60,6 +61,7 @@ class TestLayerSpawner(object):
@pytest.mark.test_case_id("C2802020")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_misc
def test_LayerSpawner_InstancesPlantInAllSupportedShapes(self, request, editor, level, launcher_platform):
expected_lines = [
@@ -101,6 +103,7 @@ class TestLayerSpawner(object):
@pytest.mark.test_case_id("C4765973")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_misc
@pytest.mark.xfail # LYN-3275
def test_LayerSpawner_FilterStageToggle(self, request, editor, level, workspace, launcher_platform):
@@ -122,6 +125,7 @@ class TestLayerSpawner(object):
@pytest.mark.test_case_id("C30000751")
@pytest.mark.SUITE_sandbox
+ @pytest.mark.dynveg_misc
@pytest.mark.skip # ATOM-14828
def test_LayerSpawner_InstancesRefreshUsingCorrectViewportCamera(self, request, editor, level, launcher_platform):
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshBlocker.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshBlocker.py
index c04390e647..7e1b416556 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshBlocker.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshBlocker.py
@@ -46,6 +46,7 @@ class TestMeshBlocker(object):
"""
@pytest.mark.test_case_id("C3980834")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_area
@pytest.mark.xfail # LYN-3273
def test_MeshBlocker_InstancesBlockedByMesh(self, request, editor, level, launcher_platform):
expected_lines = [
@@ -70,6 +71,7 @@ class TestMeshBlocker(object):
"""
@pytest.mark.test_case_id("C4766030")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_area
@pytest.mark.xfail # LYN-3273
def test_MeshBlocker_InstancesBlockedByMeshHeightTuning(self, request, editor, level, launcher_platform):
expected_lines = [
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshSurfaceTagEmitter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshSurfaceTagEmitter.py
index 77638cb576..dcbffdf3b7 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshSurfaceTagEmitter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshSurfaceTagEmitter.py
@@ -38,6 +38,7 @@ class TestMeshSurfaceTagEmitter(object):
@pytest.mark.test_case_id("C2908172")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_surfacetagemitter
def test_MeshSurfaceTagEmitter_DependentOnMeshComponent(self, request, editor, level, launcher_platform):
expected_lines = [
@@ -66,6 +67,7 @@ class TestMeshSurfaceTagEmitter(object):
@pytest.mark.test_case_id("C2908174")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_surfacetagemitter
def test_MeshSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully(self, request, editor, level, launcher_platform):
expected_lines = [
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PhysXColliderSurfaceTagEmitter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PhysXColliderSurfaceTagEmitter.py
index ca4e30a719..0f84e2caa2 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PhysXColliderSurfaceTagEmitter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PhysXColliderSurfaceTagEmitter.py
@@ -38,6 +38,7 @@ class TestPhysXColliderSurfaceTagEmitter(object):
@pytest.mark.test_case_id("C29053640")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_surfacetagemitter
def test_PhysXColliderSurfaceTagEmitter_E2E_Editor(self, request, editor, level, launcher_platform):
expected_lines = [
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py
index ac3e0abb4f..2cf8db3b96 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py
@@ -38,6 +38,7 @@ class TestPositionModifier(object):
@pytest.mark.test_case_id("C4874099", "C4814461")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_modifier
def test_PositionModifier_ComponentAndOverrides_InstancesPlantAtSpecifiedOffsets(self, request, editor, level,
launcher_platform):
@@ -60,6 +61,7 @@ class TestPositionModifier(object):
@pytest.mark.test_case_id("C4874100")
@pytest.mark.SUITE_sandbox
+ @pytest.mark.dynveg_modifier
@pytest.mark.xfail # LYN-3275
def test_PositionModifier_AutoSnapToSurfaceWorks(self, request, editor, level, launcher_platform):
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_RotationModifier.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_RotationModifier.py
index 518949c0c0..3b0c9b3947 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_RotationModifier.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_RotationModifier.py
@@ -42,6 +42,7 @@ class TestRotationModifier(object):
@pytest.mark.test_case_id("C4896922")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_modifier
def test_RotationModifier_InstancesRotateWithinRange(self, request, editor, level, launcher_platform) -> None:
"""
Launches editor and run test script to test that rotation modifier works for all axis.
@@ -71,6 +72,7 @@ class TestRotationModifier(object):
@pytest.mark.test_case_id("C4814460")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_modifier
def test_RotationModifierOverrides_InstancesRotateWithinRange(self, request, editor, level, launcher_platform) -> None:
expected_lines = [
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ScaleModifier.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ScaleModifier.py
index 6acd95e4f6..7fe7a4ece2 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ScaleModifier.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ScaleModifier.py
@@ -41,6 +41,7 @@ class TestScaleOverrideWorksSuccessfully(object):
@pytest.mark.test_case_id("C4814462")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_modifier
def test_ScaleModifierOverrides_InstancesProperlyScale(self, request, editor, level, launcher_platform):
expected_lines = [
@@ -70,6 +71,7 @@ class TestScaleOverrideWorksSuccessfully(object):
@pytest.mark.test_case_id("C4896937")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_modifier
def test_ScaleModifier_InstancesProperlyScale(self, request, editor, level, launcher_platform):
expected_lines = [
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ShapeIntersectionFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ShapeIntersectionFilter.py
index ea90b67a7f..8acdb1b644 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ShapeIntersectionFilter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ShapeIntersectionFilter.py
@@ -38,6 +38,7 @@ class TestShapeIntersectionFilter(object):
@pytest.mark.test_case_id("C4874094")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_filter
def test_ShapeIntersectionFilter_InstancesPlantInAssignedShape(self, request, editor, level, launcher_platform):
expected_lines = [
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py
index 563ac1dcc5..6825686509 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py
@@ -41,6 +41,7 @@ class TestSlopeAlignmentModifier(object):
@pytest.mark.test_case_id("C4896941")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_modifier
@pytest.mark.skip # ATOM-14299
def test_SlopeAlignmentModifier_InstanceSurfaceAlignment(self, request, editor, level, launcher_platform):
@@ -63,6 +64,7 @@ class TestSlopeAlignmentModifier(object):
@pytest.mark.test_case_id("C4814459")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_modifier
@pytest.mark.skip # ATOM-14299
def test_SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment(self, request, editor, level, launcher_platform):
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py
index dc0f0e6514..48e532adcd 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py
@@ -39,6 +39,7 @@ class TestSlopeFilter(object):
@pytest.mark.test_case_id("C4874097")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_filter
def test_SlopeFilter_FilterStageToggle(self, request, editor, level, workspace, launcher_platform):
cfg_args = [level]
@@ -70,6 +71,7 @@ class TestSlopeFilter(object):
@pytest.mark.test_case_id("C4814464", "C4874096")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_filter
@pytest.mark.skip # LYN-2211
def test_SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlopes(self, request, editor, level,
launcher_platform):
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SurfaceMaskFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SurfaceMaskFilter.py
index 20cab85293..952c000232 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SurfaceMaskFilter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SurfaceMaskFilter.py
@@ -40,6 +40,7 @@ class TestSurfaceMaskFilter(object):
# Simple validation test to ensure that SurfaceTag can be created, set to a value, and compared to another SurfaceTag.
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_filter
def test_SurfaceMaskFilter_BasicSurfaceTagCreation(self, request, level, editor, launcher_platform):
expected_lines = [
@@ -61,6 +62,7 @@ class TestSurfaceMaskFilter(object):
@pytest.mark.test_case_id("C2561342")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_filter
def test_SurfaceMaskFilter_ExclusiveSurfaceTags_Function(self, request, editor, level, launcher_platform):
expected_lines = [
@@ -93,6 +95,7 @@ class TestSurfaceMaskFilter(object):
@pytest.mark.test_case_id("C2561341")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_filter
def test_SurfaceMaskFilter_InclusiveSurfaceTags_Function(self, request, editor, level, launcher_platform):
expected_lines = [
@@ -125,6 +128,7 @@ class TestSurfaceMaskFilter(object):
@pytest.mark.test_case_id("C3711666")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_filter
def test_SurfaceMaskFilterOverrides_MultipleDescriptorOverridesPlantAsExpected(self, request, editor, level,
launcher_platform):
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SystemSettings.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SystemSettings.py
index adf9a90587..0b55d06ae4 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SystemSettings.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SystemSettings.py
@@ -38,6 +38,7 @@ class TestSystemSettings(object):
@pytest.mark.test_case_id("C2646869")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_misc
def test_SystemSettings_SectorPointDensity(self, request, editor, level, launcher_platform):
expected_lines = [
@@ -64,6 +65,7 @@ class TestSystemSettings(object):
@pytest.mark.test_case_id("C2646870")
@pytest.mark.SUITE_periodic
+ @pytest.mark.dynveg_misc
def test_SystemSettings_SectorSize(self, request, editor, level, launcher_platform):
expected_lines = [
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C100000_RigidBody_EnablingGravityWorksPoC.py b/AutomatedTesting/Gem/PythonTests/physics/C100000_RigidBody_EnablingGravityWorksPoC.py
index e0277180ae..1284c234bd 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C100000_RigidBody_EnablingGravityWorksPoC.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C100000_RigidBody_EnablingGravityWorksPoC.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C100000
# Test Case Title : Check that Gravity works
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/100000
+
# fmt:off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py b/AutomatedTesting/Gem/PythonTests/physics/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py
index c7dd8debb9..725da5fb24 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C111111
# Test Case Title : Check that Gravity works
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/111111
+
# fmt:off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12712452_ScriptCanvas_CollisionEvents.py b/AutomatedTesting/Gem/PythonTests/physics/C12712452_ScriptCanvas_CollisionEvents.py
index 216a75233f..380bb8a3c8 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12712452_ScriptCanvas_CollisionEvents.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12712452_ScriptCanvas_CollisionEvents.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test Case ID : C12712452
# Test Case Title : Verify ScriptCanvas Collision Events
-# Test Case URL : https://testrail.agscollab.com/index.php?/cases/view/12712452
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12712453_ScriptCanvas_MultipleRaycastNode.py b/AutomatedTesting/Gem/PythonTests/physics/C12712453_ScriptCanvas_MultipleRaycastNode.py
index 2adf30e65e..b415688de7 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12712453_ScriptCanvas_MultipleRaycastNode.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12712453_ScriptCanvas_MultipleRaycastNode.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C12712453
# Test Case Title : Verify Raycast Multiple Node
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/12712453
+
# fmt:off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12712454_ScriptCanvas_OverlapNodeVerification.py b/AutomatedTesting/Gem/PythonTests/physics/C12712454_ScriptCanvas_OverlapNodeVerification.py
index 94eed900ff..bcf980a710 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12712454_ScriptCanvas_OverlapNodeVerification.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12712454_ScriptCanvas_OverlapNodeVerification.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : 12712454
# Test Case Title : Verify overlap nodes in script canvas
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/12712454
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12712455_ScriptCanvas_ShapeCastVerification.py b/AutomatedTesting/Gem/PythonTests/physics/C12712455_ScriptCanvas_ShapeCastVerification.py
index 61f26ebecb..668e8083c3 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12712455_ScriptCanvas_ShapeCastVerification.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12712455_ScriptCanvas_ShapeCastVerification.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C12712455
# Test Case Title : Verify shape cast nodes in SC
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/12712455
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py b/AutomatedTesting/Gem/PythonTests/physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py
index 4745927e89..d2438110fe 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C12868578
# Test Case Title : Check that World space and local space force direction doesn't affect magnitude of force exerted
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/12868578
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12868580_ForceRegion_SplineModifiedTransform.py b/AutomatedTesting/Gem/PythonTests/physics/C12868580_ForceRegion_SplineModifiedTransform.py
index 937fdd85a6..6372104fcf 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12868580_ForceRegion_SplineModifiedTransform.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12868580_ForceRegion_SplineModifiedTransform.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C12868580
# Test Case Title : Check that spline follow force works if transform components of entity are altered
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/12868580
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12905527_ForceRegion_MagnitudeDeviation.py b/AutomatedTesting/Gem/PythonTests/physics/C12905527_ForceRegion_MagnitudeDeviation.py
index 0cb0a2f841..76578460d5 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12905527_ForceRegion_MagnitudeDeviation.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12905527_ForceRegion_MagnitudeDeviation.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C12905527
# Test Case Title : Check that deviation occurring in Force Magnitude due to Values in Force direction is not large
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/12905527
+
# fmt: off
class Tests():
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12905528_ForceRegion_WithNonTriggerCollider.py b/AutomatedTesting/Gem/PythonTests/physics/C12905528_ForceRegion_WithNonTriggerCollider.py
index 42565333f7..38dc5488d2 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C12905528_ForceRegion_WithNonTriggerCollider.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C12905528_ForceRegion_WithNonTriggerCollider.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C12905528
Test Case Title : Check that user is warned if non-trigger collider component is used with force region
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/12905528
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C13351703_COM_NotIncludeTriggerShapes.py b/AutomatedTesting/Gem/PythonTests/physics/C13351703_COM_NotIncludeTriggerShapes.py
index 828022ccf2..d5bd946d34 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C13351703_COM_NotIncludeTriggerShapes.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C13351703_COM_NotIncludeTriggerShapes.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C13351703
# Test Case Title : Check that Center of Mass calculations should not include trigger shapes
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/13351703
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C13352089_RigidBodies_MaxAngularVelocity.py b/AutomatedTesting/Gem/PythonTests/physics/C13352089_RigidBodies_MaxAngularVelocity.py
index 77d93d9752..09b6956b06 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C13352089_RigidBodies_MaxAngularVelocity.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C13352089_RigidBodies_MaxAngularVelocity.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C13352089
# Test Case Title : Verify that maximum angular velocity interacts correctly with initial angular velocity
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/13352089
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C13508019_Terrain_TerrainTexturePainterWorks.py b/AutomatedTesting/Gem/PythonTests/physics/C13508019_Terrain_TerrainTexturePainterWorks.py
index 1c580bfbfe..9c7a6e75e9 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C13508019_Terrain_TerrainTexturePainterWorks.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C13508019_Terrain_TerrainTexturePainterWorks.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C13508019
# Test Case Title : Verify terrain materials are updated after using terrain texture layer painter.
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/13508019
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C13895144_Ragdoll_ChangeLevel.py b/AutomatedTesting/Gem/PythonTests/physics/C13895144_Ragdoll_ChangeLevel.py
index 61efe20dbd..66050565a4 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C13895144_Ragdoll_ChangeLevel.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C13895144_Ragdoll_ChangeLevel.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C13895144
# Test Case Title : Run a level with multiple ragdolls and then switch levels
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/13895144
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14195074_ScriptCanvas_PostUpdateEvent.py b/AutomatedTesting/Gem/PythonTests/physics/C14195074_ScriptCanvas_PostUpdateEvent.py
index 5668082f78..1d0e1d5ac8 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14195074_ScriptCanvas_PostUpdateEvent.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14195074_ScriptCanvas_PostUpdateEvent.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C14195074
# Test Case Title : Verify Postsimulate Events
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/14195074
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14654881_CharacterController_SwitchLevels.py b/AutomatedTesting/Gem/PythonTests/physics/C14654881_CharacterController_SwitchLevels.py
index fd5653b801..8fc58b4765 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14654881_CharacterController_SwitchLevels.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14654881_CharacterController_SwitchLevels.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C14654881
# Test Case Title : Switching levels from a level containing a character controller component
# should not lead to a crash
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/14654881
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14654882_Ragdoll_ragdollAPTest.py b/AutomatedTesting/Gem/PythonTests/physics/C14654882_Ragdoll_ragdollAPTest.py
index 03c18a5f1a..33077f2607 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14654882_Ragdoll_ragdollAPTest.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14654882_Ragdoll_ragdollAPTest.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
"""
Test case ID : C14654882
Test Case Title : Loading level with old PhysX Ragdoll component serialization should not produce asset processor errors
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/14654882
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14861498_ConfirmError_NoPxMesh.py b/AutomatedTesting/Gem/PythonTests/physics/C14861498_ConfirmError_NoPxMesh.py
index e52bdb7574..dca831456d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14861498_ConfirmError_NoPxMesh.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14861498_ConfirmError_NoPxMesh.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C14861498
# Test Case Title : Confirm that when a PhysXCollider has no physics asset, the physics asset collider \
# shape throw an error
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/14861498
+
# fmt:off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14861500_DefaultSetting_ColliderShape.py b/AutomatedTesting/Gem/PythonTests/physics/C14861500_DefaultSetting_ColliderShape.py
index 7a65448dcd..c6a275d04d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14861500_DefaultSetting_ColliderShape.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14861500_DefaultSetting_ColliderShape.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C14861500
Test Case Title : Verify Default shape is Physics Asset
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/14861500
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14861501_PhysXCollider_RenderMeshAutoAssigned.py b/AutomatedTesting/Gem/PythonTests/physics/C14861501_PhysXCollider_RenderMeshAutoAssigned.py
index 904b5b0189..bc7b1b5e00 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14861501_PhysXCollider_RenderMeshAutoAssigned.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14861501_PhysXCollider_RenderMeshAutoAssigned.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C14861501
Test Case Title : Verify PxMesh is auto-assigned when Collider component is added after Rendering Mesh component
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/14861501
+
"""
@@ -98,5 +98,5 @@ if __name__ == "__main__":
import ImportPathHelper as imports
imports.init()
- from utils import Report
+ from editor_python_test_tools.utils import Report
Report.start_test(C14861501_PhysXCollider_RenderMeshAutoAssigned)
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14861502_PhysXCollider_AssetAutoAssigned.py b/AutomatedTesting/Gem/PythonTests/physics/C14861502_PhysXCollider_AssetAutoAssigned.py
index 075c3f5b61..64820f7daf 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14861502_PhysXCollider_AssetAutoAssigned.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14861502_PhysXCollider_AssetAutoAssigned.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C14861502
Test Case Title : Verify PxMesh is auto-assigned in collider when Mesh is assigned in Rendering Mesh component
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/14861502
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14861504_RenderMeshAsset_WithNoPxAsset.py b/AutomatedTesting/Gem/PythonTests/physics/C14861504_RenderMeshAsset_WithNoPxAsset.py
index bbaabf67f6..766a359397 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14861504_RenderMeshAsset_WithNoPxAsset.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14861504_RenderMeshAsset_WithNoPxAsset.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C14861504
Test Case Title : Verify if Rendering Mesh does not have a PhysX Collision Mesh fbx, then PxMesh is not auto-assigned
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/14861504
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14902097_ScriptCanvas_PreUpdateEvent.py b/AutomatedTesting/Gem/PythonTests/physics/C14902097_ScriptCanvas_PreUpdateEvent.py
index 45557098f7..327f40ec38 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14902097_ScriptCanvas_PreUpdateEvent.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14902097_ScriptCanvas_PreUpdateEvent.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C14902097
# Test Case Title : Verify Presimulate Events
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/14902097
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py b/AutomatedTesting/Gem/PythonTests/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py
index 19caaab4fe..f7c8be8804 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C14902098
# Test Case Title : Check that force region simulation with Postsimulate works independently from rendering tick
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/14902098
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14976307_Gravity_SetGravityWorks.py b/AutomatedTesting/Gem/PythonTests/physics/C14976307_Gravity_SetGravityWorks.py
index 342ac6bdbd..73137ac497 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14976307_Gravity_SetGravityWorks.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14976307_Gravity_SetGravityWorks.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C14976307
# Test Case Title : Check that Set Gravity Enabled works on an entity with gravity that starts as disabled
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/14976307
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14976308_ScriptCanvas_SetKinematicTargetTransform.py b/AutomatedTesting/Gem/PythonTests/physics/C14976308_ScriptCanvas_SetKinematicTargetTransform.py
index 815e922a76..c76c5cab80 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14976308_ScriptCanvas_SetKinematicTargetTransform.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14976308_ScriptCanvas_SetKinematicTargetTransform.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test Case
# ID : C14976308
# Title : Verify that SetKinematicTarget on PhysX rigid body updates transform for kinematic entities and vice versa
-# URL : https://testrail.agscollab.com/index.php?/cases/view/14976308
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py b/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py
index 76ea9475ff..bdfc9d19be 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C15096732
# Test Case Title : Verify Default material library works across different levels
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/15096732
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py b/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py
index 748052db56..d45423fe94 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C15096732
# Test Case Title : Verify Default material library works across different levels
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/15096732
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15096735_Materials_DefaultLibraryConsistency.py b/AutomatedTesting/Gem/PythonTests/physics/C15096735_Materials_DefaultLibraryConsistency.py
index 4c7949cc91..3dd49d4fe4 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15096735_Materials_DefaultLibraryConsistency.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15096735_Materials_DefaultLibraryConsistency.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C15096735
# Test Case Title : Verify that default material library works consistently across all systems that use it
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/15096735
+
# fmt:off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15096737_Materials_DefaultMaterialLibraryChanges.py b/AutomatedTesting/Gem/PythonTests/physics/C15096737_Materials_DefaultMaterialLibraryChanges.py
index cc7dc3c5e2..c806cbb7d4 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15096737_Materials_DefaultMaterialLibraryChanges.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15096737_Materials_DefaultMaterialLibraryChanges.py
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test Case Title : Verify that a change in the default material library material information
# affects all the materials that reference it, even non-defaulted
# exactly like if the library was selected
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/15096737
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15096740_Material_LibraryUpdatedCorrectly.py b/AutomatedTesting/Gem/PythonTests/physics/C15096740_Material_LibraryUpdatedCorrectly.py
index 0f33f0858b..bef98f6830 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15096740_Material_LibraryUpdatedCorrectly.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15096740_Material_LibraryUpdatedCorrectly.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C15096740
Test Case Title : Verify that clearing a material library on all systems that use it,
assigns the default material library
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/15096740
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15308217_NoCrash_LevelSwitch.py b/AutomatedTesting/Gem/PythonTests/physics/C15308217_NoCrash_LevelSwitch.py
index 625a8bfb4a..dadfbd7a7e 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15308217_NoCrash_LevelSwitch.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15308217_NoCrash_LevelSwitch.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C15308217
# Test Case Title : Verify that the Terrain texture layer doesn't crash when changing
# from on a level with a terrain component to another level without a terrain component
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/15308217
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15308221_Material_ComponentsInSyncWithLibrary.py b/AutomatedTesting/Gem/PythonTests/physics/C15308221_Material_ComponentsInSyncWithLibrary.py
index 3f6457f15c..ebc7d3fadd 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15308221_Material_ComponentsInSyncWithLibrary.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15308221_Material_ComponentsInSyncWithLibrary.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test Case ID : C15308221
# Test Case Title : Verify that material library and slots are always in sync and work consistently through the different places of usage
-# Test Case URL : https://testrail.agscollab.com/index.php?/cases/view/15308221
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15425929_Undo_Redo.py b/AutomatedTesting/Gem/PythonTests/physics/C15425929_Undo_Redo.py
index 57a0e6a75e..dba14552c8 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15425929_Undo_Redo.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15425929_Undo_Redo.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C15425929
# Test Case Title : Verify that undo - redo operations do not create any error
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/15425929
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15425935_Material_LibraryUpdatedAcrossLevels.py b/AutomatedTesting/Gem/PythonTests/physics/C15425935_Material_LibraryUpdatedAcrossLevels.py
index f61886ccd0..8ff90fddaf 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15425935_Material_LibraryUpdatedAcrossLevels.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15425935_Material_LibraryUpdatedAcrossLevels.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C15425935
# Test Case Title : Verify that the change in Material Library gets updated across levels
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/15425935
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.py b/AutomatedTesting/Gem/PythonTests/physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.py
index 99e0dcc669..21f5952678 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C15556261
# Test Case Title : Check that the material assignment works with Character Controller
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/15556261
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15563573_Material_AddModifyDeleteOnCharacterController.py b/AutomatedTesting/Gem/PythonTests/physics/C15563573_Material_AddModifyDeleteOnCharacterController.py
index 4572dd322a..1e9b15fc90 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15563573_Material_AddModifyDeleteOnCharacterController.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15563573_Material_AddModifyDeleteOnCharacterController.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test Case ID : C15563573
# Test Case Title : Check that any change (Add/Delete/Modify) made to the material surface in the material library reflects immediately in the PhysX Character Controller
-# Test Case URL : https://testrail.agscollab.com/index.php?/cases/view/15563573
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15845879_ForceRegion_HighLinearDampingForce.py b/AutomatedTesting/Gem/PythonTests/physics/C15845879_ForceRegion_HighLinearDampingForce.py
index 52af7d8be5..6b31ffb13b 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15845879_ForceRegion_HighLinearDampingForce.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15845879_ForceRegion_HighLinearDampingForce.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C15845879
# Test Case Title : Check that linear damping with high values do not make the object to quiver
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/15845879
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C17411467_AddPhysxRagdollComponent.py b/AutomatedTesting/Gem/PythonTests/physics/C17411467_AddPhysxRagdollComponent.py
index 68efd452b2..32bd02ae26 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C17411467_AddPhysxRagdollComponent.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C17411467_AddPhysxRagdollComponent.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C17411467
Test Case Title : Check that Physx Ragdoll component can be added without errors/warnings
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/17411467
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243580_Joints_Fixed2BodiesConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243580_Joints_Fixed2BodiesConstrained.py
index b13869ce12..c3a351ebea 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243580_Joints_Fixed2BodiesConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243580_Joints_Fixed2BodiesConstrained.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C18243580
# Test Case Title : Check that fixed joint constrains 2 bodies
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/18243580
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243581_Joints_FixedBreakable.py b/AutomatedTesting/Gem/PythonTests/physics/C18243581_Joints_FixedBreakable.py
index 19feee575b..00e9a5625f 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243581_Joints_FixedBreakable.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243581_Joints_FixedBreakable.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C18243581
# Test Case Title : Check that fixed joint is breakable
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/18243581
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243582_Joints_FixedLeadFollowerCollide.py b/AutomatedTesting/Gem/PythonTests/physics/C18243582_Joints_FixedLeadFollowerCollide.py
index c9c90d35a7..d34e3f67d3 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243582_Joints_FixedLeadFollowerCollide.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243582_Joints_FixedLeadFollowerCollide.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C18243582
# Test Case Title : Check that fixed joint allows lead-follower collision
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/18243582
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243583_Joints_Hinge2BodiesConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243583_Joints_Hinge2BodiesConstrained.py
index 66343534a7..eafce6ceaf 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243583_Joints_Hinge2BodiesConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243583_Joints_Hinge2BodiesConstrained.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C18243583
# Test Case Title : Check that hinge joint constrains 2 bodies about X-axis
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/18243583
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243584_Joints_HingeSoftLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243584_Joints_HingeSoftLimitsConstrained.py
index 3b335cc5c6..90027be2d7 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243584_Joints_HingeSoftLimitsConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243584_Joints_HingeSoftLimitsConstrained.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C18243584
# Test Case Title : Check that hinge joint allows soft limit constraints on 2 bodies
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/18243584
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243585_Joints_HingeNoLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243585_Joints_HingeNoLimitsConstrained.py
index 289522fcac..0f677d94ae 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243585_Joints_HingeNoLimitsConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243585_Joints_HingeNoLimitsConstrained.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C18243585
# Test Case Title : Check that hinge joint allows no limit constraints on 2 bodies
-# URL of the test case :https://testrail.agscollab.com/index.php?/cases/view/18243585
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243586_Joints_HingeLeadFollowerCollide.py b/AutomatedTesting/Gem/PythonTests/physics/C18243586_Joints_HingeLeadFollowerCollide.py
index 60b9189c83..7c973729d1 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243586_Joints_HingeLeadFollowerCollide.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243586_Joints_HingeLeadFollowerCollide.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C18243586
# Test Case Title : Check that hinge joint allows lead-follower collision
-# URL of the test case :https://testrail.agscollab.com/index.php?/cases/view/18243586
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243587_Joints_HingeBreakable.py b/AutomatedTesting/Gem/PythonTests/physics/C18243587_Joints_HingeBreakable.py
index af6fa8cbac..4734328d70 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243587_Joints_HingeBreakable.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243587_Joints_HingeBreakable.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C18243587
# Test Case Title : Check that hinge joint is breakable
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/18243587
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243588_Joints_Ball2BodiesConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243588_Joints_Ball2BodiesConstrained.py
index 074ca03000..b6acfd6dd8 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243588_Joints_Ball2BodiesConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243588_Joints_Ball2BodiesConstrained.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C18243588
# Test Case Title : Check that ball joint constrains 2 bodies within cone limits
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/18243588
+
# fmt: off
class Tests:
enter_game_mode = ("Entered game mode", "Failed to enter game mode")
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243589_Joints_BallSoftLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243589_Joints_BallSoftLimitsConstrained.py
index e038b33043..1ca49035b5 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243589_Joints_BallSoftLimitsConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243589_Joints_BallSoftLimitsConstrained.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : 18243589
# Test Case Title : Check that ball joint allows soft limit constraints
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/18243589
+
# fmt: off
class Tests:
@@ -57,6 +57,7 @@ def C18243589_Joints_BallSoftLimitsConstrained():
"""
import os
import sys
+ import math
import ImportPathHelper as imports
@@ -95,13 +96,33 @@ def C18243589_Joints_BallSoftLimitsConstrained():
Report.info_vector3(follower.position, "follower initial position:")
leadInitialPosition = lead.position
followerInitialPosition = follower.position
+
+ followerMovedAboveJoint = False
+ #calculate the start vector from follower and lead positions
+ normalizedStartPos = JointsHelper.getRelativeVector(lead.position, follower.position)
+ normalizedStartPos = normalizedStartPos.GetNormalizedSafe()
+ #the targeted angle to reach between the initial vector and the current follower-lead vector
+ TARGET_ANGLE_DEG = 45
+ targetAngle = math.radians(TARGET_ANGLE_DEG)
+ angleAchieved = 0.0
- # 4) Wait for several seconds
- general.idle_wait(1.0) # wait for lead and follower to move
+ def checkAngleMet():
+ #calculate the current follower-lead vector
+ normalVec = JointsHelper.getRelativeVector(lead.position, follower.position)
+ normalVec = normalVec.GetNormalizedSafe()
+ #dot product + acos to get the angle
+ angleAchieved = math.acos(normalizedStartPos.Dot(normalVec))
+ #is it above target?
+ return angleAchieved > targetAngle
+
+ MAX_WAIT_TIME = 2.0 #seconds
+ followerMovedAboveJoint = helper.wait_for_condition(checkAngleMet, MAX_WAIT_TIME)
# 5) Check to see if lead and follower behaved as expected
- Report.info_vector3(lead.position, "lead position after 1 second:")
- Report.info_vector3(follower.position, "follower position after 1 second:")
+ Report.info_vector3(lead.position, "lead position:")
+ Report.info_vector3(follower.position, "follower position:")
+ angleAchievedDeg = math.degrees(angleAchieved)
+ Report.info(f"Angle achieved {angleAchievedDeg:.2f} Target {TARGET_ANGLE_DEG:.2f}")
leadPositionDelta = lead.position.Subtract(leadInitialPosition)
leadRemainedStill = JointsHelper.vector3SmallerThanScalar(leadPositionDelta, FLOAT_EPSILON)
@@ -111,7 +132,6 @@ def C18243589_Joints_BallSoftLimitsConstrained():
followerMovedinXYZ = JointsHelper.vector3LargerThanScalar(followerPositionDelta, FLOAT_EPSILON)
Report.critical_result(Tests.check_follower_position, followerMovedinXYZ)
- followerMovedAboveJoint = follower.position.z > (followerInitialPosition.z + 2.5) # (followerInitialPosition.z + 2.5) is the z position past the 45 degree limit. This is to show that the follower swinged past the 45 degree cone limit, above the joint position.
Report.critical_result(Tests.check_follower_above_joint, followerMovedAboveJoint)
# 6) Exit Game Mode
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243590_Joints_BallNoLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243590_Joints_BallNoLimitsConstrained.py
index ede46fd5c5..1d5a213cd8 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243590_Joints_BallNoLimitsConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243590_Joints_BallNoLimitsConstrained.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C18243590
# Test Case Title : Check that ball joint allows no limit constraints
-# URL of the test case :https://testrail.agscollab.com/index.php?/cases/view/18243590
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243591_Joints_BallLeadFollowerCollide.py b/AutomatedTesting/Gem/PythonTests/physics/C18243591_Joints_BallLeadFollowerCollide.py
index c3e527956f..8f7b2d7823 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243591_Joints_BallLeadFollowerCollide.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243591_Joints_BallLeadFollowerCollide.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C18243591
# Test Case Title : Check that ball joint allows lead-follower collision
-# URL of the test case :https://testrail.agscollab.com/index.php?/cases/view/18243591
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243592_Joints_BallBreakable.py b/AutomatedTesting/Gem/PythonTests/physics/C18243592_Joints_BallBreakable.py
index 350fccd125..0fa43cf9c8 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243592_Joints_BallBreakable.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243592_Joints_BallBreakable.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C18243592
# Test Case Title : Check that ball joint is breakable
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/18243592
+
# fmt: off
class Tests:
enter_game_mode = ("Entered game mode", "Failed to enter game mode")
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243593_Joints_GlobalFrameConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243593_Joints_GlobalFrameConstrained.py
index 4580a229ea..37d659f181 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18243593_Joints_GlobalFrameConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18243593_Joints_GlobalFrameConstrained.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C18243593
# Test Case Title : Check that fixed/hinge/ball joints allow constraints to global frame
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/18243593
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18977601_Material_FrictionCombinePriority.py b/AutomatedTesting/Gem/PythonTests/physics/C18977601_Material_FrictionCombinePriority.py
index 57dfc0f349..b17b97a816 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18977601_Material_FrictionCombinePriority.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18977601_Material_FrictionCombinePriority.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C18977601
# Test Case Title : Verify that when two objects with different materials collide, the friction combine priority works
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/18977601
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18981526_Material_RestitutionCombinePriority.py b/AutomatedTesting/Gem/PythonTests/physics/C18981526_Material_RestitutionCombinePriority.py
index 9b7fea1ab9..690d3d4d3f 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C18981526_Material_RestitutionCombinePriority.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C18981526_Material_RestitutionCombinePriority.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C18981526
# Test Case Title : Verify when two objects with different materials collide, the restitution combine priority works
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/18981526
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C19536274_GetCollisionName_PrintsName.py b/AutomatedTesting/Gem/PythonTests/physics/C19536274_GetCollisionName_PrintsName.py
index 48c947aa1f..611b502019 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C19536274_GetCollisionName_PrintsName.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C19536274_GetCollisionName_PrintsName.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C19536274
Test Case Title : Verify that the Get Collision Layer Name node prints the name of the collision layer
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/19536274
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C19536277_GetCollisionName_PrintsNothing.py b/AutomatedTesting/Gem/PythonTests/physics/C19536277_GetCollisionName_PrintsNothing.py
index 66e1302b5b..04d973cbb2 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C19536277_GetCollisionName_PrintsNothing.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C19536277_GetCollisionName_PrintsNothing.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C19536277
Test Case Title : Verify that when a group is modified using ToggleCollisionLayer node such that the new group is not in the pre-existing groups, GetCollisionGroupName node prints no value
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/19536277
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C19578018_ShapeColliderWithNoShapeComponent.py b/AutomatedTesting/Gem/PythonTests/physics/C19578018_ShapeColliderWithNoShapeComponent.py
index 32ece8541c..23996934bc 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C19578018_ShapeColliderWithNoShapeComponent.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C19578018_ShapeColliderWithNoShapeComponent.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C19578018
Test Case Title : Verify that a shape collider component with no shape component indicates a missing service
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/19578018
+
"""
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C19578021_ShapeCollider_CanBeAdded.py b/AutomatedTesting/Gem/PythonTests/physics/C19578021_ShapeCollider_CanBeAdded.py
index 0c42f5457d..1eb36e16f4 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C19578021_ShapeCollider_CanBeAdded.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C19578021_ShapeCollider_CanBeAdded.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C19578021
Test Case Title : Verify that a shape collider component may be added to an entity along with one or more PhysX collider components
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/19578021
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C19723164_ShapeColliders_WontCrashEditor.py b/AutomatedTesting/Gem/PythonTests/physics/C19723164_ShapeColliders_WontCrashEditor.py
index 769f08e3c4..f6584624c3 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C19723164_ShapeColliders_WontCrashEditor.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C19723164_ShapeColliders_WontCrashEditor.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C19723164
Test Case Title : Verify that if we had 512 shape colliders in the level, the level does not crash
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/19723164
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py
index d8e0a6769c..101b96b99b 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C24308873
# Test Case Title : Check that cylinder shape collider collides with terrain
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/24308873
+
# A cylinder is suspended slightly over PhysX Terrain to check that it collides when dropped
@@ -20,7 +20,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
class Tests():
enter_game_mode = ("Entered game mode", "Failed to enter game mode")
find_cylinder = ("Cylinder entity found", "Cylinder entity not found")
- find_terrain = ("Terrain found", "Terrain not found")
+ create_terrain = ("Terrain entity created successfully", "Failed to create Terrain Entity")
+ find_terrain = ("Terrain entity found", "Terrain entity not found")
+ add_physx_shape_collider = ("Added PhysX Shape Collider", "Failed to add PhysX Shape Collider")
+ add_box_shape = ("Added Box Shape", "Failed to add Box Shape")
cylinder_above_terrain = ("Cylinder position above ground", "Cylinder is not above the ground")
time_out = ("No time out occurred", "A time out occurred, please validate level setup")
touched_ground = ("Touched ground before time out", "Did not touch ground before time out")
@@ -40,11 +43,12 @@ def C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain():
Once game mode is entered, the cylinder should fall toward and collide with the terrain.
Steps:
- 1) Open level and enter game mode
- 2) Retrieve entities and positions
- 3) Wait for cylinder to collide with terrain OR time out
- 4) Exit game mode
- 5) Close the editor
+ 1) Open level and create terrain Entity.
+ 2) Enter Game Mode.
+ 3) Retrieve entities and positions
+ 4) Wait for cylinder to collide with terrain OR time out
+ 5) Exit game mode
+ 6) Close the editor
:return:
"""
@@ -54,29 +58,48 @@ def C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain():
import ImportPathHelper as imports
imports.init()
-
+ from editor_python_test_tools.editor_entity_utils import EditorEntity
import azlmbr.legacy.general as general
import azlmbr.bus
+ import azlmbr.math as math
from editor_python_test_tools.utils import Report
from editor_python_test_tools.utils import TestHelper as helper
# Global time out
TIME_OUT = 1.0
- # 1) Open level / Enter game mode
+ # 1) Open level
helper.init_idle()
helper.open_level("Physics", "C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain")
+
+ # Create terrain entity
+ terrain = EditorEntity.create_editor_entity_at([30.0, 30.0, 33.96], "Terrain")
+ Report.result(Tests.create_terrain, terrain.id.IsValid())
+
+ terrain.add_component("PhysX Shape Collider")
+ Report.result(Tests.add_physx_shape_collider, terrain.has_component("PhysX Shape Collider"))
+
+ box_shape_component = terrain.add_component("Box Shape")
+ Report.result(Tests.add_box_shape, terrain.has_component("Box Shape"))
+
+ box_shape_component.set_component_property_value("Box Shape|Box Configuration|Dimensions",
+ math.Vector3(1024.0, 1024.0, 0.01))
+
+ # 2)Enter game mode
helper.enter_game_mode(Tests.enter_game_mode)
- # 2) Retrieve entities and positions
+ # 3) Retrieve entities and positions
cylinder_id = general.find_game_entity("PhysX_Cylinder")
Report.critical_result(Tests.find_cylinder, cylinder_id.IsValid())
+
+
+ terrain_id = general.find_game_entity("Terrain")
+ Report.critical_result(Tests.find_terrain, terrain_id.IsValid())
- terrain_id = general.find_game_entity("PhysX_Terrain")
- Report.critical_result(Tests.find_terrain, terrain_id.IsValid())
- cylinder_pos = azlmbr.components.TransformBus(azlmbr.bus.Event, "GetWorldTM", cylinder_id).GetPosition()
- terrain_pos = azlmbr.components.TransformBus(azlmbr.bus.Event, "GetWorldTM", terrain_id).GetPosition()
+ cylinder_pos = azlmbr.components.TransformBus(azlmbr.bus.Event, "GetWorldTranslation", cylinder_id)
+ #Cylinder position is 64,84,35
+ terrain_pos = azlmbr.components.TransformBus(azlmbr.bus.Event, "GetWorldTranslation", terrain_id)
Report.info_vector3(cylinder_pos, "Cylinder:")
Report.info_vector3(terrain_pos, "Terrain:")
Report.critical_result(
@@ -104,13 +127,13 @@ def C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain():
handler.connect(cylinder_id)
handler.add_callback("OnCollisionBegin", on_collision_begin)
- # 3) Wait for the cylinder to hit the ground OR time out
+ # 4) Wait for the cylinder to hit the ground OR time out
test_completed = helper.wait_for_condition((lambda: TouchGround.value), TIME_OUT)
Report.critical_result(Tests.time_out, test_completed)
Report.result(Tests.touched_ground, TouchGround.value)
- # 4) Exit game mode
+ # 5) Exit game mode
helper.exit_game_mode(Tests.exit_game_mode)
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C28978033_Ragdoll_WorldBodyBusTests.py b/AutomatedTesting/Gem/PythonTests/physics/C28978033_Ragdoll_WorldBodyBusTests.py
index 8980e68250..052795318a 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C28978033_Ragdoll_WorldBodyBusTests.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C28978033_Ragdoll_WorldBodyBusTests.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C28978033
# Test Case Title : Check that WorldRequestBus works with PhysX ragdoll
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/28978033
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C29032500_EditorComponents_WorldBodyBusWorks.py b/AutomatedTesting/Gem/PythonTests/physics/C29032500_EditorComponents_WorldBodyBusWorks.py
index be541e4bf9..4915d362f7 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C29032500_EditorComponents_WorldBodyBusWorks.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C29032500_EditorComponents_WorldBodyBusWorks.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C29032500
# Test Case Title : Check that WorldRequestBus works with editor components
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/29032500
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C3510642_Terrain_NotCollideWithTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/C3510642_Terrain_NotCollideWithTerrain.py
index 3e3770adb9..b671cd3754 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C3510642_Terrain_NotCollideWithTerrain.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C3510642_Terrain_NotCollideWithTerrain.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C3510642
# Test Case Title : Check that when no physX terrain component is added, collision of a PhysX object
# with terrain does not work. Consequently, PhysX material assignment to terrain cannot be tested.
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/3510642
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044455_Material_libraryChangesInstantly.py b/AutomatedTesting/Gem/PythonTests/physics/C4044455_Material_libraryChangesInstantly.py
index 5f2c40f11e..a7916129e8 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044455_Material_libraryChangesInstantly.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044455_Material_libraryChangesInstantly.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : 4044455
# Test Case Title : Verify that any change in any of the values including the name of the material,
# once saved, is immediately reflected in the component and functionality
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4044455
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044456_Material_FrictionCombine.py b/AutomatedTesting/Gem/PythonTests/physics/C4044456_Material_FrictionCombine.py
index b71c1e8ede..eced55fc76 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044456_Material_FrictionCombine.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044456_Material_FrictionCombine.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4044456
# Test Case Title : Verify that when two objects with different materials collide, the friction combine works
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4044456
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044457_Material_RestitutionCombine.py b/AutomatedTesting/Gem/PythonTests/physics/C4044457_Material_RestitutionCombine.py
index 1ed2e8086c..5969541a86 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044457_Material_RestitutionCombine.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044457_Material_RestitutionCombine.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4044457
# Test Case Title : Verify that when two objects with different materials collide, the restitution combine works
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4044457
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044459_Material_DynamicFriction.py b/AutomatedTesting/Gem/PythonTests/physics/C4044459_Material_DynamicFriction.py
index c420250dfa..d414bc4813 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044459_Material_DynamicFriction.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044459_Material_DynamicFriction.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4044459
# Test Case Title : Verify the functionality of dynamic friction
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4044459
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044460_Material_StaticFriction.py b/AutomatedTesting/Gem/PythonTests/physics/C4044460_Material_StaticFriction.py
index 4e330002ff..6e864c554b 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044460_Material_StaticFriction.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044460_Material_StaticFriction.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4044460
# Test Case Title : Verify the functionality of static friction
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4044460
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044461_Material_Restitution.py b/AutomatedTesting/Gem/PythonTests/physics/C4044461_Material_Restitution.py
index af8990d87f..a5219ed2c7 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044461_Material_Restitution.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044461_Material_Restitution.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4044461
# Test Case Title : Verify the functionality of restitution
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4044461
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044694_Material_EmptyLibraryUsesDefault.py b/AutomatedTesting/Gem/PythonTests/physics/C4044694_Material_EmptyLibraryUsesDefault.py
index a8375114d5..e9106d89eb 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044694_Material_EmptyLibraryUsesDefault.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044694_Material_EmptyLibraryUsesDefault.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test Case ID : C4044694
# Test Case Title : Verify that if we add an empty Material library in Collider Component, the object continues to use Default material values
-# Test Case URL : https://testrail.agscollab.com/index.php?/cases/view/4044694
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py b/AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py
index 858e778f07..57cdc8f9c5 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C4044695
Test Case Title : Verify that when you add a multiple surface fbx in PxMesh in PhysxCollider,
multiple number of Material Slots populate in the Materials Section
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4044695
+
"""
@@ -114,5 +114,5 @@ if __name__ == "__main__":
import ImportPathHelper as imports
imports.init()
- from utils import Report
+ from editor_python_test_tools.utils import Report
Report.start_test(C4044695_PhysXCollider_AddMultipleSurfaceFbx)
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044697_Material_PerfaceMaterialValidation.py b/AutomatedTesting/Gem/PythonTests/physics/C4044697_Material_PerfaceMaterialValidation.py
index dba759015f..435e8242d5 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044697_Material_PerfaceMaterialValidation.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044697_Material_PerfaceMaterialValidation.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4044697
# Test Case Title : Verify that each surface picks up the material assigned to it and behaves accordingly.
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4044697
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4888315_Material_AddModifyDeleteOnCollider.py b/AutomatedTesting/Gem/PythonTests/physics/C4888315_Material_AddModifyDeleteOnCollider.py
index 145a5e1b60..b7b3ed855f 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4888315_Material_AddModifyDeleteOnCollider.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4888315_Material_AddModifyDeleteOnCollider.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test Case ID : C4888315
# Test Case Title : Check that any change (Add/Delete/Modify) made to the material surface in the material library reflects immediately in the PhysX Collider component
-# Test Case URL : https://testrail.agscollab.com/index.php?/cases/view/4888315
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4925577_Materials_MaterialAssignedToTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/C4925577_Materials_MaterialAssignedToTerrain.py
index 59b6a3fdfc..7ebb62eaf3 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4925577_Materials_MaterialAssignedToTerrain.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4925577_Materials_MaterialAssignedToTerrain.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4925577
# Test Case Title : Verify that material can be assigned to PhysX terrain in Terrain Texture Layers
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4925577
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4925579_Material_AddModifyDeleteOnTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/C4925579_Material_AddModifyDeleteOnTerrain.py
index e0425c35be..315cf9c3bd 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4925579_Material_AddModifyDeleteOnTerrain.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4925579_Material_AddModifyDeleteOnTerrain.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test Case ID : C4925579
# Test Case Title : Check that any change (Add/Delete/Modify) made to the material surface in the material library reflects immediately in the PhysX Terrain layers
-# Test Case URL : https://testrail.agscollab.com/index.php?/cases/view/4925579
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4925580_Material_RagdollBonesMaterial.py b/AutomatedTesting/Gem/PythonTests/physics/C4925580_Material_RagdollBonesMaterial.py
index 9944a033e3..5fae373f47 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4925580_Material_RagdollBonesMaterial.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4925580_Material_RagdollBonesMaterial.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test Case ID : C4925580
# Test Case Title : Verify that Material can be assigned to Ragdoll Bones and they behave as per their material
-# Test Case URL : https://testrail.agscollab.com/index.php?/cases/view/4925580
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4925582_Material_AddModifyDeleteOnRagdollBones.py b/AutomatedTesting/Gem/PythonTests/physics/C4925582_Material_AddModifyDeleteOnRagdollBones.py
index ed872ae99e..ca37be6ff0 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4925582_Material_AddModifyDeleteOnRagdollBones.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4925582_Material_AddModifyDeleteOnRagdollBones.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test Case ID : C4925582
# Test Case Title : Check that any change (Add/Delete/Modify) made to the material surface in the material library reflects immediately in the ragdoll bones
-# Test Case URL : https://testrail.agscollab.com/index.php?/cases/view/4925582
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976194_RigidBody_PhysXComponentIsValid.py b/AutomatedTesting/Gem/PythonTests/physics/C4976194_RigidBody_PhysXComponentIsValid.py
index aa059eb224..8bb005711e 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976194_RigidBody_PhysXComponentIsValid.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976194_RigidBody_PhysXComponentIsValid.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976194
# Test Case Title : Verify that you can add PhysX Rigid Bodies Physics component to an Entity without any warning or Error.
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976194
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976195_RigidBodies_InitialLinearVelocity.py b/AutomatedTesting/Gem/PythonTests/physics/C4976195_RigidBodies_InitialLinearVelocity.py
index c5740b2798..3dbf26a0ac 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976195_RigidBodies_InitialLinearVelocity.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976195_RigidBodies_InitialLinearVelocity.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976195
# Test Case Title : Verify that when you assign an Initial Linear Velocity to an object,
# ... it moves with that linear velocity when we switch to game mode.
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976195
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976197_RigidBodies_InitialAngularVelocity.py b/AutomatedTesting/Gem/PythonTests/physics/C4976197_RigidBodies_InitialAngularVelocity.py
index 08e171269e..7a17eb5941 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976197_RigidBodies_InitialAngularVelocity.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976197_RigidBodies_InitialAngularVelocity.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976197
# Test Case Title : Verify that when you assign an Initial Angular Velocity to an object,
# it moves with that Angular velocity when we switch to game mode
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976197
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976199_RigidBodies_LinearDampingObjectMotion.py b/AutomatedTesting/Gem/PythonTests/physics/C4976199_RigidBodies_LinearDampingObjectMotion.py
index 2e19b633c4..457cb18640 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976199_RigidBodies_LinearDampingObjectMotion.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976199_RigidBodies_LinearDampingObjectMotion.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976199
# Test Case Title : Verify that with higher linear damping, the object in motion comes to rest faster
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976199
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976200_RigidBody_AngularDampingObjectRotation.py b/AutomatedTesting/Gem/PythonTests/physics/C4976200_RigidBody_AngularDampingObjectRotation.py
index b90b34be53..f423821757 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976200_RigidBody_AngularDampingObjectRotation.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976200_RigidBody_AngularDampingObjectRotation.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976200
# Test Case Title : Verify that with higher angular damping, the object in rotation comes to rest faster
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976200
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976201_RigidBody_MassIsAssigned.py b/AutomatedTesting/Gem/PythonTests/physics/C4976201_RigidBody_MassIsAssigned.py
index 7fb0ff84ce..fd15cbbb0f 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976201_RigidBody_MassIsAssigned.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976201_RigidBody_MassIsAssigned.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976201
# Test Case Title : Verify that the value assigned to the Mass of the object, gets actually assigned to the object
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976201
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold.py b/AutomatedTesting/Gem/PythonTests/physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold.py
index 7d4cf1066e..c66f5cf7b6 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold.py
@@ -14,7 +14,7 @@ Test case ID : C4976202
Test Case Title : Verify that if the object is moving with Kinetic energy less than
the sleep threshold value, then physX will put it to stop after 0.4 secs (once the
wake counter goes to zero) if the KE is still below the threshold
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976202
+
"""
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976204_Verify_Start_Asleep_Condition.py b/AutomatedTesting/Gem/PythonTests/physics/C4976204_Verify_Start_Asleep_Condition.py
index 29fc2ec2a3..6b29062adf 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976204_Verify_Start_Asleep_Condition.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976204_Verify_Start_Asleep_Condition.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976204
# Test Case Title : Verify that when Start Asleep is checked, the object in air does not fall down due to
# gravity or does not start moving with initial linear velocity assigned to it when switched to game mode
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976204
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976206_RigidBodies_GravityEnabledActive.py b/AutomatedTesting/Gem/PythonTests/physics/C4976206_RigidBodies_GravityEnabledActive.py
index b97c590a93..934e546d65 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976206_RigidBodies_GravityEnabledActive.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976206_RigidBodies_GravityEnabledActive.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976206
# Test Case Title : VErify that when Gravity enables is checked, the object falls down due to gravity [sic]
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976206
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976207_PhysXRigidBodies_KinematicBehavior.py b/AutomatedTesting/Gem/PythonTests/physics/C4976207_PhysXRigidBodies_KinematicBehavior.py
index 4481c00fc5..58193a1e9b 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976207_PhysXRigidBodies_KinematicBehavior.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976207_PhysXRigidBodies_KinematicBehavior.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976207
# Test Case Title : Verify that when Kinematic is checked, the object behaves as a Kinematic object
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976207
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976209_RigidBody_ComputesCOM.py b/AutomatedTesting/Gem/PythonTests/physics/C4976209_RigidBody_ComputesCOM.py
index 79ea6e5dc7..600b20d98d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976209_RigidBody_ComputesCOM.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976209_RigidBody_ComputesCOM.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976209
# Test Case Title : Verify that when Compute COM is enabled, the PhysX system computes the COM of the object on its own
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976209
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976210_COM_ManualSetting.py b/AutomatedTesting/Gem/PythonTests/physics/C4976210_COM_ManualSetting.py
index 451081ba23..c53fb3508d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976210_COM_ManualSetting.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976210_COM_ManualSetting.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976210
# Test Case Title : Verify that when Compute COM is disabled, the user gets an option to add the co-ordinates of
# the COM and the COM gets implemented at those co-ordinates.
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976210
+
import os
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976218_RigidBodies_InertiaObjectsNotComputed.py b/AutomatedTesting/Gem/PythonTests/physics/C4976218_RigidBodies_InertiaObjectsNotComputed.py
index 63f0d382c3..dada67548b 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976218_RigidBodies_InertiaObjectsNotComputed.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976218_RigidBodies_InertiaObjectsNotComputed.py
@@ -9,7 +9,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
"""
# Test case ID : C4976218
# Test Case Title: Verify that when compute inertia is checked, the physX engine does compute the inertia of the objects
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976218
+
# fmt: off
class Tests():
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976227_Collider_NewGroup.py b/AutomatedTesting/Gem/PythonTests/physics/C4976227_Collider_NewGroup.py
index 8d9dc01396..78c031870d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976227_Collider_NewGroup.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976227_Collider_NewGroup.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976227
# Test Case Title : Validate that a Collision Group can be added
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976227
+
# Level has entity with custom collision group added.
# If level enters game mode, collision group addition is validated.
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976236_AddPhysxColliderComponent.py b/AutomatedTesting/Gem/PythonTests/physics/C4976236_AddPhysxColliderComponent.py
index 72442601e4..fdb862005f 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976236_AddPhysxColliderComponent.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976236_AddPhysxColliderComponent.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C4976236
Test Case Title : Verify that you can add the physX collider component to an entity
without it throwing an error or warning
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976236
+
"""
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py b/AutomatedTesting/Gem/PythonTests/physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py
index bb6234b69e..ac14164f45 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976242
# Test Case Title : Assign same collision layer and same collision group to two entities and
# verify that they collide or not
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976242
+
# fmt: off
class Tests():
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py b/AutomatedTesting/Gem/PythonTests/physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py
index 949ebb2b2a..44a8b15169 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976243
# Test Case Title : Assign different collision layers and same collision group
# (such that this group has both these collision layers enabled) to two entities and verify that they collide
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976243
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976244_Collider_SameGroupSameLayerCollision.py b/AutomatedTesting/Gem/PythonTests/physics/C4976244_Collider_SameGroupSameLayerCollision.py
index c35b9fab81..ca1e7f57f5 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976244_Collider_SameGroupSameLayerCollision.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976244_Collider_SameGroupSameLayerCollision.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976244
# Test Case Title : Checks that two entities of similar custom layer collide
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976244
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976245_PhysXCollider_CollisionLayerTest.py b/AutomatedTesting/Gem/PythonTests/physics/C4976245_PhysXCollider_CollisionLayerTest.py
index dafb8d9014..5f8c0a8d67 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4976245_PhysXCollider_CollisionLayerTest.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4976245_PhysXCollider_CollisionLayerTest.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4976245
# Test Case Title : Check that two entities of collision group "None" do not collide,
# even though they have the same collision layer
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4976245
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982593_PhysXCollider_CollisionLayerTest.py b/AutomatedTesting/Gem/PythonTests/physics/C4982593_PhysXCollider_CollisionLayerTest.py
index 8d985de402..126ebf48dc 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982593_PhysXCollider_CollisionLayerTest.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982593_PhysXCollider_CollisionLayerTest.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4982593
# Test Case Title : Check that two entities with different collision groups and layers do not collide.
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4982593
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982595_Collider_TriggerDisablesCollision.py b/AutomatedTesting/Gem/PythonTests/physics/C4982595_Collider_TriggerDisablesCollision.py
index 8746996ca8..c50c517086 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982595_Collider_TriggerDisablesCollision.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982595_Collider_TriggerDisablesCollision.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test Case ID : C4982595
# Test Case Title : Verify that when the Trigger Checkbox is ticked, the object no longer collides with another object
# but simply passes through it
-# Test Case URL : https://testrail.agscollab.com/index.php?/cases/view/4982595
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982797_Collider_ColliderOffset.py b/AutomatedTesting/Gem/PythonTests/physics/C4982797_Collider_ColliderOffset.py
index 2bd4fc5adc..29a3b7f89d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982797_Collider_ColliderOffset.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982797_Collider_ColliderOffset.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4982797
# Test Case Title : Check that collision offsets trigger collision events,
# not entity transform locations
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4982797
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982798_Collider_ColliderRotationOffset.py b/AutomatedTesting/Gem/PythonTests/physics/C4982798_Collider_ColliderRotationOffset.py
index f86890d8bf..6276c81871 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982798_Collider_ColliderRotationOffset.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982798_Collider_ColliderRotationOffset.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C4982798
# Test Case Title : Verify that when the x,y,z values are defined in the offset, the collider frame
# rotates from its original orientation in the direction defined by the x,y,z units
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4982798
+
import os
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982800_PhysXColliderShape_CanBeSelected.py b/AutomatedTesting/Gem/PythonTests/physics/C4982800_PhysXColliderShape_CanBeSelected.py
index c37ad2b2d2..1822a1efa7 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982800_PhysXColliderShape_CanBeSelected.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982800_PhysXColliderShape_CanBeSelected.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C4982800
Test Case Title : Verify that the shape Sphere can be selected from the drop downlist and the value for its radius can be set
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4982800
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982801_PhysXColliderShape_CanBeSelected.py b/AutomatedTesting/Gem/PythonTests/physics/C4982801_PhysXColliderShape_CanBeSelected.py
index 19a835da18..ef9b8171c4 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982801_PhysXColliderShape_CanBeSelected.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982801_PhysXColliderShape_CanBeSelected.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C4982801
Test Case Title : Verify that the shape Box can be selected from drop downlist and the value for its dimensions in x,y,z can be set after that
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4982801
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982802_PhysXColliderShape_CanBeSelected.py b/AutomatedTesting/Gem/PythonTests/physics/C4982802_PhysXColliderShape_CanBeSelected.py
index e1365d0887..642dea48de 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982802_PhysXColliderShape_CanBeSelected.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982802_PhysXColliderShape_CanBeSelected.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C4982802
Test Case Title : Verify that the shape capsule can be selected from drop downlist and the value for its height and radius can be set after that
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4982802
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982803_Enable_PxMesh_Option.py b/AutomatedTesting/Gem/PythonTests/physics/C4982803_Enable_PxMesh_Option.py
index 4ae177934a..99e93c26c9 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4982803_Enable_PxMesh_Option.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4982803_Enable_PxMesh_Option.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Test case ID : C4982803
Test Case Title : Verify that when the shape Physics Asset is selected,
PxMesh option gets enabled and a Px Mesh can be selected and assigned to the object
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/4982803
+
"""
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5296614_PhysXMaterial_ColliderShape.py b/AutomatedTesting/Gem/PythonTests/physics/C5296614_PhysXMaterial_ColliderShape.py
index 9d2a49ac70..b4af6ab506 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5296614_PhysXMaterial_ColliderShape.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5296614_PhysXMaterial_ColliderShape.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5296614
# Test Case Title : Check that unless you assign a shape to a physX collider component,
# the material assigned to it does not take affect
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5296614
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5340400_RigidBody_ManualMomentOfInertia.py b/AutomatedTesting/Gem/PythonTests/physics/C5340400_RigidBody_ManualMomentOfInertia.py
index 7617e41cad..838007436c 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5340400_RigidBody_ManualMomentOfInertia.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5340400_RigidBody_ManualMomentOfInertia.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5340400
# Test Case Title : Verify that when Compute inertia is disabled, the user gets to set the moment of inertia
# and physX engine work accordingly
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5340400
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5689518_PhysXTerrain_CollidesWithPhysXTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/C5689518_PhysXTerrain_CollidesWithPhysXTerrain.py
index 0686adf15d..f17bf2492f 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5689518_PhysXTerrain_CollidesWithPhysXTerrain.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5689518_PhysXTerrain_CollidesWithPhysXTerrain.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5689518
# Test Case Title : PhysX entities collide with PhysX Terrain
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5689518
+
# A ball is suspended slightly over PhysX Terrain to check that it collides when dropped
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.py b/AutomatedTesting/Gem/PythonTests/physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.py
index ffafeaab34..61ef63c4ae 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5689522
# Test Case Title : Create an entity with PhysX terrain. Add another PhysX terrain and verify that
# you are able to add it without any crash or error.
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5689522
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5689524_MultipleTerrains_CheckWarningInConsole.py b/AutomatedTesting/Gem/PythonTests/physics/C5689524_MultipleTerrains_CheckWarningInConsole.py
index 2b1a73f1f3..c395507ea0 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5689524_MultipleTerrains_CheckWarningInConsole.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5689524_MultipleTerrains_CheckWarningInConsole.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5689524
# Test Case Title : Create multiple entities each with one or more terrain components and verify that you are
# able to successfully add the PhysX Terrain components to them.
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5689524
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5689528_Terrain_MultipleTerrainComponents.py b/AutomatedTesting/Gem/PythonTests/physics/C5689528_Terrain_MultipleTerrainComponents.py
index 265836489d..12f3955bf6 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5689528_Terrain_MultipleTerrainComponents.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5689528_Terrain_MultipleTerrainComponents.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5689528
# Test Case Title : Create multiple entities each with one PhysX terrain component and verify that a warning
# is thrown to the user
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5689528
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py b/AutomatedTesting/Gem/PythonTests/physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py
index 138ae68408..c5342d7421 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test Case Title : Create an entity with PhysX Terrain component and add
# PhysX Rigid Body PhysX, PhysX Collider and Rendering Mesh to it and
# verify that it works in game mode
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5689529
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5689531_Warning_TerrainSliceTerrainComponent.py b/AutomatedTesting/Gem/PythonTests/physics/C5689531_Warning_TerrainSliceTerrainComponent.py
index 7d60a61ec1..85a9037a36 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5689531_Warning_TerrainSliceTerrainComponent.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5689531_Warning_TerrainSliceTerrainComponent.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5689531
# Test Case Title : Check that when you add a spawner component to a level to spawn a
# terrain and also add a terrain component explicitly, no crash happens
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5689531
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5932040_ForceRegion_CubeExertsWorldForce.py b/AutomatedTesting/Gem/PythonTests/physics/C5932040_ForceRegion_CubeExertsWorldForce.py
index f01dd4582f..b1f9f8f934 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5932040_ForceRegion_CubeExertsWorldForce.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5932040_ForceRegion_CubeExertsWorldForce.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5932040
# Test Case Title : Check that force region exerts world space force on rigid bodies
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5932040
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py
index 095a669541..5fc07fdc67 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5932041
# Test Case Title : Check that force region exerts local space force on rigid bodies
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5932041
+
# Sphere drops and is acted upon in an upward and positive x-ward direction by a force
# with a magnitude close to the assigned force region magnitude when it reaches the force region.
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5932042_PhysXForceRegion_LinearDamping.py b/AutomatedTesting/Gem/PythonTests/physics/C5932042_PhysXForceRegion_LinearDamping.py
index 04cecd45b2..b55ce59d7a 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5932042_PhysXForceRegion_LinearDamping.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5932042_PhysXForceRegion_LinearDamping.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5932042
# Test Case Title : Check that force region exerts linear damping force on rigid bodies
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5932042
+
# fmt: off
@@ -135,7 +135,7 @@ def C5932042_PhysXForceRegion_LinearDamping():
# Constants
CLOSE_ENOUGH = 0.001
- TIME_OUT = 2.0
+ TIME_OUT = 3.0
INITIAL_VELOCITY = azmath.Vector3(0.0, 0.0, -10.0)
# 1) Open level / Enter game mode
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5932043_ForceRegion_SimpleDragOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/C5932043_ForceRegion_SimpleDragOnRigidBodies.py
index 512698ce4b..b4d29f8065 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5932043_ForceRegion_SimpleDragOnRigidBodies.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5932043_ForceRegion_SimpleDragOnRigidBodies.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5932043
# Test Case Title : Check that force region exerts simple drag force on rigid bodies
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5932043
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5932044_ForceRegion_PointForceOnRigidBody.py b/AutomatedTesting/Gem/PythonTests/physics/C5932044_ForceRegion_PointForceOnRigidBody.py
index b7257b488b..6cfaf857a4 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5932044_ForceRegion_PointForceOnRigidBody.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5932044_ForceRegion_PointForceOnRigidBody.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5932044
# Test Case Title : Check that force region exerts point force on rigid bodies
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5932044
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5932045_ForceRegion_Spline.py b/AutomatedTesting/Gem/PythonTests/physics/C5932045_ForceRegion_Spline.py
index eca0679921..298265966c 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5932045_ForceRegion_Spline.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5932045_ForceRegion_Spline.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5932045
# Test Case Title : Check that force region exerts spline follow force on rigid bodies
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5932045
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959759_RigidBody_ForceRegionSpherePointForce.py b/AutomatedTesting/Gem/PythonTests/physics/C5959759_RigidBody_ForceRegionSpherePointForce.py
index 6aff0a7145..a8ef614f75 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959759_RigidBody_ForceRegionSpherePointForce.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959759_RigidBody_ForceRegionSpherePointForce.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5959759
# Test Case Title : Check that force region (sphere) exerts point force
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5959759
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959760_PhysXForceRegion_PointForceExertion.py b/AutomatedTesting/Gem/PythonTests/physics/C5959760_PhysXForceRegion_PointForceExertion.py
index 89eb1842be..4cb1cffd16 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959760_PhysXForceRegion_PointForceExertion.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959760_PhysXForceRegion_PointForceExertion.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5959760
# Test Case Title : Check that force region (capsule) exerts point force
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5959760
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959761_ForceRegion_PhysAssetExertsPointForce.py b/AutomatedTesting/Gem/PythonTests/physics/C5959761_ForceRegion_PhysAssetExertsPointForce.py
index ba0475266b..27f9e41a7d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959761_ForceRegion_PhysAssetExertsPointForce.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959761_ForceRegion_PhysAssetExertsPointForce.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5959761
# Test Case Title : Check that force region (physics asset) exerts point force
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5959761
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py b/AutomatedTesting/Gem/PythonTests/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py
index 76130d25eb..4b62f9a029 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5959764
# Test Case Title : Check that rigid body (Cube) gets impulse from force region
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5959764
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py b/AutomatedTesting/Gem/PythonTests/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py
index f314dae5b7..aadc07b09b 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5959764
# Test Case Title : Check that rigid body (Capsule) gets impulse from force region
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5959764
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959765_ForceRegion_AssetGetsImpulsed.py b/AutomatedTesting/Gem/PythonTests/physics/C5959765_ForceRegion_AssetGetsImpulsed.py
index ddcba5996b..ed007594c2 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959765_ForceRegion_AssetGetsImpulsed.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959765_ForceRegion_AssetGetsImpulsed.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5959765
# Test Case Title : Check that rigid body (asset) gets impulse from force region
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5959765
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959808_ForceRegion_PositionOffset.py b/AutomatedTesting/Gem/PythonTests/physics/C5959808_ForceRegion_PositionOffset.py
index 175f73a420..7c3f8a43aa 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959808_ForceRegion_PositionOffset.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959808_ForceRegion_PositionOffset.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5959808
# Test Case Title : Verify Force Region Position Offset
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5959808
+
# fmt:off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959809_ForceRegion_RotationalOffset.py b/AutomatedTesting/Gem/PythonTests/physics/C5959809_ForceRegion_RotationalOffset.py
index 1ad53194d3..dc84be8798 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959809_ForceRegion_RotationalOffset.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959809_ForceRegion_RotationalOffset.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5959809
# Test Case Title : Verify Force Region Rotational Offset
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5959809
+
# fmt:off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959810_ForceRegion_ForceRegionCombinesForces.py b/AutomatedTesting/Gem/PythonTests/physics/C5959810_ForceRegion_ForceRegionCombinesForces.py
index 212f7cc86b..8efc3dc635 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959810_ForceRegion_ForceRegionCombinesForces.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959810_ForceRegion_ForceRegionCombinesForces.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5959810
# Test Case Title : Check that multiple forces in single force region create correct net force
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5959810
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py b/AutomatedTesting/Gem/PythonTests/physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py
index 4aa0fef642..948e172962 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5968759
# Test Case Title : Check nested force regions exert forces simultaneously on rigid body
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5968759
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5968760_ForceRegion_CheckNetForceChange.py b/AutomatedTesting/Gem/PythonTests/physics/C5968760_ForceRegion_CheckNetForceChange.py
index ba491c96a7..0897fcb0d7 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5968760_ForceRegion_CheckNetForceChange.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5968760_ForceRegion_CheckNetForceChange.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C5968760
# Test Case Title : Check moving force region changes net force
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/5968760
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6032082_Terrain_MultipleResolutionsValid.py b/AutomatedTesting/Gem/PythonTests/physics/C6032082_Terrain_MultipleResolutionsValid.py
index 4543b0b8f6..00d53a2d6c 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6032082_Terrain_MultipleResolutionsValid.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6032082_Terrain_MultipleResolutionsValid.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C6032082
# Test Case Title : Verify multiple terrain resolutions are supported
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/6032082
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090546_ForceRegion_SliceFileInstantiates.py b/AutomatedTesting/Gem/PythonTests/physics/C6090546_ForceRegion_SliceFileInstantiates.py
index 557b7e7ec5..2b427468b7 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090546_ForceRegion_SliceFileInstantiates.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090546_ForceRegion_SliceFileInstantiates.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C6090546
# Test Case Title : Check that a force region slice can be saved and instantiated
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/6090546
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090547_ForceRegion_ParentChildForceRegions.py b/AutomatedTesting/Gem/PythonTests/physics/C6090547_ForceRegion_ParentChildForceRegions.py
index a07fd1861b..84474f0226 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090547_ForceRegion_ParentChildForceRegions.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090547_ForceRegion_ParentChildForceRegions.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C6090547
# Test Case Title : Check that force regions in parent and child entities work together.
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/6090547
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090550_ForceRegion_WorldSpaceForceNegative.py b/AutomatedTesting/Gem/PythonTests/physics/C6090550_ForceRegion_WorldSpaceForceNegative.py
index f8da62ebac..e2c55a024d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090550_ForceRegion_WorldSpaceForceNegative.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090550_ForceRegion_WorldSpaceForceNegative.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
"""
Test case ID : C6090550
Test Case Title : Check that force region exerts world space force on rigid bodies (negative test)
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/6090550
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090551_ForceRegion_LocalSpaceForceNegative.py b/AutomatedTesting/Gem/PythonTests/physics/C6090551_ForceRegion_LocalSpaceForceNegative.py
index 0788b1da66..2e201e20bd 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090551_ForceRegion_LocalSpaceForceNegative.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090551_ForceRegion_LocalSpaceForceNegative.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
"""
Test case ID : C6090551
Test Case Title : Check that force region exerts local space force on rigid bodies (negative test)
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/6090551
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090552_ForceRegion_LinearDampingNegative.py b/AutomatedTesting/Gem/PythonTests/physics/C6090552_ForceRegion_LinearDampingNegative.py
index a878819045..585a337389 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090552_ForceRegion_LinearDampingNegative.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090552_ForceRegion_LinearDampingNegative.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
"""
Test case ID : C6090552
Test Case Title : Check that force region exerts linear damping force on rigid bodies (negative test)
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/6090552
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py
index 43c4335918..6abee0ad64 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C6090553
# Test Case Title : Check that force region exerts simple drag force on rigid bodies (negative test)
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/6090553
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090554_ForceRegion_PointForceNegative.py b/AutomatedTesting/Gem/PythonTests/physics/C6090554_ForceRegion_PointForceNegative.py
index d7781b6040..0969cebd8d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090554_ForceRegion_PointForceNegative.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090554_ForceRegion_PointForceNegative.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
"""
Test case ID : C6090554
Test Case Title : Check that force region exerts point force on rigid bodies (negative test)
-URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/6090554
+
"""
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090555_ForceRegion_SplineFollowOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/C6090555_ForceRegion_SplineFollowOnRigidBodies.py
index b1b76d896d..90f67391ad 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6090555_ForceRegion_SplineFollowOnRigidBodies.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6090555_ForceRegion_SplineFollowOnRigidBodies.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C6090555
# Test Case Title : Check that force region exerts spline follow force on rigid bodies(negative test)
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/6090555
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6131473_StaticSlice_OnDynamicSliceSpawn.py b/AutomatedTesting/Gem/PythonTests/physics/C6131473_StaticSlice_OnDynamicSliceSpawn.py
index 11281df4eb..ee68ef6049 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6131473_StaticSlice_OnDynamicSliceSpawn.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6131473_StaticSlice_OnDynamicSliceSpawn.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C6131473
# Test Case Title : Verify a static slice is not spawned automatically everytime a dynamic slice with
# PhysX Components is spawned
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/6131473
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6224408_ScriptCanvas_EntitySpawn.py b/AutomatedTesting/Gem/PythonTests/physics/C6224408_ScriptCanvas_EntitySpawn.py
index 6501e11e68..6693c17dff 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6224408_ScriptCanvas_EntitySpawn.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6224408_ScriptCanvas_EntitySpawn.py
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C6224408
# Test Case Title : Entity using PhysX nodes in Script Canvas can be spawned.
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/6224408
+
# fmt: off
class Tests:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6274125_ScriptCanvas_TriggerEvents.py b/AutomatedTesting/Gem/PythonTests/physics/C6274125_ScriptCanvas_TriggerEvents.py
index 44c8be9e1e..c360473b7f 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6274125_ScriptCanvas_TriggerEvents.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6274125_ScriptCanvas_TriggerEvents.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C6274125
# Test Case Title : Verify ScriptCanvas Trigger Events.
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/6274125
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6321601_Force_HighValuesDirectionAxes.py b/AutomatedTesting/Gem/PythonTests/physics/C6321601_Force_HighValuesDirectionAxes.py
index c1a51f2887..4b0b036970 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C6321601_Force_HighValuesDirectionAxes.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C6321601_Force_HighValuesDirectionAxes.py
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# Test case ID : C6321601
# Test Case Title : Check that very high values of direction axes of forces do not throw error
-# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/6321601
+
# fmt: off
diff --git a/AutomatedTesting/Gem/PythonTests/physics/JointsHelper.py b/AutomatedTesting/Gem/PythonTests/physics/JointsHelper.py
index e61118ef5b..476c1df237 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/JointsHelper.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/JointsHelper.py
@@ -27,6 +27,13 @@ def vector3LargerThanScalar(vec3Value, scalarValue):
vec3Value.y > scalarValue and
vec3Value.z > scalarValue)
+def getRelativeVector(vecA, vecB):
+ relativeVec = vecA
+ relativeVec.x = relativeVec.x - vecB.x
+ relativeVec.y = relativeVec.y - vecB.y
+ relativeVec.z = relativeVec.z - vecB.z
+ return relativeVec
+
# Entity class for joints tests
class JointEntity:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py
index 67e855a00e..8f1f2f7481 100644
--- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py
@@ -34,4 +34,61 @@ class TestAutomation(TestAutomationBase):
def test_C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC(self, request, workspace, editor, launcher_platform):
from . import C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ def test_C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies(self, request, workspace, editor, launcher_platform):
+ from . import C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ def test_C4044459_Material_DynamicFriction(self, request, workspace, editor, launcher_platform):
+ from . import C4044459_Material_DynamicFriction as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ def test_C15425929_Undo_Redo(self, request, workspace, editor, launcher_platform):
+ from . import C15425929_Undo_Redo as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ def test_C4976243_Collision_SameCollisionGroupDiffCollisionLayers(self, request, workspace, editor,
+ launcher_platform):
+ from . import C4976243_Collision_SameCollisionGroupDiffCollisionLayers as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ def test_C14654881_CharacterController_SwitchLevels(self, request, workspace, editor, launcher_platform):
+ from . import C14654881_CharacterController_SwitchLevels as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ def test_C17411467_AddPhysxRagdollComponent(self, request, workspace, editor, launcher_platform):
+ from . import C17411467_AddPhysxRagdollComponent as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ def test_C12712453_ScriptCanvas_MultipleRaycastNode(self, request, workspace, editor, launcher_platform):
+ from . import C12712453_ScriptCanvas_MultipleRaycastNode as test_module
+ # Fixme: unexpected_lines = ["Assert"] + test_module.Lines.unexpected
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ @fm.file_override('physxsystemconfiguration.setreg','C4982593_PhysXCollider_CollisionLayer.setreg_override', 'AutomatedTesting/Registry')
+ def test_C4982593_PhysXCollider_CollisionLayerTest(self, request, workspace, editor, launcher_platform):
+ from . import C4982593_PhysXCollider_CollisionLayerTest as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ def test_C18243586_Joints_HingeLeadFollowerCollide(self, request, workspace, editor, launcher_platform):
+ from . import C18243586_Joints_HingeLeadFollowerCollide as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ def test_C4982803_Enable_PxMesh_Option(self, request, workspace, editor, launcher_platform):
+ from . import C4982803_Enable_PxMesh_Option as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ def test_C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain(self, request, workspace, editor, launcher_platform):
+ from . import C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain as test_module
self._run_test(request, workspace, editor, test_module)
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py
index ad8ae6481f..2b82c3e596 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py
@@ -52,11 +52,6 @@ class TestAutomation(TestAutomationBase):
from . import C4976207_PhysXRigidBodies_KinematicBehavior as test_module
self._run_test(request, workspace, editor, test_module)
- @revert_physics_config
- def test_C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies(self, request, workspace, editor, launcher_platform):
- from . import C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies as test_module
- self._run_test(request, workspace, editor, test_module)
-
@revert_physics_config
def test_C5932042_PhysXForceRegion_LinearDamping(self, request, workspace, editor, launcher_platform):
from . import C5932042_PhysXForceRegion_LinearDamping as test_module
@@ -92,11 +87,6 @@ class TestAutomation(TestAutomationBase):
from . import C4976194_RigidBody_PhysXComponentIsValid as test_module
self._run_test(request, workspace, editor, test_module)
- @revert_physics_config
- def test_C4044459_Material_DynamicFriction(self, request, workspace, editor, launcher_platform):
- from . import C4044459_Material_DynamicFriction as test_module
- self._run_test(request, workspace, editor, test_module)
-
@revert_physics_config
def test_C5932045_ForceRegion_Spline(self, request, workspace, editor, launcher_platform):
from . import C5932045_ForceRegion_Spline as test_module
@@ -208,26 +198,11 @@ class TestAutomation(TestAutomationBase):
from . import C18981526_Material_RestitutionCombinePriority as test_module
self._run_test(request, workspace, editor, test_module)
- @revert_physics_config
- def test_C15425929_Undo_Redo(self, request, workspace, editor, launcher_platform):
- from . import C15425929_Undo_Redo as test_module
- self._run_test(request, workspace, editor, test_module)
-
- @revert_physics_config
- def test_C15308217_NoCrash_LevelSwitch(self, request, workspace, editor, launcher_platform):
- from . import C15308217_NoCrash_LevelSwitch as test_module
- self._run_test(request, workspace, editor, test_module)
-
@revert_physics_config
def test_C12868580_ForceRegion_SplineModifiedTransform(self, request, workspace, editor, launcher_platform):
from . import C12868580_ForceRegion_SplineModifiedTransform as test_module
self._run_test(request, workspace, editor, test_module)
- @revert_physics_config
- def test_C4976243_Collision_SameCollisionGroupDiffCollisionLayers(self, request, workspace, editor, launcher_platform):
- from . import C4976243_Collision_SameCollisionGroupDiffCollisionLayers as test_module
- self._run_test(request, workspace, editor, test_module)
-
@revert_physics_config
def test_C12712455_ScriptCanvas_ShapeCastVerification(self, request, workspace, editor, launcher_platform):
from . import C12712455_ScriptCanvas_ShapeCastVerification as test_module
@@ -248,17 +223,6 @@ class TestAutomation(TestAutomationBase):
from . import C6131473_StaticSlice_OnDynamicSliceSpawn as test_module
self._run_test(request, workspace, editor, test_module)
- @revert_physics_config
- def test_C4982798_Collider_ColliderRotationOffset(self, request, workspace, editor, launcher_platform):
- from . import C4982798_Collider_ColliderRotationOffset as test_module
- self._run_test(request, workspace, editor, test_module)
-
- @revert_physics_config
- def test_C12712453_ScriptCanvas_MultipleRaycastNode(self, request, workspace, editor, launcher_platform):
- from . import C12712453_ScriptCanvas_MultipleRaycastNode as test_module
- # Fixme: unexpected_lines = ["Assert"] + test_module.Lines.unexpected
- self._run_test(request, workspace, editor, test_module)
-
@revert_physics_config
def test_C5959808_ForceRegion_PositionOffset(self, request, workspace, editor, launcher_platform):
from . import C5959808_ForceRegion_PositionOffset as test_module
@@ -269,11 +233,13 @@ class TestAutomation(TestAutomationBase):
from . import C18977601_Material_FrictionCombinePriority as test_module
self._run_test(request, workspace, editor, test_module)
+ @pytest.mark.xfail(
+ reason="Something with the CryRenderer disabling is causing this test to fail now.")
@revert_physics_config
def test_C13895144_Ragdoll_ChangeLevel(self, request, workspace, editor, launcher_platform):
from . import C13895144_Ragdoll_ChangeLevel as test_module
self._run_test(request, workspace, editor, test_module)
-
+
@revert_physics_config
def test_C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody(self, request, workspace, editor, launcher_platform):
from . import C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody as test_module
@@ -288,6 +254,8 @@ class TestAutomation(TestAutomationBase):
from . import C4044697_Material_PerfaceMaterialValidation as test_module
self._run_test(request, workspace, editor, test_module)
+ @pytest.mark.xfail(
+ reason="This test will sometimes fail as the ball will continue to roll before the timeout is reached.")
@revert_physics_config
def test_C4976202_RigidBody_StopsWhenBelowKineticThreshold(self, request, workspace, editor, launcher_platform):
from . import C4976202_RigidBody_StopsWhenBelowKineticThreshold as test_module
@@ -303,11 +271,6 @@ class TestAutomation(TestAutomationBase):
from . import C5296614_PhysXMaterial_ColliderShape as test_module
self._run_test(request, workspace, editor, test_module)
- @revert_physics_config
- def test_C6090547_ForceRegion_ParentChildForceRegions(self, request, workspace, editor, launcher_platform):
- from . import C6090547_ForceRegion_ParentChildForceRegions as test_module
- self._run_test(request, workspace, editor, test_module)
-
@revert_physics_config
def test_C4982595_Collider_TriggerDisablesCollision(self, request, workspace, editor, launcher_platform):
from . import C4982595_Collider_TriggerDisablesCollision as test_module
@@ -318,11 +281,6 @@ class TestAutomation(TestAutomationBase):
from . import C14976307_Gravity_SetGravityWorks as test_module
self._run_test(request, workspace, editor, test_module)
- @revert_physics_config
- def test_C14654881_CharacterController_SwitchLevels(self, request, workspace, editor, launcher_platform):
- from . import C14654881_CharacterController_SwitchLevels as test_module
- self._run_test(request, workspace, editor, test_module)
-
@revert_physics_config
def test_C15556261_PhysXMaterials_CharacterControllerMaterialAssignment(self, request, workspace, editor, launcher_platform):
from . import C15556261_PhysXMaterials_CharacterControllerMaterialAssignment as test_module
@@ -350,19 +308,19 @@ class TestAutomation(TestAutomationBase):
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
- @fm.file_override('physxsystemconfiguration.setreg','C4976245_PhysXCollider_CollisionLayerTest.setreg', 'AutomatedTesting/Registry')
+ @fm.file_override('physxsystemconfiguration.setreg','C4976245_PhysXCollider_CollisionLayerTest.setreg_override', 'AutomatedTesting/Registry')
def test_C4976245_PhysXCollider_CollisionLayerTest(self, request, workspace, editor, launcher_platform):
from . import C4976245_PhysXCollider_CollisionLayerTest as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
- @fm.file_override('physxsystemconfiguration.setreg','C4976244_Collider_SameGroupSameLayerCollision.setreg', 'AutomatedTesting/Registry')
+ @fm.file_override('physxsystemconfiguration.setreg','C4976244_Collider_SameGroupSameLayerCollision.setreg_override', 'AutomatedTesting/Registry')
def test_C4976244_Collider_SameGroupSameLayerCollision(self, request, workspace, editor, launcher_platform):
from . import C4976244_Collider_SameGroupSameLayerCollision as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
- @fm.file_override('physxdefaultsceneconfiguration.setreg','C14195074_ScriptCanvas_PostUpdateEvent.setreg', 'AutomatedTesting/Registry')
+ @fm.file_override('physxdefaultsceneconfiguration.setreg','C14195074_ScriptCanvas_PostUpdateEvent.setreg_override', 'AutomatedTesting/Registry')
def test_C14195074_ScriptCanvas_PostUpdateEvent(self, request, workspace, editor, launcher_platform):
from . import C14195074_ScriptCanvas_PostUpdateEvent as test_module
self._run_test(request, workspace, editor, test_module)
@@ -373,19 +331,7 @@ class TestAutomation(TestAutomationBase):
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
- @fm.file_override('physxsystemconfiguration.setreg','C4982593_PhysXCollider_CollisionLayer.setreg', 'AutomatedTesting/Registry')
- def test_C4982593_PhysXCollider_CollisionLayerTest(self, request, workspace, editor, launcher_platform):
- from . import C4982593_PhysXCollider_CollisionLayerTest as test_module
- self._run_test(request, workspace, editor, test_module)
-
- @revert_physics_config
- @fm.file_override('physxsystemconfiguration.setreg','C3510644_Collider_CollisionGroups.setreg', 'AutomatedTesting/Registry')
- def test_C3510644_Collider_CollisionGroups(self, request, workspace, editor, launcher_platform):
- from . import C3510644_Collider_CollisionGroups as test_module
- self._run_test(request, workspace, editor, test_module)
-
- @revert_physics_config
- @fm.file_override('physxdefaultsceneconfiguration.setreg','C14902097_ScriptCanvas_PreUpdateEvent.setreg', 'AutomatedTesting/Registry')
+ @fm.file_override('physxdefaultsceneconfiguration.setreg','C14902097_ScriptCanvas_PreUpdateEvent.setreg_override', 'AutomatedTesting/Registry')
def test_C14902097_ScriptCanvas_PreUpdateEvent(self, request, workspace, editor, launcher_platform):
from . import C14902097_ScriptCanvas_PreUpdateEvent as test_module
self._run_test(request, workspace, editor, test_module)
@@ -413,18 +359,13 @@ class TestAutomation(TestAutomationBase):
from . import C18243589_Joints_BallSoftLimitsConstrained as test_module
self._run_test(request, workspace, editor, test_module)
- @revert_physics_config
- def test_C18243586_Joints_HingeLeadFollowerCollide(self, request, workspace, editor, launcher_platform):
- from . import C18243586_Joints_HingeLeadFollowerCollide as test_module
- self._run_test(request, workspace, editor, test_module)
-
@revert_physics_config
def test_C18243591_Joints_BallLeadFollowerCollide(self, request, workspace, editor, launcher_platform):
from . import C18243591_Joints_BallLeadFollowerCollide as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
- @fm.file_override('physxsystemconfiguration.setreg','C4976227_Collider_NewGroup.setreg', 'AutomatedTesting/Registry')
+ @fm.file_override('physxsystemconfiguration.setreg','C4976227_Collider_NewGroup.setreg_override', 'AutomatedTesting/Registry')
def test_C4976227_Collider_NewGroup(self, request, workspace, editor, launcher_platform):
from . import C4976227_Collider_NewGroup as test_module
self._run_test(request, workspace, editor, test_module)
@@ -439,21 +380,11 @@ class TestAutomation(TestAutomationBase):
from . import C14861500_DefaultSetting_ColliderShape as test_module
self._run_test(request, workspace, editor, test_module)
- @revert_physics_config
- def test_C19578021_ShapeCollider_CanBeAdded(self, request, workspace, editor, launcher_platform):
- from . import C19578021_ShapeCollider_CanBeAdded as test_module
- self._run_test(request, workspace, editor, test_module)
-
@revert_physics_config
def test_C19723164_ShapeCollider_WontCrashEditor(self, request, workspace, editor, launcher_platform):
from . import C19723164_ShapeColliders_WontCrashEditor as test_module
self._run_test(request, workspace, editor, test_module)
- @revert_physics_config
- def test_C4982803_Enable_PxMesh_Option(self, request, workspace, editor, launcher_platform):
- from . import C4982803_Enable_PxMesh_Option as test_module
- self._run_test(request, workspace, editor, test_module)
-
@revert_physics_config
def test_C4982800_PhysXColliderShape_CanBeSelected(self, request, workspace, editor, launcher_platform):
from . import C4982800_PhysXColliderShape_CanBeSelected as test_module
@@ -469,10 +400,6 @@ class TestAutomation(TestAutomationBase):
from . import C4982802_PhysXColliderShape_CanBeSelected as test_module
self._run_test(request, workspace, editor, test_module)
- def test_C17411467_AddPhysxRagdollComponent(self, request, workspace, editor, launcher_platform):
- from . import C17411467_AddPhysxRagdollComponent as test_module
- self._run_test(request, workspace, editor, test_module)
-
def test_C12905528_ForceRegion_WithNonTriggerCollider(self, request, workspace, editor, launcher_platform):
from . import C12905528_ForceRegion_WithNonTriggerCollider as test_module
# Fixme: expected_lines = ["[Warning] (PhysX Force Region) - Please ensure collider component marked as trigger exists in entity"]
@@ -502,6 +429,8 @@ class TestAutomation(TestAutomationBase):
from . import C4976236_AddPhysxColliderComponent as test_module
self._run_test(request, workspace, editor, test_module)
+ @pytest.mark.xfail(
+ reason="This will fail due to this issue ATOM-15487.")
def test_C14861502_PhysXCollider_AssetAutoAssigned(self, request, workspace, editor, launcher_platform):
from . import C14861502_PhysXCollider_AssetAutoAssigned as test_module
self._run_test(request, workspace, editor, test_module)
@@ -520,4 +449,35 @@ class TestAutomation(TestAutomationBase):
def test_C100000_RigidBody_EnablingGravityWorksPoC(self, request, workspace, editor, launcher_platform):
from . import C100000_RigidBody_EnablingGravityWorksPoC as test_module
- self._run_test(request, workspace, editor, test_module)
\ No newline at end of file
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ @fm.file_override('physxsystemconfiguration.setreg','C3510644_Collider_CollisionGroups.setreg_override', 'AutomatedTesting/Registry')
+ def test_C3510644_Collider_CollisionGroups(self, request, workspace, editor, launcher_platform):
+ from . import C3510644_Collider_CollisionGroups as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ def test_C4982798_Collider_ColliderRotationOffset(self, request, workspace, editor, launcher_platform):
+ from . import C4982798_Collider_ColliderRotationOffset as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ def test_C15308217_NoCrash_LevelSwitch(self, request, workspace, editor, launcher_platform):
+ from . import C15308217_NoCrash_LevelSwitch as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ def test_C6090547_ForceRegion_ParentChildForceRegions(self, request, workspace, editor, launcher_platform):
+ from . import C6090547_ForceRegion_ParentChildForceRegions as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ def test_C19578021_ShapeCollider_CanBeAdded(self, request, workspace, editor, launcher_platform):
+ from . import C19578021_ShapeCollider_CanBeAdded as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @revert_physics_config
+ def test_C15425929_Undo_Redo(self, request, workspace, editor, launcher_platform):
+ from . import C15425929_Undo_Redo as test_module
+ self._run_test(request, workspace, editor, test_module)
diff --git a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py
index 39bc4c8188..e829726ba9 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py
@@ -1,49 +1,49 @@
-"""
-All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-its licensors.
-
-For complete copyright and license terms please see the LICENSE at the root of this
-distribution (the "License"). All use of this software is governed by the License,
-or, if provided, by the license below or the license accompanying this file. Do not
-remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-
-"""
-
-# This suite consists of all test cases that are passing and have been verified.
-
-import pytest
-import os
-import sys
-
-from .FileManagement import FileManagement as fm
-from ly_test_tools import LAUNCHERS
-
-sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared')
-
-from base import TestAutomationBase
-
-
-revert_physics_config = fm.file_revert_list(['physxdebugconfiguration.setreg', 'physxdefaultsceneconfiguration.setreg', 'physxsystemconfiguration.setreg'], 'AutomatedTesting/Registry')
-
-
-@pytest.mark.SUITE_sandbox
-@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
-@pytest.mark.parametrize("project", ["AutomatedTesting"])
-class TestAutomation(TestAutomationBase):
-
- ## Seems to be flaky, need to investigate
- def test_C19536274_GetCollisionName_PrintsName(self, request, workspace, editor, launcher_platform):
- from . import C19536274_GetCollisionName_PrintsName as test_module
- # Fixme: expected_lines=["Layer Name: Right"]
- self._run_test(request, workspace, editor, test_module)
-
- ## Seems to be flaky, need to investigate
- def test_C19536277_GetCollisionName_PrintsNothing(self, request, workspace, editor, launcher_platform):
- from . import C19536277_GetCollisionName_PrintsNothing as test_module
- # All groups present in the PhysX Collider that could show up in test
- # Fixme: collision_groups = ["All", "None", "All_NoTouchBend", "All_3", "None_1", "All_NoTouchBend_1", "All_2", "None_1_1", "All_NoTouchBend_1_1", "All_1", "None_1_1_1", "All_NoTouchBend_1_1_1", "All_4", "None_1_1_1_1", "All_NoTouchBend_1_1_1_1", "GroupLeft", "GroupRight"]
- # Fixme: for group in collision_groups:
- # Fixme: unexpected_lines.append(f"GroupName: {group}")
- # Fixme: expected_lines=["GroupName: "]
- self._run_test(request, workspace, editor, test_module)
\ No newline at end of file
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+"""
+
+# This suite consists of all test cases that are passing and have been verified.
+
+import pytest
+import os
+import sys
+
+from .FileManagement import FileManagement as fm
+from ly_test_tools import LAUNCHERS
+
+sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared')
+
+from base import TestAutomationBase
+
+
+revert_physics_config = fm.file_revert_list(['physxdebugconfiguration.setreg', 'physxdefaultsceneconfiguration.setreg', 'physxsystemconfiguration.setreg'], 'AutomatedTesting/Registry')
+
+
+@pytest.mark.SUITE_sandbox
+@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
+@pytest.mark.parametrize("project", ["AutomatedTesting"])
+class TestAutomation(TestAutomationBase):
+
+ ## Seems to be flaky, need to investigate
+ def test_C19536274_GetCollisionName_PrintsName(self, request, workspace, editor, launcher_platform):
+ from . import C19536274_GetCollisionName_PrintsName as test_module
+ # Fixme: expected_lines=["Layer Name: Right"]
+ self._run_test(request, workspace, editor, test_module)
+
+ ## Seems to be flaky, need to investigate
+ def test_C19536277_GetCollisionName_PrintsNothing(self, request, workspace, editor, launcher_platform):
+ from . import C19536277_GetCollisionName_PrintsNothing as test_module
+ # All groups present in the PhysX Collider that could show up in test
+ # Fixme: collision_groups = ["All", "None", "All_NoTouchBend", "All_3", "None_1", "All_NoTouchBend_1", "All_2", "None_1_1", "All_NoTouchBend_1_1", "All_1", "None_1_1_1", "All_NoTouchBend_1_1_1", "All_4", "None_1_1_1_1", "All_NoTouchBend_1_1_1_1", "GroupLeft", "GroupRight"]
+ # Fixme: for group in collision_groups:
+ # Fixme: unexpected_lines.append(f"GroupName: {group}")
+ # Fixme: expected_lines=["GroupName: "]
+ self._run_test(request, workspace, editor, test_module)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/AssetEditor_CreateScriptEventFile.py b/AutomatedTesting/Gem/PythonTests/scripting/AssetEditor_CreateScriptEventFile.py
new file mode 100644
index 0000000000..dcbbf47f0c
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/AssetEditor_CreateScriptEventFile.py
@@ -0,0 +1,124 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Test case ID: T92569013
+Test Case Title: Script Event file can be created
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92569013
+"""
+
+
+# fmt: off
+class Tests():
+ new_event_created = ("New Script Event created", "New Script Event not created")
+ child_event_created = ("Child Event created", "Child not created")
+ file_saved = ("Script event file saved", "Script event file did not save")
+ console_error = ("No unexpected error in console", "Error found in console")
+ console_warning = ("No unexpected warning in console", "Warning found in console")
+# fmt: on
+
+
+def CreateScriptEventFile():
+ """
+ Summary:
+ Script Event file can be created
+
+ Expected Behavior:
+ File is created without any errors and warnings in Console
+
+ Test Steps:
+ 1) Open Asset Editor
+ 2) Get Asset Editor Qt object
+ 3) Create new Script Event Asset
+ 4) Add new child event
+ 5) Save the Script Event file
+ 6) Verify if file is created
+ 7) Verify console for errors/warnings
+ 8) Close Asset Editor
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+ import os
+ from utils import Report
+ from utils import TestHelper as helper
+ from utils import Tracer
+ import pyside_utils
+
+ # Open 3D Engine imports
+ import azlmbr.legacy.general as general
+ import azlmbr.editor as editor
+ import azlmbr.bus as bus
+
+ # Pyside imports
+ from PySide2 import QtWidgets
+
+ GENERAL_WAIT = 1.0 # seconds
+
+ FILE_PATH = os.path.join("AutomatedTesting", "ScriptCanvas", "test_file.scriptevent")
+
+ # 1) Open Asset Editor
+ general.idle_enable(True)
+ # Initially close the Asset Editor and then reopen to ensure we don't have any existing assets open
+ general.close_pane("Asset Editor")
+ general.open_pane("Asset Editor")
+ helper.wait_for_condition(lambda: general.is_pane_visible("Asset Editor"), 5.0)
+
+ # 2) Get Asset Editor Qt object
+ editor_window = pyside_utils.get_editor_main_window()
+ asset_editor_widget = editor_window.findChild(QtWidgets.QDockWidget, "Asset Editor").findChild(
+ QtWidgets.QWidget, "AssetEditorWindowClass"
+ )
+ container = asset_editor_widget.findChild(QtWidgets.QWidget, "ContainerForRows")
+ menu_bar = asset_editor_widget.findChild(QtWidgets.QMenuBar)
+
+ # 3) Create new Script Event Asset
+ action = pyside_utils.find_child_by_pattern(menu_bar, {"type": QtWidgets.QAction, "text": "Script Events"})
+ action.trigger()
+ result = helper.wait_for_condition(
+ lambda: container.findChild(QtWidgets.QFrame, "Events") is not None, 3 * GENERAL_WAIT
+ )
+ Report.result(Tests.new_event_created, result)
+
+ # 4) Add new child event
+ add_event = container.findChild(QtWidgets.QFrame, "Events").findChild(QtWidgets.QToolButton, "")
+ add_event.click()
+ result = helper.wait_for_condition(
+ lambda: asset_editor_widget.findChild(QtWidgets.QFrame, "EventName") is not None, GENERAL_WAIT
+ )
+ Report.result(Tests.child_event_created, result)
+
+ with Tracer() as section_tracer:
+ # 5) Save the Script Event file
+ editor.AssetEditorWidgetRequestsBus(bus.Broadcast, "SaveAssetAs", FILE_PATH)
+
+ # 6) Verify if file is created
+ result = helper.wait_for_condition(lambda: os.path.exists(FILE_PATH), 3 * GENERAL_WAIT)
+ Report.result(Tests.file_saved, result)
+
+ # 7) Verify console for errors/warnings
+ Report.result(Tests.console_error, not section_tracer.has_errors)
+ Report.result(Tests.console_warning, not section_tracer.has_warnings)
+
+ # 8) Close Asset Editor
+ general.close_pane("Asset Editor")
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+
+ from utils import Report
+
+ Report.start_test(CreateScriptEventFile)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/AssetEditor_NewScriptEvent.py b/AutomatedTesting/Gem/PythonTests/scripting/AssetEditor_NewScriptEvent.py
new file mode 100644
index 0000000000..1f801d4eeb
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/AssetEditor_NewScriptEvent.py
@@ -0,0 +1,129 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+
+Test case ID: T92568942
+Test Case Title: Clicking the "+" button and selecting "New Script Event" opens the
+Asset Editor with a new Script Event asset
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92568942
+"""
+
+from PySide2 import QtWidgets
+import azlmbr.legacy.general as general
+
+import editor_python_test_tools.pyside_utils as pyside_utils
+from editor_python_test_tools.utils import TestHelper as helper
+from editor_python_test_tools.utils import Report
+
+
+class Tests:
+ action_found = "New Script event action found"
+ asset_editor_opened = "Asset Editor opened"
+ new_asset = "Asset Editor created with new asset"
+ script_event = "New Script event created in Asset Editor"
+
+
+GENERAL_WAIT = 0.5 # seconds
+
+
+class TestAssetEditor_NewScriptEvent:
+ """
+ Summary:
+ Clicking the "+" button in Node Palette and creating New Script Event opens Asset Editor
+
+ Expected Behavior:
+ Clicking the "+" button and selecting "New Script Event" opens the Asset Editor with a
+ new Script Event asset
+
+ Test Steps:
+ 1) Open Script Canvas window (Tools > Script Canvas)
+ 2) Close any existing AssetEditor window
+ 3) Get the SC window object
+ 4) Click on New Script Event on Node palette
+ 5) Verify if Asset Editor opened
+ 6) Verify if a new asset with Script Canvas category is opened
+ 7) Close Script Canvas and Asset Editor
+
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ @pyside_utils.wrap_async
+ async def run_test(self):
+ # 1) Open Script Canvas window (Tools > Script Canvas)
+ general.idle_enable(True)
+ general.open_pane("Script Canvas")
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
+
+ # 2) Close any existing AssetEditor window
+ general.close_pane("Asset Editor")
+ helper.wait_for_condition(lambda: not general.is_pane_visible("Asset Editor"), 5.0)
+
+ # 3) Get the SC window object
+ editor_window = pyside_utils.get_editor_main_window()
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+ node_palette = sc.findChild(QtWidgets.QDockWidget, "NodePalette")
+ frame = node_palette.findChild(QtWidgets.QFrame, "searchCustomization")
+ button = frame.findChild(QtWidgets.QToolButton)
+ pyside_utils.click_button_async(button)
+
+ # 4) Click on New Script Event on Node palette
+ menu = None
+
+ def menu_has_focus():
+ nonlocal menu
+ for fw in [
+ QtWidgets.QApplication.activePopupWidget(),
+ QtWidgets.QApplication.activeModalWidget(),
+ QtWidgets.QApplication.focusWidget(),
+ QtWidgets.QApplication.activeWindow(),
+ ]:
+ print(fw)
+ if fw and isinstance(fw, QtWidgets.QMenu) and fw.isVisible():
+ menu = fw
+ return True
+ return False
+
+ await pyside_utils.wait_for_condition(menu_has_focus, GENERAL_WAIT)
+ action = await pyside_utils.wait_for_action_in_menu(menu, {"text": "New Script Event"})
+ Report.info(f"{Tests.action_found}: {action is not None}")
+ action.trigger()
+ pyside_utils.queue_hide_event(menu)
+
+ # 5) Verify if Asset Editor opened
+ result = helper.wait_for_condition(lambda: general.is_pane_visible("Asset Editor"), GENERAL_WAIT)
+ Report.info(f"{Tests.asset_editor_opened}: {result}")
+
+ # 6) Verify if a new asset with Script Canvas category is opened
+ asset_editor = editor_window.findChild(QtWidgets.QDockWidget, "Asset Editor")
+ row_container = asset_editor.findChild(QtWidgets.QWidget, "ContainerForRows")
+ # NOTE: QWidget ContainerForRows will have frames of Name, Category, ToolTip etc.
+ # To validate if a new script event file is generated, we check for
+ # QFrame Category and its value
+ categories = row_container.findChildren(QtWidgets.QFrame, "Category")
+ Report.info(f"{Tests.new_asset}: {len(categories)>0}")
+ result = False
+ for frame in categories:
+ line_edit = frame.findChild(QtWidgets.QLineEdit)
+ result = True if (line_edit and line_edit.text() == "Script Events") else False
+ Report.info(f"{Tests.script_event}: {result}")
+
+ # 7) Close Script Canvas and Asset Editor
+ general.close_pane("Script Canvas")
+ general.close_pane("Asset Editor")
+
+
+test = TestAssetEditor_NewScriptEvent()
+test.run_test()
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Debugging_TargetMultipleEntities.py b/AutomatedTesting/Gem/PythonTests/scripting/Debugging_TargetMultipleEntities.py
new file mode 100644
index 0000000000..a26cb4f923
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Debugging_TargetMultipleEntities.py
@@ -0,0 +1,144 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+
+Test case ID: T92568856
+Test Case Title: Multiple Entities can be targeted in the Debugger tool
+URLs of the test case: https://testrail.agscollab.com/index.php?/tests/view/92568856
+"""
+
+
+# fmt: off
+class Tests():
+ level_created = ("New level created", "New level not created")
+ entities_found = ("Entities are found in Logging window", "Entities are not found in Logging window")
+ select_multiple_targets = ("Multiple targets are selected", "Multiple targets are not selected")
+# fmt: on
+
+
+GENERAL_WAIT = 0.5 # seconds
+
+
+def Debugging_TargetMultipleEntities():
+ """
+ Summary:
+ Multiple Entities can be targeted in the Debugger tool
+
+ Expected Behavior:
+ Selected files can be checked for logging.
+ Upon checking, checkboxes of the parent folders change to either full or partial check.
+
+ Test Steps:
+ 1) Create temp level
+ 2) Create two entities with scriptcanvas components
+ 3) Set values for scriptcanvas
+ 4) Open Script Canvas window and get sc opbject
+ 5) Open Debugging(Logging) window
+ 6) Click on Entities tab in logging window
+ 7) Verify if the scriptcanvas exist under entities
+ 8) Verify if the entities can be selected
+ 9) Close Debugging window and Script Canvas window
+
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ from PySide2 import QtWidgets
+ from PySide2.QtCore import Qt
+ import azlmbr.legacy.general as general
+ import azlmbr.math as math
+ import azlmbr.asset as asset
+ import azlmbr.bus as bus
+
+ import os
+ import pyside_utils
+ import hydra_editor_utils as hydra
+ from utils import TestHelper as helper
+ from utils import Report
+
+ LEVEL_NAME = "tmp_level"
+ ASSET_NAME_1 = "ScriptCanvas_TwoComponents0.scriptcanvas"
+ ASSET_NAME_2 = "ScriptCanvas_TwoComponents1.scriptcanvas"
+ ASSET_1 = os.path.join("scriptcanvas", ASSET_NAME_1)
+ ASSET_2 = os.path.join("scriptcanvas", ASSET_NAME_2)
+ WAIT_TIME = 3.0
+
+ def get_asset(asset_path):
+ return asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", asset_path, math.Uuid(), False)
+
+ # 1) Create temp level
+ general.idle_enable(True)
+ result = general.create_level_no_prompt(LEVEL_NAME, 128, 1, 512, True)
+ Report.critical_result(Tests.level_created, result == 0)
+ helper.wait_for_condition(lambda: general.get_current_level_name() == LEVEL_NAME, WAIT_TIME)
+ general.close_pane("Error Report")
+
+ # 2) Create two entities with scriptcanvas components
+ position = math.Vector3(512.0, 512.0, 32.0)
+ test_entity_1 = hydra.Entity("test_entity_1")
+ test_entity_1.create_entity(position, ["Script Canvas"])
+ test_entity_2 = hydra.Entity("test_entity_2")
+ test_entity_2.create_entity(position, ["Script Canvas"])
+
+ # 3) Set values for scriptcanvas
+ test_entity_1.get_set_test(0, "Script Canvas Asset|Script Canvas Asset", get_asset(ASSET_1))
+ test_entity_2.get_set_test(0, "Script Canvas Asset|Script Canvas Asset", get_asset(ASSET_2))
+
+ # 4) Open Script Canvas window and get sc opbject
+ general.open_pane("Script Canvas")
+ editor_window = pyside_utils.get_editor_main_window()
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+
+ # 5) Open Debugging(Logging) window
+ if (
+ sc.findChild(QtWidgets.QDockWidget, "LoggingWindow") is None
+ or not sc.findChild(QtWidgets.QDockWidget, "LoggingWindow").isVisible()
+ ):
+ action = pyside_utils.find_child_by_pattern(sc, {"text": "Debugging", "type": QtWidgets.QAction})
+ action.trigger()
+ logging_window = sc.findChild(QtWidgets.QDockWidget, "LoggingWindow")
+
+ # 6) Click on Entities tab in logging window
+ button = pyside_utils.find_child_by_pattern(logging_window, {"type": QtWidgets.QPushButton, "text": "Entities"})
+ button.click()
+
+ # 7) Verify if the scriptcanvas exist under entities
+ entities = logging_window.findChild(QtWidgets.QWidget, "entitiesPage")
+ tree = entities.findChild(QtWidgets.QTreeView, "pivotTreeView")
+ asset_1_mi = pyside_utils.find_child_by_pattern(tree, ASSET_NAME_1.lower())
+ asset_2_mi = pyside_utils.find_child_by_pattern(tree, ASSET_NAME_2.lower())
+ result = asset_1_mi is not None and asset_2_mi is not None
+ Report.critical_result(Tests.entities_found, result)
+
+ # 8) Verify if the entities can be selected
+ tree.expandAll()
+ tree.model().setData(asset_1_mi, 2, Qt.CheckStateRole)
+ tree.model().setData(asset_2_mi, 2, Qt.CheckStateRole)
+ checklist = [asset_1_mi, asset_1_mi.parent(), asset_2_mi, asset_2_mi.parent()]
+ result = all([index.data(Qt.CheckStateRole) == 2 for index in checklist])
+ Report.critical_result(Tests.select_multiple_targets, result)
+
+ # 9) Close Debugging window and Script Canvas window
+ logging_window.close()
+ general.close_pane("Script Canvas")
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+ from utils import Report
+
+ Report.start_test(Debugging_TargetMultipleEntities)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Debugging_TargetMultipleGraphs.py b/AutomatedTesting/Gem/PythonTests/scripting/Debugging_TargetMultipleGraphs.py
new file mode 100644
index 0000000000..4aa5c822a7
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Debugging_TargetMultipleGraphs.py
@@ -0,0 +1,113 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+
+Test case ID: T92569137
+Test Case Title: Multiple Graphs can be targeted in the Debugger tool
+URLs of the test case: https://testrail.agscollab.com/index.php?/tests/view/92569137
+"""
+
+
+# fmt: off
+class Tests():
+ select_multiple_targets = ("Multiple targets are selected", "Multiple targets are not selected")
+# fmt: on
+
+
+GENERAL_WAIT = 0.5 # seconds
+
+
+def Debugging_TargetMultipleGraphs():
+ """
+ Summary:
+ Multiple Graphs can be targeted in the Debugger tool
+
+ Expected Behavior:
+ Selected files can be checked for logging.
+ Upon checking, checkboxes of the parent folders change to either full or partial check.
+
+ Test Steps:
+ 1) Open Script Canvas window (Tools > Script Canvas)
+ 2) Get the SC window object
+ 3) Open Debugging Tool if not opened already
+ 4) Select Graphs tab under logging window
+ 5) Select multiple targets from levels and scriptcanvas
+ 6) Verify if multiple targets are selected
+ 7) Close Debugging window and Script Canvas window
+
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ from PySide2 import QtWidgets
+ from PySide2.QtCore import Qt
+ import azlmbr.legacy.general as general
+
+ import pyside_utils
+ from utils import TestHelper as helper
+ from utils import Report
+
+ # 1) Open Script Canvas window (Tools > Script Canvas)
+ general.idle_enable(True)
+ general.open_pane("Script Canvas")
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 6.0)
+
+ # 2) Get the SC window object
+ editor_window = pyside_utils.get_editor_main_window()
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+
+ # 3) Open Debugging Tool if not opened already
+ if (
+ sc.findChild(QtWidgets.QDockWidget, "LoggingWindow") is None
+ or not sc.findChild(QtWidgets.QDockWidget, "LoggingWindow").isVisible()
+ ):
+ action = pyside_utils.find_child_by_pattern(sc, {"text": "Debugging", "type": QtWidgets.QAction})
+ action.trigger()
+ logging_window = sc.findChild(QtWidgets.QDockWidget, "LoggingWindow")
+
+ # 4) Select Graphs tab under logging window
+ button = pyside_utils.find_child_by_pattern(logging_window, {"type": QtWidgets.QPushButton, "text": "Graphs"})
+ button.click()
+
+ # 5) Select multiple targets from levels and scriptcanvas
+ graphs = logging_window.findChild(QtWidgets.QWidget, "graphsPage")
+ tree = graphs.findChild(QtWidgets.QTreeView, "pivotTreeView")
+ # Select the first child under levels
+ level_model_index = pyside_utils.find_child_by_pattern(tree, "levels")
+ level_child_index = pyside_utils.get_item_view_index(tree, 0, 0, level_model_index)
+ tree.model().setData(level_child_index, 2, Qt.CheckStateRole)
+ # Select the first child under scriptcanvas
+ sc_model_index = pyside_utils.find_child_by_pattern(tree, "scriptcanvas")
+ sc_child_index = pyside_utils.get_item_view_index(tree, 0, 0, sc_model_index)
+ tree.model().setData(sc_child_index, 2, Qt.CheckStateRole)
+
+ # 6) Verify if multiple targets are selected
+ result = all([index.data(Qt.CheckStateRole) != 0 for index in (level_model_index, sc_model_index)])
+ result = result and all([index.data(Qt.CheckStateRole) == 2 for index in (level_child_index, sc_child_index)])
+ Report.result(Tests.select_multiple_targets, result)
+
+ # 7) Close Debugging window and Script Canvas window
+ logging_window.close()
+ general.close_pane("Script Canvas")
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+
+ from utils import Report
+
+ Report.start_test(Debugging_TargetMultipleGraphs)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Docking_Pane.py b/AutomatedTesting/Gem/PythonTests/scripting/Docking_Pane.py
index 25dd83e5e2..4fa1e1257f 100755
--- a/AutomatedTesting/Gem/PythonTests/scripting/Docking_Pane.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Docking_Pane.py
@@ -16,7 +16,6 @@ URLs of the test case: https://testrail.agscollab.com/index.php?/cases/view/1702
# fmt: off
class Tests():
- open_sc_window = ("Script Canvas window is opened", "Failed to open Script Canvas window")
pane_opened = ("Pane is opened successfully", "Failed to open pane")
dock_pane = ("Pane is docked successfully", "Failed to dock Pane into one or more allowed area")
# fmt: on
@@ -78,8 +77,7 @@ def Docking_Pane():
# 1) Open Script Canvas window (Tools > Script Canvas)
general.open_pane("Script Canvas")
- is_sc_visible = helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
- Report.result(Tests.open_sc_window, is_sc_visible)
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
# 2) Make sure Node Palette pane is opened
editor_window = pyside_utils.get_editor_main_window()
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/EditMenu_UndoRedo.py b/AutomatedTesting/Gem/PythonTests/scripting/EditMenu_UndoRedo.py
new file mode 100644
index 0000000000..a87d9e9be9
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/EditMenu_UndoRedo.py
@@ -0,0 +1,123 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+
+Test case ID: T92569049
+Test Case Title: Edit > Undo undoes the last action
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92569049
+Test case ID: T92569051
+Test Case Title: Edit > Redo redoes the last undone action
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92569051
+"""
+
+
+# fmt: off
+class Tests():
+ variable_created = ("New variable created", "New variable not created")
+ undo_worked = ("Undo action working", "Undo action did not work")
+ redo_worked = ("Redo action working", "Redo action did not work")
+# fmt: on
+
+
+def EditMenu_UndoRedo():
+ """
+ Summary:
+ Edit > Undo undoes the last action
+ Edit > Redo redoes the last undone action
+ We create a new variable in variable manager, undo and verify if variable is removed,
+ redo it and verify if the variable is created again.
+
+ Expected Behavior:
+ The last action is undone.
+ The last undone action is redone.
+
+ Test Steps:
+ 1) Open Script Canvas window (Tools > Script Canvas)
+ 2) Get the SC window object
+ 3) Open Variable Manager if not opened already
+ 4) Create Graph
+ 5) Create new variable
+ 6) Verify if the variable is created initially
+ 7) Trigger Undo action and verify if variable is removed in Variable Manager
+ 8) Trigger Redo action and verify if variable is readded in Variable Manager
+ 9) Close SC window
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ from PySide2 import QtWidgets, QtCore
+
+ import azlmbr.legacy.general as general
+
+ import pyside_utils
+
+ # 1) Open Script Canvas window
+ general.idle_enable(True)
+ general.open_pane("Script Canvas")
+
+ # 2) Get the SC window object
+ editor_window = pyside_utils.get_editor_main_window()
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+
+ # 3) Open Variable Manager if not opened already
+ if sc.findChild(QtWidgets.QDockWidget, "VariableManager") is None:
+ action = pyside_utils.find_child_by_pattern(sc, {"text": "Variable Manager", "type": QtWidgets.QAction})
+ action.trigger()
+ variable_manager = sc.findChild(QtWidgets.QDockWidget, "VariableManager")
+
+ # 4) Create Graph
+ action = pyside_utils.find_child_by_pattern(sc, {"objectName": "action_New_Script", "type": QtWidgets.QAction})
+ action.trigger()
+
+ # 5) Create new variable
+ add_button = variable_manager.findChild(QtWidgets.QPushButton, "addButton")
+ add_button.click() # Click on Create Variable button
+ # Select variable type
+ table_view = variable_manager.findChild(QtWidgets.QTableView, "variablePalette")
+ model_index = pyside_utils.find_child_by_pattern(table_view, "Boolean")
+ # Click on it to create variable
+ pyside_utils.item_view_index_mouse_click(table_view, model_index)
+
+ # 6) Verify if the variable is created initially
+ graph_vars = variable_manager.findChild(QtWidgets.QTableView, "graphVariables")
+ result = graph_vars.model().rowCount(QtCore.QModelIndex()) == 1 # since we added 1 variable, rowcount=1
+ Report.result(Tests.variable_created, result)
+
+ # 7) Trigger Undo action and verify if variable is removed in Variable Manager
+ action = sc.findChild(QtWidgets.QAction, "action_Undo")
+ action.trigger()
+ result = graph_vars.model().rowCount(QtCore.QModelIndex()) == 0 # since we triggered undo, rowcount=0
+ Report.result(Tests.undo_worked, result)
+
+ # 8) Trigger Redo action and verify if variable is readded in Variable Manager
+ action = sc.findChild(QtWidgets.QAction, "action_Redo")
+ action.trigger()
+ result = (
+ graph_vars.model().rowCount(QtCore.QModelIndex()) == 1
+ ) # since action is redone 1 variable is readded, rowcount=1
+ Report.result(Tests.redo_worked, result)
+
+ # 9) Close SC window
+ general.close_pane("Script Canvas")
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+
+ from utils import Report
+
+ Report.start_test(EditMenu_UndoRedo)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Entity_AddScriptCanvasComponent.py b/AutomatedTesting/Gem/PythonTests/scripting/Entity_AddScriptCanvasComponent.py
new file mode 100644
index 0000000000..fd8e9b1173
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Entity_AddScriptCanvasComponent.py
@@ -0,0 +1,88 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Test case ID: T92562978
+Test Case Title: Script Canvas Component can be added to an entity
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92562978
+"""
+
+
+# fmt: off
+class Tests():
+ level_created = ("New level created", "Failed to create new level")
+ entity_created = ("Test Entity created", "Failed to create test entity")
+ add_sc_component = ("Script Canvas component added to entity", "Failed to add SC component to entity")
+ no_errors_found = ("Tracer found no errors", "One or more errors found by Tracer")
+ no_warnings_found = ("Tracer found no warnings", "One or more warnings found by Tracer")
+# fmt: on
+
+
+def Entity_AddScriptCanvasComponent():
+ """
+ Summary:
+ verify if Script Canvas component can be added to Entity without any issue
+
+ Expected Behavior:
+ Script Canvas Component is added to the entity successfully without issue.
+
+ Test Steps:
+ 1) Create temp level
+ 2) Create test entity
+ 3) Start Tracer
+ 4) Add Script Canvas component to test entity
+ 5) Search for errors and warnings
+
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ from utils import TestHelper as helper
+ from utils import Tracer
+ from editor_entity_utils import EditorEntity
+ import azlmbr.legacy.general as general
+
+ LEVEL_NAME = "tmp_level"
+ WAIT_TIME = 3.0 # SECONDS
+
+ # 1) Create temp level
+ general.idle_enable(True)
+ result = general.create_level_no_prompt(LEVEL_NAME, 128, 1, 512, True)
+ Report.critical_result(Tests.level_created, result == 0)
+ helper.wait_for_condition(lambda: general.get_current_level_name() == LEVEL_NAME, WAIT_TIME)
+ general.close_pane("Error Report")
+
+ # 2) Create new entity
+ test_entity = EditorEntity.create_editor_entity("test_entity")
+ Report.result(Tests.entity_created, test_entity.id.IsValid())
+
+ # 3) Start Tracer
+ with Tracer() as section_tracer:
+
+ # 4) Add Script Canvas component to test entity
+ test_entity.add_component("Script Canvas")
+ Report.result(Tests.add_sc_component, test_entity.has_component("Script Canvas"))
+
+ # 5) Search for errors and warnings
+ Report.result(Tests.no_errors_found, not section_tracer.has_errors)
+ Report.result(Tests.no_warnings_found, not section_tracer.has_warnings)
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+ from utils import Report
+
+ Report.start_test(Entity_AddScriptCanvasComponent)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/FileMenu_New_Open.py b/AutomatedTesting/Gem/PythonTests/scripting/FileMenu_New_Open.py
new file mode 100644
index 0000000000..f72ac8ea01
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/FileMenu_New_Open.py
@@ -0,0 +1,98 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+
+Test case ID: T92569037
+Test Case Title: File > New Script creates a new script
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92569037
+Test case ID: T92569039
+Test Case Title: File > Open opens the Open... dialog
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92569039
+"""
+
+import os
+import sys
+from PySide2 import QtWidgets
+import azlmbr.legacy.general as general
+
+import editor_python_test_tools.pyside_utils as pyside_utils
+from editor_python_test_tools.utils import Report
+
+# fmt: off
+class Tests():
+ new_action = "File->New action working as expected"
+ open_action = "File->Open action working as expected"
+# fmt: on
+
+
+GENERAL_WAIT = 0.5 # seconds
+
+
+class TestFileMenuNewOpen:
+ """
+ Summary:
+ When clicked on File->New, new script opens and File->Open should open the FileBrowser
+
+ Expected Behavior:
+ New and Open actions should work as expected.
+
+ Test Steps:
+ 1) Open Script Canvas window (Tools > Script Canvas)
+ 2) Get the SC window object
+ 3) Trigger File->New action
+ 4) Verify if New tab is opened
+ 5) Trigger File->Open action
+ 6) Close Script Canvas window
+
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ @pyside_utils.wrap_async
+ async def run_test(self):
+ # 1) Open Script Canvas window (Tools > Script Canvas)
+ general.open_pane("Script Canvas")
+
+ # 2) Get the SC window object
+ editor_window = pyside_utils.get_editor_main_window()
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+ sc_main = sc.findChild(QtWidgets.QMainWindow)
+ sc_tabs = sc_main.findChild(QtWidgets.QTabWidget, "ScriptCanvasTabs")
+
+ # 3) Trigger File->New action
+ initial_tabs_count = sc_tabs.count()
+ action = pyside_utils.find_child_by_pattern(
+ sc_main, {"objectName": "action_New_Script", "type": QtWidgets.QAction}
+ )
+ action.trigger()
+
+ # 4) Verify if New tab is opened
+ general.idle_wait(GENERAL_WAIT)
+ Report.info(f"{Tests.new_action}: {sc_tabs.count() == initial_tabs_count + 1}")
+
+ # 5) Trigger File->Open action
+ action = pyside_utils.find_child_by_pattern(sc_main, {"objectName": "action_Open", "type": QtWidgets.QAction})
+ pyside_utils.trigger_action_async(action)
+ general.idle_wait(GENERAL_WAIT)
+ popup = await pyside_utils.wait_for_modal_widget()
+ Report.info(f"{Tests.open_action}: {popup and 'Open' in popup.windowTitle()}")
+ popup.close()
+
+ # 6) Close Script Canvas window
+ general.close_pane("Script Canvas")
+
+
+test = TestFileMenuNewOpen()
+test.run_test()
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/GraphClose_SavePrompt.py b/AutomatedTesting/Gem/PythonTests/scripting/GraphClose_SavePrompt.py
new file mode 100644
index 0000000000..ce610b159b
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/GraphClose_SavePrompt.py
@@ -0,0 +1,110 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+
+Test case ID: T92563070
+Test Case Title: Graphs can be closed by clicking X on the Graph name tab
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92563070
+Test case ID: T92563068
+Test Case Title: Save Prompt: User is prompted to save a graph on close after
+creating a new graph
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92563068
+"""
+
+import os
+import sys
+from PySide2 import QtWidgets
+import azlmbr.legacy.general as general
+
+import editor_python_test_tools.pyside_utils as pyside_utils
+from editor_python_test_tools.utils import TestHelper as helper
+from editor_python_test_tools.utils import Report
+
+# fmt: off
+class Tests():
+ new_graph = "New graph created"
+ save_prompt = "Save prompt opened as expected"
+ close_graph = "Close button worked as expected"
+# fmt: on
+
+
+GENERAL_WAIT = 0.5 # seconds
+
+
+class TestGraphCloseSavePrompt:
+ """
+ Summary:
+ The graph is closed when x button is clicked.
+ Save Prompt is opened before closing.
+
+ Expected Behavior:
+ New and Open actions should work as expected.
+
+ Test Steps:
+ 1) Open Script Canvas window (Tools > Script Canvas)
+ 2) Get the SC window object
+ 3) Trigger File->New action
+ 4) Verify if New tab is opened
+ 5) Close new tab using X on top of graph and check for save dialog
+ 6) Check if tab is closed
+ 7) Close Script Canvas window
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ @pyside_utils.wrap_async
+ async def run_test(self):
+ # 1) Open Script Canvas window (Tools > Script Canvas)
+ general.idle_enable(True)
+ general.open_pane("Script Canvas")
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
+
+ # 2) Get the SC window object
+ editor_window = pyside_utils.get_editor_main_window()
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+ sc_main = sc.findChild(QtWidgets.QMainWindow)
+ sc_tabs = sc_main.findChild(QtWidgets.QTabWidget, "ScriptCanvasTabs")
+ tab_bar = sc_tabs.findChild(QtWidgets.QTabBar)
+
+ # 3) Trigger File->New action
+ initial_tabs_count = sc_tabs.count()
+ action = pyside_utils.find_child_by_pattern(
+ sc_main, {"objectName": "action_New_Script", "type": QtWidgets.QAction}
+ )
+ action.trigger()
+
+ # 4) Verify if New tab is opened
+ result = helper.wait_for_condition(lambda: sc_tabs.count() == initial_tabs_count + 1, GENERAL_WAIT)
+ Report.info(f"{Tests.new_graph}: {result}")
+
+ # 5) Close new tab using X on top of graph and check for save dialog
+ close_button = tab_bar.findChildren(QtWidgets.QAbstractButton)[0]
+ pyside_utils.click_button_async(close_button)
+ popup = await pyside_utils.wait_for_modal_widget()
+ if popup:
+ Report.info(f"{Tests.save_prompt}: {popup.findChild(QtWidgets.QDialog, 'SaveChangesDialog') is not None}")
+ dont_save = popup.findChild(QtWidgets.QPushButton, "m_continueButton")
+ dont_save.click()
+
+ # 6) Check if tab is closed
+ await pyside_utils.wait_for_condition(lambda: sc_tabs.count() == initial_tabs_count, 5.0)
+ Report.info(f"{Tests.close_graph}: {sc_tabs.count()==initial_tabs_count}")
+
+ # 7) Close Script Canvas window
+ general.close_pane("Script Canvas")
+
+
+test = TestGraphCloseSavePrompt()
+test.run_test()
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Graph_ZoomInZoomOut.py b/AutomatedTesting/Gem/PythonTests/scripting/Graph_ZoomInZoomOut.py
new file mode 100644
index 0000000000..a93b6e61d1
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Graph_ZoomInZoomOut.py
@@ -0,0 +1,120 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+
+Test case ID: T92569079
+Test Case Title: View > Zoom In zooms the graph in
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92569079
+Test case ID: T92569081
+Test Case Title: View > Zoom In zooms the graph out
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92569081
+"""
+
+
+# fmt: off
+class Tests():
+ zoom_in = ("Zoom In action working as expected", "Zoom In action not working as expected")
+ zoom_out = ("Zoom Out action working as expected", "Zoom Out action not working as expected")
+# fmt: on
+
+
+GENERAL_WAIT = 0.5 # seconds
+
+
+def Graph_ZoomInZoomOut():
+ """
+ Summary:
+ The graph can be zoomed in and zoomed out.
+
+ Expected Behavior:
+ The graph is zoomed in when when we click View->ZoomIn
+ The graph is zoomed out when when we click View->ZoomOut
+
+ Test Steps:
+ 1) Open Script Canvas window (Tools > Script Canvas)
+ 2) Get the SC window object
+ 3) Create new graph
+ 4) Get initial graph transform values
+ 5) Trigger Zoom In and verify if the graph transform scale is increased
+ 6) Trigger Zoom Out and verify if the graph transform scale is decreased
+ 7) Close Script Canvas window
+
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ # Helper imports
+ import ImportPathHelper as imports
+
+ imports.init()
+
+ from PySide2 import QtWidgets
+ import azlmbr.legacy.general as general
+
+ import pyside_utils
+ from utils import TestHelper as helper
+ from utils import Report
+
+ # 1) Open Script Canvas window (Tools > Script Canvas)
+ general.idle_enable(True)
+ general.open_pane("Script Canvas")
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
+
+ # 2) Get the SC window object
+ editor_window = pyside_utils.get_editor_main_window()
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+ sc_main = sc.findChild(QtWidgets.QMainWindow)
+
+ # 3) Create new graph
+ create_new_graph = pyside_utils.find_child_by_pattern(
+ sc_main, {"objectName": "action_New_Script", "type": QtWidgets.QAction}
+ )
+ create_new_graph.trigger()
+
+ # 4) Get initial graph transform values
+ graphics_view = sc_main.findChild(QtWidgets.QGraphicsView)
+ # NOTE: transform m11 and m22 are horizontal and vertical scales of graph
+ # they increase when zoomed in and decreased when zoomed out
+ curr_m11, curr_m22 = graphics_view.transform().m11(), graphics_view.transform().m22()
+
+ # 5) Trigger Zoom In and verify if the graph transform scale is increased
+ zin = pyside_utils.find_child_by_pattern(sc_main, {"objectName": "action_ZoomIn", "type": QtWidgets.QAction})
+ zin.trigger()
+ result = helper.wait_for_condition(
+ lambda: curr_m11 < graphics_view.transform().m11() and curr_m22 < graphics_view.transform().m22(), GENERAL_WAIT,
+ )
+ Report.result(Tests.zoom_in, result)
+
+ # 6) Trigger Zoom Out and verify if the graph transform scale is decreased
+ curr_m11, curr_m22 = graphics_view.transform().m11(), graphics_view.transform().m22()
+ zout = pyside_utils.find_child_by_pattern(sc_main, {"objectName": "action_ZoomOut", "type": QtWidgets.QAction})
+ zout.trigger()
+ result = helper.wait_for_condition(
+ lambda: curr_m11 > graphics_view.transform().m11() and curr_m22 > graphics_view.transform().m22(), GENERAL_WAIT,
+ )
+ Report.result(Tests.zoom_out, result)
+
+ # 7) Close Script Canvas window
+ general.close_pane("Script Canvas")
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+
+ from utils import Report
+
+ Report.start_test(Graph_ZoomInZoomOut)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/ImportPathHelper.py b/AutomatedTesting/Gem/PythonTests/scripting/ImportPathHelper.py
index 8aede24d0e..a45024cebf 100755
--- a/AutomatedTesting/Gem/PythonTests/scripting/ImportPathHelper.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ImportPathHelper.py
@@ -13,4 +13,5 @@ def init():
import os
import sys
sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared')
+ sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../EditorPythonTestTools/editor_python_test_tools')
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/NodeInspector_RenameVariable.py b/AutomatedTesting/Gem/PythonTests/scripting/NodeInspector_RenameVariable.py
new file mode 100644
index 0000000000..33d3f4137a
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/NodeInspector_RenameVariable.py
@@ -0,0 +1,132 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Test case ID: T92568982
+Test Case Title: Renaming variables in the Node Inspector
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92568982
+"""
+
+
+# fmt: off
+class Tests():
+ variable_created = ("New variable created", "New variable is not created")
+ node_inspector_rename = ("Variable is renamed in Node Inspector", "Variable is not renamed in Node Inspector")
+ variable_manager_rename = ("Variable is renamed in Variable Manager", "Variable is not renamed in Variable Manager")
+# fmt: on
+
+
+GENERAL_WAIT = 0.5 # seconds
+
+
+def NodeInspector_RenameVariable():
+ """
+ Summary:
+ Renaming variables in the Node Inspector, renames the actual variable.
+
+ Expected Behavior:
+ The Variable's name is changed in both Node Inspector and Variable Manager.
+
+ Test Steps:
+ 1) Open Script Canvas window (Tools > Script Canvas)
+ 2) Get the SC window object
+ 3) Open Variable Manager if not opened already
+ 4) Open Node Inspector if not opened already
+ 5) Create new graph and a new variable in Variable manager
+ 6) Click on the variable
+ 7) Update name in Node Inspector and click on ENTER
+ 8) Verify if the name is updated in Node inspector and Variable manager
+ 9) Close Script Canvas window
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ TEST_NAME = "test name"
+
+ from PySide2 import QtWidgets, QtCore, QtTest
+ from PySide2.QtCore import Qt
+ import azlmbr.legacy.general as general
+
+ import pyside_utils
+ from utils import TestHelper as helper
+
+ def open_tool(sc, dock_widget_name, pane_name):
+ if sc.findChild(QtWidgets.QDockWidget, dock_widget_name) is None:
+ action = pyside_utils.find_child_by_pattern(sc, {"text": pane_name, "type": QtWidgets.QAction})
+ action.trigger()
+ tool = sc.findChild(QtWidgets.QDockWidget, dock_widget_name)
+ return tool
+
+ # 1) Open Script Canvas window
+ general.idle_enable(True)
+ general.open_pane("Script Canvas")
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
+
+ # 2) Get the SC window object
+ editor_window = pyside_utils.get_editor_main_window()
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+
+ # 3) Open Variable Manager if not opened already
+ variable_manager = open_tool(sc, "VariableManager", "Variable Manager")
+
+ # 4) Open Node Inspector if not opened already
+ node_inspector = open_tool(sc, "NodeInspector", "Node Inspector")
+
+ # 5) Create new graph and a new variable in Variable manager
+ action = pyside_utils.find_child_by_pattern(sc, {"objectName": "action_New_Script", "type": QtWidgets.QAction})
+ action.trigger()
+ graph_vars = variable_manager.findChild(QtWidgets.QTableView, "graphVariables")
+ add_button = variable_manager.findChild(QtWidgets.QPushButton, "addButton")
+ add_button.click()
+ # Select variable type
+ table_view = variable_manager.findChild(QtWidgets.QTableView, "variablePalette")
+ model_index = pyside_utils.find_child_by_pattern(table_view, "Boolean")
+ # Click on it to create variable
+ pyside_utils.item_view_index_mouse_click(table_view, model_index)
+ result = graph_vars.model().rowCount(QtCore.QModelIndex()) == 1
+ var_mi = pyside_utils.find_child_by_pattern(graph_vars, "Variable 1")
+ result = result and (var_mi is not None)
+ Report.critical_result(Tests.variable_created, result)
+
+ # 6) Click on the variable
+ pyside_utils.item_view_index_mouse_click(graph_vars, var_mi)
+
+ # 7) Update name in Node Inspector and click on ENTER
+ helper.wait_for_condition(
+ lambda: node_inspector.findChild(QtWidgets.QWidget, "ContainerForRows") is not None, GENERAL_WAIT
+ )
+ row_container = node_inspector.findChild(QtWidgets.QWidget, "ContainerForRows")
+ name_frame = row_container.findChild(QtWidgets.QWidget, "Name")
+ name_line_edit = name_frame.findChild(QtWidgets.QLineEdit)
+ name_line_edit.setText(TEST_NAME)
+ QtTest.QTest.keyClick(name_line_edit, Qt.Key_Return, Qt.NoModifier)
+
+ # 8) Verify if the name is updated in Node inspector and Variable manager
+ helper.wait_for_condition(lambda: var_mi.data(Qt.DisplayRole) == TEST_NAME, GENERAL_WAIT)
+ Report.critical_result(Tests.node_inspector_rename, name_line_edit.text() == TEST_NAME)
+ Report.critical_result(Tests.variable_manager_rename, var_mi.data(Qt.DisplayRole) == TEST_NAME)
+
+ # 9) Close Script Canvas window
+ general.close_pane("Script Canvas")
+
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+
+ from utils import Report
+
+ Report.start_test(NodeInspector_RenameVariable)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_ClearSelection.py b/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_ClearSelection.py
new file mode 100644
index 0000000000..de30e46767
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_ClearSelection.py
@@ -0,0 +1,94 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Test case ID: T92562993
+Test Case Title: Clicking the X button on the Search Box clears the currently entered string
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92562993
+"""
+
+
+# fmt: off
+class Tests():
+ set_search_string = ("Search string is set", "Search string is not set")
+ search_string_cleared = ("Search string cleared as expected", "Search string not cleared")
+# fmt: on
+
+
+def NodePalette_ClearSelection():
+ """
+ Summary:
+ We enter some string in the Node Palette Search box, and click on the X button to verify if the
+ search string got cleared.
+
+ Expected Behavior:
+ Clicking the X button on the Search Box clears the currently entered string
+
+ Test Steps:
+ 1) Open Script Canvas window (Tools > Script Canvas)
+ 2) Get the SC window object
+ 3) Open Node Manager if not opened already
+ 4) Set some string in the Search box
+ 5) Verify if the test string is set
+ 6) Clear search string and verify if it is cleared
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ from PySide2 import QtWidgets
+
+ from utils import TestHelper as helper
+
+ import azlmbr.legacy.general as general
+
+ import pyside_utils
+
+ TEST_STRING = "Test String"
+
+ # 1) Open Script Canvas window (Tools > Script Canvas)
+ general.idle_enable(True)
+ general.open_pane("Script Canvas")
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 3.0)
+
+ # 2) Get the SC window object
+ editor_window = pyside_utils.get_editor_main_window()
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+
+ # 3) Open Node Manager if not opened already
+ if sc.findChild(QtWidgets.QDockWidget, "NodePalette") is None:
+ action = pyside_utils.find_child_by_pattern(sc, {"text": "Node Palette", "type": QtWidgets.QAction})
+ action.trigger()
+ node_palette = sc.findChild(QtWidgets.QDockWidget, "NodePalette")
+ search_frame = node_palette.findChild(QtWidgets.QFrame, "searchFrame")
+
+ # 4) Set some string in the Search box
+ search_box = search_frame.findChild(QtWidgets.QLineEdit, "searchFilter")
+ search_box.setText(TEST_STRING)
+
+ # 5) Verify if the test string is set
+ Report.result(Tests.set_search_string, search_box.text() == TEST_STRING)
+
+ # 6) Clear search string and verify if it is cleared
+ clear_text_button = search_frame.findChild(QtWidgets.QToolButton, "ClearToolButton")
+ clear_text_button.click()
+ Report.result(Tests.search_string_cleared, search_box.text() == "")
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+ from utils import Report
+
+ Report.start_test(NodePalette_ClearSelection)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_SelectNode.py b/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_SelectNode.py
new file mode 100644
index 0000000000..2ab76071a6
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_SelectNode.py
@@ -0,0 +1,104 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+
+Test case ID: T92568940
+Test Case Title: Categories and Nodes can be selected
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92568940
+"""
+
+
+# fmt: off
+class Tests():
+ category_selected = ("Category can be selected", "Category cannot be selected")
+ node_selected = ("Node can be selected", "Node cannot be selected")
+# fmt: on
+
+
+GENERAL_WAIT = 0.5 # seconds
+
+
+def NodePalette_SelectNode():
+ """
+ Summary:
+ Categories and Nodes can be selected
+
+ Expected Behavior:
+ When clicked on Node Palette, nodes and categories can be selected.
+
+ Test Steps:
+ 1) Open Script Canvas window (Tools > Script Canvas)
+ 2) Get the SC window object
+ 3) Expand QTreeView
+ 4) Click on category and check if it is selected
+ 5) Click on node and check if it is selected
+ 6) Close Script Canvas window
+
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ CATEGORY = "AI"
+ NODE = "Find Path To Entity"
+
+ from PySide2 import QtWidgets
+ import azlmbr.legacy.general as general
+
+ import pyside_utils
+ from utils import TestHelper as helper
+
+ # 1) Open Script Canvas window (Tools > Script Canvas)
+ general.idle_enable(True)
+ general.open_pane("Script Canvas")
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
+
+ # 2) Get the SC window object
+ editor_window = pyside_utils.get_editor_main_window()
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+ if sc.findChild(QtWidgets.QDockWidget, "NodePalette") is None:
+ action = pyside_utils.find_child_by_pattern(sc, {"text": "Node Palette", "type": QtWidgets.QAction})
+ action.trigger()
+ node_palette = sc.findChild(QtWidgets.QDockWidget, "NodePalette")
+ tree = node_palette.findChild(QtWidgets.QTreeView, "treeView")
+
+ # 3) Expand QTreeView
+ tree.expandAll()
+
+ # 4) Click on category and check if it is selected
+ category_index = pyside_utils.find_child_by_hierarchy(tree, CATEGORY)
+ tree.scrollTo(category_index)
+ pyside_utils.item_view_index_mouse_click(tree, category_index)
+ pyside_utils.wait_for_condition(tree.selectedIndexes() and tree.selectedIndexes()[0] == category_index)
+ Report.result(Tests.category_selected, tree.selectedIndexes()[0] == category_index)
+
+ # 5) Click on node and check if it is selected
+ node_index = pyside_utils.find_child_by_pattern(tree, NODE)
+ helper.wait_for_condition(lambda: tree.isExpanded(node_index), GENERAL_WAIT)
+ pyside_utils.item_view_index_mouse_click(tree, node_index)
+ pyside_utils.wait_for_condition(tree.selectedIndexes()[0] == node_index)
+ Report.result(Tests.node_selected, tree.selectedIndexes()[0] == node_index)
+
+ # 6) Close Script Canvas window
+ general.close_pane("Script Canvas")
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+
+ from utils import Report
+
+ Report.start_test(NodePalette_SelectNode)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/OnEntityActivatedDeactivated_PrintMessage.py b/AutomatedTesting/Gem/PythonTests/scripting/OnEntityActivatedDeactivated_PrintMessage.py
new file mode 100644
index 0000000000..51b63c4268
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/OnEntityActivatedDeactivated_PrintMessage.py
@@ -0,0 +1,184 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Test case ID: T92569253 // T92569254
+Test Case Title: On Entity Activated // On Entity Deactivated
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92569253 // https://testrail.agscollab.com/index.php?/tests/view/92569254
+"""
+
+
+# fmt: off
+class Tests():
+ level_created = ("Successfully created temp level", "Failed to create temp level")
+ controller_exists = ("Successfully found controller entity", "Failed to find controller entity")
+ activated_exists = ("Successfully found activated entity", "Failed to find activated entity")
+ deactivated_exists = ("Successfully found deactivated entity","Failed to find deactivated entity")
+ start_states_correct = ("Start states set up successfully", "Start states set up incorrectly")
+ game_mode_entered = ("Successfully entered game mode" "Failed to enter game mode")
+ lines_found = ("Successfully found expected prints", "Failed to find expected prints")
+ game_mode_exited = ("Successfully exited game mode" "Failed to exit game mode")
+# fmt: on
+
+
+def OnEntityActivatedDeactivated_PrintMessage():
+ """
+ Summary:
+ Verify that the On Entity Activation node is working as expected
+
+ Expected Behavior:
+ Upon entering game mode, the Controller entity will wait 1 second and then activate the ActivationTest
+ entity. The script attached to ActivationTest will print out a message on activation. The Controller
+ will also deactivate the DeactivationTest entity, which should print a message.
+
+ Test Steps:
+ 1) Create temp level
+ 2) Setup the level
+ 3) Validate the entities
+ 4) Start the Tracer
+ 5) Enter Game Mode
+ 6) Validate Print message
+ 7) Exit game mode
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+ import os
+
+ from utils import TestHelper as helper
+ from editor_entity_utils import EditorEntity as Entity
+ from utils import Report
+ from utils import Tracer
+
+ import azlmbr.legacy.general as general
+
+ EditorEntity = str
+ LEVEL_NAME = "tmp_level"
+ WAIT_TIME = 3.0 # SECONDS
+ EXPECTED_LINES = ["Activator Script: Activated", "Deactivator Script: Deactivated"]
+ controller_dict = {
+ "name": "Controller",
+ "status": "active",
+ "path": os.path.join("ScriptCanvas", "OnEntityActivatedScripts", "controller.scriptcanvas")
+ }
+ activated_dict = {
+ "name": "ActivationTest",
+ "status": "inactive",
+ "path": os.path.join("ScriptCanvas", "OnEntityActivatedScripts", "activator.scriptcanvas")
+ }
+ deactivated_dict = {
+ "name": "DeactivationTest",
+ "status": "active",
+ "path": os.path.join("ScriptCanvas", "OnEntityActivatedScripts", "deactivator.scriptcanvas")
+ }
+
+ def get_asset(asset_path):
+ return azlmbr.asset.AssetCatalogRequestBus(azlmbr.bus.Broadcast, "GetAssetIdByPath", asset_path, azlmbr.math.Uuid(), False)
+
+ def setup_level():
+ def create_editor_entity(entity_dict:dict, entity_to_activate:EditorEntity=None, entity_to_deactivate:EditorEntity=None) -> EditorEntity:
+ entity = Entity.create_editor_entity(entity_dict["name"])
+ entity.set_start_status(entity_dict["status"])
+ sc_component = entity.add_component("Script Canvas")
+ sc_component.set_component_property_value("Script Canvas Asset|Script Canvas Asset", get_asset(entity_dict["path"]))
+
+ if entity_dict["name"] == "Controller":
+ sc_component.get_property_tree()
+ sc_component.set_component_property_value("Properties|Variable Fields|Variables|[0]|Name,Value|Datum|Datum|EntityToActivate", entity_to_activate.id)
+ sc_component.set_component_property_value("Properties|Variable Fields|Variables|[1]|Name,Value|Datum|Datum|EntityToDeactivate", entity_to_deactivate.id)
+ return entity
+
+ activated = create_editor_entity(activated_dict)
+ deactivated = create_editor_entity(deactivated_dict)
+ create_editor_entity(controller_dict, activated, deactivated)
+
+ def validate_entity_exist(entity_name: str, test_tuple: tuple):
+ """
+ Validate the entity with the given name exists in the level
+ :return: entity: editor entity object
+ """
+ entity = Entity.find_editor_entity(entity_name)
+ Report.critical_result(test_tuple, entity.id.IsValid())
+ return entity
+
+ def validate_start_state(entity:EditorEntity, expected_state:str):
+ """
+ Validate that the starting state of the entity is correct, if it isn't then attempt to rectify and recheck.
+ :return: bool: Whether state is set as expected
+ """
+ state_options = {
+ "active": azlmbr.globals.property.EditorEntityStartStatus_StartActive,
+ "inactive": azlmbr.globals.property.EditorEntityStartStatus_StartInactive,
+ "editor": azlmbr.globals.property.EditorEntityStartStatus_EditorOnly,
+ }
+ if expected_state.lower() not in state_options.keys():
+ raise ValueError(f"{expected_state} is an invalid option; valid options: active, inactive, or editor.")
+
+ state = entity.get_start_status()
+ if state != state_options[expected_state]:
+ # If state fails to set, set_start_status will assert
+ entity.set_start_status(expected_state)
+ return True
+
+ def validate_entities_in_level():
+ controller = validate_entity_exist(controller_dict["name"], Tests.controller_exists)
+ state1_correct = validate_start_state(controller, controller_dict["status"])
+
+ act_tester = validate_entity_exist(activated_dict["name"], Tests.activated_exists)
+ state2_correct = validate_start_state(act_tester, activated_dict["status"])
+
+ deac_tester = validate_entity_exist(deactivated_dict["name"], Tests.deactivated_exists)
+ state3_correct = validate_start_state(deac_tester, deactivated_dict["status"])
+
+ all_states_correct = state1_correct and state2_correct and state3_correct
+ Report.critical_result(Tests.start_states_correct, all_states_correct)
+
+ def locate_expected_lines(line_list: list):
+ found_lines = [printInfo.message.strip() for printInfo in section_tracer.prints]
+ return all(line in found_lines for line in line_list)
+
+ # 1) Create temp level
+ general.idle_enable(True)
+ result = general.create_level_no_prompt(LEVEL_NAME, 128, 1, 512, True)
+ Report.critical_result(Tests.level_created, result == 0)
+ helper.wait_for_condition(lambda: general.get_current_level_name() == LEVEL_NAME, WAIT_TIME)
+ general.close_pane("Error Report")
+
+ # 2) Setup the level
+ setup_level()
+
+ # 3) Validate the entities
+ validate_entities_in_level()
+
+ # 4) Start the Tracer
+ with Tracer() as section_tracer:
+
+ # 5) Enter Game Mode
+ helper.enter_game_mode(Tests.game_mode_entered)
+
+ # 6) Validate Print message
+ helper.wait_for_condition(lambda: locate_expected_lines(EXPECTED_LINES), WAIT_TIME)
+
+ Report.result(Tests.lines_found, locate_expected_lines(EXPECTED_LINES))
+
+ # 7) Exit game mode
+ helper.exit_game_mode(Tests.game_mode_exited)
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+ imports.init()
+
+ from utils import Report
+
+ Report.start_test(OnEntityActivatedDeactivated_PrintMessage)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Opening_Closing_Pane.py b/AutomatedTesting/Gem/PythonTests/scripting/Opening_Closing_Pane.py
index 6100285092..666f052240 100755
--- a/AutomatedTesting/Gem/PythonTests/scripting/Opening_Closing_Pane.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Opening_Closing_Pane.py
@@ -17,7 +17,6 @@ URLs of the test case: https://testrail.agscollab.com/index.php?/cases/view/1702
# fmt: off
class Tests():
- open_sc_window = ("Script Canvas window is opened", "Failed to open Script Canvas window")
default_visible = ("All the panes visible by default", "One or more panes do not visible by default")
open_panes = ("All the Panes opened successfully", "Failed to open one or more panes")
close_pane = ("All the Panes closed successfully", "Failed to close one or more panes")
@@ -49,11 +48,6 @@ def Opening_Closing_Pane():
:return: None
"""
- # Helper imports
- import ImportPathHelper as imports
-
- imports.init()
-
from editor_python_test_tools.utils import Report
from editor_python_test_tools.utils import TestHelper as helper
import editor_python_test_tools.pyside_utils as pyside_utils
@@ -82,8 +76,7 @@ def Opening_Closing_Pane():
# 1) Open Script Canvas window (Tools > Script Canvas)
general.open_pane("Script Canvas")
- is_sc_visible = helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
- Report.result(Tests.open_sc_window, is_sc_visible)
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
# 2) Restore default layout
editor_window = pyside_utils.get_editor_main_window()
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Pane_RetainOnSCRestart.py b/AutomatedTesting/Gem/PythonTests/scripting/Pane_RetainOnSCRestart.py
new file mode 100644
index 0000000000..fa5e9e6068
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Pane_RetainOnSCRestart.py
@@ -0,0 +1,164 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Test case ID: C1702821 // C1702832
+Test Case Title: Retain visibility, size and location upon Script Canvas restart
+URLs of the test case: https://testrail.agscollab.com/index.php?/cases/view/1702821 and
+ https://testrail.agscollab.com/index.php?/cases/view/1702832
+"""
+
+
+# fmt: off
+class Tests():
+ relaunch_sc = ("Script Canvas window is relaunched", "Failed to relaunch Script Canvas window")
+ test_panes_visible = ("All the test panes are opened", "Failed to open one or more test panes")
+ close_pane_1 = ("Test pane 1 is closed", "Failed to close test pane 1")
+ visiblity_retained = ("Test pane retained its visiblity on SC restart", "Failed to retain visiblity of test pane on SC restart")
+ resize_pane_3 = ("Test pane 3 resized successfully", "Failed to resize Test pane 3")
+ size_retained = ("Test pane retained its size on SC restart", "Failed to retain size of test pane on SC restart")
+ location_changed = ("Location of test pane 2 changed successfully", "Failed to change locatio of test pane 2")
+ location_retained = ("Test pane retained its location on SC restart", "Failed to retain location of test pane on SC restart")
+# fmt: on
+
+
+def Pane_RetainOnSCRestart():
+ """
+ Summary:
+ The Script Canvas window is opened to verify if Script canvas panes can retain its visibility, size and location
+ upon ScriptCanvas restart.
+
+ Expected Behavior:
+ The ScriptCanvas pane retain it's visiblity, size and location upon ScriptCanvas restart.
+
+ Test Steps:
+ 1) Open Script Canvas window (Tools > Script Canvas)
+ 2) Make sure test panes are open and visible
+ 3) Close test pane 1
+ 4) Change dock location of test pane 2
+ 5) Resize test pane 3
+ 6) Relaunch Script Canvas
+ 7) Verify if test pane 1 retain its visiblity
+ 8) Verify if location of test pane 2 is retained
+ 9) Verify if size of test pane 3 is retained
+ 10) Restore default layout and close SC window
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ # Helper imports
+ from utils import Report
+ from utils import TestHelper as helper
+ import pyside_utils
+
+ # Open 3D Engine Imports
+ import azlmbr.legacy.general as general
+
+ # Pyside imports
+ from PySide2 import QtCore, QtWidgets
+ from PySide2.QtCore import Qt
+
+ # Constants
+ TEST_PANE_1 = "NodePalette" # test visibility
+ TEST_PANE_2 = "VariableManager" # test location
+ TEST_PANE_3 = "NodeInspector" # test size
+ SCALE_INT = 10 # Random resize scale integer
+ DOCKAREA = Qt.TopDockWidgetArea # Preferred top area since no widget is docked on top
+
+ def click_menu_option(window, option_text):
+ action = pyside_utils.find_child_by_pattern(window, {"text": option_text, "type": QtWidgets.QAction})
+ action.trigger()
+
+ def find_pane(window, pane_name):
+ return window.findChild(QtWidgets.QDockWidget, pane_name)
+
+ # Test starts here
+ general.idle_enable(True)
+
+ # 1) Open Script Canvas window (Tools > Script Canvas)
+ general.open_pane("Script Canvas")
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 3.0)
+
+ # 2) Make sure test panes are open and visible
+ editor_window = pyside_utils.get_editor_main_window()
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+ click_menu_option(sc, "Restore Default Layout")
+ test_pane_1 = sc.findChild(QtWidgets.QDockWidget, TEST_PANE_1)
+ test_pane_2 = sc.findChild(QtWidgets.QDockWidget, TEST_PANE_2)
+ test_pane_3 = sc.findChild(QtWidgets.QDockWidget, TEST_PANE_3)
+
+ Report.result(
+ Tests.test_panes_visible, test_pane_1.isVisible() and test_pane_2.isVisible() and test_pane_3.isVisible()
+ )
+
+ # Initiate try block here to restore default in finally block
+ try:
+ # 3) Close test pane
+ test_pane_1.close()
+ Report.result(Tests.close_pane_1, not test_pane_1.isVisible())
+
+ # 4) Change dock location of test pane 2
+ sc_main = sc.findChild(QtWidgets.QMainWindow)
+ sc_main.addDockWidget(DOCKAREA, find_pane(sc_main, TEST_PANE_2), QtCore.Qt.Vertical)
+ Report.result(Tests.location_changed, sc_main.dockWidgetArea(find_pane(sc_main, TEST_PANE_2)) == DOCKAREA)
+
+ # 5) Resize test pane 3
+ initial_size = test_pane_3.frameSize()
+ test_pane_3.resize(initial_size.width() + SCALE_INT, initial_size.height() + SCALE_INT)
+ new_size = test_pane_3.frameSize()
+ resize_success = (
+ abs(initial_size.width() - new_size.width()) == abs(initial_size.height() - new_size.height()) == SCALE_INT
+ )
+ Report.result(Tests.resize_pane_3, resize_success)
+
+ # 6) Relaunch Script Canvas
+ general.close_pane("Script Canvas")
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 2.0)
+
+ general.open_pane("Script Canvas")
+ sc_visible = helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
+ Report.result(Tests.relaunch_sc, sc_visible)
+
+ # 7) Verify if test pane 1 retain its visiblity
+ editor_window = pyside_utils.get_editor_main_window()
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+ Report.result(Tests.visiblity_retained, not find_pane(sc, TEST_PANE_1).isVisible())
+
+ # 8) Verify if location of test pane 2 is retained
+ sc_main = sc.findChild(QtWidgets.QMainWindow)
+ Report.result(Tests.location_retained, sc_main.dockWidgetArea(find_pane(sc_main, TEST_PANE_2)) == DOCKAREA)
+
+ # 9) Verify if size of test pane 3 is retained
+ test_pane_3 = sc.findChild(QtWidgets.QDockWidget, TEST_PANE_3)
+ retained_size = test_pane_3.frameSize()
+ retain_success = retained_size != initial_size
+ Report.result(Tests.size_retained, retain_success)
+
+ finally:
+ # 10) Restore default layout and close SC window
+ general.open_pane("Script Canvas")
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+ click_menu_option(sc, "Restore Default Layout")
+ sc.close()
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+
+ from utils import Report
+
+ Report.start_test(Pane_RetainOnSCRestart)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Resizing_Pane.py b/AutomatedTesting/Gem/PythonTests/scripting/Resizing_Pane.py
index 9262e76cb0..180f577953 100755
--- a/AutomatedTesting/Gem/PythonTests/scripting/Resizing_Pane.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Resizing_Pane.py
@@ -16,7 +16,6 @@ URLs of the test case: https://testrail.agscollab.com/index.php?/cases/view/1702
# fmt: off
class Tests():
- open_sc_window = ("Script Canvas window is opened", "Failed to open Script Canvas window")
open_pane = ("Pane opened successfully", "Failed to open pane")
resize_pane = ("Pane window resized successfully", "Failed to resize pane window")
# fmt: on
@@ -46,11 +45,6 @@ def Resizing_Pane():
:return: None
"""
- # Helper imports
- import ImportPathHelper as imports
-
- imports.init()
-
from editor_python_test_tools.utils import Report
from editor_python_test_tools.utils import TestHelper as helper
import editor_python_test_tools.pyside_utils as pyside_utils
@@ -76,8 +70,7 @@ def Resizing_Pane():
# 1) Open Script Canvas window (Tools > Script Canvas)
general.open_pane("Script Canvas")
- is_sc_visible = helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
- Report.result(Tests.open_sc_window, is_sc_visible)
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
# 2) Restore default layout
editor_window = pyside_utils.get_editor_main_window()
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_ChangingAssets.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_ChangingAssets.py
new file mode 100644
index 0000000000..38d60ad871
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_ChangingAssets.py
@@ -0,0 +1,116 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Test case ID: T92562986
+Test Case Title: Changing the assigned Script Canvas Asset on an entity properly updates
+level functionality
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92562986
+"""
+
+
+# fmt: off
+class Tests():
+ level_created = ("New level created", "New level not created")
+ entity_created = ("Test Entity created", "Test Entity not created")
+ game_mode_entered = ("Game Mode successfully entered", "Game mode failed to enter")
+ game_mode_exited = ("Game Mode successfully exited", "Game mode failed to exited")
+ found_lines = ("Expected log lines were found", "Expected log lines were not found")
+# fmt: on
+
+
+def ScriptCanvas_ChangingAssets():
+ """
+ Summary:
+ Changing the assigned Script Canvas Asset on an entity properly updates level functionality
+
+ Expected Behavior:
+ When game mode is entered, respective strings of assigned assets should be printed
+
+ Test Steps:
+ 1) Create temp level
+ 2) Create new entity
+ 3) Start Tracer
+ 4) Set first script and evaluate
+ 5) Set second script and evaluate
+
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ import os
+
+ from utils import TestHelper as helper
+ from utils import Tracer
+ import hydra_editor_utils as hydra
+ import azlmbr.legacy.general as general
+ import azlmbr.math as math
+ import azlmbr.asset as asset
+ import azlmbr.bus as bus
+ import azlmbr.paths as paths
+
+ LEVEL_NAME = "tmp_level"
+ ASSET_1 = os.path.join("scriptcanvas", "ScriptCanvas_TwoComponents0.scriptcanvas")
+ ASSET_2 = os.path.join("scriptcanvas", "ScriptCanvas_TwoComponents1.scriptcanvas")
+ EXP_LINE_1 = "Greetings from the first script"
+ EXP_LINE_2 = "Greetings from the second script"
+ WAIT_TIME = 3.0 # SECONDS
+
+ def get_asset(asset_path):
+ return asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", asset_path, math.Uuid(), False)
+
+ def find_expected_line(expected_line):
+ found_lines = [printInfo.message.strip() for printInfo in section_tracer.prints]
+ return expected_line in found_lines
+
+ def set_asset_evaluate(test_entity, ASSET_PATH, EXP_LINE):
+ # Set Script Canvas entity
+ test_entity.get_set_test(0, "Script Canvas Asset|Script Canvas Asset", get_asset(ASSET_PATH))
+
+ # Enter/exit game mode
+ helper.enter_game_mode(Tests.game_mode_entered)
+ helper.wait_for_condition(lambda: find_expected_line(EXP_LINE), WAIT_TIME)
+ Report.result(Tests.found_lines, find_expected_line(EXP_LINE))
+ helper.exit_game_mode(Tests.game_mode_exited)
+
+
+ # 1) Create temp level
+ general.idle_enable(True)
+ result = general.create_level_no_prompt(LEVEL_NAME, 128, 1, 512, True)
+ Report.critical_result(Tests.level_created, result == 0)
+ helper.wait_for_condition(lambda: general.get_current_level_name() == LEVEL_NAME, WAIT_TIME)
+ general.close_pane("Error Report")
+
+ # 2) Create new entity
+ position = math.Vector3(512.0, 512.0, 32.0)
+ test_entity = hydra.Entity("test_entity")
+ test_entity.create_entity(position, ["Script Canvas"])
+
+ # 3) Start Tracer
+ with Tracer() as section_tracer:
+
+ # 4) Set first script and evaluate
+ set_asset_evaluate(test_entity, ASSET_1, EXP_LINE_1)
+
+ # 5) Set second script and evaluate
+ set_asset_evaluate(test_entity, ASSET_2, EXP_LINE_2)
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+ from utils import Report
+
+ Report.start_test(ScriptCanvas_ChangingAssets)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoComponents.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoComponents.py
new file mode 100644
index 0000000000..896bee96e5
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoComponents.py
@@ -0,0 +1,118 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Test case ID: T92563190
+Test Case Title: A single Entity with two Script Canvas components works properly
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92563190
+"""
+
+
+# fmt: off
+class Tests():
+ level_created = ("New level created", "New level not created")
+ game_mode_entered = ("Game Mode successfully entered", "Game mode failed to enter")
+ game_mode_exited = ("Game Mode successfully exited", "Game mode failed to exited")
+ found_lines = ("Expected log lines were found", "Expected log lines were not found")
+# fmt: on
+
+
+class LogLines:
+ expected_lines = ["Greetings from the first script", "Greetings from the second script"]
+
+
+def ScriptCanvas_TwoComponents():
+ """
+ Summary:
+ A test entity contains two Script Canvas components with different unique script canvas files.
+ Each of these files will have a print node set to activate on graph start.
+
+ Expected Behavior:
+ When game mode is entered, two unique strings should be printed out to the console
+
+ Test Steps:
+ 1) Create level
+ 2) Create entity with SC components
+ 3) Start Tracer
+ 4) Enter game mode
+ 5) Wait for expected lines to be found
+ 6) Report if expected lines were found
+ 7) Exit game mode
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+ import os
+
+ from utils import TestHelper as helper
+ import hydra_editor_utils as hydra
+ from utils import Report
+ from utils import Tracer
+ import azlmbr.legacy.general as general
+ import azlmbr.math as math
+ import azlmbr.asset as asset
+ import azlmbr.bus as bus
+
+ LEVEL_NAME = "tmp_level"
+ ASSET_1 = os.path.join("scriptcanvas", "ScriptCanvas_TwoComponents0.scriptcanvas")
+ ASSET_2 = os.path.join("scriptcanvas", "ScriptCanvas_TwoComponents1.scriptcanvas")
+ WAIT_TIME = 3.0 # SECONDS
+
+ def get_asset(asset_path):
+ return asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", asset_path, math.Uuid(), False)
+
+ def locate_expected_lines():
+ found_lines = []
+ for printInfo in section_tracer.prints:
+ found_lines.append(printInfo.message.strip())
+
+ return all(line in found_lines for line in LogLines.expected_lines)
+
+ # 1) Create level
+ general.idle_enable(True)
+ result = general.create_level_no_prompt(LEVEL_NAME, 128, 1, 512, True)
+ Report.critical_result(Tests.level_created, result == 0)
+ helper.wait_for_condition(lambda: general.get_current_level_name() == LEVEL_NAME, WAIT_TIME)
+ general.close_pane("Error Report")
+
+ # 2) Create entity with SC components
+ position = math.Vector3(512.0, 512.0, 32.0)
+ test_entity = hydra.Entity("test_entity")
+ test_entity.create_entity(position, ["Script Canvas", "Script Canvas"])
+ test_entity.get_set_test(0, "Script Canvas Asset|Script Canvas Asset", get_asset(ASSET_1))
+ test_entity.get_set_test(1, "Script Canvas Asset|Script Canvas Asset", get_asset(ASSET_2))
+
+ # 3) Start Tracer
+ with Tracer() as section_tracer:
+
+ # 4) Enter game mode
+ helper.enter_game_mode(Tests.game_mode_entered)
+
+ # 5) Wait for expected lines to be found
+ helper.wait_for_condition(locate_expected_lines, WAIT_TIME)
+
+ # 6) Report if expected lines were found
+ Report.result(Tests.found_lines, locate_expected_lines())
+
+ # 7) Exit game mode
+ helper.exit_game_mode(Tests.game_mode_exited)
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+
+ from utils import Report
+
+ Report.start_test(ScriptCanvas_TwoComponents)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoEntities.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoEntities.py
new file mode 100644
index 0000000000..401e6c0271
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoEntities.py
@@ -0,0 +1,107 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Test case ID: T92563191
+Test Case Title: Two Entities can use the same Graph asset successfully at RunTime
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92563191
+"""
+
+
+# fmt: off
+class Tests():
+ level_created = ("New level created", "New level not created")
+ game_mode_entered = ("Game Mode successfully entered", "Game mode failed to enter")
+ game_mode_exited = ("Game Mode successfully exited", "Game mode failed to exited")
+ found_lines = ("Expected log lines were found", "Expected log lines were not found")
+# fmt: on
+
+
+def ScriptCanvas_TwoEntities():
+ """
+ Summary:
+ Two Entities can use the same Graph asset successfully at RunTime. The script canvas asset
+ attached to the enties will print the respective entity names.
+
+ Expected Behavior:
+ When game mode is entered, respective strings of different entities should be printed.
+
+ Test Steps:
+ 1) Create temp level
+ 2) Create two new entities with different names
+ 3) Set ScriptCanvas asset to both the entities
+ 4) Enter/Exit game mode and verify log lines
+
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ import os
+
+ from utils import TestHelper as helper
+ from utils import Tracer
+ import hydra_editor_utils as hydra
+ import azlmbr.legacy.general as general
+ import azlmbr.math as math
+ import azlmbr.asset as asset
+ import azlmbr.bus as bus
+
+ LEVEL_NAME = "tmp_level"
+ ASSET_PATH = os.path.join("scriptcanvas", "T92563191_test.scriptcanvas")
+ EXPECTED_LINES = ["Entity Name: test_entity_1", "Entity Name: test_entity_2"]
+ WAIT_TIME = 0.5 # SECONDS
+
+ def get_asset(asset_path):
+ return asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", asset_path, math.Uuid(), False)
+
+ # 1) Create temp level
+ general.idle_enable(True)
+ result = general.create_level_no_prompt(LEVEL_NAME, 128, 1, 512, True)
+ Report.critical_result(Tests.level_created, result == 0)
+ helper.wait_for_condition(lambda: general.get_current_level_name() == LEVEL_NAME, WAIT_TIME)
+ general.close_pane("Error Report")
+
+ # 2) Create two new entities with different names
+ position = math.Vector3(512.0, 512.0, 32.0)
+ test_entity_1 = hydra.Entity("test_entity_1")
+ test_entity_1.create_entity(position, ["Script Canvas"])
+
+ test_entity_2 = hydra.Entity("test_entity_2")
+ test_entity_2.create_entity(position, ["Script Canvas"])
+
+ # 3) Set ScriptCanvas asset to both the entities
+ test_entity_1.get_set_test(0, "Script Canvas Asset|Script Canvas Asset", get_asset(ASSET_PATH))
+ test_entity_2.get_set_test(0, "Script Canvas Asset|Script Canvas Asset", get_asset(ASSET_PATH))
+
+ # 4) Enter/Exit game mode and verify log lines
+ with Tracer() as section_tracer:
+
+ helper.enter_game_mode(Tests.game_mode_entered)
+ # wait for WAIT_TIME to let the script print strings
+ general.idle_wait(WAIT_TIME)
+ helper.exit_game_mode(Tests.game_mode_exited)
+
+ found_lines = [printInfo.message.strip() for printInfo in section_tracer.prints]
+ result = all(line in found_lines for line in EXPECTED_LINES)
+
+ Report.result(Tests.found_lines, result)
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+ from utils import Report
+
+ Report.start_test(ScriptCanvas_TwoEntities)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_ReturnSetType_Successfully.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_ReturnSetType_Successfully.py
new file mode 100644
index 0000000000..aa9abd110b
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_ReturnSetType_Successfully.py
@@ -0,0 +1,112 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Test Case Title: Event can return a value of set type successfully
+"""
+
+
+# fmt: off
+class Tests():
+ level_created = ("Successfully created temporary level", "Failed to create temporary level")
+ entity_created = ("Successfully created test entity", "Failed to create test entity")
+ enter_game_mode = ("Successfully entered game mode", "Failed to enter game mode")
+ lines_found = ("Successfully found expected message", "Failed to find expected message")
+ exit_game_mode = ("Successfully exited game mode", "Failed to exit game mode")
+# fmt: on
+
+
+def ScriptEvents_ReturnSetType_Successfully():
+ """
+ Summary: A temporary level is created with an Entity having ScriptCanvas component.
+ ScriptEvent(T92569006_ScriptEvent.scriptevents) is created with one Method that has a return value.
+ ScriptCanvas(T92569006_ScriptCanvas.scriptcanvas) is attached to Entity. Graph has Send node that sends the Method
+ of the ScriptEvent and prints the returned result ( On Entity Activated -> Send node -> Print) and Receive node is
+ set to return custom value ( Receive node -> Print).
+ Verify that the entity containing T92569006_ScriptCanvas.scriptcanvas should print the custom value set in both
+ Send and Receive nodes.
+
+ Expected Behavior:
+ After entering game mode, the graph on the entity should print an expected message to the console
+
+ Test Steps:
+ 1) Create test level
+ 2) Create test entity
+ 3) Start Tracer
+ 4) Enter Game Mode
+ 5) Read for line
+ 6) Exit Game Mode
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+ import os
+ from editor_entity_utils import EditorEntity as Entity
+ from utils import Report
+ from utils import TestHelper as helper
+ from utils import Tracer
+
+ import azlmbr.legacy.general as general
+ import azlmbr.asset as asset
+ import azlmbr.math as math
+ import azlmbr.bus as bus
+
+ LEVEL_NAME = "tmp_level"
+ WAIT_TIME = 3.0 # SECONDS
+ EXPECTED_LINES = ["T92569006_ScriptEvent_Sent", "T92569006_ScriptEvent_Received"]
+ SC_ASSET_PATH = os.path.join("ScriptCanvas", "T92569006_ScriptCanvas.scriptcanvas")
+
+ def create_editor_entity(name, sc_asset):
+ entity = Entity.create_editor_entity(name)
+ sc_comp = entity.add_component("Script Canvas")
+ asset_id = asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", sc_asset, math.Uuid(), False)
+ sc_comp.set_component_property_value("Script Canvas Asset|Script Canvas Asset", asset_id)
+ Report.critical_result(Tests.entity_created, entity.id.isValid())
+
+ def locate_expected_lines(line_list: list):
+ found_lines = [printInfo.message.strip() for printInfo in section_tracer.prints]
+
+ return all(line in found_lines for line in line_list)
+
+ # 1) Create temp level
+ general.idle_enable(True)
+ result = general.create_level_no_prompt(LEVEL_NAME, 128, 1, 512, True)
+ Report.critical_result(Tests.level_created, result == 0)
+ helper.wait_for_condition(lambda: general.get_current_level_name() == LEVEL_NAME, WAIT_TIME)
+ general.close_pane("Error Report")
+
+ # 2) Create test entity
+ create_editor_entity("TestEntity", SC_ASSET_PATH)
+
+ # 3) Start Tracer
+ with Tracer() as section_tracer:
+
+ # 4) Enter Game Mode
+ helper.enter_game_mode(Tests.enter_game_mode)
+
+ # 5) Read for line
+ lines_located = helper.wait_for_condition(lambda: locate_expected_lines(EXPECTED_LINES), WAIT_TIME)
+ Report.result(Tests.lines_found, lines_located)
+
+ # 6) Exit Game Mode
+ helper.exit_game_mode(Tests.exit_game_mode)
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+
+ from utils import Report
+
+ Report.start_test(ScriptEvents_ReturnSetType_Successfully)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_SendReceiveAcrossMultiple.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_SendReceiveAcrossMultiple.py
new file mode 100644
index 0000000000..d671229cdf
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_SendReceiveAcrossMultiple.py
@@ -0,0 +1,120 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Test case ID: T92567321
+Test Case Title: Script Events: Can send and receive a script event across multiple entities successfully
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92567321
+"""
+
+
+# fmt: off
+class Tests():
+ level_created = ("Successfully created temporary level", "Failed to create temporary level")
+ entitya_created = ("Successfully created EntityA", "Failed to create EntityA")
+ entityb_created = ("Successfully created EntityB", "Failed to create EntityB")
+ enter_game_mode = ("Successfully entered game mode", "Failed to enter game mode")
+ lines_found = ("Successfully found expected message", "Failed to find expected message")
+ exit_game_mode = ("Successfully exited game mode", "Failed to exit game mode")
+# fmt: on
+
+
+def ScriptEvents_SendReceiveAcrossMultiple():
+ """
+ Summary:
+ EntityA and EntityB will be created in a level. Attached to both will be a Script Canvas component. The Script Event created for the test will be sent from EntityA to EntityB.
+
+ Expected Behavior:
+ The output of the Script Event should be printed to the console
+
+ Test Steps:
+ 1) Create test level
+ 2) Create EntityA/EntityB (add scriptcanvas files part of entity setup)
+ 3) Start Tracer
+ 4) Enter Game Mode
+ 5) Read for line
+ 6) Exit Game Mode
+
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+ import os
+
+ from editor_entity_utils import EditorEntity as Entity
+ from utils import Report
+ from utils import TestHelper as helper
+ from utils import Tracer
+
+ import azlmbr.legacy.general as general
+
+ LEVEL_NAME = "tmp_level"
+ WAIT_TIME = 3.0
+ ASSET_PREFIX = "T92567321"
+ asset_paths = {
+ "event": os.path.join("TestAssets", f"{ASSET_PREFIX}.scriptevents"),
+ "assetA": os.path.join("ScriptCanvas", f"{ASSET_PREFIX}A.scriptcanvas"),
+ "assetB": os.path.join("ScriptCanvas", f"{ASSET_PREFIX}B.scriptcanvas"),
+ }
+ sc_for_entities = {
+ "EntityA": asset_paths["assetA"],
+ "EntityB": asset_paths["assetB"]
+ }
+ EXPECTED_LINES = ["Incoming Message Received"]
+
+ def get_asset(asset_path):
+ return azlmbr.asset.AssetCatalogRequestBus(azlmbr.bus.Broadcast, "GetAssetIdByPath", asset_path, azlmbr.math.Uuid(), False)
+
+ def create_editor_entity(name, sc_asset):
+ entity = Entity.create_editor_entity(name)
+ sc_comp = entity.add_component("Script Canvas")
+ sc_comp.set_component_property_value("Script Canvas Asset|Script Canvas Asset", get_asset(sc_asset))
+ Report.critical_result(Tests.__dict__[name.lower()+"_created"], entity.id.isValid())
+
+ def locate_expected_lines(line_list: list):
+ found_lines = [printInfo.message.strip() for printInfo in section_tracer.prints]
+
+ return all(line in found_lines for line in line_list)
+
+ # 1) Create temp level
+ general.idle_enable(True)
+ result = general.create_level_no_prompt(LEVEL_NAME, 128, 1, 512, True)
+ Report.critical_result(Tests.level_created, result == 0)
+ helper.wait_for_condition(lambda: general.get_current_level_name() == LEVEL_NAME, WAIT_TIME)
+ general.close_pane("Error Report")
+
+ # 2) Create EntityA/EntityB
+ for key in sc_for_entities.keys():
+ create_editor_entity(key, sc_for_entities[key])
+
+ # 3) Start Tracer
+ with Tracer() as section_tracer:
+
+ # 4) Enter Game Mode
+ helper.enter_game_mode(Tests.enter_game_mode)
+
+ # 5) Read for line
+ lines_located = helper.wait_for_condition(lambda: locate_expected_lines(EXPECTED_LINES), WAIT_TIME)
+ Report.result(Tests.lines_found, lines_located)
+
+ # 6) Exit Game Mode
+ helper.exit_game_mode(Tests.exit_game_mode)
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+ imports.init()
+
+ from utils import Report
+
+ Report.start_test(ScriptEvents_SendReceiveAcrossMultiple)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_SendReceiveSuccessfully.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_SendReceiveSuccessfully.py
new file mode 100644
index 0000000000..b5e26d14ae
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_SendReceiveSuccessfully.py
@@ -0,0 +1,110 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Test case ID: T92567320
+Test Case Title: Script Events: Can send and receive a script event successfully
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92567320
+"""
+
+
+# fmt: off
+class Tests():
+ level_created = ("Successfully created temporary level", "Failed to create temporary level")
+ entity_created = ("Successfully created test entity", "Failed to create test entity")
+ enter_game_mode = ("Successfully entered game mode", "Failed to enter game mode")
+ lines_found = ("Successfully found expected message", "Failed to find expected message")
+ exit_game_mode = ("Successfully exited game mode", "Failed to exit game mode")
+# fmt: on
+
+
+def ScriptEvents_SendReceiveSuccessfully():
+ """
+ Summary:
+ An entity exists in the level that contains a Script Canvas component. In the graph is both a Send Event
+ and a Receive Event.
+
+ Expected Behavior:
+ After entering game mode the graph on the entity should print an expected message to the console
+
+ Test Steps:
+ 1) Create test level
+ 2) Create test entity
+ 3) Start Tracer
+ 4) Enter Game Mode
+ 5) Read for line
+ 6) Exit Game Mode
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+ import os
+ from editor_entity_utils import EditorEntity as Entity
+ from utils import Report
+ from utils import TestHelper as helper
+ from utils import Tracer
+
+ import azlmbr.legacy.general as general
+ import azlmbr.asset as asset
+ import azlmbr.math as math
+ import azlmbr.bus as bus
+
+ LEVEL_NAME = "tmp_level"
+ WAIT_TIME = 3.0 # SECONDS
+ EXPECTED_LINES = ["T92567320: Message Received"]
+ SC_ASSET_PATH = os.path.join("ScriptCanvas", "T92567320.scriptcanvas")
+
+ def create_editor_entity(name, sc_asset):
+ entity = Entity.create_editor_entity(name)
+ sc_comp = entity.add_component("Script Canvas")
+ asset_id = asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", sc_asset, math.Uuid(), False)
+ sc_comp.set_component_property_value("Script Canvas Asset|Script Canvas Asset", asset_id)
+ Report.critical_result(Tests.entity_created, entity.id.isValid())
+
+ def locate_expected_lines(line_list: list):
+ found_lines = [printInfo.message.strip() for printInfo in section_tracer.prints]
+
+ return all(line in found_lines for line in line_list)
+
+ # 1) Create temp level
+ general.idle_enable(True)
+ result = general.create_level_no_prompt(LEVEL_NAME, 128, 1, 512, True)
+ Report.critical_result(Tests.level_created, result == 0)
+ helper.wait_for_condition(lambda: general.get_current_level_name() == LEVEL_NAME, WAIT_TIME)
+ general.close_pane("Error Report")
+
+ # 2) Create test entity
+ create_editor_entity("TestEntity", SC_ASSET_PATH)
+
+ # 3) Start Tracer
+ with Tracer() as section_tracer:
+
+ # 4) Enter Game Mode
+ helper.enter_game_mode(Tests.enter_game_mode)
+
+ # 5) Read for line
+ lines_located = helper.wait_for_condition(lambda: locate_expected_lines(EXPECTED_LINES), WAIT_TIME)
+ Report.result(Tests.lines_found, lines_located)
+
+ # 6) Exit Game Mode
+ helper.exit_game_mode(Tests.exit_game_mode)
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+
+ from utils import Report
+
+ Report.start_test(ScriptEvents_SendReceiveSuccessfully)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Active.py b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Active.py
index 8c34f29ebf..152dea93cd 100755
--- a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Active.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Active.py
@@ -12,22 +12,253 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
import pytest
import os
import sys
+sys.path.append(os.path.dirname(__file__))
+import ImportPathHelper as imports
+imports.init()
+
+import hydra_test_utils as hydra
+import ly_test_tools.environment.file_system as file_system
from ly_test_tools import LAUNCHERS
-
-sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared')
-
from base import TestAutomationBase
+TEST_DIRECTORY = os.path.dirname(__file__)
+
+
@pytest.mark.SUITE_periodic
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
@pytest.mark.parametrize("project", ["AutomatedTesting"])
class TestAutomation(TestAutomationBase):
-
+ @pytest.mark.test_case_id("C1702834", "C1702823")
+ def test_Opening_Closing_Pane(self, request, workspace, editor, launcher_platform):
+ from . import Opening_Closing_Pane as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("C1702824")
def test_Docking_Pane(self, request, workspace, editor, launcher_platform):
from . import Docking_Pane as test_module
self._run_test(request, workspace, editor, test_module)
+ @pytest.mark.test_case_id("C1702829")
def test_Resizing_Pane(self, request, workspace, editor, launcher_platform):
from . import Resizing_Pane as test_module
self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92563190")
+ @pytest.mark.parametrize("level", ["tmp_level"])
+ def test_ScriptCanvas_TwoComponents(self, request, workspace, editor, launcher_platform, level):
+ def teardown():
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ request.addfinalizer(teardown)
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ from . import ScriptCanvas_TwoComponents as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92562986")
+ @pytest.mark.parametrize("level", ["tmp_level"])
+ def test_ScriptCanvas_ChangingAssets(self, request, workspace, editor, launcher_platform, project, level):
+ def teardown():
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ request.addfinalizer(teardown)
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ from . import ScriptCanvas_ChangingAssets as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92569079", "T92569081")
+ def test_Graph_ZoomInZoomOut(self, request, workspace, editor, launcher_platform):
+ from . import Graph_ZoomInZoomOut as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92568940")
+ def test_NodePalette_SelectNode(self, request, workspace, editor, launcher_platform):
+ from . import NodePalette_SelectNode as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92569253")
+ @pytest.mark.test_case_id("T92569254")
+ @pytest.mark.parametrize("level", ["tmp_level"])
+ def test_OnEntityActivatedDeactivated_PrintMessage(self, request, workspace, editor, launcher_platform, project, level):
+ def teardown():
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ request.addfinalizer(teardown)
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ from . import OnEntityActivatedDeactivated_PrintMessage as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92562993")
+ def test_NodePalette_ClearSelection(self, request, workspace, editor, launcher_platform, project):
+ from . import NodePalette_ClearSelection as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92563191")
+ @pytest.mark.parametrize("level", ["tmp_level"])
+ def test_ScriptCanvas_TwoEntities(self, request, workspace, editor, launcher_platform, project, level):
+ def teardown():
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ request.addfinalizer(teardown)
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ from . import ScriptCanvas_TwoEntities as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92569013")
+ def test_AssetEditor_CreateScriptEventFile(self, request, workspace, editor, launcher_platform, project):
+ def teardown():
+ file_system.delete(
+ [os.path.join(workspace.paths.project(), "ScriptCanvas", "test_file.scriptevent")], True, True
+ )
+ request.addfinalizer(teardown)
+ file_system.delete(
+ [os.path.join(workspace.paths.project(), "ScriptCanvas", "test_file.scriptevent")], True, True
+ )
+ from . import AssetEditor_CreateScriptEventFile as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92569165", "T92569167", "T92569168", "T92569170")
+ def test_Toggle_ScriptCanvasTools(self, request, workspace, editor, launcher_platform):
+ from . import Toggle_ScriptCanvasTools as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92568982")
+ def test_NodeInspector_RenameVariable(self, request, workspace, editor, launcher_platform, project):
+ from . import NodeInspector_RenameVariable as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92569137")
+ def test_Debugging_TargetMultipleGraphs(self, request, workspace, editor, launcher_platform, project):
+ from . import Debugging_TargetMultipleGraphs as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92568856")
+ @pytest.mark.parametrize("level", ["tmp_level"])
+ def test_Debugging_TargetMultipleEntities(self, request, workspace, editor, launcher_platform, project, level):
+ def teardown():
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ request.addfinalizer(teardown)
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ from . import Debugging_TargetMultipleEntities as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92569049", "T92569051")
+ def test_EditMenu_UndoRedo(self, request, workspace, editor, launcher_platform, project):
+ from . import EditMenu_UndoRedo as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("C1702825", "C1702831")
+ def test_UnDockedPane_CloseSCWindow(self, request, workspace, editor, launcher_platform):
+ from . import UnDockedPane_CloseSCWindow as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92562978")
+ @pytest.mark.parametrize("level", ["tmp_level"])
+ def test_Entity_AddScriptCanvasComponent(self, request, workspace, editor, launcher_platform, project, level):
+ def teardown():
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ request.addfinalizer(teardown)
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ from . import Entity_AddScriptCanvasComponent as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("C1702821", "C1702832")
+ def test_Pane_RetainOnSCRestart(self, request, workspace, editor, launcher_platform):
+ from . import Pane_RetainOnSCRestart as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92567321")
+ @pytest.mark.parametrize("level", ["tmp_level"])
+ def test_ScriptEvents_SendReceiveAcrossMultiple(self, request, workspace, editor, launcher_platform, project, level):
+ def teardown():
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ request.addfinalizer(teardown)
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ from . import ScriptEvents_SendReceiveAcrossMultiple as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.test_case_id("T92567320")
+ @pytest.mark.parametrize("level", ["tmp_level"])
+ def test_ScriptEvents_SendReceiveSuccessfully(self, request, workspace, editor, launcher_platform, project, level):
+ def teardown():
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ request.addfinalizer(teardown)
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ from . import ScriptEvents_SendReceiveSuccessfully as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+ @pytest.mark.parametrize("level", ["tmp_level"])
+ def test_ScriptEvents_ReturnSetType_Successfully(self, request, workspace, editor, launcher_platform, project, level):
+ def teardown():
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ request.addfinalizer(teardown)
+ file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
+ from . import ScriptEvents_ReturnSetType_Successfully as test_module
+ self._run_test(request, workspace, editor, test_module)
+
+
+# NOTE: We had to use hydra_test_utils.py, as TestAutomationBase run_test method
+# fails because of pyside_utils import
+@pytest.mark.SUITE_periodic
+@pytest.mark.parametrize("launcher_platform", ["windows_editor"])
+@pytest.mark.parametrize("project", ["AutomatedTesting"])
+class TestScriptCanvasTests(object):
+ """
+ The following tests use hydra_test_utils.py to launch the editor and validate the results.
+ """
+
+ @pytest.mark.test_case_id("T92569037", "T92569039")
+ def test_FileMenu_New_Open(self, request, editor, launcher_platform):
+ expected_lines = [
+ "File->New action working as expected: True",
+ "File->Open action working as expected: True",
+ ]
+ hydra.launch_and_validate_results(
+ request, TEST_DIRECTORY, editor, "FileMenu_New_Open.py", expected_lines, auto_test_mode=False, timeout=60,
+ )
+
+ @pytest.mark.test_case_id("T92568942")
+ def test_AssetEditor_NewScriptEvent(self, request, editor, launcher_platform):
+ expected_lines = [
+ "New Script event action found: True",
+ "Asset Editor opened: True",
+ "Asset Editor created with new asset: True",
+ "New Script event created in Asset Editor: True",
+ ]
+ hydra.launch_and_validate_results(
+ request,
+ TEST_DIRECTORY,
+ editor,
+ "AssetEditor_NewScriptEvent.py",
+ expected_lines,
+ auto_test_mode=False,
+ timeout=60,
+ )
+
+ @pytest.mark.test_case_id("T92563068", "T92563070")
+ def test_GraphClose_SavePrompt(self, request, editor, launcher_platform):
+ expected_lines = [
+ "New graph created: True",
+ "Save prompt opened as expected: True",
+ "Close button worked as expected: True",
+ ]
+ hydra.launch_and_validate_results(
+ request,
+ TEST_DIRECTORY,
+ editor,
+ "GraphClose_SavePrompt.py",
+ expected_lines,
+ auto_test_mode=False,
+ timeout=60,
+ )
+
+ @pytest.mark.test_case_id("T92564789", "T92568873")
+ def test_VariableManager_CreateDeleteVars(self, request, editor, launcher_platform):
+ var_types = ["Boolean", "Color", "EntityID", "Number", "String", "Transform", "Vector2", "Vector3", "Vector4"]
+ expected_lines = [f"Success: {var_type} variable is created" for var_type in var_types]
+ expected_lines.extend([f"Success: {var_type} variable is deleted" for var_type in var_types])
+ hydra.launch_and_validate_results(
+ request,
+ TEST_DIRECTORY,
+ editor,
+ "VariableManager_CreateDeleteVars.py",
+ expected_lines,
+ auto_test_mode=False,
+ timeout=60,
+ )
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Toggle_ScriptCanvasTools.py b/AutomatedTesting/Gem/PythonTests/scripting/Toggle_ScriptCanvasTools.py
new file mode 100644
index 0000000000..4024e28277
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Toggle_ScriptCanvasTools.py
@@ -0,0 +1,137 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Test case ID: C92569165, C92569167, C92569168, C92569170
+Test Case Title: Tools > Node Palette toggles the Node Palette
+ Tools > Node Inspector toggles the Node Inspector
+ Tools > Bookmarks toggles the Bookmarks
+ Tools > Variable Manager toggles the Variable Manager
+
+URLs of the test case: https://testrail.agscollab.com/index.php?/cases/view/92569165
+ https://testrail.agscollab.com/index.php?/cases/view/92569167
+ https://testrail.agscollab.com/index.php?/cases/view/92569168
+ https://testrail.agscollab.com/index.php?/cases/view/92569170
+"""
+
+
+# fmt: off
+class Tests():
+ node_palette_opened = ("NodePalette is opened successfully", "Failed to open NodePalette")
+ node_inspector_opened = ("NodeInspector is opened successfully", "Failed to open NodeInspector")
+ bookmark_opened = ("Bookmarks is opened successfully", "Failed to open Bookmarks")
+ variable_manager_opened = ("VariableManager is opened successfully", "Failed to open VariableManager")
+ node_palette_closed_by_start = ("NodePalette is closed successfully", "Failed to close NodePalette")
+ node_inspector_closed_by_start = ("NodeInspector is closed successfully", "Failed to close NodeInspector")
+ bookmark_closed_by_start = ("Bookmarks is closed successfully", "Failed to close Bookmarks")
+ variable_manager_closed_by_start = ("VariableManager is closed successfully", "Failed to close VariableManager")
+ node_palette_closed_by_end = ("NodePalette is closed successfully", "Failed to close NodePalette")
+ node_inspector_closed_by_end = ("NodeInspector is closed successfully", "Failed to close NodeInspector")
+ bookmark_closed_by_end = ("Bookmarks is closed successfully", "Failed to close Bookmarks")
+ variable_manager_closed_by_end = ("VariableManager is closed successfully", "Failed to close VariableManager")
+# fmt: on
+
+
+def Toggle_ScriptCanvasTools():
+ """
+ Summary:
+ Toggle Node Palette, Node Inspector, Bookmarks and Variable Manager in Script Canvas.
+ Make sure each pane opens and closes successfully.
+
+ Expected Behavior:
+ Each pane opens and closes successfully.
+
+ Test Steps:
+ 1) Open Script Canvas window (Tools > Script Canvas)
+ 2) Make sure Node Palette, Node Inspector, Bookmarks and Variable Manager panes are closed in Script Canvas window
+ 3) Open Node Palette, Node Inspector, Bookmarks and Variable Manager in Script Canvas window
+ 4) Close Node Palette, Node Inspector, Bookmarks and Variable Manager in Script Canvas window
+ 5) Restore default layout
+ 6) Close Script Canvas window
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ from utils import Report
+ from utils import TestHelper as helper
+ import pyside_utils
+
+ # Open 3D Engine imports
+ import azlmbr.legacy.general as general
+
+ # Pyside imports
+ from PySide2 import QtWidgets
+
+ def click_menu_option(window, option_text):
+ action = pyside_utils.find_child_by_pattern(window, {"text": option_text, "type": QtWidgets.QAction})
+ action.trigger()
+
+ def find_pane(window, pane_name):
+ return window.findChild(QtWidgets.QDockWidget, pane_name)
+
+ def close_tool(window, pane_widget, test_tuple):
+ pane = find_pane(window, pane_widget)
+ pane.close()
+ Report.result(test_tuple, not pane.isVisible())
+
+ def open_tool(window, pane_widget, tool, test_tuple):
+ pane = find_pane(window, pane_widget)
+ if not pane.isVisible():
+ click_menu_option(window, tool)
+ pane = find_pane(window, pane_widget)
+ Report.result(test_tuple, pane.isVisible())
+
+ # Test starts here
+ general.idle_enable(True)
+
+ # 1) Open Script Canvas window (Tools > Script Canvas)
+ general.open_pane("Script Canvas")
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
+
+ # 2) Make sure Node Palette, Node Inspector, Bookmarks and Variable Manager panes are closed in Script Canvas window
+ editor_window = pyside_utils.get_editor_main_window()
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+ close_tool(sc, "NodePalette", Tests.node_palette_closed_by_start)
+ close_tool(sc, "NodeInspector", Tests.node_inspector_closed_by_start)
+ close_tool(sc, "BookmarkDockWidget", Tests.bookmark_closed_by_start)
+ close_tool(sc, "VariableManager", Tests.variable_manager_closed_by_start)
+
+ # 3) Open Node Palette, Node Inspector, Bookmarks and Variable Manager in Script Canvas window
+ open_tool(sc, "NodePalette", "Node Palette", Tests.node_palette_opened)
+ open_tool(sc, "NodeInspector", "Node Inspector", Tests.node_inspector_opened)
+ open_tool(sc, "BookmarkDockWidget", "Bookmarks", Tests.bookmark_opened)
+ open_tool(sc, "VariableManager", "Variable Manager", Tests.variable_manager_opened)
+
+ # 4) Close Node Palette, Node Inspector, Bookmarks and Variable Manager in Script Canvas window
+ close_tool(sc, "NodePalette", Tests.node_palette_closed_by_end)
+ close_tool(sc, "NodeInspector", Tests.node_inspector_closed_by_end)
+ close_tool(sc, "BookmarkDockWidget", Tests.bookmark_closed_by_end)
+ close_tool(sc, "VariableManager", Tests.variable_manager_closed_by_end)
+
+ # 5) Restore default layout
+ # Need this step to restore to default in case of test failure
+ click_menu_option(sc, "Restore Default Layout")
+
+ # 6) Close Script Canvas window
+ sc.close()
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+
+ from utils import Report
+
+ Report.start_test(Toggle_ScriptCanvasTools)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/UnDockedPane_CloseSCWindow.py b/AutomatedTesting/Gem/PythonTests/scripting/UnDockedPane_CloseSCWindow.py
new file mode 100644
index 0000000000..875f28ec95
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/UnDockedPane_CloseSCWindow.py
@@ -0,0 +1,128 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Test case ID: C1702825 // C1702831
+Test Case Title: Undocking // Closing script canvas with the pane floating
+URLs of the test case: https://testrail.agscollab.com/index.php?/cases/view/1702825 &
+ https://testrail.agscollab.com/index.php?/cases/view/1702831
+"""
+
+
+# fmt: off
+class Tests():
+ undock_pane = ("Pane is undocked successfully", "Failed to undock pane")
+ close_sc_window = ("Script Canvas window is closed", "Failed to close Script Canvas window")
+ pane_closed = ("Pane is closed successfully", "Failed to close the pane")
+# fmt: on
+
+
+def UnDockedPane_CloseSCWindow():
+ """
+ Summary:
+ The Script Canvas window is opened with one of the pane undocked.
+ Verify if undocked pane closes upon closing Script canvas window.
+
+ Expected Behavior:
+ The undocked pane closes when Script Canvas window closed.
+
+ Test Steps:
+ 1) Open Script Canvas window (Tools > Script Canvas)
+ 2) Undock Node Palette pane
+ 3) Connect to Pane visibility signal emitter to verify pane closed
+ 4) Close Script Canvas window
+ 5) Restore default layout
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ # Helper imports
+ from utils import Report
+ from utils import TestHelper as helper
+ import pyside_utils
+
+ # Open 3D Engine imports
+ import azlmbr.legacy.general as general
+
+ # Pyside imports
+ from PySide2 import QtWidgets
+
+ TEST_PANE = "NodePalette" # Chosen most commonly used pane
+
+ def click_menu_option(window, option_text):
+ action = pyside_utils.find_child_by_pattern(window, {"text": option_text, "type": QtWidgets.QAction})
+ action.trigger()
+
+ def find_pane(window, pane_name):
+ return window.findChild(QtWidgets.QDockWidget, pane_name)
+
+ def on_top_level_changed():
+ # This function has test condition always True since it gets emitted only when condition satisfied
+ Report.result(Tests.undock_pane, True)
+
+ def on_pane_closed():
+ # This function has test condition always True since it gets emitted only when condition satisfied
+ Report.result(Tests.pane_closed, True)
+
+ # Test starts here
+ general.idle_enable(True)
+
+ # 1) Open Script Canvas window (Tools > Script Canvas)
+ general.open_pane("Script Canvas")
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
+
+ # 2) Undock Node Palette pane
+ # Make sure Node Palette pane is opened
+ editor_window = pyside_utils.get_editor_main_window()
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+ pane = find_pane(sc, TEST_PANE)
+ if not pane.isVisible():
+ click_menu_option(sc, "Node Palette")
+ pane = find_pane(sc, TEST_PANE) # New reference
+
+ # We drag/drop pane over the graph since it doesn't allow docking, so this will undock it
+ try:
+ graph = find_pane(sc, "GraphCanvasEditorCentralWidget")
+ try:
+ pane.topLevelChanged.connect(on_top_level_changed)
+ pyside_utils.drag_and_drop(pane, graph)
+ finally:
+ pane.topLevelChanged.disconnect(on_top_level_changed)
+
+ # 3) Connect to Pane visibility signal emitter to verify pane closed
+ # No need to disconnect this since pane widget gets deleted when SC window closed
+ pane.visibilityChanged.connect(on_pane_closed)
+
+ # 4) Close Script Canvas window
+ sc.close()
+ is_sc_visible = helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 2.0)
+ Report.result(Tests.close_sc_window, not is_sc_visible)
+
+ finally:
+ # 5) Restore default layout
+ general.open_pane("Script Canvas")
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 5.0)
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+ click_menu_option(sc, "Restore Default Layout")
+ sc.close()
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+
+ from utils import Report
+
+ Report.start_test(UnDockedPane_CloseSCWindow)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/VariableManager_CreateDeleteVars.py b/AutomatedTesting/Gem/PythonTests/scripting/VariableManager_CreateDeleteVars.py
new file mode 100644
index 0000000000..6facc324d4
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/scripting/VariableManager_CreateDeleteVars.py
@@ -0,0 +1,123 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Test case ID: T92564789
+Test Case Title: Each Variable type can be created
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92564789
+Test case ID: T92568873
+Test Case Title: Each Variable type can be deleted
+URL of the test case: https://testrail.agscollab.com/index.php?/tests/view/92568873
+"""
+
+
+def VariableManager_CreateDeleteVars():
+ """
+ Summary:
+ Each variable type can be created and deleted in variable manager.
+
+ Expected Behavior:
+ Each variable type can be created and deleted in variable manager.
+
+ Test Steps:
+ 1) Open Script Canvas window (Tools > Script Canvas)
+ 2) Get the SC window object
+ 3) Open Variable Manager if not opened already
+ 4) Create Graph
+ 5) Create variable of each type and verify if it is created
+ 6) Delete each type of variable and verify if it is deleted
+ 7) Close SC window
+
+ Note:
+ - This test file must be called from the Open 3D Engine Editor command terminal
+ - Any passed and failed tests are written to the Editor.log file.
+ Parsing the file or running a log_monitor are required to observe the test results.
+
+ :return: None
+ """
+
+ from PySide2 import QtWidgets, QtCore, QtTest
+
+ from PySide2.QtCore import Qt
+
+ from utils import TestHelper as helper
+
+ import azlmbr.legacy.general as general
+
+ import pyside_utils
+
+ def generate_test_tuple(var_type, action):
+ return (f"{var_type} variable is {action}d", f"{var_type} variable is not {action}d")
+
+ # 1) Open Script Canvas window
+ general.idle_enable(True)
+ general.open_pane("Script Canvas")
+ helper.wait_for_condition(lambda: general.is_pane_visible("Script Canvas"), 10.0)
+
+ # 2) Get the SC window object
+ editor_window = pyside_utils.get_editor_main_window()
+ sc = editor_window.findChild(QtWidgets.QDockWidget, "Script Canvas")
+
+ # 3) Open Variable Manager if not opened already
+ if sc.findChild(QtWidgets.QDockWidget, "VariableManager") is None:
+ action = pyside_utils.find_child_by_pattern(sc, {"text": "Variable Manager", "type": QtWidgets.QAction})
+ action.trigger()
+ variable_manager = sc.findChild(QtWidgets.QDockWidget, "VariableManager")
+
+ # 4) Create Graph
+ action = pyside_utils.find_child_by_pattern(sc, {"objectName": "action_New_Script", "type": QtWidgets.QAction})
+ action.trigger()
+
+ graph_vars = variable_manager.findChild(QtWidgets.QTableView, "graphVariables")
+
+ var_types = ["Boolean", "Color", "EntityID", "Number", "String", "Transform", "Vector2", "Vector3", "Vector4"]
+
+ # 5) Create variable of each type and verify if it is created
+ for index, var_type in enumerate(var_types):
+ # Create new variable
+ add_button = variable_manager.findChild(QtWidgets.QPushButton, "addButton")
+ add_button.click() # Click on Create Variable button
+ # Select variable type
+ table_view = variable_manager.findChild(QtWidgets.QTableView, "variablePalette")
+ model_index = pyside_utils.find_child_by_pattern(table_view, var_type)
+ # Click on it to create variable
+ pyside_utils.item_view_index_mouse_click(table_view, model_index)
+ # Verify if the variable is created
+ # NOTE: To check if variable of a type is created, we are checking 1) rowcount
+ # 2) If we have row with variable "Variable "
+ # 3) Type of variable, which is next column of the variable name
+ result = graph_vars.model().rowCount(QtCore.QModelIndex()) == (
+ index + 1
+ ) # since we added 1 variable, rowcount will increase by 1
+ var_mi = pyside_utils.find_child_by_pattern(graph_vars, f"Variable {index+1}")
+ result = result and (var_mi is not None) and (var_mi.siblingAtColumn(1).data(Qt.DisplayRole) == var_type)
+ Report.result(generate_test_tuple(var_type, "create"), result)
+
+ # 6) Delete each type of variable and verify if it is deleted
+ for index, var_type in enumerate(var_types):
+ # Delete variable and verify if its deleted
+ # NOTE: To check if variable of a type is deleted, we are checking rowcount
+ var_mi = pyside_utils.find_child_by_pattern(graph_vars, f"Variable {index+1}")
+ pyside_utils.item_view_index_mouse_click(graph_vars, var_mi)
+ QtTest.QTest.keyClick(graph_vars, Qt.Key_Delete, Qt.NoModifier)
+ # since variable is deleted, rowcount will decrease by 1
+ result = graph_vars.model().rowCount(QtCore.QModelIndex()) == (len(var_types) - (index + 1))
+ Report.result(generate_test_tuple(var_type, "delete"), result)
+
+ # 7) Close SC window
+ general.close_pane("Script Canvas")
+
+
+if __name__ == "__main__":
+ import ImportPathHelper as imports
+
+ imports.init()
+ from utils import Report
+
+ Report.start_test(VariableManager_CreateDeleteVars)
diff --git a/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/C18977329_NvCloth_AddClothSimulationToMesh.ly b/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/C18977329_NvCloth_AddClothSimulationToMesh.ly
index 17fee158d8..1afbf787db 100644
--- a/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/C18977329_NvCloth_AddClothSimulationToMesh.ly
+++ b/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/C18977329_NvCloth_AddClothSimulationToMesh.ly
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a2a3360287a4711882c4254d64ca2ba70cd743012a7d38ca29aa2a57f151efaa
-size 6661
+oid sha256:e15d484113e8151072b410924747a8ad304f6f12457fad577308c0491693ab34
+size 5472
diff --git a/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/filelist.xml b/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/filelist.xml
index 6c8b361e57..9775a35c53 100644
--- a/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/filelist.xml
+++ b/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/filelist.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/level.pak b/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/level.pak
index e80d5ca1d9..08a775b6c8 100644
--- a/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/level.pak
+++ b/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/level.pak
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cd8105f020151e65093988dfb09ab42ff8d33ef5b97c61fbe0011384870aadf8
-size 39238
+oid sha256:64de37c805b0be77cdb7a85b5406af58b7f845e7d97fec1721ac5d789bb641db
+size 38856
diff --git a/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/C18977330_NvCloth_AddClothSimulationToActor.ly b/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/C18977330_NvCloth_AddClothSimulationToActor.ly
index 031989ee11..385027c479 100644
--- a/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/C18977330_NvCloth_AddClothSimulationToActor.ly
+++ b/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/C18977330_NvCloth_AddClothSimulationToActor.ly
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f53fb5e096ff562e9f0f12856ce387891596776d086f49c7ed3a59dcd0a0c11a
-size 6535
+oid sha256:7b595323d4d51211463dea0338abb6ce2a4a0a8d41efb12ac3c9dccd1f972171
+size 5504
diff --git a/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/filelist.xml b/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/filelist.xml
index 290a28f223..7ccc1d51eb 100644
--- a/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/filelist.xml
+++ b/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/filelist.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/level.pak b/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/level.pak
index fb91adeba5..12ce03fa87 100644
--- a/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/level.pak
+++ b/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/level.pak
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:87fbd9fda267daa505f11276b64f47c26115bee9e6d14f2a6f5a1cf1e1234218
-size 39179
+oid sha256:617c455668fc41cb7fd69de690e4aa3c80f2cb36deaa371902b79de18fcd1cb2
+size 39233
diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas b/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas
index a422f072a5..34e80f3ccd 100644
--- a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas
+++ b/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas
@@ -3,7 +3,7 @@
-
+
@@ -16,21 +16,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -39,23 +39,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -76,12 +62,13 @@
+
-
+
@@ -91,45 +78,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -150,12 +100,13 @@
+
-
+
@@ -165,8 +116,8 @@
-
-
+
+
@@ -187,123 +138,13 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -317,22 +158,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
-
-
-
-
+
@@ -354,52 +258,256 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
@@ -408,7 +516,375 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -441,7 +917,7 @@
-
+
@@ -468,6 +944,7 @@
+
@@ -505,6 +982,7 @@
+
@@ -542,6 +1020,7 @@
+
@@ -579,6 +1058,7 @@
+
@@ -616,6 +1096,7 @@
+
@@ -653,6 +1134,7 @@
+
@@ -690,6 +1172,7 @@
+
@@ -719,7 +1202,7 @@
-
+
@@ -746,6 +1229,7 @@
+
@@ -800,1929 +1284,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -2755,7 +1317,7 @@
-
+
@@ -2782,6 +1344,7 @@
+
@@ -2819,6 +1382,7 @@
+
@@ -2856,6 +1420,7 @@
+
@@ -2893,6 +1458,7 @@
+
@@ -2930,6 +1496,7 @@
+
@@ -2967,6 +1534,7 @@
+
@@ -3004,6 +1572,7 @@
+
@@ -3033,7 +1602,7 @@
-
+
@@ -3060,6 +1629,7 @@
+
@@ -3114,530 +1684,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3683,6 +1730,7 @@
+
@@ -3720,6 +1768,7 @@
+
@@ -3757,6 +1806,7 @@
+
@@ -3794,6 +1844,7 @@
+
@@ -3831,6 +1882,7 @@
+
@@ -3873,6 +1925,7 @@
+
@@ -3910,6 +1963,7 @@
+
@@ -3947,6 +2001,7 @@
+
@@ -3984,6 +2039,7 @@
+
@@ -4021,6 +2077,7 @@
+
@@ -4103,21 +2160,212 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4154,12 +2402,13 @@
+
-
+
@@ -4191,12 +2440,13 @@
+
-
+
@@ -4228,43 +2478,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -4285,16 +2499,16 @@
-
-
-
+
+
+
-
+
@@ -4302,7 +2516,7 @@
-
+
@@ -4348,6 +2562,7 @@
+
@@ -4385,6 +2600,7 @@
+
@@ -4427,6 +2643,7 @@
+
@@ -4464,6 +2681,7 @@
+
@@ -4492,21 +2710,389 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4538,12 +3124,13 @@
+
-
+
@@ -4575,12 +3162,13 @@
+
-
+
@@ -4612,16 +3200,17 @@
+
-
+
-
+
@@ -4631,7 +3220,307 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4682,6 +3571,7 @@
+
@@ -4719,6 +3609,7 @@
+
@@ -4756,6 +3647,7 @@
+
@@ -4793,7 +3685,1212 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4839,6 +4936,7 @@
+
@@ -4876,6 +4974,7 @@
+
@@ -4918,6 +5017,7 @@
+
@@ -4955,6 +5055,7 @@
+
@@ -4985,7 +5086,7 @@
-
+
@@ -4995,7 +5096,7 @@
-
+
@@ -5003,7 +5104,7 @@
-
+
@@ -5016,7 +5117,7 @@
-
+
@@ -5026,7 +5127,7 @@
-
+
@@ -5034,7 +5135,7 @@
-
+
@@ -5047,7 +5148,7 @@
-
+
@@ -5057,7 +5158,7 @@
-
+
@@ -5065,7 +5166,7 @@
-
+
@@ -5078,7 +5179,7 @@
-
+
@@ -5088,7 +5189,7 @@
-
+
@@ -5096,7 +5197,7 @@
-
+
@@ -5109,7 +5210,7 @@
-
+
@@ -5119,7 +5220,7 @@
-
+
@@ -5127,7 +5228,7 @@
-
+
@@ -5140,7 +5241,7 @@
-
+
@@ -5150,7 +5251,7 @@
-
+
@@ -5158,7 +5259,7 @@
-
+
@@ -5171,7 +5272,7 @@
-
+
@@ -5181,7 +5282,7 @@
-
+
@@ -5189,7 +5290,7 @@
-
+
@@ -5202,7 +5303,7 @@
-
+
@@ -5212,7 +5313,7 @@
-
+
@@ -5220,7 +5321,7 @@
-
+
@@ -5233,7 +5334,7 @@
-
+
@@ -5243,7 +5344,7 @@
-
+
@@ -5251,7 +5352,7 @@
-
+
@@ -5264,7 +5365,7 @@
-
+
@@ -5274,7 +5375,7 @@
-
+
@@ -5282,7 +5383,7 @@
-
+
@@ -5295,7 +5396,7 @@
-
+
@@ -5305,7 +5406,7 @@
-
+
@@ -5313,7 +5414,7 @@
-
+
@@ -5326,7 +5427,7 @@
-
+
@@ -5336,7 +5437,7 @@
-
+
@@ -5344,7 +5445,7 @@
-
+
@@ -5357,7 +5458,7 @@
-
+
@@ -5367,7 +5468,7 @@
-
+
@@ -5375,7 +5476,7 @@
-
+
@@ -5388,7 +5489,7 @@
-
+
@@ -5398,7 +5499,7 @@
-
+
@@ -5406,7 +5507,7 @@
-
+
@@ -5419,7 +5520,7 @@
-
+
@@ -5429,7 +5530,7 @@
-
+
@@ -5437,7 +5538,7 @@
-
+
@@ -5450,7 +5551,7 @@
-
+
@@ -5460,7 +5561,7 @@
-
+
@@ -5468,7 +5569,7 @@
-
+
@@ -5481,7 +5582,7 @@
-
+
@@ -5491,7 +5592,7 @@
-
+
@@ -5499,7 +5600,7 @@
-
+
@@ -5512,7 +5613,7 @@
-
+
@@ -5522,7 +5623,7 @@
-
+
@@ -5530,7 +5631,7 @@
-
+
@@ -5543,7 +5644,7 @@
-
+
@@ -5553,7 +5654,7 @@
-
+
@@ -5561,7 +5662,7 @@
-
+
@@ -5574,7 +5675,7 @@
-
+
@@ -5584,7 +5685,7 @@
-
+
@@ -5592,7 +5693,7 @@
-
+
@@ -5605,7 +5706,7 @@
-
+
@@ -5615,7 +5716,7 @@
-
+
@@ -5623,7 +5724,7 @@
-
+
@@ -5636,7 +5737,7 @@
-
+
@@ -5646,7 +5747,7 @@
-
+
@@ -5654,7 +5755,7 @@
-
+
@@ -5667,7 +5768,7 @@
-
+
@@ -5677,7 +5778,7 @@
-
+
@@ -5685,7 +5786,7 @@
-
+
@@ -5698,7 +5799,7 @@
-
+
@@ -5708,7 +5809,7 @@
-
+
@@ -5716,7 +5817,7 @@
-
+
@@ -5729,7 +5830,7 @@
-
+
@@ -5739,7 +5840,7 @@
-
+
@@ -5747,7 +5848,7 @@
-
+
@@ -5760,7 +5861,7 @@
-
+
@@ -5770,7 +5871,7 @@
-
+
@@ -5778,7 +5879,7 @@
-
+
@@ -5791,7 +5892,7 @@
-
+
@@ -5801,7 +5902,7 @@
-
+
@@ -5809,7 +5910,7 @@
-
+
@@ -5822,7 +5923,7 @@
-
+
@@ -5832,7 +5933,7 @@
-
+
@@ -5840,7 +5941,7 @@
-
+
@@ -5853,7 +5954,7 @@
-
+
@@ -5863,7 +5964,7 @@
-
+
@@ -5871,7 +5972,7 @@
-
+
@@ -5884,7 +5985,7 @@
-
+
@@ -5894,7 +5995,7 @@
-
+
@@ -5902,7 +6003,7 @@
-
+
@@ -5915,7 +6016,7 @@
-
+
@@ -5925,7 +6026,7 @@
-
+
@@ -5933,7 +6034,7 @@
-
+
@@ -5946,7 +6047,7 @@
-
+
@@ -5956,7 +6057,7 @@
-
+
@@ -5964,7 +6065,7 @@
-
+
@@ -5977,7 +6078,7 @@
-
+
@@ -5987,7 +6088,7 @@
-
+
@@ -5995,7 +6096,7 @@
-
+
@@ -6008,7 +6109,7 @@
-
+
@@ -6018,7 +6119,7 @@
-
+
@@ -6026,7 +6127,7 @@
-
+
@@ -6039,7 +6140,7 @@
-
+
@@ -6049,7 +6150,7 @@
-
+
@@ -6057,7 +6158,7 @@
-
+
@@ -6070,7 +6171,7 @@
-
+
@@ -6080,7 +6181,7 @@
-
+
@@ -6088,7 +6189,7 @@
-
+
@@ -6101,7 +6202,7 @@
-
+
@@ -6111,7 +6212,7 @@
-
+
@@ -6119,7 +6220,7 @@
-
+
@@ -6132,7 +6233,7 @@
-
+
@@ -6142,7 +6243,7 @@
-
+
@@ -6150,7 +6251,7 @@
-
+
@@ -6163,7 +6264,7 @@
-
+
@@ -6173,7 +6274,7 @@
-
+
@@ -6181,7 +6282,7 @@
-
+
@@ -6194,7 +6295,7 @@
-
+
@@ -6204,7 +6305,7 @@
-
+
@@ -6212,7 +6313,7 @@
-
+
@@ -6225,7 +6326,7 @@
-
+
@@ -6235,7 +6336,7 @@
-
+
@@ -6243,7 +6344,7 @@
-
+
@@ -6256,7 +6357,7 @@
-
+
@@ -6266,7 +6367,7 @@
-
+
@@ -6274,7 +6375,7 @@
-
+
@@ -6287,7 +6388,7 @@
-
+
@@ -6297,7 +6398,7 @@
-
+
@@ -6305,7 +6406,7 @@
-
+
@@ -6318,7 +6419,7 @@
-
+
@@ -6328,7 +6429,7 @@
-
+
@@ -6336,7 +6437,7 @@
-
+
@@ -6349,7 +6450,7 @@
-
+
@@ -6359,7 +6460,7 @@
-
+
@@ -6367,7 +6468,7 @@
-
+
@@ -6386,7 +6487,7 @@
-
+
@@ -6394,7 +6495,7 @@
-
+
@@ -6402,334 +6503,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -6740,10 +6514,22 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6751,7 +6537,49 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6761,6 +6589,140 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6769,12 +6731,26 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6793,151 +6769,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -6947,56 +6783,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -7008,301 +6794,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -7310,61 +6802,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -7375,10 +6813,22 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7386,7 +6836,133 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7399,14 +6975,254 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7416,6 +7232,265 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7423,6 +7498,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7430,6 +7531,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7446,38 +7579,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -7497,7 +7598,7 @@
-
+
@@ -7524,14 +7625,15 @@
-
+
+
-
+
@@ -7558,14 +7660,15 @@
-
+
+
-
+
@@ -7592,7 +7695,8 @@
-
+
+
diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas b/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas
index 88e3333298..f4ca23b882 100644
--- a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas
+++ b/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas
@@ -3,7 +3,7 @@
-
+
@@ -16,1135 +16,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1190,6 +62,7 @@
+
@@ -1227,6 +100,7 @@
+
@@ -1264,6 +138,7 @@
+
@@ -1301,6 +176,7 @@
+
@@ -1338,6 +214,7 @@
+
@@ -1375,6 +252,7 @@
+
@@ -1425,111 +303,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1576,6 +350,7 @@
+
@@ -1613,6 +388,7 @@
+
@@ -1633,7 +409,657 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1679,6 +1105,7 @@
+
@@ -1716,6 +1143,7 @@
+
@@ -1753,6 +1181,7 @@
+
@@ -1790,6 +1219,7 @@
+
@@ -1827,6 +1257,7 @@
+
@@ -1869,6 +1300,7 @@
+
@@ -1906,6 +1338,7 @@
+
@@ -1943,6 +1376,7 @@
+
@@ -1980,6 +1414,7 @@
+
@@ -2017,6 +1452,7 @@
+
@@ -2094,12 +1530,12 @@
-
+
-
+
@@ -2145,6 +1581,7 @@
+
@@ -2182,6 +1619,7 @@
+
@@ -2224,6 +1662,7 @@
+
@@ -2261,6 +1700,7 @@
+
@@ -2298,6 +1738,7 @@
+
@@ -2335,6 +1776,7 @@
+
@@ -2372,6 +1814,7 @@
+
@@ -2436,11 +1879,618 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -2450,7 +2500,7 @@
-
+
@@ -2458,7 +2508,7 @@
-
+
@@ -2471,7 +2521,7 @@
-
+
@@ -2481,7 +2531,7 @@
-
+
@@ -2489,7 +2539,7 @@
-
+
@@ -2502,7 +2552,7 @@
-
+
@@ -2512,7 +2562,7 @@
-
+
@@ -2520,7 +2570,7 @@
-
+
@@ -2533,7 +2583,7 @@
-
+
@@ -2543,7 +2593,7 @@
-
+
@@ -2551,7 +2601,7 @@
-
+
@@ -2564,7 +2614,7 @@
-
+
@@ -2574,7 +2624,7 @@
-
+
@@ -2582,7 +2632,7 @@
-
+
@@ -2595,7 +2645,7 @@
-
+
@@ -2605,7 +2655,7 @@
-
+
@@ -2613,7 +2663,7 @@
-
+
@@ -2626,7 +2676,7 @@
-
+
@@ -2636,7 +2686,7 @@
-
+
@@ -2644,7 +2694,7 @@
-
+
@@ -2657,7 +2707,7 @@
-
+
@@ -2667,7 +2717,7 @@
-
+
@@ -2675,7 +2725,7 @@
-
+
@@ -2688,7 +2738,7 @@
-
+
@@ -2698,7 +2748,7 @@
-
+
@@ -2706,7 +2756,7 @@
-
+
@@ -2719,7 +2769,7 @@
-
+
@@ -2729,7 +2779,7 @@
-
+
@@ -2737,7 +2787,7 @@
-
+
@@ -2750,7 +2800,7 @@
-
+
@@ -2760,7 +2810,7 @@
-
+
@@ -2768,7 +2818,7 @@
-
+
@@ -2781,7 +2831,7 @@
-
+
@@ -2791,7 +2841,7 @@
-
+
@@ -2799,7 +2849,7 @@
-
+
@@ -2812,7 +2862,7 @@
-
+
@@ -2822,7 +2872,7 @@
-
+
@@ -2830,7 +2880,7 @@
-
+
@@ -2843,7 +2893,7 @@
-
+
@@ -2853,7 +2903,7 @@
-
+
@@ -2861,7 +2911,7 @@
-
+
@@ -2880,7 +2930,7 @@
-
+
@@ -2888,188 +2938,41 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3077,94 +2980,30 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3180,27 +3019,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3208,22 +3027,20 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -3234,15 +3051,17 @@
-
-
-
+
+
+
+
-
-
-
+
+
+
+
@@ -3250,22 +3069,167 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3276,15 +3240,17 @@
-
-
-
+
+
+
+
-
-
-
+
+
+
+
@@ -3292,43 +3258,127 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3365,7 +3415,27 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3377,27 +3447,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3415,7 +3465,7 @@
-
+
@@ -3441,6 +3491,7 @@
+
diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/ontick.scriptcanvas b/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/ontick.scriptcanvas
index f49edd0f46..65f10d4f81 100644
--- a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/ontick.scriptcanvas
+++ b/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/ontick.scriptcanvas
@@ -3,7 +3,7 @@
-
+
@@ -16,295 +16,105 @@
-
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
@@ -312,21 +122,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -337,7 +147,7 @@
-
+
@@ -358,12 +168,13 @@
+
-
+
@@ -374,7 +185,7 @@
-
+
@@ -395,12 +206,56 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -432,12 +287,13 @@
+
-
+
@@ -469,12 +325,13 @@
+
-
+
@@ -506,12 +363,13 @@
+
-
+
@@ -543,21 +401,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
+
-
+
@@ -567,7 +442,7 @@
-
+
@@ -577,7 +452,7 @@
-
+
@@ -593,7 +468,304 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -639,6 +811,7 @@
+
@@ -676,6 +849,7 @@
+
@@ -713,6 +887,7 @@
+
@@ -750,6 +925,7 @@
+
@@ -787,6 +963,7 @@
+
@@ -824,6 +1001,7 @@
+
@@ -861,6 +1039,7 @@
+
@@ -898,6 +1077,7 @@
+
@@ -940,6 +1120,7 @@
+
@@ -977,6 +1158,7 @@
+
@@ -1056,102 +1238,285 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+