Merge branch 'stabilization/2106' into Helios_LYN-4880-IncorrectBoneNodes

This commit is contained in:
amzn-mike
2021-07-01 10:18:57 -05:00
18865 changed files with 20113 additions and 19582 deletions
+3 -3
View File
@@ -1,12 +1,12 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project
# 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.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#
add_subdirectory(CryEngine)
add_subdirectory(Framework)
add_subdirectory(LauncherUnified)
add_subdirectory(Sandbox)
add_subdirectory(Legacy)
add_subdirectory(Editor)
add_subdirectory(Tools)
-9
View File
@@ -1,9 +0,0 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#
add_subdirectory(CryCommon)
add_subdirectory(CrySystem)
@@ -1,10 +0,0 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#
set(FILES
DllMain.cpp
)
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -42,7 +42,7 @@ CAboutDialog::CAboutDialog(QString versionText, QString richTextCopyrightNotice,
m_ui->m_transparentAgreement->setObjectName("link");
setStyleSheet( "CAboutDialog > QLabel#copyrightNotice { color: #AAAAAA; font-size: 9px; }\
CAboutDialog > QLabel#link { text-decoration: underline; color: #00A1C9; }");
CAboutDialog > QLabel#link { text-decoration: underline; color: #94D2FF; }");
// Prepare background image
QImage backgroundImage(QStringLiteral(":/StartupLogoDialog/splashscreen_background_gradient.jpg"));
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,6 +1,6 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project
# 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.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
@@ -9,6 +9,8 @@ if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
return()
endif()
add_subdirectory(Plugins)
ly_add_target(
NAME EditorCore SHARED
NAMESPACE Legacy
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* 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.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*

Some files were not shown because too many files have changed in this diff Show More