Update Roscon 2022 Docker (#267)

* Add basic seedlist file * Remove invalid dependency on an Editor target from a non-Editor target * Split Dockerfile into 3: - Dockerfile: for the full editor, simulation, and navstack - Dockerfile.Simulation: for the simulation and navstack only - Dockerfile.NavStack: for the navstack only * Updated the README.md file to reflect the changes * Apply prefab fixes from ROSCon 2023 * Update docker/Dockerfile.Simulation Signed-off-by: Steve Pham <[email protected]> Co-authored-by: Mike Balfour <[email protected]> Co-authored-by: Jan Hanca <[email protected]>
o3de · Nov 6, 2023 · 34051e1 · 34051e1
1 parent 829ecb2
commit 34051e1
Show file tree

Hide file tree

Showing 14 changed files with 687 additions and 259 deletions.
diff --git a/Project/AssetBundling/SeedLists/ROSCon2022.seed b/Project/AssetBundling/SeedLists/ROSCon2022.seed
@@ -0,0 +1,36 @@
+{
+    "Type": "JsonSerialization",
+    "Version": 1,
+    "ClassName": "AZStd::vector<SeedInfo, allocator>",
+    "ClassData": [
+        {
+            "assetId": {
+                "guid": "{F556BF02-7065-505E-B81D-66BA396692A0}",
+                "subId": 3771340206
+            },
+            "platformFlags": 2,
+            "pathHint": "levels/main/main.spawnable"
+        },
+        {
+            "assetId": {
+                "guid": "{65878C59-19C8-507F-B361-C0D4B90C15F3}"
+            },
+            "platformFlags": 2,
+            "pathHint": "thirdpersoncamera.inputbindings"
+        },
+        {
+            "assetId": {
+                "guid": "{0E98ABD6-E619-5C16-9B27-D9096E4B159A}"
+            },
+            "platformFlags": 2,
+            "pathHint": "thirdpersonmovement.inputbindings"
+        },
+        {
+            "assetId": {
+                "guid": "{1CBEE567-0954-59BA-8205-93BE85D07D0B}"
+            },
+            "platformFlags": 2,
+            "pathHint": "autoexec.cfg"
+        }
+    ]
+}
diff --git a/Project/Assets/Kraken/apple_kraken_v1/apple_kraken_v1.prefab b/Project/Assets/Kraken/apple_kraken_v1/apple_kraken_v1.prefab
@@ -4056,6 +4056,9 @@
                     "$type": "EditorColliderComponent",
                     "Id": 5289266319031448357,
                     "ColliderConfiguration": {
+                        "CollisionLayer": {
+                            "Index": 1
+                        },
                         "Trigger": true,
                         "MaterialSlots": {
                             "Slots": [

diff --git a/Project/Assets/Kraken/apple_kraken_v2/apple_kraken_v2.prefab b/Project/Assets/Kraken/apple_kraken_v2/apple_kraken_v2.prefab
@@ -4718,6 +4718,9 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10590573249310138745,
                     "ColliderConfiguration": {
+                        "CollisionLayer": {
+                            "Index": 1
+                        },
                         "Trigger": true,
                         "MaterialSlots": {
                             "Slots": [

diff --git a/Project/Gem/CMakeLists.txt b/Project/Gem/CMakeLists.txt
@@ -47,7 +47,6 @@ ly_add_target(
             Gem::EMotionFX.Static
             Gem::LmbrCentral.API
             Gem::LyShine
-            Gem::AtomLyIntegration_CommonFeatures.Editor.Static
             Gem::Atom_AtomBridge.Static
             Gem::ImGui.Static
             Gem::PhysX.Static

diff --git a/Project/Gem/Source/DemoStatistics/DemoStatisticsComponent.cpp b/Project/Gem/Source/DemoStatistics/DemoStatisticsComponent.cpp
@@ -10,7 +10,6 @@
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/EditContextConstants.inl>
 #include <AzCore/Serialization/SerializeContext.h>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
 #include <LyShine/Bus/UiCanvasBus.h>
 #include <LyShine/Bus/UiTextBus.h>
 #include <LyShine/Bus/World/UiCanvasRefBus.h>

diff --git a/Project/Gem/Source/FruitStorage/FruitStorageComponent.cpp b/Project/Gem/Source/FruitStorage/FruitStorageComponent.cpp
@@ -8,11 +8,11 @@
 
 #include "FruitStorageComponent.h"
 #include "FruitStorageBus.h"
+#include <AzCore/Asset/AssetSerializer.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/EditContextConstants.inl>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzFramework/Components/TransformComponent.h>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
 
 namespace AppleKraken
 {

diff --git a/Project/Gem/Source/Manipulator/KrakenManipulatorController.cpp b/Project/Gem/Source/Manipulator/KrakenManipulatorController.cpp
@@ -11,7 +11,6 @@
 #include <AzCore/Serialization/EditContext.h>
 
 #include <AzFramework/Components/TransformComponent.h>
-#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
 
 namespace AppleKraken
 {

diff --git a/Project/Gem/enabled_gems.cmake b/Project/Gem/enabled_gems.cmake
@@ -3,7 +3,6 @@ set(ENABLED_GEMS
     ROSConDemo
     Atom
     AudioSystem
-    AWSCore
     CameraFramework
     DebugDraw
     EditorPythonBindings