From 2e9d35be576249d1b39f05770ca18bd36b545fd9 Mon Sep 17 00:00:00 2001 From: Nick Pearson Date: Tue, 8 May 2018 08:20:42 +0100 Subject: [PATCH] Final changed Fixes #168 --- .../Blueprints/WidgetLobbyScreen.uasset | 4 ++-- .../ParkourGame/Private/UI/UIHelperLibrary.h | 1 - .../ParkourGame/Private/Utils/GameVersion.h | 2 +- .../Private/Utils/ParkourHelperLibrary.cpp | 15 +++++++++++++++ .../Private/Utils/ParkourHelperLibrary.h | 6 +++++- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/ParkourGame/Content/ThirdPersonCPP/Blueprints/WidgetLobbyScreen.uasset b/ParkourGame/Content/ThirdPersonCPP/Blueprints/WidgetLobbyScreen.uasset index 73c1e60..dcd2f7e 100644 --- a/ParkourGame/Content/ThirdPersonCPP/Blueprints/WidgetLobbyScreen.uasset +++ b/ParkourGame/Content/ThirdPersonCPP/Blueprints/WidgetLobbyScreen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d3d4baf7097f4363d826ec779a9eefed96dc6931ab7371a44fb5e1ae51ead67 -size 120626 +oid sha256:a85a189113d566273c5d6e431557db3fc6506b682d2e251c078ce26a2fa23125 +size 177140 diff --git a/ParkourGame/Source/ParkourGame/Private/UI/UIHelperLibrary.h b/ParkourGame/Source/ParkourGame/Private/UI/UIHelperLibrary.h index ad423a7..1a92b22 100644 --- a/ParkourGame/Source/ParkourGame/Private/UI/UIHelperLibrary.h +++ b/ParkourGame/Source/ParkourGame/Private/UI/UIHelperLibrary.h @@ -25,5 +25,4 @@ class UUIHelperLibrary : public UBlueprintFunctionLibrary // returns a string with the key combination for a particular input action UFUNCTION(BlueprintCallable, Category = "HUD|Keys", meta = (WorldContext = "WorldContextObject")) static FText GetDisplayStringForAction(UObject* WorldContextObject, const FName& ActionName); - }; diff --git a/ParkourGame/Source/ParkourGame/Private/Utils/GameVersion.h b/ParkourGame/Source/ParkourGame/Private/Utils/GameVersion.h index 22b7c8e..f0d6b3c 100644 --- a/ParkourGame/Source/ParkourGame/Private/Utils/GameVersion.h +++ b/ParkourGame/Source/ParkourGame/Private/Utils/GameVersion.h @@ -5,7 +5,7 @@ #include "GameVersion.generated.h" #define GAME_VERSION_MAJOR 0 -#define GAME_VERSION_MINOR 10 +#define GAME_VERSION_MINOR 11 #define GAME_VERSION_PATCH 0 USTRUCT(BlueprintType) diff --git a/ParkourGame/Source/ParkourGame/Private/Utils/ParkourHelperLibrary.cpp b/ParkourGame/Source/ParkourGame/Private/Utils/ParkourHelperLibrary.cpp index a3e4ad6..f39d2c4 100644 --- a/ParkourGame/Source/ParkourGame/Private/Utils/ParkourHelperLibrary.cpp +++ b/ParkourGame/Source/ParkourGame/Private/Utils/ParkourHelperLibrary.cpp @@ -1,5 +1,6 @@ #include "ParkourHelperLibrary.h" #include "ParkourFNames.h" +#include "Regex.h" FName UParkourHelperLibrary::GetRootBoneForBodyPart(EBodyPart Part) { @@ -44,3 +45,17 @@ void UParkourHelperLibrary::GetBoneChainForBodyPart(EBodyPart Part, TArray& outChain); - + + + + UFUNCTION(BlueprintPure, Category = "Lobby") + static bool IsValidPlayerName(const FString& Name); };