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

merge from stabilization/2106

Browse Source 
Signed-off-by: greerdv <greerdv@amazon.com>
This commit is contained in:
greerdv
2021-07-01 11:30:16 +01:00
parent 899350b5c7 c6b86e3c40
commit 88615f462c
18876 changed files with 21435 additions and 19428 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/CMakeLists.txt
+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)
Code/CryEngine/CMakeLists.txt
-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)
Code/CryEngine/CrySystem/crysystem_shared_files.cmake
-10
View File
@@ -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
)
Code/Sandbox/Editor/2DViewport.cpp → Code/Editor/2DViewport.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/2DViewport.h → Code/Editor/2DViewport.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AboutDialog.cpp → Code/Editor/AboutDialog.cpp
+3 -3
View File
@@ -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,10 +42,10 @@ 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_1_27.png"));
QImage backgroundImage(QStringLiteral(":/StartupLogoDialog/splashscreen_background_gradient.jpg"));
m_backgroundImage = QPixmap::fromImage(backgroundImage.scaled(m_enforcedWidth, m_enforcedHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
// Draw the Open 3D Engine logo from svg
Code/Sandbox/Editor/AboutDialog.h → Code/Editor/AboutDialog.h
+2 -2
View File
@@ -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
*
@@ -38,6 +38,6 @@ private:
QPixmap m_backgroundImage;
int m_enforcedWidth = 600;
int m_enforcedHeight = 360;
int m_enforcedHeight = 400;
};
Code/Editor/AboutDialog.ui
+285
View File
@@ -0,0 +1,285 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>CAboutDialog</class>
<widget class="QWidget" name="CAboutDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>600</width>
<height>360</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>600</width>
<height>360</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
<height>360</height>
</size>
</property>
<property name="windowTitle">
<string>About Open 3D Engine Editor</string>
</property>
<property name="styleSheet">
<string notr="true">background-color: transparent</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>10</number>
</property>
<property name="bottomMargin">
<number>10</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_42">
<property name="leftMargin">
<number>11</number>
</property>
<property name="topMargin">
<number>12</number>
</property>
<property name="bottomMargin">
<number>12</number>
</property>
<item>
<widget class="QSvgWidget" name="m_logo" native="true">
<property name="minimumSize">
<size>
<width>175</width>
<height>66</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>175</width>
<height>66</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetNoConstraint</enum>
</property>
<property name="leftMargin">
<number>20</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16</height>
</size>
</property>
<property name="text">
<string>O3DE Editor</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="m_transparentDevelopedBy">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>18</height>
</size>
</property>
<property name="text">
<string>Developer Preview</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<widget class="QLabel" name="m_transparentCopyright">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>180</width>
<height>0</height>
</rect>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
</property>
</widget>
</widget>
</item>
<item>
<widget class="QLabel" name="m_transparentTrademarks">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>18</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="ClickableLabel" name="m_transparentAgreement">
<property name="text">
<string>Terms of Use</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="showDecoration" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>16</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="m_transparentAllRightReserved">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>260</width>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>260</width>
<height>24</height>
</size>
</property>
<property name="text">
<string>Specified in AboutDialog.cpp</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>300</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QSvgWidget</class>
<extends>QWidget</extends>
<header>qsvgwidget.h</header>
</customwidget>
<customwidget>
<class>ClickableLabel</class>
<extends>QLabel</extends>
<header>QtUI/ClickableLabel.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
Code/Sandbox/Editor/ActionManager.cpp → Code/Editor/ActionManager.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/ActionManager.h → Code/Editor/ActionManager.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Animation/AnimationBipedBoneNames.cpp → Code/Editor/Animation/AnimationBipedBoneNames.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Animation/AnimationBipedBoneNames.h → Code/Editor/Animation/AnimationBipedBoneNames.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Animation/SkeletonHierarchy.cpp → Code/Editor/Animation/SkeletonHierarchy.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Animation/SkeletonHierarchy.h → Code/Editor/Animation/SkeletonHierarchy.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Animation/SkeletonMapper.cpp → Code/Editor/Animation/SkeletonMapper.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Animation/SkeletonMapper.h → Code/Editor/Animation/SkeletonMapper.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Animation/SkeletonMapperOperator.cpp → Code/Editor/Animation/SkeletonMapperOperator.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Animation/SkeletonMapperOperator.h → Code/Editor/Animation/SkeletonMapperOperator.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AnimationContext.cpp → Code/Editor/AnimationContext.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AnimationContext.cpp.rej → Code/Editor/AnimationContext.cpp.rej
View File
Code/Sandbox/Editor/AnimationContext.h → Code/Editor/AnimationContext.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetDatabase/AssetDatabaseLocationListener.cpp → Code/Editor/AssetDatabase/AssetDatabaseLocationListener.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetDatabase/AssetDatabaseLocationListener.h → Code/Editor/AssetDatabase/AssetDatabaseLocationListener.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetEditor/AssetEditorRequestsHandler.cpp → Code/Editor/AssetEditor/AssetEditorRequestsHandler.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetEditor/AssetEditorRequestsHandler.h → Code/Editor/AssetEditor/AssetEditorRequestsHandler.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.cpp → Code/Editor/AssetEditor/AssetEditorWindow.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.h → Code/Editor/AssetEditor/AssetEditorWindow.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.ui → Code/Editor/AssetEditor/AssetEditorWindow.ui
View File
Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.cpp → Code/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h → Code/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp → Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.h → Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.cpp → Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.h → Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.ui → Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.ui
View File
Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.cpp → Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.h → Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.ui → Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.ui
View File
Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.cpp → Code/Editor/AssetImporter/UI/SelectDestinationDialog.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.h → Code/Editor/AssetImporter/UI/SelectDestinationDialog.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.ui → Code/Editor/AssetImporter/UI/SelectDestinationDialog.ui
View File
Code/Sandbox/Editor/AzAssetBrowser/AssetBrowserWindow.cpp → Code/Editor/AzAssetBrowser/AssetBrowserWindow.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AzAssetBrowser/AssetBrowserWindow.h → Code/Editor/AzAssetBrowser/AssetBrowserWindow.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp → Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.h → Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp → Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.h → Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui → Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui
View File
Code/Sandbox/Editor/BaseLibrary.cpp → Code/Editor/BaseLibrary.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/BaseLibrary.h → Code/Editor/BaseLibrary.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/BaseLibraryItem.cpp → Code/Editor/BaseLibraryItem.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/BaseLibraryItem.h → Code/Editor/BaseLibraryItem.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/BaseLibraryManager.cpp → Code/Editor/BaseLibraryManager.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/BaseLibraryManager.h → Code/Editor/BaseLibraryManager.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/CMakeLists.txt → Code/Editor/CMakeLists.txt
+3 -1
View File
@@ -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
Code/Sandbox/Editor/CVarMenu.cpp → Code/Editor/CVarMenu.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/CVarMenu.h → Code/Editor/CVarMenu.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/CheckOutDialog.cpp → Code/Editor/CheckOutDialog.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/CheckOutDialog.h → Code/Editor/CheckOutDialog.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/CheckOutDialog.ui → Code/Editor/CheckOutDialog.ui
View File
Code/Sandbox/Editor/Clipboard.cpp → Code/Editor/Clipboard.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Clipboard.h → Code/Editor/Clipboard.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Commands/CommandManager.cpp → Code/Editor/Commands/CommandManager.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Commands/CommandManager.h → Code/Editor/Commands/CommandManager.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Commands/CommandManagerBus.h → Code/Editor/Commands/CommandManagerBus.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Common/spline_edit-00.png → Code/Editor/Common/spline_edit-00.png
View File
Code/Sandbox/Editor/Common/spline_edit-01.png → Code/Editor/Common/spline_edit-01.png
View File
Code/Sandbox/Editor/Common/spline_edit-02.png → Code/Editor/Common/spline_edit-02.png
View File
Code/Sandbox/Editor/Common/spline_edit-03.png → Code/Editor/Common/spline_edit-03.png
View File
Code/Sandbox/Editor/Common/spline_edit-04.png → Code/Editor/Common/spline_edit-04.png
View File
Code/Sandbox/Editor/Common/spline_edit-05.png → Code/Editor/Common/spline_edit-05.png
View File
Code/Sandbox/Editor/Common/spline_edit-06.png → Code/Editor/Common/spline_edit-06.png
View File
Code/Sandbox/Editor/Common/spline_edit-07.png → Code/Editor/Common/spline_edit-07.png
View File
Code/Sandbox/Editor/Common/spline_edit-08.png → Code/Editor/Common/spline_edit-08.png
View File
Code/Sandbox/Editor/Common/spline_edit-09.png → Code/Editor/Common/spline_edit-09.png
View File
Code/Sandbox/Editor/Common/spline_edit-10.png → Code/Editor/Common/spline_edit-10.png
View File
Code/Sandbox/Editor/Common/spline_edit-11.png → Code/Editor/Common/spline_edit-11.png
View File
Code/Sandbox/Editor/Common/spline_edit-12.png → Code/Editor/Common/spline_edit-12.png
View File
Code/Sandbox/Editor/Common/spline_edit-13.png → Code/Editor/Common/spline_edit-13.png
View File
Code/Sandbox/Editor/Common/spline_edit-14.png → Code/Editor/Common/spline_edit-14.png
View File
Code/Sandbox/Editor/Common/spline_edit-15.png → Code/Editor/Common/spline_edit-15.png
View File
Code/Sandbox/Editor/Common/spline_edit-16.png → Code/Editor/Common/spline_edit-16.png
View File
Code/Sandbox/Editor/ConfigGroup.cpp → Code/Editor/ConfigGroup.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/ConfigGroup.h → Code/Editor/ConfigGroup.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/ConsoleDialog.cpp → Code/Editor/ConsoleDialog.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/ConsoleDialog.h → Code/Editor/ConsoleDialog.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/ControlMRU.cpp → Code/Editor/ControlMRU.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/ControlMRU.h → Code/Editor/ControlMRU.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Controls/BitmapToolTip.cpp → Code/Editor/Controls/BitmapToolTip.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Controls/BitmapToolTip.h → Code/Editor/Controls/BitmapToolTip.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Controls/ColorGradientCtrl.cpp → Code/Editor/Controls/ColorGradientCtrl.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Controls/ColorGradientCtrl.h → Code/Editor/Controls/ColorGradientCtrl.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Controls/ConsoleSCB.cpp → Code/Editor/Controls/ConsoleSCB.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Controls/ConsoleSCB.h → Code/Editor/Controls/ConsoleSCB.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Controls/ConsoleSCB.qrc → Code/Editor/Controls/ConsoleSCB.qrc
View File
Code/Sandbox/Editor/Controls/ConsoleSCB.ui → Code/Editor/Controls/ConsoleSCB.ui
View File
Code/Sandbox/Editor/Controls/ConsoleSCBMFC.cpp → Code/Editor/Controls/ConsoleSCBMFC.cpp
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Controls/ConsoleSCBMFC.h → Code/Editor/Controls/ConsoleSCBMFC.h
+1 -1
View File
@@ -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
*
Code/Sandbox/Editor/Controls/ConsoleSCBMFC.ui → Code/Editor/Controls/ConsoleSCBMFC.ui
View File
Code/Sandbox/Editor/Controls/FolderTreeCtrl.cpp → Code/Editor/Controls/FolderTreeCtrl.cpp
+1 -1
View File
@@ -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