Chris Galvan a2db9806a8 Merge pull request #7123 from aws-lumberyard-dev/cgalvan/gitflow_220124_o3de_development ...

Merged `stabilization/2111RTE` to `development`

2022-01-25 08:19:34 -06: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 pull request #7123 from aws-lumberyard-dev/cgalvan/gitflow_220124_o3de_development

2022-01-25 08:19:34 -06:00

EMotionFXAtom

Adding partial implementation of C++20 concepts and range functions for AZStd::span (#7102)

2022-01-24 17:09:08 -06: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