diff --git a/Content/Characters/NovichokV2/PackedMaterial0.uasset b/Content/Characters/NovichokV2/PackedMaterial0.uasset index 4b570ac..77a71f6 100644 Binary files a/Content/Characters/NovichokV2/PackedMaterial0.uasset and b/Content/Characters/NovichokV2/PackedMaterial0.uasset differ diff --git a/Content/Characters/NovichokV2/Sketchfab_2021_10_05_16_51_01_PhysicsAsset.uasset b/Content/Characters/NovichokV2/Sketchfab_2021_10_05_16_51_01_PhysicsAsset.uasset deleted file mode 100644 index 99a449d..0000000 Binary files a/Content/Characters/NovichokV2/Sketchfab_2021_10_05_16_51_01_PhysicsAsset.uasset and /dev/null differ diff --git a/Content/Characters/NovichokV2/Sketchfab_2021_10_05_16_51_01.uasset b/Content/Characters/NovichokV2/the_new_one.uasset similarity index 52% rename from Content/Characters/NovichokV2/Sketchfab_2021_10_05_16_51_01.uasset rename to Content/Characters/NovichokV2/the_new_one.uasset index 04e62ae..fc82db9 100644 Binary files a/Content/Characters/NovichokV2/Sketchfab_2021_10_05_16_51_01.uasset and b/Content/Characters/NovichokV2/the_new_one.uasset differ diff --git a/Content/Characters/NovichokV2/the_new_one_PhysicsAsset.uasset b/Content/Characters/NovichokV2/the_new_one_PhysicsAsset.uasset new file mode 100644 index 0000000..0672d5c Binary files /dev/null and b/Content/Characters/NovichokV2/the_new_one_PhysicsAsset.uasset differ diff --git a/Content/Characters/NovichokV2/Sketchfab_2021_10_05_16_51_01_Skeleton.uasset b/Content/Characters/NovichokV2/the_new_one_Skeleton.uasset similarity index 58% rename from Content/Characters/NovichokV2/Sketchfab_2021_10_05_16_51_01_Skeleton.uasset rename to Content/Characters/NovichokV2/the_new_one_Skeleton.uasset index a2c6e41..4ffd758 100644 Binary files a/Content/Characters/NovichokV2/Sketchfab_2021_10_05_16_51_01_Skeleton.uasset and b/Content/Characters/NovichokV2/the_new_one_Skeleton.uasset differ diff --git a/Content/TopDown/Blueprints/BP_MainChar.uasset b/Content/TopDown/Blueprints/BP_MainChar.uasset index e08cef8..ed71e89 100644 Binary files a/Content/TopDown/Blueprints/BP_MainChar.uasset and b/Content/TopDown/Blueprints/BP_MainChar.uasset differ diff --git a/Saved/Autosaves/Game/Characters/NovichokV2/PackedMaterial0_Auto2.uasset b/Saved/Autosaves/Game/Characters/NovichokV2/PackedMaterial0_Auto2.uasset new file mode 100644 index 0000000..a9cff08 Binary files /dev/null and b/Saved/Autosaves/Game/Characters/NovichokV2/PackedMaterial0_Auto2.uasset differ diff --git a/Saved/Autosaves/Game/Characters/NovichokV2/the_new_one_Auto2.uasset b/Saved/Autosaves/Game/Characters/NovichokV2/the_new_one_Auto2.uasset new file mode 100644 index 0000000..fd37f23 Binary files /dev/null and b/Saved/Autosaves/Game/Characters/NovichokV2/the_new_one_Auto2.uasset differ diff --git a/Saved/Autosaves/Game/Characters/NovichokV2/the_new_one_PhysicsAsset_Auto2.uasset b/Saved/Autosaves/Game/Characters/NovichokV2/the_new_one_PhysicsAsset_Auto2.uasset new file mode 100644 index 0000000..75965bf Binary files /dev/null and b/Saved/Autosaves/Game/Characters/NovichokV2/the_new_one_PhysicsAsset_Auto2.uasset differ diff --git a/Saved/Autosaves/Game/Characters/NovichokV2/the_new_one_Skeleton_Auto2.uasset b/Saved/Autosaves/Game/Characters/NovichokV2/the_new_one_Skeleton_Auto2.uasset new file mode 100644 index 0000000..8bbf9b5 Binary files /dev/null and b/Saved/Autosaves/Game/Characters/NovichokV2/the_new_one_Skeleton_Auto2.uasset differ diff --git a/Saved/Autosaves/Game/TopDown/Blueprints/BP_MainChar_Auto2.uasset b/Saved/Autosaves/Game/TopDown/Blueprints/BP_MainChar_Auto2.uasset new file mode 100644 index 0000000..74325a0 Binary files /dev/null and b/Saved/Autosaves/Game/TopDown/Blueprints/BP_MainChar_Auto2.uasset differ diff --git a/Saved/Config/LinuxEditor/EditorPerProjectUserSettings.ini b/Saved/Config/LinuxEditor/EditorPerProjectUserSettings.ini index 9b20596..d82cfcf 100644 --- a/Saved/Config/LinuxEditor/EditorPerProjectUserSettings.ini +++ b/Saved/Config/LinuxEditor/EditorPerProjectUserSettings.ini @@ -367,7 +367,7 @@ AssetPropertyPicker.ZoomScale=0 AssetPropertyPicker.ListViewColumnsManuallyChangedOnce=False AssetPropertyPicker.ColumnViewColumnsManuallyChangedOnce=False AssetPropertyPicker.ListHiddenColumns=Class -ContentBrowserDrawer.SelectedPaths=/Game/TopDown/Blueprints +ContentBrowserDrawer.SelectedPaths=/Game/Characters/Novichok ContentBrowserDrawer.PluginFilters= ContentBrowserDrawer.SourcesExpanded=True ContentBrowserDrawer.IsLocked=False @@ -394,19 +394,23 @@ ContentBrowserDrawer.CurrentViewType=1 ContentBrowserDrawer.ZoomScale=0 ContentBrowserDrawer.ListViewColumnsManuallyChangedOnce=False ContentBrowserDrawer.ColumnViewColumnsManuallyChangedOnce=False -ContentBrowserDrawer.JumpMRU=/All/Game/Materials/Podpivasnaya/IND-LAAAMP +ContentBrowserDrawer.JumpMRU=/All/Game/Characters/Novichok +ContentBrowserDrawer.JumpMRU=/All/Game/Characters +ContentBrowserDrawer.JumpMRU=/All/Game/Characters/NovichokV2 +ContentBrowserDrawer.JumpMRU=/All/Game/TopDown/Blueprints +ContentBrowserDrawer.JumpMRU=/All/Game/TopDown +ContentBrowserDrawer.JumpMRU=/All/Game +ContentBrowserDrawer.JumpMRU=/All/Game/Blueprints +ContentBrowserDrawer.JumpMRU=/All ContentBrowserDrawer.JumpMRU=/All/Game/Materials/Podpivasnaya +ContentBrowserDrawer.JumpMRU=/All/Game/Materials +ContentBrowserDrawer.JumpMRU=/All/Game/Materials/Podpivasnaya/IND-LAAAMP ContentBrowserDrawer.JumpMRU=/All/Game/Materials/Podpivasnaya/LAMP-TABLYA ContentBrowserDrawer.JumpMRU=/All/Game/Materials/Podpivasnaya/BOOOTLE ContentBrowserDrawer.JumpMRU=/All/Game/Materials/Podpivasnaya/Interface -ContentBrowserDrawer.JumpMRU=/All/Game/Materials -ContentBrowserDrawer.JumpMRU=/All -ContentBrowserDrawer.JumpMRU=/All/Game ContentBrowserDrawer.JumpMRU=/All/Game/Collections ContentBrowserDrawer.JumpMRU=/All/Game/Collections/window -ContentBrowserDrawer.JumpMRU=/All/Game/Characters ContentBrowserDrawer.JumpMRU=/All/EngineData/Engine/EngineMaterials -ContentBrowserDrawer.JumpMRU=/All/Game/Blueprints ContentBrowserDrawer.JumpMRU=/All/Game/Materials/Podpivasnaya/DOOORR AssetDialog.ThumbnailSizeGrid=3 AssetDialog.ThumbnailSizeList=3 @@ -584,9 +588,9 @@ Info="\"Object\" \"Object.World.NavigationSystemConfig\" \"Object.Broadphase.Bro StaticMesh="\"Object\" " StreamableRenderAsset="\"Object\" " AssetViewerSettings="\"Object\" " -BP_MainChar_C="\"Object.Character.Mesh.Object.Collision.BodyInstance\" \"Object.Character.Mesh.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.CharacterMovement.Object.NavMovement.NavMovementProperties\" \"Object.Character.CharacterMovement.Object.NavMovement.NavAgentProps\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Pawn.Pawn|Input\" " -Character="\"Object.Character.Mesh.Object.Collision.BodyInstance\" \"Object.Character.Mesh.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.CharacterMovement.Object.NavMovement.NavMovementProperties\" \"Object.Character.CharacterMovement.Object.NavMovement.NavAgentProps\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Pawn.Pawn|Input\" " -Pawn="\"Object.Character.Mesh.Object.Collision.BodyInstance\" \"Object.Character.Mesh.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.CharacterMovement.Object.NavMovement.NavMovementProperties\" \"Object.Character.CharacterMovement.Object.NavMovement.NavAgentProps\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Pawn.Pawn|Input\" " +BP_MainChar_C="\"Object.Character.Mesh.Object.Collision.BodyInstance\" \"Object.Character.Mesh.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.Mesh.Object.Rendering.OverrideMaterials\" \"Object.Character.CharacterMovement.Object.NavMovement.NavMovementProperties\" \"Object.Character.CharacterMovement.Object.NavMovement.NavAgentProps\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Pawn.Pawn|Input\" " +Character="\"Object.Character.Mesh.Object.Collision.BodyInstance\" \"Object.Character.Mesh.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.Mesh.Object.Rendering.OverrideMaterials\" \"Object.Character.CharacterMovement.Object.NavMovement.NavMovementProperties\" \"Object.Character.CharacterMovement.Object.NavMovement.NavAgentProps\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Pawn.Pawn|Input\" " +Pawn="\"Object.Character.Mesh.Object.Collision.BodyInstance\" \"Object.Character.Mesh.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.Mesh.Object.Rendering.OverrideMaterials\" \"Object.Character.CharacterMovement.Object.NavMovement.NavMovementProperties\" \"Object.Character.CharacterMovement.Object.NavMovement.NavAgentProps\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Pawn.Pawn|Input\" " InterchangeGenericAssetsPipeline="\"Object\" " InterchangePipelineBase="\"Object\" " DataTable="\"Object\" " @@ -1569,6 +1573,7 @@ PrimitiveComponent.Cooking=True PrimitiveComponent.Navigation=True PrimitiveComponent.Variable=True PrimitiveComponent.Materials=True +SkeletalMeshComponent.MaterialParameters=True [AssetEditorSubsystem] CleanShutdown=False @@ -1744,6 +1749,7 @@ SceneComponent.Physics=True StaticMeshComponent.Physics=True PointLightComponent.Light=False TextBlock.Performance=True +BP_MainChar_C.Animation=True [Interchange_StackName__Assets__PipelinePathHash_3978065961] PipelineDisplayName=Default Assets Pipeline diff --git a/Saved/SourceControl/UncontrolledChangelists.json b/Saved/SourceControl/UncontrolledChangelists.json index fabf3e5..42d69c0 100644 --- a/Saved/SourceControl/UncontrolledChangelists.json +++ b/Saved/SourceControl/UncontrolledChangelists.json @@ -40,6 +40,9 @@ "/home/oxff/Games/Projects/TheThirdTry/Content/Characters/NovichokV2/Sketchfab_2021_10_05_16_51_01.uasset", "/home/oxff/Games/Projects/TheThirdTry/Content/Characters/NovichokV2/Sketchfab_2021_10_05_16_51_01_PhysicsAsset.uasset", "/home/oxff/Games/Projects/TheThirdTry/Content/Characters/NovichokV2/Sketchfab_2021_10_05_16_51_01_Skeleton.uasset", + "/home/oxff/Games/Projects/TheThirdTry/Content/Characters/NovichokV2/the_new_one.uasset", + "/home/oxff/Games/Projects/TheThirdTry/Content/Characters/NovichokV2/the_new_one_PhysicsAsset.uasset", + "/home/oxff/Games/Projects/TheThirdTry/Content/Characters/NovichokV2/the_new_one_Skeleton.uasset", "/home/oxff/Games/Projects/TheThirdTry/Content/__ExternalActors__/TopDown/Lvl_TopDown/6/NP/XGRUMYXHGMEJM1OX5ETV4N.uasset" ] }