Merge branch 'main' into carlitosan-parser-fixes

This commit is contained in:
chcurran
2021-04-23 15:55:19 -07:00
3680 changed files with 23672 additions and 33133 deletions
@@ -7,4 +7,4 @@
# 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.
#
#
@@ -19,4 +19,4 @@ namespace ScriptCanvasTests
UnitTest::AllocatorsBase ScriptCanvasTestFixture::s_allocatorSetup = {};
AZStd::atomic_bool ScriptCanvasTestFixture::s_asyncOperationActive = {};
bool ScriptCanvasTestFixture::s_setupSucceeded = false;
}
}
@@ -20,4 +20,4 @@ namespace ScriptCanvasTests
ScriptCanvasEditor::UnitTestResult VerifyReporterEditor(const ScriptCanvasEditor::Reporter& reporter);
} // ScriptCanvasTests
} // ScriptCanvasTests
@@ -77,4 +77,4 @@ namespace ScriptCanvasTestingNodes
AZStd::string m_string;
};
}
}
@@ -16,4 +16,4 @@ set(FILES
${LY_ROOT_FOLDER}/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja
${LY_ROOT_FOLDER}/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvas_Macros.jinja
${LY_ROOT_FOLDER}/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvas_Nodeable_Macros.jinja
)
)