Esteban Papp 9c7b55a31d Merge branch 'development' into cmake/linux_fix_warn_unused ...

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
#	Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
#	Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp

2021-08-24 10:43:48 -07:00

..

Platform

Merge pull request #2401 from aws-lumberyard-dev/PM-logs-and-processcheck

2021-08-03 09:32:56 -07:00

Resources

Tabs are shown gray background when tab focused, Reworked ProjectsScreen to reuse Widgets instead of recreating it on each update, Sorting projects alphabetically

2021-08-23 07:15:44 -07:00

Source

Merge branch 'development' into cmake/linux_fix_warn_unused

2021-08-24 10:43:48 -07:00

tests

Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de

2021-07-16 17:50:44 -05:00

CMakeLists.txt

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

project_manager_app_files.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

project_manager_files.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

project_manager_tests_files.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00