Commit Graph

Select branches

Hide Pull Requests

DA-Test

DA-creation

add-melee-ennemy

add-range-ennemy

add-weapon

master

player-damages-display

range-enemy-shot

rework-weapons

Mono Color

• bf61fec77e Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix master Antoine Caru 2025-04-18 03:57:52 +02:00
• a789c06111 Update LvL 3 Antoine Caru 2025-04-18 03:57:48 +02:00
• 45a327ba2f Added and update LvL 3 map. Level art global Antoine Caru 2025-04-18 03:57:35 +02:00
• 6f13060c34 [ADD] Range enemy animation (not implemented) Emilie Schott 2025-04-18 03:42:51 +02:00
• 6e37045072 [UPD] Melee Enemy dont make damage on dash movement Emilie Schott 2025-04-18 02:41:43 +02:00
• 497b83103b Fixed level art map TjgL 2025-04-18 01:16:34 +02:00
• 4f8faaf4a7 Finished working on the map for now TjgL 2025-04-18 01:04:44 +02:00
• e0e9c70307 Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix Lu 2025-04-18 01:00:57 +02:00
• 61f7ca7d8b Updated Break Time Bastien 2025-04-18 00:57:57 +02:00
• 13002c0cf2 Added roof to the map TjgL 2025-04-18 00:49:37 +02:00
• c2ee42212c Color_Gun Lu 2025-04-18 00:48:05 +02:00
• 6227206f53 Fixed missing asset geometry TjgL 2025-04-18 00:20:06 +02:00
• 394ba0a63c Updated map with assets TjgL 2025-04-18 00:12:55 +02:00
• 689b0b2737 Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix Lu 2025-04-17 23:53:18 +02:00
• 0152aca8e9 Lvl art again Lu 2025-04-17 23:39:43 +02:00
• 917d50cefd Added even more assets from level art TjgL 2025-04-17 23:32:24 +02:00
• 20db05f217 Started importing level art assets in the main map TjgL 2025-04-17 23:00:19 +02:00
• b8821fe5d5 Updated some props physics material TjgL 2025-04-17 22:27:31 +02:00
• 721c67fd1e [FIX] melee enemy speed not reseting propely after dash Emilie Schott 2025-04-17 22:23:28 +02:00
• 606eafebfe [FIX] Nav Link proxy in both sens Emilie Schott 2025-04-17 22:22:40 +02:00
• 1121f1fb45 Reduced shotgun + impact volume TjgL 2025-04-17 21:53:53 +02:00
• 2637c55aeb Updated Curves Bastien 2025-04-17 21:50:29 +02:00
• 66eacf5d02 Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix Lu 2025-04-17 21:39:29 +02:00
• 40965714a1 Texture_Pistolet Lu 2025-04-17 21:38:54 +02:00
• e5b7f81931 Implemented player hit sound TjgL 2025-04-17 21:38:30 +02:00
• eac852e49d Implemented jump and slide sounds TjgL 2025-04-17 21:33:03 +02:00
• 11f4636c83 Updated fmod banks TjgL 2025-04-17 21:28:29 +02:00
• a197f208a0 Updated assets maps and tweak wave values Antoine Caru 2025-04-17 20:44:06 +02:00
• 5b2743ab2f Added event when health is increased TjgL 2025-04-17 20:25:40 +02:00
• d0e1d8cf39 [ADD] Implement sounds for enemies death and hit Emilie Schott 2025-04-17 03:17:44 +02:00
• 3ddc4cde23 [UPD] Melee Enemy animations : add blendspace (but the movement are not long enough to be displayed) Emilie Schott 2025-04-17 02:35:10 +02:00
• ae400c39e5 Implemented weapon hit sounds (normal + critical) TjgL 2025-04-17 00:10:06 +02:00
• 284b9c135d Animation_Carotte Lu 2025-04-16 23:59:11 +02:00
• 85fc3ab03f Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix Lu 2025-04-16 23:44:08 +02:00
• fa313d3563 Implemented bullet impact sounds TjgL 2025-04-16 23:31:30 +02:00
• 8f7268d334 Lvl art Lu 2025-04-16 23:30:50 +02:00
• 24822d8527 Implemented player dynamic footsteps + fall TjgL 2025-04-16 23:13:18 +02:00
• 2be44cfeb8 Added physics settings and physical material assets TjgL 2025-04-16 23:13:00 +02:00
• 8faace3b3a [UPD] Implement Melee Attack animation Emilie Schott 2025-04-16 23:08:52 +02:00
• da00261121 Implemented basic footsteps TjgL 2025-04-16 22:43:37 +02:00
• e862d22f5f Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix Lu 2025-04-16 22:31:00 +02:00
• 733406f9b5 Lvl art & animation Lu 2025-04-16 22:29:51 +02:00
• b61e54494f Updated weapons sounds TjgL 2025-04-16 21:53:55 +02:00
• 654973f34a lvl art Lu 2025-04-16 14:31:27 +02:00
• 1170c37f82 Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix Lu 2025-04-16 13:16:27 +02:00
• 5786b90833 [ADD] Basic animations for enemies Emilie Schott 2025-04-16 03:25:23 +02:00
• d5fcf4b8ee Updated materials on the map TjgL 2025-04-15 23:32:14 +02:00
• 47bc9ca874 Added custom collisions to arches TjgL 2025-04-15 23:23:04 +02:00
• cc20a348c5 Added collision to salle fond asset TjgL 2025-04-15 23:00:00 +02:00
• 6d30474f63 Updated map TjgL 2025-04-15 22:22:12 +02:00
• 91699e8b71 Updated wall material TjgL 2025-04-15 22:22:01 +02:00
• b63b70bfa6 Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix Lu 2025-04-15 22:19:57 +02:00
• d68c0ed7fd Blend_Space Lu 2025-04-15 22:19:50 +02:00
• f6ede5ef3e Merge remote-tracking branch 'origin/master' TjgL 2025-04-15 22:11:44 +02:00
• 37bb4f79fe Updated map with arch area assets TjgL 2025-04-15 22:11:21 +02:00
• 21ca9a304f Imported assets for the arch area TjgL 2025-04-15 22:03:00 +02:00
• 576df5a4f9 Blend_Anime Lu 2025-04-15 14:05:22 +02:00
• 4a766fa678 [ADD] Token system to attack turn for melee enemy (WIP) Emilie Schott 2025-04-15 03:12:16 +02:00
• 3e96207407 Minor map changes TjgL 2025-04-14 23:21:00 +02:00
• 1ca9f9b655 Updated map corridor section TjgL 2025-04-14 23:04:04 +02:00
• ed2c19cab9 Added more assets TjgL 2025-04-14 23:01:30 +02:00
• 886f680b52 Fixed incorrect map geometry TjgL 2025-04-14 20:51:58 +02:00
• 5d36aaad99 Updated Revolver Mesh for UVs Antoine Caru 2025-04-14 00:13:03 +02:00
• 9909af3c8b [FIX] map lvl 3 make crash game Emilie Schott 2025-04-14 00:09:55 +02:00
• b70d0ee97e Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix Lu 2025-04-13 23:22:20 +02:00
• f91e6a9191 Animation Lu 2025-04-13 23:21:58 +02:00
• c25ff81130 Merge remote-tracking branch 'origin/master' TjgL 2025-04-13 23:09:11 +02:00
• e775b3329b Updated corridor TjgL 2025-04-13 23:09:05 +02:00
• a5ed30c8b6 Imported corridor meshes TjgL 2025-04-13 23:08:37 +02:00
• 9250630138 Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix Lu 2025-04-13 23:00:59 +02:00
• cedb2162b4 gun mosh Lu 2025-04-13 21:52:05 +02:00
• e4f0f54eb3 Added enemies spawn curves TjgL 2025-04-13 19:41:47 +02:00
• cf03a0b098 Merge remote-tracking branch 'origin/master' TjgL 2025-04-13 19:40:30 +02:00
• 323846b4dd Disabled most debug logs TjgL 2025-04-13 19:38:28 +02:00
• e581fbd67c Added additional check to the ledge grab TjgL 2025-04-13 19:35:32 +02:00
• ab8be82328 [UPD] Improve enemies repositioning when overlapping on each other. Emilie Schott 2025-04-13 19:32:25 +02:00
• 8b84450ea9 Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix Lu 2025-04-13 18:09:07 +02:00
• a20ffacfed Avancement_Mur_Plafond Lu 2025-04-13 18:06:41 +02:00
• 54f45ad961 Merge remote-tracking branch 'origin/master' TjgL 2025-04-13 17:45:17 +02:00
• 2f262e38ae Implemented shotgun crosshair TjgL 2025-04-13 17:45:04 +02:00
• 620cc47614 Fixed shotgun TjgL 2025-04-13 17:43:15 +02:00
• 92fa0d28b6 Updated WaveManager to use curve as parameters + add widget debug sSebster 2025-04-13 17:17:47 +02:00
• fb44169aae [FIX] Enemy blocked when colliding with an other enemy Emilie Schott 2025-04-13 03:34:10 +02:00
• d8a04e753f Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix Lu 2025-04-13 01:00:49 +02:00
• ba60aa62eb Enviro + Pompe Lu 2025-04-13 00:59:22 +02:00
• b7e4b5c8c5 Merge remote-tracking branch 'origin/master' Emilie Schott 2025-04-13 00:05:58 +02:00
• d2e1a66fb2 [UPD] EQS Filtering and scoring for Enemies + [UPD] enemies speed Emilie Schott 2025-04-13 00:05:49 +02:00
• 47b2713e76 Updated ramp TjgL 2025-04-12 23:46:45 +02:00
• 3932ac90bd Removed shadows from the player and guns TjgL 2025-04-12 23:45:56 +02:00
• 03b84c2e65 Added the corridor ramp to the map TjgL 2025-04-12 23:31:16 +02:00
• 3a411fd272 Imported corridor ramp TjgL 2025-04-12 23:31:00 +02:00
• 9005ad23f5 Updated map TjgL 2025-04-12 22:57:54 +02:00
• 61c3f01e82 Imported upper observation area assets TjgL 2025-04-12 22:57:40 +02:00
• 2618fd48b8 Fixed nanite error TjgL 2025-04-12 20:10:43 +02:00
• d2e05ca7db Fixed the map (again) TjgL 2025-04-12 20:10:00 +02:00
• 6f426db90a Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix Lu 2025-04-12 19:33:48 +02:00
• a2e94d0b94 Roche_Fond Lu 2025-04-12 19:17:35 +02:00
• 206cfe104d Merge remote-tracking branch 'origin/master' Emilie Schott 2025-04-12 18:35:57 +02:00
• 31bfa7e94f [FIX] Blackboard not found for enemies EQS context Emilie Schott 2025-04-12 18:35:37 +02:00
• 5c63254784 Fixed a random fire sound playing at the start of the game TjgL 2025-04-12 18:35:00 +02:00