324 Commits

Author SHA1 Message Date
823b1f5da8 Fixed allies sometimes not attacking by redoing the detection code 2024-10-30 11:22:29 -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
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
7a9d2c9624 Pull request #75: Buildings are not counted as People, and can still be placed, regardless of limit
Merge in CGD/gather-and-defend from origin/bugfix/BuildingsExludedFromPopulation to main

* commit '1fd249a0d2a7687ba203a899ca9ced8a12989e00':
  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 15:11:57 +00:00
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
Élia Gingras 01
932aeb6e82 Pull request #74: Add unitUpgrade UI sprites and prefab; Also added hpBars to buildings
Merge in CGD/gather-and-defend from art/unitUpgradeUISprites to main

* commit '58fc194bb8c57ac8f7771bc643b04f2e7634ef5a':
  Add unitUpgrade UI sprites and prefab; Also added hpBars to buildings
2024-09-13 23:18:15 +00:00
58fc194bb8 Add unitUpgrade UI sprites and prefab; Also added hpBars to buildings 2024-09-09 10:16:01 -04:00
15782ad8c2 Pull request #73: Fixed issue where farmer can be placed on a non-resource tile.
Merge in CGD/gather-and-defend from origin/bugfix/FarmerTileRestriction to main

* commit '884d4a9ee6fb0bb68dccebb797b4617dc4cac1da':
  Fixed issue where farmer can be placed on a non-resource tile.
2024-09-06 00:16:00 +00:00
Ader Alisma 01
3ce5219946 Debuggins 2024-09-05 19:37:50 -04:00
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
Élia Gingras 01
87a795f879 Pull request #71: Add island 2
Merge in CGD/gather-and-defend from dev/addIsland2 to main

* commit 'd8e3e72b1e63ee273ab18c3bb64f468d18e31597':
  Add island 2
2024-07-12 15:25:05 +00:00
321d6bdff7 Balance level 1-6 and archer 2024-07-12 11:19:51 -04:00
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
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
Élia Gingras 01
556b09734e Pull request #69: Bugfix/spawnLevelConfigOddBehaviour
Merge in CGD/gather-and-defend from bugfix/spawnLevelConfigOddBehaviour to main

* commit 'dcdc0d7fc8033a332cf0b0dd260aeeea18b3a3b5':
  reset WaveObserver state wip
2024-06-23 22:57:47 +00:00
dcdc0d7fc8 Merge branch 'main' into bugfix/spawnLevelConfigOddBehaviour 2024-06-23 18:36:14 -04:00
Élia Gingras 01
564ce33175 Pull request #68: Design/summerBalance
Merge in CGD/gather-and-defend from design/summerBalance to main

* commit '7e9385db30127a2b7a5ca4703a168393f0b68adc':
  revert object instantiate on level config
  Cards and level spawning balance testing, Fixed some error logs
2024-06-23 22:35:45 +00:00
7e9385db30 revert object instantiate on level config 2024-06-23 18:34:54 -04:00
18b97c4fd9 reset WaveObserver state wip 2024-06-23 18:31:56 -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
18babd7d6c Merge branch 'main' into design/summerBalance 2024-06-23 10:36:45 -04:00
069c7eda00 Cards and level spawning balance testing, Fixed some error logs 2024-06-23 10:15:52 -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
É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
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
bb898df7c4 Add level select sprites to change island and resize island sprite 2024-05-25 16:48:44 -04:00
Felix-gabriel Boucher-luneau
fce8ea5e3d Pull request #65: barre de vie sur les ennemis
Merge in CGD/gather-and-defend from feature/lifebars to main

* commit 'd21f023e5c7d4e4649b4b6ce93c483968f9e71a0':
  barre de vie sur les ennemis
2024-05-25 18:40:36 +00:00
12a8497708 Tentative d'associer le clique utilisateur à une position sur le jeu 2024-05-12 18:48:26 -04:00
2ff5982821 - Retiré temporairement l'erreur qui apparaît quand on intéragit avec un niveau qui n'a pas de WaveConfig. 2024-04-27 09:57:24 -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
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
6dd08eb51c Pull request #62: InvestigationSpawnConstant
Merge in CGD/gather-and-defend from feature/InvestigationSpawnConstant to main

* commit '8e8c32ca68d7c740289bb40a64dbf8895c4a377c':
  Fix misplaced variable
  Comments + variable structure
  Fixed spawning decrementation and changing spawner objectives dynamically
  Fix ConstantSpawn to change constant spawn group when one group dies Keeps doing constant spawn after 2nd group dies
  Temp reset
  Fixed enemy death resuming spawner timers unexpectedly. Now checks if the constant spawn is done to decide if spawning should end.
2024-03-17 16:18:28 +00:00