Esteban Papp 036114a5a7 Merge branch 'development' into cmake/SPEC-2513_w4244 ...

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

# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp

2021-08-17 12:10:46 -07:00

..

Document

Removed errors from unimplemented status functions

2021-08-13 00:19:43 -05:00

Platform

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

Viewport

Moved material editor document system buses and system components to atom tools framework

2021-08-12 22:11:18 -05:00

Window

Merge branch 'development' into cmake/SPEC-2513_w4244

2021-08-17 12:10:46 -07:00

main.cpp

Merge pull request #1250 from aws-lumberyard-dev/lawalfua/commonToolsApplication

2021-07-19 13:32:09 -05:00

MaterialEditorApplication.cpp

Moved material editor document system buses and system components to atom tools framework

2021-08-12 22:11:18 -05:00

MaterialEditorApplication.h

Moved material editor document system buses and system components to atom tools framework

2021-08-12 22:11:18 -05:00

resource.h

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

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