Merge branch 'master' of http://192.168.1.163:3000/AndreyCrusader/RailWorker

# Conflicts: # Content/test/Meshes/RailwayCarriageBox/SM_RailwayCarriage_SM_RailwayCarriage.uasset
2020-01-24 19:39:14 +05:00
parent 0be1f05f55 cfda312aa1
commit 3b8946ad82
58 changed files with 23 additions and 0 deletions
@@ -1,2 +1,25 @@

+[/Script/UMGEditor.UMGEditorProjectSettings]
+DefaultCompilerOptions=(bCookSlowConstructionWidgetTree=True,bWidgetSupportsDynamicCreation=True,bAllowBlueprintTick=True,bAllowBlueprintPaint=True,PropertyBindingRule=Allow,Rules=)
+bShowWidgetsFromEngineContent=False
+bShowWidgetsFromDeveloperContent=True
+bUseWidgetTemplateSelector=False
+DefaultRootWidget=Class'/Script/UMG.CanvasPanel'
+DebugResolutions=(Width=3840,Height=2160,Description="",Color=(R=0.745404,G=0.904661,B=1.000000,A=1.000000))
+DebugResolutions=(Width=3440,Height=1440,Description="",Color=(R=0.439657,G=0.783538,B=0.982251,A=1.000000))
+DebugResolutions=(Width=2560,Height=1440,Description="",Color=(R=0.208637,G=0.644480,B=0.973445,A=1.000000))
+DebugResolutions=(Width=1440,Height=2560,Description="",Color=(R=0.215861,G=0.651406,B=0.973445,A=1.000000))
+DebugResolutions=(Width=2560,Height=1080,Description="",Color=(R=0.064803,G=0.539479,B=0.955973,A=1.000000))
+DebugResolutions=(Width=2048,Height=1536,Description="",Color=(R=0.009134,G=0.462077,B=0.947307,A=1.000000))
+DebugResolutions=(Width=1536,Height=2048,Description="",Color=(R=0.009134,G=0.462077,B=0.947307,A=1.000000))
+DebugResolutions=(Width=1920,Height=1080,Description="",Color=(R=0.000000,G=0.386429,B=0.930111,A=1.000000))
+DebugResolutions=(Width=1080,Height=1920,Description="",Color=(R=0.000000,G=0.386429,B=0.930111,A=1.000000))
+DebugResolutions=(Width=1280,Height=720,Description="",Color=(R=0.000000,G=0.318547,B=0.806952,A=1.000000))
+DebugResolutions=(Width=720,Height=1280,Description="",Color=(R=0.000000,G=0.318547,B=0.806952,A=1.000000))
+DebugResolutions=(Width=1136,Height=640,Description="",Color=(R=0.000000,G=0.238398,B=0.658375,A=1.000000))
+DebugResolutions=(Width=640,Height=1136,Description="",Color=(R=0.000000,G=0.238398,B=0.658375,A=1.000000))
+DebugResolutions=(Width=3240,Height=1920,Description="",Color=(R=0.004570,G=0.231187,B=0.473958,A=1.000000))
+DebugResolutions=(Width=2576,Height=2476,Description="",Color=(R=0.473958,G=0.086312,B=0.387049,A=1.000000))
+Version=1
+