Skip to content
Snippets Groups Projects
Commit d5bb4759 authored by David Gilbert's avatar David Gilbert :bug:
Browse files

Merge branch '5.4' into '5.3'

# Conflicts:
#   Config/DefaultEngine.ini
parents 015a10b3 7eaad275
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ include: ...@@ -26,7 +26,7 @@ include:
variables: variables:
UNREAL_VERSION: "5.3" UNREAL_VERSION: "5.4"
stages: stages:
......
[/Script/UnrealEd.ProjectPackagingSettings]
Build=IfProjectHasCode
BuildConfiguration=PPBC_Development
BuildTarget=RwthVrTemplate
FullRebuild=False
ForDistribution=False
IncludeDebugFiles=False
BlueprintNativizationMethod=Disabled
bIncludeNativizedAssetsInProjectGeneration=False
bExcludeMonolithicEngineHeadersInNativizedCode=False
UsePakFile=True
bUseIoStore=True
bUseZenStore=False
bMakeBinaryConfig=False
bGenerateChunks=False
bGenerateNoChunks=False
bChunkHardReferencesOnly=False
bForceOneChunkPerFile=False
MaxChunkSize=0
bBuildHttpChunkInstallData=False
HttpChunkInstallDataDirectory=(Path="")
WriteBackMetadataToAssetRegistry=Disabled
bWritePluginSizeSummaryJsons=False
bCompressed=True
PackageCompressionFormat=Oodle
bForceUseProjectCompressionFormatIgnoreHardwareOverride=False
PackageAdditionalCompressionOptions=
PackageCompressionMethod=Kraken
PackageCompressionLevel_DebugDevelopment=4
PackageCompressionLevel_TestShipping=5
PackageCompressionLevel_Distribution=7
PackageCompressionMinBytesSaved=1024
PackageCompressionMinPercentSaved=5
bPackageCompressionEnableDDC=False
PackageCompressionMinSizeToConsiderDDC=0
HttpChunkInstallDataVersion=
IncludePrerequisites=True
IncludeAppLocalPrerequisites=False
bShareMaterialShaderCode=True
bDeterministicShaderCodeOrder=False
bSharedMaterialNativeLibraries=True
ApplocalPrerequisitesDirectory=(Path="")
IncludeCrashReporter=False
InternationalizationPreset=English
-CulturesToStage=en
+CulturesToStage=en
LocalizationTargetCatchAllChunkId=0
bCookAll=False
bCookMapsOnly=False
bSkipEditorContent=False
bSkipMovies=False
-IniKeyDenylist=KeyStorePassword
-IniKeyDenylist=KeyPassword
-IniKeyDenylist=rsa.privateexp
-IniKeyDenylist=rsa.modulus
-IniKeyDenylist=rsa.publicexp
-IniKeyDenylist=aes.key
-IniKeyDenylist=SigningPublicExponent
-IniKeyDenylist=SigningModulus
-IniKeyDenylist=SigningPrivateExponent
-IniKeyDenylist=EncryptionKey
-IniKeyDenylist=DevCenterUsername
-IniKeyDenylist=DevCenterPassword
-IniKeyDenylist=IOSTeamID
-IniKeyDenylist=SigningCertificate
-IniKeyDenylist=MobileProvision
-IniKeyDenylist=IniKeyDenylist
-IniKeyDenylist=IniSectionDenylist
+IniKeyDenylist=KeyStorePassword
+IniKeyDenylist=KeyPassword
+IniKeyDenylist=rsa.privateexp
+IniKeyDenylist=rsa.modulus
+IniKeyDenylist=rsa.publicexp
+IniKeyDenylist=aes.key
+IniKeyDenylist=SigningPublicExponent
+IniKeyDenylist=SigningModulus
+IniKeyDenylist=SigningPrivateExponent
+IniKeyDenylist=EncryptionKey
+IniKeyDenylist=DevCenterUsername
+IniKeyDenylist=DevCenterPassword
+IniKeyDenylist=IOSTeamID
+IniKeyDenylist=SigningCertificate
+IniKeyDenylist=MobileProvision
+IniKeyDenylist=IniKeyDenylist
+IniKeyDenylist=IniSectionDenylist
-IniSectionDenylist=HordeStorageServers
-IniSectionDenylist=StorageServers
+IniSectionDenylist=HordeStorageServers
+IniSectionDenylist=StorageServers
+DirectoriesToNeverCook=(Path="/Game/NoCookAndroid")
bRetainStagedDirectory=False
CustomStageCopyHandler=
\ No newline at end of file
[/Script/HardwareTargeting.HardwareTargetingSettings]
TargetedHardwareClass=Desktop
AppliedTargetedHardwareClass=Desktop
DefaultGraphicsPerformance=Maximum
AppliedDefaultGraphicsPerformance=Maximum
[/Script/EngineSettings.GameMapsSettings] [/Script/EngineSettings.GameMapsSettings]
EditorStartupMap=/RWTHVRToolkit/Examples/ContentExamples/ToolkitExamples.ToolkitExamples EditorStartupMap=/Game/Maps/Main.Main
GameDefaultMap=/RWTHVRToolkit/Examples/ContentExamples/ToolkitExamples.ToolkitExamples GameDefaultMap=/Game/Maps/Main.Main
GlobalDefaultGameMode=/RWTHVRToolkit/BP_RWTHVRGameModeBase.BP_RWTHVRGameModeBase_C GlobalDefaultGameMode=/RWTHVRToolkit/BP_RWTHVRGameModeBase.BP_RWTHVRGameModeBase_C
[/Script/DisplayClusterEditor.DisplayClusterEditorSettings] [/Script/DisplayClusterEditor.DisplayClusterEditorSettings]
...@@ -30,8 +24,12 @@ r.MobileHDR=False ...@@ -30,8 +24,12 @@ r.MobileHDR=False
vr.MobileMultiView=True vr.MobileMultiView=True
vr.InstancedStereo=False vr.InstancedStereo=False
r.Mobile.UseHWsRGBEncoding=True r.Mobile.UseHWsRGBEncoding=True
r.AntiAliasingMethod=2 r.Shadow.Virtual.Enable=1
r.TemporalAA.Upsampling=False r.DefaultFeature.AmbientOcclusion=False
r.DefaultFeature.AmbientOcclusionStaticFraction=False
r.DefaultFeature.LocalExposure.HighlightContrastScale=0.800000
r.DefaultFeature.LocalExposure.ShadowContrastScale=0.800000
r.AntiAliasingMethod=3
[/Script/WindowsTargetPlatform.WindowsTargetSettings] [/Script/WindowsTargetPlatform.WindowsTargetSettings]
DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 DefaultGraphicsRHI=DefaultGraphicsRHI_DX12
...@@ -62,6 +60,9 @@ CompressionQualityModifier=1.000000 ...@@ -62,6 +60,9 @@ CompressionQualityModifier=1.000000
AutoStreamingThreshold=0.000000 AutoStreamingThreshold=0.000000
SoundCueCookQualityIndex=-1 SoundCueCookQualityIndex=-1
[/Script/NavigationSystem.NavigationSystemV1]
bAllowClientSideNavigation=True
[/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings] [/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings]
bEnablePlugin=True bEnablePlugin=True
bAllowNetworkConnection=True bAllowNetworkConnection=True
...@@ -85,13 +86,6 @@ SoundCueCookQualityIndex=-1 ...@@ -85,13 +86,6 @@ SoundCueCookQualityIndex=-1
-TargetedRHIs=SF_VULKAN_SM5 -TargetedRHIs=SF_VULKAN_SM5
+TargetedRHIs=SF_VULKAN_SM6 +TargetedRHIs=SF_VULKAN_SM6
[/Script/Engine.GameEngine]
+NetDriverDefinitions=(DefName=GameNetDriver,DriverClassName=/Script/DisplayClusterReplication.DisplayClusterNetDriver,DriverClassNameFallback=/Script/OnlineSubsystemUtils.IpNetDriver)
+NetDriverDefinitions=(DefName=DemoNetDriver,DriverClassName=/Script/Engine.DemoNetDriver,DriverClassNameFallback=/Script/Engine.DemoNetDriver)
[/Script/DisplayClusterReplication.DisplayClusterNetDriver]
NetConnectionClassName=DisplayClusterReplication.DisplayClusterNetConnection
[/Script/OculusXRHMD.OculusXRHMDRuntimeSettings] [/Script/OculusXRHMD.OculusXRHMDRuntimeSettings]
SystemSplashBackground=Black SystemSplashBackground=Black
bAutoEnabled=False bAutoEnabled=False
...@@ -134,10 +128,7 @@ ProcessorFavor=FavorEqually ...@@ -134,10 +128,7 @@ ProcessorFavor=FavorEqually
bTileTurnOffEnabled=True bTileTurnOffEnabled=True
[/Script/AndroidRuntimeSettings.AndroidRuntimeSettings] [/Script/AndroidRuntimeSettings.AndroidRuntimeSettings]
bSupportsVulkan=True
bBuildForES31=False bBuildForES31=False
MinSDKVersion=32 ExtraApplicationSettings=<meta-data android:name="com.oculus.supportedDevices" android:value="quest|quest2|questpro|quest3" />
TargetSDKVersion=32
bPackageForMetaQuest=True bPackageForMetaQuest=True
ExtraApplicationSettings=<meta-data android:name="com.oculus.supportedDevices" android:value="quest|quest2|questpro" />
[AntiAliasingQuality@0]
r.PostProcessAAQuality=0
[AntiAliasingQuality@1]
r.PostProcessAAQuality=2
[AntiAliasingQuality@2]
r.PostProcessAAQuality=3
[AntiAliasingQuality@3]
r.PostProcessAAQuality=3
;-----------------------------------------------------------------------------------------------------------------
[PostProcessQuality@0]
r.MotionBlurQuality=0
r.AmbientOcclusionLevels=0
r.LensFlareQuality=0
r.SceneColorFringeQuality=0
r.DepthOfFieldQuality=0
r.BloomQuality=1
r.FastBlurThreshold=0
[PostProcessQuality@1]
r.MotionBlurQuality=0
r.AmbientOcclusionLevels=0
r.LensFlareQuality=0
r.SceneColorFringeQuality=0
r.DepthOfFieldQuality=0
r.BloomQuality=1
r.FastBlurThreshold=0
[PostProcessQuality@2]
r.MotionBlurQuality=0
r.AmbientOcclusionLevels=0
r.LensFlareQuality=0
r.SceneColorFringeQuality=0
r.DepthOfFieldQuality=0
r.BloomQuality=1
r.FastBlurThreshold=0
[PostProcessQuality@3]
r.MotionBlurQuality=0
r.AmbientOcclusionLevels=0
r.LensFlareQuality=0
r.SceneColorFringeQuality=0
r.DepthOfFieldQuality=0
r.BloomQuality=1
r.FastBlurThreshold=0
;-----------------------------------------------------------------------------------------------------------------
[TextureQuality@0]
r.MaxAnisotropy=0
[TextureQuality@1]
r.MaxAnisotropy=2
[TextureQuality@2]
r.MaxAnisotropy=4
[TextureQuality@3]
r.MaxAnisotropy=8
;-----------------------------------------------------------------------------------------------------------------
[EffectsQuality@0]
r.TranslucencyVolumeBlur=0
r.TranslucencyLightingVolumeDim=4
r.SceneColorFormat=2
r.SSR.Quality=0
[EffectsQuality@1]
r.TranslucencyVolumeBlur=0
r.TranslucencyLightingVolumeDim=4
r.SceneColorFormat=2
r.SSR.Quality=0
[EffectsQuality@2]
r.TranslucencyVolumeBlur=0
r.TranslucencyLightingVolumeDim=4
r.SceneColorFormat=2
r.SSR.Quality=0
[EffectsQuality@3]
r.TranslucencyVolumeBlur=0
r.TranslucencyLightingVolumeDim=4
r.SceneColorFormat=2
r.SSR.Quality=0
\ No newline at end of file
...@@ -3,8 +3,5 @@ GameEngine=/Script/DisplayCluster.DisplayClusterGameEngine ...@@ -3,8 +3,5 @@ GameEngine=/Script/DisplayCluster.DisplayClusterGameEngine
UnrealEdEngine=/Script/DisplayClusterEditor.DisplayClusterEditorEngine UnrealEdEngine=/Script/DisplayClusterEditor.DisplayClusterEditorEngine
GameViewportClientClassName=/Script/DisplayCluster.DisplayClusterViewportClient GameViewportClientClassName=/Script/DisplayCluster.DisplayClusterViewportClient
[/Script/Engine.RendererSettings]
r.DefaultBackBufferPixelFormat = 0
[SystemSettings] [SystemSettings]
r.Vsync=0 r.Vsync=0
[/Script/GameplayTags.GameplayTagsList]
GameplayTagList=(Tag="Render", DevComment="")
GameplayTagList=(Tag="Editor", DevComment="")
GameplayTagList=(Tag="Primary", DevComment="")
\ No newline at end of file
[/Script/UnrealEd.ProjectPackagingSettings]
Build=IfProjectHasCode
BuildConfiguration=PPBC_Development
BuildTarget=RwthVrTemplate
FullRebuild=False
ForDistribution=False
IncludeDebugFiles=False
BlueprintNativizationMethod=Disabled
bIncludeNativizedAssetsInProjectGeneration=False
bExcludeMonolithicEngineHeadersInNativizedCode=False
UsePakFile=True
bUseIoStore=True
bUseZenStore=False
bMakeBinaryConfig=False
bGenerateChunks=False
bGenerateNoChunks=False
bChunkHardReferencesOnly=False
bForceOneChunkPerFile=False
MaxChunkSize=0
bBuildHttpChunkInstallData=False
HttpChunkInstallDataDirectory=(Path="")
WriteBackMetadataToAssetRegistry=Disabled
bWritePluginSizeSummaryJsons=False
bCompressed=True
PackageCompressionFormat=Oodle
bForceUseProjectCompressionFormatIgnoreHardwareOverride=False
PackageAdditionalCompressionOptions=
PackageCompressionMethod=Kraken
PackageCompressionLevel_DebugDevelopment=4
PackageCompressionLevel_TestShipping=5
PackageCompressionLevel_Distribution=7
PackageCompressionMinBytesSaved=1024
PackageCompressionMinPercentSaved=5
bPackageCompressionEnableDDC=False
PackageCompressionMinSizeToConsiderDDC=0
HttpChunkInstallDataVersion=
IncludePrerequisites=True
IncludeAppLocalPrerequisites=False
bShareMaterialShaderCode=True
bDeterministicShaderCodeOrder=False
bSharedMaterialNativeLibraries=True
ApplocalPrerequisitesDirectory=(Path="")
IncludeCrashReporter=False
InternationalizationPreset=English
-CulturesToStage=en
+CulturesToStage=en
LocalizationTargetCatchAllChunkId=0
bCookAll=False
bCookMapsOnly=False
bSkipEditorContent=False
bSkipMovies=False
-IniKeyDenylist=KeyStorePassword
-IniKeyDenylist=KeyPassword
-IniKeyDenylist=rsa.privateexp
-IniKeyDenylist=rsa.modulus
-IniKeyDenylist=rsa.publicexp
-IniKeyDenylist=aes.key
-IniKeyDenylist=SigningPublicExponent
-IniKeyDenylist=SigningModulus
-IniKeyDenylist=SigningPrivateExponent
-IniKeyDenylist=EncryptionKey
-IniKeyDenylist=DevCenterUsername
-IniKeyDenylist=DevCenterPassword
-IniKeyDenylist=IOSTeamID
-IniKeyDenylist=SigningCertificate
-IniKeyDenylist=MobileProvision
-IniKeyDenylist=IniKeyDenylist
-IniKeyDenylist=IniSectionDenylist
+IniKeyDenylist=KeyStorePassword
+IniKeyDenylist=KeyPassword
+IniKeyDenylist=rsa.privateexp
+IniKeyDenylist=rsa.modulus
+IniKeyDenylist=rsa.publicexp
+IniKeyDenylist=aes.key
+IniKeyDenylist=SigningPublicExponent
+IniKeyDenylist=SigningModulus
+IniKeyDenylist=SigningPrivateExponent
+IniKeyDenylist=EncryptionKey
+IniKeyDenylist=DevCenterUsername
+IniKeyDenylist=DevCenterPassword
+IniKeyDenylist=IOSTeamID
+IniKeyDenylist=SigningCertificate
+IniKeyDenylist=MobileProvision
+IniKeyDenylist=IniKeyDenylist
+IniKeyDenylist=IniSectionDenylist
-IniSectionDenylist=HordeStorageServers
-IniSectionDenylist=StorageServers
+IniSectionDenylist=HordeStorageServers
+IniSectionDenylist=StorageServers
+DirectoriesToNeverCook=(Path="/Game/NoCookAndroid")
bRetainStagedDirectory=False
CustomStageCopyHandler=
\ No newline at end of file
{ {
"FileVersion": 3, "FileVersion": 3,
"EngineAssociation": "5.3", "EngineAssociation": "5.4",
"Category": "", "Category": "",
"Description": "", "Description": "",
"Modules": [ "Modules": [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment