Mark actors as always relevant and minor fixes to UI.

The map is so small that we will always be relevant so it is just wasting CPU cycles checking that now. Also added Killgoal to ui.
TheGrimsey · Dec 18, 2019 · dccc6bf · dccc6bf
1 parent dde9346
commit dccc6bf
Show file tree

Hide file tree

Showing 11 changed files with 2,452 additions and 2,446 deletions.
diff --git a/Build/WindowsNoEditor/FileOpenOrder/CookerOpenOrder.log b/Build/WindowsNoEditor/FileOpenOrder/CookerOpenOrder.log
diff --git a/Build/WindowsNoEditor/FileOpenOrder/EditorOpenOrder.log b/Build/WindowsNoEditor/FileOpenOrder/EditorOpenOrder.log
diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini
@@ -1,5 +1,9 @@
 [/Script/EngineSettings.GeneralProjectSettings]
 ProjectID=7840F4A2415D8C4F89EB82BB4616A209
+ProjectDisplayedTitle=NSLOCTEXT("[/Script/EngineSettings]", "3F54AA5941397764424574A1D81E0699", "SimpleFPS v1")
+Homepage=thegrimsey.net
+Description=A Simple FPS game made in UE4
+ProjectName=SimpleFPS
 
 [/Script/UnrealEd.ProjectPackagingSettings]
 BlueprintNativizationMethod=Inclusive

diff --git a/Content/BP_SimpleFPSCharacter.uasset b/Content/BP_SimpleFPSCharacter.uasset
diff --git a/Content/MainMenu/MainMenuWidget.uasset b/Content/MainMenu/MainMenuWidget.uasset
diff --git a/Content/MainMenu/PlayTab_MainMenuWidget.uasset b/Content/MainMenu/PlayTab_MainMenuWidget.uasset
diff --git a/Content/UI/HUD.uasset b/Content/UI/HUD.uasset
diff --git a/Content/Weapons/BowlingBall.uasset b/Content/Weapons/BowlingBall.uasset
diff --git a/Source/SimpleFPS/SimpleFPSGameModeBase.cpp b/Source/SimpleFPS/SimpleFPSGameModeBase.cpp
@@ -52,6 +52,7 @@ void ASimpleFPSGameModeBase::InitGameState()
 
 	if (ASimpleFPSGameState * FPSGameState = GetGameState<ASimpleFPSGameState>())
 	{
+		FPSGameState->KillGoal = KillGoal;
 		FPSGameState->Teams = Teams;
 		FPSGameState->TeamKills.Init(0, Teams);
 		FPSGameState->TeamDeaths.Init(0, Teams);

diff --git a/Source/SimpleFPS/SimpleFPSGameState.cpp b/Source/SimpleFPS/SimpleFPSGameState.cpp
@@ -9,11 +9,12 @@ void ASimpleFPSGameState::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>&
 {
 	Super::GetLifetimeReplicatedProps(OutLifetimeProps);
 
+	DOREPLIFETIME_CONDITION(ASimpleFPSGameState, KillGoal, COND_InitialOnly);
 	DOREPLIFETIME_CONDITION(ASimpleFPSGameState, Teams, COND_InitialOnly);
+	DOREPLIFETIME_CONDITION(ASimpleFPSGameState, WinningTeam, COND_InitialOnly);
 
 	DOREPLIFETIME(ASimpleFPSGameState, TeamKills);
 	DOREPLIFETIME(ASimpleFPSGameState, TeamDeaths);
-	DOREPLIFETIME(ASimpleFPSGameState, WinningTeam);
 }
 
 void ASimpleFPSGameState::AddPlayerState(APlayerState* PlayerState)

diff --git a/Source/SimpleFPS/SimpleFPSGameState.h b/Source/SimpleFPS/SimpleFPSGameState.h
@@ -74,6 +74,10 @@ class SIMPLEFPS_API ASimpleFPSGameState : public AGameStateBase
 	UPROPERTY(BlueprintAssignable)
 	FOnServerMessage OnServerMessage;
 
+
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Replicated)
+	int KillGoal = 4;
+
 	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Replicated)
 	int Teams = 4;