Merge remote-tracking branch 'origin/AI' into Green-Light/Rafals-Branch

# Conflicts:
#	EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
#	EndlessVendetta/Content/MetaHumans/Common/Female/Medium/NormalWeight/Body/metahuman_base_skel.uasset
#	EndlessVendetta/Content/MetaHumans/Common/Male/Medium/NormalWeight/Bottoms/Slacks/m_med_nrw_btm_slacks_nrm.uasset
#	EndlessVendetta/Content/MetaHumans/Common/Male/Medium/NormalWeight/Shoes/Oxfords/m_med_nrw_shs_oxfords.uasset
#	EndlessVendetta/Content/MetaHumans/Common/Male/Medium/NormalWeight/Tops/Shirt/m_med_nrw_top_shirt_nrm.uasset
#	EndlessVendetta/Content/MetaHumans/Jhon/BP_Jhon.uasset
#	EndlessVendetta/Content/MetaHumans/Jhon/Face/Jhon_FaceMesh.uasset
#	EndlessVendetta/Content/MetaHumans/Jhon/Male/Medium/NormalWeight/Body/m_med_nrw_body.uasset
#	EndlessVendetta/Content/MetaHumans/Jhon/MaleHair/Hair/Mustache_S_Full_CardsMesh_Group0_LOD0.uasset
#	EndlessVendetta/Content/MetaHumans/Jhon/MaleHair/Hair/Mustache_S_Full_CardsMesh_Group0_LOD1.uasset
#	EndlessVendetta/Content/MetaHumans/Jhon/MaleHair/Hair/Mustache_S_Full_CardsMesh_Group0_LOD2.uasset
#	EndlessVendetta/Content/MetaHumans/Jhon/MaleHair/Hair/Mustache_S_Full_CardsMesh_Group0_LOD3.uasset
#	EndlessVendetta/Content/MetaHumans/Jhon/MaleHair/Hair/Mustache_S_Full_CardsMesh_Group0_LOD4.uasset
#	EndlessVendetta/Content/MetaHumans/MHAssetModified.txt
#	EndlessVendetta/Content/MetaHumans/MHAssetVersions.txt
#	EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.cpp
#	EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.h
This commit is contained in:
Rafal Swierczek 2024-02-29 01:35:40 +00:00
commit 6e7450f3fa
456 changed files with 3987 additions and 591 deletions

View File

@ -60,7 +60,7 @@
+CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") +CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn")
[/Script/EngineSettings.GameMapsSettings] [/Script/EngineSettings.GameMapsSettings]
EditorStartupMap=/Game/Levels/MainMenuLevel.MainMenuLevel EditorStartupMap=/Game/Levels/AITest.AITest
LocalMapOptions= LocalMapOptions=
TransitionMap=None TransitionMap=None
bUseSplitscreen=True bUseSplitscreen=True
@ -85,6 +85,11 @@ r.Shadow.Virtual.Enable=1
r.DefaultFeature.AutoExposure=False r.DefaultFeature.AutoExposure=False
r.DefaultFeature.AutoExposure.Method=1 r.DefaultFeature.AutoExposure.Method=1
r.DefaultFeature.AutoExposure.Bias=1.000000 r.DefaultFeature.AutoExposure.Bias=1.000000
r.GPUSkin.Support16BitBoneIndex=True
r.GPUSkin.UnlimitedBoneInfluences=True
r.SkinCache.CompileShaders=True
r.SkinCache.DefaultBehavior=0
SkeletalMesh.UseExperimentalChunking=1
[/Script/WindowsTargetPlatform.WindowsTargetSettings] [/Script/WindowsTargetPlatform.WindowsTargetSettings]
DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 DefaultGraphicsRHI=DefaultGraphicsRHI_DX12
@ -145,14 +150,18 @@ ConnectionType=USBOnly
bUseManualIPAddress=False bUseManualIPAddress=False
ManualIPAddress= ManualIPAddress=
[CoreRedirects] [CoreRedirects]
+PropertyRedirects=(OldName="/Script/EndlessVendetta.BaseWeaponClass.player",NewName="/Script/EndlessVendetta.BaseWeaponClass.playerInWorld") +PropertyRedirects=(OldName="/Script/EndlessVendetta.BaseWeaponClass.player",NewName="/Script/EndlessVendetta.BaseWeaponClass.playerInWorld")
[/Script/NavigationSystem.RecastNavMesh] [/Script/NavigationSystem.RecastNavMesh]
AgentMaxStepHeight=73.434059 AgentMaxStepHeight=73.434059
AgentMaxSlope=64.648003 AgentMaxSlope=64.648003
CellSize=10.000000
RuntimeGeneration=Dynamic
[/Script/WorldPartitionEditor.WorldPartitionEditorSettings] [/Script/WorldPartitionEditor.WorldPartitionEditorSettings]
CommandletClass=/Script/CoreUObject.Class'/Script/UnrealEd.WorldPartitionConvertCommandlet' CommandletClass=/Script/CoreUObject.Class'/Script/UnrealEd.WorldPartitionConvertCommandlet'
[ConsoleVariables]
fx.Niagara.ForceLastTickGroup=1

BIN
EndlessVendetta/Content/AI/BP_RestrictedZone.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/AI/EQS/EQSB_Enemy.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/AI/EQS/EQSB_Player.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/AI/EQS/EQS_Test.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
EndlessVendetta/Content/AI/EQS_Test.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
EndlessVendetta/Content/AI/UI_RestrictedZone.uasset (Stored with Git LFS) Normal file

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.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More