PBM2H22CWE/GARGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	Intermediate/CachedAssetRegistry.bin
#	Saved/Autosaves/PackageRestoreData.json
#	Saved/Config/Windows/EditorPerProjectUserSettings.ini
#	Saved/Logs/DesertGame.log
This commit is contained in:
Angeline Staiger
2024-07-05 14:56:15 +02:00
parent 3f36e0ca39 2bbc7c8697
commit 724fc27522
20 changed files with 26499 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Saved/Autosaves/Game/Fang/Base_Normal_Auto8.uasset Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/Fang/MCBakingTest_Low_Base_Normal_Auto9.uasset Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/Fang/NormalNew_Auto0.uasset Normal file
View File

Binary file not shown.

113
Saved/Config/Windows/EditorPerProjectUserSettings.ini
View File

@@ -130,8 +130,17 @@ CurrentPosGridSize=1
LastLevel=/Game/Map
[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
@@ -1123,6 +1132,7 @@ MRUItem1=/Game/Emmy_Testing
MRUItem2=/Game/Test
[PlacementMode]
<<<<<<< HEAD
RecentlyPlaced=/Game/Assets/Cacti3.Cacti3;
RecentlyPlaced=/Game/Assets/Cacti2.Cacti2;
RecentlyPlaced=/Game/Assets/Cacti1.Cacti1;
@@ -1135,6 +1145,9 @@ 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;
@@ -1143,6 +1156,19 @@ 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;
RecentlyPlaced=/Game/Shader+Effekte/Fire.Fire;
RecentlyPlaced=/Game/Assets/FeuFeu.FeuFeu;
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;
>>>>>>> origin/main
None=======
None=======
@@ -2038,11 +2064,55 @@ 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
AnimGraphNode_BlendSpacePlayer.Coordinates=True
AnimGraphNode_BlendSpacePlayer.Settings=True
AnimGraphNode_BlendSpacePlayer.Relevancy=True
AnimStateTransitionNode.Transition=True
AnimStateTransitionNode.BlendSettings=True
AnimStateTransitionNode.Events=True
AnimStateTransitionNode.Notifications=True
AnimMontage.Animation=True
AnimMontage.BlendOption=True
AnimMontage.SyncGroup=True
AnimMontage.AdditiveSettings=True
AnimMontage.TimeStretchCurve=True
AnimMontage.MetaData=True
AnimMontage.Thumbnail=True
SpringArmComponent.Variable=True
SpringArmComponent.TransformCommon=True
SpringArmComponent.Sockets=True
SpringArmComponent.Camera=True
SpringArmComponent.CameraCollision=True
SpringArmComponent.CameraSettings=True
SpringArmComponent.ComponentTick=True
SpringArmComponent.Lag=True
SpringArmComponent.Rendering=True
SpringArmComponent.Tags=True
SpringArmComponent.ComponentReplication=True
SpringArmComponent.Activation=True
SpringArmComponent.Cooking=True
SpringArmComponent.Events=True
CapsuleComponent.HLOD=True
BP_Dance_C.Tick=True
BP_Dance_C.Replication=True
BP_Dance_C.Rendering=True
BP_Dance_C.Collision=True
BP_Dance_C.Actor=True
BP_Dance_C.Input=True
BP_Dance_C.TransformCommon=True
EditorAnimSegment.Animation Segment=True
EditorAnimSegment.Montage=True
>>>>>>> origin/main
[PluginBrowser]
InstalledPlugins=XRVisualization
@@ -2165,6 +2235,7 @@ bConvertSceneUnit=False
LastLogListing=FBXImport
[ContentBrowserRecent]
<<<<<<< HEAD
MRUItem0=/Game/Assets/Material
MRUItem1=/Game/Assets/Trap
MRUItem2=/Game/Textures/Wandgemälde
@@ -2185,6 +2256,28 @@ 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
MRUItem3=/Game/Blueprints/BP_Dance
MRUItem4=/Game/Blueprints/BP_Deathbox
MRUItem5=/Game/Fang/Fang_Anim_rig_Walking
MRUItem6=/Game/Fang/Fang_Anim_rig_Running
MRUItem7=/Game/Fang/Fang_InteractionMon
MRUItem8=/Game/ThirdPersonBP/Blueprints/ThirdPersonCharacter
MRUItem9=/Game/Fang/Walk_RunBS
MRUItem10=/Game/Fang/Fang_Anim_rig_JumpFLYING
MRUItem11=/Game/Mannequin/Animations/ThirdPerson_IdleRun_2D
MRUItem12=/Game/Mannequin/Animations/ThirdPerson_AnimBP
MRUItem13=/Game/Fang/Fang_AnimBP
MRUItem14=/Game/Fang/Base
MRUItem15=/Game/Fang/Fang_Anim_JumpFLYING
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
@@ -2257,8 +2350,14 @@ 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
@@ -2419,7 +2518,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=
SceneComponent=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
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,
@@ -2436,6 +2535,7 @@ CharacterMovementComponent=
Fang_AnimBP_C=
Character=
BlendSpace1D=BlendSpace1D.Axis Settings.Horizontal Axis,
BP_Dance_C=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
[DetailPropertyExpansion]
MaterialExpressionDynamicParameter="\"Object.ParamNames\" \"Object.DefaultValue\" "
@@ -2454,12 +2554,12 @@ 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.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\" "
PrimitiveComponent="\"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
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=
CapsuleComponent="\"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
ShapeComponent="\"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
StaticMesh=
StreamableRenderAsset=
@@ -2594,3 +2694,6 @@ Contexts=(Name="SkeletalMeshEditor.Viewport0",Commands=)
[SuppressableDialogs]
Warning_CompileErrorsInMaterial=False
[DetailCategoriesAdvanced]
CapsuleComponent.Shape=False

1572
Saved/Crashes/UE4CC-Windows-11AD34AA4A9D054AE76B738DAB61FD6D_0000/CrashContext.runtime-xml Normal file
View File

File diff suppressed because it is too large Load Diff

5
Saved/Crashes/UE4CC-Windows-11AD34AA4A9D054AE76B738DAB61FD6D_0000/CrashReportClient.ini Normal file
View File

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

18961
Saved/Crashes/UE4CC-Windows-11AD34AA4A9D054AE76B738DAB61FD6D_0000/DesertGame.log Normal file
View File

File diff suppressed because one or more lines are too long

BIN
Saved/Crashes/UE4CC-Windows-11AD34AA4A9D054AE76B738DAB61FD6D_0000/UE4Minidump.dmp Normal file
View File

Binary file not shown.

5853
Saved/Logs/DesertGame.log
View File

File diff suppressed because it is too large Load Diff