Merge remote-tracking branch 'arnaud-jamin/main'

# Conflicts:
#	Plugins/Cog/Source/CogDebug/Private/CogDebugDrawHelper.cpp
#	Plugins/Cog/Source/CogDebug/Private/CogDebugLog.cpp
#	Plugins/Cog/Source/CogWindow/Private/CogWindowManager.cpp
#	Plugins/Cog/Source/CogWindow/Private/CogWindow_Settings.cpp
#	Plugins/Cog/Source/ThirdParty/ImGui/imconfig.h
#	Plugins/Cog/Source/ThirdParty/ImGui/imgui.cpp
#	Plugins/Cog/Source/ThirdParty/ImGui/imgui.h
#	Plugins/Cog/Source/ThirdParty/ImGui/imgui_demo.cpp
#	Plugins/Cog/Source/ThirdParty/ImGui/imgui_draw.cpp
#	Plugins/Cog/Source/ThirdParty/ImGui/imgui_internal.h
#	Plugins/Cog/Source/ThirdParty/ImGui/imgui_tables.cpp
#	Plugins/Cog/Source/ThirdParty/ImGui/imgui_widgets.cpp
#	Plugins/Cog/Source/ThirdParty/ImGui/imstb_textedit.h
#	Plugins/Cog/Source/ThirdParty/ImGui/imstb_truetype.h
#	Plugins/Cog/Source/ThirdParty/ImPlot/README.md
#	Plugins/Cog/Source/ThirdParty/ImPlot/TODO.md
#	Plugins/Cog/Source/ThirdParty/ImPlot/implot.cpp
#	Plugins/Cog/Source/ThirdParty/ImPlot/implot.h
#	Plugins/Cog/Source/ThirdParty/ImPlot/implot_demo.cpp
#	Plugins/Cog/Source/ThirdParty/ImPlot/implot_internal.h
#	Plugins/Cog/Source/ThirdParty/ImPlot/implot_items.cpp
#	Plugins/CogInput/Source/CogInput/Public/CogInputDataAsset.h

Cog.uproject

@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "5.3",
+	"EngineAssociation": "5.5",
 	"Category": "",
 	"Description": "",
 	"Modules": [
@@ -21,6 +21,10 @@
 			"TargetAllowList": [
 				"Editor"
 			]
+		},
+		{
+			"Name": "AssetSearch",
+			"Enabled": true
 		}
 	]
 }

Config/DefaultEngine.ini

@@ -1,6 +1,6 @@
 [/Script/EngineSettings.GameMapsSettings]
-GameDefaultMap=/Game/Maps/L_Default.L_Default
-EditorStartupMap=/Game/Maps/L_Default.L_Default
+GameDefaultMap=/Game/Maps/L_Level1.L_Level1
+EditorStartupMap=/Game/Maps/L_Level1.L_Level1
 GlobalDefaultGameMode="/Script/CogSample.CogSampleGameMode"
 
 [/Script/Engine.RendererSettings]
@@ -111,7 +111,7 @@ ManualIPAddress=
 +DefaultChannelResponses=(Channel=ECC_GameTraceChannel2,DefaultResponse=ECR_Ignore,bTraceType=False,bStaticObject=False,Name="Projectile")
 +DefaultChannelResponses=(Channel=ECC_GameTraceChannel3,DefaultResponse=ECR_Ignore,bTraceType=True,bStaticObject=False,Name="TraceCustom")
 +EditProfiles=(Name="Pawn",CustomResponses=((Channel="Camera",Response=ECR_Ignore),(Channel="Projectile",Response=ECR_Ignore),(Channel="TraceCustom")))
-+EditProfiles=(Name="CharacterMesh",CustomResponses=((Channel="Camera",Response=ECR_Ignore),(Channel="Projectile",Response=ECR_Overlap),(Channel="TraceCustom",Response=ECR_Ignore)))
++EditProfiles=(Name="CharacterMesh",CustomResponses=((Channel="Camera",Response=ECR_Ignore),(Channel="Projectile",Response=ECR_Overlap),(Channel="TraceCustom",Response=ECR_Ignore),(Channel="CharacterMesh",Response=ECR_Overlap)))
 +EditProfiles=(Name="BlockAll",CustomResponses=((Channel="Projectile")))
 +EditProfiles=(Name="OverlapAll",CustomResponses=((Channel="Projectile",Response=ECR_Overlap)))
 +EditProfiles=(Name="BlockAllDynamic",CustomResponses=((Channel="Projectile")))

Config/DefaultGame.ini

@@ -15,11 +15,10 @@ bIgnoreMissingCookedAssetRegistryData=False
 [/Script/Engine.AssetManagerSettings]
 -PrimaryAssetTypesToScan=(PrimaryAssetType="Map",AssetBaseClass=/Script/Engine.World,bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game/Maps")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
 -PrimaryAssetTypesToScan=(PrimaryAssetType="PrimaryAssetLabel",AssetBaseClass=/Script/Engine.PrimaryAssetLabel,bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
-+PrimaryAssetTypesToScan=(PrimaryAssetType="Map",AssetBaseClass="/Script/Engine.World",bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game/Maps")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
++PrimaryAssetTypesToScan=(PrimaryAssetType="Map",AssetBaseClass="/Script/Engine.World",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Maps")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=AlwaysCook))
 +PrimaryAssetTypesToScan=(PrimaryAssetType="PrimaryAssetLabel",AssetBaseClass="/Script/Engine.PrimaryAssetLabel",bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
-+PrimaryAssetTypesToScan=(PrimaryAssetType="CogAbilityDataAsset",AssetBaseClass="/Script/CogAbility.CogAbilityDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Core/Debug")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=DevelopmentAlwaysCook))
-+PrimaryAssetTypesToScan=(PrimaryAssetType="CogEngineDataAsset",AssetBaseClass="/Script/CogEngine.CogEngineDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Core/Debug")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=DevelopmentAlwaysCook))
-+PrimaryAssetTypesToScan=(PrimaryAssetType="CogInputDataAsset",AssetBaseClass="/Script/CogInput.CogInputDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Core/Debug")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=DevelopmentAlwaysCook))
++PrimaryAssetTypesToScan=(PrimaryAssetType="CogAbilityDataAsset",AssetBaseClass="/Script/CogAbility.CogAbilityDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Core/Debug")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=DevelopmentAlwaysProductionNeverCook))
++PrimaryAssetTypesToScan=(PrimaryAssetType="CogEngineDataAsset",AssetBaseClass="/Script/CogEngine.CogEngineDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Core/Debug")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=DevelopmentAlwaysProductionNeverCook))
 bOnlyCookProductionAssets=False
 bShouldManagerDetermineTypeAndName=False
 bShouldGuessTypeAndNameInEditor=True

Config/DefaultGameplayTags.ini

@@ -1,3 +1,4 @@
+;METADATA=(Diff=true, UseCommands=true)
 [/Script/GameplayTags.GameplayTagsSettings]
 ImportTagsFromConfig=True
 WarnOnInvalidTags=True
@@ -5,9 +6,12 @@ ClearInvalidTags=False
 AllowEditorTagUnloading=True
 AllowGameTagUnloading=False
 FastReplication=False
+bDynamicReplication=False
 InvalidTagCharacters="\"\',"
 NumBitsForContainerSize=6
 NetIndexFirstBitSegment=16
++GameplayTagList=(Tag="Effect.Type.Damage.Magical",DevComment="")
++GameplayTagList=(Tag="Effect.Type.Damage.Physical",DevComment="")
 +GameplayTagList=(Tag="GameplayCue.Ability.Hero1.Poison",DevComment="")
 +GameplayTagList=(Tag="GameplayCue.Ability.Hero1.PuhBack",DevComment="")
 +GameplayTagList=(Tag="GameplayCue.Ability.Hero1.Shield",DevComment="")