birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development

Browse Source
This commit is contained in:
chcurran
2021-08-30 14:33:16 -07:00
parent 862df096db cdcdcb0777
commit 782c6748ae
1660 changed files with 432462 additions and 114764 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.cpp
+1 -1
View File
@@ -166,7 +166,7 @@ namespace ScriptCanvas
}
},
{
[this]()
[]()
{
DisallowReentrantExecutionContract* reentrantContract = aznew DisallowReentrantExecutionContract();
return reentrantContract;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ namespace ScriptCanvas
int tupleGetFuncIndex = -1;
if (tupleGetFuncAttrReader.Read<int>(tupleGetFuncIndex))
{
auto insertIter = tupleGetMethodMap.emplace(tupleGetFuncIndex, behaviorMethod);
[[maybe_unused]] auto insertIter = tupleGetMethodMap.emplace(tupleGetFuncIndex, behaviorMethod);
AZ_Error("Script Canvas", insertIter.second, "Multiple methods with the same TupleGetFunctionIndex attribute"
"has been registered for the class name: %s with typeid: %s",
behaviorClass->m_name.data(), behaviorClass->m_typeId.ToString<AZStd::string>().data())
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp
-1
View File
@@ -86,7 +86,6 @@ namespace ScriptCanvas
if (!wasConfigured)
{
AZ::Uuid addressTypeId = m_definition.GetAddressType();
AZ::Uuid addressId = m_definition.GetAddressTypeProperty().GetId();
if (m_definition.IsAddressRequired())
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp
-2
View File
@@ -16,8 +16,6 @@ namespace ScriptCanvas
{
namespace Logic
{
static const int NUMBER_OF_OUTPUTS = 8;
Sequencer::Sequencer()
: Node()
, m_selectedIndex(0)
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ namespace ScriptCanvas
if (sourceType == SourceType::SourceInput)
{
ContractDescriptor supportsMethodContract;
supportsMethodContract.m_createFunc = [this]() -> SupportsMethodContract* { return aznew SupportsMethodContract("At"); };
supportsMethodContract.m_createFunc = []() -> SupportsMethodContract* { return aznew SupportsMethodContract("At"); };
contractDescs.push_back(AZStd::move(supportsMethodContract));
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ namespace ScriptCanvas
if (sourceType == SourceType::SourceInput)
{
ContractDescriptor supportsMethodContract;
supportsMethodContract.m_createFunc = [this]() -> SupportsMethodContract* { return aznew SupportsMethodContract("Back"); };
supportsMethodContract.m_createFunc = []() -> SupportsMethodContract* { return aznew SupportsMethodContract("Back"); };
contractDescs.push_back(AZStd::move(supportsMethodContract));
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ namespace ScriptCanvas
if (sourceType == SourceType::SourceInput)
{
ContractDescriptor supportsMethodContract;
supportsMethodContract.m_createFunc = [this]() -> SupportsMethodContract* { return aznew SupportsMethodContract("Erase"); };
supportsMethodContract.m_createFunc = []() -> SupportsMethodContract* { return aznew SupportsMethodContract("Erase"); };
contractDescs.push_back(AZStd::move(supportsMethodContract));
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ namespace ScriptCanvas
if (sourceType == SourceType::SourceInput)
{
ContractDescriptor supportsMethodContract;
supportsMethodContract.m_createFunc = [this]() -> SupportsMethodContract* { return aznew SupportsMethodContract("Front"); };
supportsMethodContract.m_createFunc = []() -> SupportsMethodContract* { return aznew SupportsMethodContract("Front"); };
contractDescs.push_back(AZStd::move(supportsMethodContract));
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ namespace ScriptCanvas
if (sourceType == SourceType::SourceInput)
{
ContractDescriptor supportsMethodContract;
supportsMethodContract.m_createFunc = [this]() -> SupportsMethodContract* { return aznew SupportsMethodContract("Insert"); };
supportsMethodContract.m_createFunc = []() -> SupportsMethodContract* { return aznew SupportsMethodContract("Insert"); };
contractDescs.push_back(AZStd::move(supportsMethodContract));
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ namespace ScriptCanvas
if (sourceType == SourceType::SourceInput)
{
ContractDescriptor supportsMethodContract;
supportsMethodContract.m_createFunc = [this]() -> SupportsMethodContract* { return aznew SupportsMethodContract("PushBack"); };
supportsMethodContract.m_createFunc = []() -> SupportsMethodContract* { return aznew SupportsMethodContract("PushBack"); };
contractDescs.push_back(AZStd::move(supportsMethodContract));
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.cpp
+1 -1
View File
@@ -101,7 +101,7 @@ namespace ScriptCanvas::Nodeables::Spawning
return;
}
auto preSpawnCB = [this, translation, rotation, scale]([[maybe_unused]] AzFramework::EntitySpawnTicket::Id ticketId,
auto preSpawnCB = [translation, rotation, scale]([[maybe_unused]] AzFramework::EntitySpawnTicket::Id ticketId,
AzFramework::SpawnableEntityContainerView view)
{
AZ::Entity* rootEntity = *view.begin();