Merging //UE4/Dev-Main to Dev-Geometry (//UE4/Dev-Geometry) (up to CL 3517493)

#rb none [CL 3517961 by Mike Fricker in Dev-Geometry branch]
2026-03-26 18:15:20 -07:00 · 2017-06-30 12:21:06 -04:00
parent 9ab80c55c5
commit 3892ace583
5060 changed files with 306000 additions and 146908 deletions
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TpsData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<Name>GoogleInstantPreview Library</Name>
+	<Location>/Engine/Source/ThirdParty/GoogleInstantPreview/</Location>
+	<Date>2017-03-29T15:56:39.5313637-08:00</Date>
+	<Function>Allows instant preview of apps on Google Daydream hardware.</Function>
+	<Justification />
+	<Eula>https://github.com/googlevr/gvr-android-sdk/blob/master/LICENSE</Eula>
+	<RedistributeTo>
+		<EndUserGroup>Licensees</EndUserGroup>
+		<EndUserGroup>Git</EndUserGroup>
+		<EndUserGroup>P4</EndUserGroup>
+	</RedistributeTo>
+	<LicenseFolder>/Engine/Source/ThirdParty/Licenses/GoogleVRSDK_License.txt</LicenseFolder>
+</TpsData>
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TpsData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<Notification>
-Redirect: ../../../Source/ThirdParty/LinuxNativeDialogs/UELinuxNativeDialogs.tps
-Notes:
-</Notification>
-</TpsData>
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TpsData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <Notification>
-Redirect: ../../../../Source/ThirdParty/Oculus/OculusMobile/OculusMobile.tps
+Redirect: ../../../../Source/ThirdParty/Oculus/OVRPlugin/OVRPlugin.tps
 Notes:
 </Notification>
 </TpsData>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TpsData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Name>Gradle v3.5</Name>
+  <Location>/Engine/Build/Android/Java/gradle</Location>
+  <Date>2017-06-01T15:23:24.2594464+09:00</Date>
+  <Function>Using the Gradle wrapper. Allows users' machines to download and install the rest of Gradle automatically</Function>
+  <Justification>Needed so our users can build Android builds using Gradle</Justification>
+  <Eula>https://github.com/gradle/gradle/blob/master/LICENSE</Eula>
+  <RedistributeTo>
+    <EndUserGroup>Licensees</EndUserGroup>
+    <EndUserGroup>Git</EndUserGroup>
+    <EndUserGroup>P4</EndUserGroup>
+  </RedistributeTo>
+  <LicenseFolder>/Engine/Source/ThirdParty/Licenses/Gradle_License.txt</LicenseFolder>
+</TpsData>
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
@@ -231,22 +231,6 @@ BuildICU()
  set +x
 }

-BuildLND()
-{
-  echo "building LinuxNativeDialogs"
-  set -x
-  cd Source/ThirdParty/LinuxNativeDialogs/UELinuxNativeDialogs
-  rm -rf build
-  mkdir build
-  cd build
-  cmake ..
-  make $MAKE_ARGS
-  local LIB_DIR=../lib/Linux/$TARGET_ARCH/
-  mv *.so $LIB_DIR
-  cp -P --remove-destination $LIB_DIR/*.so ${TOP_DIR}/Binaries/ThirdParty/LinuxNativeDialogs/Linux/$TARGET_ARCH/
-  set +x
-}
-
 BuildForsythTriOO()
 {
  echo "building ForsythTriOO"
@@ -397,7 +381,6 @@ build_all() {
   Run BuildHLSLCC
   Run BuildMcpp
   Run BuildFreeType
-   Run BuildLND
   Run BuildForsythTriOO
   Run BuildnvTriStrip
   Run BuildnvTextureTools
@@ -426,7 +409,6 @@ print_valid_build_opts() {
  echo "    HLSLCC"
  echo "    Mcpp"
  echo "    FreeType"
-  echo "    LND"
  echo "    ForsythTriOO"
  echo "    nvTriStrip"
  echo "    nvTextureTools"
@@ -1,6 +1,36 @@
 #!/bin/bash

 SCRIPT_DIR=$(cd "$(dirname "$BASH_SOURCE")" ; pwd)
+TOP_DIR=$(cd "$SCRIPT_DIR/../../.." ; pwd)
+
+AddGDBPrettyPrinters()
+{
+	echo -ne "Attempting to set up UE4 pretty printers for gdb...\t"
+
+	# Copy the pretty printer into the appropriate folder.
+	mkdir -pv ~/.config/Epic/GDBPrinters/
+	cp "$TOP_DIR/Extras/GDBPrinters/UE4Printers.py" ~/.config/Epic/GDBPrinters/
+
+	# Check if .gdbinit exists. If not create else add needed parts.
+	if [ ! -f ~/.gdbinit ]; then
+		echo "no ~/.gdbinit file found - creating a new one."
+		echo -e "python \nimport sys\n\nsys.path.append('$HOME/.config/Epic/GDBPrinters/')\n\nfrom UE4Printers import register_ue4_printers\nregister_ue4_printers(None)\nprint(\"Registered pretty printers for UE4 classes\")\n\nend" >> ~/.gdbinit
+	else
+		if grep -q "register_ue4_printers" ~/.gdbinit; then
+			echo "found necessary entries in ~/.gdbinit file, skipping."
+		else
+			echo -e "cannot modify .gdbinit. Please add the below lines manually:\n\n"
+			echo -e "\timport sys"
+			echo -e "\tsys.path.append('$HOME/.config/Epic/GDBPrinters/')"
+			echo -e "\tfrom UE4Printers import register_ue4_printers"
+			echo -e "\tregister_ue4_printers(None)"
+			echo -e "\tprint(\"Registered pretty printers for UE4 classes\")"
+			echo -e "\tend"
+			echo -e"\n\n"
+		fi
+	fi
+}
+

 # args: wrong filename, correct filename
 # expects to be run in Engine folder
@@ -225,7 +255,7 @@ done
 CreateLinkIfNoneExists ../../engine/shaders/Fxaa3_11.usf  ../Engine/Shaders/Fxaa3_11.usf
 CreateLinkIfNoneExists ../../Engine/shaders/Fxaa3_11.usf  ../Engine/Shaders/Fxaa3_11.usf

-# We have to build libhlslcc locally due to apparent mismatch between system STL and cross-toolchain one
+# Provide the hooks for locally building third party libs if needed
 echo
 pushd Build/BatchFiles/Linux > /dev/null
 ./BuildThirdParty.sh
@@ -268,5 +298,8 @@ MimeType=application/uproject;" > ~/.local/share/applications/UE4Editor.desktop
  fi
 fi

+# Add GDB scripts for common Unreal types.
+AddGDBPrettyPrinters
+
 echo "Setup successful."
 touch Build/OneTimeSetupPerformed
@@ -1,6 +1,6 @@
 {
 	"MajorVersion": 4,
-	"MinorVersion": 17,
+	"MinorVersion": 18,
 	"PatchVersion": 0,
 	"Changelist": 0,
 	"CompatibleChangelist": 0,
@@ -51,7 +51,7 @@
 		// it can be gzip compressed on disk like other assets. Compressing via UnrealPak has the advantage of storing a smaller data
 		// file to IndexedDB, whereas gzip compressing to disk has the advantage of starting up the page slightly faster.
 		// If true, serve out 'UE4Game.data.gz', if false, serve out 'UE4Game.data'.
-		const dataFileIsGzipCompressed = false;
+//		const dataFileIsGzipCompressed = false;

 		var Module = {
 			// state management
@@ -528,9 +528,8 @@ Module.locateFile = function(name) {
 		serveGzipped = false;
 	}

-	// Asset packages do not benefit from gzip compression because they are already compressed at UE4 packaging time,
-	// and uncompressing very large gzip files would just slow down startup times.
-	if (!dataFileIsGzipCompressed && name.split('.').slice(-1)[0] == 'data') serveGzipped = false;
+	// uncompressing very large gzip files may slow down startup times.
+//	if (!dataFileIsGzipCompressed && name.split('.').slice(-1)[0] == 'data') serveGzipped = false;

 	return serveGzipped ? (name + 'gz') : name;
 };
@@ -254,6 +254,10 @@
 			Engine/Build/BatchFiles/Linux/Setup.sh
 			Engine/Build/BatchFiles/Linux/UpdateDeps.sh
 			Engine/Build/BatchFiles/RunUAT.sh
+
+			<!-- Bundled libcxx -->
+			Engine/Source/ThirdParty/Linux/LibCxx/...
+
 		</Property>
 	</Do>

@@ -413,6 +417,7 @@

 		<!-- Additional Binaries -->
 		Engine/Binaries/Win64/XboxOne/XboxOnePackageNameUtil.exe
+    Engine/Binaries/Win64/XboxOne/XboxOnePDBFileUtil.exe
 	</Property>

 	<Property Name="CopyXboxOneExceptions">
@@ -117,4 +117,5 @@ Engine\Plugins\Runtime\WolfPlatMoviePlayer\Source\WolfPlatMoviePlayer\*
 Engine\Plugins\Runtime\WolfPlatMoviePlayer\Source\WolfPlatMoviePlayer\Public\*
 Engine\Plugins\Runtime\WolfPlatMoviePlayer\Source\WolfPlatMoviePlayer\Private\*
 Engine\Binaries\Win64\*-Subtitles.*
-Engine\Binaries\Win64\*-SubtitlesEditor.*
+Engine\Binaries\Win64\*-SubtitlesEditor.*
+Engine\Binaries\Win64\*-PackageDependencyInfo*.*
@@ -15,6 +15,7 @@
 	<Option Name="WithPS4" DefaultValue="false" Description="Compile for PS4"/>
 	<Option Name="WithXboxOne" DefaultValue="false" Description="Compile for Xbox One"/>
 	<Option Name="WithLinux" DefaultValue="false" Description="Compile for Linux"/>
+	<Option Name="WithLinux-x86" DefaultValue="false" Description="Compile for Linux x86"/>
 	<Option Name="WithLinux-ARM32" DefaultValue="false" Description="Compile for Linux ARM32"/>
 	<Option Name="WithLinux-ARM64" DefaultValue="false" Description="Compile for Linux ARM64"/>
 	<Option Name="WithMac" DefaultValue="false" Description="Compile for Mac"/>
@@ -58,6 +59,11 @@
 			<Command Name="BuildPhysX" Arguments="-TargetPlatforms=Linux -TargetConfigs=&quot;$(TargetConfigs)&quot; -TargetWindowsCompilers=&quot;$(TargetWindowsCompilers)&quot; $(OtherArgs)"/>
 		</Node>
 	</Agent>
+	<Agent Name="PhysX Linux x86" Type="EngineWin64;PhysX_CompileWin64;Win64">
+		<Node Name="Compile PhysX Linux x86">
+			<Command Name="BuildPhysX" Arguments="-TargetPlatforms=Linux-i686-unknown-linux-gnu -TargetConfigs=&quot;$(TargetConfigs)&quot; -TargetWindowsCompilers=&quot;$(TargetWindowsCompilers)&quot; $(OtherArgs)"/>
+		</Node>
+	</Agent>
 	<Agent Name="PhysX Linux ARM32" Type="EngineWin64;PhysX_CompileWin64;Win64">
 		<Node Name="Compile PhysX Linux ARM32">
 			<Command Name="BuildPhysX" Arguments="-TargetPlatforms=Linux-arm-unknown-linux-gnueabihf -TargetConfigs=&quot;$(TargetConfigs)&quot; -TargetWindowsCompilers=&quot;$(TargetWindowsCompilers)&quot; $(OtherArgs)"/>
@@ -93,17 +99,17 @@
 			<Command Name="BuildPhysX" Arguments="-TargetPlatforms=HTML5 -TargetConfigs=&quot;$(TargetConfigs)&quot; -TargetWindowsCompilers=&quot;$(TargetWindowsCompilers)&quot; $(OtherArgs)"/>
 		</Node>
 	</Agent>
-	<Agent Name="PhysX Mac" Type="EngineMac;PhysX_CompileMac">
+	<Agent Name="PhysX Mac" Type="EngineMac;PhysX_CompileMac;Mac">
 		<Node Name="Compile PhysX Mac">
 			<Command Name="BuildPhysX" Arguments="-TargetPlatforms=Mac -TargetConfigs=&quot;$(TargetConfigs)&quot; $(OtherArgs)"/>
 		</Node>
 	</Agent>
-	<Agent Name="PhysX IOS" Type="EngineMac;PhysX_CompileMac">
+	<Agent Name="PhysX IOS" Type="EngineMac;PhysX_CompileMac;Mac">
 		<Node Name="Compile PhysX IOS">
 			<Command Name="BuildPhysX" Arguments="-TargetPlatforms=IOS -TargetConfigs=&quot;$(TargetConfigs)&quot; $(OtherArgs)"/>
 		</Node>
 	</Agent>
-	<Agent Name="PhysX TVOS" Type="EngineMac;PhysX_CompileMac">
+	<Agent Name="PhysX TVOS" Type="EngineMac;PhysX_CompileMac;Mac">
 		<Node Name="Compile PhysX TVOS">
 			<Command Name="BuildPhysX" Arguments="-TargetPlatforms=TVOS -TargetConfigs=&quot;$(TargetConfigs)&quot; $(OtherArgs)"/>
 		</Node>
@@ -120,6 +126,7 @@
 	<Property Name="PhysXTargets" Value="$(PhysXTargets);Compile PhysX PS4" If="$(WithPS4)"/>
 	<Property Name="PhysXTargets" Value="$(PhysXTargets);Compile PhysX XboxOne" If="$(WithXboxOne)"/>
 	<Property Name="PhysXTargets" Value="$(PhysXTargets);Compile PhysX Linux" If="$(WithLinux)"/>
+	<Property Name="PhysXTargets" Value="$(PhysXTargets);Compile PhysX Linux x86" If="$(WithLinux-x86)"/>
 	<Property Name="PhysXTargets" Value="$(PhysXTargets);Compile PhysX Linux ARM32" If="$(WithLinux-ARM32)"/>
 	<Property Name="PhysXTargets" Value="$(PhysXTargets);Compile PhysX Linux ARM64" If="$(WithLinux-ARM64)"/>
 	<Property Name="PhysXTargets" Value="$(PhysXTargets);Compile PhysX Android Armv7" If="$(WithAndroid-ARMv7)"/>
@@ -134,12 +141,12 @@
 	
 	<Aggregate Name="Build PhysX" Requires="$(PhysXTargets)"/>
 	
-	<Property Name="AllEmailTargets" Value="chad.garyet@epicgames.com;ori.cohen@epicgames.com;aborovicka@nvidia.com;sschirm@nvidia.com;sabdulajees@nvidia.com"/>
+	<Property Name="AllEmailTargets" Value="chad.garyet@epicgames.com;ori.cohen@epicgames.com;aborovicka@nvidia.com;sschirm@nvidia.com;sabdulajees@nvidia.com;benn.gallagher@epicgames.com;tom.sarkanen@epicgames.com"/>
 	
 	<Notify Nodes="Compile PhysX Win32;Compile PhysX Win64" Users="$(AllEmailTargets)"/>
 	<Notify Nodes="Compile PhysX PS4" Users="$(AllEmailTargets);luke.thatcher@epicgames.com"/>
 	<Notify Nodes="Compile PhysX XboxOne" Users="$(AllEmailTargets);jeff.campeau@epicgames.com"/>
-	<Notify Nodes="Compile PhysX Linux;Compile PhysX Linux ARM32;Compile PhysX Linux ARM64" Users="$(AllEmailTargets);dmitry.rekman@epicgames.com"/>
+	<Notify Nodes="Compile PhysX Linux;Compile PhysX Linux x86;Compile PhysX Linux ARM32;Compile PhysX Linux ARM64" Users="$(AllEmailTargets);arciel.rekman@epicgames.com"/>
 	<Notify Nodes="Compile PhysX Android Armv7;Compile PhysX Android Arm64;Compile PhysX Android x86;Compile PhysX Android x64" Users="$(AllEmailTargets);chris.babcock@epicgames.com"/>
 	<Notify Nodes="Compile PhysX HTML5" Users="$(AllEmailTargets);nshin@phosphorgames.com"/>
 	<Notify Nodes="Compile PhysX Mac;Compile PhysX IOS;Compile PhysX TVOS" Users="$(AllEmailTargets);michael.trepka@epicgames.com"/>
@@ -7,7 +7,7 @@ AudioDeviceModuleName=AndroidAudio
 PlatformHeadroomDB=0

 [DeviceProfileManager]
-DeviceProfileSelectionModule="AndroidDeviceProfileSelector"
+DeviceProfileSelectionModule="AndroidDeviceProfileSelectorRuntime"

 [Advertising]
 DefaultProviderName=AndroidAdvertising
@@ -62,7 +62,6 @@
 +DeviceProfileNameAndTypes=Android_Mali_T8xx,Android
 +DeviceProfileNameAndTypes=Android_Mali_T8xx_No_Vulkan,Android

-
 [/Script/Engine.TextureLODSettings]
@TextureLODGroups=Group
 TextureLODGroups=(Group=TEXTUREGROUP_World,MinLODSize=1,MaxLODSize=4096,LODBias=0,MinMagFilter=aniso,MipFilter=point,MipGenSettings=TMGS_SimpleAverage)
@@ -452,8 +451,6 @@ BaseProfileName=
 [Mac DeviceProfile]
 DeviceType=Mac
 BaseProfileName=
-+CVars=r.AOScatterTileCulling=0
-+CVars=r.DFShadowScatterTileCulling=0
 +CVars=r.Shaders.ZeroInitialise=1
 +CVars=r.Shaders.BoundsChecking=1

@@ -37,12 +37,6 @@ bUpdateActorsInGridLevelsImmediately=False

 ; True if the memory/size data is displayed in the slate level browser
 bDisplayMemorySizeDataInLevelBrowser=False
-	
-; When enabled, the application frame rate, memory, Unreal object count, as well as a debug console will be displayed in the main editor UI
-bShowFrameRateAndMemory=False
-
-; Lowers CPU usage when the editor is in the background and not the active application
-bThrottleCPUWhenNotForeground=True

 ; True if we should automatically reimport animset assets when a change to source content is detected
 bAutoReimportAnimSets=False
@@ -227,6 +221,7 @@ StandaloneWindowHeight=720
 CenterStandaloneWindow=True
 ShowMouseControlLabel=True
 AutoRecompileBlueprints=True
+ShouldMinimizeEditorOnVRPIE=True
 ; True if Play In Editor should only load currently-visible levels in PIE
 bOnlyLoadVisibleLevelsInPIE=False
 LastExecutedPlayModeLocation=PlayLocation_DefaultPlayerStart
@@ -797,3 +792,19 @@ bLooping=true

 [/Script/MovieSceneTools.MovieSceneToolsProjectSettings]
 +FbxSettings=(FbxPropertyName="FocalLength", PropertyPath=(ComponentName="CameraComponent",PropertyName="CurrentFocalLength"))
+
+[/Script/SpeedTreeImporter.SpeedTreeImportData]
+TreeScale=30.48
+ImportGeometryType=IGT_3D
+LODType=ILT_PaintedFoliage
+IncludeCollision=false
+MakeMaterialsCheck=false
+IncludeNormalMapCheck=false
+IncludeDetailMapCheck=false
+IncludeSpecularMapCheck=false
+IncludeBranchSeamSmoothing=false
+IncludeSpeedTreeAO=false
+IncludeColorAdjustment=false
+IncludeVertexProcessingCheck=false
+IncludeWindCheck=false
+IncludeSmoothLODCheck=false
@@ -24,6 +24,10 @@ HttpConnectionTimeout=60
 HttpReceiveTimeout=30
 HttpSendTimeout=30

+[WebSockets.LibWebSockets]
+ThreadTargetFrameTimeInSeconds=0.0333
+ThreadMinimumSleepTimeInSeconds=0.0
+
 [Ping]
 StackSize=1048576

@@ -82,6 +86,8 @@ VertexColorViewModeMaterialName_GreenOnly=/Engine/EngineDebugMaterials/VertexCol
 VertexColorViewModeMaterialName_BlueOnly=/Engine/EngineDebugMaterials/VertexColorViewMode_BlueOnly.VertexColorViewMode_BlueOnly
 BoneWeightMaterialName=/Engine/EngineDebugMaterials/BoneWeightMaterial.BoneWeightMaterial
 ClothPaintMaterialName=/Engine/EngineDebugMaterials/ClothMaterial.ClothMaterial
+ClothPaintMaterialWireframeName=/Engine/EngineDebugMaterials/ClothMaterial_WF.ClothMaterial_WF
+DebugEditorMaterialName=/Engine/EngineDebugMaterials/DebugEditorMaterial.DebugEditorMaterial
 InvalidLightmapSettingsMaterialName=/Engine/EngineMaterials/M_InvalidLightmapSettings.M_InvalidLightmapSettings
 PreviewShadowsIndicatorMaterialName=/Engine/EditorMaterials/PreviewShadowIndicatorMaterial.PreviewShadowIndicatorMaterial 
 EditorBrushMaterialName=/Engine/EngineMaterials/EditorBrushMaterial.EditorBrushMaterial
@@ -205,7 +211,6 @@ bEnableOnScreenDebugMessages=true
 DurationOfErrorsAndWarningsOnHUD=0
 NearClipPlane=10.0
 bUseStreamingPause=false
-bSuppressWarningOnEmptyMorphTargetAnimation=false


 ; Matinee redirects (starts-with match and replace)
@@ -252,7 +257,6 @@ bSuppressWarningOnEmptyMorphTargetAnimation=false
 +ClassRedirects=(OldName="AnimNotify_PlayParticleEffect_C",NewName="/Script/Engine.AnimNotify_PlayParticleEffect",OverrideClassName="/Script/CoreUObject.Class")
 +ClassRedirects=(OldName="AnimNotify_PlaySound_C",NewName="/Script/Engine.AnimNotify_PlaySound",OverrideClassName="/Script/CoreUObject.Class")
 +ClassRedirects=(OldName="MovieSceneMaterialParameterSection",NewName="/Script/MovieSceneTracks.MovieSceneParameterSection")
-+ClassRedirects=(OldName="OculusFunctionLibrary", NewName="/Script/OculusLibrary.OculusFunctionLibrary")

 +PackageRedirects=(OldName="/Engine/EngineAnimNotifies/AnimNotify_PlayParticleEffect",Removed=True)
 +PackageRedirects=(OldName="/Engine/EngineAnimNotifies/AnimNotify_PlaySound",Removed=True)
@@ -370,6 +374,8 @@ bSuppressWarningOnEmptyMorphTargetAnimation=false
 +ClassRedirects=(OldName="SoundCueGraphNode_Base",NewName="/Script/AudioEditor.SoundCueGraphNode_Base")
 +ClassRedirects=(OldName="SoundCueGraphNode_Root",NewName="/Script/AudioEditor.SoundCueGraphNode_Root")
 +ClassRedirects=(OldName="SoundCueGraphSchema",NewName="/Script/AudioEditor.SoundCueGraphSchema")
+ClassRedirects=(OldName="OculusFunctionLibrary", NewName="/Script/OculusHMD.OculusFunctionLibrary")
+ClassRedirects=(OldName="OculusRiftBoundaryComponent", NewName="/Script/OculusHMD.OculusBoundaryComponent")

 +StructRedirects=(OldName="AnimationNode_TwoWayBlend",NewName="/Script/AnimGraphRuntime.AnimNode_TwoWayBlend")
 +StructRedirects=(OldName="AttenuationSettings",NewName="SoundAttenuationSettings")
@@ -422,6 +428,19 @@ bSuppressWarningOnEmptyMorphTargetAnimation=false
 ; 4.17

 +PropertyRedirects=(OldName="StaticMesh.bRequiresAreaWeightedSampling",NewName="StaticMesh.bSupportUniformlyDistributedSampling")
+PropertyRedirects=(OldName="FPostProcessSettings.BloomConvolutionPreFilter", NewName="FPostProcessSettings.BloomConvolutionPreFilter_DEPRECATED")
+PropertyRedirects=(OldName="FPostProcessSettings.bOverride_BloomConvolutionPreFilter", NewName="FPostProcessSettings.bOverride_BloomConvolutionPreFilter_DEPRECATED")
+
+;SpectatorScreen Refactoring Redirects
+ClassRedirects=(OldName="HeadMountedDisplayFunctionLibrary",NewName="/Script/HeadMountedDisplay.HeadMountedDisplayFunctionLibrary")
+EnumRedirects=(OldName="EWidgetClipping",ValueChanges=(("EWidgetClipping::No","EWidgetClipping::Inherit"),("EWidgetClipping::Yes","EWidgetClipping::ClipToBounds"),("EWidgetClipping::YesWithoutIntersecting","EWidgetClipping::ClipToBoundsWithoutIntersecting"),("EWidgetClipping::YesAlways","EWidgetClipping::ClipToBoundsAlways")) )
+EnumRedirects=(OldName="EOrientPositionSelector",NewName="/Script/HeadMountedDisplay.EOrientPositionSelector")
+EnumRedirects=(OldName="EHMDTrackingOrigin",NewName="/Script/HeadMountedDisplay.EHMDTrackingOrigin")
+EnumRedirects=(OldName="EHMDWornState",NewName="/Script/HeadMountedDisplay.EHMDWornState")
+EnumRedirects=(OldName="ESocialScreenModes",NewName="/Script/HeadMountedDisplay.ESpectatorScreenMode",ValueChanges=(("SystemMirror","ESpectatorScreenMode::SingleEyeCroppedToFill"),("SeparateTest","ESpectatorScreenMode::Undistorted"),("SeparateTexture","ESpectatorScreenMode::Texture"),("SeparateSoftwareMirror","ESpectatorScreenMode::Undistorted")) )
+FunctionRedirects=(OldName="SetSocialScreenMode",NewName="/Script/HeadMountedDisplay.HeadMountedDisplayFunctionLibrary.SetSpectatorScreenMode")
+FunctionRedirects=(OldName="SetSocialScreenTexture",NewName="/Script/HeadMountedDisplay.HeadMountedDisplayFunctionLibrary.SetSpectatorScreenTexture")
+PropertyRedirects=(OldName="Widget.ClipToBounds",NewName="Clipping")

 [CoreUObject.Metadata]
 ; Note: UnrealHeaderTool should be rerun after making changes to MetadataRedirects to catch any keys specified in class headers
@@ -554,6 +573,7 @@ gc.CreateGCClusters=True
 gc.MergeGCClusters=False
 gc.ActorClusteringEnabled=False
 gc.BlueprintClusteringEnabled=False
+gc.UseDisregardForGCOnDedicatedServers=False

 [Internationalization]
 +LocalizationPaths=../../../Engine/Content/Localization/Engine
@@ -1028,6 +1048,20 @@ FriendsFields=locale
 +FriendsFields=link
 +FriendsFields=gender

+[OnlineSubsystemTwitch]
+bEnabled=false
+ClientId=""
+
+[OnlineSubsystemTwitch.OnlineIdentityTwitch]
+LoginUrl="https://api.twitch.tv/kraken/oauth2/authorize"
+bForceVerify=true
+LoginRedirectUrl=""
+LoginDomains=".twitch.tv"
+TokenValidateUrl="https://api.twitch.tv/kraken"
+ScopeFields=user_read
+TokenRevokeUrl="https://api.twitch.tv/kraken/oauth2/revoke"
+bRevokeTokenOnLogout=true
+
 [OnlineSubsystemNull]
 bEnabled=true
 Achievement_0_Id=null-ach-0
@@ -1453,14 +1487,14 @@ bSupportsUpsideDownOrientation=False
 bSupportsLandscapeLeftOrientation=True
 bSupportsLandscapeRightOrientation=True
 bSupportsMetal=True
-bSupportsOpenGLES2=True
+bSupportsOpenGLES2=False
 bCookPVRTCTextures=True
 bCookASTCTextures=False
 bSupportsMetalMRT=False
-bDevForArmV7=True
+bDevForArmV7=False
 bDevForArm64=True
 bDevForArmV7S=False
-bShipForArmV7=True
+bShipForArmV7=False
 bShipForArm64=True
 bShipForArmV7S=False
 bTreatRemoteAsSeparateController=False
@@ -1590,7 +1624,7 @@ TargetArchitecture=X86_64UnknownLinuxGnu
 [HMDPluginPriority]
 ; Since SteamVR also works with the Oculus Rift, give priority to the native Oculus plugin before trying SteamVR
 ; Since OSVR also works with either Oculus Rift or SteamVR, give priority to either before OSVR
-OculusRift=20
+OculusHMD=20
 SteamVR=10
 OSVR=5

@@ -1734,6 +1768,7 @@ DefaultLensFStop=2.8

 [OnlineSubsystemMcp.OnlineChatMcp]
 +RestrictedPlatforms=PSN
+RestrictedPlatforms=XBL

 [/Script/TcpMessaging.TcpMessagingSettings]
 EnableTransport=True
@@ -73,6 +73,7 @@ DebugDisplay=AI
 InputYawScale=2.5
 InputPitchScale=-1.75
 InputRollScale=1.0
+ForceFeedbackScale=1.0

 [/Script/Engine.DebugCameraController]
 bShowSelectedInfo=true
@@ -81,6 +81,7 @@ r.Shadow.MaxCSMResolution=512
 r.Shadow.RadiusThreshold=0.06
 r.Shadow.DistanceScale=0.6
 r.Shadow.CSM.TransitionScale=0
+r.Shadow.PreShadowResolutionFactor=0.5
 r.DistanceFieldShadowing=0
 r.DistanceFieldAO=0
 r.VolumetricFog=0
@@ -95,6 +96,7 @@ r.Shadow.MaxCSMResolution=1024
 r.Shadow.RadiusThreshold=0.05
 r.Shadow.DistanceScale=0.7
 r.Shadow.CSM.TransitionScale=0.25
+r.Shadow.PreShadowResolutionFactor=0.5
 r.DistanceFieldShadowing=0
 r.DistanceFieldAO=0
 r.VolumetricFog=0
@@ -109,12 +111,14 @@ r.Shadow.MaxCSMResolution=2048
 r.Shadow.RadiusThreshold=0.04
 r.Shadow.DistanceScale=0.85
 r.Shadow.CSM.TransitionScale=0.8
+r.Shadow.PreShadowResolutionFactor=0.5
 r.DistanceFieldShadowing=1
 r.DistanceFieldAO=1
 r.VolumetricFog=1
 r.VolumetricFog.GridPixelSize=16
 r.VolumetricFog.GridSizeZ=64
 r.VolumetricFog.HistoryMissSupersampleCount=4
+r.LightMaxDrawDistanceScale=1

 [ShadowQuality@3]
 r.LightFunctionQuality=1
@@ -125,12 +129,14 @@ r.Shadow.MaxCSMResolution=2048
 r.Shadow.RadiusThreshold=0.03
 r.Shadow.DistanceScale=1.0
 r.Shadow.CSM.TransitionScale=1.0
+r.Shadow.PreShadowResolutionFactor=1.0
 r.DistanceFieldShadowing=1
 r.DistanceFieldAO=1
 r.VolumetricFog=1
 r.VolumetricFog.GridPixelSize=8
 r.VolumetricFog.GridSizeZ=128
 r.VolumetricFog.HistoryMissSupersampleCount=4
+r.LightMaxDrawDistanceScale=1

 [ShadowQuality@Cine]
 r.LightFunctionQuality=1
@@ -141,12 +147,14 @@ r.Shadow.MaxCSMResolution=4096
 r.Shadow.RadiusThreshold=0.03
 r.Shadow.DistanceScale=1.0
 r.Shadow.CSM.TransitionScale=1.0
+r.Shadow.PreShadowResolutionFactor=1.0
 r.DistanceFieldShadowing=1
 r.DistanceFieldAO=1
 r.VolumetricFog=1
 r.VolumetricFog.GridPixelSize=4
 r.VolumetricFog.GridSizeZ=128
 r.VolumetricFog.HistoryMissSupersampleCount=16
+r.LightMaxDrawDistanceScale=1

 ;-----------------------------------------------------------------------------------------------------------------

--- a/Show More
+++ b/Show More