diff --git a/.buildkite/nightly.steps.yaml b/.buildkite/nightly.steps.yaml index 3b9983f5..48e2b01b 100644 --- a/.buildkite/nightly.steps.yaml +++ b/.buildkite/nightly.steps.yaml @@ -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" diff --git a/DeployGame.bat b/DeployGame.bat index acaef514..44e1d35a 100644 --- a/DeployGame.bat +++ b/DeployGame.bat @@ -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 diff --git a/Game/Content/Blueprints/NPCs/BTTask_UnocupyPatrolPoint.uasset b/Game/Content/Blueprints/NPCs/BTTask_UnocupyPatrolPoint.uasset index 00718b30..6de0b7ee 100644 Binary files a/Game/Content/Blueprints/NPCs/BTTask_UnocupyPatrolPoint.uasset and b/Game/Content/Blueprints/NPCs/BTTask_UnocupyPatrolPoint.uasset differ diff --git a/Game/Content/Blueprints/NPCs/BT_NPC.uasset b/Game/Content/Blueprints/NPCs/BT_NPC.uasset index 1131418e..fd9b95af 100644 Binary files a/Game/Content/Blueprints/NPCs/BT_NPC.uasset and b/Game/Content/Blueprints/NPCs/BT_NPC.uasset differ diff --git a/Game/Content/Characters/BP_SimulatedPlayerCharacter.uasset b/Game/Content/Characters/BP_SimulatedPlayerCharacter.uasset index c6511c3b..9a9a56de 100644 Binary files a/Game/Content/Characters/BP_SimulatedPlayerCharacter.uasset and b/Game/Content/Characters/BP_SimulatedPlayerCharacter.uasset differ diff --git a/Game/Source/GDKShooter/Private/Characters/GDKCharacter.cpp b/Game/Source/GDKShooter/Private/Characters/GDKCharacter.cpp index 5a7a8d5a..38f608f1 100644 --- a/Game/Source/GDKShooter/Private/Characters/GDKCharacter.cpp +++ b/Game/Source/GDKShooter/Private/Characters/GDKCharacter.cpp @@ -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(); +} diff --git a/Game/Source/GDKShooter/Public/Characters/GDKCharacter.h b/Game/Source/GDKShooter/Public/Characters/GDKCharacter.h index 187bde8a..aade2da4 100644 --- a/Game/Source/GDKShooter/Public/Characters/GDKCharacter.h +++ b/Game/Source/GDKShooter/Public/Characters/GDKCharacter.h @@ -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(); diff --git a/LaunchSpatial.bat b/LaunchSpatial.bat index 216fff97..e23f82d3 100644 --- a/LaunchSpatial.bat +++ b/LaunchSpatial.bat @@ -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 diff --git a/spatial/spatialos.json b/spatial/spatialos.json index d5a60dbc..9122c353 100644 --- 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-preview-6", + "sdk_version": "15.0.0", "dependencies": [ { "name": "standard_library", - "version": "15.0.0-preview-6" + "version": "15.0.0" } ] }