Skip to content
Merged
2 changes: 1 addition & 1 deletion .buildkite/nightly.steps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ env:
GDK_REPOSITORY: "git@github.com:spatialos/UnrealGDK.git"
MAIN_MAP_NAME: "Control_Small"
SPATIAL_PROJECT_NAME: "unreal_gdk"
SPATIAL_RUNTIME_VERSION: "15.0.0-preview-6" ## the runtime version of SpatialOS
SPATIAL_RUNTIME_VERSION: "15.0.0" ## the runtime version of SpatialOS

steps:
- label: "generate-pipeline-steps"
Expand Down
2 changes: 1 addition & 1 deletion DeployGame.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set deploymentname=%gamename%%formatdate%
cd spatial/
spatial build build-config || goto :error
spatial cloud upload %deploymentname% --force || goto :error
spatial cloud launch %deploymentname% one_worker_test.json %deploymentname% --snapshot=snapshots/default.snapshot --cluster_region=eu --runtime_version=0.4.3 || goto :error
spatial cloud launch %deploymentname% one_worker_test.json %deploymentname% --snapshot=snapshots/default.snapshot --cluster_region=eu --runtime_version=15.0.0 || goto :error
spatial project deployment tags add %deploymentname% dev_login || goto :error
spatial project deployment tags add %deploymentname% status_lobby || goto :error

Expand Down
Binary file modified Game/Content/Blueprints/NPCs/BTTask_UnocupyPatrolPoint.uasset
Binary file not shown.
Binary file modified Game/Content/Blueprints/NPCs/BT_NPC.uasset
Binary file not shown.
Binary file modified Game/Content/Characters/BP_SimulatedPlayerCharacter.uasset
Binary file not shown.
5 changes: 5 additions & 0 deletions Game/Source/GDKShooter/Private/Characters/GDKCharacter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -209,3 +209,8 @@ bool AGDKCharacter::CanBeSeenFrom(const FVector& ObserverLocation, FVector& OutS
OutSightStrength = (float)PositiveHits / (float)NumberOfLoSChecksPerformed;
return PositiveHits > 0;
}

void AGDKCharacter::ClientMovementReset_Implementation()
{
GetCharacterMovement()->ResetPredictionData_Server();
}
7 changes: 7 additions & 0 deletions Game/Source/GDKShooter/Public/Characters/GDKCharacter.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ class GDKSHOOTER_API AGDKCharacter : public ACharacter, public IGenericTeamAgent
UFUNCTION(BlueprintNativeEvent, BlueprintCallable)
void StartRagdoll();

// ----- HACKY WORKAROUND, KEEP AWAY FROM PRODUCTION CODE ----
// This class is used by simplayer, which locally replaces the Pawn's controller without the server's knowledge
// Unpossessing a character resets its movement data, so this is used to inform the server that it happened.
// Getting rid of this hack means adding AIController-like capabilities to the regular PlayerController.
UFUNCTION(BlueprintCallable, Server, Unreliable)
void ClientMovementReset();

private:
UFUNCTION()
void DeleteSelf();
Expand Down
2 changes: 1 addition & 1 deletion LaunchSpatial.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ spatial worker build build-config
rem To launch a local Spatial deployment with a different launch configuration, change the default_launch.json argument to the name of your configuration file,
rem for example one_worker_test.json or two_worker_test.json. Similarly, you can specify a different snapshot than the default one by replacing the value of
rem the --snapshot argument with the path to the snapshot you want to launch with.
spatial local launch default_launch.json --snapshot=snapshots/default.snapshot --runtime_version=0.4.3
spatial local launch default_launch.json --snapshot=snapshots/default.snapshot --runtime_version=15.0.0

popd
4 changes: 2 additions & 2 deletions spatial/spatialos.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "your_project_name_here",
"project_version": "0.0.1",
"sdk_version": "15.0.0-preview-6",
"sdk_version": "15.0.0",
"dependencies": [
{
"name": "standard_library",
"version": "15.0.0-preview-6"
"version": "15.0.0"
}
]
}