Merge remote-tracking branch 'upstream/development' into Atom/amzn-tommy/ExposeTransformLookAtToBehaviorContext

Signed-off-by: amzn-tommy <waltont@amazon.com>

Gems/Atom/RPI/Code/Source/RPI.Reflect/Buffer/BufferAssetCreator.cpp

@@ -57,7 +57,7 @@ namespace AZ
             // Only allocate buffer if initial data is not empty
             if (initialData != nullptr && initialDataSize > 0)
             {
-                bufferAsset->m_buffer.resize(descriptor.m_byteCount);
+                bufferAsset->m_buffer.resize_no_construct(descriptor.m_byteCount);
                 memcpy(bufferAsset->m_buffer.data(), initialData, initialDataSize);
             }
 

Gems/EditorPythonBindings/Code/Source/PythonProxyBus.cpp

@@ -195,7 +195,7 @@ namespace EditorPythonBindings
 
                 if (!m_handler)
                 {
-                    AZ_Error("python", false, "No EBus connection deteced; missing call or failed call to connect()?");
+                    AZ_Error("python", false, "No EBus connection detected; missing call or failed call to connect()?");
                     return false;
                 }
 

Gems/Multiplayer/Code/Tests/ClientHierarchyTests.cpp

@@ -307,7 +307,7 @@ namespace Multiplayer
     class ClientDeepHierarchyTests : public ClientSimpleHierarchyTests
     {
     public:
-        static const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
+        const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
 
         void SetUp() override
         {

Gems/Multiplayer/Code/Tests/ServerHierarchyTests.cpp

@@ -414,12 +414,12 @@ namespace Multiplayer
     class ServerBranchedHierarchyTests : public HierarchyTests
     {
     public:
-        static const NetEntityId RootNetEntityId = NetEntityId{ 1 };
-        static const NetEntityId ChildNetEntityId = NetEntityId{ 2 };
-        static const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
-        static const NetEntityId Child2NetEntityId = NetEntityId{ 4 };
-        static const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 5 };
-        static const NetEntityId Child2OfChild2NetEntityId = NetEntityId{ 6 };
+        const NetEntityId RootNetEntityId = NetEntityId{ 1 };
+        const NetEntityId ChildNetEntityId = NetEntityId{ 2 };
+        const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
+        const NetEntityId Child2NetEntityId = NetEntityId{ 4 };
+        const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 5 };
+        const NetEntityId Child2OfChild2NetEntityId = NetEntityId{ 6 };
 
         void SetUp() override
         {
@@ -610,9 +610,9 @@ namespace Multiplayer
     class ServerHierarchyOfHierarchyTests : public ServerDeepHierarchyTests
     {
     public:
-        static const NetEntityId Root2NetEntityId = NetEntityId{ 4 };
-        static const NetEntityId Child2NetEntityId = NetEntityId{ 5 };
-        static const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 6 };
+        const NetEntityId Root2NetEntityId = NetEntityId{ 4 };
+        const NetEntityId Child2NetEntityId = NetEntityId{ 5 };
+        const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 6 };
 
         void SetUp() override
         {
@@ -1132,9 +1132,9 @@ namespace Multiplayer
     class ServerHierarchyWithThreeRoots : public ServerHierarchyOfHierarchyTests
     {
     public:
-        static const NetEntityId Root3NetEntityId = NetEntityId{ 7 };
-        static const NetEntityId Child3NetEntityId = NetEntityId{ 8 };
-        static const NetEntityId ChildOfChild3NetEntityId = NetEntityId{ 9 };
+        const NetEntityId Root3NetEntityId = NetEntityId{ 7 };
+        const NetEntityId Child3NetEntityId = NetEntityId{ 8 };
+        const NetEntityId ChildOfChild3NetEntityId = NetEntityId{ 9 };
 
         void SetUp() override
         {

cmake/Platform/Mac/PAL_mac.cmake

@@ -37,6 +37,10 @@ endif()
 # Set the default asset type for deployment
 set(LY_ASSET_DEPLOY_ASSET_TYPE "mac" CACHE STRING "Set the asset type for deployment.")
 
+# Set the deployment target for MacOS
+set(LY_MAC_DEPLOYMENT_TARGET "11.0" CACHE STRING "Mac Deployment Target")
+set(CMAKE_OSX_DEPLOYMENT_TARGET ${LY_MAC_DEPLOYMENT_TARGET})
+
 # Set the python cmd tool
 ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/python/python.sh)
 

cmake/Platform/iOS/Toolchain_ios.cmake

@@ -13,7 +13,7 @@ set(CMAKE_OSX_ARCHITECTURES arm64)
 
 
 set(LY_IOS_CODE_SIGNING_IDENTITY "iPhone Developer" CACHE STRING "iPhone Developer")
-set(LY_IOS_DEPLOYMENT_TARGET "13.0" CACHE STRING "iOS Deployment Target")
+set(LY_IOS_DEPLOYMENT_TARGET "14.0" CACHE STRING "iOS Deployment Target")
 set(LY_IOS_DEVELOPMENT_TEAM "CF9TGN983S" CACHE STRING "The development team ID")