Merge pull request #61 from OudomMunint/OudomMunint-patch-1

PR: patch-1 => main
OudomMunint · Oct 18, 2024 · 8fa941d · 8fa941d
2 parents 3890bd5 + ebf8245
commit 8fa941d
Show file tree

Hide file tree

Showing 30 changed files with 23 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,4 +25,4 @@ jobs:
         uses: ncipollo/[email protected]
         with:
           artifacts: "UE4&5-github-actions-build"
-          tag: v2.1.4
+          tag: v2.2.0
diff --git a/.gitignore b/.gitignore
@@ -75,4 +75,6 @@ Plugins/*/Intermediate/*
 
 # Cache files for the editor to use
 DerivedDataCache/*
-/enc_temp_folder
+/enc_temp_folder
+Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset
+Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini
@@ -158,3 +158,8 @@ ReverbPlugin=
 OcclusionPlugin=
 SoundCueCookQualityIndex=-1
 
+[/Script/FFXFSR3Settings.FFXFSR3Settings]
+r.FidelityFX.FSR3.Enabled=False
+r.FidelityFX.FSR3.EnabledInEditorViewport=False
+r.FidelityFX.FSR3.QualityMode=4
+
diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini
@@ -5,7 +5,7 @@ Description=Third Person shooter
 CopyrightNotice=
 bUseBorderlessWindow=True
 Homepage="https://github.com/OudomMunint/Unreal-3rd-person-shooter-4.27"
-ProjectVersion=2.1.4
+ProjectVersion=2.2.0
 
 [StartupActions]
 bAddPacks=True

diff --git a/Content/BlueprintsMGE/BP_GameMode_MainMenu.uasset b/Content/BlueprintsMGE/BP_GameMode_MainMenu.uasset
diff --git a/Content/BlueprintsMGE/WidgetBP/Menus/DeadScreen.uasset b/Content/BlueprintsMGE/WidgetBP/Menus/DeadScreen.uasset
diff --git a/Content/BlueprintsMGE/WidgetBP/Menus/Pause.uasset b/Content/BlueprintsMGE/WidgetBP/Menus/Pause.uasset
diff --git a/Content/BlueprintsMGE/WidgetBP/Menus/WBP_MainMenu.uasset b/Content/BlueprintsMGE/WidgetBP/Menus/WBP_MainMenu.uasset
diff --git a/Content/BlueprintsMGE/WidgetBP/Menus/WBP_Menu_Graphics.uasset b/Content/BlueprintsMGE/WidgetBP/Menus/WBP_Menu_Graphics.uasset
diff --git a/Content/BlueprintsMGE/WidgetBP/Menus/WinScreen.uasset b/Content/BlueprintsMGE/WidgetBP/Menus/WinScreen.uasset
diff --git a/Content/BlueprintsMGE/WidgetBP/Widgets/Pause.uasset b/Content/BlueprintsMGE/WidgetBP/Widgets/Pause.uasset
diff --git a/Content/BlueprintsMGE/WidgetBP/Widgets/Timer.uasset b/Content/BlueprintsMGE/WidgetBP/Widgets/Timer.uasset
diff --git a/Content/ShooterSimplifiedAI/Animations/AM_Reload_Rifle_Ironsights.uasset b/Content/ShooterSimplifiedAI/Animations/AM_Reload_Rifle_Ironsights.uasset
diff --git a/Content/ShooterSimplifiedAI/Animations/Hit_Montage.uasset b/Content/ShooterSimplifiedAI/Animations/Hit_Montage.uasset
diff --git a/Content/ShooterSimplifiedAI/Animations/Hit_React_1_Montage.uasset b/Content/ShooterSimplifiedAI/Animations/Hit_React_1_Montage.uasset
diff --git a/Content/ShooterSimplifiedAI/Blueprints/AI/BP_ShooterEnemyAI.uasset b/Content/ShooterSimplifiedAI/Blueprints/AI/BP_ShooterEnemyAI.uasset
diff --git a/Content/ShooterSimplifiedAI/Blueprints/Player/BP_ShooterPlayer.uasset b/Content/ShooterSimplifiedAI/Blueprints/Player/BP_ShooterPlayer.uasset
diff --git a/Content/ShooterSimplifiedAI/Blueprints/ShooterGameMode.uasset b/Content/ShooterSimplifiedAI/Blueprints/ShooterGameMode.uasset
diff --git a/Content/ShooterSimplifiedAI/Blueprints/Weapon/BP_PlayerBaseWeapon.uasset b/Content/ShooterSimplifiedAI/Blueprints/Weapon/BP_PlayerBaseWeapon.uasset
diff --git a/Content/ShooterSimplifiedAI/Blueprints/Weapon/BP_PlayerMachineGun.uasset b/Content/ShooterSimplifiedAI/Blueprints/Weapon/BP_PlayerMachineGun.uasset
diff --git a/Content/ShooterSimplifiedAI/Blueprints/Weapon/BP_PlayerRifle.uasset b/Content/ShooterSimplifiedAI/Blueprints/Weapon/BP_PlayerRifle.uasset
diff --git a/Content/ShooterSimplifiedAI/Maps/DemoMap_ShooterAI.umap b/Content/ShooterSimplifiedAI/Maps/DemoMap_ShooterAI.umap
diff --git a/Content/ShooterSimplifiedAI/UI/HUD/W_MainHUD.uasset b/Content/ShooterSimplifiedAI/UI/HUD/W_MainHUD.uasset
diff --git a/Content/akicon.png b/Content/akicon.png
diff --git a/Content/akicon.uasset b/Content/akicon.uasset
diff --git a/DESN2600Test.uproject b/DESN2600Test.uproject
@@ -25,6 +25,13 @@
 		{
 			"Name": "MobileFSR",
 			"Enabled": false
+		},
+		{
+			"Name": "FSR3",
+			"Enabled": false,
+			"SupportedTargetPlatforms": [
+				"Win64"
+			]
 		}
 	],
 	"TargetPlatforms": [

diff --git a/README.md b/README.md
@@ -106,8 +106,8 @@ anytime by pressing `R` during game play.
   After downloading, extract the zip file and run the executable.
   If you're on macOS, you might need to allow the app to run in `System Preferences > Security & Privacy` On Windows, you might need to allow the app to run when prompted by Windows Security.
 - <b>v1.0 (Deprecated) Windows_x86_64:</b> <a href="https://www.dropbox.com/sh/iaq1bsasgaz5znd/AABZkdeA_N6LC4kTpRVe0Af3a?dl=1">Download here</a>
-- <b>v2.1.4 Windows_x86_64:</b> <a href="https://www.dropbox.com/scl/fi/mp7uqwbhy5maw98al00wa/TPS_2.1.4_x86_64.zip?rlkey=c9yujbgjhpnnc725w04c1jlx8&st=r8pk7ih9&dl=0">Download here</a>
-- <b>v2.1.4 macOS (Intel & Apple Silicon):</b> <a href="https://www.dropbox.com/scl/fi/6ueauqgurhz66fj8746zt/TPS_2.1.4_macOS.zip?rlkey=zu19eamzss0arewhjwng6gwc3&st=m1e0a3fn&dl=0">Download here</a>
+- <b>v2.2.0 Windows_x86_64:</b> <a href="https://www.dropbox.com/scl/fi/8al23mkzg6xb6lb1lj2q9/TPS-v2.2-x86.zip?rlkey=f4md149ig35s7j915rpb8ss1w&st=w2dvqdtz&dl=0">Download here</a>
+- <b>v2.2.0 macOS (Intel & Apple Silicon):</b> <a href="https://www.dropbox.com/scl/fi/ks3o77akre3ohflfcr0aq/TPS-v2.2.0-macos.zip?rlkey=819p8wwl5mylcg9mywmdsslyh&st=u9pjvp8x&dl=0">Download here</a>
 
 > [!NOTE]  
 > FSR 2 is only available on Windows v1.0 build. <br>
@@ -124,6 +124,9 @@ anytime by pressing `R` during game play.
 - [X] Update base engine to 5.2.0 for native apple silicon support.
 - [X] Update base engine to 5.3.0 for navite apple silicon supoort for lumen and nanite.
 - [ ] Add support for FSR 3 for Unreal Engine 5.4.4.
+- [X] Reloading System.
+- [X] Shoulder Switching System.
+- [X] Objectives System & Win Condition.
 
 ### Screenshots
 <img src="img1.png" width="900"/> <hr/>

diff --git a/Source/DESN2600Test/Private/AGlobalIlluminationManager.cpp b/Source/DESN2600Test/Private/AGlobalIlluminationManager.cpp
@@ -4,7 +4,6 @@
 #include "GameFramework/Actor.h"
 #include "HAL/IConsoleManager.h"
 #include "Scalability.h"
-#include "AShadowManager.h"
 
 // Sets default values
 AAGlobalIlluminationManager::AAGlobalIlluminationManager()

diff --git a/Source/DESN2600Test/Private/AShadowManager.cpp b/Source/DESN2600Test/Private/AShadowManager.cpp
@@ -1,5 +1,4 @@
 #include "AShadowManager.h"
-#include "AGlobalIlluminationManager.h"
 #include "Engine/World.h"
 #include "Engine/Engine.h"
 #include "GameFramework/Actor.h"

diff --git a/Source/DESN2600Test/Public/AShadowManager.h b/Source/DESN2600Test/Public/AShadowManager.h
@@ -26,5 +26,6 @@ class DESN2600TEST_API AAShadowManager : public AActor
 	// Called every frame
 	virtual void Tick(float DeltaTime) override;
 
+	UFUNCTION(BlueprintCallable, Category = "Shadows")
 	void ApplyShadowSettings(int32 ShadowQualityLevel);
 };