Merge remote-tracking branch 'origin/main'

# Conflicts:
#	Intermediate/CachedAssetRegistry.bin
#	Saved/Config/Windows/EditorPerProjectUserSettings.ini
#	Saved/Logs/DesertGame.log
This commit is contained in:
Angeline Staiger 2024-07-05 11:32:10 +02:00
commit 4773d1e9d2
26 changed files with 15729 additions and 16 deletions

Binary file not shown.

Binary file not shown.

BIN
Content/Fang/Base.uasset Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Fang/Fang.uasset Normal file

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.

File diff suppressed because one or more lines are too long

View File

@ -127,11 +127,17 @@ PerInstanceSettings=(ConfigName="FourPanes2x2.Viewport 1.Viewport3",ConfigSettin
CurrentPosGridSize=1
[EditorStartup]
LastLevel=/Game/Map
LastLevel=/Game/Emmy_Testing
[AssetEditorSubsystem]
<<<<<<< HEAD
CleanShutdown=True
OpenAssetsAtExit=/Game/Materials/Tür.Tür
=======
CleanShutdown=False
OpenAssetsAtExit=/Game/Fang/Base.Base
OpenAssetsAtExit=/Game/Fang/Fang.Fang
>>>>>>> origin/main
[RootWindow]
ScreenPosition=X=58.400 Y=0.000
@ -1118,11 +1124,22 @@ 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/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;
>>>>>>> origin/main
RecentlyPlaced=/Game/Materials/gen2.gen2;
RecentlyPlaced=/Game/Assets/wand4.wand4;
RecentlyPlaced=/Game/Blueprints/BP_Lever.BP_Lever;
@ -1130,6 +1147,7 @@ RecentlyPlaced=/Game/Materials/gen.gen;
RecentlyPlaced=/Game/Assets/Plattform_broken__1_.Plattform_broken__1_;
RecentlyPlaced=/Game/Shader+Effekte/Fire.Fire;
RecentlyPlaced=/Game/Assets/FeuFeu.FeuFeu;
<<<<<<< HEAD
RecentlyPlaced=/Game/Materials/M_Water.M_Water;
RecentlyPlaced=/Game/Assets/wand3.wand3;
RecentlyPlaced=/Game/Assets/wand6.wand6;
@ -1143,6 +1161,14 @@ RecentlyPlaced=/Game/Assets/door_Cube.door_Cube;
RecentlyPlaced=/Game/Blueprints/BP_Door.BP_Door;
RecentlyPlaced=/Game/Materials/Treppe.Treppe;
RecentlyPlaced=/Game/Materials/Säule_destroyed.Säule_destroyed;
=======
RecentlyPlaced=/Game/Shader+Effekte/Fire_Matrial.Fire_Matrial;
RecentlyPlaced=/Game/Assets/Fackel3.Fackel3;
RecentlyPlaced=/Game/Assets/Fackel1.Fackel1;
RecentlyPlaced=/Game/Assets/test.test;
RecentlyPlaced=/Game/Materials/Lagerfeuer.Lagerfeuer;
RecentlyPlaced=/Game/Assets/wand7.wand7;
>>>>>>> origin/main
None=======
None=======
@ -1980,6 +2006,62 @@ K2Node_FunctionEntry.GraphNodeDetail=True
K2Node_FunctionEntry.Graph=True
K2Node_FunctionEntry.Inputs=True
K2Node_FunctionEntry.Outputs=True
FbxImportUI.Animation=True
SkeletalMesh.Material Slots=True
SkeletalMesh.LODCustomMode=True
SkeletalMesh.LOD0=True
SkeletalMesh.LODSettings=True
SkeletalMesh.Clothing=True
SkeletalMesh.Mesh=True
SkeletalMesh.AnimationRig=True
SkeletalMesh.SkeletalMesh=True
SkeletalMesh.Physics=True
SkeletalMesh.ImportSettings=True
SkeletalMesh.SkinWeights=True
SkeletalMesh.Lighting=True
SkeletalMesh.Animation=True
SkeletalMesh.RayTracing=True
SkeletalMesh.Sampling=True
AnimSequence.Animation=True
AnimSequence.AdditiveSettings=True
AnimSequence.Compression=True
AnimSequence.RootMotion=True
AnimSequence.ImportSettings=True
AnimSequence.Transform=True
AnimSequence.Miscellaneous=True
AnimSequence.File Path=True
AnimSequence.CustomAttributes=True
AnimSequence.MetaData=True
AnimSequence.Thumbnail=True
MaterialExpressionNormalize.MaterialExpression=True
SkeletalMeshActor.TransformCommon=True
SkeletalMeshActor.Animation=True
SkeletalMeshActor.Mesh=True
SkeletalMeshActor.Materials=True
SkeletalMeshActor.Clothing=True
SkeletalMeshActor.Physics=True
SkeletalMeshActor.Collision=True
SkeletalMeshActor.MasterPoseComponent=True
SkeletalMeshActor.Lighting=True
SkeletalMeshActor.ClothingSimulation=True
SkeletalMeshActor.Rendering=True
SkeletalMeshActor.SkinWeights=True
SkeletalMeshActor.Navigation=True
SkeletalMeshActor.VirtualTexture=True
SkeletalMeshActor.Tags=True
SkeletalMeshActor.Activation=True
SkeletalMeshActor.Cooking=True
SkeletalMeshActor.Replication=True
SkeletalMeshActor.Input=True
SkeletalMeshActor.Actor=True
Fang_AnimBP_C.RootMotion=True
Fang_AnimBP_C.Notifies=True
K2Node_InputKey.Modifier=True
K2Node_InputKey.Input=True
Fang_AnimBP_C.Default=True
AnimGraphNode_Slot.Settings=True
AnimStateNode.GraphNodeDetail=True
AnimStateNode.Animation State=True
[PluginBrowser]
InstalledPlugins=XRVisualization
@ -2003,7 +2085,7 @@ LodDistance6=0.000000
LodDistance7=0.000000
MinimumLodNumber=0
LodNumber=0
bImportAnimations=False
bImportAnimations=True
bImportMaterials=True
bImportTextures=True
@ -2060,7 +2142,7 @@ bConvertSceneUnit=False
[FBX_Import_UI_Option_FbxAnimSequenceImportData]
bImportMeshesInBoneHierarchy=True
AnimationLength=FBXALIT_ExportedTime
AnimationLength=FBXALIT_AnimatedKey
FrameImportRange=(Min=0,Max=0)
bUseDefaultSampleRate=False
CustomSampleRate=0
@ -2100,9 +2182,10 @@ bForceFrontXAxis=False
bConvertSceneUnit=False
[MessageLog]
LastLogListing=FBXImport
LastLogListing=LightingResults
[ContentBrowserRecent]
<<<<<<< HEAD
MRUItem0=/Game/Materials/M_Water
MRUItem1=/Game/Blueprints/BP_Door
MRUItem2=/Game/Textures/Tür/Texture/DefaultMaterial_Roughness
@ -2123,6 +2206,28 @@ MRUItem16=/Game/Assets/metal
MRUItem17=/Game/Materials/Fackeln/Lagerfeuer
MRUItem18=/Game/Blueprints/BPI_JumpAndRun
MRUItem19=/Game/Blueprints/BP_Spawner
=======
MRUItem0=/Game/ThirdPersonBP/Blueprints/ThirdPersonCharacter
MRUItem1=/Game/Fang/Fang_AnimBP
MRUItem2=/Game/Fang/Base
MRUItem3=/Game/Fang/Fang_Anim_rig_Walking
MRUItem4=/Game/Fang/Fang_Anim_rig_JumpFLYING
MRUItem5=/Game/Fang/Fang_Anim_JumpFLYING
MRUItem6=/Game/Fang/Base_Roughness
MRUItem7=/Game/Fang/Fang
MRUItem8=/Game/Assets/Plattform_broken__1_
MRUItem9=/Game/Assets/Plattform_broken
MRUItem10=/Game/Materials/platform_broken
MRUItem11=/Game/Map
MRUItem12=/Game/Assets/FeuFeu
MRUItem13=/Game/Assets/Fackel1
MRUItem14=/Game/Assets/Fackel3
MRUItem15=/Game/Materials/coals
MRUItem16=/Game/Assets/Fackel2
MRUItem17=/Game/Assets/flame
MRUItem18=/Game/Assets/holders
MRUItem19=/Game/Assets/metal
>>>>>>> origin/main
[AssetEditorToolkitTabLocation]
/Game/Assets/BSurfaceMesh.BSurfaceMesh=1
@ -2193,6 +2298,8 @@ None=======
/Game/Assets/FeuFeu.FeuFeu=1
/Game/Materials/platform_broken.platform_broken=1
/Game/Assets/Plattform_broken.Plattform_broken=1
/Game/Fang/Base_Roughness.Base_Roughness=0
/Game/Fang/Base.Base=0
[MaterialEditor]
PrimType=1
@ -2273,7 +2380,7 @@ ShowUnusedLayers=True
[DetailCustomWidgetExpansion]
LandscapeEditorObject=LandscapeEditorObject.Target Layers.TargetLayers,
AssetViewerSettings=AssetViewerSettings.Settings.Environment,
ThirdPersonCharacter_C=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
ThirdPersonCharacter_C=
CapsuleComponent=
CryptoKeysSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
GeneralProjectSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
@ -2365,9 +2472,16 @@ PropertyWrapper=StaticMeshComponent.Rendering.TextureStreaming,StaticMeshCompone
K2Node_VariableSet=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,StaticMeshComponent.Rendering.TextureStreaming,StaticMeshComponent.Rendering.RayTracing,StaticMeshComponent.Rendering.LOD,
Landscape=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
PersonaPreviewSceneDescription=AssetViewerSettings.Settings.Environment,
<<<<<<< HEAD
PreviewMeshCollection=
Actor=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
PrimitiveComponent=
=======
PreviewMeshCollection=AssetViewerSettings.Settings.Environment,
CharacterMovementComponent=
Fang_AnimBP_C=
Character=
>>>>>>> origin/main
[DetailPropertyExpansion]
MaterialExpressionDynamicParameter="\"Object.ParamNames\" \"Object.DefaultValue\" "
@ -2375,9 +2489,9 @@ MaterialExpression=
Object=
MaterialExpressionScalarParameter="\"Object.DefaultValue\" "
MaterialExpressionParameter="\"Object.DefaultValue\" "
ThirdPersonCharacter_C="\"Object.Character.Mesh.Object.Rendering.CustomPrimitiveData\" \"Object.Character.Mesh.Object.Lighting.LightingChannels\" \"Object.Character.Mesh.Object.Collision.BodyInstance\" \"Object.Character.Mesh.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.CharacterMovement.Object.Character Movement: Walking.CurrentFloor\" \"Object.Character.CharacterMovement.Object.Character Movement (Rotation Settings).RotationRate\" \"Object.Character.CharacterMovement.Object.NavMovement.NavAgentProps\" \"Object.Character.CapsuleComponent.Object.Shape.ShapeColor\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.CapsuleComponent.Object.Rendering.CustomPrimitiveData\" "
Character="\"Object.Character.Mesh.Object.Rendering.CustomPrimitiveData\" \"Object.Character.Mesh.Object.Lighting.LightingChannels\" \"Object.Character.Mesh.Object.Collision.BodyInstance\" \"Object.Character.Mesh.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.CharacterMovement.Object.Character Movement: Walking.CurrentFloor\" \"Object.Character.CharacterMovement.Object.Character Movement (Rotation Settings).RotationRate\" \"Object.Character.CharacterMovement.Object.NavMovement.NavAgentProps\" \"Object.Character.CapsuleComponent.Object.Shape.ShapeColor\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.CapsuleComponent.Object.Rendering.CustomPrimitiveData\" "
Pawn="\"Object.Character.Mesh.Object.Rendering.CustomPrimitiveData\" \"Object.Character.Mesh.Object.Lighting.LightingChannels\" \"Object.Character.Mesh.Object.Collision.BodyInstance\" \"Object.Character.Mesh.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.CharacterMovement.Object.Character Movement: Walking.CurrentFloor\" \"Object.Character.CharacterMovement.Object.Character Movement (Rotation Settings).RotationRate\" \"Object.Character.CharacterMovement.Object.NavMovement.NavAgentProps\" \"Object.Character.CapsuleComponent.Object.Shape.ShapeColor\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.CapsuleComponent.Object.Rendering.CustomPrimitiveData\" "
ThirdPersonCharacter_C=
Character=
Pawn=
MaterialExpressionVectorParameter="\"Object.DefaultValue\" "
GeomModifier_Pen="\"Object.Settings\" "
GeomModifier_Edit="\"Object.Settings\" "
@ -2385,10 +2499,17 @@ GeomModifier="\"Object.Settings\" "
None=======
InputSettings="\"Object.Bindings.ActionMappings.ActionMappings[4]\" "
StaticMeshComponent="\"Object.Rendering.WireframeColorOverride\" \"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightmassSettings\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
<<<<<<< HEAD
MeshComponent="\"Object.Rendering.WireframeColorOverride\" \"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightmassSettings\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
PrimitiveComponent=
SceneComponent=
ActorComponent=
=======
MeshComponent="\"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
PrimitiveComponent="\"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
SceneComponent="\"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
ActorComponent="\"Object.NavMovement.NavAgentProps\" "
>>>>>>> origin/main
SkeletalMeshComponent="\"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
SkinnedMeshComponent="\"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
CapsuleComponent=
@ -2399,6 +2520,10 @@ SphereComponent="\"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstan
BoxComponent="\"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
PreviewMeshCollection="\"Object.SkeletalMeshes\" "
DataAsset="\"Object.SkeletalMeshes\" "
CharacterMovementComponent="\"Object.NavMovement.NavAgentProps\" "
PawnMovementComponent="\"Object.NavMovement.NavAgentProps\" "
NavMovementComponent="\"Object.NavMovement.NavAgentProps\" "
MovementComponent="\"Object.NavMovement.NavAgentProps\" "
[/Script/UnrealEd.EditorLoadingSavingSettings]
bSCCUseGlobalSettings=False
@ -2515,6 +2640,8 @@ Contexts=(Name="AnimationBlueprintEditor",Commands=)
Contexts=(Name="AnimationBlueprintEditor.Viewport0",Commands=)
Contexts=(Name="AnimationEditor",Commands=)
Contexts=(Name="AnimationEditor.Viewport0",Commands=)
Contexts=(Name="SkeletalMeshEditor",Commands=)
Contexts=(Name="SkeletalMeshEditor.Viewport0",Commands=)
[SuppressableDialogs]
Warning_CompileErrorsInMaterial=False

View File

@ -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

File diff suppressed because one or more lines are too long

Binary file not shown.