santorac b5c7869f14 Merge branch 'development' into Atom/santorac/RemixableMaterialTypes3 ...

There were lots of material system conflicts that had to be resolved. I expect the build is broken at this commit, and I'll fix it in followup commits.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>

2022-01-25 14:47:24 -08:00

..

CreateMaterialDialog

Atom Tools: Removing unnecessary modules, components, and dead code from ME

2022-01-20 00:10:07 -06:00

Icons

Atom Tools: moving custom asset browser code to common location

2022-01-18 18:05:23 -06:00

MaterialInspector

Merge branch 'development' into Atom/santorac/RemixableMaterialTypes3

2022-01-25 14:47:24 -08:00

PerformanceMonitor

Atom Tools: Removing unnecessary modules, components, and dead code from ME

2022-01-20 00:10:07 -06:00

SettingsDialog

Atom Tools: Removing unnecessary modules, components, and dead code from ME

2022-01-20 00:10:07 -06:00

ToolBar

Atom Tools: Removing unnecessary modules, components, and dead code from ME

2022-01-20 00:10:07 -06:00

ViewportSettingsInspector

Atom Tools: Changed ME preset browser dialog into generic asset grid dialog in ATF

2022-01-23 11:22:48 -06:00

MaterialEditor.qrc

Atom Tools: moving custom asset browser code to common location

2022-01-18 18:05:23 -06:00

MaterialEditor.qss

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

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

MaterialEditorBrowserInteractions.cpp

Fixed several material editor bugs related to file paths and hot reload prompts (#6374)

2021-12-14 08:52:01 -08:00

MaterialEditorBrowserInteractions.h

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

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

MaterialEditorWindow.cpp

Atom Tools: Replaced custom help dialog with generic message box

2022-01-23 15:18:49 -06:00

MaterialEditorWindow.h

Atom Tools: Replaced custom help dialog with generic message box

2022-01-23 15:18:49 -06:00

MaterialEditorWindowSettings.cpp

Atom Tools: Removing unnecessary modules, components, and dead code from ME

2022-01-20 00:10:07 -06:00

MaterialEditorWindowSettings.h

Atom Tools: Removing unnecessary modules, components, and dead code from ME

2022-01-20 00:10:07 -06:00