sphrose 4e5b62ee25 conflict fix ...

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

2021-12-03 11:36:58 +00:00

..

assetpipeline

Added an assert to verify AP and AP Batch close on teardown. (#5891)

2021-12-02 13:48:30 -08:00

Atom

Merge pull request #5908 from aws-lumberyard-dev/terrain/sphrose/reference_shape

2021-12-02 10:09:05 +00:00

automatedtesting_shared

Make prefab system enabled as default for automated tests (#5670)

2021-11-22 10:45:18 -08:00

AWS

AWSClientAuth updated to use custom CognitoCachingCredentialsProvider (#5525)

2021-11-16 14:50:37 -08:00

Blast

Make prefab system enabled as default for automated tests (#5670)

2021-11-22 10:45:18 -08:00

editor

Enabling only optimized test runners for Editor/DynVeg/GradSignal (#5873)

2021-11-30 11:18:41 -08:00

editor_test_testing

addressing minor details in feedback

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

EditorPythonBindings

Cry Legacy: the Lessening (#5961)

2021-11-29 11:21:06 -07:00

EditorPythonTestTools

Adding setup step to remove temporary level that fails to cleanup (#6056)

2021-12-01 11:17:08 -08:00

largeworlds

Merge pull request #5908 from aws-lumberyard-dev/terrain/sphrose/reference_shape

2021-12-02 10:09:05 +00:00

Multiplayer

Make prefab system enabled as default for automated tests (#5670)

2021-11-22 10:45:18 -08:00

NvCloth

Make prefab system enabled as default for automated tests (#5670)

2021-11-22 10:45:18 -08:00

Physics

Make prefab system enabled as default for automated tests (#5670)

2021-11-22 10:45:18 -08:00

Platform

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

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

Prefab

Add tests for deleting an entity from the level and from another prefab (#5839)

2021-11-30 08:20:25 -08:00

PythonAssetBuilder

{lyn7352} adding more logging to mock asset builder test (#5591)

2021-11-16 12:21:33 -06:00

scripting

Make prefab system enabled as default for automated tests (#5670)

2021-11-22 10:45:18 -08:00

smoke

Make prefab system enabled as default for automated tests (#5670)

2021-11-22 10:45:18 -08:00

streaming

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

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

Terrain

conflict fix

2021-12-03 11:36:58 +00:00

WhiteBox

Make prefab system enabled as default for automated tests (#5670)

2021-11-22 10:45:18 -08:00

CMakeLists.txt

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

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