Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix
This commit is contained in:
commit
34be6aeb78
2
.gitignore
vendored
2
.gitignore
vendored
@ -80,6 +80,8 @@ DerivedDataCache/*
|
|||||||
# Patches files
|
# Patches files
|
||||||
Binaries/Win64/*.patch_*.exp
|
Binaries/Win64/*.patch_*.exp
|
||||||
Binaries/Win64/*.patch_*.pdb
|
Binaries/Win64/*.patch_*.pdb
|
||||||
|
*.exp
|
||||||
|
*.pdb
|
||||||
|
|
||||||
|
|
||||||
### FMOD
|
### FMOD
|
||||||
|
BIN
Binaries/Win64/LegumeMix.exp
(Stored with Git LFS)
BIN
Binaries/Win64/LegumeMix.exp
(Stored with Git LFS)
Binary file not shown.
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:a4095f38942889b5e58246cbcb9fb720a5765c78e184ff10a6e3d8f3160673d1
|
|
||||||
size 346189824
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
BIN
Binaries/Win64/UnrealEditor-LegumeMix.exp
(Stored with Git LFS)
BIN
Binaries/Win64/UnrealEditor-LegumeMix.exp
(Stored with Git LFS)
Binary file not shown.
BIN
Binaries/Win64/UnrealEditor-LegumeMix.pdb
(Stored with Git LFS)
BIN
Binaries/Win64/UnrealEditor-LegumeMix.pdb
(Stored with Git LFS)
Binary file not shown.
@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"BuildId": "37670630",
|
|
||||||
"Modules":
|
|
||||||
{
|
|
||||||
"LegumeMix": "UnrealEditor-LegumeMix.dll"
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:241455a154d1686242b1731a5ee7010f11a3c455b987ed2c69555443f4e12a00
|
|
||||||
size 3010560
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:a38bdac5dd93acb86446e65dad87e4521ecf9e7fe551c7bb3959652791ffae42
|
|
||||||
size 1126400
|
|
@ -132,6 +132,7 @@ ManualIPAddress=
|
|||||||
+Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.")
|
+Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.")
|
||||||
+Profiles=(Name="UI",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap),(Channel="Bullet",Response=ECR_Ignore)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ")
|
+Profiles=(Name="UI",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap),(Channel="Bullet",Response=ECR_Ignore)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ")
|
||||||
+Profiles=(Name="Drop",CollisionEnabled=QueryAndPhysics,bCanModify=True,ObjectTypeName="Drop",CustomResponses=((Channel="WorldStatic",Response=ECR_Ignore),(Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Destructible",Response=ECR_Ignore),(Channel="Bullet",Response=ECR_Ignore),(Channel="Enemy",Response=ECR_Ignore),(Channel="Drop",Response=ECR_Ignore)),HelpMessage="Needs description")
|
+Profiles=(Name="Drop",CollisionEnabled=QueryAndPhysics,bCanModify=True,ObjectTypeName="Drop",CustomResponses=((Channel="WorldStatic",Response=ECR_Ignore),(Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Destructible",Response=ECR_Ignore),(Channel="Bullet",Response=ECR_Ignore),(Channel="Enemy",Response=ECR_Ignore),(Channel="Drop",Response=ECR_Ignore)),HelpMessage="Needs description")
|
||||||
|
+Profiles=(Name="PlayerGrab",CollisionEnabled=QueryAndPhysics,bCanModify=True,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Ignore),(Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Destructible",Response=ECR_Ignore),(Channel="Bullet",Response=ECR_Ignore),(Channel="Enemy",Response=ECR_Ignore),(Channel="Projectile",Response=ECR_Ignore),(Channel="Drop",Response=ECR_Overlap)),HelpMessage="Used by player grab component")
|
||||||
+DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,DefaultResponse=ECR_Block,bTraceType=True,bStaticObject=False,Name="Bullet")
|
+DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,DefaultResponse=ECR_Block,bTraceType=True,bStaticObject=False,Name="Bullet")
|
||||||
+DefaultChannelResponses=(Channel=ECC_GameTraceChannel2,DefaultResponse=ECR_Block,bTraceType=True,bStaticObject=False,Name="Enemy")
|
+DefaultChannelResponses=(Channel=ECC_GameTraceChannel2,DefaultResponse=ECR_Block,bTraceType=True,bStaticObject=False,Name="Enemy")
|
||||||
+DefaultChannelResponses=(Channel=ECC_GameTraceChannel3,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="Projectile")
|
+DefaultChannelResponses=(Channel=ECC_GameTraceChannel3,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="Projectile")
|
||||||
|
BIN
Content/Legumix/Drops/BP_DropRevolver.uasset
(Stored with Git LFS)
BIN
Content/Legumix/Drops/BP_DropRevolver.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Legumix/Drops/BP_DropShotgun.uasset
(Stored with Git LFS)
BIN
Content/Legumix/Drops/BP_DropShotgun.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Legumix/Drops/BP_HealthPack.uasset
(Stored with Git LFS)
BIN
Content/Legumix/Drops/BP_HealthPack.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Legumix/Player/BP_Play.uasset
(Stored with Git LFS)
BIN
Content/Legumix/Player/BP_Play.uasset
(Stored with Git LFS)
Binary file not shown.
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
#include "LMWaveManager.h"
|
#include "LMWaveManager.h"
|
||||||
|
|
||||||
|
#include "EngineUtils.h"
|
||||||
#include "Components/CapsuleComponent.h"
|
#include "Components/CapsuleComponent.h"
|
||||||
#include "Enemy/LMEnemy.h"
|
#include "Enemy/LMEnemy.h"
|
||||||
|
|
||||||
@ -18,6 +19,17 @@ void ALMWaveManager::BeginPlay()
|
|||||||
{
|
{
|
||||||
Super::BeginPlay();
|
Super::BeginPlay();
|
||||||
StartWave();
|
StartWave();
|
||||||
|
|
||||||
|
SpawnPositionsList.Empty(); // Nettoie la liste avant de remplir
|
||||||
|
|
||||||
|
for (TActorIterator<ALMSpawnPosition> It(GetWorld()); It; ++It)
|
||||||
|
{
|
||||||
|
ALMSpawnPosition* SpawnPos = *It;
|
||||||
|
if (SpawnPos)
|
||||||
|
{
|
||||||
|
SpawnPositionsList.Add(SpawnPos);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ALMWaveManager::SpawnEnemy(ALMSpawnPosition* spawnPosition)
|
void ALMWaveManager::SpawnEnemy(ALMSpawnPosition* spawnPosition)
|
||||||
|
Reference in New Issue
Block a user