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 6b96be82ea Merge branch 'development' into cmake/linux_fix_warn_unused
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
5 years ago
..
API Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Application Merge branch 'development' into cmake/linux_fix_warn_unused 5 years ago
Archive Code/Framework 5 years ago
Asset Minimal TypeInfo header/reduce std interdependencies. (#2688) 5 years ago
CommandLine Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Components Camera Component, Editor Viewport Widget refactoring. 5 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
Entity Refactor budget definitions as named functions instead of template specializations 5 years ago
FileFunc Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
FileTag Code/Framework 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 Code/Framework 5 years ago
InGameUI Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Input Fix input priority conflict with LyShine and ImGuiPass (#3329) 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 5 years ago
Physics CR Feedback addressing 5 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/linux_fix_warn_unused 5 years ago
Session Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Slice Minimal TypeInfo header/reduce std interdependencies. (#2688) 5 years ago
Spawnable Disabling RootSpawnable warning (#3427) 5 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 Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller 5 years ago
Terrain Non-terrain-gem changes in support of upcoming terrain work. (#3345) 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) 5 years ago
Viewport Fix mouse capture behavior for Editor Viewport (#3417) 5 years ago
Visibility Merge branch 'development' into cmake/linux_fix_warn_unused 5 years ago
Windowing Support for refresh rate and sync interval (#2989) 5 years ago
AzFrameworkModule.cpp Add preliminary budget tracking system and remove driller integration 5 years ago
AzFrameworkModule.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
azframework_files.cmake Add preliminary budget tracking system and remove driller integration 5 years ago