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

Merge branch 'development' into cmake/SPEC-7484

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ResourceSelectorHost.cpp
This commit is contained in:
Esteban Papp
2021-08-11 07:55:26 -07:00
parent d71674579a a26d6d5ec9
commit 9f7d280a1e
77 changed files with 248 additions and 1003 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzFramework/AzFramework/Archive/IArchive.h
+1
View File
@@ -11,6 +11,7 @@
#include <AzCore/EBus/Event.h>
#include <AzCore/IO/FileIO.h>
#include <AzCore/RTTI/RTTI.h>
#include <AzCore/std/containers/map.h>
#include <AzCore/std/smart_ptr/intrusive_base.h>
#include <AzCore/std/smart_ptr/intrusive_ptr.h>
Code/Framework/AzFramework/AzFramework/Asset/CfgFileAsset.h
+1 -1
View File
@@ -7,7 +7,7 @@
*/
#pragma once
#include <AzCore/RTTI/TypeInfo.h>
#include <AzCore/RTTI/TypeInfoSimple.h>
#include <AzFramework/Asset/SimpleAsset.h>
namespace AzFramework
Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionGroups.h
+1 -1
View File
@@ -8,7 +8,7 @@
#pragma once
#include <AzCore/RTTI/TypeInfo.h>
#include <AzCore/RTTI/TypeInfoSimple.h>
#include <AzCore/Memory/Memory.h>
#include <AzCore/std/containers/vector.h>
#include <AzCore/std/string/string.h>
Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionLayers.h
+1 -1
View File
@@ -8,7 +8,7 @@
#pragma once
#include <AzCore/RTTI/TypeInfo.h>
#include <AzCore/RTTI/TypeInfoSimple.h>
#include <AzCore/Memory/Memory.h>
#include <AzCore/std/containers/array.h>
#include <AzCore/std/string/string.h>
Code/Framework/AzFramework/AzFramework/Physics/Configuration/CollisionConfiguration.h
+1 -1
View File
@@ -8,7 +8,7 @@
#pragma once
#include <AzCore/RTTI/TypeInfo.h>
#include <AzCore/RTTI/TypeInfoSimple.h>
#include <AzCore/Memory/Memory.h>
#include <AzCore/std/containers/array.h>
#include <AzCore/std/containers/vector.h>
Code/Framework/AzFramework/AzFramework/Physics/Configuration/SceneConfiguration.h
+1 -1
View File
@@ -9,7 +9,7 @@
#include <AzCore/Math/Aabb.h>
#include <AzCore/Memory/Memory.h>
#include <AzCore/RTTI/TypeInfo.h>
#include <AzCore/RTTI/TypeInfoSimple.h>
#include <AzCore/std/containers/vector.h>
#include <AzCore/std/string/string.h>
Code/Framework/AzFramework/AzFramework/Slice/SliceInstantiationTicket.h
+1 -1
View File
@@ -10,7 +10,7 @@
#include <AzCore/Asset/AssetCommon.h>
#include <AzCore/Math/Uuid.h>
#include <AzCore/RTTI/TypeInfo.h>
#include <AzCore/RTTI/TypeInfoSimple.h>
#include <AzCore/std/hash.h>
#include <AzCore/std/string/string.h>
Code/Framework/AzFramework/AzFramework/Viewport/CameraState.h
+5
View File
@@ -11,6 +11,11 @@
#include <AzCore/Math/Vector2.h>
#include <AzCore/Math/Vector3.h>
namespace AZ
{
class SerializeContext;
} // namespace AZ
namespace AzFramework
{
//! Represents the camera state populated by the viewport camera.
Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.h
+2 -1
View File
@@ -11,7 +11,8 @@
#include <AzCore/base.h>
#include <AzCore/Math/Vector2.h>
#include <AzCore/Math/Vector3.h>
#include <AzCore/RTTI/TypeInfo.h>
#include <AzCore/RTTI/TypeInfoSimple.h>
#include <AzCore/Casting/numeric_cast.h>
namespace AZ
{