[UNR-890] - Tidy Up Content (#45)

* Change StarterProjectCharacter_BP to be generic - Changed name of StarterProjectCharacter_BP to Character_BP to be more generic for creating a project template * Remove EntityBlueprints folder * Tidy Up StarterProject - Removed redundant cpp & h files - Tidied project content folder * Disable Seamless Travel * Update Spatial Launch Configs - Updated launch configs to prevent template warnings with new runtime * Update SDK version - Updated SDK version in spatialos.json - Added comment about seamless travel * Updated world dimensions and chunk size * Revert EngineAssociation * Rollback DefaultEngine changes - Rolling back automatically applied changes to DefaultEngine
spatialos · Feb 4, 2019 · 196ff1a · 196ff1a
1 parent 5270018
commit 196ff1a
Show file tree

Hide file tree

Showing 31 changed files with 21 additions and 80 deletions.
diff --git 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
diff --git a/Game/Content/StarterProject/Characters/PlayerCharacter_BP.uasset b/Game/Content/StarterProject/Characters/PlayerCharacter_BP.uasset
diff --git a/...PersonCPP/Maps/ThirdPersonExampleMap.umap → ...erProject/Maps/ThirdPersonExampleMap.umap b/...PersonCPP/Maps/ThirdPersonExampleMap.umap → ...erProject/Maps/ThirdPersonExampleMap.umap
diff --git a/...ps/ThirdPersonExampleMap_BuiltData.uasset → ...ps/ThirdPersonExampleMap_BuiltData.uasset b/...ps/ThirdPersonExampleMap_BuiltData.uasset → ...ps/ThirdPersonExampleMap_BuiltData.uasset
diff --git a/Game/Content/StarterProject/Meshes/Bump_StaticMesh.uasset b/Game/Content/StarterProject/Meshes/Bump_StaticMesh.uasset
diff --git a/Game/Content/StarterProject/Meshes/LeftArm_StaticMesh.uasset b/Game/Content/StarterProject/Meshes/LeftArm_StaticMesh.uasset
diff --git a/Game/Content/StarterProject/Meshes/Linear_Stair_StaticMesh.uasset b/Game/Content/StarterProject/Meshes/Linear_Stair_StaticMesh.uasset
diff --git a/Game/Content/StarterProject/Meshes/RampMaterial.uasset b/Game/Content/StarterProject/Meshes/RampMaterial.uasset
diff --git a/Game/Content/StarterProject/Meshes/Ramp_StaticMesh.uasset b/Game/Content/StarterProject/Meshes/Ramp_StaticMesh.uasset
diff --git a/Game/Content/StarterProject/Meshes/RightArm_StaticMesh.uasset b/Game/Content/StarterProject/Meshes/RightArm_StaticMesh.uasset
diff --git a/Game/Content/ThirdPerson/Meshes/Bump_StaticMesh.uasset b/Game/Content/ThirdPerson/Meshes/Bump_StaticMesh.uasset
diff --git a/Game/Content/ThirdPerson/Meshes/CubeMaterial.uasset b/Game/Content/ThirdPerson/Meshes/CubeMaterial.uasset
diff --git a/Game/Content/ThirdPerson/Meshes/LeftArm_StaticMesh.uasset b/Game/Content/ThirdPerson/Meshes/LeftArm_StaticMesh.uasset
diff --git a/Game/Content/ThirdPerson/Meshes/Linear_Stair_StaticMesh.uasset b/Game/Content/ThirdPerson/Meshes/Linear_Stair_StaticMesh.uasset
diff --git a/Game/Content/ThirdPerson/Meshes/RampMaterial.uasset b/Game/Content/ThirdPerson/Meshes/RampMaterial.uasset
diff --git a/Game/Content/ThirdPerson/Meshes/Ramp_StaticMesh.uasset b/Game/Content/ThirdPerson/Meshes/Ramp_StaticMesh.uasset
diff --git a/Game/Content/ThirdPerson/Meshes/RightArm_StaticMesh.uasset b/Game/Content/ThirdPerson/Meshes/RightArm_StaticMesh.uasset
diff --git a/Game/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset b/Game/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset
diff --git 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
diff --git a/Game/Source/StarterProject/StarterProjectGameInstance.h b/Game/Source/StarterProject/StarterProjectGameInstance.h
diff --git 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<APawn> PlayerPawnBPClass(TEXT("/Game/EntityBlueprints/StarterProjectCharacter_BP"));
+	static ConstructorHelpers::FClassFinder<APawn> 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
diff --git a/Game/Source/StarterProject/StarterProjectGameStateBase.h b/Game/Source/StarterProject/StarterProjectGameStateBase.h
diff --git a/Game/Source/StarterProject/StarterProjectPlayerState.cpp b/Game/Source/StarterProject/StarterProjectPlayerState.cpp
diff --git a/Game/Source/StarterProject/StarterProjectPlayerState.h b/Game/Source/StarterProject/StarterProjectPlayerState.h
diff --git 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
@@ -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
@@ -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
@@ -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": [
       {