Commit graph

73 commits

Author SHA1 Message Date
0727e44b80 Merge branch 'Integration' 2025-01-29 06:35:56 +01:00
1b2611e5a9 working 2025-01-29 06:34:44 +01:00
Kirabsol
1fb3c9bfbe Update MainMenu.unity 2025-01-29 01:27:21 +01:00
Kirabsol
8101f86b06 Merge branch 'main' of https://github.com/Crizomb/ProjetAMJV_CR 2025-01-29 01:02:31 +01:00
Kirabsol
97aa74cacb Main Menu Rules
Started, should be finished in fact 👍
2025-01-29 01:02:28 +01:00
4e91f448c9 things 2025-01-29 00:59:22 +01:00
a17810ffeb Import
temp
2025-01-29 00:41:25 +01:00
a87f0ed109 temporary files rename 2025-01-29 00:34:36 +01:00
8e077e523c Revert "integration"
This reverts commit 521a62973a.
2025-01-29 00:02:11 +01:00
521a62973a integration
bad other team code on another branch
2025-01-28 23:58:50 +01:00
7925fd966a Merge branch 'main' of https://github.com/Crizomb/ProjetAMJV_CR 2025-01-28 23:43:04 +01:00
Kirabsol
9a67bd00aa Merge branch 'main' of https://github.com/Crizomb/ProjetAMJV_CR 2025-01-28 23:41:58 +01:00
Kirabsol
f52ac8863c Behavior choice complete
omg ça marche juste la défense il faut une reine mais en vrai c'est pas grave
2025-01-28 23:41:01 +01:00
3230f458a5 gameplay 2025-01-28 23:38:41 +01:00
9c9c895319 Merge branch 'main' into clement 2025-01-28 23:01:44 +01:00
1d6a879755 Sound + somewhat game loop 2025-01-28 23:00:52 +01:00
Kirabsol
0e815e1a05 Merge branch 'main' of https://github.com/Crizomb/ProjetAMJV_CR 2025-01-28 20:31:35 +01:00
Kirabsol
7568887a44 Canvas Win/Lose but not display 2025-01-28 20:31:32 +01:00
2d9e991c6f Merge branch 'main' of https://github.com/Crizomb/ProjetAMJV_CR 2025-01-28 13:21:38 +01:00
Kirabsol
fd649c831c Merge branch 'main' of https://github.com/Crizomb/ProjetAMJV_CR 2025-01-28 13:20:31 +01:00
Kirabsol
33d88bdfa7 Start of WiN/LOSE UI
finishing later today
2025-01-28 13:20:29 +01:00
29e5e48aee Je veux faire du bevy
C'est mieux, honêtement
2025-01-28 13:20:13 +01:00
2ad6cc9bdb crown setters make crown appear 2025-01-28 12:16:59 +01:00
Kirabsol
e51417a4e5 Merge branch 'main' of https://github.com/Crizomb/ProjetAMJV_CR 2025-01-28 12:01:10 +01:00
Kirabsol
e805b7eb9c Crown Placement and Start of Game
Lisez pas mes commits svp T_T
2025-01-28 12:01:04 +01:00
4e82be610a Merge branch 'main' into clement 2025-01-28 11:58:57 +01:00
f5acd70d85 cringe bug fix im stupid
in HealthHandmer
2025-01-28 11:58:43 +01:00
Kirabsol
c2af70eeb4 Merge branch 'main' of https://github.com/Crizomb/ProjetAMJV_CR 2025-01-28 04:13:34 +01:00
Kirabsol
abeb6fbf83 Placement of units and crown
youhou
2025-01-28 04:13:29 +01:00
37bed1fd33 next level logic 2025-01-28 04:11:53 +01:00
ee2a5fdf08 All Map + things 2025-01-28 02:56:56 +01:00
769264c79b fix navmesh no find
cringe unity instantiate
C# + java cringe operator overloading making things not clea renough
2025-01-28 00:08:00 +01:00
f8c859ed96 Merge branch 'main' of https://github.com/Crizomb/ProjetAMJV_CR 2025-01-27 23:39:46 +01:00
e9af1b413a cam things 2025-01-27 23:38:26 +01:00
Kirabsol
49c5e6df9f Start Unit PLacement
navmesh not working yet
2025-01-27 23:37:59 +01:00
afe60bae57 crampté 2025-01-27 23:08:58 +01:00
3fc57e3a64 Zombie + Skeletton capacities 2025-01-23 11:46:27 +01:00
e94e2b8dce maybe before cycling import
failsafe
2025-01-23 11:04:17 +01:00
299091b632 Merge branch 'main' of https://github.com/Crizomb/ProjetAMJV_CR 2025-01-23 10:42:14 +01:00
777fd0380c add crown 2025-01-23 10:37:07 +01:00
Kirabsol
1e4052732b Merge branch 'main' of https://github.com/Crizomb/ProjetAMJV_CR 2025-01-22 18:01:43 +01:00
Kirabsol
56f0f8f30f start of Shop system
grrr
2025-01-22 18:01:31 +01:00
7d3b4ced0e Capacity + Health and Mana bars 2025-01-21 12:59:14 +01:00
b21d392ff6 witches 2025-01-20 21:05:28 +01:00
ffb1f1caa1 Shiny shiny golem animations + attack 2025-01-16 01:48:50 +01:00
c74ebe3225 Iron golem 2025-01-15 23:13:20 +01:00
d3101b6bcf Delete gltf things
cringe unity doesn't support open-source chad format and only want maya cringelord fbx format
2025-01-15 20:42:12 +01:00
95943c415c WORKING ARCHERS + test
big drip
2025-01-15 01:46:16 +01:00
ca7ce8e645 Invoke repeating + add goal distance to neutral behavior 2025-01-15 01:32:30 +01:00
bf010f3476 Zombies + Skeleton Physics arrow + aimbot
360 headhsot ezz
2025-01-15 00:51:59 +01:00