diff --git a/Game/Config/DefaultEngine.ini b/Game/Config/DefaultEngine.ini index 49b0603..84648e9 100644 --- a/Game/Config/DefaultEngine.ini +++ b/Game/Config/DefaultEngine.ini @@ -1,8 +1,8 @@ [/Script/EngineSettings.GameMapsSettings] -GameDefaultMap=/Game/ThirdPersonCPP/Maps/ThirdPersonExampleMap -EditorStartupMap=/Game/ThirdPersonCPP/Maps/ThirdPersonExampleMap +GameDefaultMap=/Game/StarterProject/Maps/ThirdPersonExampleMap.ThirdPersonExampleMap +EditorStartupMap=/Game/StarterProject/Maps/ThirdPersonExampleMap.ThirdPersonExampleMap GlobalDefaultGameMode=/Script/StarterProject.StarterProjectGameMode -GameInstanceClass=/Script/StarterProject.StarterProjectGameInstance +GameInstanceClass=/Script/SpatialGDK.SpatialGameInstance [/Script/IOSRuntimeSettings.IOSRuntimeSettings] MinimumiOSVersion=IOS_8 @@ -68,4 +68,3 @@ AsyncSceneSmoothingFactor=0.990000 InitialAverageFrameRate=0.016667 PhysXTreeRebuildRate=10 - diff --git a/Game/Content/EntityBlueprints/StarterProjectCharacter_BP.uasset b/Game/Content/EntityBlueprints/StarterProjectCharacter_BP.uasset deleted file mode 100644 index 1872fca..0000000 Binary files a/Game/Content/EntityBlueprints/StarterProjectCharacter_BP.uasset and /dev/null differ diff --git a/Game/Content/StarterProject/Characters/PlayerCharacter_BP.uasset b/Game/Content/StarterProject/Characters/PlayerCharacter_BP.uasset new file mode 100644 index 0000000..cd75a2a Binary files /dev/null and b/Game/Content/StarterProject/Characters/PlayerCharacter_BP.uasset differ diff --git a/Game/Content/ThirdPersonCPP/Maps/ThirdPersonExampleMap.umap b/Game/Content/StarterProject/Maps/ThirdPersonExampleMap.umap similarity index 99% rename from Game/Content/ThirdPersonCPP/Maps/ThirdPersonExampleMap.umap rename to Game/Content/StarterProject/Maps/ThirdPersonExampleMap.umap index 0b73dec..836d9e0 100644 Binary files a/Game/Content/ThirdPersonCPP/Maps/ThirdPersonExampleMap.umap and b/Game/Content/StarterProject/Maps/ThirdPersonExampleMap.umap differ diff --git a/Game/Content/ThirdPersonCPP/Maps/ThirdPersonExampleMap_BuiltData.uasset b/Game/Content/StarterProject/Maps/ThirdPersonExampleMap_BuiltData.uasset similarity index 99% rename from Game/Content/ThirdPersonCPP/Maps/ThirdPersonExampleMap_BuiltData.uasset rename to Game/Content/StarterProject/Maps/ThirdPersonExampleMap_BuiltData.uasset index 926a8fd..e92abee 100644 Binary files a/Game/Content/ThirdPersonCPP/Maps/ThirdPersonExampleMap_BuiltData.uasset and b/Game/Content/StarterProject/Maps/ThirdPersonExampleMap_BuiltData.uasset differ diff --git a/Game/Content/StarterProject/Meshes/Bump_StaticMesh.uasset b/Game/Content/StarterProject/Meshes/Bump_StaticMesh.uasset new file mode 100644 index 0000000..b4e4a6a Binary files /dev/null and b/Game/Content/StarterProject/Meshes/Bump_StaticMesh.uasset differ diff --git a/Game/Content/StarterProject/Meshes/LeftArm_StaticMesh.uasset b/Game/Content/StarterProject/Meshes/LeftArm_StaticMesh.uasset new file mode 100644 index 0000000..7379c2b Binary files /dev/null and b/Game/Content/StarterProject/Meshes/LeftArm_StaticMesh.uasset differ diff --git a/Game/Content/StarterProject/Meshes/Linear_Stair_StaticMesh.uasset b/Game/Content/StarterProject/Meshes/Linear_Stair_StaticMesh.uasset new file mode 100644 index 0000000..171d37b Binary files /dev/null and b/Game/Content/StarterProject/Meshes/Linear_Stair_StaticMesh.uasset differ diff --git a/Game/Content/StarterProject/Meshes/RampMaterial.uasset b/Game/Content/StarterProject/Meshes/RampMaterial.uasset new file mode 100644 index 0000000..61817f4 Binary files /dev/null and b/Game/Content/StarterProject/Meshes/RampMaterial.uasset differ diff --git a/Game/Content/StarterProject/Meshes/Ramp_StaticMesh.uasset b/Game/Content/StarterProject/Meshes/Ramp_StaticMesh.uasset new file mode 100644 index 0000000..4f4b8e0 Binary files /dev/null and b/Game/Content/StarterProject/Meshes/Ramp_StaticMesh.uasset differ diff --git a/Game/Content/StarterProject/Meshes/RightArm_StaticMesh.uasset b/Game/Content/StarterProject/Meshes/RightArm_StaticMesh.uasset new file mode 100644 index 0000000..aae10de Binary files /dev/null and b/Game/Content/StarterProject/Meshes/RightArm_StaticMesh.uasset differ diff --git a/Game/Content/ThirdPerson/Meshes/Bump_StaticMesh.uasset b/Game/Content/ThirdPerson/Meshes/Bump_StaticMesh.uasset deleted file mode 100644 index 875ac73..0000000 Binary files a/Game/Content/ThirdPerson/Meshes/Bump_StaticMesh.uasset and /dev/null differ diff --git a/Game/Content/ThirdPerson/Meshes/CubeMaterial.uasset b/Game/Content/ThirdPerson/Meshes/CubeMaterial.uasset deleted file mode 100644 index 83472f4..0000000 Binary files a/Game/Content/ThirdPerson/Meshes/CubeMaterial.uasset and /dev/null differ diff --git a/Game/Content/ThirdPerson/Meshes/LeftArm_StaticMesh.uasset b/Game/Content/ThirdPerson/Meshes/LeftArm_StaticMesh.uasset deleted file mode 100644 index 24ce013..0000000 Binary files a/Game/Content/ThirdPerson/Meshes/LeftArm_StaticMesh.uasset and /dev/null differ diff --git a/Game/Content/ThirdPerson/Meshes/Linear_Stair_StaticMesh.uasset b/Game/Content/ThirdPerson/Meshes/Linear_Stair_StaticMesh.uasset deleted file mode 100644 index a17f97a..0000000 Binary files a/Game/Content/ThirdPerson/Meshes/Linear_Stair_StaticMesh.uasset and /dev/null differ diff --git a/Game/Content/ThirdPerson/Meshes/RampMaterial.uasset b/Game/Content/ThirdPerson/Meshes/RampMaterial.uasset deleted file mode 100644 index 66b9c09..0000000 Binary files a/Game/Content/ThirdPerson/Meshes/RampMaterial.uasset and /dev/null differ diff --git a/Game/Content/ThirdPerson/Meshes/Ramp_StaticMesh.uasset b/Game/Content/ThirdPerson/Meshes/Ramp_StaticMesh.uasset deleted file mode 100644 index 935de68..0000000 Binary files a/Game/Content/ThirdPerson/Meshes/Ramp_StaticMesh.uasset and /dev/null differ diff --git a/Game/Content/ThirdPerson/Meshes/RightArm_StaticMesh.uasset b/Game/Content/ThirdPerson/Meshes/RightArm_StaticMesh.uasset deleted file mode 100644 index f2933e0..0000000 Binary files a/Game/Content/ThirdPerson/Meshes/RightArm_StaticMesh.uasset and /dev/null differ diff --git a/Game/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset b/Game/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset deleted file mode 100644 index 044fa00..0000000 Binary files a/Game/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset and /dev/null differ diff --git a/Game/Source/StarterProject/StarterProjectCharacter.cpp b/Game/Source/StarterProject/StarterProjectCharacter.cpp index d140c06..1ca4527 100644 --- a/Game/Source/StarterProject/StarterProjectCharacter.cpp +++ b/Game/Source/StarterProject/StarterProjectCharacter.cpp @@ -9,7 +9,6 @@ #include "GameFramework/Controller.h" #include "GameFramework/SpringArmComponent.h" #include "Kismet/GameplayStatics.h" -#include "StarterProjectGameStateBase.h" #include "SpatialNetDriver.h" #include "UnrealNetwork.h" diff --git a/Game/Source/StarterProject/StarterProjectGameInstance.cpp b/Game/Source/StarterProject/StarterProjectGameInstance.cpp deleted file mode 100644 index d91be3e..0000000 --- a/Game/Source/StarterProject/StarterProjectGameInstance.cpp +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright (c) Improbable Worlds Ltd, All Rights Reserved - -#include "StarterProjectGameInstance.h" \ No newline at end of file diff --git a/Game/Source/StarterProject/StarterProjectGameInstance.h b/Game/Source/StarterProject/StarterProjectGameInstance.h deleted file mode 100644 index 876e5de..0000000 --- a/Game/Source/StarterProject/StarterProjectGameInstance.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Improbable Worlds Ltd, All Rights Reserved - -#pragma once - -#include "CoreMinimal.h" -#include "SpatialGameInstance.h" -#include "StarterProjectGameInstance.generated.h" - -UCLASS() -class STARTERPROJECT_API UStarterProjectGameInstance : public USpatialGameInstance -{ - GENERATED_BODY() -}; diff --git a/Game/Source/StarterProject/StarterProjectGameMode.cpp b/Game/Source/StarterProject/StarterProjectGameMode.cpp index 8144d84..c005227 100644 --- a/Game/Source/StarterProject/StarterProjectGameMode.cpp +++ b/Game/Source/StarterProject/StarterProjectGameMode.cpp @@ -1,19 +1,17 @@ // Copyright (c) Improbable Worlds Ltd, All Rights Reserved #include "StarterProjectGameMode.h" -#include "StarterProjectGameStateBase.h" -#include "StarterProjectPlayerState.h" #include "UObject/ConstructorHelpers.h" AStarterProjectGameMode::AStarterProjectGameMode() { //set default pawn class to our Blueprinted character - static ConstructorHelpers::FClassFinder PlayerPawnBPClass(TEXT("/Game/EntityBlueprints/StarterProjectCharacter_BP")); + static ConstructorHelpers::FClassFinder PlayerPawnBPClass(TEXT("/Game/StarterProject/Characters/PlayerCharacter_BP")); if (PlayerPawnBPClass.Class != NULL) { DefaultPawnClass = PlayerPawnBPClass.Class; } - - GameStateClass = AStarterProjectGameStateBase::StaticClass(); - PlayerStateClass = AStarterProjectPlayerState::StaticClass(); + + // Seamless Travel is not currently supported in SpatialOS [UNR-897] + bUseSeamlessTravel = false; } diff --git a/Game/Source/StarterProject/StarterProjectGameStateBase.cpp b/Game/Source/StarterProject/StarterProjectGameStateBase.cpp deleted file mode 100644 index 657ee5d..0000000 --- a/Game/Source/StarterProject/StarterProjectGameStateBase.cpp +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright (c) Improbable Worlds Ltd, All Rights Reserved - -#include "StarterProjectGameStateBase.h" diff --git a/Game/Source/StarterProject/StarterProjectGameStateBase.h b/Game/Source/StarterProject/StarterProjectGameStateBase.h deleted file mode 100644 index 562564c..0000000 --- a/Game/Source/StarterProject/StarterProjectGameStateBase.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Improbable Worlds Ltd, All Rights Reserved - -#pragma once - -#include "CoreMinimal.h" -#include "GameFramework/GameStateBase.h" -#include "StarterProjectGameStateBase.generated.h" - -UCLASS(SpatialType=Singleton) -class STARTERPROJECT_API AStarterProjectGameStateBase : public AGameStateBase -{ - GENERATED_BODY() -}; diff --git a/Game/Source/StarterProject/StarterProjectPlayerState.cpp b/Game/Source/StarterProject/StarterProjectPlayerState.cpp deleted file mode 100644 index 6b2c888..0000000 --- a/Game/Source/StarterProject/StarterProjectPlayerState.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) Improbable Worlds Ltd, All Rights Reserved - -#include "StarterProjectPlayerState.h" - -AStarterProjectPlayerState::AStarterProjectPlayerState() -{ -} diff --git a/Game/Source/StarterProject/StarterProjectPlayerState.h b/Game/Source/StarterProject/StarterProjectPlayerState.h deleted file mode 100644 index ce8bd68..0000000 --- a/Game/Source/StarterProject/StarterProjectPlayerState.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) Improbable Worlds Ltd, All Rights Reserved - -#pragma once - -#include "CoreMinimal.h" -#include "GameFramework/PlayerState.h" -#include "StarterProjectPlayerState.generated.h" - -UCLASS(SpatialType) -class AStarterProjectPlayerState : public APlayerState -{ - GENERATED_BODY() - -public: - AStarterProjectPlayerState(); -}; diff --git a/spatial/default_launch.json b/spatial/default_launch.json index 7f259ae..159c9ee 100644 --- a/spatial/default_launch.json +++ b/spatial/default_launch.json @@ -1,11 +1,11 @@ { - "template": "small_entity_db_v2", + "template": "small", "world": { "dimensions": { - "x_meters": 200, - "z_meters": 200 + "x_meters": 2000, + "z_meters": 2000 }, - "chunk_edge_length_meters": 5, + "chunk_edge_length_meters": 50, "streaming_query_interval": 4, "legacy_flags": [ { diff --git a/spatial/one_worker_test.json b/spatial/one_worker_test.json index 27e8c30..d80ebb0 100644 --- a/spatial/one_worker_test.json +++ b/spatial/one_worker_test.json @@ -1,11 +1,11 @@ { - "template": "small_entity_db_v2", + "template": "small", "world": { "dimensions": { - "x_meters": 200, - "z_meters": 200 + "x_meters": 2000, + "z_meters": 2000 }, - "chunk_edge_length_meters": 5, + "chunk_edge_length_meters": 50, "streaming_query_interval": 4, "legacy_flags": [ { diff --git a/spatial/spatialos.json b/spatial/spatialos.json index 6a3b1aa..c9fb0d5 100644 --- a/spatial/spatialos.json +++ b/spatial/spatialos.json @@ -1,11 +1,11 @@ { "name": "unreal_gdk_starter_project", "project_version": "0.0.1", - "sdk_version": "13.3.1", + "sdk_version": "13.5.0", "dependencies": [ { "name": "standard_library", - "version": "13.3.1" + "version": "13.5.0" } ] } diff --git a/spatial/two_worker_test.json b/spatial/two_worker_test.json index 70b629e..a303259 100644 --- a/spatial/two_worker_test.json +++ b/spatial/two_worker_test.json @@ -1,11 +1,11 @@ { - "template": "small_entity_db_v2", + "template": "small", "world": { "dimensions": { - "x_meters": 200, - "z_meters": 200 + "x_meters": 2000, + "z_meters": 2000 }, - "chunk_edge_length_meters": 5, + "chunk_edge_length_meters": 50, "streaming_query_interval": 4, "legacy_flags": [ {