santorac 76add4d0d9 Merge remote-tracking branch 'upstream/development' into Atom/santorac/RemixableMaterialTypes3 ...

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

2022-01-25 20:54:34 -08:00

..

AtomBridge

fix launcher not showing gems (#7015)

2022-01-19 17:09:40 -08:00

AtomFont

fix launcher not showing gems (#7015)

2022-01-19 17:09:40 -08:00

AtomImGuiTools

fix launcher not showing gems (#7015)

2022-01-19 17:09:40 -08:00

AtomViewportDisplayIcons

fix launcher not showing gems (#7015)

2022-01-19 17:09:40 -08:00

AtomViewportDisplayInfo

fix launcher not showing gems (#7015)

2022-01-19 17:09:40 -08:00

CommonFeatures

Merge branch 'development' into Atom/santorac/RemixableMaterialTypes3

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

EMotionFXAtom

Add manipulator for atom render plugin in animation editor. (#7068)

2022-01-25 11:25:18 -08:00

ImguiAtom

fix launcher not showing gems (#7015)

2022-01-19 17:09:40 -08:00

TechnicalArt/DccScriptingInterface

Updated all .material files to have materialTypeVersion instead of propertyLayoutVersion. This was renamed in code at some point but we forgot to rename in the files. Before this was silently ignored but since I removed MaterialSourceDataSerializer, this started being reported as a warning.

2022-01-18 19:02:36 -08:00

CMakeLists.txt

Templates restricted (#6498)

2022-01-14 10:27:20 -08:00

gem.json

Templates restricted (#6498)

2022-01-14 10:27:20 -08:00