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/Framework/AzFramework/AzFramework
Esteban Papp f8e99cd7dd Merge branch 'development' into cmake/SPEC-2513_w4244
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
#	Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
4 years ago
..
API Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Application Deprecate profiler categories based on global enum 4 years ago
Archive Merge branch 'development' into cmake/SPEC-2513_w4244 4 years ago
Asset Minimal TypeInfo header/reduce std interdependencies. (#2688) 4 years ago
CommandLine Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Components Camera Component, Editor Viewport Widget refactoring. 4 years ago
Debug Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Dependency Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Driller Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Entity Deprecate profiler categories based on global enum 4 years ago
FileFunc Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
FileTag Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Font Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Gem Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
IO Deprecate profiler categories based on global enum 4 years ago
InGameUI Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Input Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Logging Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Math Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Metrics Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Network fxies for AzFramework 4 years ago
Physics PR comments/observations 4 years ago
Platform Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Process Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ProjectManager Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Render Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Scene Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Script Merge branch 'development' into cmake/SPEC-2513_w4244 4 years ago
Session Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Slice Minimal TypeInfo header/reduce std interdependencies. (#2688) 4 years ago
Spawnable Fixed EntitySpawnTicket move constructor (#2832) 4 years ago
StreamingInstall Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
StringFunc Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
TargetManagement Deprecate profiler categories based on global enum 4 years ago
Terrain Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Thermal Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
UnitTest Fixed the emplace function implementations for stack and queue (#2657) 4 years ago
Viewport Fix issue with mouse input for viewport camera (#3210) 4 years ago
Visibility Deprecate profiler categories based on global enum 4 years ago
Windowing Support for refresh rate and sync interval (#2989) 4 years ago
AzFrameworkModule.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
AzFrameworkModule.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
azframework_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago