Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -43,7 +43,7 @@ def C19578018_ShapeColliderWithNoShapeComponent():
     7) Close the editor

    Note:
-    - This test file must be called from the Lumberyard Editor command terminal
+    - This test file must be called from the Open 3D Engine Editor command terminal
    - Any passed and failed tests are written to the Editor.log file.
        Parsing the file or running a log_monitor are required to observe the test results.

@@ -60,7 +60,7 @@ def C19578018_ShapeColliderWithNoShapeComponent():
    from utils import TestHelper as helper
    from editor_entity_utils import EditorEntity

-    # Lumberyard Imports
+    # Open 3D Engine Imports
    import azlmbr.bus as bus
    import azlmbr.editor as editor