Skip to content

Commit

Permalink
Merge 0.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuahuburn authored May 6, 2020
2 parents 5871c8b + df6e57c commit c8ba083
Show file tree
Hide file tree
Showing 75 changed files with 487 additions and 185 deletions.
52 changes: 36 additions & 16 deletions .buildkite/nightly.steps.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,36 @@
---
# 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:-v3-1572524284-e64831bf1e88b227-------z}"
- "scaler_version=2"
- "working_hours_time_zone=london"
- "agent_count=8"
- "capable_of_building=platform"
- "environment=production"
- "machine_type=quarter"
- "permission_set=builder"
- "platform=linux"
- "queue=${CI_LINUX_BUILDER_QUEUE:-v4-2019-12-12-bk5225-daecba805768d787}"
- "scaler_version=2"
- "working_hours_time_zone=london"
retry:
automatic:
- <<: *agent_transients
- <<: *bk_system_error
- <<: *bk_interrupted_by_signal

common: &common
windows: &windows
agents:
- "agent_count=1"
- "capable_of_building=gdk-for-unreal"
Expand All @@ -19,13 +39,13 @@ common: &common
- "permission_set=builder"
- "platform=windows"
- "scaler_version=2"
- "queue=${CI_WINDOWS_BUILDER_QUEUE:-v4-2019-11-07-bk3700-fbffad576b9676d7}" # Has FASTbuild disabled
timeout_in_minutes: 60 # TODO(ENG-548): reduce timeout once agent-cold-start is optimised.
- "queue=${CI_WINDOWS_BUILDER_QUEUE:-v4-20-03-26-102432-bk9951-8afe0ffb}"
timeout_in_minutes: 60
retry:
automatic:
# This is designed to trap and retry failures because agent lost connection. Agent exits with -1 in this case.
- exit_status: -1
limit: 3
- <<: *agent_transients
- <<: *bk_system_error
- <<: *bk_interrupted_by_signal
plugins:
- ca-johnson/taskkill#v4.1: ~

Expand All @@ -46,4 +66,4 @@ steps:
- label: "slack-notify"
if: build.env("SLACK_NOTIFY") == "true" || build.branch == "master"
command: "powershell -NoProfile -NonInteractive -InputFormat Text -Command ./ci/slack-notify.ps1"
<<: *common # This folds the YAML named anchor into this step. Overrides, if any, should follow, not precede.
<<: *windows
1 change: 0 additions & 1 deletion BuildProject.bat
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ set GDK_DIRECTORY=%UNREAL_ENGINE%\Engine\Plugins\UnrealGDK
echo Building worker with GDK located at %GDK_DIRECTORY%

call %GDK_DIRECTORY%\SpatialGDK\Build\Scripts\BuildWorker.bat %GAME_NAME%Server Linux Development "%~dp0\%PROJECT_PATH%\%GAME_NAME%.uproject" || goto :error
call %GDK_DIRECTORY%\SpatialGDK\Build\Scripts\BuildWorker.bat %GAME_NAME%SimulatedPlayer Linux Development "%~dp0\%PROJECT_PATH%\%GAME_NAME%.uproject" || goto :error
call %GDK_DIRECTORY%\SpatialGDK\Build\Scripts\BuildWorker.bat %GAME_NAME% Win64 Development "%~dp0\%PROJECT_PATH%\%GAME_NAME%.uproject" || goto :error
echo All builds succeeded.

Expand Down
23 changes: 18 additions & 5 deletions Game/Config/DefaultEngine.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ GlobalDefaultServerGameMode=None
ServerDefaultMap=/Game/Maps/FPS-Start_Medium.FPS-Start_Medium

[/Script/IOSRuntimeSettings.IOSRuntimeSettings]
MinimumiOSVersion=IOS_8
MinimumiOSVersion=IOS_11

[/Script/HardwareTargeting.HardwareTargetingSettings]
TargetedHardwareClass=Desktop
Expand All @@ -21,6 +21,7 @@ r.SceneColorFormat=2
r.TemporalAACurrentFrameWeight=0.25
r.AllowStaticLighting=False
r.LightPropagationVolume = 1
r.MobileHDR=False

[/Script/Engine.LocalPlayer]
AspectRatioAxisConstraint=AspectRatio_MaintainYFOV
Expand All @@ -32,6 +33,7 @@ AspectRatioAxisConstraint=AspectRatio_MaintainYFOV
+ActiveGameNameRedirects=(OldGameName="ThirdPersonShooter",NewGameName="/Script/GDKShooter")
+ActiveGameNameRedirects=(OldGameName="/Script/ThirdPersonShooter",NewGameName="/Script/GDKShooter")
MaximumLoopIterationCount=1000000
WorldSettingsClassName=/Script/SpatialGDK.SpatialWorldSettings

[CoreRedirects]
+PackageRedirects=(OldName="/Script/SpatialOS",NewName="/Script/SpatialGDK")
Expand All @@ -47,9 +49,6 @@ LogSpatialOSActorChannel=Log
TargetedHardwareClass=Desktop
DefaultGraphicsPerformance=Maximum

[/Script/SpatialGDK.SpatialGameInstance]
bPreventAutoConnectWithLocator=False

[/Script/NavigationSystem.NavigationSystemV1]
bAllowClientSideNavigation=True

Expand Down Expand Up @@ -86,6 +85,8 @@ bDisableKinematicStaticPairs=False
bDisableKinematicKinematicPairs=False
bDisableCCD=False
bEnableEnhancedDeterminism=False
AnimPhysicsMinDeltaTime=0.000000
bSimulateAnimPhysicsAfterReset=False
MaxPhysicsDeltaTime=0.033333
bSubstepping=False
bSubsteppingAsync=False
Expand All @@ -94,5 +95,17 @@ MaxSubsteps=6
SyncSceneSmoothingFactor=0.000000
InitialAverageFrameRate=0.016667
PhysXTreeRebuildRate=10
DefaultBroadphaseSettings=(bUseMBPOnClient=False,bUseMBPOnServer=False,MBPBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=0),MBPNumSubdivs=2)
DefaultBroadphaseSettings=(bUseMBPOnClient=False,bUseMBPOnServer=False,bUseMBPOuterBounds=False,MBPBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=0),MBPOuterBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=0),MBPNumSubdivs=2)
ChaosSettings=(DefaultThreadingModel=DedicatedThread,DedicatedThreadTickMode=VariableCappedWithTarget,DedicatedThreadBufferMode=Double)

[DerivedDataBackendGraph]
MinimumDaysToKeepFile=7
Root=(Type=KeyLength, Length=120, Inner=AsyncPut)
AsyncPut=(Type=AsyncPut, Inner=Hierarchy)
Hierarchy=(Type=Hierarchical, Inner=Boot, Inner=Pak, Inner=EnginePak, Inner=Local, Inner=Shared)
Boot=(Type=Boot, Filename=%GAMEDIR%DerivedDataCache/Boot.ddc, MaxCacheSize=256)
Local=(Type=FileSystem, ReadOnly=false, Clean=false, Flush=false, PurgeTransient=true, DeleteUnused=true, UnusedFileAge=17, FoldersToClean=-1, Path=../../../Engine/DerivedDataCache)
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)
Pak=(Type=ReadPak, Filename=%GAMEDIR%DerivedDataCache/DDC.ddp)
EnginePak=(Type=ReadPak, Filename=../../../Engine/DerivedDataCache/DDC.ddp)
25 changes: 20 additions & 5 deletions Game/Config/DefaultSpatialGDKSettings.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,16 @@ ActorReplicationRateLimit=0
EntityCreationRateLimit=0
OpsUpdateRate=1000.000000
bEnableHandover=True
MaxNetCullDistanceSquared=900000000.000000
MaxNetCullDistanceSquared=0.000000
QueuedIncomingRPCWaitTime=1.000000
PositionUpdateFrequency=1.000000
PositionDistanceThreshold=100.000000
bEnableMetrics=True
bEnableMetricsDisplay=False
MetricsReportRate=2.000000
bUseFrameTimeAsLoad=False
bCheckRPCOrder=False
bBatchSpatialPositionUpdates=True
bBatchSpatialPositionUpdates=False
MaxDynamicallyAttachedSubobjectsPerClass=3
bEnableServerQBI=True
bPackRPCs=True
DefaultReceptionistHost=127.0.0.1
bUseDevelopmentAuthenticationFlow=False
DevelopmentAuthenticationToken=
Expand All @@ -30,3 +27,21 @@ bEnableOffloading=False
ActorGroups=()
ServerWorkerTypes=("UnrealWorker")
ServicesRegion=Default
UseIsActorRelevantForConnection=False
WorkerLogLevel=Warning
SpatialDebuggerClassPath=/SpatialGDK/SpatialDebugger/BP_SpatialDebugger.BP_SpatialDebugger_C
bEnableUnrealLoadBalancer=False
LoadBalancingWorkerType=(WorkerTypeName="UnrealWorker")
LoadBalanceStrategy=None
LockingPolicy=None
bUseRPCRingBuffers=True
DefaultRPCRingBufferSize=32
RPCRingBufferSizeMap=()
MaxRPCRingBufferSize=32
bTcpNoDelay=False
UdpServerUpstreamUpdateIntervalMS=1
UdpServerDownstreamUpdateIntervalMS=1
UdpClientUpstreamUpdateIntervalMS=1
UdpClientDownstreamUpdateIntervalMS=1
SpatialDebugger=BlueprintGeneratedClass'/Game/Blueprints/LoadBalancing/BP_VerboseSpatialDebugger.BP_VerboseSpatialDebugger_C'

Binary file modified Game/Content/Base/MasterMaterials/M_Spatial_Asset_MASTER.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Game/Content/Blueprints/MapBuilder/BP_MapBuilder.uasset
Binary file not shown.
Binary file modified Game/Content/Characters/BP_Base_Character.uasset
Binary file not shown.
Binary file modified Game/Content/Characters/BP_FPS_Character.uasset
Binary file not shown.
Binary file modified Game/Content/Controllers/BP_GDK_PlayerController.uasset
Binary file not shown.
Binary file modified Game/Content/GameMode/BP_DeathmatchGameMode.uasset
Binary file not shown.
Binary file modified Game/Content/Maps/FPS-Start_Large.umap
Binary file not shown.
Binary file modified Game/Content/Maps/FPS-Start_Large_BuiltData.uasset
Binary file not shown.
Binary file modified Game/Content/Maps/FPS-Start_Large_Limited_Spawns.umap
Binary file not shown.
Binary file modified Game/Content/Maps/FPS-Start_Large_Limited_Spawns_BuiltData.uasset
Binary file not shown.
Binary file modified Game/Content/Maps/FPS-Start_Medium.umap
Binary file not shown.
Binary file modified Game/Content/Maps/FPS-Start_Medium_BuiltData.uasset
Binary file not shown.
Binary file modified Game/Content/Maps/FPS-Start_Small.umap
Binary file not shown.
Binary file modified Game/Content/Maps/FPS-Start_SmallTown.umap
Binary file not shown.
Binary file modified Game/Content/Maps/FPS-Start_SmallTown_BuiltData.uasset
Binary file not shown.
Binary file modified Game/Content/Maps/FPS-Start_Small_BuiltData.uasset
Binary file not shown.
Binary file modified Game/Content/Maps/FPS-Start_Tiny.umap
Binary file not shown.
Binary file modified Game/Content/Maps/FPS-Start_Tiny_BuiltData.uasset
Binary file not shown.
Binary file modified Game/Content/UI/Blueprints/BP_QuitButton.uasset
Binary file not shown.
2 changes: 1 addition & 1 deletion Game/GDKShooter.uproject
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"Enabled": true
}
]
}
}
2 changes: 2 additions & 0 deletions Game/Source/GDKShooter/GDKShooter.Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ public GDKShooter(ReadOnlyTargetRules Target) : base(Target)
{
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;

bLegacyPublicIncludePaths = false;

PublicDependencyModuleNames.AddRange(
new string[]
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

#include "EquippedComponent.h"
#include "UnrealNetwork.h"
#include "Characters/Components/EquippedComponent.h"
#include "Net/UnrealNetwork.h"
#include "GDKLogging.h"
#include "Engine/World.h"
#include "Weapons/Holdable.h"
Expand All @@ -10,7 +10,7 @@
UEquippedComponent::UEquippedComponent()
{
PrimaryComponentTick.bCanEverTick = false;
bReplicates = true;
SetIsReplicatedByDefault(true);
}


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

#include "FirstPersonTraceProvider.h"
#include "Characters/Components/FirstPersonTraceProvider.h"
#include "GDKLogging.h"

UFirstPersonTraceProvider::UFirstPersonTraceProvider()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

#include "Components/GDKMovementComponent.h"
#include "Characters/Components/GDKMovementComponent.h"

#include "GameFramework/Character.h"
#include "GameFramework/Controller.h"
#include "UnrealNetwork.h"
#include "Net/UnrealNetwork.h"
#include "GDKLogging.h"

// Use the first custom movement flag slot in the character for sprinting.
Expand All @@ -27,9 +27,9 @@ UGDKMovementComponent::UGDKMovementComponent(const FObjectInitializer& ObjectIni
MaxWalkSpeed = 250;
MaxWalkSpeedCrouched = 125;
MaxAcceleration = 1000;
bReplicates = true;
JumpZVelocity = 600.f;
AirControl = 0.2f;
SetIsReplicatedByDefault(true);
}

void UGDKMovementComponent::TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction *ThisTickFunction)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

#include "HealthComponent.h"
#include "Components/ControllerEventsComponent.h"
#include "Components/ScorePublisher.h"
#include "Characters/Components/HealthComponent.h"
#include "Controllers/Components/ControllerEventsComponent.h"
#include "Game/Components/ScorePublisher.h"
#include "GameFramework/Pawn.h"
#include "TeamComponent.h"
#include "UnrealNetwork.h"
#include "Characters/Components/TeamComponent.h"
#include "Net/UnrealNetwork.h"

UHealthComponent::UHealthComponent()
{
PrimaryComponentTick.bCanEverTick = true;

bReplicates = true;
SetIsReplicatedByDefault(true);

MaxHealth = 100.f;
CurrentHealth = MaxHealth;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

#include "MetaDataComponent.h"
#include "UnrealNetwork.h"
#include "Characters/Components/MetaDataComponent.h"
#include "Net/UnrealNetwork.h"
#include "GDKLogging.h"

UMetaDataComponent::UMetaDataComponent()
{
bReplicates = true;
SetIsReplicatedByDefault(true);
}

void UMetaDataComponent::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLifetimeProps) const
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

#include "ShootingComponent.h"
#include "Characters/Components/ShootingComponent.h"
#include "CollisionQueryParams.h"
#include "Engine/World.h"
#include "GameFramework/Actor.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

#include "TeamComponent.h"
#include "UnrealNetwork.h"
#include "Characters/Components/TeamComponent.h"
#include "Net/UnrealNetwork.h"

#include "Engine/World.h"


UTeamComponent::UTeamComponent()
{
PrimaryComponentTick.bCanEverTick = false;
bReplicates = true;
SetIsReplicatedByDefault(true);
}

void UTeamComponent::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLifetimeProps) const
Expand Down
9 changes: 6 additions & 3 deletions Game/Source/GDKShooter/Private/Characters/GDKCharacter.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

#include "GDKCharacter.h"
#include "Characters/GDKCharacter.h"

#include "Components/CapsuleComponent.h"
#include "GameFramework/CharacterMovementComponent.h"
#include "Components/SkeletalMeshComponent.h"
#include "SpatialNetDriver.h"
#include "UnrealNetwork.h"
#include "EngineClasses/SpatialNetDriver.h"
#include "Net/UnrealNetwork.h"
#include "GDKLogging.h"
#include "Controllers/GDKPlayerController.h"
#include "Controllers/Components/ControllerEventsComponent.h"
Expand Down Expand Up @@ -48,6 +48,9 @@ void AGDKCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputCompon
PlayerInputComponent->BindAxis("Turn", this, &APawn::AddControllerYawInput);
PlayerInputComponent->BindAxis("LookUp", this, &APawn::AddControllerPitchInput);

PlayerInputComponent->BindAxis("TurnRate", this, &APawn::AddControllerYawInput);
PlayerInputComponent->BindAxis("LookUpRate", this, &APawn::AddControllerPitchInput);

PlayerInputComponent->BindAction<FBoolean>("Sprint", IE_Pressed, GDKMovementComponent, &UGDKMovementComponent::SetWantsToSprint, true);
PlayerInputComponent->BindAction<FBoolean>("Sprint", IE_Released, GDKMovementComponent, &UGDKMovementComponent::SetWantsToSprint, false);
PlayerInputComponent->BindAction<FBoolean>("Crouch", IE_Pressed, this, &AGDKCharacter::Crouch, true);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

#include "ControllerEventsComponent.h"
#include "Controllers/Components/ControllerEventsComponent.h"
#include "GameFramework/Controller.h"
#include "GameFramework/PlayerState.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved

#include "TeamSettingComponent.h"
#include "Controllers/Components/TeamSettingComponent.h"
#include "GDKLogging.h"
#include "AIController.h"

Expand Down
Loading

0 comments on commit c8ba083

Please sign in to comment.