Compare commits
No commits in common. "724fc27522de98616fa0c347325f133ab6ecf30b" and "2bbc7c869779215ad5ad5a7330e45fdceebc10e2" have entirely different histories.
724fc27522
...
2bbc7c8697
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/Assets/Material.uasset
Normal file
BIN
Content/Assets/Material.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/Map.umap
BIN
Content/Map.umap
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: 77 KiB After Width: | Height: | Size: 75 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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,5 +0,0 @@
|
||||
[CrashReportClient]
|
||||
bHideLogFilesOption=false
|
||||
bIsAllowedToCloseWithoutSending=true
|
||||
CrashConfigPurgeDays=2
|
||||
|
@ -127,26 +127,21 @@ PerInstanceSettings=(ConfigName="FourPanes2x2.Viewport 1.Viewport3",ConfigSettin
|
||||
CurrentPosGridSize=1
|
||||
|
||||
[EditorStartup]
|
||||
LastLevel=/Game/Map
|
||||
LastLevel=/Game/Emmy_Testing
|
||||
|
||||
[AssetEditorSubsystem]
|
||||
<<<<<<< HEAD
|
||||
CleanShutdown=True
|
||||
OpenAssetsAtExit=/Game/Materials/Wandgemälde.Wandgemälde
|
||||
=======
|
||||
CleanShutdown=False
|
||||
OpenAssetsAtExit=/Game/Fang/Base.Base
|
||||
OpenAssetsAtExit=/Game/Fang/Fang.Fang
|
||||
OpenAssetsAtExit=/Game/Fang/Fang_Dance.Fang_Dance
|
||||
OpenAssetsAtExit=/Game/ThirdPersonBP/Blueprints/ThirdPersonCharacter.ThirdPersonCharacter
|
||||
OpenAssetsAtExit=/Game/Blueprints/BP_Dance.BP_Dance
|
||||
>>>>>>> origin/main
|
||||
|
||||
[RootWindow]
|
||||
ScreenPosition=X=58.400 Y=0.000
|
||||
ScreenPosition=X=56.800 Y=39.200
|
||||
WindowSize=X=1310.400 Y=750.400
|
||||
WindowSize=X=1334.400 Y=774.400
|
||||
WindowSize=X=1332.800 Y=772.800
|
||||
None=======
|
||||
InitiallyMaximized=True
|
||||
|
||||
@ -175,7 +170,7 @@ ContentBrowserTab1.ActiveTypeFilters=
|
||||
ContentBrowserTab1.EnabledTypeFilters=
|
||||
ContentBrowserTab1.ActiveFrontendFilters=
|
||||
ContentBrowserTab1.EnabledFrontendFilters=
|
||||
ContentBrowserTab1.SelectedPaths=/Game/Assets
|
||||
ContentBrowserTab1.SelectedPaths=/Game/Blueprints
|
||||
ContentBrowserTab1.PluginFilters=
|
||||
ContentBrowserTab1.Favorites.SelectedPaths=
|
||||
FavoritePaths=
|
||||
@ -1127,37 +1122,21 @@ AnimationEditor.TimeStamp=2024.05.13-09.53.19
|
||||
AnimationEditor.LastCompileMethod=Unknown
|
||||
|
||||
[MRU]
|
||||
MRUItem0=/Game/Map
|
||||
MRUItem1=/Game/Emmy_Testing
|
||||
MRUItem0=/Game/Emmy_Testing
|
||||
MRUItem1=/Game/Map
|
||||
MRUItem2=/Game/Test
|
||||
|
||||
[PlacementMode]
|
||||
<<<<<<< HEAD
|
||||
RecentlyPlaced=/Game/Assets/Cacti3.Cacti3;
|
||||
RecentlyPlaced=/Game/Assets/Cacti2.Cacti2;
|
||||
RecentlyPlaced=/Game/Assets/Cacti1.Cacti1;
|
||||
RecentlyPlaced=/Game/Assets/Cacti5.Cacti5;
|
||||
RecentlyPlaced=/Game/Assets/Cacti4.Cacti4;
|
||||
RecentlyPlaced=/Game/Assets/Trap.Trap;
|
||||
RecentlyPlaced=/Game/Materials/gen.gen;
|
||||
RecentlyPlaced=/Game/Assets/Plattform_broken__1_.Plattform_broken__1_;
|
||||
RecentlyPlaced=/Game/Shader+Effekte/FireSmall.FireSmall;
|
||||
RecentlyPlaced=/Game/Assets/Fackel2.Fackel2;
|
||||
RecentlyPlaced=/Game/Materials/Wandgemälde.Wandgemälde;
|
||||
RecentlyPlaced=/Script/Engine.DecalActor;/Engine/Transient.ActorFactoryDeferredDecal_0
|
||||
=======
|
||||
RecentlyPlaced=/Game/Blueprints/BP_Dance.BP_Dance;
|
||||
>>>>>>> origin/main
|
||||
RecentlyPlaced=/Game/Fang/Fang.Fang;
|
||||
RecentlyPlaced=/Game/Fang/Fang_Anim_rig_Dance.Fang_Anim_rig_Dance;
|
||||
RecentlyPlaced=/Game/Blueprints/BP_Door.BP_Door;
|
||||
RecentlyPlaced=/Game/Materials/gen.gen;
|
||||
RecentlyPlaced=/Game/Materials/M_Water.M_Water;
|
||||
RecentlyPlaced=/Game/Materials/Treppe.Treppe;
|
||||
RecentlyPlaced=/Game/Materials/Säule_destroyed.Säule_destroyed;
|
||||
RecentlyPlaced=/Game/Materials/platform_broken.platform_broken;
|
||||
RecentlyPlaced=/Game/Materials/gen2.gen2;
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
RecentlyPlaced=/Game/Assets/Plattform_broken__1_.Plattform_broken__1_;
|
||||
RecentlyPlaced=/Game/Shader+Effekte/FireSmall.FireSmall;
|
||||
RecentlyPlaced=/Game/Assets/Fackel2.Fackel2;
|
||||
@ -1168,7 +1147,6 @@ RecentlyPlaced=/Game/Assets/Fackel3.Fackel3;
|
||||
RecentlyPlaced=/Game/Assets/Fackel1.Fackel1;
|
||||
RecentlyPlaced=/Game/Assets/test.test;
|
||||
RecentlyPlaced=/Game/Materials/Lagerfeuer.Lagerfeuer;
|
||||
>>>>>>> origin/main
|
||||
None=======
|
||||
None=======
|
||||
|
||||
@ -2064,13 +2042,6 @@ AnimStateNode.GraphNodeDetail=True
|
||||
AnimStateNode.Animation State=True
|
||||
AnimGraphNode_SequencePlayer.Settings=True
|
||||
AnimGraphNode_SequencePlayer.Relevancy=True
|
||||
<<<<<<< HEAD
|
||||
DecalActor.TransformCommon=True
|
||||
DecalActor.Decal=True
|
||||
DecalActor.Rendering=True
|
||||
DecalActor.Tags=True
|
||||
DecalActor.Cooking=True
|
||||
=======
|
||||
BoneProxy.Transform=True
|
||||
BoneProxy.Bone=True
|
||||
BoneProxy.Reference Transform=True
|
||||
@ -2112,7 +2083,6 @@ BP_Dance_C.Input=True
|
||||
BP_Dance_C.TransformCommon=True
|
||||
EditorAnimSegment.Animation Segment=True
|
||||
EditorAnimSegment.Montage=True
|
||||
>>>>>>> origin/main
|
||||
|
||||
[PluginBrowser]
|
||||
InstalledPlugins=XRVisualization
|
||||
@ -2120,6 +2090,7 @@ InstalledPlugins=XRVisualization
|
||||
[/Script/UnrealEd.MaterialEditorOptions]
|
||||
bHideUnrelatedNodes=False
|
||||
bUseUnsortedMenus=False
|
||||
bShowGrid=False
|
||||
|
||||
[FBX_Import_UI_Option_FbxImportUI]
|
||||
bOverrideFullName=True
|
||||
@ -2232,31 +2203,9 @@ bForceFrontXAxis=False
|
||||
bConvertSceneUnit=False
|
||||
|
||||
[MessageLog]
|
||||
LastLogListing=FBXImport
|
||||
LastLogListing=LightingResults
|
||||
|
||||
[ContentBrowserRecent]
|
||||
<<<<<<< HEAD
|
||||
MRUItem0=/Game/Assets/Material
|
||||
MRUItem1=/Game/Assets/Trap
|
||||
MRUItem2=/Game/Textures/Wandgemälde
|
||||
MRUItem3=/Game/Materials/Wandgemälde
|
||||
MRUItem4=/Game/Map
|
||||
MRUItem5=/Game/Fang/Walk_RunBS
|
||||
MRUItem6=/Game/Mannequin/Animations/ThirdPerson_IdleRun_2D
|
||||
MRUItem7=/Game/Mannequin/Animations/ThirdPerson_AnimBP
|
||||
MRUItem8=/Game/ThirdPersonBP/Blueprints/ThirdPersonCharacter
|
||||
MRUItem9=/Game/Fang/Fang_AnimBP
|
||||
MRUItem10=/Game/Fang/Base
|
||||
MRUItem11=/Game/Fang/Fang_Anim_rig_Walking
|
||||
MRUItem12=/Game/Fang/Fang_Anim_rig_JumpFLYING
|
||||
MRUItem13=/Game/Fang/Fang_Anim_JumpFLYING
|
||||
MRUItem14=/Game/Fang/Base_Roughness
|
||||
MRUItem15=/Game/Fang/Fang
|
||||
MRUItem16=/Game/Assets/Plattform_broken__1_
|
||||
MRUItem17=/Game/Assets/Plattform_broken
|
||||
MRUItem18=/Game/Materials/platform_broken
|
||||
MRUItem19=/Game/Assets/FeuFeu
|
||||
=======
|
||||
MRUItem0=/Game/Fang/Fang_Dance
|
||||
MRUItem1=/Game/Blueprints/BP_BrokenPlattform
|
||||
MRUItem2=/Game/Blueprints/BPI_JumpAndRun
|
||||
@ -2277,7 +2226,6 @@ MRUItem16=/Game/Fang/Base_Roughness
|
||||
MRUItem17=/Game/Fang/Fang
|
||||
MRUItem18=/Game/Assets/Plattform_broken__1_
|
||||
MRUItem19=/Game/Assets/Plattform_broken
|
||||
>>>>>>> origin/main
|
||||
|
||||
[AssetEditorToolkitTabLocation]
|
||||
/Game/Assets/BSurfaceMesh.BSurfaceMesh=1
|
||||
@ -2350,14 +2298,9 @@ None=======
|
||||
/Game/Assets/Plattform_broken.Plattform_broken=1
|
||||
/Game/Fang/Base_Roughness.Base_Roughness=0
|
||||
/Game/Fang/Base.Base=0
|
||||
<<<<<<< HEAD
|
||||
/Game/Textures/Wandgemälde.Wandgemälde=0
|
||||
/Game/Assets/Material.Material=0
|
||||
=======
|
||||
/Game/Fang/Fang_Anim_rig_Walking.Fang_Anim_rig_Walking=0
|
||||
/Game/Fang/Fang_AnimBP.Fang_AnimBP=0
|
||||
/Game/Fang/Fang_Dance.Fang_Dance=0
|
||||
>>>>>>> origin/main
|
||||
|
||||
[MaterialEditor]
|
||||
PrimType=1
|
||||
@ -2630,7 +2573,6 @@ NodeTemplateCacheCapMB=20.000000
|
||||
|
||||
[SelectionDetails]
|
||||
PreserveScaleRatio=True
|
||||
DecalSize_PreserveScaleRatio=False
|
||||
|
||||
[FoliageEdit]
|
||||
Radius=27.397949
|
||||
|
@ -58,3 +58,11 @@ MLSDKPath=(Path="")
|
||||
[/Script/UnrealEd.EditorEngine]
|
||||
FlipNormalMapGreenChannel=False
|
||||
|
||||
[WindowsApplication.Accessibility]
|
||||
StickyKeysHotkey=True
|
||||
ToggleKeysHotkey=True
|
||||
FilterKeysHotkey=True
|
||||
StickyKeysConfirmation=True
|
||||
ToggleKeysConfirmation=True
|
||||
FilterKeysConfirmation=True
|
||||
|
||||
|
Binary file not shown.
1122
Saved/Logs/DesertGame-backup-2024.07.03-21.28.43.log
Normal file
1122
Saved/Logs/DesertGame-backup-2024.07.03-21.28.43.log
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user