You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
o3de/Code/Tools/Standalone/Source/Driller
Esteban Papp 1f9b284de2 Merge branch 'development' into cmake/SPEC-7179
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
#	Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h
#	Code/Editor/Plugins/EditorCommon/stdafx.cpp
#	Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
#	Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h
#	Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
#	Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h
#	Code/Tools/AssetProcessor/native/precompiled.h
#	Code/Tools/Standalone/StandaloneTools_precompiled.h
#	Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h
#	Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
#	Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
#	Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h
#	Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h
#	Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h
#	Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake
#	Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h
#	Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake
#	Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h
#	Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
#	Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h
#	Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h
#	Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
#	Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
#	Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
#	Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
#	Gems/Blast/Code/Source/StdAfx.cpp
#	Gems/Camera/Code/Source/Camera_precompiled.h
#	Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h
#	Gems/FastNoise/Code/Source/FastNoise_precompiled.h
#	Gems/Gestures/Code/Source/Gestures_precompiled.h
#	Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h
#	Gems/GraphCanvas/Code/precompiled.h
#	Gems/ImGui/Code/Source/ImGui_precompiled.h
#	Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h
#	Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h
#	Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp
#	Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
#	Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
#	Gems/LyShine/Code/Source/LyShine_precompiled.h
#	Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h
#	Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h
#	Gems/Maestro/Code/Source/Maestro_precompiled.h
#	Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h
#	Gems/Metastream/Code/Source/Metastream_precompiled.h
#	Gems/Microphone/Code/Source/Microphone_precompiled.h
#	Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h
#	Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
#	Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
#	Gems/PhysX/Code/Source/PhysX_precompiled.h
#	Gems/PhysX/Code/physx_unsupported_files.cmake
#	Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
#	Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
#	Gems/ScriptCanvas/Code/Editor/precompiled.h
#	Gems/ScriptCanvas/Code/Source/precompiled.h
#	Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h
#	Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h
#	Gems/ScriptEvents/Code/Source/precompiled.h
#	Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp
#	Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h
#	Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h
#	Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h
#	Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h
#	Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h
#	Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
#	Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h
#	Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h
#	Gems/Twitch/Code/Source/Twitch_precompiled.h
#	Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h
#	Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h
#	Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
4 years ago
..
Annotations Merge branch 'development' into cmake/SPEC-7179 4 years ago
Carrier Merge branch 'development' into cmake/SPEC-7179 4 years ago
EventTrace Merge branch 'development' into cmake/SPEC-7179 4 years ago
IO Merge branch 'development' into cmake/SPEC-7179 4 years ago
Memory Merge branch 'development' into cmake/SPEC-7179 4 years ago
Profiler Merge branch 'development' into cmake/SPEC-7179 4 years ago
Rendering/VRAM Merge branch 'development' into cmake/SPEC-7179 4 years ago
Replica Merge branch 'development' into cmake/SPEC-7179 4 years ago
Trace Merge branch 'development' into cmake/SPEC-7179 4 years ago
Unsupported Merge branch 'development' into cmake/SPEC-7179 4 years ago
Workspaces Merge branch 'development' into cmake/SPEC-7179 4 years ago
AreaChart.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
AreaChart.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Axis.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
Axis.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
CSVExportSettings.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ChannelConfigurationDialog.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
ChannelConfigurationDialog.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ChannelConfigurationWidget.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
ChannelConfigurationWidget.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ChannelControl.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
ChannelControl.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ChannelControl.ui Integrating latest 47acbe8 5 years ago
ChannelDataView.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
ChannelDataView.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ChannelProfilerWidget.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
ChannelProfilerWidget.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ChannelProfilerWidget.ui Integrating latest 47acbe8 5 years ago
ChartNumberFormats.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
ChartNumberFormats.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ChartTypes.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
ChartTypes.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
CollapsiblePanel.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
CollapsiblePanel.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
CollapsiblePanel.ui Integrating latest 47acbe8 5 years ago
CombinedEventsControl.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
CombinedEventsControl.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
CustomizeCSVExportWidget.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
CustomizeCSVExportWidget.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DoubleListSelector.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
DoubleListSelector.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DoubleListSelector.ui Integrating latest 47acbe8 5 years ago
DrillerAggregator.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
DrillerAggregator.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DrillerAggregatorOptions.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DrillerCaptureWindow.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
DrillerCaptureWindow.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DrillerCaptureWindow.ui Integrating latest 47acbe8 5 years ago
DrillerContext.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
DrillerContext.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DrillerContextInterface.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DrillerDataContainer.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
DrillerDataContainer.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DrillerDataTypes.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DrillerEvent.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
DrillerEvent.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DrillerMainChannelsView.ui Integrating latest 47acbe8 5 years ago
DrillerMainWindow.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
DrillerMainWindow.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DrillerMainWindow.ui Integrating latest 47acbe8 5 years ago
DrillerMainWindowMessages.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
DrillerMainWindowMessages.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DrillerNetworkMessages.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DrillerOperationTelemetryEvent.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DrillerOperationTelemetryEvent.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
FilteredListView.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
FilteredListView.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
FilteredListView.ui Integrating latest 47acbe8 5 years ago
GenericCustomizeCSVExportWidget.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
GenericCustomizeCSVExportWidget.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
GenericCustomizeCSVExportWidget.ui Integrating latest 47acbe8 5 years ago
RacetrackChart.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
RacetrackChart.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
StripChart.cpp Merge branch 'development' into cmake/SPEC-7179 4 years ago
StripChart.hxx Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago