Skip to content

Commit

Permalink
Merge pull request #46 from OudomMunint/OudomMunint-patch-1
Browse files Browse the repository at this point in the history
patch-1 => main
  • Loading branch information
OudomMunint authored Oct 2, 2024
2 parents b69f79e + f1632dd commit 8dc1f0b
Show file tree
Hide file tree
Showing 19 changed files with 170 additions and 5 deletions.
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.2
tag: v2.1.3
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,4 @@ Plugins/*/Intermediate/*

# Cache files for the editor to use
DerivedDataCache/*
/enc_temp_folder
13 changes: 13 additions & 0 deletions .vsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": "1.0",
"components": [
"Microsoft.Net.Component.4.6.2.TargetingPack",
"Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64",
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
"Microsoft.VisualStudio.Component.Windows10SDK.22621",
"Microsoft.VisualStudio.Workload.CoreEditor",
"Microsoft.VisualStudio.Workload.ManagedDesktop",
"Microsoft.VisualStudio.Workload.NativeDesktop",
"Microsoft.VisualStudio.Workload.NativeGame"
]
}
3 changes: 3 additions & 0 deletions Config/DefaultEngine.ini
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ r.AllowOcclusionQueries=True
r.Lumen.TraceMeshSDFs=0
r.DefaultFeature.LocalExposure.ShadowContrastScale=1.000000
r.DefaultFeature.AmbientOcclusionStaticFraction=True
r.DefaultFeature.AutoExposure=True
r.DefaultFeature.AutoExposure.Bias=1.000000
r.DefaultFeature.AutoExposure.Method=0

[/Script/WindowsTargetPlatform.WindowsTargetSettings]
DefaultGraphicsRHI=DefaultGraphicsRHI_DX12
Expand Down
5 changes: 3 additions & 2 deletions Config/DefaultGame.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[/Script/EngineSettings.GeneralProjectSettings]
ProjectID=87FBF80649ED3745C4EF19980CE488C6
ProjectID=447CEEEF4C3B2354AED720A032F1A5FD
ProjectName=Third Person Shooter
Description=Third Person shooter
CopyrightNotice=
bUseBorderlessWindow=True
Homepage="https://github.com/OudomMunint/Unreal-3rd-person-shooter-4.27"
ProjectVersion=2.1.2
ProjectVersion=2.1.3

[StartupActions]
bAddPacks=True
Expand All @@ -15,4 +15,5 @@ InsertPack=(PackSource="StarterContent.upack",PackName="StarterContent")
FullRebuild=True
BuildConfiguration=PPBC_Shipping
IncludeAppLocalPrerequisites=True
Build=Always

Binary file modified Content/BlueprintsMGE/WidgetBP/Menus/WBP_Menu_Graphics.uasset
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.
Binary file added DESN2600Test.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions DESN2600Test.uproject
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
"EngineAssociation": "5.4",
"Category": "",
"Description": "",
"Modules": [
{
"Name": "DESN2600Test",
"Type": "Runtime",
"LoadingPhase": "Default",
"AdditionalDependencies": [
"Engine"
]
}
],
"Plugins": [
{
"Name": "Volumetrics",
Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# 3rd Person Shooter (still thinking of a name)
### Started development with `Unreal Engine 4.27`, now developing with `Unreal Engine 5`

> [!NOTE]
> This project uses both blueprints and C++
## Maintenance: ![maintenance-status](https://img.shields.io/badge/maintenance-passively--maintained-yellowgreen.svg)

## Release Pipeline: [![UE Release](https://github.com/OudomMunint/Unreal-3rd-person-shooter-4.27/actions/workflows/release.yml/badge.svg)](https://github.com/OudomMunint/Unreal-3rd-person-shooter-4.27/actions/workflows/release.yml)
Expand Down Expand Up @@ -98,8 +101,8 @@
### 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.1.2 Windows_x86_64:</b> <a href="https://www.dropbox.com/scl/fi/iy0ja6y7zj64dtqxuh0al/v2.1.2_windows_x86.zip?rlkey=cm3svbal8sgr8i9n182frfybr&st=xso92ouq&dl=0">Download here</a>
- <b>v2.1.2 macOS (Intel & Apple Silicon):</b> <a href="https://www.dropbox.com/scl/fi/3n3sknj9zfyobjcc096pg/v2.1.2_macOS_universal.zip?rlkey=apa27fpraz2gwt7322c6t7lsf&st=qh459nrt&dl=0">Download here</a>
- <b>v2.1.3 Windows_x86_64:</b> <a href="https://www.dropbox.com/scl/fi/41ac7c7b7wohgh407q1uo/TPS_v2.1.3_x86.zip?rlkey=wwlp6u8o5g6zr8g5z2bwmibys&st=2haloduj&dl=0">Download here</a>
- <b>v2.1.3 macOS (Intel & Apple Silicon):</b> <a href="https://www.dropbox.com/scl/fi/u13dn2lqymrejkyok2t7x/TPS_v2.1.3_macOS.zip?rlkey=9fwcwfabrv1umgr6fk5ybhkww&st=eo19sdyu&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.
Expand Down
15 changes: 15 additions & 0 deletions Source/DESN2600Test.Target.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@


using UnrealBuildTool;
using System.Collections.Generic;

public class DESN2600TestTarget : TargetRules
{
public DESN2600TestTarget(TargetInfo Target) : base(Target)
{
Type = TargetType.Game;
DefaultBuildSettings = BuildSettingsVersion.V5;

ExtraModuleNames.AddRange( new string[] { "DESN2600Test" } );
}
}
23 changes: 23 additions & 0 deletions Source/DESN2600Test/DESN2600Test.Build.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@


using UnrealBuildTool;

public class DESN2600Test : ModuleRules
{
public DESN2600Test(ReadOnlyTargetRules Target) : base(Target)
{
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;

PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" });

PrivateDependencyModuleNames.AddRange(new string[] { });

// Uncomment if you are using Slate UI
// PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });

// Uncomment if you are using online features
// PrivateDependencyModuleNames.Add("OnlineSubsystem");

// To include OnlineSubsystemSteam, add it to the plugins section in your uproject file with the Enabled attribute set to true
}
}
6 changes: 6 additions & 0 deletions Source/DESN2600Test/DESN2600Test.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@


#include "DESN2600Test.h"
#include "Modules/ModuleManager.h"

IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, DESN2600Test, "DESN2600Test" );
6 changes: 6 additions & 0 deletions Source/DESN2600Test/DESN2600Test.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@


#pragma once

#include "CoreMinimal.h"

43 changes: 43 additions & 0 deletions Source/DESN2600Test/Private/AGlobalIlluminationManager.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#include "AGlobalIlluminationManager.h"
#include "Engine/World.h"
#include "Engine/Engine.h"
#include "GameFramework/Actor.h"
#include "HAL/IConsoleManager.h"
#include "Scalability.h"

// Sets default values
AAGlobalIlluminationManager::AAGlobalIlluminationManager()
{
// Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it.
PrimaryActorTick.bCanEverTick = true;
}

// Called when the game starts or when spawned
void AAGlobalIlluminationManager::BeginPlay()
{
Super::BeginPlay();
}

// Called every frame
void AAGlobalIlluminationManager::Tick(float DeltaTime)
{
Super::Tick(DeltaTime);

if (Scalability::GetQualityLevels().GlobalIlluminationQuality <= 1)
{
IConsoleManager::Get().FindConsoleVariable(TEXT("r.DynamicGlobalIlluminationMethod"))->Set(2);
IConsoleManager::Get().FindConsoleVariable(TEXT("r.ReflectionMethod"))->Set(2);
IConsoleManager::Get().FindConsoleVariable(TEXT("r.SSGI.Quality"))->Set(4);

UE_LOG(LogTemp, Warning, TEXT("Lumen is disabled"));
UE_LOG(LogTemp, Warning, TEXT("SSGI fallback is enabled"));
UE_LOG(LogTemp, Warning, TEXT("SSR fallback is enabled"));
}
else if (Scalability::GetQualityLevels().GlobalIlluminationQuality > 1)
{
IConsoleManager::Get().FindConsoleVariable(TEXT("r.DynamicGlobalIlluminationMethod"))->Set(1);
IConsoleManager::Get().FindConsoleVariable(TEXT("r.ReflectionMethod"))->Set(1);

UE_LOG(LogTemp, Warning, TEXT("Lumen GI & Reflections is enabled"));
}
}
26 changes: 26 additions & 0 deletions Source/DESN2600Test/Public/AGlobalIlluminationManager.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@


#pragma once

#include "CoreMinimal.h"
#include "GameFramework/Actor.h"
#include "AGlobalIlluminationManager.generated.h"

UCLASS()
class DESN2600TEST_API AAGlobalIlluminationManager : public AActor
{
GENERATED_BODY()

public:
// Sets default values for this actor's properties
AAGlobalIlluminationManager();

protected:
// Called when the game starts or when spawned
virtual void BeginPlay() override;

public:
// Called every frame
virtual void Tick(float DeltaTime) override;

};
15 changes: 15 additions & 0 deletions Source/DESN2600TestEditor.Target.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@


using UnrealBuildTool;
using System.Collections.Generic;

public class DESN2600TestEditorTarget : TargetRules
{
public DESN2600TestEditorTarget(TargetInfo Target) : base(Target)
{
Type = TargetType.Editor;
DefaultBuildSettings = BuildSettingsVersion.V5;

ExtraModuleNames.AddRange( new string[] { "DESN2600Test" } );
}
}

0 comments on commit 8dc1f0b

Please sign in to comment.