Compare commits

..

No commits in common. "616b8cb7920871a5c10f2e72993a7a8024959527" and "130edb7865d5d51ff8371d42f13f77ae09884bad" have entirely different histories.

34 changed files with 21455 additions and 15335 deletions

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: 67 KiB

After

Width:  |  Height:  |  Size: 61 KiB

View File

@ -1,5 +0,0 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

View File

@ -1,5 +0,0 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

View File

@ -1,5 +0,0 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

View File

@ -1,5 +0,0 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

View File

@ -1,5 +0,0 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

View File

@ -136,7 +136,7 @@ CleanShutdown=True
ScreenPosition=X=58.400 Y=0.000 ScreenPosition=X=58.400 Y=0.000
ScreenPosition=X=56.800 Y=39.200 ScreenPosition=X=56.800 Y=39.200
WindowSize=X=1310.400 Y=750.400 WindowSize=X=1310.400 Y=750.400
WindowSize=X=1323.200 Y=763.200 WindowSize=X=1316.800 Y=756.800
None======= None=======
InitiallyMaximized=True InitiallyMaximized=True
@ -1122,26 +1122,26 @@ MRUItem1=/Game/Emmy_Testing
MRUItem2=/Game/Test MRUItem2=/Game/Test
[PlacementMode] [PlacementMode]
RecentlyPlaced=/Game/Materials/Säule_destroyed.Säule_destroyed;
RecentlyPlaced=/Game/Assets/saeule_destroyed.saeule_destroyed;
RecentlyPlaced=/Game/Materials/gen2.gen2; RecentlyPlaced=/Game/Materials/gen2.gen2;
RecentlyPlaced=/Game/Assets/wand_destroyed.wand_destroyed;
RecentlyPlaced=/Game/Assets/Fackel1.Fackel1;
RecentlyPlaced=/Game/Assets/Fackel2.Fackel2;
RecentlyPlaced=/Game/Assets/Fackel3.Fackel3;
RecentlyPlaced=/Game/Assets/wand2.wand2;
RecentlyPlaced=/Game/Materials/M_Water.M_Water;
RecentlyPlaced=/Game/Materials/gen.gen; RecentlyPlaced=/Game/Materials/gen.gen;
RecentlyPlaced=/Game/Assets/wand3.wand3;
RecentlyPlaced=/Game/Assets/wand.wand; RecentlyPlaced=/Game/Assets/wand.wand;
RecentlyPlaced=/Game/Assets/cornerPiece.cornerPiece; RecentlyPlaced=/Game/Assets/cornerPiece.cornerPiece;
RecentlyPlaced=/Game/Materials/Säule.Säule; RecentlyPlaced=/Game/Materials/Säule.Säule;
RecentlyPlaced=/Game/Materials/Säule_destroyed.Säule_destroyed;
RecentlyPlaced=/Game/Materials/Treppe.Treppe; RecentlyPlaced=/Game/Materials/Treppe.Treppe;
RecentlyPlaced=/Game/Assets/saeule.saeule; RecentlyPlaced=/Game/Assets/saeule.saeule;
RecentlyPlaced=/Game/Assets/saeule_destroyed.saeule_destroyed;
RecentlyPlaced=/Engine/BasicShapes/Cube.Cube;/Engine/Transient.ActorFactoryBasicShape_0 RecentlyPlaced=/Engine/BasicShapes/Cube.Cube;/Engine/Transient.ActorFactoryBasicShape_0
RecentlyPlaced=/Game/Assets/treppe_Cube.treppe_Cube; RecentlyPlaced=/Game/Assets/treppe_Cube.treppe_Cube;
RecentlyPlaced=/Game/Assets/treppe_Cube_001.treppe_Cube_001; RecentlyPlaced=/Game/Assets/treppe_Cube_001.treppe_Cube_001;
RecentlyPlaced=/Game/Assets/treppe_Cube_002.treppe_Cube_002; RecentlyPlaced=/Game/Assets/treppe_Cube_002.treppe_Cube_002;
RecentlyPlaced=/Game/Assets/door_Cube.door_Cube;
RecentlyPlaced=/Game/Blueprints/BP_Lever.BP_Lever;
RecentlyPlaced=/Script/Engine.PointLight;/Engine/Transient.ActorFactoryPointLight_0
RecentlyPlaced=/Script/Engine.DirectionalLight;/Engine/Transient.ActorFactoryDirectionalLight_0
RecentlyPlaced=/Game/Blueprints/BP_Door.BP_Door;
RecentlyPlaced=/Game/Blueprints/BP_Spawner.BP_Spawner;
RecentlyPlaced=/Game/Blueprints/BP_Projectile.BP_Projectile;
None======= None=======
None======= None=======
@ -1982,6 +1982,7 @@ InstalledPlugins=XRVisualization
[/Script/UnrealEd.MaterialEditorOptions] [/Script/UnrealEd.MaterialEditorOptions]
bHideUnrelatedNodes=False bHideUnrelatedNodes=False
bUseUnsortedMenus=False bUseUnsortedMenus=False
bShowGrid=False
[FBX_Import_UI_Option_FbxImportUI] [FBX_Import_UI_Option_FbxImportUI]
bOverrideFullName=True bOverrideFullName=True
@ -2097,26 +2098,26 @@ bConvertSceneUnit=False
LastLogListing=FBXImport LastLogListing=FBXImport
[ContentBrowserRecent] [ContentBrowserRecent]
MRUItem0=/Game/Assets/Fackel1 MRUItem0=/Game/Map
MRUItem1=/Game/Assets/door_Cube_001 MRUItem1=/Game/Mannequin/Animations/ThirdPerson_AnimBP
MRUItem2=/Game/Assets/Fackel3 MRUItem2=/Game/Mannequin/Animations/ThirdPerson_IdleRun_2D
MRUItem3=/Game/Assets/Fackel2 MRUItem3=/Game/Blueprints/BP_GameInstance
MRUItem4=/Game/Materials/M_Water MRUItem4=/Game/Blueprints/BPI_JumpAndRun
MRUItem5=/Game/Map MRUItem5=/Game/ThirdPersonBP/Blueprints/ThirdPersonCharacter
MRUItem6=/Game/Mannequin/Animations/ThirdPerson_AnimBP MRUItem6=/Game/Blueprints/BP_CheckpointGame
MRUItem7=/Game/Mannequin/Animations/ThirdPerson_IdleRun_2D MRUItem7=/Game/Blueprints/BP_Checkpoint
MRUItem8=/Game/Blueprints/BP_GameInstance MRUItem8=/Game/Materials/KugelMat
MRUItem9=/Game/Blueprints/BPI_JumpAndRun MRUItem9=/Game/Blueprints/BP_Deathbox
MRUItem10=/Game/ThirdPersonBP/Blueprints/ThirdPersonCharacter MRUItem10=/Game/Blueprints/CharacterPhysics
MRUItem11=/Game/Blueprints/BP_CheckpointGame MRUItem11=/Engine/EngineMaterials/DefaultPhysicalMaterial
MRUItem12=/Game/Blueprints/BP_Checkpoint MRUItem12=/Engine/EngineMaterials/PhysMat_Metal
MRUItem13=/Game/Materials/KugelMat MRUItem13=/Game/Blueprints/BP_Projectile
MRUItem14=/Game/Blueprints/BP_Deathbox MRUItem14=/Game/Blueprints/BP_Spawner
MRUItem15=/Game/Blueprints/CharacterPhysics MRUItem15=/Game/Assets/FallenKugel
MRUItem16=/Engine/EngineMaterials/DefaultPhysicalMaterial MRUItem16=/Game/Materials/Island
MRUItem17=/Engine/EngineMaterials/PhysMat_Metal MRUItem17=/Game/Textures/Treppe/Treppe_Roughness
MRUItem18=/Game/Blueprints/BP_Projectile MRUItem18=/Game/Textures/Treppe/Treppe_Mixed_AO
MRUItem19=/Game/Blueprints/BP_Spawner MRUItem19=/Game/Materials/Treppe
[AssetEditorToolkitTabLocation] [AssetEditorToolkitTabLocation]
/Game/Assets/BSurfaceMesh.BSurfaceMesh=1 /Game/Assets/BSurfaceMesh.BSurfaceMesh=1
@ -2172,11 +2173,6 @@ None=======
/Game/Blueprints/BP_GameInstance.BP_GameInstance=1 /Game/Blueprints/BP_GameInstance.BP_GameInstance=1
/Game/Mannequin/Animations/ThirdPerson_AnimBP.ThirdPerson_AnimBP=0 /Game/Mannequin/Animations/ThirdPerson_AnimBP.ThirdPerson_AnimBP=0
/Game/Mannequin/Animations/ThirdPerson_IdleRun_2D.ThirdPerson_IdleRun_2D=0 /Game/Mannequin/Animations/ThirdPerson_IdleRun_2D.ThirdPerson_IdleRun_2D=0
/Game/Materials/M_Water.M_Water=1
/Game/Assets/Fackel2.Fackel2=1
/Game/Assets/Fackel3.Fackel3=1
/Game/Assets/door_Cube_001.door_Cube_001=1
/Game/Assets/Fackel1.Fackel1=1
[MaterialEditor] [MaterialEditor]
PrimType=1 PrimType=1
@ -2368,15 +2364,15 @@ None=======
InputSettings="\"Object.Bindings.ActionMappings.ActionMappings[4]\" " 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\" " StaticMeshComponent="\"Object.Rendering.WireframeColorOverride\" \"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightmassSettings\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
MeshComponent="\"Object.Rendering.WireframeColorOverride\" \"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightmassSettings\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" " MeshComponent="\"Object.Rendering.WireframeColorOverride\" \"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightmassSettings\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
PrimitiveComponent="\"Object.Rendering.WireframeColorOverride\" \"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightmassSettings\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" " PrimitiveComponent=
SceneComponent="\"Object.Rendering.WireframeColorOverride\" \"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightmassSettings\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" " SceneComponent=
ActorComponent="\"Object.Rendering.WireframeColorOverride\" \"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightmassSettings\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" " ActorComponent=
SkeletalMeshComponent="\"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" " 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\" " SkinnedMeshComponent="\"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
CapsuleComponent= CapsuleComponent=
ShapeComponent= ShapeComponent=
StaticMesh= StaticMesh="\"Object.StaticMesh.BodySetup.Object.DefaultInstance.CollisionResponses.ResponseArray.ResponseArray[7]\" "
StreamableRenderAsset= StreamableRenderAsset="\"Object.StaticMesh.BodySetup.Object.DefaultInstance.CollisionResponses.ResponseArray.ResponseArray[7]\" "
SphereComponent="\"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" " SphereComponent="\"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
BoxComponent="\"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" " BoxComponent="\"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
PreviewMeshCollection="\"Object.SkeletalMeshes\" " PreviewMeshCollection="\"Object.SkeletalMeshes\" "
@ -2498,6 +2494,3 @@ Contexts=(Name="AnimationBlueprintEditor.Viewport0",Commands=)
Contexts=(Name="AnimationEditor",Commands=) Contexts=(Name="AnimationEditor",Commands=)
Contexts=(Name="AnimationEditor.Viewport0",Commands=) Contexts=(Name="AnimationEditor.Viewport0",Commands=)
[SuppressableDialogs]
Warning_CompileErrorsInMaterial=False

View File

@ -1,5 +0,0 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

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

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

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

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