Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: patch-1 => main #61

Merged
merged 27 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
a6be600
#57 - Rifle icon for ammo counter UI.
OudomMunint Oct 15, 2024
4a1f0f8
Decouple AAGlobalIlluminationManager class and AShadowManager class
OudomMunint Oct 15, 2024
3bfadc8
Update ignore list.
OudomMunint Oct 15, 2024
e509de6
ApplyShadowSettings() in AShadowManager class is now blueprint callable.
OudomMunint Oct 15, 2024
861eda9
#57 Created Win screen.
OudomMunint Oct 16, 2024
e2e6f11
Hit react animation montage
OudomMunint Oct 16, 2024
a78b48b
#58 Created Timer component
OudomMunint Oct 16, 2024
6a685a2
Tweaked Reload animation for player char
OudomMunint Oct 16, 2024
e107013
#58 #57 - Ammo counter UI, Kill/Objective UI + Use timer in Main hud.
OudomMunint Oct 16, 2024
a95d1ed
Small tweaks to Pause and DeadScreen widgets
OudomMunint Oct 16, 2024
602828d
BP_GameMode optimisations and clean up
OudomMunint Oct 16, 2024
4f330ed
#59 Added screen trace option for lumen, Fix overlay toggle can't be …
OudomMunint Oct 16, 2024
b7d9d8f
Merge pull request #60 from OudomMunint/main
OudomMunint Oct 16, 2024
586a80d
#56 Reloading system
OudomMunint Oct 17, 2024
ae82f18
Fixed items at top or bottom most cant be interacted with
OudomMunint Oct 17, 2024
9886bb4
#55 Win condition, win screen,.
OudomMunint Oct 17, 2024
92e7ab7
New Project version, Release tag
OudomMunint Oct 17, 2024
cd81ddf
#56 #54 #57 Should switch system, Reload on command, New aim FOV, Cro…
OudomMunint Oct 17, 2024
82bc185
Misc changes, blueprint clean up
OudomMunint Oct 17, 2024
ba9f5f3
Map changes, tweaks and optimizations
OudomMunint Oct 17, 2024
20698e5
#14 WIP: FSR 3.1.1 implementation
OudomMunint Oct 17, 2024
0d3aae9
Disabled FSR, (WIP)
OudomMunint Oct 18, 2024
fe27328
Disabled FSR 3
OudomMunint Oct 18, 2024
638ee2e
Fixed dead screen & win screen alignment
OudomMunint Oct 18, 2024
b115304
v2.20 build and link for windows_x86
OudomMunint Oct 18, 2024
166ddd8
v2.2.0 build & link for macOS, re-imported ak icon.
OudomMunint Oct 18, 2024
ebf8245
Readme update
OudomMunint Oct 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
uses: ncipollo/[email protected]
with:
artifacts: "UE4&5-github-actions-build"
tag: v2.1.4
tag: v2.2.0
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions Config/DefaultEngine.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion Config/DefaultGame.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified Content/BlueprintsMGE/BP_GameMode_MainMenu.uasset
Binary file not shown.
Binary file modified Content/BlueprintsMGE/WidgetBP/Menus/DeadScreen.uasset
Binary file not shown.
Binary file modified Content/BlueprintsMGE/WidgetBP/Menus/Pause.uasset
Binary file not shown.
Binary file modified Content/BlueprintsMGE/WidgetBP/Menus/WBP_MainMenu.uasset
Binary file not shown.
Binary file modified Content/BlueprintsMGE/WidgetBP/Menus/WBP_Menu_Graphics.uasset
Binary file not shown.
Binary file not shown.
Binary file modified Content/BlueprintsMGE/WidgetBP/Widgets/Pause.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Content/ShooterSimplifiedAI/Blueprints/ShooterGameMode.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Content/ShooterSimplifiedAI/Maps/DemoMap_ShooterAI.umap
Binary file not shown.
Binary file modified Content/ShooterSimplifiedAI/UI/HUD/W_MainHUD.uasset
Binary file not shown.
Binary file added Content/akicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Content/akicon.uasset
Binary file not shown.
7 changes: 7 additions & 0 deletions DESN2600Test.uproject
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@
{
"Name": "MobileFSR",
"Enabled": false
},
{
"Name": "FSR3",
"Enabled": false,
"SupportedTargetPlatforms": [
"Win64"
]
}
],
"TargetPlatforms": [
Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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/>
Expand Down
1 change: 0 additions & 1 deletion Source/DESN2600Test/Private/AGlobalIlluminationManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "GameFramework/Actor.h"
#include "HAL/IConsoleManager.h"
#include "Scalability.h"
#include "AShadowManager.h"

// Sets default values
AAGlobalIlluminationManager::AAGlobalIlluminationManager()
Expand Down
1 change: 0 additions & 1 deletion Source/DESN2600Test/Private/AShadowManager.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "AShadowManager.h"
#include "AGlobalIlluminationManager.h"
#include "Engine/World.h"
#include "Engine/Engine.h"
#include "GameFramework/Actor.h"
Expand Down
1 change: 1 addition & 0 deletions Source/DESN2600Test/Public/AShadowManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};
Loading