Merge branch 'o3de:development' into development

Author: mateuszwasilewski

.gitattributes

@@ -124,7 +124,11 @@ Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_low.fbx filter=lf
 Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/marmoset_bake.tbscene filter=lfs diff=lfs merge=lfs -text
 Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/Brass/brass_bake.spp filter=lfs diff=lfs merge=lfs -text
 Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/stone/stone_bake.spp filter=lfs diff=lfs merge=lfs -text
+Gems/ProteusRobot/docs/images/*.png filter= diff= merge= -text
+Gems/RosRobotSample/docs/images/*.png filter= diff= merge= -text
+Gems/WarehouseAutomation/docs/images/*.png filter= diff= merge= -text
 Gems/WarehouseAssets/docs/images/*.png filter= diff= merge= -text
+Gems/WarehouseSample/docs/images/*.png filter= diff= merge= -text
 Templates/Ros2FleetRobotTemplate/docs/images/*.png filter= diff= merge= -text
 Gems/ROS2/docs/**/*.png -filter -diff -merge
 Templates/Ros2ProjectTemplate/Screenshots/*.png filter= diff= merge= -text

.github/pull_request_template.md

@@ -0,0 +1,9 @@
+## What does this PR do?
+
+_Please describe your PR. For a bug fix, what was the old behavior, what is the new behavior?_
+
+_Please add links to any issues, RFCs or other items that are relevant to this PR._
+
+## How was this PR tested?
+
+_Please describe any testing performed._

Gems/AudioEngineWwise/Assets/AudioBank_Dependencies.xml

@@ -0,0 +1,5 @@
+<EngineDependencies versionnumber="1.0.0">
+    <Dependency path="sounds/wwise/*.bnk" optional="false" />
+    <Dependency path="libs/gameaudio/wwise/*.xml" optional="false" />
+    <Dependency path=":libs/gameaudio/wwise/levels/*.xml" optional="false" />
+</EngineDependencies>

Gems/AudioEngineWwise/Assets/GameAudioSeedList.seed

@@ -0,0 +1,14 @@
+{
+    "Type": "JsonSerialization",
+    "Version": 1,
+    "ClassName": "AZStd::vector<SeedInfo, allocator>",
+    "ClassData": [
+        {
+            "assetId": {
+                "guid": "{95372958-1CFD-524C-9574-EC7A7BB6F883}"
+            },
+            "platformFlags": 1,
+            "pathHint": "audiobank_dependencies.xml"
+        }
+    ]
+}

Gems/AudioEngineWwise/CMakeLists.txt

@@ -0,0 +1,44 @@
+#
+# 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
+#
+#
+
+if(NOT COMMAND o3de_gem_setup)
+    # Backwards compatibility for older engines
+    macro(o3de_gem_setup default_gem_name)
+        # Query the gem name from the gem.json file if possible
+        # otherwise fallback to using the default gem name argument
+        o3de_find_ancestor_gem_root(gem_path gem_name "${CMAKE_CURRENT_SOURCE_DIR}")
+        if (NOT gem_name)
+            set(gem_name "${default_gem_name}")
+        endif()
+
+        # Fallback to using the current source CMakeLists.txt directory as the gem root path
+        if (NOT gem_path)
+            set(gem_path ${CMAKE_CURRENT_SOURCE_DIR})
+        endif()
+
+        set(gem_json ${gem_path}/gem.json)
+
+        # Read the version field from the gem.json
+        set(gem_version, "0.0.0")
+        o3de_read_json_key(gem_version ${gem_json} "version")
+
+        o3de_restricted_path(${gem_json} gem_restricted_path gem_parent_relative_path)
+
+        o3de_pal_dir(pal_dir ${CMAKE_CURRENT_SOURCE_DIR}/Platform/${PAL_PLATFORM_NAME} "${gem_restricted_path}" "${gem_path}" "${gem_parent_relative_path}")
+    endmacro()
+endif()
+
+o3de_gem_setup("AudioEngineWwise")
+
+if(TARGET AudioEngineWwise)
+    # For backwards compatibility with engines that include AudioEngineWwise
+    # use Wwise for the targets if AudioEngineWwise is already defined
+    set(gem_name "Wwise")
+endif()
+
+add_subdirectory(Code)