birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628

Browse Source
This commit is contained in:
Gene Walters
2021-06-28 19:09:20 -07:00
parent 7b618d9db2 c7d000e14b
commit 4e14c0069b
18674 changed files with 87627 additions and 179297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/Gem/PythonTests/atom_renderer/CMakeLists.txt
+3 -7
View File
@@ -1,12 +1,8 @@
#
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
# its licensors.
# Copyright (c) Contributors to the Open 3D Engine Project
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
# For complete copyright and license terms please see the LICENSE at the root of this
# distribution (the "License"). All use of this software is governed by the License,
# or, if provided, by the license below or the license accompanying this file. Do not
# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#
################################################################################
AutomatedTesting/Gem/PythonTests/atom_renderer/__init__.py
+2 -7
View File
@@ -1,10 +1,5 @@
"""
All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
its licensors.
Copyright (c) Contributors to the Open 3D Engine Project
For complete copyright and license terms please see the LICENSE at the root of this
distribution (the "License"). All use of this software is governed by the License,
or, if provided, by the license below or the license accompanying this file. Do not
remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
SPDX-License-Identifier: Apache-2.0 OR MIT
"""
AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/__init__.py
+2 -7
View File
@@ -1,10 +1,5 @@
"""
All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
its licensors.
Copyright (c) Contributors to the Open 3D Engine Project
For complete copyright and license terms please see the LICENSE at the root of this
distribution (the "License"). All use of this software is governed by the License,
or, if provided, by the license below or the license accompanying this file. Do not
remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
SPDX-License-Identifier: Apache-2.0 OR MIT
"""
AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
+2 -7
View File
@@ -1,12 +1,7 @@
"""
All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
its licensors.
Copyright (c) Contributors to the Open 3D Engine Project
For complete copyright and license terms please see the LICENSE at the root of this
distribution (the "License"). All use of this software is governed by the License,
or, if provided, by the license below or the license accompanying this file. Do not
remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
SPDX-License-Identifier: Apache-2.0 OR MIT
Hydra script that creates an entity and attaches Atom components to it for test verification.
"""
AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
+2 -7
View File
@@ -1,12 +1,7 @@
"""
All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
its licensors.
Copyright (c) Contributors to the Open 3D Engine Project
For complete copyright and license terms please see the LICENSE at the root of this
distribution (the "License"). All use of this software is governed by the License,
or, if provided, by the license below or the license accompanying this file. Do not
remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
SPDX-License-Identifier: Apache-2.0 OR MIT
Main suite tests for the Atom renderer.
"""
AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py
+2 -7
View File
@@ -1,12 +1,7 @@
"""
All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
its licensors.
Copyright (c) Contributors to the Open 3D Engine Project
For complete copyright and license terms please see the LICENSE at the root of this
distribution (the "License"). All use of this software is governed by the License,
or, if provided, by the license below or the license accompanying this file. Do not
remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
SPDX-License-Identifier: Apache-2.0 OR MIT
Sandbox suite tests for the Atom renderer.
"""