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/LyShine/Bus
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
..
Sprite Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Tools Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
World Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiAnimateEntityBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiAnimationBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiButtonBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiCanvasBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiCanvasManagerBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiCanvasUpdateNotificationBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiCheckboxBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiCursorBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiDraggableBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiDropTargetBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiDropdownBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiDropdownOptionBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiDynamicLayoutBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiDynamicScrollBoxBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiEditorBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiEditorCanvasBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiEditorChangeNotificationBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiElementBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiEntityContextBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiFaderBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiFlipbookAnimationBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiGameEntityContextBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiImageBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiImageSequenceBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiIndexableImageBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiInitializationBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiInteractableActionsBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiInteractableBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiInteractableStatesBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiInteractionMaskBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiLayoutBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiLayoutCellBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiLayoutCellDefaultBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiLayoutColumnBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiLayoutControllerBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiLayoutFitterBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiLayoutGridBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiLayoutManagerBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiLayoutRowBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiMarkupButtonBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiMaskBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiNavigationBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiParticleEmitterBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiRadioButtonBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiRadioButtonCommunicationBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiRadioButtonGroupBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiRadioButtonGroupCommunicationBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiRenderBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiRenderControlBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiScrollBarBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiScrollBoxBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiScrollableBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiScrollerBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiSliderBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiSpawnerBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiSystemBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiTextBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiTextInputBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiTooltipBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiTooltipDataPopulatorBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiTooltipDisplayBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UiTransform2dBus.h Merge branch 'development' into cmake/SPEC-7179 5 years ago
UiTransformBus.h Merge branch 'development' into cmake/SPEC-7179 5 years ago
UiVisualBus.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago