Chris Galvan 5b0046ce78 Resolved conflicts in merge from stabilization/2106 -> development. ...

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

2021-08-11 15:33:50 -05:00

..

assetpipeline

Fixes a nightly build and a CMake warning (#2941)

2021-08-10 14:05:14 -07:00

atom_renderer

MaterialEditor BasicTests added to AutomatedTesting for AR (#3022)

2021-08-11 12:15:31 -07:00

automatedtesting_shared

Fix python fbx tests (#2171)

2021-07-20 06:48:35 -07:00

AWS

Fix AWSTests.periodic failing on Linux due to a File Not Found error

2021-08-09 13:00:43 -07:00

Blast

Fixes a nightly build and a CMake warning (#2941)

2021-08-10 14:05:14 -07:00

editor

Fixes a nightly build and a CMake warning (#2941)

2021-08-10 14:05:14 -07:00

editor_test_testing

(Continuation) Implemented automation paralellization & standarization (#1718)

2021-07-22 12:57:23 +02:00

EditorPythonBindings

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

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

EditorPythonTestTools

MaterialEditor BasicTests added to AutomatedTesting for AR (#3022)

2021-08-11 12:15:31 -07:00

largeworlds

Resolved conflicts in merge from stabilization/2106 -> development.

2021-08-11 15:33:50 -05:00

NvCloth

Fixes a nightly build and a CMake warning (#2941)

2021-08-10 14:05:14 -07:00

physics

Fixes a nightly build and a CMake warning (#2941)

2021-08-10 14:05:14 -07:00

Platform

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

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

prefab

Fixes a nightly build and a CMake warning (#2941)

2021-08-10 14:05:14 -07:00

PythonAssetBuilder

Fixes a nightly build and a CMake warning (#2941)

2021-08-10 14:05:14 -07:00

scripting

Fixes a nightly build and a CMake warning (#2941)

2021-08-10 14:05:14 -07:00

smoke

Fixes a nightly build and a CMake warning (#2941)

2021-08-10 14:05:14 -07:00

streaming

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

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

WhiteBox

Fixes a nightly build and a CMake warning (#2941)

2021-08-10 14:05:14 -07:00

CMakeLists.txt

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

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