Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Vincent Sergent 2020-08-05 15:21:35 +02:00
commit c19fc9161a
29 changed files with 41 additions and 4 deletions

View file

@ -1,5 +1,3 @@
[/Script/HardwareTargeting.HardwareTargetingSettings] [/Script/HardwareTargeting.HardwareTargetingSettings]
TargetedHardwareClass=Desktop TargetedHardwareClass=Desktop
AppliedTargetedHardwareClass=Desktop AppliedTargetedHardwareClass=Desktop
@ -7,7 +5,7 @@ DefaultGraphicsPerformance=Maximum
AppliedDefaultGraphicsPerformance=Maximum AppliedDefaultGraphicsPerformance=Maximum
[/Script/EngineSettings.GameMapsSettings] [/Script/EngineSettings.GameMapsSettings]
EditorStartupMap=/Game/0_Project/Maps/TestTile.TestTile EditorStartupMap=/Game/0_Project/Maps/MainMap.MainMap
LocalMapOptions= LocalMapOptions=
TransitionMap=None TransitionMap=None
bUseSplitscreen=True bUseSplitscreen=True
@ -16,7 +14,7 @@ ThreePlayerSplitscreenLayout=FavorTop
FourPlayerSplitscreenLayout=Grid FourPlayerSplitscreenLayout=Grid
bOffsetPlayerGamepadIds=False bOffsetPlayerGamepadIds=False
GameInstanceClass=/Game/0_Project/Core/Engine/MyGameInstance.MyGameInstance_C GameInstanceClass=/Game/0_Project/Core/Engine/MyGameInstance.MyGameInstance_C
GameDefaultMap=/Game/0_Project/Maps/TestTile.TestTile GameDefaultMap=/Game/0_Project/Maps/MainMap.MainMap
ServerDefaultMap=/Engine/Maps/Entry.Entry ServerDefaultMap=/Engine/Maps/Entry.Entry
GlobalDefaultGameMode=/Game/0_Project/Core/Engine/My_GameMode.My_GameMode_C GlobalDefaultGameMode=/Game/0_Project/Core/Engine/My_GameMode.My_GameMode_C
GlobalDefaultServerGameMode=None GlobalDefaultServerGameMode=None
@ -30,3 +28,42 @@ r.DefaultFeature.MotionBlur=False
r.DefaultFeature.AntiAliasing=2 r.DefaultFeature.AntiAliasing=2
r.DefaultFeature.AutoExposure=False r.DefaultFeature.AutoExposure=False
[/Script/NavigationSystem.RecastNavMesh]
bDoFullyAsyncNavDataGathering=False
RuntimeGeneration=Dynamic
DrawOffset=1.000000
bFixedTilePoolSize=False
bSortNavigationAreasByCost=False
CellSize=5.000000
CellHeight=2.000000
AgentRadius=10.000000
AgentHeight=12.000000
bForceRebuildOnLoad=True
bAutoDestroyWhenNoNavigation=False
ObservedPathsTickInterval=0.100000
TilePoolSize=2048
AgentMaxSlope=14.841908
AgentMaxStepHeight=5.000000
MinRegionArea=9.000000
MergeRegionSize=50.000000
bDrawPolyEdges=True
MaxSimplificationError=1.500000
TileSizeUU=300.000000
[/Script/NavigationSystem.NavigationSystemV1]
DefaultAgentName=None
CrowdManagerClass=/Script/AIModule.CrowdManager
bAutoCreateNavigationData=True
bSpawnNavDataInNavBoundsLevel=True
bAllowClientSideNavigation=False
bShouldDiscardSubLevelNavData=True
bTickWhilePaused=True
bInitialBuildingLocked=False
bSkipAgentHeightCheckWhenPickingNavData=False
DataGatheringMode=Instant
bGenerateNavigationOnlyAroundNavigationInvokers=False
ActiveTilesUpdateInterval=1.000000
+SupportedAgents=(Name="Default",Color=(B=255,G=251,R=181,A=164),DefaultQueryExtent=(X=50.000000,Y=50.000000,Z=250.000000),NavDataClass=/Script/NavigationSystem.RecastNavMesh,AgentRadius=10.000000,AgentHeight=12.000000,AgentStepHeight=-1.000000,NavWalkingSearchHeightScale=0.500000,PreferredNavData=None,bCanCrouch=False,bCanJump=False,bCanWalk=True,bCanSwim=False,bCanFly=False)
SupportedAgentsMask=(bSupportsAgent0=True,bSupportsAgent1=True,bSupportsAgent2=True,bSupportsAgent3=True,bSupportsAgent4=True,bSupportsAgent5=True,bSupportsAgent6=True,bSupportsAgent7=True,bSupportsAgent8=True,bSupportsAgent9=True,bSupportsAgent10=True,bSupportsAgent11=True,bSupportsAgent12=True,bSupportsAgent13=True,bSupportsAgent14=True,bSupportsAgent15=True)
DirtyAreasUpdateFreq=0.100000

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.