From 283b54ffaaa083c0bf13b12c3c1fd039ed88f3c5 Mon Sep 17 00:00:00 2001 From: sSebster Date: Wed, 22 Jan 2025 12:49:17 +0100 Subject: [PATCH 01/15] Created EQS setup for range ennemies --- Content/Legumix/Ennemy/Range/BB_RangeEnnemy.uasset | 3 +++ Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset | 3 +++ Content/Legumix/Ennemy/Range/EQC_Player.uasset | 3 +++ Content/Legumix/Ennemy/Range/EQSTester.uasset | 3 +++ Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset | 3 +++ 5 files changed, 15 insertions(+) create mode 100644 Content/Legumix/Ennemy/Range/BB_RangeEnnemy.uasset create mode 100644 Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset create mode 100644 Content/Legumix/Ennemy/Range/EQC_Player.uasset create mode 100644 Content/Legumix/Ennemy/Range/EQSTester.uasset create mode 100644 Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset diff --git a/Content/Legumix/Ennemy/Range/BB_RangeEnnemy.uasset b/Content/Legumix/Ennemy/Range/BB_RangeEnnemy.uasset new file mode 100644 index 0000000..88b08e4 --- /dev/null +++ b/Content/Legumix/Ennemy/Range/BB_RangeEnnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa6c8c45a067ec708533beff9d403b3d8d55ae28cc452ebc25ea4884397603e8 +size 2648 diff --git a/Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset b/Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset new file mode 100644 index 0000000..70b4c68 --- /dev/null +++ b/Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc9d4f03c7f937fa0ed1b772aaa3f41b86c8f18ffb4a9ccb24821bd2ae89290d +size 7448 diff --git a/Content/Legumix/Ennemy/Range/EQC_Player.uasset b/Content/Legumix/Ennemy/Range/EQC_Player.uasset new file mode 100644 index 0000000..3f6519e --- /dev/null +++ b/Content/Legumix/Ennemy/Range/EQC_Player.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ad0e604760e86594b513339cd06fcdbb2a81ea9bff344d6cb9f8d1d11cdca70 +size 18236 diff --git a/Content/Legumix/Ennemy/Range/EQSTester.uasset b/Content/Legumix/Ennemy/Range/EQSTester.uasset new file mode 100644 index 0000000..ca024c6 --- /dev/null +++ b/Content/Legumix/Ennemy/Range/EQSTester.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0649f82aceb6cca4ae4f46fdfc9ddb37af49d7b8bbe5af2fb371a32fdc11913a +size 24306 diff --git a/Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset b/Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset new file mode 100644 index 0000000..2cb84c4 --- /dev/null +++ b/Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea4a42a7c8a655535309b8bd88b08f6338cae9fb834a2748251510c06ae716d9 +size 6155 From eb716039a681981d24a582484e3957e61c287cd7 Mon Sep 17 00:00:00 2001 From: Emilie Schott Date: Wed, 22 Jan 2025 13:08:06 +0100 Subject: [PATCH 02/15] Added : Enemies files --- .../DistantEnemy/BP_DistantEnemy.uasset | 3 +++ .../DistantEnemy/M_DistantEnemyTemp.uasset | 3 +++ .../Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset | 3 +++ .../Ennemy/MeleeEnemy/M_MeleeEnemyTemp.uasset | 3 +++ .../Enemy/DistantEnemy/LMDistantEnemy.cpp | 25 +++++++++++++++++++ Source/LegumeMix/Private/Enemy/LMEnemy.cpp | 24 ++++++++++++++++++ .../Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp | 25 +++++++++++++++++++ .../Enemy/DistantEnemy/LMDistantEnemy.h | 22 ++++++++++++++++ Source/LegumeMix/Public/Enemy/LMEnemy.h | 21 ++++++++++++++++ .../Public/Enemy/MeleeEnemy/LMMeleeEnemy.h | 22 ++++++++++++++++ 10 files changed, 151 insertions(+) create mode 100644 Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset create mode 100644 Content/Legumix/Ennemy/DistantEnemy/M_DistantEnemyTemp.uasset create mode 100644 Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset create mode 100644 Content/Legumix/Ennemy/MeleeEnemy/M_MeleeEnemyTemp.uasset create mode 100644 Source/LegumeMix/Private/Enemy/DistantEnemy/LMDistantEnemy.cpp create mode 100644 Source/LegumeMix/Private/Enemy/LMEnemy.cpp create mode 100644 Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp create mode 100644 Source/LegumeMix/Public/Enemy/DistantEnemy/LMDistantEnemy.h create mode 100644 Source/LegumeMix/Public/Enemy/LMEnemy.h create mode 100644 Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h diff --git a/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset b/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset new file mode 100644 index 0000000..ac4d074 --- /dev/null +++ b/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc44551167ca9148cde050daa188cec14c15dd051d99ad0423c7c41631e83003 +size 33896 diff --git a/Content/Legumix/Ennemy/DistantEnemy/M_DistantEnemyTemp.uasset b/Content/Legumix/Ennemy/DistantEnemy/M_DistantEnemyTemp.uasset new file mode 100644 index 0000000..d694115 --- /dev/null +++ b/Content/Legumix/Ennemy/DistantEnemy/M_DistantEnemyTemp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9b33f71da3d945f8c826d25ec7b72f4e75e908649abeb7073f85a46a9aa9204 +size 15318 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset new file mode 100644 index 0000000..a18e913 --- /dev/null +++ b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac8388a21ba46d18c9e4d8936d26c0ef86e02af46aedb65834fc6faaaf57297b +size 34170 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/M_MeleeEnemyTemp.uasset b/Content/Legumix/Ennemy/MeleeEnemy/M_MeleeEnemyTemp.uasset new file mode 100644 index 0000000..3e74616 --- /dev/null +++ b/Content/Legumix/Ennemy/MeleeEnemy/M_MeleeEnemyTemp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:906f7ca92661d1b85467febfb40cb00fb6061279c76330c51a36f85ddb17f674 +size 15283 diff --git a/Source/LegumeMix/Private/Enemy/DistantEnemy/LMDistantEnemy.cpp b/Source/LegumeMix/Private/Enemy/DistantEnemy/LMDistantEnemy.cpp new file mode 100644 index 0000000..76cc0eb --- /dev/null +++ b/Source/LegumeMix/Private/Enemy/DistantEnemy/LMDistantEnemy.cpp @@ -0,0 +1,25 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#include "Enemy/DistantEnemy/LMDistantEnemy.h" + +ALMDistantEnemy::ALMDistantEnemy() +{ + PrimaryActorTick.bCanEverTick = true; +} + +void ALMDistantEnemy::BeginPlay() +{ + Super::BeginPlay(); + +} + +void ALMDistantEnemy::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); +} + +void ALMDistantEnemy::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) +{ + Super::SetupPlayerInputComponent(PlayerInputComponent); +} + diff --git a/Source/LegumeMix/Private/Enemy/LMEnemy.cpp b/Source/LegumeMix/Private/Enemy/LMEnemy.cpp new file mode 100644 index 0000000..f947680 --- /dev/null +++ b/Source/LegumeMix/Private/Enemy/LMEnemy.cpp @@ -0,0 +1,24 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#include "Enemy/LMEnemy.h" + +ALMEnemy::ALMEnemy() +{ + PrimaryActorTick.bCanEverTick = true; +} + +void ALMEnemy::BeginPlay() +{ + Super::BeginPlay(); +} + +void ALMEnemy::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); +} + +void ALMEnemy::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) +{ + Super::SetupPlayerInputComponent(PlayerInputComponent); +} + diff --git a/Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp b/Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp new file mode 100644 index 0000000..90f4b0c --- /dev/null +++ b/Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp @@ -0,0 +1,25 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#include "Enemy/MeleeEnemy/LMMeleeEnemy.h" + +ALMMeleeEnemy::ALMMeleeEnemy() +{ + PrimaryActorTick.bCanEverTick = true; +} + +void ALMMeleeEnemy::BeginPlay() +{ + Super::BeginPlay(); + +} + +void ALMMeleeEnemy::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); +} + +void ALMMeleeEnemy::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) +{ + Super::SetupPlayerInputComponent(PlayerInputComponent); +} + diff --git a/Source/LegumeMix/Public/Enemy/DistantEnemy/LMDistantEnemy.h b/Source/LegumeMix/Public/Enemy/DistantEnemy/LMDistantEnemy.h new file mode 100644 index 0000000..ea1a314 --- /dev/null +++ b/Source/LegumeMix/Public/Enemy/DistantEnemy/LMDistantEnemy.h @@ -0,0 +1,22 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Enemy/LMEnemy.h" +#include "LMDistantEnemy.generated.h" + +UCLASS() +class LEGUMEMIX_API ALMDistantEnemy : public ALMEnemy +{ + GENERATED_BODY() + +public: + ALMDistantEnemy(); + virtual void Tick(float DeltaTime) override; + virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; + +protected: + virtual void BeginPlay() override; + +}; diff --git a/Source/LegumeMix/Public/Enemy/LMEnemy.h b/Source/LegumeMix/Public/Enemy/LMEnemy.h new file mode 100644 index 0000000..c95ec3e --- /dev/null +++ b/Source/LegumeMix/Public/Enemy/LMEnemy.h @@ -0,0 +1,21 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/Character.h" +#include "LMEnemy.generated.h" + +UCLASS() +class LEGUMEMIX_API ALMEnemy : public ACharacter +{ + GENERATED_BODY() + +public: + ALMEnemy(); + virtual void Tick(float DeltaTime) override; + virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; + +protected: + virtual void BeginPlay() override; +}; diff --git a/Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h b/Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h new file mode 100644 index 0000000..ab73814 --- /dev/null +++ b/Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h @@ -0,0 +1,22 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Enemy/LMEnemy.h" +#include "LMMeleeEnemy.generated.h" + +UCLASS() +class LEGUMEMIX_API ALMMeleeEnemy : public ALMEnemy +{ + GENERATED_BODY() + +public: + ALMMeleeEnemy(); + virtual void Tick(float DeltaTime) override; + virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; + +protected: + virtual void BeginPlay() override; + +}; From 08ab510810711f943e007c58c2c167b7f8605f73 Mon Sep 17 00:00:00 2001 From: sSebster Date: Wed, 22 Jan 2025 15:05:36 +0100 Subject: [PATCH 03/15] Add ai controler for range ennemy --- Binaries/Win64/LegumeMixEditor.target | 136 +++++++++--------- Binaries/Win64/UnrealEditor-LegumeMix.exp | 4 +- Binaries/Win64/UnrealEditor-LegumeMix.pdb | 4 +- .../DistantEnemy/AIC_DistantEnnemy.uasset | 3 + .../DistantEnemy/BP_DistantEnemy.uasset | 4 +- 5 files changed, 74 insertions(+), 77 deletions(-) create mode 100644 Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset diff --git a/Binaries/Win64/LegumeMixEditor.target b/Binaries/Win64/LegumeMixEditor.target index a7ca2f1..7b8d3b5 100644 --- a/Binaries/Win64/LegumeMixEditor.target +++ b/Binaries/Win64/LegumeMixEditor.target @@ -2833,50 +2833,6 @@ "Path": "$(EngineDir)/Plugins/Animation/LiveLink/Binaries/Win64/UnrealEditor.modules", "Type": "RequiredResource" }, - { - "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicDeveloper.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicEditor.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicLib.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicLibTest.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicModule.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor.modules", - "Type": "RequiredResource" - }, - { - "Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-Bridge.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-Bridge.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-MegascansPlugin.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-MegascansPlugin.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor.modules", - "Type": "RequiredResource" - }, { "Path": "$(EngineDir)/Plugins/Cameras/CameraShakePreviewer/Binaries/Win64/UnrealEditor-CameraShakePreviewer.dll", "Type": "DynamicLibrary" @@ -3709,18 +3665,6 @@ "Path": "$(EngineDir)/Plugins/Experimental/MeshModelingToolsetExp/Binaries/Win64/UnrealEditor.modules", "Type": "RequiredResource" }, - { - "Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/Binaries/Win64/UnrealEditor-MetaHumanSDKEditor.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/Binaries/Win64/UnrealEditor-MetaHumanSDKRuntime.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/Binaries/Win64/UnrealEditor.modules", - "Type": "RequiredResource" - }, { "Path": "$(EngineDir)/Plugins/Experimental/NFORDenoise/Binaries/Win64/UnrealEditor-NFORDenoise.dll", "Type": "DynamicLibrary" @@ -3945,6 +3889,66 @@ "Path": "$(EngineDir)/Plugins/Interchange/Runtime/Binaries/Win64/UnrealEditor.modules", "Type": "RequiredResource" }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RD.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RD.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderBlueprint.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderBlueprint.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderGameControl.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderGameControl.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLC.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLC.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLink.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLink.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLogging.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLogging.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderShaderInfo.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderShaderInfo.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor.modules", + "Type": "RequiredResource" + }, { "Path": "$(EngineDir)/Plugins/Media/AndroidMedia/Binaries/Win64/UnrealEditor-AndroidMediaEditor.dll", "Type": "DynamicLibrary" @@ -29835,14 +29839,6 @@ "Path": "$(EngineDir)/Plugins/Animation/LiveLink/LiveLink.uplugin", "Type": "UFS" }, - { - "Path": "$(EngineDir)/Plugins/Animation/RigLogic/RigLogic.uplugin", - "Type": "UFS" - }, - { - "Path": "$(EngineDir)/Plugins/Bridge/Bridge.uplugin", - "Type": "UFS" - }, { "Path": "$(EngineDir)/Plugins/Cameras/CameraShakePreviewer/CameraShakePreviewer.uplugin", "Type": "UFS" @@ -30183,10 +30179,6 @@ "Path": "$(EngineDir)/Plugins/Experimental/MeshModelingToolsetExp/MeshModelingToolsetExp.uplugin", "Type": "UFS" }, - { - "Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/MetaHumanSDK.uplugin", - "Type": "UFS" - }, { "Path": "$(EngineDir)/Plugins/Experimental/NFORDenoise/NFORDenoise.uplugin", "Type": "UFS" @@ -30247,6 +30239,10 @@ "Path": "$(EngineDir)/Plugins/Interchange/Runtime/Interchange.uplugin", "Type": "UFS" }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/RiderLink.uplugin", + "Type": "UFS" + }, { "Path": "$(EngineDir)/Plugins/Media/AndroidMedia/AndroidMedia.uplugin", "Type": "UFS" @@ -30577,7 +30573,6 @@ "BaseCharacterFXEditor", "BlendSpaceMotionAnalysis", "BlueprintHeaderView", - "Bridge", "CLionSourceCodeAccess", "CableComponent", "CameraShakePreviewer", @@ -30666,7 +30661,6 @@ "MeshModelingToolset", "MeshModelingToolsetExp", "MeshPainting", - "MetaHumanSDK", "Metasound", "MobileLauncherProfileWizard", "MobilePatchingUtils", @@ -30705,8 +30699,8 @@ "RenderDocPlugin", "RenderGraphInsights", "ResonanceAudio", + "RiderLink", "RiderSourceCodeAccess", - "RigLogic", "RigVM", "SQLiteCore", "SequencerAnimTools", diff --git a/Binaries/Win64/UnrealEditor-LegumeMix.exp b/Binaries/Win64/UnrealEditor-LegumeMix.exp index 28b9036..4c17110 100644 --- a/Binaries/Win64/UnrealEditor-LegumeMix.exp +++ b/Binaries/Win64/UnrealEditor-LegumeMix.exp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41802b8b537a6e0b34f466dd58f0dbb46aedcaaf28e05beacb1d6ca529a0cad3 -size 11548 +oid sha256:4087fd93068a961972395609fe2ffa02854042852dc4ea04cbefd783cd2f1a82 +size 25892 diff --git a/Binaries/Win64/UnrealEditor-LegumeMix.pdb b/Binaries/Win64/UnrealEditor-LegumeMix.pdb index fa2722f..0d127e0 100644 --- a/Binaries/Win64/UnrealEditor-LegumeMix.pdb +++ b/Binaries/Win64/UnrealEditor-LegumeMix.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fae58fec73ac589dda932e97a46512579fbd2a0c6d34b3ce1be250f0b29def6c -size 60215296 +oid sha256:7fac61dacdd5567af603a71df6d326918f687caefb81577078ce87d5caad5953 +size 60329984 diff --git a/Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset b/Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset new file mode 100644 index 0000000..bc2e4d6 --- /dev/null +++ b/Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf4960c4c4de54c1fadd96760a4c823a4b3ec5e304a47e8df9f7d75f6dccd4ef +size 19980 diff --git a/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset b/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset index ac4d074..cbed392 100644 --- a/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset +++ b/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc44551167ca9148cde050daa188cec14c15dd051d99ad0423c7c41631e83003 -size 33896 +oid sha256:f5eb50a5cea8198ccc92d6635989dcb0e34db3b36ef41b0fff20ba8752c4df91 +size 34184 From e96407b2e70afdba99f33830e9c81b5510c563eb Mon Sep 17 00:00:00 2001 From: sSebster Date: Wed, 22 Jan 2025 12:49:17 +0100 Subject: [PATCH 04/15] Created EQS setup for range ennemies --- Content/Legumix/Ennemy/Range/BB_RangeEnnemy.uasset | 3 +++ Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset | 3 +++ Content/Legumix/Ennemy/Range/EQC_Player.uasset | 3 +++ Content/Legumix/Ennemy/Range/EQSTester.uasset | 3 +++ Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset | 3 +++ 5 files changed, 15 insertions(+) create mode 100644 Content/Legumix/Ennemy/Range/BB_RangeEnnemy.uasset create mode 100644 Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset create mode 100644 Content/Legumix/Ennemy/Range/EQC_Player.uasset create mode 100644 Content/Legumix/Ennemy/Range/EQSTester.uasset create mode 100644 Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset diff --git a/Content/Legumix/Ennemy/Range/BB_RangeEnnemy.uasset b/Content/Legumix/Ennemy/Range/BB_RangeEnnemy.uasset new file mode 100644 index 0000000..88b08e4 --- /dev/null +++ b/Content/Legumix/Ennemy/Range/BB_RangeEnnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa6c8c45a067ec708533beff9d403b3d8d55ae28cc452ebc25ea4884397603e8 +size 2648 diff --git a/Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset b/Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset new file mode 100644 index 0000000..70b4c68 --- /dev/null +++ b/Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc9d4f03c7f937fa0ed1b772aaa3f41b86c8f18ffb4a9ccb24821bd2ae89290d +size 7448 diff --git a/Content/Legumix/Ennemy/Range/EQC_Player.uasset b/Content/Legumix/Ennemy/Range/EQC_Player.uasset new file mode 100644 index 0000000..3f6519e --- /dev/null +++ b/Content/Legumix/Ennemy/Range/EQC_Player.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ad0e604760e86594b513339cd06fcdbb2a81ea9bff344d6cb9f8d1d11cdca70 +size 18236 diff --git a/Content/Legumix/Ennemy/Range/EQSTester.uasset b/Content/Legumix/Ennemy/Range/EQSTester.uasset new file mode 100644 index 0000000..ca024c6 --- /dev/null +++ b/Content/Legumix/Ennemy/Range/EQSTester.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0649f82aceb6cca4ae4f46fdfc9ddb37af49d7b8bbe5af2fb371a32fdc11913a +size 24306 diff --git a/Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset b/Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset new file mode 100644 index 0000000..2cb84c4 --- /dev/null +++ b/Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea4a42a7c8a655535309b8bd88b08f6338cae9fb834a2748251510c06ae716d9 +size 6155 From 2d6ce3e52bed3753f3da25c40c40067f7293566b Mon Sep 17 00:00:00 2001 From: Emilie Schott Date: Wed, 22 Jan 2025 13:08:06 +0100 Subject: [PATCH 05/15] Added : Enemies files --- .../DistantEnemy/BP_DistantEnemy.uasset | 3 +++ .../DistantEnemy/M_DistantEnemyTemp.uasset | 3 +++ .../Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset | 3 +++ .../Ennemy/MeleeEnemy/M_MeleeEnemyTemp.uasset | 3 +++ .../Enemy/DistantEnemy/LMDistantEnemy.cpp | 25 +++++++++++++++++++ Source/LegumeMix/Private/Enemy/LMEnemy.cpp | 24 ++++++++++++++++++ .../Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp | 25 +++++++++++++++++++ .../Enemy/DistantEnemy/LMDistantEnemy.h | 22 ++++++++++++++++ Source/LegumeMix/Public/Enemy/LMEnemy.h | 21 ++++++++++++++++ .../Public/Enemy/MeleeEnemy/LMMeleeEnemy.h | 22 ++++++++++++++++ 10 files changed, 151 insertions(+) create mode 100644 Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset create mode 100644 Content/Legumix/Ennemy/DistantEnemy/M_DistantEnemyTemp.uasset create mode 100644 Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset create mode 100644 Content/Legumix/Ennemy/MeleeEnemy/M_MeleeEnemyTemp.uasset create mode 100644 Source/LegumeMix/Private/Enemy/DistantEnemy/LMDistantEnemy.cpp create mode 100644 Source/LegumeMix/Private/Enemy/LMEnemy.cpp create mode 100644 Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp create mode 100644 Source/LegumeMix/Public/Enemy/DistantEnemy/LMDistantEnemy.h create mode 100644 Source/LegumeMix/Public/Enemy/LMEnemy.h create mode 100644 Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h diff --git a/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset b/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset new file mode 100644 index 0000000..ac4d074 --- /dev/null +++ b/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc44551167ca9148cde050daa188cec14c15dd051d99ad0423c7c41631e83003 +size 33896 diff --git a/Content/Legumix/Ennemy/DistantEnemy/M_DistantEnemyTemp.uasset b/Content/Legumix/Ennemy/DistantEnemy/M_DistantEnemyTemp.uasset new file mode 100644 index 0000000..d694115 --- /dev/null +++ b/Content/Legumix/Ennemy/DistantEnemy/M_DistantEnemyTemp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9b33f71da3d945f8c826d25ec7b72f4e75e908649abeb7073f85a46a9aa9204 +size 15318 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset new file mode 100644 index 0000000..a18e913 --- /dev/null +++ b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac8388a21ba46d18c9e4d8936d26c0ef86e02af46aedb65834fc6faaaf57297b +size 34170 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/M_MeleeEnemyTemp.uasset b/Content/Legumix/Ennemy/MeleeEnemy/M_MeleeEnemyTemp.uasset new file mode 100644 index 0000000..3e74616 --- /dev/null +++ b/Content/Legumix/Ennemy/MeleeEnemy/M_MeleeEnemyTemp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:906f7ca92661d1b85467febfb40cb00fb6061279c76330c51a36f85ddb17f674 +size 15283 diff --git a/Source/LegumeMix/Private/Enemy/DistantEnemy/LMDistantEnemy.cpp b/Source/LegumeMix/Private/Enemy/DistantEnemy/LMDistantEnemy.cpp new file mode 100644 index 0000000..76cc0eb --- /dev/null +++ b/Source/LegumeMix/Private/Enemy/DistantEnemy/LMDistantEnemy.cpp @@ -0,0 +1,25 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#include "Enemy/DistantEnemy/LMDistantEnemy.h" + +ALMDistantEnemy::ALMDistantEnemy() +{ + PrimaryActorTick.bCanEverTick = true; +} + +void ALMDistantEnemy::BeginPlay() +{ + Super::BeginPlay(); + +} + +void ALMDistantEnemy::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); +} + +void ALMDistantEnemy::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) +{ + Super::SetupPlayerInputComponent(PlayerInputComponent); +} + diff --git a/Source/LegumeMix/Private/Enemy/LMEnemy.cpp b/Source/LegumeMix/Private/Enemy/LMEnemy.cpp new file mode 100644 index 0000000..f947680 --- /dev/null +++ b/Source/LegumeMix/Private/Enemy/LMEnemy.cpp @@ -0,0 +1,24 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#include "Enemy/LMEnemy.h" + +ALMEnemy::ALMEnemy() +{ + PrimaryActorTick.bCanEverTick = true; +} + +void ALMEnemy::BeginPlay() +{ + Super::BeginPlay(); +} + +void ALMEnemy::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); +} + +void ALMEnemy::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) +{ + Super::SetupPlayerInputComponent(PlayerInputComponent); +} + diff --git a/Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp b/Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp new file mode 100644 index 0000000..90f4b0c --- /dev/null +++ b/Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp @@ -0,0 +1,25 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#include "Enemy/MeleeEnemy/LMMeleeEnemy.h" + +ALMMeleeEnemy::ALMMeleeEnemy() +{ + PrimaryActorTick.bCanEverTick = true; +} + +void ALMMeleeEnemy::BeginPlay() +{ + Super::BeginPlay(); + +} + +void ALMMeleeEnemy::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); +} + +void ALMMeleeEnemy::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) +{ + Super::SetupPlayerInputComponent(PlayerInputComponent); +} + diff --git a/Source/LegumeMix/Public/Enemy/DistantEnemy/LMDistantEnemy.h b/Source/LegumeMix/Public/Enemy/DistantEnemy/LMDistantEnemy.h new file mode 100644 index 0000000..ea1a314 --- /dev/null +++ b/Source/LegumeMix/Public/Enemy/DistantEnemy/LMDistantEnemy.h @@ -0,0 +1,22 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Enemy/LMEnemy.h" +#include "LMDistantEnemy.generated.h" + +UCLASS() +class LEGUMEMIX_API ALMDistantEnemy : public ALMEnemy +{ + GENERATED_BODY() + +public: + ALMDistantEnemy(); + virtual void Tick(float DeltaTime) override; + virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; + +protected: + virtual void BeginPlay() override; + +}; diff --git a/Source/LegumeMix/Public/Enemy/LMEnemy.h b/Source/LegumeMix/Public/Enemy/LMEnemy.h new file mode 100644 index 0000000..c95ec3e --- /dev/null +++ b/Source/LegumeMix/Public/Enemy/LMEnemy.h @@ -0,0 +1,21 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/Character.h" +#include "LMEnemy.generated.h" + +UCLASS() +class LEGUMEMIX_API ALMEnemy : public ACharacter +{ + GENERATED_BODY() + +public: + ALMEnemy(); + virtual void Tick(float DeltaTime) override; + virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; + +protected: + virtual void BeginPlay() override; +}; diff --git a/Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h b/Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h new file mode 100644 index 0000000..ab73814 --- /dev/null +++ b/Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h @@ -0,0 +1,22 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Enemy/LMEnemy.h" +#include "LMMeleeEnemy.generated.h" + +UCLASS() +class LEGUMEMIX_API ALMMeleeEnemy : public ALMEnemy +{ + GENERATED_BODY() + +public: + ALMMeleeEnemy(); + virtual void Tick(float DeltaTime) override; + virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; + +protected: + virtual void BeginPlay() override; + +}; From c4d51d878f3986fe96bfd1caf654eb952af573e2 Mon Sep 17 00:00:00 2001 From: sSebster Date: Wed, 22 Jan 2025 15:05:36 +0100 Subject: [PATCH 06/15] Add ai controler for range ennemy --- Binaries/Win64/LegumeMixEditor.target | 136 +++++++++--------- .../DistantEnemy/AIC_DistantEnnemy.uasset | 3 + .../DistantEnemy/BP_DistantEnemy.uasset | 4 +- 3 files changed, 70 insertions(+), 73 deletions(-) create mode 100644 Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset diff --git a/Binaries/Win64/LegumeMixEditor.target b/Binaries/Win64/LegumeMixEditor.target index 314c033..ee4c387 100644 --- a/Binaries/Win64/LegumeMixEditor.target +++ b/Binaries/Win64/LegumeMixEditor.target @@ -2845,50 +2845,6 @@ "Path": "$(EngineDir)/Plugins/Animation/LiveLink/Binaries/Win64/UnrealEditor.modules", "Type": "RequiredResource" }, - { - "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicDeveloper.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicEditor.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicLib.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicLibTest.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicModule.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor.modules", - "Type": "RequiredResource" - }, - { - "Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-Bridge.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-Bridge.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-MegascansPlugin.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-MegascansPlugin.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor.modules", - "Type": "RequiredResource" - }, { "Path": "$(EngineDir)/Plugins/Cameras/CameraShakePreviewer/Binaries/Win64/UnrealEditor-CameraShakePreviewer.dll", "Type": "DynamicLibrary" @@ -3721,18 +3677,6 @@ "Path": "$(EngineDir)/Plugins/Experimental/MeshModelingToolsetExp/Binaries/Win64/UnrealEditor.modules", "Type": "RequiredResource" }, - { - "Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/Binaries/Win64/UnrealEditor-MetaHumanSDKEditor.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/Binaries/Win64/UnrealEditor-MetaHumanSDKRuntime.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/Binaries/Win64/UnrealEditor.modules", - "Type": "RequiredResource" - }, { "Path": "$(EngineDir)/Plugins/Experimental/NFORDenoise/Binaries/Win64/UnrealEditor-NFORDenoise.dll", "Type": "DynamicLibrary" @@ -3957,6 +3901,66 @@ "Path": "$(EngineDir)/Plugins/Interchange/Runtime/Binaries/Win64/UnrealEditor.modules", "Type": "RequiredResource" }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RD.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RD.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderBlueprint.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderBlueprint.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderGameControl.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderGameControl.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLC.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLC.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLink.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLink.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLogging.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLogging.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderShaderInfo.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderShaderInfo.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor.modules", + "Type": "RequiredResource" + }, { "Path": "$(EngineDir)/Plugins/Media/AndroidMedia/Binaries/Win64/UnrealEditor-AndroidMediaEditor.dll", "Type": "DynamicLibrary" @@ -29839,14 +29843,6 @@ "Path": "$(EngineDir)/Plugins/Animation/LiveLink/LiveLink.uplugin", "Type": "UFS" }, - { - "Path": "$(EngineDir)/Plugins/Animation/RigLogic/RigLogic.uplugin", - "Type": "UFS" - }, - { - "Path": "$(EngineDir)/Plugins/Bridge/Bridge.uplugin", - "Type": "UFS" - }, { "Path": "$(EngineDir)/Plugins/Cameras/CameraShakePreviewer/CameraShakePreviewer.uplugin", "Type": "UFS" @@ -30187,10 +30183,6 @@ "Path": "$(EngineDir)/Plugins/Experimental/MeshModelingToolsetExp/MeshModelingToolsetExp.uplugin", "Type": "UFS" }, - { - "Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/MetaHumanSDK.uplugin", - "Type": "UFS" - }, { "Path": "$(EngineDir)/Plugins/Experimental/NFORDenoise/NFORDenoise.uplugin", "Type": "UFS" @@ -30251,6 +30243,10 @@ "Path": "$(EngineDir)/Plugins/Interchange/Runtime/Interchange.uplugin", "Type": "UFS" }, + { + "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/RiderLink.uplugin", + "Type": "UFS" + }, { "Path": "$(EngineDir)/Plugins/Media/AndroidMedia/AndroidMedia.uplugin", "Type": "UFS" @@ -30577,7 +30573,6 @@ "BaseCharacterFXEditor", "BlendSpaceMotionAnalysis", "BlueprintHeaderView", - "Bridge", "CLionSourceCodeAccess", "CableComponent", "CameraShakePreviewer", @@ -30666,7 +30661,6 @@ "MeshModelingToolset", "MeshModelingToolsetExp", "MeshPainting", - "MetaHumanSDK", "Metasound", "MobileLauncherProfileWizard", "MobilePatchingUtils", @@ -30705,8 +30699,8 @@ "RenderDocPlugin", "RenderGraphInsights", "ResonanceAudio", + "RiderLink", "RiderSourceCodeAccess", - "RigLogic", "RigVM", "SQLiteCore", "SequencerAnimTools", diff --git a/Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset b/Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset new file mode 100644 index 0000000..bc2e4d6 --- /dev/null +++ b/Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf4960c4c4de54c1fadd96760a4c823a4b3ec5e304a47e8df9f7d75f6dccd4ef +size 19980 diff --git a/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset b/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset index ac4d074..cbed392 100644 --- a/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset +++ b/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc44551167ca9148cde050daa188cec14c15dd051d99ad0423c7c41631e83003 -size 33896 +oid sha256:f5eb50a5cea8198ccc92d6635989dcb0e34db3b36ef41b0fff20ba8752c4df91 +size 34184 From 226d134dfd623e5099e70c70f9f39d1b6e5db64d Mon Sep 17 00:00:00 2001 From: Emilie Schott Date: Wed, 22 Jan 2025 15:36:44 +0100 Subject: [PATCH 07/15] Updated : Change player controller class (test) --- Content/Legumix/BP_GameMode.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Legumix/BP_GameMode.uasset b/Content/Legumix/BP_GameMode.uasset index ae68f7c..0761f49 100644 --- a/Content/Legumix/BP_GameMode.uasset +++ b/Content/Legumix/BP_GameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ef764f0d6d17fb2309efb34815b5a2714079966472e420a0d6181a5021a0b5e -size 21071 +oid sha256:f44c6f292c298e382ea73b07276ecb12d9f8b8cfa4e57a35133dacf0f37f55d3 +size 20675 From 557bf601515531d41cd04801c0cd5c90376d2e23 Mon Sep 17 00:00:00 2001 From: Emilie Schott Date: Wed, 22 Jan 2025 15:37:46 +0100 Subject: [PATCH 08/15] updated : player controller class (restored) --- Content/Legumix/BP_GameMode.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Legumix/BP_GameMode.uasset b/Content/Legumix/BP_GameMode.uasset index 0761f49..5c81b89 100644 --- a/Content/Legumix/BP_GameMode.uasset +++ b/Content/Legumix/BP_GameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f44c6f292c298e382ea73b07276ecb12d9f8b8cfa4e57a35133dacf0f37f55d3 -size 20675 +oid sha256:5c049b449256f23053725befbe7cbffa784e75c58e932fa785a25002745c51fc +size 20767 From 4a7119aecfcc6f0a8b8c345b393a5fd276ab6e4a Mon Sep 17 00:00:00 2001 From: Emilie Schott Date: Wed, 22 Jan 2025 18:47:30 +0100 Subject: [PATCH 09/15] Added : Melee enemy behaviour files --- Content/Legumix/Ennemy/MeleeEnemy/BB_MeleeEnemy.uasset | 3 +++ Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset | 4 ++-- .../Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemyController.uasset | 3 +++ Content/Legumix/Ennemy/MeleeEnemy/BTTask_FindPlayer.uasset | 3 +++ Content/Legumix/Ennemy/MeleeEnemy/BT_MeleeEnemy.uasset | 3 +++ 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 Content/Legumix/Ennemy/MeleeEnemy/BB_MeleeEnemy.uasset create mode 100644 Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemyController.uasset create mode 100644 Content/Legumix/Ennemy/MeleeEnemy/BTTask_FindPlayer.uasset create mode 100644 Content/Legumix/Ennemy/MeleeEnemy/BT_MeleeEnemy.uasset diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BB_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BB_MeleeEnemy.uasset new file mode 100644 index 0000000..aa3edc2 --- /dev/null +++ b/Content/Legumix/Ennemy/MeleeEnemy/BB_MeleeEnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:770633aa823471ca2d270eda0f3cbd762bd953d7ad89be54282f5a7f0750830d +size 3033 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset index a18e913..566de43 100644 --- a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset +++ b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac8388a21ba46d18c9e4d8936d26c0ef86e02af46aedb65834fc6faaaf57297b -size 34170 +oid sha256:6c62df05348edd1d63f63c997b0bfd571b7c3f5ba737e2621dbc3d95fc0ed07f +size 34964 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemyController.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemyController.uasset new file mode 100644 index 0000000..a57c06d --- /dev/null +++ b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemyController.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08d7f3c5867cee1a4fd7d23d0c776c83ca4320e1f3ae5c40bd8b0f20fd304334 +size 25236 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BTTask_FindPlayer.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BTTask_FindPlayer.uasset new file mode 100644 index 0000000..4a4c9e3 --- /dev/null +++ b/Content/Legumix/Ennemy/MeleeEnemy/BTTask_FindPlayer.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300a00e313fd865b20e4e24a9b94716c4b9f3d8d7d9fb3d67fe0316d4da71d07 +size 39868 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BT_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BT_MeleeEnemy.uasset new file mode 100644 index 0000000..95a65f5 --- /dev/null +++ b/Content/Legumix/Ennemy/MeleeEnemy/BT_MeleeEnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5185c1f14b498328275b53a9f694b42d6d3dd1a5e619a2acb0f4fd67de2c8fe +size 10702 From 52b996d3f6996ccf7d8748f03d2e2e6c94a28843 Mon Sep 17 00:00:00 2001 From: Emilie Schott <43524962+EmilieSchott@users.noreply.github.com> Date: Fri, 24 Jan 2025 01:04:42 +0100 Subject: [PATCH 10/15] Add properties and methods to know when attack the player --- .../Ennemy/MeleeEnemy/BB_MeleeEnemy.uasset | 4 ++-- .../Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset | 4 ++-- .../MeleeEnemy/BTTask_FindPlayer.uasset | 4 ++-- .../Ennemy/MeleeEnemy/BT_MeleeEnemy.uasset | 4 ++-- Source/LegumeMix/Private/Enemy/LMEnemy.cpp | 6 ++++++ .../Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp | 2 +- Source/LegumeMix/Public/Enemy/LMEnemy.h | 21 +++++++++++++++++++ .../Public/Enemy/MeleeEnemy/LMMeleeEnemy.h | 2 +- 8 files changed, 37 insertions(+), 10 deletions(-) diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BB_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BB_MeleeEnemy.uasset index aa3edc2..08f57c9 100644 --- a/Content/Legumix/Ennemy/MeleeEnemy/BB_MeleeEnemy.uasset +++ b/Content/Legumix/Ennemy/MeleeEnemy/BB_MeleeEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:770633aa823471ca2d270eda0f3cbd762bd953d7ad89be54282f5a7f0750830d -size 3033 +oid sha256:aea1496523de2a9eb01d3ba25a355216e796b8fcf113cbba6617c076731783fb +size 3156 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset index 566de43..68243db 100644 --- a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset +++ b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c62df05348edd1d63f63c997b0bfd571b7c3f5ba737e2621dbc3d95fc0ed07f -size 34964 +oid sha256:7af074235a0a90c5a20349e573f003c32c85ff1fd586d2698b2c7ca71afe7f12 +size 79519 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BTTask_FindPlayer.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BTTask_FindPlayer.uasset index 4a4c9e3..6706e7e 100644 --- a/Content/Legumix/Ennemy/MeleeEnemy/BTTask_FindPlayer.uasset +++ b/Content/Legumix/Ennemy/MeleeEnemy/BTTask_FindPlayer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:300a00e313fd865b20e4e24a9b94716c4b9f3d8d7d9fb3d67fe0316d4da71d07 -size 39868 +oid sha256:422eb52e1a281b9e45516e2d4251a0982590a974359d715712e13e5fa6ec0dd4 +size 33884 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BT_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BT_MeleeEnemy.uasset index 95a65f5..926b856 100644 --- a/Content/Legumix/Ennemy/MeleeEnemy/BT_MeleeEnemy.uasset +++ b/Content/Legumix/Ennemy/MeleeEnemy/BT_MeleeEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5185c1f14b498328275b53a9f694b42d6d3dd1a5e619a2acb0f4fd67de2c8fe -size 10702 +oid sha256:f7aa37a3dfbea708c4751ee85b9ce5a044a2ac04ae10ca5723c65cb0432ff6ea +size 10694 diff --git a/Source/LegumeMix/Private/Enemy/LMEnemy.cpp b/Source/LegumeMix/Private/Enemy/LMEnemy.cpp index f947680..47b24ef 100644 --- a/Source/LegumeMix/Private/Enemy/LMEnemy.cpp +++ b/Source/LegumeMix/Private/Enemy/LMEnemy.cpp @@ -5,6 +5,7 @@ ALMEnemy::ALMEnemy() { PrimaryActorTick.bCanEverTick = true; + EnemyState = EEnemyState::EES_Chasing; } void ALMEnemy::BeginPlay() @@ -12,6 +13,11 @@ void ALMEnemy::BeginPlay() Super::BeginPlay(); } +double ALMEnemy::GetDistanceToTarget(const AActor* TargetedActor) +{ + return (TargetedActor->GetActorLocation() - GetActorLocation()).Length(); +} + void ALMEnemy::Tick(float DeltaTime) { Super::Tick(DeltaTime); diff --git a/Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp b/Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp index 90f4b0c..a047dd4 100644 --- a/Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp +++ b/Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp @@ -5,6 +5,7 @@ ALMMeleeEnemy::ALMMeleeEnemy() { PrimaryActorTick.bCanEverTick = true; + AttackingRadius = 100.f; } void ALMMeleeEnemy::BeginPlay() @@ -22,4 +23,3 @@ void ALMMeleeEnemy::SetupPlayerInputComponent(UInputComponent* PlayerInputCompon { Super::SetupPlayerInputComponent(PlayerInputComponent); } - diff --git a/Source/LegumeMix/Public/Enemy/LMEnemy.h b/Source/LegumeMix/Public/Enemy/LMEnemy.h index c95ec3e..3a22c3b 100644 --- a/Source/LegumeMix/Public/Enemy/LMEnemy.h +++ b/Source/LegumeMix/Public/Enemy/LMEnemy.h @@ -6,6 +6,13 @@ #include "GameFramework/Character.h" #include "LMEnemy.generated.h" +UENUM(BlueprintType) +enum class EEnemyState : uint8 +{ + EES_Chasing UMETA(DisplayName = "Chasing"), + EES_Attacking UMETA(DisplayName = "Attacking") +}; + UCLASS() class LEGUMEMIX_API ALMEnemy : public ACharacter { @@ -18,4 +25,18 @@ public: protected: virtual void BeginPlay() override; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (AllowPrivateAccess = "true"), Category = "Legumix") + EEnemyState EnemyState; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (AllowPrivateAccess = "true"), Category = "Legumix") + double AttackingRadius; + + /** + * Returns the distance between the enemy and a target. + * @param TargetedActor + * @returns the distance + */ + UFUNCTION(BlueprintCallable, Category="Legumix", meta=(ReturnDisplayName="Distance", DefaultToSelf="TargetedActor")) + double GetDistanceToTarget(const AActor* TargetedActor); }; diff --git a/Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h b/Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h index ab73814..58a36c5 100644 --- a/Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h +++ b/Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h @@ -18,5 +18,5 @@ public: protected: virtual void BeginPlay() override; - + }; From 26ef805f35d78af7d6a8fe6d9701e7ecfa87072f Mon Sep 17 00:00:00 2001 From: sSebster Date: Fri, 24 Jan 2025 10:26:40 +0100 Subject: [PATCH 11/15] Added : EQS for range enemy --- Binaries/Win64/LegumeMixEditor.target | 32 +++++++++---------- Binaries/Win64/UnrealEditor-LegumeMix.exp | 4 +-- Binaries/Win64/UnrealEditor-LegumeMix.pdb | 4 +-- .../DistantEnemy/AIC_DistantEnnemy.uasset | 4 +-- .../DistantEnemy/BP_DistantEnemy.uasset | 4 +-- .../Ennemy/Range/BT_RangeEnnemy.uasset | 4 +-- .../Legumix/Ennemy/Range/EQC_Player.uasset | 4 +-- .../Ennemy/Range/EQS_RangeEnnemy.uasset | 4 +-- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Binaries/Win64/LegumeMixEditor.target b/Binaries/Win64/LegumeMixEditor.target index ee4c387..7b8d3b5 100644 --- a/Binaries/Win64/LegumeMixEditor.target +++ b/Binaries/Win64/LegumeMixEditor.target @@ -21,18 +21,6 @@ "BuildId": "37670630" }, "BuildProducts": [ - { - "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-LegumeMix.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-LegumeMix.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor.modules", - "Type": "RequiredResource" - }, { "Path": "$(EngineDir)/Binaries/ThirdParty/USD/UsdResources/Win64/plugins/ar/resources/plugInfo.json", "Type": "RequiredResource" @@ -4820,13 +4808,21 @@ { "Path": "$(EngineDir)/Plugins/XGEController/Binaries/Win64/UnrealEditor.modules", "Type": "RequiredResource" + }, + { + "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-LegumeMix.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-LegumeMix.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor.modules", + "Type": "RequiredResource" } ], "RuntimeDependencies": [ - { - "Path": "$(ProjectDir)/LegumeMix.uproject", - "Type": "UFS" - }, { "Path": "$(EngineDir)/Binaries/ThirdParty/DbgHelp/dbghelp.dll", "Type": "NonUFS" @@ -30542,6 +30538,10 @@ { "Path": "$(EngineDir)/Plugins/XGEController/XGEController.uplugin", "Type": "UFS" + }, + { + "Path": "$(ProjectDir)/LegumeMix.uproject", + "Type": "UFS" } ], "BuildPlugins": [ diff --git a/Binaries/Win64/UnrealEditor-LegumeMix.exp b/Binaries/Win64/UnrealEditor-LegumeMix.exp index 97f87d6..ba4fab9 100644 --- a/Binaries/Win64/UnrealEditor-LegumeMix.exp +++ b/Binaries/Win64/UnrealEditor-LegumeMix.exp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68b86cef883a7e338f87c5c36d61538d2d03210a35190a72c22f98f092391a66 -size 46484 +oid sha256:3df1acca8e4cdf1893175f1d8597ea1642d147be112bbef3279af8e75d6418c2 +size 60844 diff --git a/Binaries/Win64/UnrealEditor-LegumeMix.pdb b/Binaries/Win64/UnrealEditor-LegumeMix.pdb index 48a3dbd..b0a2401 100644 --- a/Binaries/Win64/UnrealEditor-LegumeMix.pdb +++ b/Binaries/Win64/UnrealEditor-LegumeMix.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f8d21845e3d8fc57431ae1ae85d637472513a830bff3db7a401b08d23a21ef3 -size 60092416 +oid sha256:32607ea29095e07c45380c0de54fafe9c4041a870b278060c3820f9af629ba1c +size 60993536 diff --git a/Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset b/Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset index bc2e4d6..dc311ef 100644 --- a/Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset +++ b/Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf4960c4c4de54c1fadd96760a4c823a4b3ec5e304a47e8df9f7d75f6dccd4ef -size 19980 +oid sha256:2e34e409fc782bb73e19e568221cb3bcc99552e974b653e67ed4f2a19de62306 +size 26316 diff --git a/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset b/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset index cbed392..a06eb69 100644 --- a/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset +++ b/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5eb50a5cea8198ccc92d6635989dcb0e34db3b36ef41b0fff20ba8752c4df91 -size 34184 +oid sha256:e3fd5cb6e3bf4bb5dc233d5abb3661262b50ef30ad0958d659e26fe7aec85e03 +size 34209 diff --git a/Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset b/Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset index 70b4c68..100ae90 100644 --- a/Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset +++ b/Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc9d4f03c7f937fa0ed1b772aaa3f41b86c8f18ffb4a9ccb24821bd2ae89290d -size 7448 +oid sha256:cd82a71227e3a572958564470d69a81ee51397e16c7a654618d3382f18876139 +size 8900 diff --git a/Content/Legumix/Ennemy/Range/EQC_Player.uasset b/Content/Legumix/Ennemy/Range/EQC_Player.uasset index 3f6519e..42855af 100644 --- a/Content/Legumix/Ennemy/Range/EQC_Player.uasset +++ b/Content/Legumix/Ennemy/Range/EQC_Player.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ad0e604760e86594b513339cd06fcdbb2a81ea9bff344d6cb9f8d1d11cdca70 -size 18236 +oid sha256:2868f3f290510db0255d3b4e0dd23e7a75a776d6f96e19348688d9b5b0fb342a +size 21131 diff --git a/Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset b/Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset index 2cb84c4..0bc4e61 100644 --- a/Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset +++ b/Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea4a42a7c8a655535309b8bd88b08f6338cae9fb834a2748251510c06ae716d9 -size 6155 +oid sha256:75cf5950340e6eff9a6893c01751089e1f5b9a1beb82bec329f3e978b753fe00 +size 19675 From 3b1d4c86e5df9305de64412ee67acbd8f326aca8 Mon Sep 17 00:00:00 2001 From: Emilie Schott Date: Fri, 24 Jan 2025 11:19:39 +0100 Subject: [PATCH 12/15] Added : Attack function for enemies, callable in blueprint and overridable --- Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset | 4 ++-- .../Private/Enemy/DistantEnemy/LMDistantEnemy.cpp | 5 +++++ Source/LegumeMix/Private/Enemy/LMEnemy.cpp | 7 +++++++ .../Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp | 5 +++++ .../Public/Enemy/DistantEnemy/LMDistantEnemy.h | 1 + Source/LegumeMix/Public/Enemy/LMEnemy.h | 10 +++++++++- .../LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h | 1 + 7 files changed, 30 insertions(+), 3 deletions(-) diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset index 68243db..cca5ed0 100644 --- a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset +++ b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7af074235a0a90c5a20349e573f003c32c85ff1fd586d2698b2c7ca71afe7f12 -size 79519 +oid sha256:97473c9b4d5cfd6fbede4719c82c42913ccf5a984c03b733e1c248fb1c2ab66d +size 76813 diff --git a/Source/LegumeMix/Private/Enemy/DistantEnemy/LMDistantEnemy.cpp b/Source/LegumeMix/Private/Enemy/DistantEnemy/LMDistantEnemy.cpp index 76cc0eb..a6870d1 100644 --- a/Source/LegumeMix/Private/Enemy/DistantEnemy/LMDistantEnemy.cpp +++ b/Source/LegumeMix/Private/Enemy/DistantEnemy/LMDistantEnemy.cpp @@ -13,6 +13,11 @@ void ALMDistantEnemy::BeginPlay() } +void ALMDistantEnemy::Attack(const APawn* TargetedPawn) +{ + Super::Attack(TargetedPawn); +} + void ALMDistantEnemy::Tick(float DeltaTime) { Super::Tick(DeltaTime); diff --git a/Source/LegumeMix/Private/Enemy/LMEnemy.cpp b/Source/LegumeMix/Private/Enemy/LMEnemy.cpp index 47b24ef..3ff5bf9 100644 --- a/Source/LegumeMix/Private/Enemy/LMEnemy.cpp +++ b/Source/LegumeMix/Private/Enemy/LMEnemy.cpp @@ -13,6 +13,13 @@ void ALMEnemy::BeginPlay() Super::BeginPlay(); } +void ALMEnemy::Attack(const APawn* TargetedPawn) +{ + // TO DO + FString Debug = FString::Printf(TEXT("Enemy %s attack %s !"), *GetName(), *TargetedPawn->GetName()); + GEngine->AddOnScreenDebugMessage(1, 2.f, FColor::Cyan, Debug); +} + double ALMEnemy::GetDistanceToTarget(const AActor* TargetedActor) { return (TargetedActor->GetActorLocation() - GetActorLocation()).Length(); diff --git a/Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp b/Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp index a047dd4..84e860d 100644 --- a/Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp +++ b/Source/LegumeMix/Private/Enemy/MeleeEnemy/LMMeleeEnemy.cpp @@ -14,6 +14,11 @@ void ALMMeleeEnemy::BeginPlay() } +void ALMMeleeEnemy::Attack(const APawn* TargetedPawn) +{ + Super::Attack(TargetedPawn); +} + void ALMMeleeEnemy::Tick(float DeltaTime) { Super::Tick(DeltaTime); diff --git a/Source/LegumeMix/Public/Enemy/DistantEnemy/LMDistantEnemy.h b/Source/LegumeMix/Public/Enemy/DistantEnemy/LMDistantEnemy.h index ea1a314..cc64f0a 100644 --- a/Source/LegumeMix/Public/Enemy/DistantEnemy/LMDistantEnemy.h +++ b/Source/LegumeMix/Public/Enemy/DistantEnemy/LMDistantEnemy.h @@ -18,5 +18,6 @@ public: protected: virtual void BeginPlay() override; + virtual void Attack(const APawn* TargetedPawn) override; }; diff --git a/Source/LegumeMix/Public/Enemy/LMEnemy.h b/Source/LegumeMix/Public/Enemy/LMEnemy.h index 3a22c3b..6b9da99 100644 --- a/Source/LegumeMix/Public/Enemy/LMEnemy.h +++ b/Source/LegumeMix/Public/Enemy/LMEnemy.h @@ -25,7 +25,7 @@ public: protected: virtual void BeginPlay() override; - + UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (AllowPrivateAccess = "true"), Category = "Legumix") EEnemyState EnemyState; @@ -39,4 +39,12 @@ protected: */ UFUNCTION(BlueprintCallable, Category="Legumix", meta=(ReturnDisplayName="Distance", DefaultToSelf="TargetedActor")) double GetDistanceToTarget(const AActor* TargetedActor); + + /** + * Returns the distance between the enemy and a target. + * @param TargetedPawn + * @returns + */ + UFUNCTION(BlueprintCallable, Category="Legumix", meta=(DefaultToSelf="TargetedPawn")) + virtual void Attack(const APawn* TargetedPawn); }; diff --git a/Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h b/Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h index 58a36c5..4ebae5c 100644 --- a/Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h +++ b/Source/LegumeMix/Public/Enemy/MeleeEnemy/LMMeleeEnemy.h @@ -18,5 +18,6 @@ public: protected: virtual void BeginPlay() override; + virtual void Attack(const APawn* TargetedPawn) override; }; From defa12ea98d3855cbb9ea4fbbbc924db6b2b0748 Mon Sep 17 00:00:00 2001 From: sSebster Date: Fri, 24 Jan 2025 12:31:47 +0100 Subject: [PATCH 13/15] upd checking high for range system --- Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset | 4 ++-- Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset | 4 ++-- Content/Legumix/Ennemy/Range/BB_RangeEnnemy.uasset | 4 ++-- .../Ennemy/Range/BTDecorator_ConditionToRepositionate.uasset | 3 +++ Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset | 4 ++-- Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 Content/Legumix/Ennemy/Range/BTDecorator_ConditionToRepositionate.uasset diff --git a/Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset b/Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset index dc311ef..59e4b75 100644 --- a/Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset +++ b/Content/Legumix/Ennemy/DistantEnemy/AIC_DistantEnnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e34e409fc782bb73e19e568221cb3bcc99552e974b653e67ed4f2a19de62306 -size 26316 +oid sha256:d97eacadb31bb9062ca3918e5b2fde965a8a75a4002d97f6c113960d725acab8 +size 25060 diff --git a/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset b/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset index a06eb69..1e4391d 100644 --- a/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset +++ b/Content/Legumix/Ennemy/DistantEnemy/BP_DistantEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3fd5cb6e3bf4bb5dc233d5abb3661262b50ef30ad0958d659e26fe7aec85e03 -size 34209 +oid sha256:5d45646d12e90f3e3ec101dea73b1876c75bb827eeebb5d705ecae081b6c6ae5 +size 65141 diff --git a/Content/Legumix/Ennemy/Range/BB_RangeEnnemy.uasset b/Content/Legumix/Ennemy/Range/BB_RangeEnnemy.uasset index 88b08e4..ef8393d 100644 --- a/Content/Legumix/Ennemy/Range/BB_RangeEnnemy.uasset +++ b/Content/Legumix/Ennemy/Range/BB_RangeEnnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa6c8c45a067ec708533beff9d403b3d8d55ae28cc452ebc25ea4884397603e8 -size 2648 +oid sha256:7e4188cdb69409e36a77ee52c3fca8257478572e909b8737d04e1a14354769d8 +size 3033 diff --git a/Content/Legumix/Ennemy/Range/BTDecorator_ConditionToRepositionate.uasset b/Content/Legumix/Ennemy/Range/BTDecorator_ConditionToRepositionate.uasset new file mode 100644 index 0000000..a0c4c88 --- /dev/null +++ b/Content/Legumix/Ennemy/Range/BTDecorator_ConditionToRepositionate.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24634565912bce075d6a03776b110df7d3f8ca33bd01917271e99d9760f41414 +size 37233 diff --git a/Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset b/Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset index 100ae90..3c7a361 100644 --- a/Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset +++ b/Content/Legumix/Ennemy/Range/BT_RangeEnnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd82a71227e3a572958564470d69a81ee51397e16c7a654618d3382f18876139 -size 8900 +oid sha256:81a6a23af6f9a2302235810bf15ab92bd7bb03226fd840c8d90b0c90b0018646 +size 17102 diff --git a/Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset b/Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset index 0bc4e61..f0a3614 100644 --- a/Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset +++ b/Content/Legumix/Ennemy/Range/EQS_RangeEnnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75cf5950340e6eff9a6893c01751089e1f5b9a1beb82bec329f3e978b753fe00 -size 19675 +oid sha256:fd7dafe77e932ec7a53b6a78551f99db23aee9c3db08344f532111ff3af0b9db +size 20789 From aa28569e899bcf75637169a21f60c92b8b49ad50 Mon Sep 17 00:00:00 2001 From: Emilie Schott Date: Fri, 24 Jan 2025 14:33:43 +0100 Subject: [PATCH 14/15] Updated : Melee enemy AI --- Binaries/Win64/LegumeMixEditor.target | 168 +++++++++--------- Binaries/Win64/UnrealEditor-LegumeMix.exp | 4 +- Binaries/Win64/UnrealEditor-LegumeMix.pdb | 4 +- .../Ennemy/MeleeEnemy/AI/BB_MeleeEnemy.uasset | 3 + .../Ennemy/MeleeEnemy/AI/BT_MeleeEnemy.uasset | 3 + .../MeleeEnemy/AI/Task/BTTask_Attack.uasset | 3 + .../AI/Task/BTTask_FindPlayer.uasset | 3 + .../Ennemy/MeleeEnemy/BB_MeleeEnemy.uasset | 3 - .../Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset | 4 +- .../MeleeEnemy/BP_MeleeEnemyController.uasset | 4 +- .../MeleeEnemy/BTTask_FindPlayer.uasset | 3 - .../Ennemy/MeleeEnemy/BT_MeleeEnemy.uasset | 3 - .../Ennemy/MeleeEnemy/SKM_MeleeEnemy.uasset | 3 + 13 files changed, 110 insertions(+), 98 deletions(-) create mode 100644 Content/Legumix/Ennemy/MeleeEnemy/AI/BB_MeleeEnemy.uasset create mode 100644 Content/Legumix/Ennemy/MeleeEnemy/AI/BT_MeleeEnemy.uasset create mode 100644 Content/Legumix/Ennemy/MeleeEnemy/AI/Task/BTTask_Attack.uasset create mode 100644 Content/Legumix/Ennemy/MeleeEnemy/AI/Task/BTTask_FindPlayer.uasset delete mode 100644 Content/Legumix/Ennemy/MeleeEnemy/BB_MeleeEnemy.uasset delete mode 100644 Content/Legumix/Ennemy/MeleeEnemy/BTTask_FindPlayer.uasset delete mode 100644 Content/Legumix/Ennemy/MeleeEnemy/BT_MeleeEnemy.uasset create mode 100644 Content/Legumix/Ennemy/MeleeEnemy/SKM_MeleeEnemy.uasset diff --git a/Binaries/Win64/LegumeMixEditor.target b/Binaries/Win64/LegumeMixEditor.target index 7b8d3b5..314c033 100644 --- a/Binaries/Win64/LegumeMixEditor.target +++ b/Binaries/Win64/LegumeMixEditor.target @@ -21,6 +21,18 @@ "BuildId": "37670630" }, "BuildProducts": [ + { + "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-LegumeMix.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-LegumeMix.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor.modules", + "Type": "RequiredResource" + }, { "Path": "$(EngineDir)/Binaries/ThirdParty/USD/UsdResources/Win64/plugins/ar/resources/plugInfo.json", "Type": "RequiredResource" @@ -2833,6 +2845,50 @@ "Path": "$(EngineDir)/Plugins/Animation/LiveLink/Binaries/Win64/UnrealEditor.modules", "Type": "RequiredResource" }, + { + "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicDeveloper.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicEditor.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicLib.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicLibTest.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor-RigLogicModule.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Animation/RigLogic/Binaries/Win64/UnrealEditor.modules", + "Type": "RequiredResource" + }, + { + "Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-Bridge.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-Bridge.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-MegascansPlugin.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor-MegascansPlugin.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(EngineDir)/Plugins/Bridge/Binaries/Win64/UnrealEditor.modules", + "Type": "RequiredResource" + }, { "Path": "$(EngineDir)/Plugins/Cameras/CameraShakePreviewer/Binaries/Win64/UnrealEditor-CameraShakePreviewer.dll", "Type": "DynamicLibrary" @@ -3665,6 +3721,18 @@ "Path": "$(EngineDir)/Plugins/Experimental/MeshModelingToolsetExp/Binaries/Win64/UnrealEditor.modules", "Type": "RequiredResource" }, + { + "Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/Binaries/Win64/UnrealEditor-MetaHumanSDKEditor.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/Binaries/Win64/UnrealEditor-MetaHumanSDKRuntime.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/Binaries/Win64/UnrealEditor.modules", + "Type": "RequiredResource" + }, { "Path": "$(EngineDir)/Plugins/Experimental/NFORDenoise/Binaries/Win64/UnrealEditor-NFORDenoise.dll", "Type": "DynamicLibrary" @@ -3889,66 +3957,6 @@ "Path": "$(EngineDir)/Plugins/Interchange/Runtime/Binaries/Win64/UnrealEditor.modules", "Type": "RequiredResource" }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RD.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RD.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderBlueprint.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderBlueprint.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderGameControl.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderGameControl.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLC.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLC.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLink.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLink.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLogging.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderLogging.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderShaderInfo.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor-RiderShaderInfo.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/Binaries/Win64/UnrealEditor.modules", - "Type": "RequiredResource" - }, { "Path": "$(EngineDir)/Plugins/Media/AndroidMedia/Binaries/Win64/UnrealEditor-AndroidMediaEditor.dll", "Type": "DynamicLibrary" @@ -4808,21 +4816,13 @@ { "Path": "$(EngineDir)/Plugins/XGEController/Binaries/Win64/UnrealEditor.modules", "Type": "RequiredResource" - }, - { - "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-LegumeMix.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-LegumeMix.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor.modules", - "Type": "RequiredResource" } ], "RuntimeDependencies": [ + { + "Path": "$(ProjectDir)/LegumeMix.uproject", + "Type": "UFS" + }, { "Path": "$(EngineDir)/Binaries/ThirdParty/DbgHelp/dbghelp.dll", "Type": "NonUFS" @@ -29839,6 +29839,14 @@ "Path": "$(EngineDir)/Plugins/Animation/LiveLink/LiveLink.uplugin", "Type": "UFS" }, + { + "Path": "$(EngineDir)/Plugins/Animation/RigLogic/RigLogic.uplugin", + "Type": "UFS" + }, + { + "Path": "$(EngineDir)/Plugins/Bridge/Bridge.uplugin", + "Type": "UFS" + }, { "Path": "$(EngineDir)/Plugins/Cameras/CameraShakePreviewer/CameraShakePreviewer.uplugin", "Type": "UFS" @@ -30179,6 +30187,10 @@ "Path": "$(EngineDir)/Plugins/Experimental/MeshModelingToolsetExp/MeshModelingToolsetExp.uplugin", "Type": "UFS" }, + { + "Path": "$(EngineDir)/Plugins/Experimental/MetaHuman/MetaHumanSDK/MetaHumanSDK.uplugin", + "Type": "UFS" + }, { "Path": "$(EngineDir)/Plugins/Experimental/NFORDenoise/NFORDenoise.uplugin", "Type": "UFS" @@ -30239,10 +30251,6 @@ "Path": "$(EngineDir)/Plugins/Interchange/Runtime/Interchange.uplugin", "Type": "UFS" }, - { - "Path": "$(EngineDir)/Plugins/Marketplace/Developer/RiderLink/RiderLink.uplugin", - "Type": "UFS" - }, { "Path": "$(EngineDir)/Plugins/Media/AndroidMedia/AndroidMedia.uplugin", "Type": "UFS" @@ -30538,10 +30546,6 @@ { "Path": "$(EngineDir)/Plugins/XGEController/XGEController.uplugin", "Type": "UFS" - }, - { - "Path": "$(ProjectDir)/LegumeMix.uproject", - "Type": "UFS" } ], "BuildPlugins": [ @@ -30573,6 +30577,7 @@ "BaseCharacterFXEditor", "BlendSpaceMotionAnalysis", "BlueprintHeaderView", + "Bridge", "CLionSourceCodeAccess", "CableComponent", "CameraShakePreviewer", @@ -30661,6 +30666,7 @@ "MeshModelingToolset", "MeshModelingToolsetExp", "MeshPainting", + "MetaHumanSDK", "Metasound", "MobileLauncherProfileWizard", "MobilePatchingUtils", @@ -30699,8 +30705,8 @@ "RenderDocPlugin", "RenderGraphInsights", "ResonanceAudio", - "RiderLink", "RiderSourceCodeAccess", + "RigLogic", "RigVM", "SQLiteCore", "SequencerAnimTools", diff --git a/Binaries/Win64/UnrealEditor-LegumeMix.exp b/Binaries/Win64/UnrealEditor-LegumeMix.exp index ba4fab9..14ff2fc 100644 --- a/Binaries/Win64/UnrealEditor-LegumeMix.exp +++ b/Binaries/Win64/UnrealEditor-LegumeMix.exp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3df1acca8e4cdf1893175f1d8597ea1642d147be112bbef3279af8e75d6418c2 -size 60844 +oid sha256:fd20eee524ff1258fcc9e57bdfe893c54dcc262a33d53450e88f1f137c581105 +size 62628 diff --git a/Binaries/Win64/UnrealEditor-LegumeMix.pdb b/Binaries/Win64/UnrealEditor-LegumeMix.pdb index b0a2401..b27929e 100644 --- a/Binaries/Win64/UnrealEditor-LegumeMix.pdb +++ b/Binaries/Win64/UnrealEditor-LegumeMix.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32607ea29095e07c45380c0de54fafe9c4041a870b278060c3820f9af629ba1c -size 60993536 +oid sha256:7a53ca02ff4ea16ec35044f5ff34db3b66eed5064e880795f22c4e00262fc765 +size 60215296 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/AI/BB_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/AI/BB_MeleeEnemy.uasset new file mode 100644 index 0000000..0289644 --- /dev/null +++ b/Content/Legumix/Ennemy/MeleeEnemy/AI/BB_MeleeEnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e15796b9c82aa0affe44bab93af507a34ec12da0f405631f8b0945b21917356 +size 3050 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/AI/BT_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/AI/BT_MeleeEnemy.uasset new file mode 100644 index 0000000..baf6b0e --- /dev/null +++ b/Content/Legumix/Ennemy/MeleeEnemy/AI/BT_MeleeEnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5eae06a7a036d39145e16e4ab215d2dcd8a79b18411bcb4e0b4058ea9f47257 +size 13816 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/AI/Task/BTTask_Attack.uasset b/Content/Legumix/Ennemy/MeleeEnemy/AI/Task/BTTask_Attack.uasset new file mode 100644 index 0000000..29f5e00 --- /dev/null +++ b/Content/Legumix/Ennemy/MeleeEnemy/AI/Task/BTTask_Attack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:098a7cadf8e6cb3a31a632b8c60545502cec800cf74e85f875260bd9b6ce772a +size 38420 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/AI/Task/BTTask_FindPlayer.uasset b/Content/Legumix/Ennemy/MeleeEnemy/AI/Task/BTTask_FindPlayer.uasset new file mode 100644 index 0000000..0084009 --- /dev/null +++ b/Content/Legumix/Ennemy/MeleeEnemy/AI/Task/BTTask_FindPlayer.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a0412b2e95fd7bdbd533064767291320dbe94fac3eb8bea850b0174a35f890f +size 45160 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BB_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BB_MeleeEnemy.uasset deleted file mode 100644 index 08f57c9..0000000 --- a/Content/Legumix/Ennemy/MeleeEnemy/BB_MeleeEnemy.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aea1496523de2a9eb01d3ba25a355216e796b8fcf113cbba6617c076731783fb -size 3156 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset index cca5ed0..da93177 100644 --- a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset +++ b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97473c9b4d5cfd6fbede4719c82c42913ccf5a984c03b733e1c248fb1c2ab66d -size 76813 +oid sha256:eb126c4a0ff1e81e1b5d5af696f2d73ce008cc5c9101f862b42e073276caddd5 +size 90684 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemyController.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemyController.uasset index a57c06d..5c8c676 100644 --- a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemyController.uasset +++ b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemyController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08d7f3c5867cee1a4fd7d23d0c776c83ca4320e1f3ae5c40bd8b0f20fd304334 -size 25236 +oid sha256:d49259cf69991521d5a6a80a22dbcf368c73a02e583263cf6123d264a71f6493 +size 25155 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BTTask_FindPlayer.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BTTask_FindPlayer.uasset deleted file mode 100644 index 6706e7e..0000000 --- a/Content/Legumix/Ennemy/MeleeEnemy/BTTask_FindPlayer.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:422eb52e1a281b9e45516e2d4251a0982590a974359d715712e13e5fa6ec0dd4 -size 33884 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BT_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BT_MeleeEnemy.uasset deleted file mode 100644 index 926b856..0000000 --- a/Content/Legumix/Ennemy/MeleeEnemy/BT_MeleeEnemy.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7aa37a3dfbea708c4751ee85b9ce5a044a2ac04ae10ca5723c65cb0432ff6ea -size 10694 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/SKM_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/SKM_MeleeEnemy.uasset new file mode 100644 index 0000000..6cffc7f --- /dev/null +++ b/Content/Legumix/Ennemy/MeleeEnemy/SKM_MeleeEnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6628e20f0100e9a74e08ea8422573c41c893d1d0526db80580ed8df846f3c3e5 +size 970282 From 516834d45eaa99b93767be67a881379ccd9d6956 Mon Sep 17 00:00:00 2001 From: Emilie Schott Date: Fri, 24 Jan 2025 14:56:06 +0100 Subject: [PATCH 15/15] Updated parameters --- Content/Legumix/BP_GameMode.uasset | 4 ++-- Content/Legumix/Ennemy/Range/EQC_Player.uasset | 4 ++-- Content/Legumix/Levels/LVL_GYM_00.umap | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Content/Legumix/BP_GameMode.uasset b/Content/Legumix/BP_GameMode.uasset index 5c81b89..eb7174e 100644 --- a/Content/Legumix/BP_GameMode.uasset +++ b/Content/Legumix/BP_GameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c049b449256f23053725befbe7cbffa784e75c58e932fa785a25002745c51fc -size 20767 +oid sha256:320296b9119206f37731b93db97e04944aa782f712ea84fda01cbd1bd0e44223 +size 20983 diff --git a/Content/Legumix/Ennemy/Range/EQC_Player.uasset b/Content/Legumix/Ennemy/Range/EQC_Player.uasset index 42855af..145878d 100644 --- a/Content/Legumix/Ennemy/Range/EQC_Player.uasset +++ b/Content/Legumix/Ennemy/Range/EQC_Player.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2868f3f290510db0255d3b4e0dd23e7a75a776d6f96e19348688d9b5b0fb342a -size 21131 +oid sha256:35ea376c5fa60940698a5363234de3999869fe61bd56e0a155d9fc7780bf0b50 +size 21320 diff --git a/Content/Legumix/Levels/LVL_GYM_00.umap b/Content/Legumix/Levels/LVL_GYM_00.umap index e104dc7..cd95459 100644 --- a/Content/Legumix/Levels/LVL_GYM_00.umap +++ b/Content/Legumix/Levels/LVL_GYM_00.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58e1830d8daaecddb4f46fee63b40c87f48829325b93cad9cf28d1439c9905be -size 409777 +oid sha256:5b94fa8aed5de1edb9f1855437f449f9e2e05154fa93e4b14e30c15a5ba9e557 +size 766024