Skip to content

Commit

Permalink
Merge pull request #31 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 Aug 30, 2024
2 parents 5018d3b + fb5c889 commit df3c149
Show file tree
Hide file tree
Showing 16 changed files with 70 additions and 45 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: UE Release

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
workflow_dispatch:
Expand All @@ -27,4 +25,4 @@ jobs:
uses: ncipollo/[email protected]
with:
artifacts: "UE4&5-github-actions-build"
tag: v1.4.9.6
tag: v2.0.0
9 changes: 8 additions & 1 deletion Config/DefaultEngine.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ AppliedDefaultGraphicsPerformance=Maximum
[/Script/Engine.Engine]
+ActiveGameNameRedirects=(OldGameName="TP_FirstPersonBP",NewGameName="/Script/DESN2600Test")
+ActiveGameNameRedirects=(OldGameName="/Script/TP_FirstPersonBP",NewGameName="/Script/DESN2600Test")
bSmoothFrameRate=True
SmoothedFrameRateRange=(LowerBound=(Type=Inclusive,Value=30.000000),UpperBound=(Type=Exclusive,Value=72.000000))

[/Script/AIModule.CrowdManager]
MaxAgents=100
Expand Down Expand Up @@ -60,17 +62,22 @@ r.RayTracing.Skylight=False
r.RayTracing.UseTextureLod=True
r.NormalMapsForStaticLighting=True
r.PathTracing=False
r.AntiAliasingMethod=4
r.AntiAliasingMethod=2
r.Shadow.Virtual.Enable=0
r.Lumen.TranslucencyReflections.FrontLayer.EnableForProject=True
r.Lumen.HardwareRayTracing=True
r.MSAACount=1
r.DefaultFeature.LensFlare=True
r.Lumen.Reflections.HardwareRayTracing.Translucent.Refraction.EnableForProject=True
r.Nanite.ProjectEnabled=True
r.DefaultFeature.Bloom=True
r.DefaultFeature.MotionBlur=True

[/Script/WindowsTargetPlatform.WindowsTargetSettings]
DefaultGraphicsRHI=DefaultGraphicsRHI_DX12
-D3D12TargetedShaderFormats=PCD3D_SM5
+D3D12TargetedShaderFormats=PCD3D_SM5
+D3D12TargetedShaderFormats=PCD3D_SM6
-D3D11TargetedShaderFormats=PCD3D_SM5
+D3D11TargetedShaderFormats=PCD3D_SM5
+VulkanTargetedShaderFormats=SF_VULKAN_SM5
Expand Down
2 changes: 1 addition & 1 deletion Config/DefaultGame.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[/Script/EngineSettings.GeneralProjectSettings]
ProjectID=28F3DF0B4227A5998EBF4F88EE6E88A4
ProjectName=DESN2600
ProjectName=Third Person Shooter
Description=Third Person shooter
CopyrightNotice=
bUseBorderlessWindow=False
Expand Down
Binary file modified Content/BlueprintsMGE/BP_TimeOfDay.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/FirstPersonBP/Blueprints/FirstPersonCharacter.uasset
Binary file not shown.
Binary file modified Content/FirstPersonBP/Blueprints/FirstPersonHUD.uasset
Binary file not shown.
Binary file modified Content/FirstPersonBP/Maps/FirstPersonExampleMap.umap
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/StarterContent/Architecture/Floor_400x400.uasset
Binary file not shown.
Binary file modified Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
Binary file not shown.
25 changes: 6 additions & 19 deletions DESN2600Test.uproject
Original file line number Diff line number Diff line change
@@ -1,37 +1,24 @@
{
"FileVersion": 3,
"EngineAssociation": "5.1",
"EngineAssociation": "5.4",
"Category": "",
"Description": "",
"Plugins": [
{
"Name": "Volumetrics",
"Enabled": true
},
{
"Name": "FSR2",
"Enabled": true,
"SupportedTargetPlatforms": [
"Win64"
]
},
{
"Name": "FSR",
"Enabled": false
},
{
"Name": "MobileFSR",
"Enabled": true
},
{
"Name": "DLSS",
"Enabled": true,
"MarketplaceURL": "https://www.unrealengine.com/marketplace/en-US/product/nvidia-dlss"
},
{
"Name": "NIS",
"Enabled": true,
"MarketplaceURL": "https://www.unrealengine.com/marketplace/en-US/product/nvidia-dlss"
"Enabled": false
}
],
"TargetPlatforms": [
"Windows",
"Mac"
]
}
75 changes: 54 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# 3rd Person Shooter (still thinking of a name)
### Started development with `Unreal Engine 4.27`, now developing with `Unreal Engine 5`

## Maintenance: ![maintenance-status](https://img.shields.io/badge/maintenance-passively--maintained-yellowgreen.svg)

Expand All @@ -10,9 +11,10 @@
| CPU | i7-3770K or Ryzen 3200G | i7-8750H or Ryzen 5 4600H |
| RAM | 8GB | 16GB or higher |
| Storage | Nvme SSD 5GB of free space | Nvme SSD 5GB of free space |
| GPU | Intel Iris Xe 96EU | GTX 1050 or RX 550 |
| GPU | Intel Iris Xe 96EU | GTX 1050 Ti or RX 560 |
| Shader Model | 5.0+ | 6+ for VSM, Lumen etc |
| OS | Windows 10 or macOS 10.12 | Windows 10 or macOS 10.15 |
| API | DX11 or Vulkan | DX12 or Vulkan |
| OS | Windows 10 or macOS 10.12 | Windows 11 or macOS 10.15 |

# Recommened Specs Apple Silicon
| Specification | Minimum | Recommended |
Expand All @@ -21,17 +23,36 @@
| RAM | 8GB | 16GB or higher |
| Storage | Nvme SSD 5GB of free space | Nvme SSD 5GB of free space |
| GPU | Apple M1 7 or 8 Core GPU | Apple M1 Pro 14 Core GPU |
| OS | macOS 13.0 | macOS 13.6 |

~~‼️ Apple silicon isn't supported `M1` & `M2` SKUs <br>~~
~~‼️ Apple silicon is now supported with `macOS 13.0+` and `Unreal Engine 5.1.1+`~~ <br>
‼️ Apple silicon is now supported with `macOS 13.0+` and `Unreal Engine 5.2+` <br>
‼️ Mac compatibility tested on `2023 MacBook Pro 14" M2 Pro (10 core CPU + 16 Core GPU)` <br>& `2021 MacBookPro 16" M1 Max (10 core GPU + 32 Core GPU)` <br>
‼️ For now `FSR 2` Doesn't work on macOS 13+ use `r.FidelityFX.FSR2.Enabled 0` to disable FSR<br>
‼️ DLSS only supprts `RTX 20 Series` and newer. <br>
‼️ Use `r.FidelityFX.FSR2.EnableFP16OnNvDX11` to enable half precision mode if GPU < `Maxwell` / `GCN 1.0` <br>
‼️ `UE 5.2.1` will not launch because of `FSR 2.2.1` <br>
‼️ For now macOS platforms can only use `FSR 1.0` & `FSR Mobile` <br>
| API | Metal 2.4 | Metal 3 |
| OS | macOS 13.0 | macOS 14 |

# Recommended Specs Intel Macs
| Specification | Minimum | Recommended |
|-------------------|----------------------------------|---------------------------------|
| CPU | i7-6700HQ | i7-8750H |
| RAM | 8GB | 16GB or higher |
| Storage | Nvme SSD 5GB of free space | Nvme SSD 5GB of free space |
| GPU | Radeon Pro 455 2GB | Radeon Pro 560X 4GB |
| Shader Model | 5.0+ | 6+ for VSM, Lumen etc |
| API | Metal 2 | Metal 2 |
| OS | macOS 10.12 | macOS 10.15 |

# Notes
- ~~‼️ Apple silicon is now supported with `macOS 13.0+` and `Unreal Engine 5.1.1+`~~
- Apple silicon is now supported with `macOS 13.0+` and `Unreal Engine 5.2+`
- Apple silicon Mac compatibility and performance was tested on:
- `2023 MacBook Pro 14" M2 Pro (10 core CPU/16 Core GPU)`
- `2021 MacBookPro 16" M1 Max (10 core GPU/32 Core GPU)`
- Intel Mac compatibility and performance was tested on:
- `2016 MacBook Pro 15" (i7-6700HQ + Radeon Pro 455)`
- `2018 MacBook Pro 15" (i7-8850H + Radeon Pro 560X)`
- Use `r.FidelityFX.FSR2.EnableFP16OnNvDX11` to enable half precision mode if GPU < `Maxwell` / `GCN 1.0`.

# Known Issues
- ~~Apple silicon isn't supported `M1` & `M2` SKUs~~
- `UE 5.2.1` will not launch because of `FSR 2.2.1`.
- For now macOS platforms can only use `FSR 1.0` & `FSR Mobile`.
- For now `FSR 2` Doesn't work on macOS 13+ use `r.FidelityFX.FSR2.Enabled 0` to disable.

# FSR commands
- For mac users: replace `r.FidelityFX.FSR2` with `r.FidelityFX.FSR1`
Expand Down Expand Up @@ -60,19 +81,31 @@
- `Foliage`: `Low`, There's no foliage
- `Shading`: `Epic`, no performance cost until Cinematic

### Started with `Unreal Engine 4.27`, now developing with `Unreal Engine 5.0+`
### Downloads

- <b>v1.0 Windows_x86_64:</b> <a href="https://www.dropbox.com/sh/iaq1bsasgaz5znd/AABZkdeA_N6LC4kTpRVe0Af3a?dl=1">Download here</a>
- <b>v2.0 Windows_x86_64:</b> <a href="https://www.dropbox.com/scl/fo/sv01yicixj3jxhf2iqp9r/AF35lhdCMbRm5VVAfNO4n8M?rlkey=zt1ijovaqo47ev99y9fi2qrtt&st=vthjub3p&dl=0">Download here</a>
- <b>v2.0 macOS_x86 (Intel):</b> <a href="https://www.dropbox.com/scl/fi/5rqerzjudf1ixl9216tx3/DESN2600Test-Mac-Shipping-10.10.23-PM.zip?rlkey=jer5ajepx85zmj245zzttzdai&st=dy0w213b&dl=0">Download here</a>
- <b>v2.0 macOS_arm64 (Apple Silicon):</b> <a href="https://www.dropbox.com/scl/fi/5rqerzjudf1ixl9216tx3/DESN2600Test-Mac-Shipping-10.10.23-PM.zip?rlkey=jer5ajepx85zmj245zzttzdai&st=dy0w213b&dl=0">Download here</a>

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 in `Windows Security` prompt.

### Featuring `AMD FSR 2.2.1`, `Bots` and `Guns!` <a href="https://www.dropbox.com/sh/iaq1bsasgaz5znd/AABZkdeA_N6LC4kTpRVe0Af3a?dl=1">Download here</a>
### Download notes
- `FSR 2` is only available on Windows v1.0.
- `v1.0` is built with `Unreal Engine 5.0.3`.
- `v2.0` is built with `Unreal Engine 5.4.4` with native Apple Silicon support.
- `v1.0` on Windows uses DX11, `v2.0` uses DX12 & Metal 3 for macOS.

### Upcoming features

- [X] Update DLSS to DLSS 2.3 or DLSS 3
- [X] Add FSR 1 for Mac
- [ ] Add graphics options for DLSS or FSR
- [ ] Update base engine to 5.2.0 for native apple silicon support
- [ ] Update base engine to 5.3.0 for navite apple silicon supoort for lumen and nanite
- [X] ~~- Update DLSS to DLSS 2.3 or DLSS 3.~~
- [X] Add FSR 1 for Mac.
- [ ] Add graphics options for ~~- DLSS~~ and FSR.
- [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.

<img src="img1.png" width="900"/> <hr/>
<img src="tps.png" width="900"/> <hr/>
<img src="img2.png" width="900"/> <hr/>
<img src="Screenshot 2023-07-26 195911.png" width="900"/> <hr/>
<img src="Screenshot 2023-07-26 195911.png" width="900"/> <hr/>

0 comments on commit df3c149

Please sign in to comment.