Merging final GDK for Unreal 0.13.0 release

gdk-for-unreal-bot · web-flow · commit bfac8c886f6a · 2021-05-17T22:15:06.000+01:00
Release 0.13.0
diff --git a/.buildkite/nightly.steps.yaml b/.buildkite/nightly.steps.yaml
@@ -1,60 +1,26 @@
 ---
-# This is designed to trap and retry failures because agent lost
-# connection. Agent exits with -1 in this case.
-agent_transients: &agent_transients
-  exit_status: -1
-  limit: 3
-# BK system error
-bk_system_error: &bk_system_error
-  exit_status: 255
-  limit: 3
-# job was interrupted by a signal (e.g. ctrl+c etc)
-bk_interrupted_by_signal: &bk_interrupted_by_signal
-  exit_status: 15
-  limit: 3
-
-script_runner: &script_runner
-  agents:
-    - "agent_count=8"
-    - "capable_of_building=platform"
-    - "environment=production"
-    - "machine_type=quarter"
-    - "permission_set=builder"
-    - "platform=linux"
-    - "queue=${CI_LINUX_BUILDER_QUEUE:-v4-20-08-12-083656-bk14222-38697241}"
-    - "scaler_version=2"
-    - "working_hours_time_zone=london"
-  retry:
-    automatic:
-      - <<: *agent_transients
-      - <<: *bk_system_error
-      - <<: *bk_interrupted_by_signal
-
-# NOTE: step labels turn into commit-status names like {org}/{repo}/{pipeline}/{step-label}, lower-case and hyphenated.
-# These are then relied on to have stable names by other things, so once named, please beware renaming has consequences.
-env:
-    SLACK_CHANNEL: "#unreal-gdk-builds"
-    GDK_REPOSITORY: "git@github.com:spatialos/UnrealGDK.git"
-    MAIN_MAP_NAME: "Control_Small"
-    SPATIAL_PROJECT_NAME: "unreal_gdk"
-    SPATIAL_RUNTIME_VERSION: "15.0.0" ## the runtime version of SpatialOS
+ci_version: &ci_version "1.1"
 
 steps:
-  - label: "generate-pipeline-steps"
-    commands: 
-      - "chmod -R +rwx ci"
-      - "ci/generate-pipeline-steps.sh"
-    env:
-      ENGINE_VERSION: "${ENGINE_VERSION}"
-    <<: *script_runner
-
-  - wait
-
-  - label: "slack-notify"
-    if: |
-      build.env("NIGHTLY_BUILD") == "true" || 
-      build.env("SLACK_NOTIFY") == "true" || 
-      build.env("FIREBASE_TEST") == "true" || 
-      build.branch == "master"
-    command: "python3 ci/slack-notify.py"
-    <<: *script_runner
+  # New build pipeline
+  # Trigger a 4.26 build
+  - trigger: "unrealgdkbuild-ci"
+    label: "exampleproject-ci"
+    async: false
+    build:
+      branch: *ci_version
+      message: "exampleproject-4.26 ${BUILDKITE_MESSAGE}"
+      env: 
+        BUILD_TYPE: "EXAMPLE"
+        GDK_BRANCH: "${GDK_BRANCH:-0.13.0}" # NOTE: temp fix for new ci release interop issues
+        ENGINE_BRANCH: "${ENGINE_BRANCH:-4.26-SpatialOSUnrealGDK-0.13.0}" # NOTE: temp fix for new ci release interop issues
+        ENGINE_MAJOR: "4.26"
+        PROJECT_BRANCH: "${BUILDKITE_BRANCH}"
+        USE_FASTBUILD: "True"
+        IS_BUILDKITE_BUILD: "True"
+        BUILD_ANDROID: "True"
+        SKIP_TESTS: "True"
+        CLEAN_BUILD: "False"
+        START_DEPLOYMENT: "True"
+        SPATIAL_PROJECT_NAME: "unreal_gdk"
+# TODO: bring back deployment link notifies UNR-5391
diff --git a/DeployGame.bat b/DeployGame.bat
diff --git a/Game/Config/DefaultEngine.ini b/Game/Config/DefaultEngine.ini
@@ -2,7 +2,7 @@
 GameDefaultMap=/Engine/Maps/Entry.Entry
 EditorStartupMap=/Game/Maps/Control_Small.Control_Small
 GlobalDefaultGameMode=/Game/GameMode/BP_ControlGameMode.BP_ControlGameMode_C
-GameInstanceClass=/Game/GameMode/BP_GDKShooterGameInstance.BP_GDKShooterGameInstance_C
+GameInstanceClass=/Script/SpatialGDK.SpatialGameInstance
 GlobalDefaultServerGameMode=None
 ServerDefaultMap=/Game/Maps/Control_Small.Control_Small
 
@@ -108,3 +108,4 @@ EnginePak=(Type=ReadPak, Filename=../../../Engine/DerivedDataCache/DDC.ddp)
 ; Shared DDC location setup
 ; Shared=(Type=FileSystem, ReadOnly=false, Clean=false, Flush=false, DeleteUnused=true, UnusedFileAge=19, FoldersToClean=-1, Path=\\mystudio.net\DDC, EnvPathOverride=UE-SharedDataCachePath)
 ; AltShared=(Type=FileSystem, ReadOnly=true, Clean=false, Flush=false, DeleteUnused=true, UnusedFileAge=19, FoldersToClean=-1, Path=\\mystudio.net\DDC2, EnvPathOverride=UE-SharedDataCachePath2)
+
diff --git a/Game/Config/DefaultGame.ini b/Game/Config/DefaultGame.ini
@@ -15,3 +15,8 @@ MaxSpectators=100
 +MapsToCook=(FilePath="/Game/Maps/Control_Medium")
 +MapsToCook=(FilePath="/Game/Maps/Control_Small")
 +DirectoriesToAlwaysCook=(Path="/Game/Spatial")
+
+[Staging]
++WhitelistConfigFiles=GDKShooter/Config/DefaultSpatialGDKEditorSettings.ini
++WhitelistConfigFiles=GDKShooter/Config/DefaultSpatialGDKSettings.ini
++WhitelistConfigFiles=Engine/Config/DefaultSpatialGDKSettings.ini
diff --git a/Game/Content/GameMode/BP_GDKShooterGameInstance.uasset b/Game/Content/GameMode/BP_GDKShooterGameInstance.uasset
diff --git a/Game/GDKShooter.uproject b/Game/GDKShooter.uproject
@@ -25,6 +25,33 @@
 		{
 			"Name": "SpatialGDK",
 			"Enabled": true
+		},
+		{
+			"Name": "MagicLeapMedia",
+			"Enabled": false,
+			"SupportedTargetPlatforms": [
+				"Lumin"
+			]
+		},
+		{
+			"Name": "MagicLeap",
+			"Enabled": false,
+			"SupportedTargetPlatforms": [
+				"Lumin",
+				"Mac",
+				"Win64"
+			]
+		},
+		{
+			"Name": "LuminPlatformFeatures",
+			"Enabled": false,
+			"SupportedTargetPlatforms": [
+				"Lumin"
+			]
+		},
+		{
+			"Name": "MLSDK",
+			"Enabled": false
 		}
 	]
-}
+}
diff --git a/Game/Source/GDKShooter/Private/Game/Components/SpatialSessionStateComponent.cpp b/Game/Source/GDKShooter/Private/Game/Components/SpatialSessionStateComponent.cpp
@@ -5,8 +5,8 @@
 #include "Engine/World.h"
 #include "Net/UnrealNetwork.h"
 #include "EngineClasses/SpatialNetDriver.h"
-#include "Interop/SpatialStaticComponentView.h"
 #include "Interop/Connection/SpatialWorkerConnection.h"
+#include "SpatialView/EntityView.h"
 
 void USpatialSessionStateComponent::SendStateUpdate(EGDKSessionProgress SessionProgressState)
 {
@@ -18,7 +18,18 @@ void USpatialSessionStateComponent::SendStateUpdate(EGDKSessionProgress SessionP
 	}
 
 	USpatialNetDriver* SpatialNetDriver = Cast<USpatialNetDriver>(NetDriver);
-	bool bAuthoritativeOverSessionEntity = SpatialNetDriver->StaticComponentView->HasAuthority(SessionEntityId, SessionComponentId);
+
+	const bool bAuthoritativeOverSessionEntity = [this, SpatialNetDriver]()
+	{
+		const SpatialGDK::EntityViewElement* SessionEntity = SpatialNetDriver->Connection->GetView().Find(
+			SessionEntityId);
+		if (SessionEntity != nullptr)
+		{
+			return SessionEntity->Authority.Contains(SessionComponentId);
+		}
+		return false;
+	}();
+
 	if (!bAuthoritativeOverSessionEntity)
 	{
 		return;
diff --git a/LaunchSpatial.bat b/LaunchSpatial.bat
diff --git a/UnrealGDKVersion.txt b/UnrealGDKVersion.txt
@@ -1 +1 @@
-0.12.0
+0.13.0
diff --git a/ci/run-firebase-test.py b/ci/run-firebase-test.py
@@ -68,6 +68,10 @@ def gcloud_upload(app_platform, app_path, gcloud_storage_keyword, success_keywor
         ios_device = common.get_environment_variable(
         'IOS_DEVICE_AND_VERSION', 'model=iphonexs,version=12.0')
         cmds.append('--device ' + ios_device)
+    elif app_platform == 'android':
+        android_device = common.get_environment_variable(
+        'ANDROID_DEVICE_AND_VERSION', 'model=walleye,version=28')
+        cmds.append('--device ' + android_device)
 
     res = common.run_shell(cmds)
     gcloud_storage_url = ''
diff --git a/spatial/one_worker_test.json b/spatial/one_worker_test.json
@@ -5,46 +5,52 @@
     "snapshots": {
       "snapshotWritePeriodSeconds": 0
     },
-    "legacy_flags": [
-      {
-        "name": "bridge_soft_handover_enabled",
-        "value": "false"
-      }
-    ],
+    "legacy_flags": [{
+      "name": "bridge_soft_handover_enabled",
+      "value": "false"
+    }],
     "dimensions": {
       "xMeters": 2000,
       "zMeters": 2000
     }
   },
   "load_balancing": {
-    "layer_configurations": [
-      {
-        "layer": "UnrealWorker",
-        "rectangle_grid": {
-          "cols": 1,
-          "rows": 1
-        }
+    "layer_configurations": [{
+      "layer": "UnrealWorker",
+      "rectangle_grid": {
+        "cols": 1,
+        "rows": 1
       }
-    ]
+    }]
   },
-  "workers": [
-    {
+  "workers": [{
       "worker_type": "UnrealWorker",
       "flags": [],
-      "permissions": [
-        {
-          "all": {}
-        }
-      ]
+      "permissions": [{
+        "all": {}
+      }]
     },
     {
       "worker_type": "UnrealClient",
       "flags": [],
-      "permissions": [
-        {
-          "all": {}
+      "permissions": [{
+        "entity_creation": {
+          "allow": false
+        },
+        "entity_deletion": {
+          "allow": false
+        },
+        "entity_query": {
+          "allow": true,
+          "components": [
+            "*"
+          ]
+        },
+        "system_entity_command": {
+          "allow": false
         }
-      ]
+
+      }]
     }
   ]
 }
diff --git a/spatial/spatialos.json b/spatial/spatialos.json
@@ -1,11 +1,11 @@
 {
   "name": "your_project_name_here",
   "project_version": "0.0.1",
-  "sdk_version": "15.0.0",
+  "sdk_version": "15.0.1",
   "dependencies": [
     {
       "name": "standard_library",
-      "version": "15.0.0"
+      "version": "15.0.1"
     }
   ]
 }
diff --git a/spatial/two_worker_test.json b/spatial/two_worker_test.json

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "your_project_name_here",`
`3`	`3`	`"project_version": "0.0.1",`
`4`		`- "sdk_version": "15.0.0",`
	`4`	`+ "sdk_version": "15.0.1",`
`5`	`5`	`"dependencies": [`
`6`	`6`	`{`
`7`	`7`	`"name": "standard_library",`
`8`		`- "version": "15.0.0"`
	`8`	`+ "version": "15.0.1"`
`9`	`9`	`}`
`10`	`10`	`]`
`11`	`11`	`}`