Tommy Walton 7bf5f86c05 Merging latest development ...

Signed-off-by: Tommy Walton <waltont@amazon.com>

2021-11-16 13:38:57 -08:00

..

assetpipeline

Merge commit 'c44d03a40df0899851c6cbd929a673fac48ce82b' into amzn-tommy/gitflow_211116_o3de2

2021-11-16 12:53:42 -08:00

Atom

Merge pull request #5564 from aws-lumberyard-dev/Atom/jromnoa/fix-asset-path-calls-to-use-new-asset-test-class

2021-11-11 15:32:23 -08:00

automatedtesting_shared

Fixed editor log path and improved editor log not found error string (#5357)

2021-11-11 22:15:44 +00:00

AWS

Update resource mapping schema to make default account ID optional (#5475)

2021-11-15 14:48:32 -08:00

Blast

Added PAL to blast and whitebox tests to only enable automated tests on supported platforms: windows only at the moment. (#5165)

2021-11-02 09:28:31 +00:00

editor

Removal and Replacement of the CryTimer (gEnv->pTimer) (#5409)

2021-11-15 12:11:58 +00:00

editor_test_testing

addressing minor details in feedback

2021-10-26 10:37:39 -07:00

EditorPythonBindings

Update the FileIO Aliases (#4186)

2021-10-05 15:12:53 -05:00

EditorPythonTestTools

Removed redundant append to components list from add_component()

2021-11-15 17:50:42 -06:00

largeworlds

Cleaning up test docstring

2021-11-15 18:30:06 -06:00

Multiplayer

Removing Multiplayer MainSuite tests, because AR considers no-test to be a failure

2021-11-04 22:23:00 -07:00

NvCloth

Cloth automated tests only check for cloth gem errors and warnings (#5374)

2021-11-08 09:14:26 +00:00

Physics

Fix prefab enabled automated tests (#5626)

2021-11-16 17:56:24 +00:00

Platform

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

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

Prefab

Added two complex prefab tests (#5089)

2021-10-29 22:32:33 +01:00

PythonAssetBuilder

{lyn7352} adding more logging around mock_asset_builder.py (#5103) (#5566)

2021-11-11 16:07:02 -06:00

scripting

Marked test_VariableManager_UnpinVariableType_Works as xfail, the test needs to be reworked

2021-09-30 17:15:06 -07:00

smoke

merge from development

2021-11-12 14:47:08 -08:00

streaming

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

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

Terrain

Physics/test axis aligned box shape configuration works #7378a (#5366)

2021-11-09 14:11:33 +00:00

WhiteBox

Added PAL to blast and whitebox tests to only enable automated tests on supported platforms: windows only at the moment. (#5165)

2021-11-02 09:28:31 +00:00

CMakeLists.txt

Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21

2021-11-11 10:15:52 -08:00