Added buttons for textures and finishing up for the night.
I needed to restart my computer to even be able to commit this!
This commit is contained in:
@@ -167,7 +167,10 @@ LastLevel=/Game/DevelopedContent/Main_Map
|
||||
CleanShutdown=False
|
||||
DebuggerAttached=False
|
||||
RecentAssetEditors=BlueprintEditor
|
||||
<<<<<<< Updated upstream
|
||||
RecentAssetEditors=WidgetBlueprintEditor
|
||||
=======
|
||||
>>>>>>> Stashed changes
|
||||
RecentAssetEditors=BlueprintEditor
|
||||
RecentAssetEditors=
|
||||
RecentAssetEditors=
|
||||
@@ -1314,6 +1317,8 @@ MovieSceneCapture.TimeStamp=2023.11.13-17.02.21
|
||||
MovieSceneCapture.LastCompileMethod=External
|
||||
SequencerWidgets.TimeStamp=2023.11.13-17.02.24
|
||||
SequencerWidgets.LastCompileMethod=External
|
||||
TextureEditor.TimeStamp=2023.11.13-17.02.27
|
||||
TextureEditor.LastCompileMethod=Unknown
|
||||
|
||||
[Python]
|
||||
LastDirectory=
|
||||
@@ -2387,6 +2392,7 @@ TileView.Rendering=True
|
||||
TileView.Localization=True
|
||||
EditPivotToolProperties.Options=True
|
||||
EditPivotToolActionPropertySet.BoxPositions=True
|
||||
<<<<<<< Updated upstream
|
||||
|
||||
[AssetEditorSubsystemRecents]
|
||||
MRUItem0=/Game/DevelopedContent/BluePrints/Player_UI
|
||||
@@ -2397,6 +2403,41 @@ MRUItem4=/Game/StarterContent/Maps/Advanced_Lighting
|
||||
MRUItem5=/Game/StarterContent/Maps/Minimal_Default
|
||||
MRUItem6=/Game/StarterContent/Maps/StarterMap
|
||||
MRUItem7=/Game/StarterContent/Props/MaterialSphere
|
||||
=======
|
||||
Texture2D.LevelOfDetail=True
|
||||
Texture2D.Compression=True
|
||||
Texture2D.Texture=True
|
||||
Texture2D.Adjustments=True
|
||||
Texture2D.File Path=True
|
||||
Texture2D.Compositing=True
|
||||
WorldDataLayers.Networking=True
|
||||
WorldDataLayers.LevelInstance=True
|
||||
WorldPartitionMiniMap.WorldPartitionMiniMap=True
|
||||
WorldPartitionMiniMap.Networking=True
|
||||
TileView.Events=True
|
||||
VolumetricCloud.TransformCommon=True
|
||||
VolumetricCloud.Layer=True
|
||||
VolumetricCloud.Planet=True
|
||||
VolumetricCloud.Cloud Material=True
|
||||
VolumetricCloud.Cloud Tracing=True
|
||||
VolumetricCloud.Rendering=True
|
||||
VolumetricCloud.Physics=True
|
||||
VolumetricCloud.Tags=True
|
||||
VolumetricCloud.Activation=True
|
||||
VolumetricCloud.Cooking=True
|
||||
VolumetricCloud.Replication=True
|
||||
VolumetricCloud.Networking=True
|
||||
VolumetricCloud.Actor=True
|
||||
|
||||
[AssetEditorSubsystemRecents]
|
||||
MRUItem0=/Game/DevelopedContent/BluePrints/CharaModel
|
||||
MRUItem1=/Game/DevelopedContent/BluePrints/NewBlueprint
|
||||
MRUItem2=/Game/DevelopedContent/Main_Map
|
||||
MRUItem3=/Game/StarterContent/Maps/Advanced_Lighting
|
||||
MRUItem4=/Game/StarterContent/Maps/Minimal_Default
|
||||
MRUItem5=/Game/StarterContent/Maps/StarterMap
|
||||
MRUItem6=/Game/StarterContent/Props/MaterialSphere
|
||||
>>>>>>> Stashed changes
|
||||
|
||||
[AssetEditorToolkitTabLocation]
|
||||
/Game/StarterContent/Props/MaterialSphere.MaterialSphere=1
|
||||
@@ -2406,6 +2447,13 @@ MRUItem7=/Game/StarterContent/Props/MaterialSphere
|
||||
/Game/DevelopedContent/BluePrints/Player_UI.Player_UI=1
|
||||
/Game/DevelopedContent/BluePrints/CharaModel.CharaModel=1
|
||||
/Game/DevelopedContent/BluePrints/NewBlueprint.NewBlueprint=1
|
||||
<<<<<<< Updated upstream
|
||||
=======
|
||||
/Game/DevelopedContent/Textures/TXKnitted.TXKnitted=1
|
||||
/Game/DevelopedContent/Textures/TXDenim.TXDenim=1
|
||||
/Game/DevelopedContent/Textures/TXCloth.TXCloth=1
|
||||
/Game/DevelopedContent/Textures/TXBricks.TXBricks=1
|
||||
>>>>>>> Stashed changes
|
||||
|
||||
[SelectionDetails]
|
||||
PreserveScaleRatio=False
|
||||
@@ -2581,15 +2629,20 @@ Image="\"Object.Appearance.Brush\" \"Object.Appearance.Brush.ImageSize\" \"Objec
|
||||
EditorLoadingSavingSettings="\"Object.AutoReimport\" \"Object.AutoSave\" \"Object.Blueprints\" "
|
||||
CrashReportsPrivacySettings="\"Object.Options.bSendUnattendedBugReports\" "
|
||||
AnalyticsPrivacySettings="\"Object.Options.bSendUsageData\" "
|
||||
Button="\"Object.Appearance.WidgetStyle\" \"Object.Appearance.BackgroundColor\" \"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
ContentWidget="\"Object.Appearance.WidgetStyle\" \"Object.Appearance.BackgroundColor\" \"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
PanelWidget="\"Object.Appearance.WidgetStyle\" \"Object.Appearance.BackgroundColor\" \"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
UniformGridPanel="\"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
Button="\"Object.Appearance.WidgetStyle\" \"Object.Appearance.WidgetStyle.Normal\" \"Object.Appearance.WidgetStyle.Normal.ImageSize\" \"Object.Appearance.WidgetStyle.Hovered\" \"Object.Appearance.WidgetStyle.Hovered.ImageSize\" \"Object.Appearance.WidgetStyle.Pressed\" \"Object.Appearance.WidgetStyle.Pressed.ImageSize\" \"Object.Appearance.BackgroundColor\" \"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
ContentWidget="\"Object.Appearance.WidgetStyle\" \"Object.Appearance.WidgetStyle.Normal\" \"Object.Appearance.WidgetStyle.Normal.ImageSize\" \"Object.Appearance.WidgetStyle.Hovered\" \"Object.Appearance.WidgetStyle.Hovered.ImageSize\" \"Object.Appearance.WidgetStyle.Pressed\" \"Object.Appearance.WidgetStyle.Pressed.ImageSize\" \"Object.Appearance.BackgroundColor\" \"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
PanelWidget="\"Object.Appearance.WidgetStyle\" \"Object.Appearance.WidgetStyle.Normal\" \"Object.Appearance.WidgetStyle.Normal.ImageSize\" \"Object.Appearance.WidgetStyle.Hovered\" \"Object.Appearance.WidgetStyle.Hovered.ImageSize\" \"Object.Appearance.WidgetStyle.Pressed\" \"Object.Appearance.WidgetStyle.Pressed.ImageSize\" \"Object.Appearance.BackgroundColor\" \"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
UniformGridPanel="\"Object.Child Layout.SlotPadding\" \"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
ScrollBox="\"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
CanvasPanel="\"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
Slider="\"Object.Style.WidgetStyle\" \"Object.Style.WidgetStyle.NormalBarImage\" \"Object.Style.WidgetStyle.NormalBarImage.ImageSize\" \"Object.Style.WidgetStyle.HoveredBarImage\" \"Object.Layout.Slot.Object.Layout.Layout|Canvas Slot.LayoutData.Anchors\" \"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
<<<<<<< Updated upstream
|
||||
Player_UI_C="\"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
UserWidget="\"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
=======
|
||||
Player_UI_C=
|
||||
UserWidget=
|
||||
>>>>>>> Stashed changes
|
||||
CheckBox="\"Object.Style.WidgetStyle\" \"Object.Style.WidgetStyle.UncheckedImage\" \"Object.Style.WidgetStyle.UncheckedImage.ImageSize\" \"Object.Style.WidgetStyle.UncheckedHoveredImage\" \"Object.Style.WidgetStyle.UncheckedHoveredImage.ImageSize\" \"Object.Style.WidgetStyle.UncheckedPressedImage\" \"Object.Style.WidgetStyle.UncheckedPressedImage.ImageSize\" \"Object.Style.WidgetStyle.CheckedImage\" \"Object.Style.WidgetStyle.CheckedImage.ImageSize\" \"Object.Style.WidgetStyle.CheckedHoveredImage\" \"Object.Style.WidgetStyle.CheckedHoveredImage.ImageSize\" \"Object.Style.WidgetStyle.CheckedPressedImage\" \"Object.Style.WidgetStyle.CheckedPressedImage.ImageSize\" \"Object.Style.WidgetStyle.BackgroundImage\" \"Object.Style.WidgetStyle.BorderBackgroundColor\" \"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
TileView="\"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
ListView="\"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
|
||||
@@ -2751,3 +2804,12 @@ bConvertSceneUnit=False
|
||||
[OutputLog]
|
||||
PreferredCommandExecutor=Cmd
|
||||
|
||||
<<<<<<< Updated upstream
|
||||
=======
|
||||
[DetailCustomWidgetExpansion]
|
||||
PropertyWrapper=PropertyWrapper.DefaultValueCategory.Textures,PropertyWrapper.DefaultValueCategory.Image,K2Node_VariableGet.DefaultValueCategory.Image
|
||||
Player_UI_C=PropertyWrapper.DefaultValueCategory.Textures,PropertyWrapper.DefaultValueCategory.Image,K2Node_VariableGet.DefaultValueCategory.Image
|
||||
K2Node_VariableGet=PropertyWrapper.DefaultValueCategory.Textures,PropertyWrapper.DefaultValueCategory.Image,K2Node_VariableGet.DefaultValueCategory.Image
|
||||
K2Node_MacroInstance=PropertyWrapper.DefaultValueCategory.Textures,PropertyWrapper.DefaultValueCategory.Image,K2Node_VariableGet.DefaultValueCategory.Image
|
||||
|
||||
>>>>>>> Stashed changes
|
||||
|
||||
Reference in New Issue
Block a user