diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index e9a9348e..43cd1136 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -2,8 +2,8 @@ CommonUI.Debug.CheckGameViewportClientValid=0 [/Script/EngineSettings.GameMapsSettings] -GameDefaultMap=/Game/ThirdPerson/Maps/ThirdPersonMap.ThirdPersonMap -EditorStartupMap=/Game/ThirdPerson/Maps/ThirdPersonMap.ThirdPersonMap +GameDefaultMap=/Game/Maps/StartupMap.StartupMap +EditorStartupMap=/Game/Maps/StartupMap.StartupMap GlobalDefaultGameMode=/Game/Blueprints/Game/BP_ShooterGameModeBase.BP_ShooterGameModeBase_C ServerDefaultMap=/Game/ThirdPerson/Maps/ThirdPersonMap.ThirdPersonMap diff --git a/Content/Blueprints/Game/BP_MenuGameMode.uasset b/Content/Blueprints/Game/BP_MenuGameMode.uasset index 3e5625f0..0d3830d3 100644 Binary files a/Content/Blueprints/Game/BP_MenuGameMode.uasset and b/Content/Blueprints/Game/BP_MenuGameMode.uasset differ diff --git a/Content/DedicatedServers/APITest/UI/BP_APITestHUD.uasset b/Content/DedicatedServers/APITest/UI/BP_APITestHUD.uasset new file mode 100644 index 00000000..75fcc3ac Binary files /dev/null and b/Content/DedicatedServers/APITest/UI/BP_APITestHUD.uasset differ diff --git a/Content/DedicatedServers/APITest/UI/WBP_APITestOverlay.uasset b/Content/DedicatedServers/APITest/UI/WBP_APITestOverlay.uasset new file mode 100644 index 00000000..ed8878cf Binary files /dev/null and b/Content/DedicatedServers/APITest/UI/WBP_APITestOverlay.uasset differ diff --git a/Source/DedicatedServers/DedicatedServers.Build.cs b/Source/DedicatedServers/DedicatedServers.Build.cs index f0aa3850..1ce4533f 100644 --- a/Source/DedicatedServers/DedicatedServers.Build.cs +++ b/Source/DedicatedServers/DedicatedServers.Build.cs @@ -21,7 +21,8 @@ public class DedicatedServers : ModuleRules { "Slate", "SlateCore", - "OpenSSL" + "OpenSSL", + "UMG" }); // Adds in the plugin for GameLiftServerSDK if it is the server build. diff --git a/Source/DedicatedServers/Private/UI/API_Test/APITestOverlay.cpp b/Source/DedicatedServers/Private/UI/API_Test/APITestOverlay.cpp new file mode 100644 index 00000000..594c4614 --- /dev/null +++ b/Source/DedicatedServers/Private/UI/API_Test/APITestOverlay.cpp @@ -0,0 +1,4 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "UI/API_Test/APITestOverlay.h" diff --git a/Source/DedicatedServers/Private/UI/API_Test/API_TestHUD.cpp b/Source/DedicatedServers/Private/UI/API_Test/API_TestHUD.cpp new file mode 100644 index 00000000..5260e37d --- /dev/null +++ b/Source/DedicatedServers/Private/UI/API_Test/API_TestHUD.cpp @@ -0,0 +1,17 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "UI/API_Test/API_TestHUD.h" +#include "UI/API_Test/APITestOverlay.h" + +void AAPI_TestHUD::BeginPlay() +{ + Super::BeginPlay(); + + APlayerController* PlayerController = GetOwningPlayerController(); + if (IsValid(PlayerController) && APITestOverlayClass) + { + APITestOverlay = CreateWidget(PlayerController, APITestOverlayClass); + APITestOverlay->AddToViewport(); + } +} diff --git a/Source/DedicatedServers/Public/UI/API_Test/APITestOverlay.h b/Source/DedicatedServers/Public/UI/API_Test/APITestOverlay.h new file mode 100644 index 00000000..f47f0b42 --- /dev/null +++ b/Source/DedicatedServers/Public/UI/API_Test/APITestOverlay.h @@ -0,0 +1,16 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Blueprint/UserWidget.h" +#include "APITestOverlay.generated.h" + +/** + * + */ +UCLASS() +class DEDICATEDSERVERS_API UAPITestOverlay : public UUserWidget +{ + GENERATED_BODY() +}; diff --git a/Source/DedicatedServers/Public/UI/API_Test/API_TestHUD.h b/Source/DedicatedServers/Public/UI/API_Test/API_TestHUD.h new file mode 100644 index 00000000..312ac61f --- /dev/null +++ b/Source/DedicatedServers/Public/UI/API_Test/API_TestHUD.h @@ -0,0 +1,29 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/HUD.h" +#include "API_TestHUD.generated.h" + +class UAPITestOverlay; +/** + * + */ +UCLASS() +class DEDICATEDSERVERS_API AAPI_TestHUD : public AHUD +{ + GENERATED_BODY() + +public: + UPROPERTY(EditDefaultsOnly) + TSubclassOf APITestOverlayClass; + +protected: + virtual void BeginPlay() override; + +private: + UPROPERTY() + TObjectPtr APITestOverlay; + +};