diff --git a/.gitignore b/.gitignore
index b942c2f42e..24af068c53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,14 +2,14 @@
.vscode/
__pycache__
AssetProcessorTemp/**
-build/**
-Cache/**
+[Bb]uild/**
+[Cc]ache/
Editor/EditorEventLog.xml
Editor/EditorLayout.xml
Tools/**/*egg-info/**
Tools/**/*egg-link
UserSettings.xml
-user/Registry/**
+[Uu]ser/
FrameCapture/**
.DS_Store
user*.cfg
@@ -17,4 +17,4 @@ user*.cfg
_savebackup/
#Output folder for test results when running Automated Tests
TestResults/**
-*.swatches
\ No newline at end of file
+*.swatches
diff --git a/AssetProcessorPlatformConfig.setreg b/AssetProcessorPlatformConfig.setreg
index c075342b98..d3cf6d6272 100644
--- a/AssetProcessorPlatformConfig.setreg
+++ b/AssetProcessorPlatformConfig.setreg
@@ -22,7 +22,7 @@
"AssetProcessor": {
"Settings": {
"Platform pc": {
- "tags": "tools,renderer,dx12,vulkan"
+ "tags": "tools,renderer,dx12,vulkan,null"
},
"Platform es3": {
"tags": "android,mobile,renderer,vulkan"
@@ -31,7 +31,7 @@
"tags": "mobile,renderer,metal"
},
"Platform osx_gl": {
- "tags": "tools,renderer,metal"
+ "tags": "tools,renderer,metal,null"
},
// this is an example of a headless platform that has no renderer.
// To use this you would still need to make sure 'assetplatform' in your startup params in your main() chooses this 'server' platform as your server 'assets' flavor
@@ -104,7 +104,7 @@
"ScanFolder Game": {
"watch": "@PROJECTROOT@",
- "display": "@PROJECTROOT@",
+ "display": "@PROJECTNAME@",
"recursive": 1,
"order": 0
},
@@ -172,6 +172,9 @@
"Exclude Build": {
"pattern": ".*/[Bb]uild/.*"
},
+ "Exclude UserSettings": {
+ "pattern": ".*/UserSettings.xml"
+ },
// ------------------------------------------------------------------------------
// Large Worlds Test
diff --git a/AutomatedReview/Jenkinsfile b/AutomatedReview/Jenkinsfile
index 1c4f03f30d..a9c16a9e4d 100644
--- a/AutomatedReview/Jenkinsfile
+++ b/AutomatedReview/Jenkinsfile
@@ -16,6 +16,8 @@ INCREMENTAL_BUILD_SCRIPT_PATH = 'scripts/build/bootstrap/incremental_build_util.
EMPTY_JSON = readJSON text: '{}'
+ENGINE_REPOSITORY_NAME = env.DEFAULT_REPOSITORY_NAME
+
def pipelineProperties = []
def pipelineParameters = [
@@ -117,7 +119,7 @@ def RegexMatcher(str, regex) {
def LoadPipelineConfig(String pipelineName, String branchName, String scmType) {
echo 'Loading pipeline config'
if (scmType == 'codecommit') {
- PullFilesFromGit(PIPELINE_CONFIG_FILE, branchName)
+ PullFilesFromGit(PIPELINE_CONFIG_FILE, branchName, true, ENGINE_REPOSITORY_NAME)
}
def pipelineConfig = {}
pipelineConfig = readJSON file: PIPELINE_CONFIG_FILE
@@ -132,7 +134,7 @@ def LoadPipelineConfig(String pipelineName, String branchName, String scmType) {
}
echo "Downloading platform pipeline configs ${pipeline_config}"
if (scmType == 'codecommit') {
- PullFilesFromGit(pipeline_config, branchName)
+ PullFilesFromGit(pipeline_config, branchName, false, ENGINE_REPOSITORY_NAME)
}
echo "Searching platform pipeline configs in ${pipeline_config} using ${platform_regex}"
for (pipeline_config_path in findFiles(glob: pipeline_config)) {
@@ -154,7 +156,7 @@ def LoadPipelineConfig(String pipelineName, String branchName, String scmType) {
}
echo "Downloading configs ${build_config}"
if (scmType == 'codecommit') {
- PullFilesFromGit(build_config, branchName)
+ PullFilesFromGit(build_config, branchName, false, ENGINE_REPOSITORY_NAME)
}
echo "Searching configs in ${build_config} using ${platform_regex}"
for (build_config_path in findFiles(glob: build_config)) {
@@ -163,6 +165,7 @@ def LoadPipelineConfig(String pipelineName, String branchName, String scmType) {
if(platform) {
pipelineConfig.platforms[platform].build_types = readJSON file: build_config_path.toString()
}
+ palRm(build_config_path.toString())
}
}
return pipelineConfig
@@ -193,29 +196,14 @@ def GetBuildEnvVars(Map platformEnv, Map buildTypeEnv, String pipelineName) {
// This may override the above one if there is an entry defined by the job
envVarMap[var.key] = var.value
}
- return envVarMap
-}
+
+ // Environment that only applies to to Jenkins tweaks.
+ // For 3rdParty downloads, we store them in the EBS volume so we can reuse them across node
+ // instances. This allow us to scale up and down without having to re-download 3rdParty
+ envVarMap['LY_PACKAGE_DOWNLOAD_CACHE_LOCATION'] = "${envVarMap['WORKSPACE']}/3rdParty/downloaded_packages"
+ envVarMap['LY_PACKAGE_UNPACK_LOCATION'] = "${envVarMap['WORKSPACE']}/3rdParty/packages"
-def CheckoutBootstrapScripts(String branchName) {
- checkout([$class: "GitSCM",
- branches: [[name: "*/${branchName}"]],
- doGenerateSubmoduleConfigurations: false,
- extensions: [
- [
- $class: "SparseCheckoutPaths",
- sparseCheckoutPaths: [
- [ $class: "SparseCheckoutPath", path: "AutomatedReview/" ],
- [ $class: "SparseCheckoutPath", path: "scripts/build/bootstrap/" ],
- [ $class: "SparseCheckoutPath", path: "Tools/build/JenkinsScripts/build/Platform" ]
- ]
- ],
- [
- $class: "CloneOption", depth: 1, noTags: false, reference: "", shallow: true
- ]
- ],
- submoduleCfg: [],
- userRemoteConfigs: scm.userRemoteConfigs
- ])
+ return envVarMap
}
def GetEnvStringList(Map envVarMap) {
@@ -229,7 +217,7 @@ def GetEnvStringList(Map envVarMap) {
// Pulls/downloads files from the repo through codecommit. Despite Glob matching is NOT supported, '*' is supported
// as a folder or filename (not a portion, it has to be the whole folder or filename)
def PullFilesFromGit(String filenamePath, String branchName, boolean failIfNotFound = true, String repositoryName = env.DEFAULT_REPOSITORY_NAME) {
- echo "PullFilesFromGit filenamePath=${filenamePath} branchName=${branchName}"
+ echo "PullFilesFromGit filenamePath=${filenamePath} branchName=${branchName} repositoryName=${repositoryName}"
def folderPathParts = filenamePath.tokenize('/')
def filename = folderPathParts[folderPathParts.size()-1]
folderPathParts.remove(folderPathParts.size()-1) // remove the filename
@@ -310,28 +298,42 @@ def PullFilesFromGit(String filenamePath, String branchName, boolean failIfNotFo
}
}
-def SetLfsCredentials(cmd, lbl = '') {
- if (env.IS_UNIX) {
- sh label: lbl,
- script: cmd
- } else {
- bat label: lbl,
- script: cmd
- }
+def CheckoutBootstrapScripts(String branchName) {
+ checkout([$class: "GitSCM",
+ branches: [[name: "*/${branchName}"]],
+ doGenerateSubmoduleConfigurations: false,
+ extensions: [
+ [
+ $class: "SparseCheckoutPaths",
+ sparseCheckoutPaths: [
+ [ $class: "SparseCheckoutPath", path: "AutomatedReview/" ],
+ [ $class: "SparseCheckoutPath", path: "scripts/build/bootstrap/" ],
+ [ $class: "SparseCheckoutPath", path: "Tools/build/JenkinsScripts/build/Platform" ]
+ ]
+ ],
+ [
+ $class: "CloneOption", depth: 1, noTags: false, reference: "", shallow: true
+ ]
+ ],
+ submoduleCfg: [],
+ userRemoteConfigs: scm.userRemoteConfigs
+ ])
}
def CheckoutRepo(boolean disableSubmodules = false) {
- palSh('git lfs uninstall', 'Git LFS Uninstall') // Prevent git from pulling lfs objects during checkout
-
- if(fileExists('.git')) {
- // If the repository after checkout is locked, likely we took a snapshot while git was running,
- // to leave the repo in a usable state, garbagecollect. This also helps in situations where
- def indexLockFile = '.git/index.lock'
- if(fileExists(indexLockFile)) {
- palSh('git gc', 'Git GarbageCollect')
- }
- if(fileExists(indexLockFile)) { // if it is still there, remove it
- palRm(indexLockFile)
+
+ dir(ENGINE_REPOSITORY_NAME) {
+ if(fileExists('.git')) {
+ // If the repository after checkout is locked, likely we took a snapshot while git was running,
+ // to leave the repo in a usable state, garbagecollect. This also helps in situations where
+ def indexLockFile = '.git/index.lock'
+ if(fileExists(indexLockFile)) {
+ palSh('git gc', 'Git GarbageCollect')
+ }
+ if(fileExists(indexLockFile)) { // if it is still there, remove it
+ palRm(indexLockFile)
+ }
+ palSh('git remote prune origin', 'Git reset')
}
}
@@ -344,41 +346,45 @@ def CheckoutRepo(boolean disableSubmodules = false) {
retryAttempt = retryAttempt + 1
if(params.PULL_REQUEST_ID) {
// This is a pull request build. Perform merge with destination branch before building.
- checkout scm: [
- $class: 'GitSCM',
- branches: scm.branches,
- extensions: [
- [$class: 'PreBuildMerge', options: [mergeRemote: 'origin', mergeTarget: params.DESTINATION_BRANCH]],
- [$class: 'SubmoduleOption', disableSubmodules: disableSubmodules, recursiveSubmodules: true],
- [$class: 'CheckoutOption', timeout: 60]
- ],
- userRemoteConfigs: scm.userRemoteConfigs
- ]
+ dir(ENGINE_REPOSITORY_NAME) {
+ checkout scm: [
+ $class: 'GitSCM',
+ branches: scm.branches,
+ extensions: [
+ [$class: 'PreBuildMerge', options: [mergeRemote: 'origin', mergeTarget: params.DESTINATION_BRANCH]],
+ [$class: 'SubmoduleOption', disableSubmodules: disableSubmodules, recursiveSubmodules: true],
+ [$class: 'CheckoutOption', timeout: 60]
+ ],
+ userRemoteConfigs: scm.userRemoteConfigs
+ ]
+ }
} else {
- checkout scm: [
- $class: 'GitSCM',
- branches: scm.branches,
- extensions: [
- [$class: 'SubmoduleOption', disableSubmodules: disableSubmodules, recursiveSubmodules: true],
- [$class: 'CheckoutOption', timeout: 60]
- ],
- userRemoteConfigs: scm.userRemoteConfigs
- ]
+ dir(ENGINE_REPOSITORY_NAME) {
+ checkout scm: [
+ $class: 'GitSCM',
+ branches: scm.branches,
+ extensions: [
+ [$class: 'SubmoduleOption', disableSubmodules: disableSubmodules, recursiveSubmodules: true],
+ [$class: 'CheckoutOption', timeout: 60]
+ ],
+ userRemoteConfigs: scm.userRemoteConfigs
+ ]
+ }
}
}
- // Run lfs in a separate step. Jenkins is unable to load the credentials for the custom LFS endpoint
- withCredentials([usernamePassword(credentialsId: "${env.GITHUB_USER}", passwordVariable: 'accesstoken', usernameVariable: 'username')]) {
- SetLfsCredentials("git config -f .lfsconfig lfs.url https://${username}:${accesstoken}@${env.LFS_URL}", 'Set credentials')
- }
- palSh('git lfs install', 'Git LFS Install')
- palSh('git lfs pull', 'Git LFS Pull')
+ // Add folder where we will store the 3rdParty downloads and packages
+ if(!fileExists('3rdParty')) {
+ palMkdir('3rdParty')
+ }
// CHANGE_ID is used by some scripts to identify uniquely the current change (usually metric jobs)
- palSh('git rev-parse HEAD > commitid', 'Getting commit id')
- env.CHANGE_ID = readFile file: 'commitid'
- env.CHANGE_ID = env.CHANGE_ID.trim()
- palRm('commitid')
+ dir(ENGINE_REPOSITORY_NAME) {
+ palSh('git rev-parse HEAD > commitid', 'Getting commit id')
+ env.CHANGE_ID = readFile file: 'commitid'
+ env.CHANGE_ID = env.CHANGE_ID.trim()
+ palRm('commitid')
+ }
}
def PreBuildCommonSteps(String pipeline, String branchName, String platform, String buildType, String workspace, boolean mount = true, boolean disableSubmodules = false) {
@@ -409,7 +415,10 @@ def PreBuildCommonSteps(String pipeline, String branchName, String platform, Str
"""
}
}
- if(params.CLEAN_WORKSPACE) {
+
+ // Cleanup previous repo location, we are currently at the root of the workspace, if we have a .git folder
+ // we need to cleanup. Once all branches take this relocation, we can remove this
+ if(params.CLEAN_WORKSPACE || fileExists("${workspace}/.git")) {
if(fileExists(workspace)) {
palRmDir(workspace)
}
@@ -420,19 +429,21 @@ def PreBuildCommonSteps(String pipeline, String branchName, String platform, Str
CheckoutRepo(disableSubmodules)
// Get python
- if(env.IS_UNIX) {
+ dir(ENGINE_REPOSITORY_NAME) {
+ if(env.IS_UNIX) {
sh label: 'Getting python',
script: 'python/get_python.sh'
- } else {
- bat label: 'Getting python',
- script: 'python/get_python.bat'
+ } else {
+ bat label: 'Getting python',
+ script: 'python/get_python.bat'
+ }
}
}
}
def Build(Map options, String platform, String type, String workspace) {
def command = "${options.BUILD_ENTRY_POINT} --platform ${platform} --type ${type}"
- dir(workspace) {
+ dir("${workspace}/${ENGINE_REPOSITORY_NAME}") {
if (env.IS_UNIX) {
sh label: "Running ${platform} ${type}",
script: "${options.PYTHON_DIR}/python.sh -u ${command}"
@@ -443,20 +454,20 @@ def Build(Map options, String platform, String type, String workspace) {
}
}
-def TestMetrics(Map options, Map buildType, String workspace, String branchName, String repoName) {
+def TestMetrics(Map options, String workspace, String branchName, String repoName, String buildJobName, String outputDirectory, String configuration) {
catchError(buildResult: null, stageResult: null) {
- def cmakeBuildDir = [workspace, buildType.value.PARAMETERS.OUTPUT_DIRECTORY].join('/')
- def command = "${options.PYTHON_DIR}/python.cmd -u mars/scripts/python/ctest_test_metric_scraper.py -e jenkins.creds.user ${username} -e jenkins.creds.pass ${apitoken} ${cmakeBuildDir} ${branchName} %BUILD_NUMBER% AR ${buildType.value.PARAMETERS.CONFIGURATION} ${repoName} "
- if (params.DESTINATION_BRANCH)
- command += '--destination-branch "$DESTINATION_BRANCH" '
- dir(workspace) {
+ def cmakeBuildDir = [workspace, ENGINE_REPOSITORY_NAME, outputDirectory].join('/')
+ dir("${workspace}/${ENGINE_REPOSITORY_NAME}") {
checkout scm: [
$class: 'GitSCM',
extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'mars']],
userRemoteConfigs: [[url: "${env.MARS_REPO}", name: 'mars']]
]
withCredentials([usernamePassword(credentialsId: "${env.SERVICE_USER}", passwordVariable: 'apitoken', usernameVariable: 'username')]) {
- bat label: "Publishing ${buildType.key} Test Metrics",
+ def command = "${options.PYTHON_DIR}/python.cmd -u mars/scripts/python/ctest_test_metric_scraper.py -e jenkins.creds.user ${username} -e jenkins.creds.pass ${apitoken} ${cmakeBuildDir} ${branchName} %BUILD_NUMBER% AR ${configuration} ${repoName} "
+ if (params.DESTINATION_BRANCH)
+ command += "--destination-branch ${params.DESTINATION_BRANCH} "
+ bat label: "Publishing ${buildJobName} Test Metrics",
script: command
}
}
@@ -467,7 +478,7 @@ def PostBuildCommonSteps(String workspace, boolean mount = true) {
echo 'Starting post-build common steps...'
if(params.PULL_REQUEST_ID) {
- dir(workspace) {
+ dir("${workspace}/${ENGINE_REPOSITORY_NAME}") {
if(fileExists('.git')) {
palSh('git reset --hard HEAD', 'Discard PR merge, git reset')
}
@@ -505,10 +516,10 @@ def CreateBuildStage(Map pipelineConfig, String platformName, String jobName, Ma
}
}
-def CreateTestMetricsStage(Map pipelineConfig, Map buildJob, String branchName, Map environmentVars) {
+def CreateTestMetricsStage(Map pipelineConfig, String branchName, Map environmentVars, String buildJobName, String outputDirectory, String configuration) {
return {
- stage("${buildJob.key}") {
- TestMetrics(pipelineConfig, buildJob, environmentVars['WORKSPACE'], branchName, env.DEFAULT_REPOSITORY_NAME)
+ stage("${buildJobName}_metrics") {
+ TestMetrics(pipelineConfig, environmentVars['WORKSPACE'], branchName, env.DEFAULT_REPOSITORY_NAME, buildJobName, outputDirectory, configuration)
}
}
}
@@ -564,7 +575,7 @@ try {
// Stash the INCREMENTAL_BUILD_SCRIPT_PATH since all nodes will use it
if (scmType == 'codecommit') {
- PullFilesFromGit(INCREMENTAL_BUILD_SCRIPT_PATH, branchName)
+ PullFilesFromGit(INCREMENTAL_BUILD_SCRIPT_PATH, branchName, true, ENGINE_REPOSITORY_NAME)
}
stash name: 'incremental_build_script',
includes: INCREMENTAL_BUILD_SCRIPT_PATH
@@ -599,19 +610,25 @@ try {
withEnv(GetEnvStringList(envVars)) {
timeout(time: envVars['TIMEOUT'], unit: 'MINUTES', activity: true) {
try {
+ def build_job_name = build_job.key
+
CreateSetupStage(pipelineName, branchName, platform.key, build_job.key, envVars).call()
if(build_job.value.steps) { //this is a pipe with many steps so create all the build stages
build_job.value.steps.each { build_step ->
+ build_job_name = build_step
CreateBuildStage(pipelineConfig, platform.key, build_step, envVars).call()
}
} else {
CreateBuildStage(pipelineConfig, platform.key, build_job.key, envVars).call()
}
- if (env.MARS_REPO && platform.key == 'Windows' && build_job.key.startsWith('test')) {
- CreateTestMetricsStage(pipelineConfig, build_job, branchName, envVars).call()
+
+ if (env.MARS_REPO && platform.key == 'Windows' && build_job_name.startsWith('test')) {
+ def output_directory = platform.value.build_types[build_job_name].PARAMETERS.OUTPUT_DIRECTORY
+ def configuration = platform.value.build_types[build_job_name].PARAMETERS.CONFIGURATION
+ CreateTestMetricsStage(pipelineConfig, branchName, envVars, build_job_name, output_directory, configuration).call()
}
- }
+ }
catch(Exception e) {
// https://github.com/jenkinsci/jenkins/blob/master/core/src/main/java/hudson/model/Result.java
// {SUCCESS,UNSTABLE,FAILURE,NOT_BUILT,ABORTED}
diff --git a/AutomatedTesting/Gem/PythonTests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
index a787fb84fa..19c6eb260e 100644
--- a/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
@@ -21,7 +21,7 @@ add_subdirectory(assetpipeline)
if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_pytest(
NAME AutomatedTesting::PhysicsTests
- TEST_SUITE main
+ TEST_SUITE sandbox
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/physics/TestSuite_Active.py
TIMEOUT 3600
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_enum.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_enum.py
index 4fa9356b93..3d51444500 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_enum.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_enum.py
@@ -53,7 +53,7 @@ typeIdsList = editor.EditorComponentAPIBus(bus.Broadcast, 'FindComponentTypeIdsB
addComponentsOutcome = editor.EditorComponentAPIBus(bus.Broadcast, 'AddComponentsOfType', entityId, typeIdsList)
print_result("Components added to entity", addComponentsOutcome.IsSuccess())
-# fetch the Vegetation Distance Between Filter
+# fetch the Vegetation Distance Between Filter
vegDistTypeIdList = editor.EditorComponentAPIBus(bus.Broadcast, 'FindComponentTypeIdsByEntityType', ["Vegetation Distance Between Filter"], entity.EntityType().Game)
componentOutcome = editor.EditorComponentAPIBus(bus.Broadcast, 'GetComponentsOfType', entityId, vegDistTypeIdList[0])
print_result('Found Vegetation Distance Between Filter', componentOutcome.IsSuccess())
diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/hydra_test_utils.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/hydra_test_utils.py
index 2c88d5d1dc..caf109571e 100755
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/hydra_test_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/hydra_test_utils.py
@@ -52,8 +52,9 @@ def launch_and_validate_results(request, test_directory, editor, editor_script,
test_case = os.path.join(test_directory, editor_script)
request.addfinalizer(lambda: teardown_editor(editor))
logger.debug("Running automated test: {}".format(editor_script))
- editor.args.extend(["--skipWelcomeScreenDialog", "--regset=/Amazon/Settings/EnableSourceControl=false",
- run_python, test_case, "--runpythonargs", " ".join(cfg_args)])
+ editor.args.extend(["--skipWelcomeScreenDialog", "--regset=/Amazon/Settings/EnableSourceControl=false",
+ "--regset=/Amazon/Preferences/EnablePrefabSystem=false", run_python, test_case,
+ "--runpythonargs", " ".join(cfg_args)])
if auto_test_mode:
editor.args.extend(["--autotest_mode"])
if null_renderer:
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14195074_ScriptCanvas_PostUpdateEvent.py b/AutomatedTesting/Gem/PythonTests/physics/C14195074_ScriptCanvas_PostUpdateEvent.py
index 9f64f70fe0..4beca8845d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14195074_ScriptCanvas_PostUpdateEvent.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14195074_ScriptCanvas_PostUpdateEvent.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
"""
# Test case ID : C14195074
-# Test Case Title : Verify Post Update Events
+# Test Case Title : Verify Postsimulate Events
# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/14195074
# fmt: off
@@ -29,7 +29,7 @@ class Tests:
def C14195074_ScriptCanvas_PostUpdateEvent():
"""
- Summary: Verifies that Post Update Event node in Script Canvas works as expected.
+ Summary: Verifies that Postsimulate Event node in Script Canvas works as expected.
Level Description:
Lead_Sphere - Directly next to Follow_sphere on the +x axis; has rigid body(gravity disabled), sphere shape
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14902097_ScriptCanvas_PreUpdateEvent.py b/AutomatedTesting/Gem/PythonTests/physics/C14902097_ScriptCanvas_PreUpdateEvent.py
index 323bbb9318..4c9c7de263 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14902097_ScriptCanvas_PreUpdateEvent.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14902097_ScriptCanvas_PreUpdateEvent.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
"""
# Test case ID : C14902097
-# Test Case Title : Verify Pre Update Events
+# Test Case Title : Verify Presimulate Events
# URL of the test case : https://testrail.agscollab.com/index.php?/cases/view/14902097
# fmt: off
@@ -29,7 +29,7 @@ class Tests:
def C14902097_ScriptCanvas_PreUpdateEvent():
"""
- Summary: Verifies that Pre Update Event node in Script Canvas works as expected.
+ Summary: Verifies that Presimulate node in Script Canvas works as expected.
Level Description:
Lead_Sphere - Directly next to Follow_sphere on the +x axis; has rigid body (gravity disabled), sphere shape
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py b/AutomatedTesting/Gem/PythonTests/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py
index 44da1373b0..669ff3d84d 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py
@@ -11,7 +11,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 PostPhysicsUpdate works independently from rendering tick
+# 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
@@ -41,7 +41,7 @@ def C14902098_ScriptCanvas_PostPhysicsUpdate():
"""
Summary:
- Check that force region simulation with PostPhysicsUpdate works independently from rendering tick.
+ Check that force region simulation with Postsimulate works independently from rendering tick.
Level Description:
A Sphere is placed inside a Force Region. The "Fixed Time Step" in PhysX Configuration is set to 0.05.
@@ -49,7 +49,7 @@ def C14902098_ScriptCanvas_PostPhysicsUpdate():
Box Shape components
Sphere (entity) - Entity with PhysX Rigid Body, PhysX Collider, Mesh and 2 Script Canvas components
Script Canvas:
- onpostphysicsupdate - The script checks the position of the sphere on every On Post Physics Update event and prints
+ onpostphysicsupdate - The script checks the position of the sphere on every On Postsimulate event and prints
debug statements as per the position of the sphere relative to its previous position.
ontick - The script checks the position of the sphere on every On Tick event and prints
debug statements as per the position of the sphere relative to its previous position.
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C28978033_Ragdoll_WorldBodyBusTests.py b/AutomatedTesting/Gem/PythonTests/physics/C28978033_Ragdoll_WorldBodyBusTests.py
index f82e211525..9f595616e7 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C28978033_Ragdoll_WorldBodyBusTests.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C28978033_Ragdoll_WorldBodyBusTests.py
@@ -37,7 +37,7 @@ def C28978033_Ragdoll_WorldBodyBusTests():
- RayEnd: entity that points where to end the raycast_correct
| ( ) |
- o - - - | ¦ | - - > o
+ o - - - | | | - - > o
RayStart | / \ | RayEnd
TestRagdoll
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044697_Material_PerfaceMaterialValidation.py b/AutomatedTesting/Gem/PythonTests/physics/C4044697_Material_PerfaceMaterialValidation.py
index 114be00012..9ae4122eef 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C4044697_Material_PerfaceMaterialValidation.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C4044697_Material_PerfaceMaterialValidation.py
@@ -253,7 +253,7 @@ def C4044697_Material_PerfaceMaterialValidation():
# 3) Create entity objects
sphere_0 = Entity("Sphere_0", math.Vector3(0.0, -10.0, 0.0), math.Vector3(0.0, 0.0, 0.0))
- sphere_1 = Entity("Sphere_1", math.Vector3(-10.0, 0.0, 0.0), math.Vector3(8.35, -0.71, 4.56))
+ sphere_1 = Entity("Sphere_1", math.Vector3(-10.0, 0.0, 0.0), math.Vector3(10.09, 1.85, 1.18))
sphere_2 = Entity("Sphere_2", math.Vector3(10.0, 0.0, 0.0), math.Vector3(-5.0, 0.0, 0.0))
perface_entity = Entity("Perface_Entity")
entity_list = [sphere_0, sphere_1, sphere_2, perface_entity]
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py b/AutomatedTesting/Gem/PythonTests/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py
index f9a0687cc5..2b7bf49278 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py
@@ -148,7 +148,7 @@ def C5959763_ForceRegion_ForceRegionImpulsesCube():
Report.failure(Tests.tests_completed)
else:
- # Did Force Region succeed. True if vector z ≈ 1 and force region magnitude ≈ magnitude applied on cube
+ # Did Force Region succeed. True if vector z is close to 1 and force region magnitude is close to magnitude applied on cube
force_region_result = (
ifVectorClose(RegionObject.force_vector.z, UPWARD_Z_VECTOR) and RegionObject.force_region_in_range()
)
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py b/AutomatedTesting/Gem/PythonTests/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py
index 7ff62e7cb2..02bba2f848 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py
@@ -148,7 +148,7 @@ def C5959764_ForceRegion_ForceRegionImpulsesCapsule():
Report.failure(Tests.tests_completed)
else:
- # Did Force Region succeed. True if vector z ≈ 1 and force region magnitude ≈ magnitude applied on Capsule
+ # Did Force Region succeed. True if vector z is close to 1 and force region magnitude is close to magnitude applied on Capsule
force_region_result = (
ifVectorClose(RegionObject.force_vector.z, UPWARD_Z_VECTOR) and RegionObject.force_region_in_range()
)
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959765_ForceRegion_AssetGetsImpulsed.py b/AutomatedTesting/Gem/PythonTests/physics/C5959765_ForceRegion_AssetGetsImpulsed.py
index 8268440521..1afd7b4536 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C5959765_ForceRegion_AssetGetsImpulsed.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C5959765_ForceRegion_AssetGetsImpulsed.py
@@ -153,7 +153,7 @@ def C5959765_ForceRegion_AssetGetsImpulsed():
Report.failure(Tests.tests_completed)
else:
- # Did Force Region succeed. True if vector z ≈ 1 and force region magnitude ≈ magnitude applied on Asset
+ # Did Force Region succeed. True if vector z is close to 1 and force region magnitude is close to magnitude applied on Asset
force_region_result = (
ifVectorAxisClose(RegionObject.force_vector.z, UPWARD_Z_VECTOR) and RegionObject.force_region_in_range()
)
diff --git a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Active.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Active.py
index 23a892b29d..2b93dc4a6f 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Active.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Active.py
@@ -27,7 +27,7 @@ from base import TestAutomationBase
revert_physics_config = fm.file_revert_list(['physxdebugconfiguration.setreg', 'physxdefaultsceneconfiguration.setreg', 'physxsystemconfiguration.setreg'], 'AutomatedTesting/Registry')
-@pytest.mark.SUITE_main
+@pytest.mark.SUITE_sandbox
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
@pytest.mark.parametrize("project", ["AutomatedTesting"])
class TestAutomation(TestAutomationBase):
@@ -263,11 +263,6 @@ class TestAutomation(TestAutomationBase):
from . import C4976243_Collision_SameCollisionGroupDiffCollisionLayers as test_module
self._run_test(request, workspace, editor, test_module)
- @revert_physics_config
- def test_C6224408_ScriptCanvas_EntitySpawn(self, request, workspace, editor, launcher_platform):
- from . import C6224408_ScriptCanvas_EntitySpawn 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
@@ -324,6 +319,10 @@ class TestAutomation(TestAutomationBase):
from . import C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody as test_module
self._run_test(request, workspace, editor, test_module)
+ # Marking the test as an expected failure due to sporadic failure on Automated Review: LYN-2580
+ # The test still runs, but a failure of the test doesn't result in the test run failing
+ @pytest.mark.xfail(
+ reason="This test needs new physics asset with multiple materials to be more stable.")
@revert_physics_config
def test_C4044697_Material_PerfaceMaterialValidation(self, request, workspace, editor, launcher_platform):
from . import C4044697_Material_PerfaceMaterialValidation as test_module
@@ -402,9 +401,6 @@ class TestAutomation(TestAutomationBase):
from . import C4976244_Collider_SameGroupSameLayerCollision as test_module
self._run_test(request, workspace, editor, test_module)
- @pytest.mark.xfail(
- reason="This test seems to fail sometimes due to reliance on non-deterministic movement calculations."
- "Need to figure out the reason why this is the case")
@revert_physics_config
@fm.file_override('physxdefaultsceneconfiguration.setreg','C14195074_ScriptCanvas_PostUpdateEvent.setreg', 'AutomatedTesting/Registry')
def test_C14195074_ScriptCanvas_PostUpdateEvent(self, request, workspace, editor, launcher_platform):
@@ -428,9 +424,6 @@ class TestAutomation(TestAutomationBase):
from . import C3510644_Collider_CollisionGroups as test_module
self._run_test(request, workspace, editor, test_module)
- @pytest.mark.xfail(
- reason="This test seems to fail sometimes due to reliance on non-deterministic movement calculations."
- "Need to figure out the reason why this is the case")
@revert_physics_config
@fm.file_override('physxdefaultsceneconfiguration.setreg','C14902097_ScriptCanvas_PreUpdateEvent.setreg', 'AutomatedTesting/Registry')
def test_C14902097_ScriptCanvas_PreUpdateEvent(self, request, workspace, editor, launcher_platform):
diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/C12712452_ScriptCanvas_CollisionEvents.ly b/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/C12712452_ScriptCanvas_CollisionEvents.ly
index 15986210b7..b34e483067 100644
--- a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/C12712452_ScriptCanvas_CollisionEvents.ly
+++ b/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/C12712452_ScriptCanvas_CollisionEvents.ly
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:00f8a158fcfb667b060c902ed2129024f5041816e299c9cace2370f4ac60287d
-size 10762
+oid sha256:ec428aee9c49ffd58a00fdcbb0625185a22f5690f7b2e81326ef5443699019e6
+size 10945
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 4cda3349c0..a422f072a5 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,9 +39,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -67,7 +81,7 @@
-
+
@@ -78,7 +92,7 @@
-
+
@@ -104,7 +118,7 @@
-
+
@@ -114,7 +128,7 @@
-
+
@@ -141,7 +155,7 @@
-
+
@@ -151,7 +165,7 @@
-
+
@@ -178,7 +192,7 @@
-
+
@@ -188,8 +202,8 @@
-
-
+
+
@@ -201,7 +215,7 @@
-
+
@@ -215,7 +229,7 @@
-
+
@@ -224,23 +238,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
@@ -257,7 +303,7 @@
-
+
@@ -266,18 +312,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -290,11 +355,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -303,25 +431,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -331,7 +473,7 @@
-
+
@@ -341,8 +483,8 @@
-
-
+
+
@@ -351,10 +493,10 @@
-
+
-
+
@@ -368,7 +510,7 @@
-
+
@@ -378,10 +520,10 @@
-
-
+
+
-
+
@@ -389,13 +531,13 @@
-
+
-
+
@@ -405,7 +547,7 @@
-
+
@@ -415,24 +557,24 @@
-
-
+
+
-
-
+
+
-
+
-
+
@@ -442,7 +584,7 @@
-
+
@@ -452,8 +594,8 @@
-
-
+
+
@@ -479,7 +621,7 @@
-
+
@@ -489,11 +631,48 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -516,7 +695,7 @@
-
+
@@ -525,8 +704,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -536,14 +734,14 @@
-
-
+
+
-
+
-
+
@@ -554,105 +752,47 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
@@ -660,21 +800,21 @@
-
+
-
+
-
+
-
+
@@ -716,7 +856,7 @@
-
+
@@ -753,7 +893,7 @@
-
+
@@ -806,7 +946,7 @@
-
+
@@ -822,21 +962,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -847,7 +987,7 @@
-
+
@@ -873,7 +1013,7 @@
-
+
@@ -883,8 +1023,8 @@
-
-
+
+
@@ -910,7 +1050,7 @@
-
+
@@ -920,10 +1060,10 @@
-
-
+
+
-
+
@@ -931,51 +1071,23 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -990,8 +1102,8 @@
-
-
+
+
@@ -1013,109 +1125,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
@@ -1123,21 +1149,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -1148,7 +1174,7 @@
-
+
@@ -1174,7 +1200,7 @@
-
+
@@ -1184,8 +1210,8 @@
-
-
+
+
@@ -1211,7 +1237,7 @@
-
+
@@ -1220,14 +1246,9 @@
-
-
-
-
-
-
-
+
+
@@ -1236,14 +1257,14 @@
-
-
+
+
-
+
@@ -1253,7 +1274,7 @@
-
+
@@ -1262,18 +1283,23 @@
+
+
+
+
+
-
-
+
+
-
+
-
+
@@ -1291,21 +1317,18 @@
-
+
-
-
-
+
-
+
-
@@ -1313,21 +1336,125 @@
-
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -1336,8 +1463,13 @@
+
+
+
+
+
-
+
@@ -1348,13 +1480,13 @@
-
+
-
+
@@ -1364,7 +1496,7 @@
-
+
@@ -1374,7 +1506,7 @@
-
+
@@ -1384,7 +1516,7 @@
-
+
@@ -1401,7 +1533,7 @@
-
+
@@ -1410,13 +1542,8 @@
-
-
-
-
-
-
+
@@ -1426,14 +1553,14 @@
-
-
+
+
-
+
@@ -1443,7 +1570,7 @@
-
+
@@ -1453,11 +1580,11 @@
-
+
-
-
+
+
@@ -1490,12 +1617,21 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
@@ -1503,7 +1639,7 @@
-
+
@@ -1693,21 +1829,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -1717,8 +1853,8 @@
-
-
+
+
@@ -1744,7 +1880,7 @@
-
+
@@ -1754,8 +1890,8 @@
-
-
+
+
@@ -1764,7 +1900,7 @@
-
+
@@ -1781,7 +1917,7 @@
-
+
@@ -1791,8 +1927,8 @@
-
-
+
+
@@ -1818,7 +1954,7 @@
-
+
@@ -1827,9 +1963,14 @@
+
+
+
+
+
-
-
+
+
@@ -1838,24 +1979,58 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -1865,8 +2040,8 @@
-
-
+
+
@@ -1875,7 +2050,7 @@
-
+
@@ -1892,7 +2067,7 @@
-
+
@@ -1901,14 +2076,9 @@
-
-
-
-
-
-
-
+
+
@@ -1917,14 +2087,14 @@
-
-
+
+
-
+
@@ -1934,7 +2104,7 @@
-
+
@@ -1967,48 +2137,143 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -2017,8 +2282,13 @@
+
+
+
+
+
-
+
@@ -2028,14 +2298,14 @@
-
-
+
+
-
+
-
+
@@ -2045,7 +2315,7 @@
-
+
@@ -2055,24 +2325,24 @@
-
+
-
+
-
-
+
+
-
+
@@ -2082,7 +2352,7 @@
-
+
@@ -2092,34 +2362,80 @@
-
+
-
-
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -2129,8 +2445,8 @@
-
-
+
+
@@ -2139,10 +2455,10 @@
-
+
-
+
@@ -2156,7 +2472,7 @@
-
+
@@ -2166,10 +2482,10 @@
-
-
+
+
-
+
@@ -2177,13 +2493,13 @@
-
+
-
+
@@ -2193,7 +2509,7 @@
-
+
@@ -2203,10 +2519,10 @@
-
+
-
+
@@ -2214,122 +2530,29 @@
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
-
+
@@ -2337,21 +2560,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -2360,9 +2583,14 @@
+
+
+
+
+
-
-
+
+
@@ -2372,13 +2600,13 @@
-
+
-
+
@@ -2388,7 +2616,7 @@
-
+
@@ -2398,8 +2626,8 @@
-
-
+
+
@@ -2425,7 +2653,7 @@
-
+
@@ -2435,8 +2663,8 @@
-
-
+
+
@@ -2458,48 +2686,57 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -2508,9 +2745,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -2519,7 +2770,7 @@
-
+
@@ -2536,7 +2787,7 @@
-
+
@@ -2545,14 +2796,9 @@
-
-
-
-
-
-
-
+
+
@@ -2562,13 +2808,13 @@
-
+
-
+
@@ -2578,7 +2824,7 @@
-
+
@@ -2588,10 +2834,10 @@
-
-
+
+
-
+
@@ -2599,13 +2845,13 @@
-
+
-
+
@@ -2615,7 +2861,7 @@
-
+
@@ -2625,24 +2871,24 @@
-
-
+
+
-
-
+
+
-
+
-
+
@@ -2652,7 +2898,7 @@
-
+
@@ -2662,8 +2908,8 @@
-
-
+
+
@@ -2689,7 +2935,7 @@
-
+
@@ -2699,11 +2945,11 @@
-
+
-
-
+
+
@@ -2726,7 +2972,7 @@
-
+
@@ -2736,11 +2982,11 @@
-
+
-
+
@@ -2763,7 +3009,7 @@
-
+
@@ -2772,8 +3018,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -2783,24 +3048,87 @@
-
-
+
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2809,18 +3137,23 @@
+
+
+
+
+
-
+
-
+
-
+
@@ -2837,7 +3170,44 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2847,7 +3217,7 @@
-
+
@@ -2860,7 +3230,7 @@
-
+
@@ -2884,96 +3254,21 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
@@ -2981,21 +3276,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -3004,9 +3299,14 @@
+
+
+
+
+
-
-
+
+
@@ -3016,13 +3316,13 @@
-
+
-
+
@@ -3032,7 +3332,7 @@
-
+
@@ -3042,8 +3342,8 @@
-
-
+
+
@@ -3052,7 +3352,7 @@
-
+
@@ -3069,7 +3369,7 @@
-
+
@@ -3079,8 +3379,8 @@
-
-
+
+
@@ -3106,7 +3406,7 @@
-
+
@@ -3115,23 +3415,18 @@
-
-
-
-
-
-
-
+
+
-
-
+
+
-
+
@@ -3149,18 +3444,30 @@
-
+
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -3168,21 +3475,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -3191,9 +3498,14 @@
+
+
+
+
+
-
-
+
+
@@ -3203,13 +3515,13 @@
-
+
-
+
@@ -3219,7 +3531,7 @@
-
+
@@ -3229,8 +3541,8 @@
-
-
+
+
@@ -3239,7 +3551,7 @@
-
+
@@ -3256,7 +3568,7 @@
-
+
@@ -3266,10 +3578,10 @@
-
+
-
+
@@ -3277,29 +3589,47 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -3307,21 +3637,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -3330,14 +3660,9 @@
-
-
-
-
-
-
-
+
+
@@ -3347,13 +3672,13 @@
-
+
-
+
@@ -3363,7 +3688,7 @@
-
+
@@ -3373,8 +3698,8 @@
-
-
+
+
@@ -3400,7 +3725,7 @@
-
+
@@ -3410,8 +3735,8 @@
-
-
+
+
@@ -3433,161 +3758,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3596,14 +3771,9 @@
-
-
-
-
-
-
-
+
+
@@ -3612,14 +3782,14 @@
-
-
+
+
-
+
@@ -3629,7 +3799,7 @@
-
+
@@ -3639,8 +3809,8 @@
-
-
+
+
@@ -3649,7 +3819,7 @@
-
+
@@ -3666,7 +3836,7 @@
-
+
@@ -3675,9 +3845,14 @@
+
+
+
+
+
-
-
+
+
@@ -3686,70 +3861,24 @@
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3759,24 +3888,24 @@
-
-
+
+
-
+
-
-
+
+
-
+
@@ -3786,7 +3915,7 @@
-
+
@@ -3796,8 +3925,8 @@
-
-
+
+
@@ -3809,7 +3938,7 @@
-
+
@@ -3823,7 +3952,7 @@
-
+
@@ -3856,143 +3985,181 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4001,13 +4168,8 @@
-
-
-
-
-
-
+
@@ -4018,13 +4180,13 @@
-
+
-
+
@@ -4034,7 +4196,7 @@
-
+
@@ -4044,7 +4206,7 @@
-
+
@@ -4054,7 +4216,7 @@
-
+
@@ -4071,7 +4233,7 @@
-
+
@@ -4081,24 +4243,24 @@
-
+
-
-
+
+
-
+
-
+
@@ -4123,16 +4285,16 @@
-
-
-
+
+
+
-
+
@@ -4140,21 +4302,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -4163,13 +4325,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -4179,14 +4373,14 @@
-
-
+
+
-
+
@@ -4196,7 +4390,7 @@
-
+
@@ -4205,8 +4399,13 @@
+
+
+
+
+
-
+
@@ -4217,13 +4416,13 @@
-
+
-
+
@@ -4233,7 +4432,7 @@
-
+
@@ -4243,10 +4442,10 @@
-
+
-
+
@@ -4254,13 +4453,13 @@
-
+
-
+
@@ -4280,21 +4479,12 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
@@ -4302,21 +4492,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -4327,7 +4517,7 @@
-
+
@@ -4353,7 +4543,7 @@
-
+
@@ -4363,8 +4553,8 @@
-
-
+
+
@@ -4390,7 +4580,7 @@
-
+
@@ -4400,10 +4590,10 @@
-
-
+
+
-
+
@@ -4411,23 +4601,51 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -4442,8 +4660,8 @@
-
-
+
+
@@ -4459,7 +4677,81 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4470,18 +4762,30 @@
-
+
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -4489,21 +4793,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -4514,7 +4818,7 @@
-
+
@@ -4540,7 +4844,7 @@
-
+
@@ -4550,8 +4854,8 @@
-
-
+
+
@@ -4577,7 +4881,7 @@
-
+
@@ -4586,9 +4890,14 @@
+
+
+
+
+
-
-
+
+
@@ -4597,14 +4906,14 @@
-
-
+
+
-
+
@@ -4614,7 +4923,7 @@
-
+
@@ -4623,23 +4932,18 @@
-
-
-
-
-
-
-
+
+
-
+
-
+
@@ -4653,42 +4957,293 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
+
-
+
@@ -4696,7 +5251,7 @@
-
+
@@ -4709,17 +5264,17 @@
-
+
-
+
-
+
@@ -4727,7 +5282,7 @@
-
+
@@ -4740,28 +5295,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -4771,28 +5326,59 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4802,17 +5388,17 @@
-
+
-
+
-
+
@@ -4820,7 +5406,7 @@
-
+
@@ -4833,28 +5419,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -4864,17 +5450,48 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -4882,7 +5499,7 @@
-
+
@@ -4895,28 +5512,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -4926,25 +5543,25 @@
-
+
-
+
-
+
-
+
-
+
@@ -4957,28 +5574,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -4988,28 +5605,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5019,28 +5636,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5050,28 +5667,90 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -5081,28 +5760,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5112,28 +5791,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5143,28 +5822,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5174,28 +5853,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5205,28 +5884,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5236,28 +5915,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5267,28 +5946,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5298,28 +5977,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5329,28 +6008,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5360,28 +6039,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5391,28 +6070,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5422,28 +6101,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5453,28 +6132,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5484,28 +6163,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5515,28 +6194,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5546,28 +6225,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5577,28 +6256,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5608,28 +6287,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5639,28 +6318,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5670,28 +6349,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5707,7 +6386,7 @@
-
+
@@ -5715,7 +6394,7 @@
-
+
@@ -5723,33 +6402,222 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
@@ -5757,7 +6625,7 @@
-
+
@@ -5765,27 +6633,27 @@
-
+
-
+
-
+
-
+
@@ -5799,22 +6667,20 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -5825,15 +6691,17 @@
-
-
-
+
+
+
+
-
-
-
+
+
+
+
@@ -5841,41 +6709,41 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
@@ -5883,41 +6751,46 @@
-
+
-
-
-
-
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
@@ -5925,22 +6798,20 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -5951,36 +6822,17 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -5988,41 +6840,41 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
@@ -6030,7 +6882,7 @@
-
+
@@ -6038,7 +6890,7 @@
-
+
@@ -6058,7 +6910,7 @@
-
+
@@ -6072,46 +6924,41 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
+
+
+
+
@@ -6119,7 +6966,7 @@
-
+
@@ -6127,27 +6974,27 @@
-
+
-
+
-
+
-
+
@@ -6161,88 +7008,83 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
+
+
+
+
@@ -6250,46 +7092,41 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
+
+
+
+
@@ -6297,41 +7134,41 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
@@ -6339,41 +7176,41 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
@@ -6381,41 +7218,41 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
@@ -6423,41 +7260,41 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
@@ -6465,7 +7302,7 @@
-
+
@@ -6473,27 +7310,27 @@
-
+
-
+
-
+
-
+
@@ -6507,41 +7344,41 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
@@ -6549,41 +7386,41 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
@@ -6594,49 +7431,57 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/leveldata/TimeOfDay.xml
index 3a083a6882..6ea168cc6b 100644
--- a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/leveldata/TimeOfDay.xml
+++ b/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/leveldata/TimeOfDay.xml
@@ -1,17 +1,17 @@
-
+
-
+
-
+
-
+
@@ -20,31 +20,31 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -56,7 +56,7 @@
-
+
@@ -83,10 +83,10 @@
-
+
-
+
@@ -104,7 +104,7 @@
-
+
@@ -140,7 +140,7 @@
-
+
@@ -149,7 +149,7 @@
-
+
@@ -158,76 +158,76 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -239,10 +239,10 @@
-
+
-
+
@@ -251,7 +251,7 @@
-
+
@@ -263,7 +263,7 @@
-
+
@@ -275,10 +275,10 @@
-
+
-
+
@@ -287,7 +287,7 @@
-
+
@@ -341,7 +341,7 @@
-
+
@@ -350,7 +350,7 @@
-
+
diff --git a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/C12712455_ScriptCanvas_ShapeCastVerification.ly b/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/C12712455_ScriptCanvas_ShapeCastVerification.ly
index 5c93e231d5..5088b67628 100644
--- a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/C12712455_ScriptCanvas_ShapeCastVerification.ly
+++ b/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/C12712455_ScriptCanvas_ShapeCastVerification.ly
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f096ae6620bbb17e9a1c98f7f476f62762753e1359a1dfe84192ba3e052e6404
-size 10036
+oid sha256:6df3d83f5b9dd43118aba5cef3a8fe9ee42ee253f7bd3886fc7c88f41c504fff
+size 8802
diff --git a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/filelist.xml b/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/filelist.xml
index 362bfb7b51..36bb23e8d4 100644
--- a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/filelist.xml
+++ b/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/filelist.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/level.pak b/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/level.pak
index 6945bded24..cc9a49f622 100644
--- a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/level.pak
+++ b/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/level.pak
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8cdc13062aba6712ebbcc2f32f49295cd1e872f7313a02994f8d06baf7765bd0
-size 39334
+oid sha256:625b55f2edc3e8eabeea7d87575119590fe7ed88db70a6125eb6bf9d891d743f
+size 39113
diff --git a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/leveldata/TimeOfDay.xml
index 456d609b8a..6ea168cc6b 100644
--- a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/leveldata/TimeOfDay.xml
+++ b/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/leveldata/TimeOfDay.xml
@@ -1,356 +1,356 @@
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas b/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas
index e973421d1d..88e3333298 100644
--- a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas
+++ b/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas
@@ -3,7 +3,7 @@
-
+
@@ -16,21 +16,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -40,8 +40,8 @@
-
-
+
+
@@ -67,7 +67,7 @@
-
+
@@ -77,8 +77,8 @@
-
-
+
+
@@ -87,7 +87,7 @@
-
+
@@ -104,7 +104,7 @@
-
+
@@ -114,8 +114,8 @@
-
-
+
+
@@ -141,7 +141,7 @@
-
+
@@ -150,46 +150,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
@@ -198,24 +166,58 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -225,13 +227,22 @@
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -241,13 +252,13 @@
-
+
-
+
@@ -257,7 +268,7 @@
-
+
@@ -267,24 +278,24 @@
-
-
+
+
-
+
-
-
+
+
-
+
@@ -294,7 +305,7 @@
-
+
@@ -304,8 +315,8 @@
-
-
+
+
@@ -317,7 +328,7 @@
-
+
@@ -331,7 +342,7 @@
-
+
@@ -341,10 +352,10 @@
-
-
+
+
-
+
@@ -352,13 +363,13 @@
-
+
-
+
@@ -368,7 +379,7 @@
-
+
@@ -378,8 +389,8 @@
-
-
+
+
@@ -405,7 +416,7 @@
-
+
@@ -419,8 +430,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -443,48 +468,60 @@
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -494,24 +531,24 @@
-
+
-
+
-
-
+
+
-
+
@@ -521,7 +558,7 @@
-
+
@@ -531,7 +568,7 @@
-
+
@@ -544,7 +581,7 @@
-
+
@@ -558,7 +595,7 @@
-
+
@@ -567,18 +604,23 @@
+
+
+
+
+
-
+
-
+
-
+
@@ -595,7 +637,7 @@
-
+
@@ -604,18 +646,23 @@
+
+
+
+
+
-
+
-
+
-
+
@@ -632,7 +679,7 @@
-
+
@@ -641,18 +688,23 @@
+
+
+
+
+
-
+
-
+
-
+
@@ -669,7 +721,7 @@
-
+
@@ -679,10 +731,10 @@
-
+
-
+
@@ -690,13 +742,13 @@
-
+
-
+
-
+
@@ -707,203 +759,43 @@
-
+
-
-
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
+
@@ -911,21 +803,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -936,7 +828,7 @@
-
+
@@ -962,7 +854,7 @@
-
+
@@ -973,7 +865,7 @@
-
+
@@ -999,7 +891,7 @@
-
+
@@ -1008,23 +900,18 @@
-
-
-
-
-
-
+
-
-
+
+
-
+
@@ -1037,11 +924,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -1050,18 +968,23 @@
+
+
+
+
+
-
+
-
+
-
+
@@ -1078,7 +1001,7 @@
-
+
@@ -1088,24 +1011,24 @@
-
+
-
+
-
-
+
+
-
+
@@ -1115,7 +1038,7 @@
-
+
@@ -1125,10 +1048,10 @@
-
+
-
+
@@ -1152,7 +1075,7 @@
-
+
@@ -1162,10 +1085,10 @@
-
+
-
+
@@ -1173,13 +1096,13 @@
-
+
-
+
@@ -1190,59 +1113,30 @@
-
+
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -1250,21 +1144,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -1275,7 +1169,7 @@
-
+
@@ -1301,7 +1195,7 @@
-
+
@@ -1311,8 +1205,8 @@
-
-
+
+
@@ -1338,7 +1232,7 @@
-
+
@@ -1348,10 +1242,10 @@
-
-
+
+
-
+
@@ -1359,48 +1253,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1413,82 +1265,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1498,10 +1279,10 @@
-
+
-
+
@@ -1509,48 +1290,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1567,7 +1306,7 @@
-
+
@@ -1576,23 +1315,18 @@
-
-
-
-
-
-
+
-
+
-
+
@@ -1609,7 +1343,7 @@
-
+
@@ -1618,23 +1352,18 @@
-
-
-
-
-
-
+
-
+
-
+
@@ -1647,85 +1376,48 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
@@ -1733,7 +1425,7 @@
-
+
@@ -1837,21 +1529,125 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -1861,8 +1657,8 @@
-
-
+
+
@@ -1888,7 +1684,7 @@
-
+
@@ -1898,8 +1694,8 @@
-
-
+
+
@@ -1908,7 +1704,7 @@
-
+
@@ -1925,7 +1721,7 @@
-
+
@@ -1935,10 +1731,10 @@
-
-
+
+
-
+
@@ -1946,13 +1742,13 @@
-
+
-
+
@@ -1962,7 +1758,7 @@
-
+
@@ -1972,10 +1768,10 @@
-
-
+
+
-
+
@@ -1983,13 +1779,13 @@
-
+
-
+
@@ -1999,7 +1795,7 @@
-
+
@@ -2009,10 +1805,10 @@
-
-
+
+
-
+
@@ -2020,13 +1816,13 @@
-
+
-
+
@@ -2036,7 +1832,7 @@
-
+
@@ -2045,18 +1841,23 @@
+
+
+
+
+
-
-
+
+
-
+
-
+
@@ -2069,174 +1870,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -2245,23 +1883,18 @@
-
-
-
-
-
-
+
-
+
-
+
@@ -2278,7 +1911,7 @@
-
+
@@ -2288,7 +1921,7 @@
-
+
@@ -2298,10 +1931,10 @@
-
+
-
+
@@ -2315,7 +1948,7 @@
-
+
@@ -2325,10 +1958,10 @@
-
+
-
+
@@ -2352,7 +1985,7 @@
-
+
@@ -2362,7 +1995,7 @@
-
+
@@ -2375,7 +2008,7 @@
-
+
@@ -2404,47 +2037,524 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2454,28 +2564,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2485,28 +2595,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2516,28 +2626,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2547,28 +2657,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2578,28 +2688,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2609,28 +2719,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2640,28 +2750,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2671,28 +2781,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2702,28 +2812,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2733,28 +2843,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2770,7 +2880,7 @@
-
+
@@ -2778,7 +2888,49 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2820,7 +2972,70 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2862,7 +3077,7 @@
-
+
@@ -2870,27 +3085,27 @@
-
+
-
+
-
+
-
+
@@ -2904,7 +3119,7 @@
-
+
@@ -2946,7 +3161,7 @@
-
+
@@ -2957,7 +3172,7 @@
-
+
@@ -2965,14 +3180,14 @@
-
+
-
+
@@ -2993,7 +3208,7 @@
-
+
@@ -3001,27 +3216,27 @@
-
+
-
+
-
+
-
+
@@ -3035,28 +3250,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3064,27 +3258,27 @@
-
+
-
+
-
+
-
+
@@ -3098,7 +3292,7 @@
-
+
@@ -3106,27 +3300,27 @@
-
+
-
+
-
+
-
+
@@ -3158,9 +3352,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3170,11 +3377,15 @@
-
+
-
+
+
+
+
+
@@ -3182,11 +3393,11 @@
-
+
-
+
@@ -3204,7 +3415,7 @@
-
+
diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/C4044697_Material_PerfaceMaterialValidation.ly b/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/C4044697_Material_PerfaceMaterialValidation.ly
index 48958d519b..0de21e7ffa 100644
--- a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/C4044697_Material_PerfaceMaterialValidation.ly
+++ b/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/C4044697_Material_PerfaceMaterialValidation.ly
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c96e192861177f27edcd4dde87612645f328cb4d53ee31fb188cb75a0da7496b
-size 9974
+oid sha256:1f42344cdf0092eac6fc43bff66a2e0d9706511865da89490abfb2d054a1b5db
+size 9647
diff --git a/AutomatedTesting/Levels/Simple/Simple.cry b/AutomatedTesting/Levels/Simple/Simple.ly
similarity index 100%
rename from AutomatedTesting/Levels/Simple/Simple.cry
rename to AutomatedTesting/Levels/Simple/Simple.ly
diff --git a/AutomatedTesting/Registry/editorpreferences.setreg b/AutomatedTesting/Registry/editorpreferences.setreg
new file mode 100644
index 0000000000..b338d6acad
--- /dev/null
+++ b/AutomatedTesting/Registry/editorpreferences.setreg
@@ -0,0 +1,7 @@
+{
+ "Amazon": {
+ "Preferences": {
+ "EnablePrefabSystem": false
+ }
+ }
+}
\ No newline at end of file
diff --git a/AutomatedTesting/ScriptCanvas/C12712455_ScriptCanvas_ShapeCastVerification.scriptcanvas b/AutomatedTesting/ScriptCanvas/C12712455_ScriptCanvas_ShapeCastVerification.scriptcanvas
index 2383fb043f..ff9fe5c64c 100644
--- a/AutomatedTesting/ScriptCanvas/C12712455_ScriptCanvas_ShapeCastVerification.scriptcanvas
+++ b/AutomatedTesting/ScriptCanvas/C12712455_ScriptCanvas_ShapeCastVerification.scriptcanvas
@@ -3,7 +3,7 @@
-
+
@@ -16,21 +16,142 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -41,7 +162,7 @@
-
+
@@ -64,9 +185,46 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -74,7 +232,16 @@
-
+
+
+
+
+
+
+
+
+
+
@@ -290,21 +457,21 @@
-
+
-
+
-
+
-
+
@@ -313,23 +480,18 @@
-
-
-
-
-
-
+
-
+
-
+
@@ -346,7 +508,7 @@
-
+
@@ -361,7 +523,7 @@
-
+
@@ -388,7 +550,7 @@
-
+
@@ -425,7 +587,7 @@
-
+
@@ -469,36 +631,24 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+
@@ -506,21 +656,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -557,7 +707,7 @@
-
+
@@ -594,7 +744,7 @@
-
+
@@ -636,7 +786,7 @@
-
+
@@ -678,7 +828,7 @@
-
+
@@ -720,7 +870,7 @@
-
+
@@ -762,7 +912,7 @@
-
+
@@ -777,7 +927,7 @@
-
+
@@ -804,7 +954,7 @@
-
+
@@ -813,18 +963,23 @@
+
+
+
+
+
-
+
-
+
-
+
@@ -841,7 +996,7 @@
-
+
@@ -851,10 +1006,10 @@
-
+
-
+
@@ -878,7 +1033,7 @@
-
+
@@ -888,7 +1043,7 @@
-
+
@@ -915,7 +1070,7 @@
-
+
@@ -925,10 +1080,10 @@
-
+
-
+
@@ -952,7 +1107,7 @@
-
+
@@ -962,10 +1117,10 @@
-
+
-
+
@@ -985,96 +1140,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1083,23 +1153,18 @@
-
-
-
-
-
-
+
-
+
-
+
@@ -1116,7 +1181,7 @@
-
+
@@ -1125,23 +1190,18 @@
-
-
-
-
-
-
+
-
+
-
+
@@ -1154,129 +1214,94 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
-
-
-
+
-
+
-
+
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
@@ -1598,7 +1623,7 @@
-
+
@@ -1838,26 +1863,26 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1867,10 +1892,10 @@
-
-
+
+
-
+
@@ -1878,25 +1903,46 @@
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1936,7 +1982,49 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1973,7 +2061,7 @@
-
+
@@ -2017,24 +2105,36 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
@@ -2044,28 +2144,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2075,28 +2175,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2106,28 +2206,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2137,28 +2237,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2168,17 +2268,17 @@
-
+
-
+
-
+
-
+
@@ -2186,10 +2286,10 @@
-
+
-
+
@@ -2199,28 +2299,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2230,28 +2330,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2261,28 +2361,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2292,28 +2392,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2329,7 +2429,7 @@
-
+
@@ -2337,7 +2437,7 @@
-
+
@@ -2345,27 +2445,33 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
+
@@ -2373,22 +2479,20 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -2399,15 +2503,17 @@
-
-
-
+
+
+
+
-
-
-
+
+
+
+
@@ -2415,22 +2521,20 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -2441,15 +2545,17 @@
-
-
-
+
+
+
+
-
-
-
+
+
+
+
@@ -2457,22 +2563,20 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -2483,15 +2587,38 @@
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2499,7 +2626,7 @@
-
+
@@ -2512,14 +2639,14 @@
-
+
-
+
@@ -2533,7 +2660,7 @@
-
+
@@ -2541,22 +2668,20 @@
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -2567,36 +2692,17 @@
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -2604,7 +2710,7 @@
-
+
@@ -2612,7 +2718,7 @@
-
+
@@ -2626,13 +2732,13 @@
-
+
-
+
@@ -2646,7 +2752,7 @@
-
+
@@ -2654,27 +2760,27 @@
-
+
-
+
-
+
-
+
@@ -2690,20 +2796,16 @@
-
-
-
-
-
+
-
+
@@ -2711,7 +2813,11 @@
-
+
+
+
+
+
diff --git a/AutomatedTesting/ScriptCanvas/C14195074_ScriptCanvas_PostUpdateEvent.scriptcanvas b/AutomatedTesting/ScriptCanvas/C14195074_ScriptCanvas_PostUpdateEvent.scriptcanvas
index 97c2213cc0..988184109a 100644
--- a/AutomatedTesting/ScriptCanvas/C14195074_ScriptCanvas_PostUpdateEvent.scriptcanvas
+++ b/AutomatedTesting/ScriptCanvas/C14195074_ScriptCanvas_PostUpdateEvent.scriptcanvas
@@ -3,7 +3,7 @@
-
+
@@ -16,382 +16,453 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -607,7 +678,7 @@
-
+
@@ -781,7 +852,7 @@
-
+
@@ -806,21 +877,21 @@
-
+
-
+
-
+
@@ -857,7 +928,7 @@
-
+
@@ -894,7 +965,7 @@
-
+
@@ -931,7 +1002,7 @@
-
+
@@ -968,7 +1039,7 @@
-
+
@@ -1005,7 +1076,7 @@
-
+
@@ -1021,7 +1092,7 @@
-
+
@@ -1047,7 +1118,7 @@
-
+
@@ -1057,10 +1128,10 @@
-
+
-
+
@@ -1084,7 +1155,7 @@
-
+
@@ -1094,7 +1165,7 @@
-
+
@@ -1121,7 +1192,7 @@
-
+
@@ -1131,10 +1202,10 @@
-
+
-
+
@@ -1158,7 +1229,7 @@
-
+
@@ -1168,7 +1239,7 @@
-
+
@@ -1191,540 +1262,579 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+