Merge remote-tracking branch 'origin/developer' into modellers
This commit is contained in:
Vladimir
@@ -79,12 +79,12 @@ FOVScale=0.011110
|
||||
DoubleClickTime=0.200000
|
||||
+ActionMappings=(ActionName="ClickLeftMouse",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton)
|
||||
+AxisMappings=(AxisName="MouseX",Scale=1.000000,Key=MouseX)
|
||||
+AxisMappings=(AxisName="MouseY",Scale=-1.000000,Key=MouseY)
|
||||
+AxisMappings=(AxisName="MouseY",Scale=1.000000,Key=MouseY)
|
||||
+AxisMappings=(AxisName="MouseScroll",Scale=15.000000,Key=MouseWheelAxis)
|
||||
DefaultPlayerInputClass=/Script/Engine.PlayerInput
|
||||
DefaultInputComponentClass=/Script/Engine.InputComponent
|
||||
DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks
|
||||
-ConsoleKeys=Tilde
|
||||
+ConsoleKeys=Tilde
|
||||
+ConsoleKeys=ё
|
||||
+ConsoleKeys=None
|
||||
|
||||
|
||||
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.
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 62 KiB |
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.
File diff suppressed because one or more lines are too long
@@ -967,9 +967,15 @@ SequencerWidgets.LastCompileMethod=Unknown
|
||||
|
||||
[AssetEditorSubsystem]
|
||||
CleanShutdown=True
|
||||
OpenAssetsAtExit=/Game/materials/ship/testMaterials/NewMaterial.NewMaterial
|
||||
OpenAssetsAtExit=/Game/materials/ship/testMaterials/NewMaterial_Inst.NewMaterial_Inst
|
||||
OpenAssetsAtExit=/Game/blueprints/ship/BP_Ship.BP_Ship
|
||||
OpenAssetsAtExit=/Game/ui/mainMenu/mainMenu.mainMenu
|
||||
OpenAssetsAtExit=/Game/meshes/ship/SM_Ship_Ship.SM_Ship_Ship
|
||||
OpenAssetsAtExit=/Game/materials/ship/instances/body_paint_Cleen_outline_Inst.body_paint_Cleen_outline_Inst
|
||||
|
||||
[RootWindow]
|
||||
ScreenPosition=X=640.000 Y=340.000
|
||||
ScreenPosition=X=-1920.000 Y=340.000
|
||||
WindowSize=X=1280.000 Y=720.000
|
||||
InitiallyMaximized=True
|
||||
|
||||
@@ -998,7 +1004,7 @@ ContentBrowserTab1.ActiveTypeFilters=World
|
||||
ContentBrowserTab1.EnabledTypeFilters=
|
||||
ContentBrowserTab1.ActiveFrontendFilters=
|
||||
ContentBrowserTab1.EnabledFrontendFilters=
|
||||
ContentBrowserTab1.SelectedPaths=/Game/Content/outline
|
||||
ContentBrowserTab1.SelectedPaths=/Game/materials/ship/testMaterials
|
||||
ContentBrowserTab1.Favorites.SelectedPaths=
|
||||
FavoritePaths=
|
||||
ContentBrowserTab1.CollectionsExpanded=True
|
||||
@@ -1030,33 +1036,35 @@ Project=D:/UE4/UE_4.26/
|
||||
|
||||
[MRU]
|
||||
MRUItem0=/Game/maps/ship
|
||||
MRUItem1=/Game/Content/outline/Untitled
|
||||
MRUItem2=/Game/Content/three/Untitled
|
||||
MRUItem3=/Game/Content/second/Untitled
|
||||
MRUItem4=/Game/maps/NewMap
|
||||
MRUItem5=/Game/maps/black
|
||||
MRUItem1=/Game/Content/first/Untitled
|
||||
MRUItem2=/Game/Content/for/Untitled
|
||||
MRUItem3=/Game/Content/outline/Untitled
|
||||
MRUItem4=/Game/Content/three/Untitled
|
||||
MRUItem5=/Game/Content/second/Untitled
|
||||
MRUItem6=/Game/maps/NewMap
|
||||
MRUItem7=/Game/maps/black
|
||||
|
||||
[ContentBrowserRecent]
|
||||
MRUItem0=/Game/Content/outline/body_paint_Cleen1_Inst
|
||||
MRUItem1=/Game/Content/outline/stripes
|
||||
MRUItem2=/Game/meshes/ship/SM_Ship_Radar
|
||||
MRUItem3=/Game/Content/outline/body_paint_Cleen1
|
||||
MRUItem4=/Engine/EditorMaterials/WidgetGridVertexColorMaterial
|
||||
MRUItem5=/Engine/EditorMaterials/T_1x1_Grid
|
||||
MRUItem6=/Game/Content/outline/body_paint_Cleen_Inst
|
||||
MRUItem7=/Game/Content/outline/m_outline_Inst
|
||||
MRUItem8=/Game/Content/outline/body_paint_Cleen
|
||||
MRUItem9=/Game/materials/ship/body_paint_Cleen
|
||||
MRUItem10=/Game/Content/outline/m_outline_grid_Inst
|
||||
MRUItem11=/Game/Content/outline/m_outline_grid
|
||||
MRUItem12=/Game/Content/outline/m_outline
|
||||
MRUItem13=/Game/maps/ship
|
||||
MRUItem14=/Game/Content/outline/GlowEnhanced_Inst
|
||||
MRUItem15=/Game/Content/outline/GlowEnhanced
|
||||
MRUItem16=/Game/Content/outline/Untitled
|
||||
MRUItem17=/Game/blueprints/playerController/BP_playerController
|
||||
MRUItem18=/Game/Content/three/iviser
|
||||
MRUItem19=/Game/Content/three/invisible
|
||||
MRUItem0=/Game/materials/ship/instances/body_paint_Cleen_outline_Inst
|
||||
MRUItem1=/Game/meshes/ship/SM_Ship_Ship
|
||||
MRUItem2=/Game/ui/mainMenu/mainMenu
|
||||
MRUItem3=/Game/blueprints/ship/BP_Ship
|
||||
MRUItem4=/Game/materials/ship/body_paint
|
||||
MRUItem5=/Game/materials/ship/testMaterials/NewMaterial_Inst
|
||||
MRUItem6=/Game/materials/ship/testMaterials/NewMaterial
|
||||
MRUItem7=/Game/maps/ship
|
||||
MRUItem8=/Game/materials/ship/red
|
||||
MRUItem9=/Game/materials/ship/ShipTextures/Metall_BC
|
||||
MRUItem10=/Game/materials/ship/ShipTextures/Metall_N
|
||||
MRUItem11=/Game/materials/ship/ShipTextures/Metall_R
|
||||
MRUItem12=/Game/materials/ship/ShipTextures/tkwmea1o_4K_Roughness1
|
||||
MRUItem13=/Game/materials/ship/ShipTextures/rluijcp_4K_Albedo2
|
||||
MRUItem14=/Game/materials/ship/ShipTextures/schcbgfp_4K_Roughness
|
||||
MRUItem15=/Game/materials/ship/ShipTextures/tkwmea1o_8K_Normal
|
||||
MRUItem16=/Game/materials/ship/testMaterials/body_paint
|
||||
MRUItem17=/Game/materials/ship/materialFunctions/slicer
|
||||
MRUItem18=/Game/materials/ship/instances/body_paint_Inst
|
||||
MRUItem19=/Game/materials/slicer/3Dprinter_2_Inst
|
||||
|
||||
[DetailCategories]
|
||||
NewBlueprint_C.Tick=True
|
||||
@@ -1734,16 +1742,16 @@ SpringArmComponent.CameraCollision=True
|
||||
SpringArmComponent.CameraSettings=True
|
||||
SpringArmComponent.ComponentTick=True
|
||||
SpringArmComponent.Lag=True
|
||||
SpringArmComponent.Rendering=True
|
||||
SpringArmComponent.Tags=True
|
||||
SpringArmComponent.ComponentReplication=True
|
||||
SpringArmComponent.Activation=True
|
||||
SpringArmComponent.Cooking=True
|
||||
SpringArmComponent.Events=True
|
||||
SpringArmComponent.Physics=True
|
||||
SpringArmComponent.AssetUserData=True
|
||||
SpringArmComponent.Rendering=False
|
||||
SpringArmComponent.Tags=False
|
||||
SpringArmComponent.ComponentReplication=False
|
||||
SpringArmComponent.Activation=False
|
||||
SpringArmComponent.Cooking=False
|
||||
SpringArmComponent.Events=False
|
||||
SpringArmComponent.Physics=False
|
||||
SpringArmComponent.AssetUserData=False
|
||||
SpringArmComponent.Collision=False
|
||||
SpringArmComponent.LOD=True
|
||||
SpringArmComponent.LOD=False
|
||||
GameplayTagsSettings.Advanced Gameplay Tags=True
|
||||
AssetManagerSettings.Asset Registry=True
|
||||
Engine.LevelStreaming=True
|
||||
@@ -1787,6 +1795,60 @@ MaterialExpressionComponentMask.MaterialExpressionComponentMask=True
|
||||
MaterialExpressionComponentMask.MaterialExpression=True
|
||||
MaterialExpressionWorldPosition.UMaterialExpressionWorldPosition=True
|
||||
MaterialExpressionWorldPosition.MaterialExpression=True
|
||||
MaterialExpressionAdd.MaterialExpressionAdd=True
|
||||
MaterialExpressionAdd.MaterialExpression=True
|
||||
MaterialExpressionTime.MaterialExpressionTime=True
|
||||
MaterialExpressionTime.MaterialExpression=True
|
||||
MaterialExpressionSine.MaterialExpressionSine=True
|
||||
MaterialExpressionSine.MaterialExpression=True
|
||||
MaterialExpressionSphereMask.MaterialExpressionSphereMask=True
|
||||
MaterialExpressionSphereMask.MaterialExpression=True
|
||||
MaterialExpressionAppendVector.MaterialExpression=True
|
||||
MaterialExpressionOneMinus.MaterialExpression=True
|
||||
K2Node_CallFunction.Inputs=True
|
||||
K2Node_CallFunction.Outputs=True
|
||||
man_C.Tick=True
|
||||
man_C.Replication=True
|
||||
man_C.Rendering=True
|
||||
man_C.Collision=True
|
||||
man_C.Actor=True
|
||||
man_C.Input=True
|
||||
man_C.TransformCommon=True
|
||||
MaterialParameterCollection.Material=True
|
||||
NewBlueprint_C.TransformCommon=True
|
||||
MaterialExpressionClamp.MaterialExpressionClamp=True
|
||||
MaterialExpressionClamp.MaterialExpression=True
|
||||
MaterialExpressionDivide.MaterialExpressionDivide=True
|
||||
MaterialExpressionDivide.MaterialExpression=True
|
||||
MaterialExpressionPixelNormalWS.MaterialExpression=True
|
||||
MaterialExpressionSubtract.MaterialExpressionSubtract=True
|
||||
MaterialExpressionSubtract.MaterialExpression=True
|
||||
MaterialExpressionDesaturation.MaterialExpressionDesaturation=True
|
||||
MaterialExpressionDesaturation.MaterialExpression=True
|
||||
MaterialExpressionBumpOffset.MaterialExpressionBumpOffset=True
|
||||
MaterialExpressionBumpOffset.MaterialExpression=True
|
||||
MaterialExpressionIf.MaterialExpressionIf=True
|
||||
MaterialExpressionIf.MaterialExpression=True
|
||||
MaterialExpressionStaticSwitch.MaterialExpressionStaticSwitch=True
|
||||
MaterialExpressionStaticSwitch.MaterialExpression=True
|
||||
MaterialExpressionStaticSwitchParameter.General=True
|
||||
MaterialExpressionStaticSwitchParameter.MaterialExpressionStaticBoolParameter=True
|
||||
MaterialExpressionStaticSwitchParameter.MaterialExpression=True
|
||||
MaterialExpressionPower.MaterialExpressionPower=True
|
||||
MaterialExpressionPower.MaterialExpression=True
|
||||
MaterialExpressionReflectionVectorWS.UMaterialExpressionReflectionVectorWS=True
|
||||
MaterialExpressionReflectionVectorWS.MaterialExpression=True
|
||||
MaterialExpressionFrac.MaterialExpression=True
|
||||
MaterialExpressionNormalize.MaterialExpression=True
|
||||
MaterialExpressionTextureSampleParameter2D.General=True
|
||||
MaterialExpressionTextureSampleParameter2D.MaterialExpression=True
|
||||
MaterialExpressionTextureSampleParameter2D.ParameterCustomization=True
|
||||
MaterialExpressionTextureSampleParameter2D.MaterialExpressionTextureSample=True
|
||||
MaterialExpressionTextureSampleParameter2D.MaterialExpressionTextureBase=True
|
||||
MaterialExpressionTransform.MaterialExpressionTransform=True
|
||||
MaterialExpressionTransform.MaterialExpression=True
|
||||
MaterialExpressionDepthFade.MaterialExpressionDepthFade=True
|
||||
MaterialExpressionDepthFade.MaterialExpression=True
|
||||
|
||||
[AssetEditorToolkitTabLocation]
|
||||
/Game/blueprints/NewBlueprint.NewBlueprint=1
|
||||
@@ -1847,6 +1909,33 @@ MaterialExpressionWorldPosition.MaterialExpression=True
|
||||
/Engine/EditorMaterials/WidgetGridVertexColorMaterial.WidgetGridVertexColorMaterial=1
|
||||
/Game/Content/outline/body_paint_Cleen1.body_paint_Cleen1=1
|
||||
/Game/Content/outline/body_paint_Cleen1_Inst.body_paint_Cleen1_Inst=1
|
||||
/Game/Content/outline/body_paint_Cleen1_Inst_Inst.body_paint_Cleen1_Inst_Inst=1
|
||||
/Game/materials/body_paint_Cleen_outline_Inst.body_paint_Cleen_outline_Inst=1
|
||||
/Game/materials/body_paint_Cleen_outline.body_paint_Cleen_outline=1
|
||||
/Game/meshes/ship/SM_Ship_Tower.SM_Ship_Tower=1
|
||||
/Game/materials/ship/body_paint_Cleen_outline.body_paint_Cleen_outline=1
|
||||
/Game/materials/ship/body_paint.body_paint=1
|
||||
/Game/Content/for/3Dprinter_2_Inst.3Dprinter_2_Inst=1
|
||||
/Game/Content/for/3Dprinter_Inst.3Dprinter_Inst=1
|
||||
/Game/meshes/ship/SM_Ship_TowersGun.SM_Ship_TowersGun=1
|
||||
/Game/materials/slicer/3Dprinter_2_Inst.3Dprinter_2_Inst=1
|
||||
/Game/materials/slicer/3Dprinter_2.3Dprinter_2=1
|
||||
/Game/Content/for/3Dprinter.3Dprinter=1
|
||||
/Game/materials/ship/instances/body_paint_Inst.body_paint_Inst=1
|
||||
/Game/materials/ship/materialFunctions/slicer.slicer=1
|
||||
/Game/Content/first/MF_Disolv.MF_Disolv=1
|
||||
/Game/Content/first/NewMaterial_Inst.NewMaterial_Inst=1
|
||||
/Game/Content/first/NewBlueprint.NewBlueprint=1
|
||||
/Game/Content/first/NewMaterial.NewMaterial=1
|
||||
/Game/materials/ship/ShipTextures/tkwmea1o_4K_Roughness1.tkwmea1o_4K_Roughness1=1
|
||||
/Game/materials/ship/ShipTextures/rluijcp_4K_Albedo2.rluijcp_4K_Albedo2=1
|
||||
/Game/materials/ship/ShipTextures/schcbgfp_4K_Roughness.schcbgfp_4K_Roughness=1
|
||||
/Game/materials/ship/ShipTextures/Metall_BC.Metall_BC=1
|
||||
/Game/materials/ship/ShipTextures/Metall_R.Metall_R=1
|
||||
/Game/materials/ship/ShipTextures/Metall_N.Metall_N=1
|
||||
/Game/materials/ship/red.red=1
|
||||
/Game/materials/ship/testMaterials/NewMaterial.NewMaterial=1
|
||||
/Game/materials/ship/testMaterials/body_paint.body_paint=1
|
||||
|
||||
[/Script/BlueprintGraph.BlueprintEditorSettings]
|
||||
bDrawMidpointArrowsInBlueprints=False
|
||||
@@ -2064,9 +2153,21 @@ bForceFrontXAxis=False
|
||||
bConvertSceneUnit=False
|
||||
|
||||
[MessageLog]
|
||||
LastLogListing=MapCheck
|
||||
LastLogListing=PIE
|
||||
|
||||
[PlacementMode]
|
||||
RecentlyPlaced=/Game/meshes/ship/SM_Ship_Ship.SM_Ship_Ship;
|
||||
RecentlyPlaced=/Game/materials/ship/testMaterials/NewMaterial_Inst.NewMaterial_Inst;
|
||||
RecentlyPlaced=/Engine/BasicShapes/Cube.Cube;/Engine/Transient.ActorFactoryBasicShape_0
|
||||
RecentlyPlaced=/Game/Content/first/NewBlueprint.NewBlueprint;
|
||||
RecentlyPlaced=/Game/Content/first/NewMaterial_Inst.NewMaterial_Inst;
|
||||
RecentlyPlaced=/Game/materials/3Dprinter_2_Inst.3Dprinter_2_Inst;
|
||||
RecentlyPlaced=/Game/materials/3Dprinter_2.3Dprinter_2;
|
||||
RecentlyPlaced=/Game/Content/for/3Dprinter.3Dprinter;
|
||||
RecentlyPlaced=/Game/Content/for/3Dprinter_Inst.3Dprinter_Inst;
|
||||
RecentlyPlaced=/Game/Content/for/man.man;
|
||||
RecentlyPlaced=/Game/Content/outline/body_paint_Cleen_outline.body_paint_Cleen_outline;
|
||||
RecentlyPlaced=/Engine/BasicShapes/Cylinder.Cylinder;/Engine/Transient.ActorFactoryBasicShape_0
|
||||
RecentlyPlaced=/Game/Content/outline/GlowEnhanced_Inst.GlowEnhanced_Inst;
|
||||
RecentlyPlaced=/Game/Content/three/invisible_Inst.invisible_Inst;
|
||||
RecentlyPlaced=/Game/blueprints/ship/BP_Ship.BP_Ship;
|
||||
@@ -2075,16 +2176,16 @@ RecentlyPlaced=/Script/Engine.PointLight;/Engine/Transient.ActorFactoryPointLigh
|
||||
RecentlyPlaced=/Engine/BasicShapes/Plane.Plane;/Engine/Transient.ActorFactoryBasicShape_0
|
||||
RecentlyPlaced=/Game/meshes/ship/SM_Ship_Radar.SM_Ship_Radar;
|
||||
RecentlyPlaced=/Game/meshes/ship/SM_Ship_TrackerHead.SM_Ship_TrackerHead;
|
||||
RecentlyPlaced=/Game/meshes/ship/SM_Ship_TrackerBody.SM_Ship_TrackerBody;
|
||||
RecentlyPlaced=/Engine/BasicShapes/Cube.Cube;/Engine/Transient.ActorFactoryBasicShape_0
|
||||
RecentlyPlaced=/Game/meshes/ship/SM_Ship_Ship.SM_Ship_Ship;
|
||||
|
||||
[/Script/UnrealEd.MaterialEditorOptions]
|
||||
bHideUnrelatedNodes=False
|
||||
bUseUnsortedMenus=False
|
||||
bShowGrid=False
|
||||
bRealtimeExpressionViewport=True
|
||||
bAlwaysRefreshAllPreviews=True
|
||||
|
||||
[MaterialEditor]
|
||||
PrimType=2
|
||||
PrimType=1
|
||||
|
||||
[/Script/UnrealEd.MaterialStatsOptions]
|
||||
bPlatformUsed[0]=1
|
||||
@@ -2142,7 +2243,7 @@ bMaterialQualityUsed[2]=0
|
||||
bMaterialQualityUsed[3]=0
|
||||
|
||||
[DetailCustomWidgetExpansion]
|
||||
MaterialEditorInstanceConstant=MaterialEditorInstanceConstant.ParameterGroups.Depth,MaterialEditorInstanceConstant.ParameterGroups.DepthFade,MaterialEditorInstanceConstant.ParameterGroups.Foam,MaterialEditorInstanceConstant.ParameterGroups.Global Vector Parameter Values,MaterialEditorInstanceConstant.ParameterGroups.Normal,MaterialEditorInstanceConstant.ParameterGroups.Refraction,MaterialEditorInstanceConstant.ParameterGroups.Roughnes,MaterialEditorInstanceConstant.ParameterGroups.Tesselation,MaterialEditorInstanceConstant.ParameterGroups.Wave1,MaterialEditorInstanceConstant.ParameterGroups.Wave2,MaterialEditorInstanceConstant.ParameterGroups.Wave3,MaterialEditorInstanceConstant.ParameterGroups.Global Scalar Parameter Values,
|
||||
MaterialEditorInstanceConstant=MaterialEditorInstanceConstant.ParameterGroups.Depth,MaterialEditorInstanceConstant.ParameterGroups.DepthFade,MaterialEditorInstanceConstant.ParameterGroups.Foam,MaterialEditorInstanceConstant.ParameterGroups.Global Vector Parameter Values,MaterialEditorInstanceConstant.ParameterGroups.Normal,MaterialEditorInstanceConstant.ParameterGroups.Refraction,MaterialEditorInstanceConstant.ParameterGroups.Roughnes,MaterialEditorInstanceConstant.ParameterGroups.Tesselation,MaterialEditorInstanceConstant.ParameterGroups.Wave1,MaterialEditorInstanceConstant.ParameterGroups.Wave2,MaterialEditorInstanceConstant.ParameterGroups.Wave3,MaterialEditorInstanceConstant.ParameterGroups.Global Scalar Parameter Values,MaterialEditorInstanceConstant.General.MaterialPropertyOverrideGroup,MaterialEditorInstanceConstant.ParameterGroups.Global Texture Parameter Values,MaterialEditorInstanceConstant.ParameterGroups.Global Static Switch Parameter Values,
|
||||
MaterialInstanceConstant=
|
||||
CryptoKeysSettings=InputSettings.Bindings.ActionMappings.NewActionMapping_0,InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.ClickLeftMouse,GameMapsSettings.DefaultModes.SelectedGameModeDetails,IOSRuntimeSettings.Build.Remote Build Options,InputSettings.Bindings.AxisMappings.NewAxisMapping_0,InputSettings.Bindings.AxisMappings,InputSettings.Bindings.AxisMappings.MouseX,InputSettings.Bindings.AxisMappings.MouseY,InputSettings.Bindings.AxisMappings.MouseScroll,
|
||||
GeneralProjectSettings=InputSettings.Bindings.ActionMappings.NewActionMapping_0,InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.ClickLeftMouse,GameMapsSettings.DefaultModes.SelectedGameModeDetails,IOSRuntimeSettings.Build.Remote Build Options,InputSettings.Bindings.AxisMappings.NewAxisMapping_0,InputSettings.Bindings.AxisMappings,InputSettings.Bindings.AxisMappings.MouseX,InputSettings.Bindings.AxisMappings.MouseY,InputSettings.Bindings.AxisMappings.MouseScroll,
|
||||
@@ -2216,7 +2317,7 @@ WmfMediaSettings=InputSettings.Bindings.ActionMappings.NewActionMapping_0,InputS
|
||||
CameraComponent=CameraComponent.PostProcess.Lens,
|
||||
K2Node_VariableGet=K2Node_VariableGet.DefaultValueCategory.None,
|
||||
cpp_Ship=
|
||||
Player_C=K2Node_VariableGet.DefaultValueCategory.None,
|
||||
Player_C=
|
||||
BP_Ship_C=
|
||||
SceneComponent=
|
||||
PropertyWrapper=K2Node_VariableGet.DefaultValueCategory.None,
|
||||
@@ -2226,7 +2327,7 @@ K2Node_VariableSet=K2Node_VariableGet.DefaultValueCategory.None,
|
||||
[MaterialInstanceEditor]
|
||||
bShowGrid=True
|
||||
bDrawGrid=False
|
||||
PrimType=2
|
||||
PrimType=1
|
||||
|
||||
[LightingBuildOptions]
|
||||
OnlyBuildSelected=False
|
||||
@@ -2238,6 +2339,8 @@ K2Node_CustomEvent.Graph=True
|
||||
TextBlock.Appearance=False
|
||||
Button.Interaction=False
|
||||
MaterialEditorInstanceConstant.General=True
|
||||
SpringArmComponent.ComponentTick=False
|
||||
SpringArmComponent.Lag=False
|
||||
|
||||
[PluginBrowser]
|
||||
InstalledPlugins=RigLogic
|
||||
@@ -2250,8 +2353,8 @@ Brush="\"Object.BrushBuilder.BrushBuilder.Object.BrushSettings\" "
|
||||
InputSettings="\"Object.Bindings.AxisConfig\" \"Object.Bindings.AxisConfig.AxisConfig[0]\" \"Object.Bindings.AxisConfig.AxisConfig[1]\" \"Object.Bindings.AxisConfig.AxisConfig[2]\" \"Object.Bindings.AxisConfig.AxisConfig[3]\" \"Object.Bindings.AxisConfig.AxisConfig[4]\" \"Object.Bindings.AxisConfig.AxisConfig[5]\" \"Object.Bindings.AxisConfig.AxisConfig[6]\" \"Object.Bindings.AxisConfig.AxisConfig[7]\" \"Object.Bindings.AxisConfig.AxisConfig[8]\" \"Object.Bindings.AxisConfig.AxisConfig[9]\" \"Object.Bindings.AxisConfig.AxisConfig[10]\" \"Object.Bindings.AxisConfig.AxisConfig[11]\" \"Object.Bindings.AxisConfig.AxisConfig[12]\" \"Object.Bindings.AxisConfig.AxisConfig[13]\" \"Object.Bindings.AxisConfig.AxisConfig[14]\" \"Object.Bindings.AxisConfig.AxisConfig[15]\" \"Object.Bindings.AxisConfig.AxisConfig[16]\" \"Object.Bindings.AxisConfig.AxisConfig[17]\" \"Object.Bindings.AxisConfig.AxisConfig[18]\" \"Object.Bindings.AxisConfig.AxisConfig[19]\" \"Object.Bindings.AxisConfig.AxisConfig[20]\" \"Object.Bindings.AxisConfig.AxisConfig[21]\" \"Object.Bindings.AxisConfig.AxisConfig[22]\" \"Object.Bindings.AxisConfig.AxisConfig[23]\" \"Object.Bindings.AxisConfig.AxisConfig[24]\" \"Object.Bindings.AxisConfig.AxisConfig[25]\" \"Object.Bindings.AxisConfig.AxisConfig[26]\" \"Object.Bindings.AxisConfig.AxisConfig[27]\" \"Object.Bindings.AxisConfig.AxisConfig[28]\" \"Object.Bindings.AxisConfig.AxisConfig[29]\" \"Object.Bindings.AxisConfig.AxisConfig[30]\" \"Object.Bindings.AxisConfig.AxisConfig[31]\" \"Object.Bindings.AxisConfig.AxisConfig[32]\" \"Object.Bindings.AxisConfig.AxisConfig[33]\" \"Object.Bindings.AxisConfig.AxisConfig[34]\" \"Object.Bindings.AxisConfig.AxisConfig[35]\" \"Object.Bindings.AxisConfig.AxisConfig[36]\" \"Object.Bindings.AxisConfig.AxisConfig[37]\" \"Object.Bindings.AxisConfig.AxisConfig[38]\" \"Object.Bindings.AxisConfig.AxisConfig[39]\" \"Object.Bindings.AxisConfig.AxisConfig[40]\" \"Object.Bindings.AxisConfig.AxisConfig[41]\" \"Object.Bindings.AxisConfig.AxisConfig[42]\" \"Object.Bindings.AxisConfig.AxisConfig[43]\" \"Object.Bindings.AxisConfig.AxisConfig[44]\" \"Object.Bindings.AxisConfig.AxisConfig[45]\" \"Object.Bindings.AxisConfig.AxisConfig[46]\" \"Object.Bindings.AxisConfig.AxisConfig[47]\" \"Object.Bindings.AxisConfig.AxisConfig[48]\" \"Object.Bindings.AxisConfig.AxisConfig[49]\" \"Object.Bindings.AxisConfig.AxisConfig[50]\" \"Object.Bindings.AxisConfig.AxisConfig[51]\" \"Object.Bindings.AxisConfig.AxisConfig[52]\" \"Object.Bindings.AxisConfig.AxisConfig[53]\" \"Object.Bindings.AxisConfig.AxisConfig[54]\" \"Object.Bindings.AxisConfig.AxisConfig[55]\" \"Object.Bindings.AxisConfig.AxisConfig[56]\" \"Object.Bindings.ActionMappings.ActionMappings[0]\" \"Object.Bindings.AxisMappings.AxisMappings[2]\" "
|
||||
Object=
|
||||
Image="\"Object.Appearance.Brush\" \"Object.Appearance.ColorAndOpacity\" \"Object.Layout.Slot\" "
|
||||
Widget="\"Object.Appearance.Brush\" \"Object.Appearance.ColorAndOpacity\" \"Object.Layout.Slot\" "
|
||||
Visual="\"Object.Appearance.Brush\" \"Object.Appearance.ColorAndOpacity\" \"Object.Layout.Slot\" "
|
||||
Widget="\"Object.Appearance.ColorAndOpacity\" \"Object.Layout.Slot\" "
|
||||
Visual="\"Object.Appearance.ColorAndOpacity\" \"Object.Layout.Slot\" "
|
||||
TextBlock="\"Object.Appearance.ColorAndOpacity\" \"Object.Appearance.Font\" \"Object.Appearance.StrikeBrush\" \"Object.Appearance.StrikeBrush.TintColor\" \"Object.Appearance.Margin\" \"Object.Layout.Slot\" "
|
||||
TextLayoutWidget="\"Object.Appearance.ColorAndOpacity\" \"Object.Appearance.Font\" \"Object.Appearance.StrikeBrush\" \"Object.Appearance.StrikeBrush.TintColor\" \"Object.Appearance.Margin\" \"Object.Layout.Slot\" "
|
||||
ScrollBox="\"Object.Layout.Slot\" "
|
||||
@@ -2262,14 +2365,14 @@ CanvasPanel="\"Object.Layout.Slot\" "
|
||||
HorizontalBox="\"Object.Layout.Slot\" "
|
||||
Spacer="\"Object.Layout.Slot\" "
|
||||
SizeBox="\"Object.Layout.Slot\" "
|
||||
mainMenu_C="\"Object.Layout.Slot\" "
|
||||
UserWidget="\"Object.Layout.Slot\" "
|
||||
mainMenu_C="\"Object.Appearance.ColorAndOpacity\" \"Object.Layout.Slot\" "
|
||||
UserWidget="\"Object.Appearance.ColorAndOpacity\" \"Object.Layout.Slot\" "
|
||||
CameraComponent="\"Object.PostProcess.PostProcessSettings\" "
|
||||
SceneComponent=
|
||||
ActorComponent=
|
||||
cpp_Ship=
|
||||
Player_C="\"Object.ship\" "
|
||||
Pawn="\"Object.ship\" "
|
||||
Player_C=
|
||||
Pawn=
|
||||
BP_Ship_C=
|
||||
ProjectPackagingSettings="\"Object.Packaging.IniKeyBlacklist\" "
|
||||
AssetManagerSettings="\"Object.Asset Manager.PrimaryAssetTypesToScan\" \"Object.Asset Manager.PrimaryAssetTypesToScan.PrimaryAssetTypesToScan[0]\" \"Object.Asset Manager.PrimaryAssetTypesToScan.PrimaryAssetTypesToScan[0].Directories\" \"Object.Asset Manager.PrimaryAssetTypesToScan.PrimaryAssetTypesToScan[0].Rules\" \"Object.Asset Manager.PrimaryAssetTypesToScan.PrimaryAssetTypesToScan[1]\" \"Object.Asset Manager.PrimaryAssetTypesToScan.PrimaryAssetTypesToScan[1].Directories\" \"Object.Asset Manager.PrimaryAssetTypesToScan.PrimaryAssetTypesToScan[1].Rules\" "
|
||||
@@ -2301,7 +2404,7 @@ NiagaraSettings="\"Object.Niagara.AdditionalParameterEnums\" \"Object.Scalabilit
|
||||
NiagaraEditorSettings="\"Object.Niagara.GraphCreationShortcuts\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[0]\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[0].Input\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[1]\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[1].Input\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[2]\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[2].Input\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[3]\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[3].Input\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[4]\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[4].Input\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[5]\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[5].Input\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[6]\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[6].Input\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[7]\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[7].Input\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[8]\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[8].Input\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[9]\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[9].Input\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[10]\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[10].Input\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[11]\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[11].Input\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[12]\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[12].Input\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[13]\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[13].Input\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[14]\" \"Object.Niagara.GraphCreationShortcuts.GraphCreationShortcuts[14].Input\" "
|
||||
VerticalBox="\"Object.Layout.Slot\" "
|
||||
SpringArmComponent=
|
||||
MaterialEditorInstanceConstant="\"Object.ParameterGroups.ParameterGroups[1].Parameters.Parameters[1].Object.ParameterValue\" "
|
||||
MaterialEditorInstanceConstant=
|
||||
|
||||
[/Script/UnrealEd.EditorLoadingSavingSettings]
|
||||
bSCCUseGlobalSettings=False
|
||||
@@ -2394,6 +2497,8 @@ FrameNumberDisplayFormat=Seconds
|
||||
Theme0=New Theme
|
||||
Theme0Color0=(R=27.724609,G=1.000000,B=1.000000,A=1.000000)
|
||||
Theme0Label0=
|
||||
Theme0Color1=(R=357.049225,G=1.000000,B=0.807292,A=1.000000)
|
||||
Theme0Label1=
|
||||
|
||||
[SuppressableDialogs]
|
||||
Warning_CompileErrorsInMaterial=False
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user