361 Commits

Author SHA1 Message Date
b90e1f44d3 Merge branch 'main' into art/knightOnHorse 2025-07-14 18:53:18 -04:00
6664ce5c18 Revert "removed knightOnHorse unit placement button"
This reverts commit 5b44c1b0bb5dd17ee31bfb0c1364b7be02b03111.
2025-07-14 18:50:38 -04:00
5b44c1b0bb removed knightOnHorse unit placement button 2025-07-14 18:42:50 -04:00
eb773a6806 fixed bug regarding attack damage value switch 2025-07-14 18:39:10 -04:00
e66e1089a6 Production buildings (Mill, Workshop, Blacksmith) (#10)
Les valeurs de productions sont boostées pour tester.
L'outline drag and drop doit être redimensionner manuellement dû à des contraintes d'ordre d'éxecution (l'outline est créé avant qu'on puisse modifier la taille dans un script).
L'art est placeholder.

Reviewed-on: #10
Reviewed-by: Ader_Alisma <ader.alisma.1@ens.etsmtl.ca>
Co-authored-by: Adam <adam-hamid.salah-salah.1@ens.etsmtl.ca>
Co-committed-by: Adam <adam-hamid.salah-salah.1@ens.etsmtl.ca>
2025-07-14 22:28:00 +00:00
cf1f88f43a cleaned up KnightOnHorse unit and commented code 2025-06-30 00:58:42 -04:00
52d6584577 knightOnHorse fading implemented 2025-06-30 00:15:50 -04:00
2a2f3bf040 charging animation implemented 2025-06-29 04:31:28 -04:00
7148263214 rider model and base animation replaced 2025-06-26 15:17:14 -04:00
f83d26e35c Merge branch 'dev/knightOnHorse' into art/knightOnHorse 2025-06-26 14:35:09 -04:00
228e16b2b4 charge damage and cooldown implemented 2025-06-26 14:32:44 -04:00
f28e57eeb7 charging implemented 2025-06-23 21:13:36 -04:00
b5530033db Add charging animation placeholder 2025-06-16 16:35:47 -04:00
d15c20ab8e Adds knight on horse and its animations 2025-06-16 16:25:11 -04:00
921449fc1d Flèches droites peuvent changer d'angle (#7)
Ce Pull Request inclue aussi d'autres corrections mineures, comme le fait que le jeu utilise la nouvelle icône pour le château.

Reviewed-on: #7
Reviewed-by: Ader_Alisma <ader.alisma.1@ens.etsmtl.ca>
2025-05-30 23:42:34 +00:00
8ec062892a Added Unit Tooltip (#6)
Affiche un Tooltip d'une unité quand on hover sur l'unité
Inclus description et stats de l'unité

Co-authored-by: Ader Alisma 01 <adeder22@hotmail.com>
Reviewed-on: #6
Reviewed-by: EliaGingras1 <william-gin1@hotmail.com>
2025-05-30 19:05:03 +00:00
23ecdd6ab4 Added a OnTriggerExit2D to stop attack when entity not detected 2025-05-28 19:16:04 -04:00
b46d8b66e8 created Rider prefab and assets + added test spawn button 2025-05-28 13:38:52 -04:00
cf1df05d6d Added warning on house card to let player know to build one (#5)
Reviewed-on: #5
Reviewed-by: Ader_Alisma <ader.alisma.1@ens.etsmtl.ca>
Co-authored-by: craftwill <william-gin1@hotmail.com>
Co-committed-by: craftwill <william-gin1@hotmail.com>
2025-04-29 18:59:31 +00:00
3fdbbee765 Fix placing multiple units on the same tile (#2)
Reviewed-on: #2
Reviewed-by: Ader_Alisma <ader.alisma.1@ens.etsmtl.ca>
2025-04-06 22:31:07 +00:00
e5c9e327e4 Added an exemple challenge in the UI (#4)
Reviewed-on: #4
Reviewed-by: Ader_Alisma <ader.alisma.1@ens.etsmtl.ca>
Co-authored-by: craftwill <william-gin1@hotmail.com>
Co-committed-by: craftwill <william-gin1@hotmail.com>
2025-04-06 22:23:14 +00:00
05a9fa2112 Add castle sprite and change its dmg 2->3 (#3)
Reviewed-on: #3
Reviewed-by: Ader_Alisma <ader.alisma.1@ens.etsmtl.ca>
Co-authored-by: craftwill <william-gin1@hotmail.com>
Co-committed-by: craftwill <william-gin1@hotmail.com>
2025-03-02 18:06:54 +00:00
a6778d8b72 Fixed an issue where the player couldn't consistently bring up the upgrade option when trying to click on units that were specifically in the castle's shooting range. (#1)
Reviewed-on: #1
Co-authored-by: MaximilienBlanchardBizien1 <maximilien.blanchard-bizien.1@ens.etsmtl.ca>
Co-committed-by: MaximilienBlanchardBizien1 <maximilien.blanchard-bizien.1@ens.etsmtl.ca>
2025-02-13 21:30:36 +00:00
219aa36d62 Pull request #85: Castle Unit Implementation
Merge in CGD/gather-and-defend from origin/feature/CastleUnitImplementation to main

* commit 'e36d43d69ab6aa1092511fbb237421785f3c25c7':
  - Fixed an issue where the castle arrow couldn't fire at enemies in an angle, and only straight forward; - Modified the castle's infos so that it fires only 4 arrows per intervals instead of 5.
  Implemented the basis for the castle unit, including having it shoot, the shooting range, and the upgrading logic.
  Implemented Castle data to the game. The only thing it's missing is the attack pattern.
2025-01-05 21:48:55 +00:00
e36d43d69a - Fixed an issue where the castle arrow couldn't fire at enemies in an angle, and only straight forward;
- Modified the castle's infos so that it fires only 4 arrows per intervals instead of 5.
2025-01-05 16:33:16 -05:00
503a8dedbc Implemented the basis for the castle unit, including having it shoot, the shooting range, and the upgrading logic. 2025-01-05 10:49:19 -05:00
a8ca27ebcd Pull request #83: Destroys unitTree onDestroy
Merge in CGD/gather-and-defend from bugfix/UnitTreeOnDeath to main

* commit 'd126255f4a6c9b8422dd2d1ac6b4d970bc124b7f':
  Destroys unitTree onDestroy
2024-11-24 20:44:47 +00:00
b123b9c0f7 Pull request #82: Fix detection collider qui empêche le click sur les unités qu'elle couvre
Merge in CGD/gather-and-defend from bugfix/DetectionCollider to main

* commit '4c699f63c20645d4474a7cf1503aba64e360d793':
  Changed detection layer to InvisibleToCamera
2024-11-24 20:44:03 +00:00
Ader Alisma 01
d126255f4a Destroys unitTree onDestroy 2024-11-10 13:32:33 -05:00
Ader Alisma 01
4c699f63c2 Changed detection layer to InvisibleToCamera 2024-11-10 13:11:37 -05:00
116d9610c4 Implemented Castle data to the game. The only thing it's missing is the attack pattern. 2024-11-07 15:35:36 -05:00
Élia Gingras 01
bad4685988 Pull request #80: Integration of upgrades for melee, ranged and house units and more
Merge in CGD/gather-and-defend from dev/unitUpgradeIntegration to main

* commit 'b0c3bf5ba1216d3aa7539cf73584c6915bac6fa6':
  Add Scorpion unit; balance ranged units; balanced level13
  added level 13
  Integration of upgrades for melee, ranged and house units; Lots of balancing and created levels 8 to 12; Added desert sprites and change background dynamicaly; Fix upgrade error when only 1-2 upgrades are put in a unit; Made it so that resources are collected automaticaly after a delay; Units need to be upgraded to access the better units now; Some visual updates on units; Added slinger unit (temporary graphics)
2024-11-04 00:25:02 +00:00
b0c3bf5ba1 Add Scorpion unit; balance ranged units; balanced level13 2024-11-02 16:42:54 -04:00
b90ece779d added level 13 2024-11-02 14:35:23 -04:00
14c4cf4c88 Merge branch 'main' into dev/unitUpgradeIntegration 2024-10-30 11:35:30 -04:00
Élia Gingras 01
02a1f63e44 Pull request #81: Fixed allies sometimes not attacking by redoing the detection code
Merge in CGD/gather-and-defend from bugfix/enemeisNotAttacked to main

* commit '823b1f5da8c6213424966f0536a9121614cceb7b':
  Fixed allies sometimes not attacking by redoing the detection code
2024-10-30 15:34:55 +00:00
823b1f5da8 Fixed allies sometimes not attacking by redoing the detection code 2024-10-30 11:22:29 -04:00
af5dd22bc2 Integration of upgrades for melee, ranged and house units; Lots of balancing and created levels 8 to 12; Added desert sprites and change background dynamicaly; Fix upgrade error when only 1-2 upgrades are put in a unit; Made it so that resources are collected automaticaly after a delay; Units need to be upgraded to access the better units now; Some visual updates on units; Added slinger unit (temporary graphics) 2024-10-29 15:46:57 -04:00
f06f619174 Pull request #78: UpgradeIndividuel
Merge in CGD/gather-and-defend from UpgradeIndividuel to main

* commit '196740676df3a8b2b1cfa877b0b61dabdda497e0':
  Permettre 1 à 3 upgrades
  Suppression debug logs
  Revert UI
  Utilisation du UI d'Élia
  Ajout ScriptableObject pour UnitUpgrades
  Affichage bouttons interactifs + Suppression dummy gameobjects in Game scene
  Debuggins
  Change l'unité par l'upgrade choisi
  Début lien entre upgradeUI et Unité
  Rendu UpgradePlacementButton.cs indépendant des héritages de UnitPlacementButtons.
  Prefab UpgadeButtons, utilisation de EventSystems pour clique sur unités.
  Tentative d'associer le clique utilisateur à une position sur le jeu
2024-10-27 20:28:26 +00:00
Élia Gingras 01
60a56cc7d0 Pull request #79: Added swordsman and renamed the knight
Merge in CGD/gather-and-defend from art/swordsmanArt to main

* commit '82a76c418054f1527f6c6a40723551ba45f40173':
  Change range so it maybe unbugs the swords users; Also balance costs of units and cooldowns
  Added swordsman and renamed the knight
2024-10-27 19:57:54 +00:00
Élia Gingras 01
7852709519 Pull request #77: Added missing Ally tags and sorting order type for enemies
Merge in CGD/gather-and-defend from dev/tagsAndSortingOrder to main

* commit '507b2ce8e069ed105bb9bc6ac59a5aba39022750':
  Null check so that buildings dont need an animator
  Added missing Ally tags and sorting order type for enemies
2024-10-27 19:57:46 +00:00
507b2ce8e0 Null check so that buildings dont need an animator 2024-10-27 15:57:26 -04:00
Ader Alisma 01
196740676d Permettre 1 à 3 upgrades 2024-10-27 15:37:30 -04:00
82a76c4180 Change range so it maybe unbugs the swords users; Also balance costs of units and cooldowns 2024-10-27 15:27:38 -04:00
Ader Alisma 01
c8ecace848 Suppression debug logs 2024-10-27 14:52:51 -04:00
a38388ad90 Added swordsman and renamed the knight 2024-10-27 14:33:43 -04:00
Ader Alisma 01
20a6393888 Revert UI 2024-10-27 11:49:12 -04:00
12e5f4bc55 Added missing Ally tags and sorting order type for enemies 2024-10-13 12:10:18 -04:00
56b5dd3361 Pull request #76: Fixed Enemy Farm Overlay
Merge in CGD/gather-and-defend from origin/bugfix/enemyFarmOverlay to main

* commit 'c9e791633f7d91da852be5a4e4d8c31a39d9f5d4':
  Increased the layer levels of the monsters currently in the game, making it so that they walk over the farm tiles instead of under.
2024-10-12 18:10:48 +00:00
c9e791633f Increased the layer levels of the monsters currently in the game, making it so that they walk over the farm tiles instead of under. 2024-10-12 13:56:26 -04:00