diff --git a/Content/Characters/NovichokV2/PackedMaterial0.uasset b/Content/Characters/NovichokV2/PackedMaterial0.uasset index 77a71f6..1ec9582 100644 Binary files a/Content/Characters/NovichokV2/PackedMaterial0.uasset and b/Content/Characters/NovichokV2/PackedMaterial0.uasset differ diff --git a/Content/Characters/NovichokV2/the_new_one.uasset b/Content/Characters/NovichokV2/the_last_one_i_hope.uasset similarity index 52% rename from Content/Characters/NovichokV2/the_new_one.uasset rename to Content/Characters/NovichokV2/the_last_one_i_hope.uasset index fc82db9..7e5e621 100644 Binary files a/Content/Characters/NovichokV2/the_new_one.uasset and b/Content/Characters/NovichokV2/the_last_one_i_hope.uasset differ diff --git a/Content/Characters/NovichokV2/the_last_one_i_hope_PhysicsAsset.uasset b/Content/Characters/NovichokV2/the_last_one_i_hope_PhysicsAsset.uasset new file mode 100644 index 0000000..ebc9061 Binary files /dev/null and b/Content/Characters/NovichokV2/the_last_one_i_hope_PhysicsAsset.uasset differ diff --git a/Content/Characters/NovichokV2/the_new_one_Skeleton.uasset b/Content/Characters/NovichokV2/the_last_one_i_hope_Skeleton.uasset similarity index 59% rename from Content/Characters/NovichokV2/the_new_one_Skeleton.uasset rename to Content/Characters/NovichokV2/the_last_one_i_hope_Skeleton.uasset index 4ffd758..273ad69 100644 Binary files a/Content/Characters/NovichokV2/the_new_one_Skeleton.uasset and b/Content/Characters/NovichokV2/the_last_one_i_hope_Skeleton.uasset differ diff --git a/Content/Characters/NovichokV2/the_new_one_PhysicsAsset.uasset b/Content/Characters/NovichokV2/the_new_one_PhysicsAsset.uasset deleted file mode 100644 index 0672d5c..0000000 Binary files a/Content/Characters/NovichokV2/the_new_one_PhysicsAsset.uasset and /dev/null differ diff --git a/Content/TopDown/Blueprints/BP_MainChar.uasset b/Content/TopDown/Blueprints/BP_MainChar.uasset index ed71e89..d3e940c 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/TopDown/Blueprints/BP_MainChar_Auto3.uasset b/Saved/Autosaves/Game/TopDown/Blueprints/BP_MainChar_Auto3.uasset new file mode 100644 index 0000000..62c8f4b Binary files /dev/null and b/Saved/Autosaves/Game/TopDown/Blueprints/BP_MainChar_Auto3.uasset differ diff --git a/Saved/Config/LinuxEditor/EditorPerProjectUserSettings.ini b/Saved/Config/LinuxEditor/EditorPerProjectUserSettings.ini index d82cfcf..484a548 100644 --- a/Saved/Config/LinuxEditor/EditorPerProjectUserSettings.ini +++ b/Saved/Config/LinuxEditor/EditorPerProjectUserSettings.ini @@ -314,6 +314,8 @@ BoxComponent=BoxComponent.Physics.ConstraintsGroup SceneComponent= StaticMeshActor=WidgetComponent.TransformCommon.Transform,WidgetComponent.Physics.ConstraintsGroup,BoxComponent.Physics.ConstraintsGroup InterchangeGenericAssetsPipeline=InterchangeGenericAssetsPipeline.Common Meshes.Build,InterchangeGenericAssetsPipeline.Static Meshes.Collision,InterchangeGenericAssetsPipeline.Static Meshes.Build,InterchangeGenericAssetsPipeline.Skeletal Meshes.Build +BrushComponent=WidgetComponent.TransformCommon.Transform,WidgetComponent.Physics.ConstraintsGroup,BoxComponent.Physics.ConstraintsGroup +CapsuleComponent=BP_MainChar_C.Physics.ConstraintsGroup [ContentBrowser] ContentBrowserTab1.SelectedPaths=/Game/Materials/Podpivasnaya/IND-LAAAMP/industrial_wall_sconce_4k/StaticMeshes @@ -397,12 +399,13 @@ ContentBrowserDrawer.ColumnViewColumnsManuallyChangedOnce=False ContentBrowserDrawer.JumpMRU=/All/Game/Characters/Novichok ContentBrowserDrawer.JumpMRU=/All/Game/Characters ContentBrowserDrawer.JumpMRU=/All/Game/Characters/NovichokV2 +ContentBrowserDrawer.JumpMRU=/All/Game +ContentBrowserDrawer.JumpMRU=/All 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= +ContentBrowserDrawer.JumpMRU=/All/Game/Blueprints ContentBrowserDrawer.JumpMRU=/All/Game/Materials ContentBrowserDrawer.JumpMRU=/All/Game/Materials/Podpivasnaya/IND-LAAAMP ContentBrowserDrawer.JumpMRU=/All/Game/Materials/Podpivasnaya/LAMP-TABLYA @@ -574,7 +577,7 @@ CharacterMovementComponent="\"Object\" " PawnMovementComponent="\"Object\" " NavMovementComponent="\"Object\" " MovementComponent="\"Object\" " -CapsuleComponent="\"Object\" " +CapsuleComponent="\"Object\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" " ShapeComponent="\"Object\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" " ControlRigSkeletalMeshComponent="\"Object\" " DebugSkelMeshComponent="\"Object\" " @@ -588,9 +591,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.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\" " +BP_MainChar_C="\"Object\" \"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\" \"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\" \"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\" " @@ -1592,6 +1595,7 @@ RecentAssetEditors=GenericAssetEditor RecentAssetEditors=BlueprintEditor RecentAssetEditors=BlueprintEditor RecentAssetEditors=GenericAssetEditor +OpenAssetsAtExit=/Game/TopDown/Blueprints/BP_MainChar.BP_MainChar [SlateAdditionalLayoutConfig] Viewport 1.LayoutType=FourPanes2x2 diff --git a/Saved/Config/LinuxEditor/SourceControlSettings.ini b/Saved/Config/LinuxEditor/SourceControlSettings.ini new file mode 100644 index 0000000..b1000d8 --- /dev/null +++ b/Saved/Config/LinuxEditor/SourceControlSettings.ini @@ -0,0 +1,4 @@ +;METADATA=(Diff=true, UseCommands=true) +[SourceControl.SourceControlSettings] +Provider=Git +