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/AutoScreenshot.png
#	Saved/Config/CrashReportClient/UE4CC-Windows-26C0574148A80F1241BAC28EB3C6CB42/CrashReportClient.ini
#	Saved/Config/CrashReportClient/UE4CC-Windows-85ACC2DF4F5ECBEB010EDC890FABFAB7/CrashReportClient.ini
#	Saved/Config/CrashReportClient/UE4CC-Windows-884F02AE422160193B63EB9556766C5A/CrashReportClient.ini
#	Saved/Config/CrashReportClient/UE4CC-Windows-AB1C1390466C882DFD90D08C57659F53/CrashReportClient.ini
#	Saved/Config/Windows/EditorPerProjectUserSettings.ini
#	Saved/Logs/DesertGame.log
#	Saved/SaveGames/1.sav
This commit is contained in:
Angeline Staiger 2024-07-01 13:42:18 +02:00
commit 5df8973756
25 changed files with 6914 additions and 4798 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Config/DefaultInput.ini
View File

@ -80,6 +80,8 @@ DoubleClickTime=0.200000
+ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom)
+ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar)
+ActionMappings=(ActionName="ResetVR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=R)
+ActionMappings=(ActionName="Action",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=E)
+ActionMappings=(ActionName="Click",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton)
+AxisMappings=(AxisName="LookUp",Scale=-1.000000,Key=MouseY)
+AxisMappings=(AxisName="LookUpRate",Scale=1.000000,Key=Gamepad_RightY)
+AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=Down)

BIN
Content/Assets/door_Cube.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/door_Cube_001.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/schalter_Cube_001.uasset Normal file
View File

Binary file not shown.

BIN
Content/Assets/schalter_Cube_002.uasset Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/BP_BrokenPlattform.uasset Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/BP_Door.uasset Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/BP_Lever.uasset Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/BP_Spawner.uasset
View File

Binary file not shown.

BIN
Content/Emmy_Testing.umap
View File

Binary file not shown.

BIN
Content/ThirdPersonBP/Blueprints/ThirdPersonCharacter.uasset
View File

Binary file not shown.

2
Intermediate/Config/CoalescedSourceConfigs/Input.ini
View File

@ -79,6 +79,8 @@ DefaultViewportMouseLockMode=LockOnCapture
ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom)
ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar)
ActionMappings=(ActionName="ResetVR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=R)
ActionMappings=(ActionName="Action",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=E)
ActionMappings=(ActionName="Click",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton)
AxisMappings=(AxisName="LookUp",Scale=-1.000000,Key=MouseY)
AxisMappings=(AxisName="LookUpRate",Scale=1.000000,Key=Gamepad_RightY)
AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=Down)

BIN
Saved/Autosaves/Game/Assets/door_Cube_001_Auto2.uasset Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/Assets/door_Cube_Auto2.uasset Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/Assets/schalter_Cube_001_Auto2.uasset Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/Assets/schalter_Cube_002_Auto2.uasset Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/Blueprints/BP_Door_Auto1.uasset Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/Blueprints/BP_Lever_Auto3.uasset Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/Emmy_Testing_Auto3.umap Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/Emmy_Testing_Auto4.umap Normal file
View File

Binary file not shown.

5
Saved/Config/CrashReportClient/UE4CC-Windows-884F02AE422160193B63EB9556766C5A/CrashReportClient.ini Normal file
View File

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

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

@ -132,8 +132,13 @@ LastLevel=/Game/Emmy_Testing
CleanShutdown=True
[RootWindow]
<<<<<<< HEAD
ScreenPosition=X=58.400 Y=0.000
WindowSize=X=1310.400 Y=750.400
=======
ScreenPosition=X=56.800 Y=39.200
WindowSize=X=1305.600 Y=745.600
>>>>>>> origin/main
InitiallyMaximized=True
[SlateAdditionalLayoutConfig]
@ -150,7 +155,7 @@ FourPanes2x2.Viewport 1.bIsMaximized=True
FourPanes2x2.Viewport 1.MaximizedViewport=FourPanes2x2.Viewport 1.Viewport1
[ContentBrowser]
ContentBrowserTab1.SourcesExpanded=False
ContentBrowserTab1.SourcesExpanded=True
ContentBrowserTab1.Locked=False
ContentBrowserTab1.VerticalSplitter.SlotSize0=0.250000
ContentBrowserTab1.VerticalSplitter.SlotSize1=0.750000
@ -184,7 +189,7 @@ BRUSH=../../../../../../Users/bib/Documents/GARGame/Content/
FBX=../../../../../../Users/bib/Documents/GARGame/Content/
FBXAnim=../../../../../../Users/bib/Documents/GARGame/Content/
GenericImport=../../../../../../Users/bib/Documents/Unterricht/Semester4/GAR/Blend datein/Vase1.fbx
GenericExport=../../../../../../Users/bib/Documents/GARGame/Content/
GenericExport=C:/Users/bib/Documents/Unreal Projects/Backup_Desert_Game/Content
GenericOpen=../../../../../../Users/bib/Documents/GARGame/Content/
GenericSave=../../../../../../Users/bib/Documents/GARGame/Content/
MeshImportExport=../../../../../../Users/bib/Documents/GARGame/Content/
@ -1088,6 +1093,7 @@ MRUItem1=/Game/Emmy_Testing
MRUItem2=/Game/Test
[PlacementMode]
<<<<<<< HEAD
RecentlyPlaced=/Game/Materials/gen.gen;
RecentlyPlaced=/Game/Materials/gen2.gen2;
RecentlyPlaced=/Game/Materials/Säule.Säule;
@ -1099,6 +1105,16 @@ RecentlyPlaced=/Engine/BasicShapes/Cube.Cube;/Engine/Transient.ActorFactoryBasic
RecentlyPlaced=/Game/Assets/treppe_Cube.treppe_Cube;
RecentlyPlaced=/Game/Assets/treppe_Cube_001.treppe_Cube_001;
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;
RecentlyPlaced=/Game/Blueprints/BP_BrokenPlattform.BP_BrokenPlattform;
>>>>>>> origin/main
RecentlyPlaced=/Game/Blueprints/BP_Deathbox.BP_Deathbox;
RecentlyPlaced=/Game/Blueprints/Elevator.Elevator;
RecentlyPlaced=/Game/Blueprints/BP_CheckpointGame.BP_CheckpointGame;
@ -1108,6 +1124,11 @@ RecentlyPlaced=/Game/Shader+Effekte/Flamethrower.Flamethrower;
RecentlyPlaced=/Game/Shader+Effekte/FireSmall.FireSmall;
RecentlyPlaced=/Game/Assets/Fackel1.Fackel1;
RecentlyPlaced=/Engine/BasicShapes/Cylinder.Cylinder;/Engine/Transient.ActorFactoryBasicShape_0
<<<<<<< HEAD
=======
RecentlyPlaced=/Game/Assets/Fackel2.Fackel2;
RecentlyPlaced=/Game/Assets/Fackel3.Fackel3;
>>>>>>> origin/main
[DetailCategories]
Actor.TransformCommon=True
@ -1694,6 +1715,7 @@ BP_Spawner_C.Collision=True
BP_Spawner_C.Actor=True
BP_Spawner_C.Input=True
BP_Deathbox_C.TransformCommon=True
<<<<<<< HEAD
GeomModifier_Pen.Settings=True
Texture2D.Compression=True
Texture2D.Texture=True
@ -1716,6 +1738,85 @@ BP_CheckpointGame_C.Rendering=True
BP_CheckpointGame_C.Replication=True
BP_CheckpointGame_C.Collision=True
BP_CheckpointGame_C.Actor=True
=======
BP_BrokenPlattform_C.Tick=True
BP_BrokenPlattform_C.Replication=True
BP_BrokenPlattform_C.Rendering=True
BP_BrokenPlattform_C.Collision=True
BP_BrokenPlattform_C.Actor=True
BP_BrokenPlattform_C.Input=True
StaticMeshComponent.Variable=True
StaticMeshComponent.Sockets=True
StaticMeshComponent.ComponentTick=True
StaticMeshComponent.ComponentReplication=True
StaticMeshComponent.Events=True
BP_BrokenPlattform_C.TransformCommon=True
K2Node_VariableGet.Variable=True
K2Node_VariableGet.Events=True
SceneComponent.Variable=True
SceneComponent.TransformCommon=True
SceneComponent.Sockets=True
SceneComponent.Rendering=True
SceneComponent.ComponentTick=True
SceneComponent.Tags=True
SceneComponent.ComponentReplication=True
SceneComponent.Activation=True
SceneComponent.Cooking=True
SceneComponent.Events=True
PropertyWrapper.Variable=True
PropertyWrapper.DefaultValueCategory=True
K2Node_VariableGet.DefaultValueCategory=True
BP_BrokenPlattform_C.Default=True
BP_Projectile_C.TransformCommon=True
BP_Projectile_C.Default=True
BP_Projectile_C.Rendering=True
BP_Projectile_C.Replication=True
BP_Projectile_C.Collision=True
BP_Projectile_C.Input=True
BP_Projectile_C.Actor=True
BP_Spawner_C.TransformCommon=True
BP_CheckpointGame_C.Tick=True
BP_CheckpointGame_C.Replication=True
BP_CheckpointGame_C.Rendering=True
BP_CheckpointGame_C.Collision=True
BP_CheckpointGame_C.Actor=True
BP_Door_C.Tick=True
BP_Door_C.Replication=True
BP_Door_C.Rendering=True
BP_Door_C.Collision=True
BP_Door_C.Actor=True
BP_Door_C.Input=True
BP_Door_C.TransformCommon=True
BP_Lever_C.Tick=True
BP_Lever_C.Replication=True
BP_Lever_C.Rendering=True
BP_Lever_C.Collision=True
BP_Lever_C.Actor=True
BP_Lever_C.Input=True
PointLight.TransformCommon=True
PointLight.Light=True
PointLight.Rendering=True
PointLight.Lightmass=True
PointLight.Performance=True
PointLight.LightFunction=True
PointLight.Light Profiles=True
PointLight.DistanceFieldShadows=True
PointLight.RayTracing=True
PointLight.Tags=True
PointLight.Cooking=True
PointLight.Actor=True
BP_Lever_C.TransformCommon=True
K2Node_InputAction.Input=True
K2Node_CustomEvent.GraphNodeDetail=True
K2Node_CustomEvent.Graph=True
K2Node_CustomEvent.Inputs=True
PropertyWrapper.Events=True
K2Node_VariableSet.Variable=True
K2Node_VariableSet.DefaultValueCategory=True
K2Node_VariableSet.Events=True
K2Node_Timeline.GraphNodeDetail=True
BP_Projectile_C.Tick=True
>>>>>>> origin/main
[PluginBrowser]
InstalledPlugins=XRVisualization
@ -1838,6 +1939,7 @@ bConvertSceneUnit=False
LastLogListing=FBXImport
[ContentBrowserRecent]
<<<<<<< HEAD
MRUItem0=/Game/Textures/Treppe/Treppe_Normal_DirectX
MRUItem1=/Game/Materials/Treppe
MRUItem2=/Game/Textures/gen/M_Sandstone_normal
@ -1858,6 +1960,28 @@ MRUItem16=/Game/Blueprints/Foliage/gras
MRUItem17=/Game/Blueprints/Elevator
MRUItem18=/Game/ThirdPersonBP/Blueprints/ThirdPersonCharacter
MRUItem19=/Game/Blueprints/Blueprints/BP_Deathbox
=======
MRUItem0=/Game/Blueprints/BP_Projectile
MRUItem1=/Game/Blueprints/BP_Spawner
MRUItem2=/Game/Assets/FallenKugel
MRUItem3=/Game/Assets/door_Cube
MRUItem4=/Game/ThirdPersonBP/Blueprints/ThirdPersonCharacter
MRUItem5=/Game/Blueprints/BP_Lever
MRUItem6=/Game/Blueprints/BP_Door
MRUItem7=/Game/Blueprints/BP_CheckpointGame
MRUItem8=/Game/Blueprints/BP_BrokenPlattform
MRUItem9=/Game/Blueprints/BP_Deathbox
MRUItem10=/Game/Blueprints/Materials/grastexture
MRUItem11=/Game/Blueprints/Foliage/gras
MRUItem12=/Game/Blueprints/Elevator
MRUItem13=/Game/Blueprints/Blueprints/BP_Deathbox
MRUItem14=/Game/Emmy_Testing
MRUItem15=/Game/Assets/treppe_Cube_001
MRUItem16=/Game/Assets/treppe_Cube
MRUItem17=/Game/Shader+Effekte/Flamethrower
MRUItem18=/Game/Shader+Effekte/FireSmall
MRUItem19=/Game/Shader+Effekte/Fire
>>>>>>> origin/main
[AssetEditorToolkitTabLocation]
/Game/Assets/BSurfaceMesh.BSurfaceMesh=1
@ -1876,6 +2000,7 @@ MRUItem19=/Game/Blueprints/Blueprints/BP_Deathbox
/Game/Blueprints/Foliage/gras.gras=0
/Game/Blueprints/Materials/grastexture.grastexture=0
/Game/Blueprints/Elevator.Elevator=0
<<<<<<< HEAD
/Game/Blueprints/BP_Spawner.BP_Spawner=1
/Game/Blueprints/BP_Deathbox.BP_Deathbox=1
/Game/Materials/Säule.Säule=1
@ -1887,6 +2012,16 @@ MRUItem19=/Game/Blueprints/Blueprints/BP_Deathbox
/Game/Textures/Säule_destroyed/Material_Base_color.Material_Base_color=1
/Game/Textures/gen/M_Sandstone_normal.M_Sandstone_normal=1
/Game/Textures/Treppe/Treppe_Normal_DirectX.Treppe_Normal_DirectX=1
=======
/Game/Blueprints/BP_BrokenPlattform.BP_BrokenPlattform=0
/Game/Blueprints/BP_CheckpointGame.BP_CheckpointGame=0
/Game/Assets/FallenKugel.FallenKugel=0
/Game/Blueprints/BP_Door.BP_Door=0
/Game/Blueprints/BP_Lever.BP_Lever=0
/Game/Assets/door_Cube.door_Cube=0
/Game/Blueprints/BP_Spawner.BP_Spawner=0
/Game/Blueprints/BP_Projectile.BP_Projectile=0
>>>>>>> origin/main
[MaterialEditor]
PrimType=1
@ -1968,7 +2103,90 @@ ShowUnusedLayers=True
LandscapeEditorObject=LandscapeEditorObject.Target Layers.TargetLayers,
AssetViewerSettings=AssetViewerSettings.Settings.Environment,
ThirdPersonCharacter_C=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
CapsuleComponent=
CapsuleComponent=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
CryptoKeysSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
GeneralProjectSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
GameplayTagsSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
GameMapsSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
MoviePlayerSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
ProjectPackagingSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
HardwareTargetingSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
AssetManagerSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
AssetToolsSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
AISystem=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
AnimationSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
AudioSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
ChaosSolverSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
CollisionProfile=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
ConsoleSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
CookerSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
CrowdManager=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
DataDrivenConsoleVariableSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
DebugCameraControllerSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
GameplayDebuggerConfig=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
GarbageCollectionSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
Engine=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
HierarchicalLODSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
InputSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
LandscapeSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
LevelSequenceProjectSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
RecastNavMesh=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
NavigationSystemV1=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
NetworkSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
PhysicsSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
RendererSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
RendererOverrideSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
SlateSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
StreamingSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
TutorialSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
UserInterfaceSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
LevelEditor2DSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
EditorProjectAppearanceSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
BlueprintEditorProjectSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
ClassViewerProjectSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
DDCProjectSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
ProxyLODMeshSimplificationSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
MovieSceneToolsProjectSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
MeshSimplificationSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
PaperImporterSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
SkeletalMeshSimplificationSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
StructViewerProjectSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
TextureImportSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
UMGEditorProjectSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
AndroidRuntimeSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
ShaderPlatformQualitySettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
AndroidSDKSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
IOSRuntimeSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
LinuxTargetSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
MacTargetSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
LuminRuntimeSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
MagicLeapSDKSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
WindowsTargetSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
AvfMediaSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
GooglePADRuntimeSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
ImgMediaSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
LevelSequenceEditorSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
LiveLinkSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
LiveLinkComponentSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
LiveLinkSequencerSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
MagicLeapSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
MagicLeapARPinSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
NiagaraSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
NiagaraEditorSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
OculusHMDRuntimeSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
PaperRuntimeSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
PythonScriptPluginSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
SteamVREditorSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
TakeRecorderProjectSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
TcpMessagingSettings=InputSettings.Bindings.ActionMappings,InputSettings.Bindings.ActionMappings.Action,InputSettings.Bindings.ActionMappings.Click,
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=
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,
BP_Lever_C=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
BP_Spawner_C=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
[DetailPropertyExpansion]
MaterialExpressionDynamicParameter="\"Object.ParamNames\" \"Object.DefaultValue\" "
@ -1980,9 +2198,13 @@ ThirdPersonCharacter_C="\"Object.Character.Mesh.Object.Rendering.CustomPrimitive
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\" "
MaterialExpressionVectorParameter="\"Object.DefaultValue\" "
<<<<<<< HEAD
GeomModifier_Pen="\"Object.Settings\" "
GeomModifier_Edit="\"Object.Settings\" "
GeomModifier="\"Object.Settings\" "
=======
InputSettings="\"Object.Bindings.ActionMappings.ActionMappings[4]\" "
>>>>>>> origin/main
[/Script/UnrealEd.EditorLoadingSavingSettings]
bSCCUseGlobalSettings=False
@ -2002,6 +2224,7 @@ bDeleteSourceFilesWithAssets=False
CryptoKeysSettings=True
GeneralProjectSettings=True
GameMapsSettings=True
InputSettings=True
[/Script/BlueprintGraph.BlueprintEditorSettings]
bDrawMidpointArrowsInBlueprints=False

4795
Saved/Logs/DesertGame-backup-2024.06.24-13.15.52.log
View File

File diff suppressed because one or more lines are too long

2117
Saved/Logs/DesertGame-backup-2024.06.27-09.23.06.log Normal file
View File

File diff suppressed because one or more lines are too long

4562
Saved/Logs/DesertGame.log
View File

File diff suppressed because one or more lines are too long