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/Legacy/CryCommon
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
5 years ago
..
LyShine Merge branch 'development' into cmake/SPEC-7179 5 years ago
Maestro Merge branch 'development' into cmake/SPEC-7179 5 years ago
Mocks Merge branch 'development' into cmake/SPEC-7179 5 years ago
AndroidSpecific.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
AnimKey.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
AppleSpecific.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
BaseTypes.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
BitFiddling.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CMakeLists.txt Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Common_TypeInfo.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CompileTimeAssert.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryArray.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryAssert.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryAssert_Android.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryAssert_Linux.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryAssert_Mac.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryAssert_iOS.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryAssert_impl.h Merge branch 'development' into cmake/SPEC-7179 5 years ago
CryCommon.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryCrc32.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryCustomTypes.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryEndian.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryFile.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryFixedString.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryHalf.inl Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryHalf_info.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryHeaders.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryHeaders_info.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryLegacyAllocator.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryLibrary.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryLibrary.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryListenerSet.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryName.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryPath.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryPodArray.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryRandomInternal.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CrySizer.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryString.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CrySystemBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryThread.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryThreadImpl.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryThreadImpl_pthreads.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryThreadImpl_windows.h Merge branch 'development' into cmake/SPEC-7179 5 years ago
CryThread_dummy.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryThread_pthreads.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryThread_windows.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryTypeInfo.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryTypeInfo.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryVersion.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CryWindows.h Merge branch 'development' into cmake/SPEC-7179 5 years ago
Cry_Camera.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_Color.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_Geo.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_GeoDistance.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_GeoIntersect.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_GeoOverlap.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_HWMatrix.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_HWVector3.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_Math.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_Matrix33.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_Matrix34.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_Matrix44.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_MatrixDiag.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_Quat.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_ValidNumber.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_Vector2.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_Vector3.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_Vector4.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Cry_XOptimise.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
FrameProfiler.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
FunctorBaseFunction.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
FunctorBaseMember.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
HMDBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
HeapAllocator.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
HeightmapUpdateNotificationBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IAudioInterfacesCommonData.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IAudioSystem.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ICmdLine.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IConsole.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IEntityRenderState.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IEntityRenderState_info.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IFont.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IFunctorBase.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IGem.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IIndexedMesh.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IIndexedMesh_info.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ILevelSystem.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ILocalizationManager.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ILog.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IMNM.h Merge branch 'development' into cmake/SPEC-7179 5 years ago
IMaterial.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IMiniLog.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IMovieSystem.h Merge branch 'development' into cmake/SPEC-7179 5 years ago
INavigationSystem.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IPathfinder.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IPhysics.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IPostEffectGroup.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IProcess.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IReadWriteXMLSink.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IRenderAuxGeom.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IRenderMesh.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IRenderer.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ISerialize.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IShader.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ISplines.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IStatObj.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IStereoRenderer.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ISurfaceType.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ISystem.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ITexture.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ITimer.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IValidator.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IViewSystem.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IWindowMessageHandler.h Merge branch 'development' into cmake/SPEC-7179 5 years ago
IXml.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
LCGRandom.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
LegacyAllocator.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Linux32Specific.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Linux64Specific.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
LinuxSpecific.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Linux_Win32Wrapper.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
LoadScreenBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
LocalizationManagerBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
LocalizationManagerBus.inl Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
MTPseudoRandom.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
MTPseudoRandom.h SPEC-7531 Change Code/CryEngine to Code/Legacy (#1634) 5 years ago
MacSpecific.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
MainThreadRenderRequestBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
MathConversion.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
MemoryAccess.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
MetaUtils.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
MicrophoneBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
MiniQueue.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
MultiThread.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
MultiThread_Containers.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
NullAudioSystem.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Options.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
PNoise3.h SPEC-7531 Change Code/CryEngine to Code/Legacy (#1634) 5 years ago
PoolAllocator.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ProjectDefines.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Random.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Range.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
RenderBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
SFunctor.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ScopedVariableSetter.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
SerializationTypes.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
SerializeFwd.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
SimpleSerialize.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
StatObjBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
StaticInstance.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
StereoRendererBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
StlUtils.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
StringUtils.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Synchronization.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Tarray.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
TimeValue.h Merge branch 'development' into cmake/SPEC-7179 5 years ago
TimeValue_info.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Timer.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
TypeInfo_decl.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
TypeInfo_impl.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UnicodeBinding.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UnicodeEncoding.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UnicodeFunctions.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UnicodeIterator.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
VRCommon.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
VectorMap.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
VectorSet.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Vertex.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
VertexFormats.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Win32specific.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Win64specific.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
WinBase.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
XMLBinaryHeaders.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
crycommon_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
crycommon_testing_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
iOSSpecific.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
physinterface.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
platform.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
platform_impl.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
primitives.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
smartptr.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
stridedptr.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago