Prep for 0.4.0 release

Nick-Pearson · Mar 8, 2018 · b016661 · b016661
1 parent 2fd6930
commit b016661
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/ParkourGame/Content/ThirdPersonCPP/Blueprints/WidgetServerEntry.uasset b/ParkourGame/Content/ThirdPersonCPP/Blueprints/WidgetServerEntry.uasset
diff --git a/ParkourGame/ParkourGame.uproject b/ParkourGame/ParkourGame.uproject
@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "4.18",
+	"EngineAssociation": "{1EB35545-43B9-8FA4-BECF-1FA82A93E018}",
 	"Category": "",
 	"Description": "",
 	"Modules": [

diff --git a/ParkourGame/Source/ParkourGame/ParkourGame.Build.cs b/ParkourGame/Source/ParkourGame/ParkourGame.Build.cs
@@ -8,7 +8,7 @@ public ParkourGame(ReadOnlyTargetRules Target) : base(Target)
 	{
 		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
 
-		PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "PhysX", "APEX", "PhysXCookingLib", "RuntimePhysXCooking", "PhysXCooking"});
+		PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "PhysX", "APEX"});
         PrivateDependencyModuleNames.AddRange(new string[] { "HTTP", "LowEntryJson" });
 	}
 }
diff --git a/ParkourGame/Source/ParkourGame/Private/Core/ParkourGameGameMode.cpp b/ParkourGame/Source/ParkourGame/Private/Core/ParkourGameGameMode.cpp
@@ -32,6 +32,8 @@ AParkourGameGameMode::AParkourGameGameMode()
 FString AParkourGameGameMode::InitNewPlayer(APlayerController* NewPlayerController, const FUniqueNetIdRepl& UniqueId, const FString& Options, const FString& Portal /*= TEXT("")*/)
 {
 	FString msg = Super::InitNewPlayer(NewPlayerController, UniqueId, Options, Portal);
+
+  UE_LOG(LogTemp, Warning, TEXT("OPTIONS: %s"), *Options);
 	return msg;
 }
 
diff --git a/ParkourGame/Source/ParkourGame/Private/Physics/ReverseSweep.cpp b/ParkourGame/Source/ParkourGame/Private/Physics/ReverseSweep.cpp
@@ -5,6 +5,7 @@
 #include "Runtime/Engine/Private/PhysicsEngine/PhysXSupport.h"
 
 #pragma region STD PHYSX CODE
+#if WITH_EDITOR
 
 namespace ECollisionQuery
 {
@@ -211,6 +212,8 @@ PxQueryHitType::Enum FPxQueryFilterCallbackSweep::postFilter(const PxFilterData&
 	}
 }
 
+#endif
+
 struct FScopedMultiSceneReadLock
 {
 	FScopedMultiSceneReadLock()
@@ -252,7 +255,7 @@ struct FScopedMultiSceneReadLock
 	PxScene* SceneLocks[PST_MAX];
 };
 
-PxQueryFlags StaticDynamicQueryFlags(const FCollisionQueryParams& Params)
+PxQueryFlags pk_StaticDynamicQueryFlags(const FCollisionQueryParams& Params)
 {
 	switch (Params.MobilityType)
 	{
@@ -335,7 +338,7 @@ PxVec3 GeomReverseSweep_PhysX(const UWorld* World, const PxGeometry& PGeom, cons
 {
 	// Create filter data used to filter collisions
 	PxFilterData PFilter = CreateQueryFilterData(TraceChannel, Params.bTraceComplex, ResponseParams.CollisionResponse, Params, ObjectParams, true);
-	PxQueryFilterData PQueryFilterData(PFilter, StaticDynamicQueryFlags(Params) | PxQueryFlag::ePREFILTER | PxQueryFlag::ePOSTFILTER | PxQueryFlag::eNO_BLOCK);
+	PxQueryFilterData PQueryFilterData(PFilter, pk_StaticDynamicQueryFlags(Params) | PxQueryFlag::ePREFILTER | PxQueryFlag::ePOSTFILTER | PxQueryFlag::eNO_BLOCK);
 	PxHitFlags POutputFlags = PxHitFlag::ePOSITION | PxHitFlag::eNORMAL | PxHitFlag::eDISTANCE | PxHitFlag::eFACE_INDEX | PxHitFlag::eMESH_MULTIPLE | PxHitFlag::eMESH_BOTH_SIDES;
 	FPxQueryFilterCallbackSweep PQueryCallbackSweep(Params);
 
@@ -380,6 +383,7 @@ PxVec3 GeomReverseSweep_PhysX(const UWorld* World, const PxGeometry& PGeom, cons
 #pragma endregion
 
 #pragma region MORE STD PHYSX CODE
+#if WITH_EDITOR
 
 static const PxQuat CapsuleRotator(0.f, 0.707106781f, 0.f, 0.707106781f);
 
@@ -486,4 +490,5 @@ PxFilterData CreateQueryFilterData(const uint8 MyChannel, const bool bTraceCompl
 	}
 }
 
+#endif
 #pragma endregion
diff --git a/ParkourGame/Source/ParkourGame/Private/Utils/GameVersion.h b/ParkourGame/Source/ParkourGame/Private/Utils/GameVersion.h
@@ -5,8 +5,8 @@
 #include "GameVersion.generated.h"
 
 #define GAME_VERSION_MAJOR 0
-#define GAME_VERSION_MINOR 3
-#define GAME_VERSION_PATCH 1
+#define GAME_VERSION_MINOR 4
+#define GAME_VERSION_PATCH 0
 
 USTRUCT(BlueprintType)
 struct FGameVersion