Skip to content

Commit

Permalink
Merge pull request #65 from OudomMunint/OudomMunint-patch-1
Browse files Browse the repository at this point in the history
PR: Patch-1 => Main
  • Loading branch information
OudomMunint authored Nov 6, 2024
2 parents 8fa941d + bb8b9e7 commit ccca0a3
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 25 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:
contents: write

jobs:
Verify-Project-Integrity:
Verify-Integrity:
runs-on: ubuntu-latest
steps:
- name: Use Node.js lasted
Expand All @@ -24,5 +24,5 @@ jobs:
- name: Create Release
uses: ncipollo/[email protected]
with:
artifacts: "UE4&5-github-actions-build"
tag: v2.2.0
artifacts: "UE-github-actions-artifacts"
tag: v2.2.1
5 changes: 4 additions & 1 deletion Config/DefaultEditor.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@ bReplaceBlueprintWithClass= true
bDontLoadBlueprintOutsideEditor= true
bBlueprintIsNotBlueprintType= true

[/Script/AdvancedPreviewScene.SharedProfiles]
[CookSettings]
MemoryMinFreeVirtual=1024
MemoryMinFreePhisical=512

[/Script/AdvancedPreviewScene.SharedProfiles]
6 changes: 3 additions & 3 deletions Config/DefaultEngine.ini
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ OcclusionPlugin=
SoundCueCookQualityIndex=-1

[/Script/FFXFSR3Settings.FFXFSR3Settings]
r.FidelityFX.FSR3.Enabled=False
r.FidelityFX.FSR3.EnabledInEditorViewport=False
r.FidelityFX.FSR3.QualityMode=4
r.FidelityFX.FSR3.Enabled=True
r.FidelityFX.FSR3.EnabledInEditorViewport=True
r.FidelityFX.FSR3.QualityMode=1

7 changes: 3 additions & 4 deletions Config/DefaultGame.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ Description=Third Person shooter
CopyrightNotice=
bUseBorderlessWindow=True
Homepage="https://github.com/OudomMunint/Unreal-3rd-person-shooter-4.27"
ProjectVersion=2.2.0
ProjectVersion=2.2.1

[StartupActions]
bAddPacks=True
InsertPack=(PackSource="StarterContent.upack",PackName="StarterContent")
; InsertPack=(PackSource="StarterContent.upack",PackName="StarterContent")

[/Script/UnrealEd.ProjectPackagingSettings]
FullRebuild=True
BuildConfiguration=PPBC_Shipping
IncludeAppLocalPrerequisites=True
Build=Always

Build=Always
2 changes: 1 addition & 1 deletion Config/DefaultInput.ini
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
bAltEnterTogglesFullscreen=True
bF11TogglesFullscreen=True
bUseMouseForTouch=False
bEnableMouseSmoothing=True
bEnableMouseSmoothing=False
bEnableFOVScaling=True
bCaptureMouseOnLaunch=True
bEnableLegacyInputScales=True
Expand Down
Binary file modified Content/BlueprintsMGE/WidgetBP/Menus/WBP_Menu_Graphics.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion DESN2600Test.uproject
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
{
"Name": "FSR3",
"Enabled": false,
"Enabled": true,
"SupportedTargetPlatforms": [
"Win64"
]
Expand Down
31 changes: 19 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 3rd Person Shooter (still thinking of a name)
### Started development with `Unreal Engine 4.27`, now developing with `Unreal Engine 5`
### Started development with `Unreal Engine 4.27`, now developing with `Unreal Engine 5.4.4`

> [!NOTE]
> This project uses both blueprints and C++
Expand Down Expand Up @@ -60,10 +60,15 @@ for more info on requirements for UE5 rendering features on macOS.
> - `2016 MacBook Pro 15" (i7-6700HQ + Radeon Pro 455/16GB RAM)`
> - `2018 MacBook Pro 15" (i7-8850H + Radeon Pro 560X/16GB RAM)`

> [!WARNING]
> Nanite & Virtual Shadow Maps (VSM) is only available for Apple Silicon M2+ <br>
> Builds later than `1.0` only offer Unreal Engine's Temporal Super Resolution (TSR) as an upscaling solution.
> FSR 1 and FSR 2 are now Deprecated. FSR 3 is now available for the latest builds. <br>
> FSR 3 requires a Polaris (RX 5XX) GPU or newer for AMD and Pascal (GTX 10XX) GPU or newer for Nvidia. <br>
> FSR 3 implementation in this project is consist of the upscaling component, no frame generation. <br>
> Currently FSR 3 is only available for Windows builds, macOS would still have TSR.
> [!TIP]
> Options for FSR 3 are available in the graphics settings for windows builds.
# FSR commands. For (v1.0) build.
- For mac users: replace `r.FidelityFX.FSR2` with `r.FidelityFX.FSR1`
Expand All @@ -79,6 +84,12 @@ for more info on requirements for UE5 rendering features on macOS.
| `r.FidelityFX.FSR2.QualityMode 4` | FSR 2 Ultra Performance Mode |
| `r.FidelityFX.FSR2.EnableFP16OnNvDX11 1`| Enable half precision mode on Nvidia|

# FSR 3.1.1 commands.

| Commands | Actions |
|-----------------------------------------|----------------------------------|
| `r.FidelityFX.FSR3.EnableFP16OnNvDX11 1`| Enable half precision mode on Nvidia|

# Optimization
- `Resolution Scale`: `100%` if TSR or FSR is off.
- `View Distance`: `Near`, the map is small.
Expand All @@ -98,16 +109,12 @@ for more info on requirements for UE5 rendering features on macOS.
> You can use the performance overlay to see the performance impact of each setting in real-time.
> <br> To do so go to `Options > Graphics > Performance Overlay`.
> [!CAUTION]
>If graphics options are not being applied, try clicking `Play` in the main menu, then you can go back to the main menu
anytime by pressing `R` during game play.

### Downloads
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.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>
- <b>v2.2.1 Windows_x86_64:</b> <a href="https://www.dropbox.com/scl/fi/on0k3j6ntt0uyupi7c47x/TPS-2.2.1-windows.zip?rlkey=y8n1w32gwojo9ynp4bygllnrs&st=r82f314y&dl=0">Download here</a>
- <b>v2.2.1 macOS (Intel & Apple Silicon):</b> <a href="https://www.dropbox.com/scl/fi/px5r1pb0wiszbrkq0cpb6/TPS-2.2.1-macos.zip?rlkey=ag2ribixs1uhs5p265v109q8s&st=brgmzg68&dl=0">Download here</a>

> [!NOTE]
> FSR 2 is only available on Windows v1.0 build. <br>
Expand All @@ -118,12 +125,12 @@ anytime by pressing `R` during game play.

- [X] ~~- Update DLSS to DLSS 2.3 or DLSS 3.~~
- [X] Add FSR 1 for Mac.
- [ ] Add graphics options for ~~- DLSS~~ and FSR.
- [X] Add graphics options for ~~- DLSS~~ and FSR.
- [X] Add a perforamnce overlay.
- [X] Add graphics option for TSR and Anti-Aliasing.
- [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] Add support for FSR 3 for Unreal Engine 5.4.4.
- [X] Reloading System.
- [X] Shoulder Switching System.
- [X] Objectives System & Win Condition.
Expand All @@ -132,4 +139,4 @@ anytime by pressing `R` during game play.
<img src="img1.png" width="900"/> <hr/>
<img src="tps.png" width="900"/> <hr/>
<img src="img2.png" width="900"/> <hr/>
<img src="img3.png" width="900"/> <hr/>
<img src="img3.png" width="900"/> <hr/>

0 comments on commit ccca0a3

Please sign in to comment.