302 Commits

Author SHA1 Message Date
cf03a0b098 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Content/Legumix/Player/BP_Play.uasset
2025-04-13 19:40:30 +02:00
e581fbd67c Added additional check to the ledge grab
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-13 19:35:32 +02:00
Emilie Schott
ab8be82328 [UPD] Improve enemies repositioning when overlapping on each other. 2025-04-13 19:32:25 +02:00
Lu
8b84450ea9 Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix 2025-04-13 18:09:07 +02:00
Lu
a20ffacfed Avancement_Mur_Plafond 2025-04-13 18:06:41 +02:00
54f45ad961 Merge remote-tracking branch 'origin/master' 2025-04-13 17:45:17 +02:00
2f262e38ae Implemented shotgun crosshair
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-13 17:45:04 +02:00
620cc47614 Fixed shotgun
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-13 17:43:15 +02:00
92fa0d28b6 Updated WaveManager to use curve as parameters + add widget debug 2025-04-13 17:17:47 +02:00
Emilie Schott
fb44169aae [FIX] Enemy blocked when colliding with an other enemy 2025-04-13 03:34:10 +02:00
Lu
d8a04e753f Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix 2025-04-13 01:00:49 +02:00
Lu
ba60aa62eb Enviro + Pompe 2025-04-13 00:59:22 +02:00
Emilie Schott
b7e4b5c8c5 Merge remote-tracking branch 'origin/master' 2025-04-13 00:05:58 +02:00
Emilie Schott
d2e1a66fb2 [UPD] EQS Filtering and scoring for Enemies + [UPD] enemies speed 2025-04-13 00:05:49 +02:00
47b2713e76 Updated ramp
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 23:46:45 +02:00
3932ac90bd Removed shadows from the player and guns
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 23:45:56 +02:00
03b84c2e65 Added the corridor ramp to the map
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 23:31:16 +02:00
3a411fd272 Imported corridor ramp
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 23:31:00 +02:00
9005ad23f5 Updated map
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 22:57:54 +02:00
61c3f01e82 Imported upper observation area assets
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 22:57:40 +02:00
2618fd48b8 Fixed nanite error
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 20:10:43 +02:00
d2e05ca7db Fixed the map (again)
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 20:10:35 +02:00
Lu
6f426db90a Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix 2025-04-12 19:33:48 +02:00
Lu
a2e94d0b94 Roche_Fond 2025-04-12 19:17:35 +02:00
Emilie Schott
206cfe104d Merge remote-tracking branch 'origin/master' 2025-04-12 18:35:57 +02:00
Emilie Schott
31bfa7e94f [FIX] Blackboard not found for enemies EQS context 2025-04-12 18:35:37 +02:00
5c63254784 Fixed a random fire sound playing at the start of the game
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 18:35:00 +02:00
dc23cdc149 Implemented return to menu on player death
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 18:25:30 +02:00
819b9c8890 Fixed nanite error
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 18:25:12 +02:00
ed43e081e1 Merge remote-tracking branch 'origin/master' 2025-04-12 18:05:55 +02:00
44695b7877 Updated map with assets for the big central wall
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 18:05:50 +02:00
Emilie Schott
67b348255e [FIX] Melee enemies killing each others 2025-04-12 17:05:16 +02:00
b809355bda Fixed incorrect mesh
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 16:24:36 +02:00
7f777c9519 Added material to cables
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 16:15:13 +02:00
3216cff507 Added pillars to the corridor
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 16:12:08 +02:00
b8113e3ba8 Removed incorrect mesh collisions
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 16:11:55 +02:00
7d6b4241e1 Moved glass folder
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 16:11:38 +02:00
f05be593ae Imported more assets into the map
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 15:44:36 +02:00
e86c3e501c Merge remote-tracking branch 'origin/master'
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 15:44:11 +02:00
f111e17d00 Created custom glass material
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 15:07:48 +02:00
Lu
34be6aeb78 Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix 2025-04-12 12:51:31 +02:00
7b13bedb8f Finally fixed player grab not working
Signed-off-by: TjgL <lithmoneo@gmail.com>
2025-04-12 12:32:43 +02:00
Lu
7f907864f0 DA_Avancement 2025-04-11 19:02:33 +02:00
Lu
aff005397a Teste_Roche_Block_out 2025-04-10 00:33:40 +02:00
9d5a22719c Updated decals disappearing distance 2025-04-09 23:27:18 +02:00
9d499d7c8a Fixed map 2025-04-09 22:37:20 +02:00
Lu
15f1214346 Material_Legume 2025-04-09 22:31:00 +02:00
Lu
c5e4ab3dce Merge branch 'DA-Test' 2025-04-09 22:18:56 +02:00
Lu
b4f0f28c38 Update_Asset 2025-04-09 22:16:57 +02:00
2154215432 Added missing textures and materials files 2025-04-08 22:59:09 +02:00