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

Merge branch 'stabilization/2106' into redcode/SPEC-7563

Browse Source
This commit is contained in:
Esteban Papp
2021-06-30 09:20:08 -07:00
parent d6caff7842 6392788212
commit 5fa495380c
55 changed files with 1182 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/EditorDefs.h
-9
View File
@@ -7,15 +7,6 @@
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios
// -------------------------------------------------------------------------
// Created: 13/2/2003 by Timur.
// Description: Main header included by every file in Editor.
//
////////////////////////////////////////////////////////////////////////////
#ifndef CRYINCLUDE_EDITOR_EDITORDEFS_H
#define CRYINCLUDE_EDITOR_EDITORDEFS_H
Code/Editor/EditorViewportWidget.cpp
+2 -1
View File
@@ -462,7 +462,6 @@ void EditorViewportWidget::Update()
SetViewTM(m);
SetFOV(cameraState.m_fovOrZoom);
m_Camera.SetZRange(cameraState.m_nearClip, cameraState.m_farClip);
m_updateCameraPositionNextTick = false;
}
else if (!ed_useNewCameraSystem)
{
@@ -483,6 +482,8 @@ void EditorViewportWidget::Update()
);
m_renderViewport->GetViewportContext()->SetCameraProjectionMatrix(clipMatrix);
}
// Reset the camera update flag now that we're finished updating our viewport context
m_updateCameraPositionNextTick = false;
// Don't wait for changes to update the focused viewport.
if (CheckRespondToInput())
Code/Editor/NewLevelDialog.h
-14
View File
@@ -7,20 +7,6 @@
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2002.
// -------------------------------------------------------------------------
// File name: newleveldialog.h
// Version: v1.00
// Created: 24/7/2002 by Timur.
// Compilers: Visual Studio.NET
// Description:
// -------------------------------------------------------------------------
// History:
//
////////////////////////////////////////////////////////////////////////////
#ifndef CRYINCLUDE_EDITOR_NEWLEVELDIALOG_H
#define CRYINCLUDE_EDITOR_NEWLEVELDIALOG_H
Code/Editor/NewTerrainDialog.h
-14
View File
@@ -5,20 +5,6 @@
*
*/
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2002.
// -------------------------------------------------------------------------
// File name: newterraindialog.h
// Version: v1.00
// Created: 24/7/2002 by Timur.
// Compilers: Visual Studio.NET
// Description:
// -------------------------------------------------------------------------
// History:
//
////////////////////////////////////////////////////////////////////////////
#ifndef CRYINCLUDE_EDITOR_NEWTERRAINDIALOG_H
#define CRYINCLUDE_EDITOR_NEWTERRAINDIALOG_H
Code/Editor/Plugin.h
-9
View File
@@ -7,15 +7,6 @@
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2001-2012
// -------------------------------------------------------------------------
// Created: 15/1/2003 by Timur.
// Description: Plugin architecture supporting classes
//
////////////////////////////////////////////////////////////////////////////
#ifndef CRYINCLUDE_EDITOR_PLUGIN_H
#define CRYINCLUDE_EDITOR_PLUGIN_H
#include "Include/IEditorClassFactory.h"
Code/Editor/PluginManager.h
-8
View File
@@ -7,14 +7,6 @@
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2001-2012.
// -------------------------------------------------------------------------
// Description: The plugin manager, central point for loading/unloading plugins
//
////////////////////////////////////////////////////////////////////////////
#ifndef CRYINCLUDE_EDITOR_PLUGINMANAGER_H
#define CRYINCLUDE_EDITOR_PLUGINMANAGER_H
Code/Editor/Plugins/EditorCommon/EditorCommon.rc
BIN
View File
Binary file not shown.
Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin.h
+1 -4
View File
@@ -7,10 +7,7 @@
#pragma once
////////////////////////////////// CRYTEK ////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2011.
////////////////////////////////////////////////////////////////////////////
// -------------------------------------------------------------------------
// File Name : FFMPEGPlugin.h
// Author : Jaewon Jung
Code/Editor/Settings.h
-14
View File
@@ -7,20 +7,6 @@
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2002.
// -------------------------------------------------------------------------
// File name: settings.h
// Version: v1.00
// Created: 14/1/2003 by Timur.
// Compilers: Visual Studio.NET
// Description: General editor settings.
// -------------------------------------------------------------------------
// History:
//
////////////////////////////////////////////////////////////////////////////
#ifndef CRYINCLUDE_EDITOR_SETTINGS_H
#define CRYINCLUDE_EDITOR_SETTINGS_H
#include "SettingsManager.h"
Code/Editor/UsedResources.h
-11
View File
@@ -7,17 +7,6 @@
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2001-2012
// -------------------------------------------------------------------------
// File name: UsedResources.h
// Created: 28/11/2003 by Timur.
// Description: Class to gather used resources
//
////////////////////////////////////////////////////////////////////////////
//! Class passed to resource gathering functions
#ifndef CRYINCLUDE_EDITOR_USEDRESOURCES_H
#define CRYINCLUDE_EDITOR_USEDRESOURCES_H
Code/Editor/WaitProgress.h
-6
View File
@@ -8,12 +8,6 @@
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2002-2012.
// -------------------------------------------------------------------------
// File name: waitprogress.h
// Created: 10/5/2002 by Timur.
// Description: CWaitProgress class adds information about lengthy process
// Usage:
//
Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp
+7
View File
@@ -187,6 +187,13 @@ namespace AzNetworking
connection->Disconnect(disconnectReason, TerminationEndpoint::Local);
continue;
}
const ConnectionState connectionState = connection->GetConnectionState();
if (connectionState == ConnectionState::Disconnecting || connectionState == ConnectionState::Disconnected)
{
// Skip packets from disconnected connections
continue;
}
int32_t decodedPacketSize = 0;
m_decryptBuffer.Resize(m_decryptBuffer.GetCapacity());
Code/Framework/AzQtComponents/AzQtComponents/Images/Menu/helpers.svg
+12 -24
View File
@@ -1,24 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Helpers Icon</title>
<defs>
<circle id="path-1" cx="8" cy="8" r="8"></circle>
<path d="M8.59736328,10.1821289 L8.59736328,9.79394531 C8.59736328,9.07617188 8.86835937,8.71728516 9.84248047,8.15332031 C10.8751953,7.54541016 11.4098633,6.77636719 11.4098633,5.67041016 C11.4098633,4.00048828 10.0255859,2.8359375 7.93085937,2.8359375 C5.68232422,2.8359375 4.40791016,4.09570312 4.37128906,5.89746094 L6.35615234,5.89746094 C6.40009766,5.06982422 6.95673828,4.53515625 7.79902344,4.53515625 C8.63398437,4.53515625 9.190625,5.04052734 9.190625,5.73632812 C9.190625,6.43212891 8.90498047,6.79101562 7.96015625,7.35498047 C6.94941406,7.94824219 6.54658203,8.60742188 6.64179687,9.75732422 L6.65644531,10.1821289 L8.59736328,10.1821289 Z M7.70380859,13.7124023 C8.52412109,13.7124023 9.02949219,13.2436523 9.02949219,12.4892578 C9.02949219,11.7275391 8.52412109,11.2587891 7.70380859,11.2587891 C6.88349609,11.2587891 6.37080078,11.7275391 6.37080078,12.4892578 C6.37080078,13.2436523 6.88349609,13.7124023 7.70380859,13.7124023 Z" id="path-3"></path>
</defs>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="2nd-ToolBar-v2-(Perspective)-3" transform="translate(-1161.000000, -7.000000)">
<g id="2nd-ToolBar-buttons-on-right" transform="translate(1076.000000, 5.000000)">
<g id="Helpers-Icon" transform="translate(85.000000, 2.000000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<use id="Oval" fill="#FFFFFF" xlink:href="#path-1"></use>
<g id="?" fill-rule="nonzero" mask="url(#mask-2)">
<use fill="#909090" xlink:href="#path-3"></use>
<use fill="#3F3F3F" xlink:href="#path-3"></use>
</g>
</g>
</g>
</g>
</g>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 25.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
<style type="text/css">
.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
</style>
<path class="st0" d="M8,5.511C6.626,5.511,5.511,6.626,5.511,8S6.626,10.489,8,10.489S10.489,9.374,10.489,8S9.374,5.511,8,5.511z
M8,9.694C7.064,9.694,6.306,8.936,6.306,8S7.064,6.306,8,6.306S9.694,7.064,9.694,8S8.936,9.694,8,9.694z"/>
<path class="st0" d="M8,0C3.582,0,0,3.582,0,8s3.582,8,8,8s8-3.582,8-8S12.418,0,8,0z M8,12.463c-4,0-7.242-2.915-7.242-4.463
S4,3.537,8,3.537c4,0,7.242,2.915,7.242,4.463S12,12.463,8,12.463z"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 868 B

Code/Legacy/CrySystem/ConsoleHelpGen.cpp
+4 -4
View File
@@ -90,10 +90,10 @@ void CConsoleHelpGen::StartPage(FILE* f, const char* szPageName, const char* szP
{
fprintf(f, "<HTML><HEAD><TITLE>%s</TITLE><META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=iso-8859-1\">", szPageName);
fprintf(f, "<META NAME=\"DESCRIPTION\" CONTENT=\"%s\">", szPageDescription);
fprintf(f, "<META NAME=\"author\" content=\"Crytek\">");
fprintf(f, "<META NAME=\"copyright\" CONTENT=\"Crytek\">");
fprintf(f, "<META NAME=\"KEYWORDS\" CONTENT=\"CryEngine,Crytek\">");
fprintf(f, "<META NAME=\"distribution\" CONTENT=\"Crytek\">");
fprintf(f, "<META NAME=\"author\" content=\"Contributors to the Open 3D Engine Project\">");
fprintf(f, "<META NAME=\"copyright\" CONTENT=\"Contributors to the Open 3D Engine Project\">");
fprintf(f, "<META NAME=\"KEYWORDS\" CONTENT=\"O3DE\">");
fprintf(f, "<META NAME=\"distribution\" CONTENT=\"Contributors to the Open 3D Engine Project\">");
fprintf(f, "<META NAME=\"revisit-after\" CONTENT=\"10 days\">");
fprintf(f, "<META NAME=\"robots\" CONTENT=\"INDEX, NOFOLLOW\">");
fprintf(f, "</HEAD><BODY bgcolor=#ffffff leftmargin=0 topmargin=0 alink=#0000ff link=#0000ff vlink=#0000ff text=#000000>");
Code/Tools/ProjectManager/Resources/ProjectManager.qss
+15
View File
@@ -463,6 +463,21 @@ QProgressBar::chunk {
font-weight: 600;
}
#GemCatalogHeaderLabel {
font-size: 12px;
color: #FFFFFF;
}
#GemCatalogHeaderShowCountLabel {
font-size: 12px;
font: italic;
color: #FFFFFF;
}
#GemCatalogListView {
background-color: #333333;
}
/************** Gem Catalog (Inspector) **************/
#GemCatalogInspector {
Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp
+7 -7
View File
@@ -31,7 +31,7 @@ namespace O3DE::ProjectManager
topLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding));
QLabel* showCountLabel = new QLabel();
showCountLabel->setStyleSheet("font-size: 12px; font: italic; color: #FFFFFF;");
showCountLabel->setObjectName("GemCatalogHeaderShowCountLabel");
topLayout->addWidget(showCountLabel);
connect(proxyModel, &GemSortFilterProxyModel::OnInvalidated, this, [=]
{
@@ -57,27 +57,27 @@ namespace O3DE::ProjectManager
QHBoxLayout* columnHeaderLayout = new QHBoxLayout();
columnHeaderLayout->setAlignment(Qt::AlignLeft);
const int gemNameStartX = GemItemDelegate::s_itemMargins.left() + GemItemDelegate::s_contentMargins.left() - 3;
const int gemNameStartX = GemItemDelegate::s_itemMargins.left() + GemItemDelegate::s_contentMargins.left() - 1;
columnHeaderLayout->addSpacing(gemNameStartX);
QLabel* gemNameLabel = new QLabel(tr("Gem Name"));
gemNameLabel->setStyleSheet("font-size: 12px; color: #FFFFFF;");
gemNameLabel->setObjectName("GemCatalogHeaderLabel");
columnHeaderLayout->addWidget(gemNameLabel);
columnHeaderLayout->addSpacing(77);
columnHeaderLayout->addSpacing(89);
QLabel* gemSummaryLabel = new QLabel(tr("Gem Summary"));
gemSummaryLabel->setStyleSheet("font-size: 12px; color: #FFFFFF;");
gemSummaryLabel->setObjectName("GemCatalogHeaderLabel");
columnHeaderLayout->addWidget(gemSummaryLabel);
QSpacerItem* horizontalSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
columnHeaderLayout->addSpacerItem(horizontalSpacer);
QLabel* gemSelectedLabel = new QLabel(tr("Selected"));
gemSelectedLabel->setStyleSheet("font-size: 12px; color: #FFFFFF;");
gemSelectedLabel->setObjectName("GemCatalogHeaderLabel");
columnHeaderLayout->addWidget(gemSelectedLabel);
columnHeaderLayout->addSpacing(60);
columnHeaderLayout->addSpacing(65);
vLayout->addLayout(columnHeaderLayout);
}
Code/Tools/ProjectManager/Source/GemCatalog/GemListView.cpp
+1 -2
View File
@@ -14,10 +14,9 @@ namespace O3DE::ProjectManager
GemListView::GemListView(QAbstractItemModel* model, QItemSelectionModel* selectionModel, QWidget* parent)
: QListView(parent)
{
setObjectName("GemCatalogListView");
setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
setStyleSheet("background-color: #333333;");
setModel(model);
setSelectionModel(selectionModel);
setItemDelegate(new GemItemDelegate(model, this));