125 Commits

Author SHA1 Message Date
00f9dd2910 Fix tooltip issue; Fix unlock issue; Fix spoopy HP bar not updating; Fix res speed boosts 2025-11-09 11:51:12 -05:00
ecec445335 art/creeper (#17)
Code de Ader et mon implémentation du art pour le Creeper et les creeplings.
Aussi desert monster added.

Co-authored-by: Ader Alisma 01 <adeder22@hotmail.com>
Reviewed-on: #17
Reviewed-by: Ader_Alisma <ader.alisma.1@ens.etsmtl.ca>
Co-authored-by: Craftelia <william-gin1@hotmail.com>
Co-committed-by: Craftelia <william-gin1@hotmail.com>
2025-09-12 19:59:45 +00:00
a15a75a603 bugfix/HideUpgradesOnDeselect (#9)
Retire le UI du UnitTree quand on clique sur n'importe quoi d'autre

Co-authored-by: Ader Alisma 01 <adeder22@hotmail.com>
Reviewed-on: #9
Reviewed-by: EliaGingras1 <william-gin1@hotmail.com>
2025-09-07 22:48:30 +00:00
b05a3245c0 implemented desert heavy monster (#16)
Reviewed-on: #16
Reviewed-by: EliaGingras1 <william-gin1@hotmail.com>
Co-authored-by: Adam Salah <adam-hamid.salah-salah.1@ens.etsmtl.ca>
Co-committed-by: Adam Salah <adam-hamid.salah-salah.1@ens.etsmtl.ca>
2025-09-07 22:46:45 +00:00
61fcd9bf82 outline when hovering unit upgrade (#15)
Reviewed-on: #15
Reviewed-by: EliaGingras1 <william-gin1@hotmail.com>
2025-07-29 21:39:59 +00:00
39bffa8c59 projectile revamp + scorpion (#14)
Reviewed-on: #14
Reviewed-by: EliaGingras1 <william-gin1@hotmail.com>
2025-07-29 21:39:18 +00:00
efafc2bddc art/ghostLady (#13)
- Added spoopy ahh ghost monster

Reviewed-on: #13
Co-authored-by: Craftelia <william-gin1@hotmail.com>
Co-committed-by: Craftelia <william-gin1@hotmail.com>
2025-07-27 20:56:07 +00:00
4cb859c4a5 Basic Dodging Enemy Creation (#12)
Reviewed-on: #12
Reviewed-by: Ader_Alisma <ader.alisma.1@ens.etsmtl.ca>
Co-authored-by: MaximilienBlanchardBizien1 <maximilien.blanchard-bizien.1@ens.etsmtl.ca>
Co-committed-by: MaximilienBlanchardBizien1 <maximilien.blanchard-bizien.1@ens.etsmtl.ca>
2025-07-27 20:30:08 +00:00
2538023d8d dev/bolas (#11)
Reviewed-on: #11
Reviewed-by: Ader_Alisma <ader.alisma.1@ens.etsmtl.ca>
Co-authored-by: Adam Salah <adam-hamid.salah-salah.1@ens.etsmtl.ca>
Co-committed-by: Adam Salah <adam-hamid.salah-salah.1@ens.etsmtl.ca>
2025-07-23 06:39:59 +00:00
e66452005a Adds knight on horse and its animations (#8)
Co-authored-by: Adam <adam-hamid.salah-salah.1@ens.etsmtl.ca>
Co-authored-by: Adam Hamid Salah Salah <adam-hamid.salah-salah.1@ens.etsmtl.ca>
Reviewed-on: #8
Reviewed-by: Ader_Alisma <ader.alisma.1@ens.etsmtl.ca>
Co-authored-by: Craftelia <william-gin1@hotmail.com>
Co-committed-by: Craftelia <william-gin1@hotmail.com>
2025-07-14 22:58:23 +00: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
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
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
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
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
b0c3bf5ba1 Add Scorpion unit; balance ranged units; balanced level13 2024-11-02 16:42:54 -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
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
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
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
Ader Alisma 01
aa4224e7b9 Utilisation du UI d'Élia 2024-09-29 14:40:34 -04:00
Ader Alisma 01
4490600691 Merge remote-tracking branch 'origin/main' into feature/UpgradeIndividuel 2024-09-28 18:50:05 -04:00
Ader Alisma 01
308da140cf Ajout ScriptableObject pour UnitUpgrades 2024-09-28 18:44:46 -04:00
Ader Alisma 01
eb82e6b853 Affichage bouttons interactifs + Suppression dummy gameobjects in Game scene 2024-09-21 15:06:14 -04:00
58fc194bb8 Add unitUpgrade UI sprites and prefab; Also added hpBars to buildings 2024-09-09 10:16:01 -04:00
Ader Alisma 01
3e0ddca9a4 Change l'unité par l'upgrade choisi 2024-08-04 18:40:50 -04:00
321d6bdff7 Balance level 1-6 and archer 2024-07-12 11:19:51 -04:00
Ader Alisma 01
968f255cd5 Début lien entre upgradeUI et Unité 2024-07-07 19:21:49 -04:00
b5351f58ee - Ajouter deuxième île au menu de choix de niveau;
- Ajouté boutons pour passer entre les deux îles.
2024-06-23 15:13:06 -04:00
4a2ece2833 Rendu UpgradePlacementButton.cs indépendant des héritages de UnitPlacementButtons.
Interface d'amélioration s'affiche onClick pour FarmersAssociation

Interface n'est présentement pas rétroactive des infos de l'unité
2024-06-09 15:41:26 -04:00
97d1b6ba02 Prefab UpgadeButtons, utilisation de EventSystems pour clique sur unités.
Début changement selon héritage de UnitPlacementButton
2024-06-08 18:52:58 -04:00
bb898df7c4 Add level select sprites to change island and resize island sprite 2024-05-25 16:48:44 -04:00
12a8497708 Tentative d'associer le clique utilisateur à une position sur le jeu 2024-05-12 18:48:26 -04:00
Felix Boucher
d21f023e5c barre de vie sur les ennemis
Il était impossible de savoir la vie des ennemis et des alliés durant une partie

Ajout d'une barre de vie sur les ennemis et les alliés
2024-03-26 19:58:08 -04:00
William Gingras 01
fd2e2e3991 Pull request #61: Added animated mill and peasant card!
Merge in CGD/gather-and-defend from art/millAndPeasantCard to main

* commit 'ee5cf003b0fd0b4d5b03334f514649d04b96adf3':
  Added animated mill and peasant card!
2024-02-19 17:07:14 +00:00
Felix Boucher
effe4ca2cc unit cooldown
#Le besoin addressé par le commit
les unités et bâtiments devrait avoir un temps de cooldown avant de pouvoir être spawné à nouveau

#Comment le besoin est-il addressé? (modifications)
les unités et bâtiments prennent maintenant 3 secondes avant de redevenir interactif après avoir été spawné
2024-02-18 11:11:03 -05:00
ee5cf003b0 Added animated mill and peasant card! 2024-02-04 18:57:28 -05:00
e1e3c42b00 Created destination placeholders where resource ui should be 2024-02-04 11:30:28 -05:00
Felix-gabriel Boucher-luneau
9188e86adb Pull request #58: Feature/delete button
Merge in CGD/gather-and-defend from feature/delete_button to main

* commit '27d329df7170a12e850d11355ccd33118a94fb7e':
  fix unit cost not working anymore
  working delete feature + placeholder refactor
  refactor placement buttons to accomodate delete
  update database for prefabs and scriptableobjects
  add delete button
2024-01-26 00:18:01 +00:00
Felix Boucher
42fbffd306 working delete feature + placeholder refactor 2024-01-19 15:30:54 -05:00
47338ecdaf Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cgd/gather-and-defend
# Conflicts:
#	Assets/Tiles/BushTile.asset
2024-01-09 10:17:00 -05:00