Merge branch 'stagging' into android-hack

UnrealEngine/Config/DefaultEngine.ini

@@ -1,15 +1,25 @@
 
 
 [/Script/EngineSettings.GameMapsSettings]
+EditorStartupMap=/Game/Levels/StartupLevel.StartupLevel
+LocalMapOptions=
+TransitionMap=None
+bUseSplitscreen=False
+TwoPlayerSplitscreenLayout=Horizontal
+ThreePlayerSplitscreenLayout=FavorTop
+FourPlayerSplitscreenLayout=Grid
+bOffsetPlayerGamepadIds=False
+GameInstanceClass=/Script/Engine.GameInstance
 GameDefaultMap=/Game/Levels/StartupLevel.StartupLevel
+ServerDefaultMap=/Engine/Maps/Entry.Entry
 GlobalDefaultGameMode=/Game/Blueprints/BP_JSBSimGameMode.BP_JSBSimGameMode_C
-EditorStartupMap=/Game/Levels/StartupLevel.StartupLevel
+GlobalDefaultServerGameMode=None
 
 [/Script/HardwareTargeting.HardwareTargetingSettings]
-TargetedHardwareClass=Desktop
-AppliedTargetedHardwareClass=Desktop
-DefaultGraphicsPerformance=Maximum
-AppliedDefaultGraphicsPerformance=Maximum
+TargetedHardwareClass=Mobile
+AppliedTargetedHardwareClass=Mobile
+DefaultGraphicsPerformance=Scalable
+AppliedDefaultGraphicsPerformance=Scalable
 
 [/Script/Engine.Engine]
 +ActiveGameNameRedirects=(OldGameName="TP_Blank",NewGameName="/Script/JSBSimIntegration")
@@ -21,22 +31,135 @@ TinyFontName=None
 SmallFontName=None
 
 [/Script/Engine.RendererSettings]
-r.SupportSkyAtmosphereAffectsHeightFog=True
-r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True
+r.Mobile.DisableVertexFog=False
+r.Shadow.CSM.MaxMobileCascades=2
+r.Mobile.AntiAliasing=1
+r.Mobile.FloatPrecisionMode=0
+r.Mobile.AllowDitheredLODTransition=False
+r.Mobile.VirtualTextures=False
+r.Mobile.ReflectionCaptureCompression=False
+r.DiscardUnusedQuality=False
+r.Shaders.CompressionFormat=2
+r.AllowOcclusionQueries=True
+r.MinScreenRadiusForLights=0.030000
+r.MinScreenRadiusForDepthPrepass=0.030000
+r.MinScreenRadiusForCSMDepth=0.010000
+r.PrecomputedVisibilityWarning=False
+r.TextureStreaming=True
+Compat.UseDXT5NormalMaps=False
+r.VirtualTextures=False
+r.VT.EnableAutoImport=True
+r.VirtualTexturedLightmaps=False
+r.VT.AnisotropicFiltering=False
+r.VT.TileSize=128
+r.VT.TileBorderSize=4
+r.vt.FeedbackFactor=16
+WorkingColorSpaceChoice=sRGB
+RedChromaticityCoordinate=(X=0.640000,Y=0.330000)
+GreenChromaticityCoordinate=(X=0.300000,Y=0.600000)
+BlueChromaticityCoordinate=(X=0.150000,Y=0.060000)
+WhiteChromaticityCoordinate=(X=0.312700,Y=0.329000)
+r.ClearCoatNormal=False
+r.DynamicGlobalIlluminationMethod=0
+r.ReflectionMethod=2
+r.ReflectionCaptureResolution=128
+r.ReflectionEnvironmentLightmapMixBasedOnRoughness=True
+r.Lumen.HardwareRayTracing=False
+r.Lumen.HardwareRayTracing.LightingMode=0
+r.Lumen.TraceMeshSDFs=1
+r.Shadow.Virtual.Enable=1
+r.RayTracing=False
+r.RayTracing.Shadows=False
+r.RayTracing.Skylight=False
+r.RayTracing.UseTextureLod=False
+r.PathTracing=True
+r.GenerateMeshDistanceFields=False
+r.DistanceFields.DefaultVoxelDensity=0.200000
+r.AllowStaticLighting=False
+r.NormalMapsForStaticLighting=False
+r.ForwardShading=False
+r.VertexFoggingForOpaque=True
+r.SeparateTranslucency=False
+r.TranslucentSortPolicy=0
+TranslucentSortAxis=(X=0.000000,Y=-1.000000,Z=0.000000)
+vr.VRS.HMDFixedFoveationLevel=0
+vr.VRS.HMDFixedFoveationDynamic=False
+r.CustomDepth=3
+r.CustomDepthTemporalAAJitter=True
+r.PostProcessing.PropagateAlpha=0
+r.DefaultFeature.Bloom=False
+r.DefaultFeature.AmbientOcclusion=False
+r.DefaultFeature.AmbientOcclusionStaticFraction=True
+r.DefaultFeature.AutoExposure=False
+r.DefaultFeature.AutoExposure.Method=0
 r.DefaultFeature.AutoExposure.Bias=0.000000
-r.UsePreExposure=True
-r.DefaultFeature.MotionBlur=True
+r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True
+r.DefaultFeature.MotionBlur=False
 r.DefaultFeature.LensFlare=False
 r.TemporalAA.Upsampling=False
-r.DefaultFeature.AntiAliasing=2
-r.DefaultFeature.AutoExposure=True
-r.EyeAdaptation.EditorOnly=False
-r.DefaultFeature.AutoExposure.Method=0
-r.AntiAliasingMethod=4
-r.Shadow.Virtual.Enable=1
-r.CustomDepth=3
-r.AllowStaticLighting=False
-r.Vsync=1
+r.AntiAliasingMethod=0
+r.MSAACount=4
+r.DefaultFeature.LightUnits=1
+r.DefaultBackBufferPixelFormat=4
+r.Shadow.UnbuiltPreviewInGame=True
+r.StencilForLODDither=False
+r.EarlyZPass=3
+r.EarlyZPassOnlyMaterialMasking=False
+r.Shadow.CSMCaching=False
+r.DBuffer=True
+r.ClearSceneMethod=1
+r.VelocityOutputPass=0
+r.Velocity.EnableVertexDeformation=2
+r.SelectiveBasePassOutputs=False
+bDefaultParticleCutouts=False
+fx.GPUSimulationTextureSizeX=1024
+fx.GPUSimulationTextureSizeY=1024
+r.AllowGlobalClipPlane=False
+r.GBufferFormat=1
+r.MorphTarget.Mode=True
+r.GPUCrashDebugging=False
+vr.InstancedStereo=False
+r.MobileHDR=True
+vr.MobileMultiView=False
+r.Mobile.UseHWsRGBEncoding=False
+vr.RoundRobinOcclusion=False
+vr.ODSCapture=False
+r.MeshStreaming=False
+r.WireframeCullThreshold=5.000000
+r.SupportStationarySkylight=True
+r.SupportLowQualityLightmaps=True
+r.SupportPointLightWholeSceneShadows=True
+r.SupportSkyAtmosphere=True
+r.SupportSkyAtmosphereAffectsHeightFog=True
+r.SupportCloudShadowOnForwardLitTranslucent=False
+r.Material.RoughDiffuse=False
+r.Material.EnergyConservation=False
+r.SkinCache.CompileShaders=False
+r.SkinCache.DefaultBehavior=1
+r.SkinCache.SceneMemoryLimitInMB=128.000000
+r.Mobile.EnableStaticAndCSMShadowReceivers=True
+r.Mobile.EnableMovableLightCSMShaderCulling=True
+r.Mobile.EnableNoPrecomputedLightingCSMShader=False
+r.Mobile.AllowDistanceFieldShadows=True
+r.Mobile.AllowMovableDirectionalLights=True
+r.MobileNumDynamicPointLights=4
+r.Mobile.EnableMovableSpotlights=False
+r.Mobile.EnableMovableSpotlightsShadow=False
+r.GPUSkin.Support16BitBoneIndex=False
+r.GPUSkin.Limit2BoneInfluences=False
+r.SupportDepthOnlyIndexBuffers=True
+r.SupportReversedIndexBuffers=True
+r.Mobile.AmbientOcclusion=False
+r.GPUSkin.UnlimitedBoneInfluences=False
+r.GPUSkin.UnlimitedBoneInfluencesThreshold=8
+MaxSkinBones=(Default=65536,PerPlatform=(("Mobile", 256)))
+r.Mobile.PlanarReflectionMode=0
+r.Mobile.SupportsGen4TAA=True
+bStreamSkeletalMeshLODs=(Default=False,PerPlatform=())
+bDiscardSkeletalMeshOptionalLODs=(Default=False,PerPlatform=())
+VisualizeCalibrationColorMaterialPath=/Engine/EngineMaterials/PPM_DefaultCalibrationColor.PPM_DefaultCalibrationColor
+VisualizeCalibrationCustomMaterialPath=None
+VisualizeCalibrationGrayscaleMaterialPath=/Engine/EngineMaterials/PPM_DefaultCalibrationGrayscale.PPM_DefaultCalibrationGrayscale
 
 [/Script/Engine.CollisionProfile]
 -Profiles=(Name="NoCollision",CollisionEnabled=NoCollision,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="No collision",bCanModify=False)
@@ -107,4 +230,12 @@ bLogFiles=False
 bReportStats=False
 ConnectionType=USBOnly
 bUseManualIPAddress=False
-ManualIPAddress=
+ManualIPAddress=
+
+[/Script/Slate.SlateSettings]
+bExplicitCanvasChildZOrder=True
+
+[/Script/AndroidRuntimeSettings.AndroidRuntimeSettings]
+PackageName=com.epic.jsbsim
+bPackageDataInsideApk=True
+

UnrealEngine/Config/DefaultInput.ini

@@ -110,6 +110,10 @@ bEnableMouseSmoothing=True
 bEnableFOVScaling=True
 bCaptureMouseOnLaunch=True
 bEnableLegacyInputScales=True
+bEnableMotionControls=True
+bFilterInputByPlatformUser=False
+bShouldFlushPressedKeysOnViewportFocusLost=True
+bEnableDynamicComponentInputBinding=True
 bAlwaysShowTouchInterface=False
 bShowConsoleOnFourFingerTap=True
 bEnableGestureRecognizer=False
@@ -174,11 +178,12 @@ DoubleClickTime=0.200000
 +AxisMappings=(AxisName="ThrottleIncrease",Scale=-1.000000,Key=Gamepad_FaceButton_Bottom)
 +AxisMappings=(AxisName="Flaps Increase",Scale=-1.000000,Key=Gamepad_LeftShoulder)
 +AxisMappings=(AxisName="Flaps Axis",Scale=1.000000,Key=None)
-DefaultPlayerInputClass=/Script/Engine.PlayerInput
-DefaultInputComponentClass=/Script/Engine.InputComponent
+DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput
+DefaultInputComponentClass=/Script/EnhancedInput.EnhancedInputComponent
 DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks
 -ConsoleKeys=Tilde
 +ConsoleKeys=Tilde
++ConsoleKeys=²
 
 [/Script/RawInput.RawInputSettings]
 +DeviceConfigurations=(VendorID="294B",ProductID="1900",AxisProperties=((Key=GenericUSBController_Axis1,bInverted=True,Offset=0.500000),(Key=GenericUSBController_Axis2,Offset=-0.500000)),ButtonProperties=((Key=GenericUSBController_Button1),(Key=GenericUSBController_Button2),(Key=GenericUSBController_Button3),(Key=GenericUSBController_Button4),(Key=GenericUSBController_Button5),(Key=GenericUSBController_Button6),(Key=GenericUSBController_Button7),(Key=GenericUSBController_Button8),(Key=GenericUSBController_Button9),(Key=GenericUSBController_Button10),(Key=GenericUSBController_Button11),(Key=GenericUSBController_Button12),(Key=GenericUSBController_Button13),(Key=GenericUSBController_Button14),(Key=GenericUSBController_Button15),(Key=GenericUSBController_Button16),(Key=GenericUSBController_Button17),(Key=GenericUSBController_Button18),(Key=GenericUSBController_Button19),(Key=GenericUSBController_Button20)))

UnrealEngine/UEReferenceApp.uproject

@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "5.0",
+	"EngineAssociation": "5.1",
 	"Category": "",
 	"Description": "",
 	"Modules": [
@@ -44,6 +44,7 @@
 	"TargetPlatforms": [
 		"Windows",
 		"Linux",
-		"Mac"
+		"Mac",
+		"Android"
 	]
 }