Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity
357 Commits 16 Branches 0 Tags
Commit Graph

39 Commits

Author SHA1 Message Date
Craftelia
2b59f41997 Merge branch 'main' into art/creeper 2025-09-07 15:31:38 -04:00
Craftelia
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
Adam Salah
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
Craftelia
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
Adam
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
Ader Alisma 01
78c98ac94e Fixed detection 2025-07-13 19:19:07 -04:00
Ader Alisma 01
3ae0de86ba Changed creepling to be an array 2025-07-13 18:28:34 -04:00
Ader_Alisma
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
craftwill
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
MaximilienBlanchardBizien1
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
craftwill
b0c3bf5ba1 Add Scorpion unit; balance ranged units; balanced level13 2024-11-02 16:42:54 -04:00
craftwill
b90ece779d added level 13 2024-11-02 14:35:23 -04:00
craftwill
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
Ader Alisma 01
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
craftwill
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
craftwill
a38388ad90 Added swordsman and renamed the knight 2024-10-27 14:33:43 -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
William
321d6bdff7 Balance level 1-6 and archer 2024-07-12 11:19:51 -04:00
craftwill
069c7eda00 Cards and level spawning balance testing, Fixed some error logs 2024-06-23 10:15:52 -04:00
Ader Alisma 01
12a8497708 Tentative d'associer le clique utilisateur à une position sur le jeu 2024-05-12 18:48:26 -04:00
Felix-gabriel Boucher-luneau
99655f7e09 Pull request #63: extraire les prix et cooldowns des unit cards 
Merge in CGD/gather-and-defend from feature/separate_cooldown_from_units to main

* commit '927c08559f2f0c8850be6c9b3e170165e8bccb27':
  extraire les prix et cooldowns des unit cards
 2024-03-17 19:03:14 +00:00
Felix Boucher
927c08559f extraire les prix et cooldowns des unit cards 
problème : le fait que les prix et les cooldowns étaient dans les game objects directement rendait le design compliqué

solution : créer un scriptable object pour contenir l'info des unit cards
 2024-03-13 16:38:07 -04:00
Ader Alisma 01
bc4b4c30a8 Fixed spawning decrementation and changing spawner objectives dynamically 2024-03-02 16:26:47 -05:00
Ader Alisma 01
8921c898ec Fix ConstantSpawn to change constant spawn group when one group dies 
Keeps doing constant spawn after 2nd group dies

To test: 2 groups die, what about the 3rd one
 2024-02-27 15:44:11 -05:00
Ader Alisma 01
0fd0584a50 Fixed enemy death resuming spawner timers unexpectedly. Now checks if the constant spawn is done to decide if spawning should end. 2024-02-04 18:25:23 -05:00
craftwill
8e50c6d455 Fix spawning for gala and fix archer atk speed 2023-11-13 22:26:24 -05:00
craftwill
c8d2e43326 Add timed victory and config changes 2023-11-13 20:03:28 -05:00
craftwill
e8d89dbd03 Balanced level configs 2023-11-13 18:57:58 -05:00
craftwill
2c701112ad Add levels missing config; Add island float animation 2023-11-13 17:56:14 -05:00
craftwill
e1ffb8c887 Add berries to all levels 2023-11-13 17:47:23 -05:00
craftwill
2ec32f8832 Merge branch 'main' into origin/feature/berriesInteractions 2023-11-13 17:27:36 -05:00
Felix Boucher
7dba305d30 fixes to berry harvesting 
- berry harvester appears on bush tiles
- change berry resource for food instead
- some structural change to reduce bugs
 2023-11-12 18:26:36 -05:00
Ader Alisma 01
4ae8f0dcfa Start delay with for loop and breakTag 2023-11-04 10:01:40 -04:00
craftwill
5211bd9ae9 Fix spawn configs and levels to spawn ok amount of enemies 2023-10-23 21:56:10 -04:00
craftwill
90f01233f4 Added smolEye 2023-10-23 21:37:41 -04:00
craftwill
c143d79fde Playing around with level configs and balanced units 2023-10-23 20:47:57 -04:00
craftwill
69aad5b451 First push 2023-05-07 18:28:47 -04:00