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

..

CreateMaterialDialog

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

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

HelpDialog

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

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

Icons

ATOM-15128 replacing material editor icon

2021-05-10 18:02:26 -05:00

MaterialInspector

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

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

PerformanceMonitor

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

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

PresetBrowserDialogs

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

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

SettingsDialog

fixed formatting

2021-08-16 18:29:16 -05:00

ToolBar

Gems/Atom

2021-08-16 16:42:28 -07:00

ViewportSettingsInspector

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

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

MaterialBrowserWidget.cpp

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

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

MaterialBrowserWidget.h

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

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

MaterialBrowserWidget.ui

Initial commit

2021-03-08 14:30:57 -08:00

MaterialEditor.qrc

ATOM-15128 replacing material editor icon

2021-05-10 18:02:26 -05:00

MaterialEditor.qss

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

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

MaterialEditorBrowserInteractions.cpp

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

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

MaterialEditorBrowserInteractions.h

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

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

MaterialEditorWindow.cpp

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

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

MaterialEditorWindow.h

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

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

MaterialEditorWindowComponent.cpp

move main window bus reflection to atom tools

2021-08-11 15:21:54 -05:00

MaterialEditorWindowComponent.h

Bug fix (updating WindowComponent)

2021-08-03 19:47:50 -05:00

MaterialEditorWindowModule.cpp

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

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

MaterialEditorWindowSettings.cpp

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

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