Send help

This commit is contained in:
Emmylou Coleen Unger 2024-07-05 15:26:56 +02:00
parent 724fc27522
commit 83d60d35bd
24 changed files with 15453 additions and 6381 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.

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

File diff suppressed because one or more lines are too long

View File

@ -127,20 +127,15 @@ 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
@ -175,7 +170,7 @@ ContentBrowserTab1.ActiveTypeFilters=
ContentBrowserTab1.EnabledTypeFilters=
ContentBrowserTab1.ActiveFrontendFilters=
ContentBrowserTab1.EnabledFrontendFilters=
ContentBrowserTab1.SelectedPaths=/Game/Assets
ContentBrowserTab1.SelectedPaths=/Game
ContentBrowserTab1.PluginFilters=
ContentBrowserTab1.Favorites.SelectedPaths=
FavoritePaths=
@ -217,12 +212,12 @@ SequenceBrowser.HiddenColumns=CurveNameList
SequenceBrowser.HiddenColumns=Class
[Directories2]
UNR=../../../../../../Users/bib/Documents/GAR/Dino Game/Content
UNR=../../../../../../Users/bib/Documents/GARGame/Content
BRUSH=../../../../../../Users/bib/Documents/GARGame/Content/
FBX=../../../../../../Users/bib/Documents/GARGame/Content/
FBXAnim=../../../../../../Users/bib/Documents/GARGame/Content/
GenericImport=../../../../../../Users/bib/Documents/Fackel1.fbx
GenericExport=C:/Users/bib/Documents/Unreal Projects/Backup_Desert_Game/Content
GenericImport=../../../../../../Users/bib/Pictures/Dino Game/Dino Game Texturen/Neue Normal/NormalNew.png
GenericExport=C:/Users/bib/Documents/Unreal Projects/Migraine/Content
GenericOpen=../../../../../../Users/bib/Documents/GARGame/Content/
GenericSave=../../../../../../Users/bib/Documents/GARGame/Content/
MeshImportExport=../../../../../../Users/bib/Documents/GARGame/Content/
@ -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
@ -2232,31 +2202,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 +2225,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 +2297,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
@ -2518,7 +2460,7 @@ TcpMessagingSettings=InputSettings.Bindings.ActionMappings,InputSettings.Binding
TemplateSequenceEditorSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
UdpMessagingSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
WmfMediaSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
SceneComponent=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
SceneComponent=
BP_Door_C=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
K2Node_VariableGet=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,StaticMeshComponent.Rendering.TextureStreaming,StaticMeshComponent.Rendering.RayTracing,StaticMeshComponent.Rendering.LOD,
BP_Lever_C=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
@ -2530,7 +2472,7 @@ 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,
PreviewMeshCollection=AssetViewerSettings.Settings.Environment,
PreviewMeshCollection=
CharacterMovementComponent=
Fang_AnimBP_C=
Character=
@ -2554,13 +2496,13 @@ 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\" "
MeshComponent="\"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
PrimitiveComponent="\"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
PrimitiveComponent=
SceneComponent=
ActorComponent=
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="\"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
ShapeComponent="\"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
CapsuleComponent=
ShapeComponent=
StaticMesh=
StreamableRenderAsset=
SphereComponent="\"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
@ -2591,6 +2533,79 @@ CryptoKeysSettings=True
GeneralProjectSettings=True
GameMapsSettings=True
InputSettings=True
GameplayTagsSettings=True
MoviePlayerSettings=True
ProjectPackagingSettings=True
HardwareTargetingSettings=True
AssetManagerSettings=True
AssetToolsSettings=True
AISystem=True
AnimationSettings=True
AudioSettings=True
ChaosSolverSettings=True
CollisionProfile=True
ConsoleSettings=True
CookerSettings=True
CrowdManager=True
DataDrivenConsoleVariableSettings=True
DebugCameraControllerSettings=True
GameplayDebuggerConfig=True
GarbageCollectionSettings=True
Engine=True
HierarchicalLODSettings=True
LandscapeSettings=True
LevelSequenceProjectSettings=True
RecastNavMesh=True
NavigationSystemV1=True
NetworkSettings=True
PhysicsSettings=True
RendererSettings=True
RendererOverrideSettings=True
SlateSettings=True
StreamingSettings=True
TutorialSettings=True
UserInterfaceSettings=True
LevelEditor2DSettings=True
EditorProjectAppearanceSettings=True
BlueprintEditorProjectSettings=True
ClassViewerProjectSettings=True
DDCProjectSettings=True
ProxyLODMeshSimplificationSettings=True
MovieSceneToolsProjectSettings=True
MeshSimplificationSettings=True
PaperImporterSettings=True
SkeletalMeshSimplificationSettings=True
StructViewerProjectSettings=True
TextureImportSettings=True
UMGEditorProjectSettings=True
AndroidRuntimeSettings=True
ShaderPlatformQualitySettings=True
AndroidSDKSettings=True
IOSRuntimeSettings=True
LinuxTargetSettings=True
MacTargetSettings=True
LuminRuntimeSettings=True
MagicLeapSDKSettings=True
WindowsTargetSettings=True
AvfMediaSettings=True
GooglePADRuntimeSettings=True
ImgMediaSettings=True
LevelSequenceEditorSettings=True
LiveLinkSettings=True
LiveLinkComponentSettings=True
LiveLinkSequencerSettings=True
MagicLeapSettings=True
MagicLeapARPinSettings=True
NiagaraSettings=True
NiagaraEditorSettings=True
OculusHMDRuntimeSettings=True
PaperRuntimeSettings=True
PythonScriptPluginSettings=True
SteamVREditorSettings=True
TakeRecorderProjectSettings=True
TcpMessagingSettings=True
UdpMessagingSettings=True
WmfMediaSettings=True
[/Script/BlueprintGraph.BlueprintEditorSettings]
bDrawMidpointArrowsInBlueprints=False
@ -2630,7 +2645,6 @@ NodeTemplateCacheCapMB=20.000000
[SelectionDetails]
PreserveScaleRatio=True
DecalSize_PreserveScaleRatio=False
[FoliageEdit]
Radius=27.397949

File diff suppressed because one or more lines are too long