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

Compare commits

base: PBM2H22CWE:531b9f371e6e9c4a34800c18fc4f6088913252a1
Branches Tags
PBM2H22CWE:main
..
compare: PBM2H22CWE:50134fae94b1c923e59ffbce471b599d0907c77f
Branches Tags
PBM2H22CWE:main

No commits in common. "531b9f371e6e9c4a34800c18fc4f6088913252a1" and "50134fae94b1c923e59ffbce471b599d0907c77f" have entirely different histories.
531b9f371e ... 50134fae94

7 changed files with 2494 additions and 423 deletions
Show Stats Expand all files Collapse all files

BIN
Content/Fang/Fang_AnimBP.uasset
View File

Binary file not shown.

BIN
Content/Fang/Walk_RunBS.uasset
View File

Binary file not shown.

BIN
Intermediate/CachedAssetRegistry.bin
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/Fang/Fang_AnimBP_Auto6.uasset
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/Fang/Walk_RunBS_Auto7.uasset
View File

Binary file not shown.

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

@ -130,18 +130,20 @@ CurrentPosGridSize=1
LastLevel=/Game/Emmy_Testing LastLevel=/Game/Emmy_Testing
[AssetEditorSubsystem] [AssetEditorSubsystem]
<<<<<<< HEAD
CleanShutdown=True
OpenAssetsAtExit=/Game/Materials/Tür.Tür
=======
CleanShutdown=False CleanShutdown=False
OpenAssetsAtExit=/Game/Fang/Base.Base OpenAssetsAtExit=/Game/Fang/Base.Base
OpenAssetsAtExit=/Game/Fang/Fang.Fang OpenAssetsAtExit=/Game/Fang/Fang.Fang
OpenAssetsAtExit=/Game/Fang/Fang_AnimBP.Fang_AnimBP >>>>>>> origin/main
OpenAssetsAtExit=/Game/Mannequin/Animations/ThirdPerson_AnimBP.ThirdPerson_AnimBP
OpenAssetsAtExit=/Game/Mannequin/Animations/ThirdPerson_IdleRun_2D.ThirdPerson_IdleRun_2D
[RootWindow] [RootWindow]
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=1332.800 Y=772.800 WindowSize=X=1334.400 Y=774.400
None======= None=======
InitiallyMaximized=True InitiallyMaximized=True
@ -170,7 +172,7 @@ ContentBrowserTab1.ActiveTypeFilters=
ContentBrowserTab1.EnabledTypeFilters= ContentBrowserTab1.EnabledTypeFilters=
ContentBrowserTab1.ActiveFrontendFilters= ContentBrowserTab1.ActiveFrontendFilters=
ContentBrowserTab1.EnabledFrontendFilters= ContentBrowserTab1.EnabledFrontendFilters=
ContentBrowserTab1.SelectedPaths=/Game/Blueprints ContentBrowserTab1.SelectedPaths=/Game/Materials
ContentBrowserTab1.PluginFilters= ContentBrowserTab1.PluginFilters=
ContentBrowserTab1.Favorites.SelectedPaths= ContentBrowserTab1.Favorites.SelectedPaths=
FavoritePaths= FavoritePaths=
@ -1127,6 +1129,8 @@ MRUItem1=/Game/Map
MRUItem2=/Game/Test MRUItem2=/Game/Test
[PlacementMode] [PlacementMode]
<<<<<<< HEAD
=======
RecentlyPlaced=/Game/Fang/Fang.Fang; RecentlyPlaced=/Game/Fang/Fang.Fang;
RecentlyPlaced=/Game/Fang/Fang_Anim_rig_Dance.Fang_Anim_rig_Dance; RecentlyPlaced=/Game/Fang/Fang_Anim_rig_Dance.Fang_Anim_rig_Dance;
RecentlyPlaced=/Game/Blueprints/BP_Door.BP_Door; RecentlyPlaced=/Game/Blueprints/BP_Door.BP_Door;
@ -1135,18 +1139,36 @@ RecentlyPlaced=/Game/Materials/M_Water.M_Water;
RecentlyPlaced=/Game/Materials/Treppe.Treppe; RecentlyPlaced=/Game/Materials/Treppe.Treppe;
RecentlyPlaced=/Game/Materials/Säule_destroyed.Säule_destroyed; RecentlyPlaced=/Game/Materials/Säule_destroyed.Säule_destroyed;
RecentlyPlaced=/Game/Materials/platform_broken.platform_broken; RecentlyPlaced=/Game/Materials/platform_broken.platform_broken;
>>>>>>> origin/main
RecentlyPlaced=/Game/Materials/gen2.gen2; RecentlyPlaced=/Game/Materials/gen2.gen2;
RecentlyPlaced=/Game/Assets/wand4.wand4;
RecentlyPlaced=/Game/Blueprints/BP_Lever.BP_Lever;
RecentlyPlaced=/Game/Materials/gen.gen;
RecentlyPlaced=/Game/Assets/Plattform_broken__1_.Plattform_broken__1_; 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/Shader+Effekte/Fire.Fire;
RecentlyPlaced=/Game/Assets/FeuFeu.FeuFeu; RecentlyPlaced=/Game/Assets/FeuFeu.FeuFeu;
<<<<<<< HEAD
RecentlyPlaced=/Game/Materials/M_Water.M_Water;
RecentlyPlaced=/Game/Assets/wand3.wand3;
RecentlyPlaced=/Game/Assets/wand6.wand6;
RecentlyPlaced=/Game/Assets/wand5.wand5;
RecentlyPlaced=/Game/Assets/wand_destroyed.wand_destroyed;
RecentlyPlaced=/Game/Assets/wand.wand;
RecentlyPlaced=/Game/Shader+Effekte/FireSmall.FireSmall;
RecentlyPlaced=/Game/Assets/Fackel1.Fackel1;
RecentlyPlaced=/Game/Materials/Tür.Tür;
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/Shader+Effekte/Fire_Matrial.Fire_Matrial;
RecentlyPlaced=/Game/Assets/Fackel3.Fackel3; RecentlyPlaced=/Game/Assets/Fackel3.Fackel3;
RecentlyPlaced=/Game/Assets/Fackel1.Fackel1; RecentlyPlaced=/Game/Assets/Fackel1.Fackel1;
RecentlyPlaced=/Game/Assets/test.test; RecentlyPlaced=/Game/Assets/test.test;
RecentlyPlaced=/Game/Materials/Lagerfeuer.Lagerfeuer; RecentlyPlaced=/Game/Materials/Lagerfeuer.Lagerfeuer;
RecentlyPlaced=/Game/Assets/wand7.wand7; RecentlyPlaced=/Game/Assets/wand7.wand7;
>>>>>>> origin/main
None======= None=======
None======= None=======
@ -2040,8 +2062,6 @@ Fang_AnimBP_C.Default=True
AnimGraphNode_Slot.Settings=True AnimGraphNode_Slot.Settings=True
AnimStateNode.GraphNodeDetail=True AnimStateNode.GraphNodeDetail=True
AnimStateNode.Animation State=True AnimStateNode.Animation State=True
AnimGraphNode_SequencePlayer.Settings=True
AnimGraphNode_SequencePlayer.Relevancy=True
[PluginBrowser] [PluginBrowser]
InstalledPlugins=XRVisualization InstalledPlugins=XRVisualization
@ -2165,26 +2185,49 @@ bConvertSceneUnit=False
LastLogListing=LightingResults LastLogListing=LightingResults
[ContentBrowserRecent] [ContentBrowserRecent]
MRUItem0=/Game/Fang/Walk_RunBS <<<<<<< HEAD
MRUItem1=/Game/Mannequin/Animations/ThirdPerson_IdleRun_2D MRUItem0=/Game/Materials/M_Water
MRUItem2=/Game/Mannequin/Animations/ThirdPerson_AnimBP MRUItem1=/Game/Blueprints/BP_Door
MRUItem3=/Game/ThirdPersonBP/Blueprints/ThirdPersonCharacter MRUItem2=/Game/Textures/Tür/Texture/DefaultMaterial_Roughness
MRUItem4=/Game/Fang/Fang_AnimBP MRUItem3=/Game/Textures/Tür/Texture/DefaultMaterial_Mixed_AO
MRUItem5=/Game/Fang/Base MRUItem4=/Game/Materials/Tür
MRUItem6=/Game/Fang/Fang_Anim_rig_Walking MRUItem5=/Game/Map
MRUItem7=/Game/Fang/Fang_Anim_rig_JumpFLYING MRUItem6=/Game/Assets/Plattform_broken__1_
MRUItem8=/Game/Fang/Fang_Anim_JumpFLYING MRUItem7=/Game/Assets/Plattform_broken
MRUItem9=/Game/Fang/Base_Roughness MRUItem8=/Game/Materials/platform_broken
MRUItem10=/Game/Fang/Fang MRUItem9=/Game/Assets/FeuFeu
MRUItem11=/Game/Assets/Plattform_broken__1_ MRUItem10=/Game/Assets/Fackel1
MRUItem12=/Game/Assets/Plattform_broken MRUItem11=/Game/Assets/Fackel3
MRUItem13=/Game/Materials/platform_broken MRUItem12=/Game/Materials/coals
MRUItem14=/Game/Map MRUItem13=/Game/Assets/Fackel2
MRUItem15=/Game/Assets/FeuFeu MRUItem14=/Game/Assets/flame
MRUItem16=/Game/Assets/Fackel1 MRUItem15=/Game/Assets/holders
MRUItem17=/Game/Assets/Fackel3 MRUItem16=/Game/Assets/metal
MRUItem18=/Game/Materials/coals MRUItem17=/Game/Materials/Fackeln/Lagerfeuer
MRUItem19=/Game/Assets/Fackel2 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] [AssetEditorToolkitTabLocation]
/Game/Assets/BSurfaceMesh.BSurfaceMesh=1 /Game/Assets/BSurfaceMesh.BSurfaceMesh=1
@ -2240,7 +2283,7 @@ None=======
/Game/Blueprints/BP_GameInstance.BP_GameInstance=0 /Game/Blueprints/BP_GameInstance.BP_GameInstance=0
/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/Materials/M_Water.M_Water=0
/Game/Assets/Fackel2.Fackel2=0 /Game/Assets/Fackel2.Fackel2=0
/Game/Assets/Fackel3.Fackel3=1 /Game/Assets/Fackel3.Fackel3=1
/Game/Assets/door_Cube_001.door_Cube_001=1 /Game/Assets/door_Cube_001.door_Cube_001=1
@ -2429,11 +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, 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, Landscape=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
PersonaPreviewSceneDescription=AssetViewerSettings.Settings.Environment, PersonaPreviewSceneDescription=AssetViewerSettings.Settings.Environment,
<<<<<<< HEAD
PreviewMeshCollection=
Actor=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
PrimitiveComponent=
=======
PreviewMeshCollection=AssetViewerSettings.Settings.Environment, PreviewMeshCollection=AssetViewerSettings.Settings.Environment,
CharacterMovementComponent= CharacterMovementComponent=
Fang_AnimBP_C= Fang_AnimBP_C=
Character= Character=
BlendSpace1D=BlendSpace1D.Axis Settings.Horizontal Axis, >>>>>>> origin/main
[DetailPropertyExpansion] [DetailPropertyExpansion]
MaterialExpressionDynamicParameter="\"Object.ParamNames\" \"Object.DefaultValue\" " MaterialExpressionDynamicParameter="\"Object.ParamNames\" \"Object.DefaultValue\" "
@ -2451,10 +2499,17 @@ GeomModifier="\"Object.Settings\" "
None======= 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\" "
<<<<<<< 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\" " 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\" " 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\" " SceneComponent="\"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
ActorComponent="\"Object.NavMovement.NavAgentProps\" " ActorComponent="\"Object.NavMovement.NavAgentProps\" "
>>>>>>> origin/main
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=

2800
Saved/Logs/DesertGame.log
View File

File diff suppressed because one or more lines are too long