Merge remote-tracking branch 'origin' into MultiplayerComponents

This commit is contained in:
karlberg
2021-05-11 13:43:17 -07:00
1119 changed files with 28174 additions and 131365 deletions
@@ -582,7 +582,7 @@ namespace ScriptCanvas
int SetExecutionOut(lua_State* lua)
{
// \note Return values could become necessary.
// \see https://jira.agscollab.com/browse/LY-99750
// \see LY-99750
AZ_Assert(lua_isuserdata(lua, -3), "Error in compiled lua file, 1st argument to SetExecutionOut is not userdata (Nodeable)");
AZ_Assert(lua_isnumber(lua, -2), "Error in compiled lua file, 2nd argument to SetExecutionOut is not a number");
@@ -605,7 +605,7 @@ namespace ScriptCanvas
int SetExecutionOutResult(lua_State* lua)
{
// \note Return values could become necessary.
// \see https://jira.agscollab.com/browse/LY-99750
// \see LY-99750
AZ_Assert(lua_isuserdata(lua, -3), "Error in compiled lua file, 1st argument to SetExecutionOutResult is not userdata (Nodeable)");
AZ_Assert(lua_isnumber(lua, -2), "Error in compiled lua file, 2nd argument to SetExecutionOutResult is not a number");
@@ -3114,7 +3114,7 @@ namespace ScriptCanvas
/// NOTE: after basic iteration works correctly
/// \todo when subsequent input (from nodes connected to the break slot) looks up the slot from the node with key or the value,
/// it is going to have to find the output of the get/key value functions in BOTH the child outs of break and loop
/// https://jira.agscollab.com/browse/LY-109862 may be required for this
/// LY-109862 may be required for this
ExecutionTreePtr lastExecution = forEachLoopBody;