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

276 Commits

Author SHA1 Message Date
craftwill
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
MaximilienBlanchardBizien1
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
Maximilien Blanchard-Bizien
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
MaximilienBlanchardBizien1
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
MaximilienBlanchardBizien1
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
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
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
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
14c4cf4c88 Merge branch 'main' into dev/unitUpgradeIntegration 2024-10-30 11:35:30 -04:00
craftwill
823b1f5da8 Fixed allies sometimes not attacking by redoing the detection code 2024-10-30 11:22:29 -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
É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
craftwill
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
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
Ader Alisma 01
c8ecace848 Suppression debug logs 2024-10-27 14:52:51 -04:00
craftwill
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
craftwill
12e5f4bc55 Added missing Ally tags and sorting order type for enemies 2024-10-13 12:10:18 -04:00
MaximilienBlanchardBizien1
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
MaximilienBlanchardBizien1
1fd249a0d2 Made it so that buildings are not counted in the total population count, and that the player can still place those, even when the maximum population has been reached. 2024-09-24 10:50:46 -04:00
Ader Alisma 01
eb82e6b853 Affichage bouttons interactifs + Suppression dummy gameobjects in Game scene 2024-09-21 15:06:14 -04:00
craftwill
58fc194bb8 Add unitUpgrade UI sprites and prefab; Also added hpBars to buildings 2024-09-09 10:16:01 -04:00
Ader Alisma 01
3ce5219946 Debuggins 2024-09-05 19:37:50 -04:00
MaximilienBlanchardBizien1
884d4a9ee6 Fixed issue where farmer can be placed on a non-resource tile. 2024-09-03 15:43:38 -04:00
Ader Alisma 01
3e0ddca9a4 Change l'unité par l'upgrade choisi 2024-08-04 18:40:50 -04:00
Élia Gingras 01
8eb2a7d5cc Pull request #72: Balance level 1-6 and archer 
Merge in CGD/gather-and-defend from design/finallyBalanceLevels to main

* commit '321d6bdff760ad7062b19189c6bb6f9f714a655d':
  Balance level 1-6 and archer
 2024-07-12 15:46:00 +00:00
William
321d6bdff7 Balance level 1-6 and archer 2024-07-12 11:19:51 -04:00
craftwill
d8e3e72b1e Add island 2 2024-07-09 11:40:05 -04:00
Ader Alisma 01
968f255cd5 Début lien entre upgradeUI et Unité 2024-07-07 19:21:49 -04:00
Maximilien Blanchard-Bizien
a39aebf9f7 Pull request #70: Ajouter deuxième île au menu de choix de niveau 
Merge in CGD/gather-and-defend from feature/World2Map to main

* commit 'b5351f58ee6fbe53c28ac1efa75696e21b4c64ea':
  - Ajouter deuxième île au menu de choix de niveau; - Ajouté boutons pour passer entre les deux îles.
 2024-06-23 23:18:37 +00:00
craftwill
dcdc0d7fc8 Merge branch 'main' into bugfix/spawnLevelConfigOddBehaviour 2024-06-23 18:36:14 -04:00
craftwill
7e9385db30 revert object instantiate on level config 2024-06-23 18:34:54 -04:00
craftwill
18b97c4fd9 reset WaveObserver state wip 2024-06-23 18:31:56 -04:00
MaximilienBlanchardBizien1
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
craftwill
18babd7d6c Merge branch 'main' into design/summerBalance 2024-06-23 10:36:45 -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
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
Ader Alisma 01
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
Élia Gingras 01
8804450d99 Pull request #67: Add level select sprites to change island and resize island sprite 
Merge in CGD/gather-and-defend from art/levelSelectSprites to main

* commit 'bb898df7c42ce83c7949857e4dc1b75fbfb7f47f':
  Add level select sprites to change island and resize island sprite
 2024-06-08 18:46:04 +00:00
Maximilien Blanchard-Bizien
43c569dfec Pull request #66: - Retiré temporairement l'erreur qui apparaît quand on intéragit avec un niveau qui n'a pas de WaveConfig. 
Merge in CGD/gather-and-defend from bugfix/WaveConfigNullCheck to main

* commit '2ff59828210c23b0706da1e934aabadc5a60b52e':
  - Retiré temporairement l'erreur qui apparaît quand on intéragit avec un niveau qui n'a pas de WaveConfig.
 2024-05-25 23:18:45 +00:00
craftwill
bb898df7c4 Add level select sprites to change island and resize island sprite 2024-05-25 16:48:44 -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