An attempt to push UI asset again

Just in case. Gitea didn't show it being pushed yesterday, so let's try it again.

#Frustrating
This commit is contained in:
2024-01-21 16:36:24 +02:00
parent 0adb2e6dfc
commit 8c495145a6
28 changed files with 8842 additions and 10974 deletions

View File

@@ -1,7 +0,0 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2
Stall.RecordDump=false
Ensure.RecordDump=true

View File

@@ -1,7 +0,0 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2
Stall.RecordDump=false
Ensure.RecordDump=true

View File

@@ -1,7 +0,0 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2
Stall.RecordDump=false
Ensure.RecordDump=true

View File

@@ -1,7 +0,0 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2
Stall.RecordDump=false
Ensure.RecordDump=true

View File

@@ -1,7 +0,0 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2
Stall.RecordDump=false
Ensure.RecordDump=true

View File

@@ -1,7 +0,0 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2
Stall.RecordDump=false
Ensure.RecordDump=true

View File

@@ -166,17 +166,15 @@ LastLevel=/Game/DevelopedContent/Main_Map
[AssetEditorSubsystem]
CleanShutdown=False
DebuggerAttached=False
RecentAssetEditors=BlueprintEditor
<<<<<<< Updated upstream
RecentAssetEditors=WidgetBlueprintEditor
=======
>>>>>>> Stashed changes
RecentAssetEditors=BlueprintEditor
RecentAssetEditors=
RecentAssetEditors=
RecentAssetEditors=
RecentAssetEditors=
RecentAssetEditors=
RecentAssetEditors=
RecentAssetEditors=
None=======
None=======
OpenAssetsAtExit=/Game/DevelopedContent/BluePrints/Player_UI.Player_UI
[RootWindow]
@@ -221,7 +219,7 @@ ContentBrowserDrawer.VerticalSplitter.SlotSize1=0.75
ContentBrowserDrawer.FavoriteSplitter.SlotSize0=0.200000003
ContentBrowserDrawer.FavoriteSplitter.SlotSize1=0.800000012
ContentBrowserDrawer.FavoriteSplitter.SlotSize2=0.400000006
ContentBrowserDrawer.SelectedPaths=/Game/DevelopedContent
ContentBrowserDrawer.SelectedPaths=/Game/StarterContent/Props
ContentBrowserDrawer.PluginFilters=
ContentBrowserDrawer.Favorites.SelectedPaths=
ContentBrowserDrawer.SelectedCollections=
@@ -2392,7 +2390,6 @@ TileView.Rendering=True
TileView.Localization=True
EditPivotToolProperties.Options=True
EditPivotToolActionPropertySet.BoxPositions=True
<<<<<<< Updated upstream
[AssetEditorSubsystemRecents]
MRUItem0=/Game/DevelopedContent/BluePrints/Player_UI
@@ -2403,41 +2400,6 @@ 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
@@ -2447,13 +2409,13 @@ MRUItem6=/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
=======
None=======
None=======
None=======
/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
@@ -2622,9 +2584,9 @@ TreeViewWidth=0.300000
[DetailPropertyExpansion]
TextBlock="\"Object.Appearance.Font\" \"Object.Appearance.Font.OutlineSettings\" \"Object.Layout.Slot.Object.Layout.Layout|Canvas Slot.LayoutData.Anchors\" \"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
TextLayoutWidget="\"Object.Appearance.Font\" \"Object.Appearance.Font.OutlineSettings\" \"Object.Layout.Slot.Object.Layout.Layout|Canvas Slot.LayoutData.Anchors\" \"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
Widget="\"Object.Appearance.Brush\" \"Object.Appearance.Brush.ImageSize\" \"Object.Appearance.Brush.OutlineSettings\" \"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
Visual="\"Object.Appearance.Brush\" \"Object.Appearance.Brush.ImageSize\" \"Object.Appearance.Brush.OutlineSettings\" \"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
Object=
Widget="\"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\" "
Visual="\"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\" "
Object="\"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\" "
Image="\"Object.Appearance.Brush\" \"Object.Appearance.Brush.ImageSize\" \"Object.Appearance.Brush.OutlineSettings\" \"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
EditorLoadingSavingSettings="\"Object.AutoReimport\" \"Object.AutoSave\" \"Object.Blueprints\" "
CrashReportsPrivacySettings="\"Object.Options.bSendUnattendedBugReports\" "
@@ -2636,13 +2598,12 @@ UniformGridPanel="\"Object.Child Layout.SlotPadding\" \"Object.Render Transform.
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="\"Object.Render Transform.RenderTransform\" \"Object.Render Transform.RenderTransform.Scale\" \"Object.Render Transform.RenderTransformPivot\" "
UserWidget=
>>>>>>> Stashed changes
None=======
None=======
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\" "
@@ -2660,9 +2621,11 @@ StaticMeshComponent.Physics=False
StaticMeshComponent.Rendering=False
StaticMeshComponent.Collision=False
TextBlock.Appearance=False
Button.Behavior=False
Button.Interaction=False
[MessageLog]
LastLogListing=LoadErrors
LastLogListing=AssetReimport
[/Script/UnrealEd.EditorLoadingSavingSettings]
AutoSaveMaxBackups=10
@@ -2803,13 +2766,16 @@ bConvertSceneUnit=False
[OutputLog]
PreferredCommandExecutor=Cmd
None=======
None=======
<<<<<<< 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
None=======
[PluginBrowser]
InstalledPlugins=WMFCodecs
>>>>>>> Stashed changes