jckand-amzn 52ced4a4ee Merge branch 'development' of https://github.com/o3de/o3de into jckand/LCXfailUpdate

2021-10-11 18:29:39 -05:00

..

Code

Squashed commit of Procedural Prefab work (#4481)

2021-10-06 07:14:38 -05:00

Editor/Scripts

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

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

PythonCoverage

Setting /permissive- to make MSVC more "standard" (#3701)

2021-08-31 14:46:50 -07:00

PythonTests

Merge branch 'development' of https://github.com/o3de/o3de into jckand/LCXfailUpdate

2021-10-11 18:29:39 -05:00

Resources

Remove non-existant files from icon contents.json files (#3148)

2021-08-16 15:13:35 -07:00

AssetProcessorGemConfig.setreg

Integrating latest from github/staging

2021-03-26 14:32:02 -07:00

CMakeLists.txt

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

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

gem.json

Updated gem.json for all top-level Gems. (#1715) (#1917)

2021-07-07 13:29:33 -05:00

preview.png

Integrating latest 47acbe8

2021-03-25 13:57:57 -07:00