Skip to content

Commit 2f7e582

Browse files
Merging final GDK for Unreal 0.13.1 release
Release 0.13.1
2 parents f678995 + 551d232 commit 2f7e582

17 files changed

+61
-21
lines changed

.buildkite/premerge.steps.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
ci_version: &ci_version "1.1"
2+
ci_version: &ci_version "1.2"
33

44
# This is designed to trap and retry failures because agent lost
55
# connection. Agent exits with -1 in this case.
@@ -33,10 +33,10 @@ steps:
3333
message: "testgyms-4.26 ${BUILDKITE_MESSAGE}"
3434
env:
3535
BUILD_TYPE: "GDK"
36-
GDK_BRANCH: "${GDK_BRANCH:-0.13.0}" # NOTE: temp fix for new ci release interop issues
37-
ENGINE_BRANCH: "${ENGINE_BRANCH_426:-4.26-SpatialOSUnrealGDK-0.13.0}" # NOTE: temp fix for new ci release interop issues
36+
GDK_BRANCH: "${GDK_BRANCH:-match_branch_name_pref::0.13.1}"
37+
ENGINE_BRANCH: "${ENGINE_BRANCH_426:-match_branch_name_pref_engine::4.26-SpatialOSUnrealGDK-0.13.1}"
3838
ENGINE_MAJOR: "4.26"
39-
PROJECT_BRANCH: "${BUILDKITE_BRANCH}"
39+
PROJECT_BRANCH: "main_branch::${BUILDKITE_BRANCH}"
4040
USE_FASTBUILD: "True"
4141
IS_BUILDKITE_BUILD: "True"
4242
BUILD_ANDROID: "False"
@@ -52,10 +52,10 @@ steps:
5252
message: "testgyms-4.25 ${BUILDKITE_MESSAGE}"
5353
env:
5454
BUILD_TYPE: "GDK"
55-
GDK_BRANCH: "${GDK_BRANCH:-0.13.0}" # NOTE: temp fix for new ci release interop issues
56-
ENGINE_BRANCH: "${ENGINE_BRANCH_425:-4.25-SpatialOSUnrealGDK-0.13.0}" # NOTE: temp fix for new ci release interop issues
55+
GDK_BRANCH: "${GDK_BRANCH:-match_branch_name_pref::0.13.1}"
56+
ENGINE_BRANCH: "${ENGINE_BRANCH_425:-match_branch_name_pref_engine::4.25-SpatialOSUnrealGDK-0.13.1}"
5757
ENGINE_MAJOR: "4.25"
58-
PROJECT_BRANCH: "${BUILDKITE_BRANCH}" # NOTE: temp fix for new ci release interop issues
58+
PROJECT_BRANCH: "main_branch::${BUILDKITE_BRANCH}"
5959
USE_FASTBUILD: "True"
6060
IS_BUILDKITE_BUILD: "True"
6161
BUILD_ANDROID: "False"

Game/Config/DefaultSpatialGDKSettings.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,5 @@ InterestRangeFrequencyPairs=(DistanceRatio=1.000000,Frequency=7.500000)
5353
bUseSecureClientConnection=False
5454
bUseSecureServerConnection=False
5555
bEnableClientQueriesOnServer=False
56+
EventTracingSamplingSettingsClass=BlueprintGeneratedClass'/Game/EventTracing/BP_ETSamplingSettings_Default.BP_ETSamplingSettings_Default_C'
5657

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
[/Script/SpatialGDK.SpatialGDKSettings]
22
bEventTracingEnabled=True
33

4-
[/Script/SpatialGDKEditor.SpatialGDKEditorSettings]
5-
SpatialOSCommandLineLaunchFlags="--event-tracing-enabled=true"
6-
74
[/Script/UnrealEd.LevelEditorPlaySettings]
85
PlayNumberOfClients=1
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
[/Script/SpatialGDK.SpatialGDKSettings]
22
bEventTracingEnabled=True
33

4-
[/Script/SpatialGDKEditor.SpatialGDKEditorSettings]
5-
SpatialOSCommandLineLaunchFlags="--event-tracing-enabled=true"
6-
74
[/Script/UnrealEd.LevelEditorPlaySettings]
85
PlayNumberOfClients=1
232 KB
Binary file not shown.
173 KB
Binary file not shown.
5.24 KB
Binary file not shown.
352 Bytes
Binary file not shown.
-12.7 KB
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)