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

Merge branch 'development' into cmake/linux_fix_warn_unused

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
This commit is contained in:
Esteban Papp
2021-08-25 11:47:19 -07:00
parent cd5df6b372 b53182fdb6
commit 6b96be82ea
400 changed files with 1886 additions and 46899 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Legacy/CrySystem/SystemInit.cpp
-44
View File
@@ -97,7 +97,6 @@
#include <CrySystemBus.h>
#include <AzCore/Jobs/JobFunction.h>
#include <AzCore/Jobs/JobManagerBus.h>
#include <AzFramework/Driller/DrillerConsoleAPI.h>
#if defined(ANDROID)
#include <AzCore/Android/Utils.h>
@@ -1679,46 +1678,6 @@ void CmdSetAwsLogLevel(IConsoleCmdArgs* pArgs)
}
}
void CmdDrillToFile(IConsoleCmdArgs* pArgs)
{
if (azstricmp(pArgs->GetArg(0), "DrillerStop") == 0)
{
EBUS_EVENT(AzFramework::DrillerConsoleCommandBus, StopDrillerSession, AZ::Crc32("DefaultDrillerSession"));
}
else
{
if (pArgs->GetArgCount() > 1)
{
AZ::Debug::DrillerManager::DrillerListType drillersToEnable;
for (int iArg = 1; iArg < pArgs->GetArgCount(); ++iArg)
{
if (azstricmp(pArgs->GetArg(iArg), "Replica") == 0)
{
drillersToEnable.push_back();
drillersToEnable.back().id = AZ::Crc32("ReplicaDriller");
}
else if (azstricmp(pArgs->GetArg(iArg), "Carrier") == 0)
{
drillersToEnable.push_back();
drillersToEnable.back().id = AZ::Crc32("CarrierDriller");
}
else
{
CryLogAlways("Driller %s not supported.", pArgs->GetArg(iArg));
}
}
EBUS_EVENT(AzFramework::DrillerConsoleCommandBus, StartDrillerSession, drillersToEnable, AZ::Crc32("DefaultDrillerSession"));
}
else
{
CryLogAlways("Syntax: DrillerStart [Driller1] [Driller2] [...]");
CryLogAlways("Supported Drillers:");
CryLogAlways(" Carrier");
CryLogAlways(" Replica");
}
}
}
//////////////////////////////////////////////////////////////////////////
void CSystem::CreateSystemVars()
{
@@ -2084,9 +2043,6 @@ void CSystem::CreateSystemVars()
// By default it is now enabled. Modify system.cfg or game.cfg to disable it
REGISTER_INT("sys_enableCanvasEditor", 1, VF_NULL, "Enables the UI Canvas Editor");
REGISTER_COMMAND_DEV_ONLY("DrillerStart", CmdDrillToFile, VF_DEV_ONLY, "Start a driller capture.");
REGISTER_COMMAND_DEV_ONLY("DrillerStop", CmdDrillToFile, VF_DEV_ONLY, "Stop a driller capture.");
REGISTER_COMMAND("sys_SetLogLevel", CmdSetAwsLogLevel, 0, "Set AWS log level [0 - 6].");
}