merging latest dev

Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-22 17:00:47 -07:00
parent 569dbc7db3 297f40d6c4
commit 6ef6164ad8
835 changed files with 23255 additions and 9255 deletions
@@ -33,7 +33,7 @@ add_subdirectory(WhiteBox)
 add_subdirectory(NvCloth)

 ## Prefab ##
-add_subdirectory(prefab)
+add_subdirectory(Prefab)

 ## Editor Python Bindings ##
 add_subdirectory(EditorPythonBindings)
@@ -61,3 +61,6 @@ add_subdirectory(AWS)

 ## Multiplayer ##
 add_subdirectory(Multiplayer)
+
+## Integration tests for editor testing framework ##
+add_subdirectory(editor_test_testing)