Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA

# Conflicts: # Content/Level/Environment.umap # Content/Level/Index.umap # Content/Level/People.umap # Content/PeopleSplineWalk/PeopleMove.uasset
2019-12-03 15:38:59 +05:00
parent 2ed7548725 9afd5c60fe
commit c88f52dc2f
146 changed files with 1 additions and 3 deletions
@@ -9,7 +9,6 @@ r.DefaultFeature.LensFlare=True
 r.Shadow.UnbuiltPreviewInGame=False
 r.SeparateTranslucency=False
 r.TranslucentSortPolicy=0
-vr.RoundRobinOcclusion=True

 [/Script/HardwareTargeting.HardwareTargetingSettings]
 TargetedHardwareClass=Desktop
@@ -29,11 +28,10 @@ NearClipPlane=1.000000
 bSmoothFrameRate=False

 [/Script/EngineSettings.GameMapsSettings]
-EditorStartupMap=/Game/Level/test.test
+EditorStartupMap=/Game/Level/Index.Index
 GameDefaultMap=/Game/Level/Index.Index
 GlobalDefaultGameMode=/Game/Blueprints/Player/MyGM.MyGM_C
 GameInstanceClass=/Game/Blueprints/Player/GI.GI_C
-bUseSplitscreen=False

 [/Script/NavigationSystem.RecastNavMesh]
 AgentRadius=15.000000
--- a/Show More
+++ b/Show More