59 Commits

Author SHA1 Message Date
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
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
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
b90ece779d added level 13 2024-11-02 14:35:23 -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
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
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
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
12a8497708 Tentative d'associer le clique utilisateur à une position sur le jeu 2024-05-12 18:48:26 -04: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
ee5cf003b0 Added animated mill and peasant card! 2024-02-04 18:57:28 -05:00
fabd51a9f5 Adjusted destination positions 2024-02-04 11:36:24 -05:00
a4f7accfcd Removed Debug logs and prepared main rebase 2024-02-04 11:30:28 -05:00
e1e3c42b00 Created destination placeholders where resource ui should be 2024-02-04 11:30:28 -05:00
Felix Boucher
42fbffd306 working delete feature + placeholder refactor 2024-01-19 15:30:54 -05:00
Felix Boucher
795d6751ec refactor placement buttons to accomodate delete 2024-01-19 14:51:30 -05:00
Felix Boucher
637fec1410 update database for prefabs and scriptableobjects 2024-01-19 14:30:58 -05:00
Felix Boucher
db7cd3650c add delete button 2024-01-19 14:25:01 -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
Felix Boucher
104f812c41 repair pause button + refactoring
problem :

- pause button needed 2 times to press

solution

- decouple pause from resume
- refactor
2023-10-30 20:45:47 -04:00
Felix-gabriel Boucher-luneau
96d9b0fd7b Pull request #49: added population mechanic
Merge in CGD/gather-and-defend from prog/population to main

* commit '6778880d5fed0d60c92f48995e62eca289bfaec3':
  reset resources for real each level loading
  oops forgot some staging
  population mechanic with art
2023-10-30 03:26:43 +00:00
Felix Boucher
b54627196c population mechanic with art
- added art for house and UI
- put population in ResourceManager
- create house prefab
- added code for adding and removing pop depending on entity
- refactor harvesters so they inherit from ally
- modify placeholders and buttons so that only units cost population
- add events for population and resources changing
- add population relative configs to global config
- add start resources values to Levels
- add debug feature for generating resources for free
2023-10-29 19:12:32 -04:00
570b3948d4 Added some basic sounds including ambiant and res collection; Fixed level retry not working 2023-10-29 16:54:13 -04:00
e2ff56264e Fix game conflict and added correct UI for the victory and defeat screens 2023-10-15 18:34:42 -04:00
449744cdc7 Merged with main 2023-10-15 17:51:21 -04:00
Felix Boucher
8adc563d47 make transition fool proof
problème :
Il y avait plusieurs manières de faire planter le loading screen en appuyant sur des boutons

changements:
- turn off buttons when loading screen is active
- turn on buttons when loading screen is not active
- add event aggregator class to project and migrate every event to it
- fix bugs and regressions
2023-10-09 22:21:06 -04:00
Felix Boucher
f9a54513cd repair camera calibrating + finish adding configs 2023-10-01 21:50:15 -04:00
Felix Boucher
ef6b345a03 added some doc + some global configs 2023-10-01 21:50:12 -04:00
da9257f78e Pull request #45: Origin/feature/ChangeGameSpeed
Merge in CGD/gather-and-defend from origin/feature/ChangeGameSpeed to main

* commit '059b6d5bd84b3f07963f222f575a61c7dc7b86a2':
  Correction du nom d'une méthode.
  Ajout du menu pause et de son interface.
  - Ajout d'une fonction qui met le jeu en pause.
  - Implémentation d'une méthode pour accèler le jeux pendant un partie;
2023-10-02 01:01:31 +00:00
1eba2adce8 Ajout du menu pause et de son interface. 2023-10-01 18:26:56 -04:00
Baptiste
e25b7da389 ajout des fonctionnalité des boutons + ajout de la condition de défaite fonctionnelle 2023-09-30 15:25:18 -04:00
Baptiste
2d2cfecbc4 ajout classe building + debut condition victoire defaite (script et ui) 2023-09-18 16:47:06 -04:00
73eaf47726 - Ajout d'une fonction qui met le jeu en pause. 2023-09-17 17:09:34 -04:00
4d7d59bda7 - Implémentation d'une méthode pour accèler le jeux pendant un partie;
- Création d'une méthode qui remet la vitesse de jeux à son état normal lorsque le dernier ennemi est mort, mais n'est pas encore implémenté;
2023-08-30 14:09:38 -04:00
496a6eb738 Added swordsman 2023-08-21 16:54:03 -04:00
Felix Boucher
9696ee614e spawners n'apparaissent plus + beau back button 2023-07-23 20:22:29 -04:00
Felix Boucher
27d72368aa finish integrating level selector
Level selector was already working after work by William but some small bugs remained to be fixed + it wasn't possible to return to level selector once we were in the level.

- it's now possible to go back to level selector from Level
- LevelManagerScript is no longer a singleton (this way, it resets with the Game scene unloading)
- Added a property drawer for using scene files in inspectors
2023-07-23 20:16:44 -04:00
Felix Boucher
b1cfb714a6 changer l'apparence du harvester
problème :

- le harvester avait une apparence non-changeante dépendant du genre de ressource sur lequel il était placé.

solution :

- ajouter une logique qui change le prefab choisi dépendant de sur quelle tuile on place le harvester.

- also, quelques micro refactorings (changement de noms, ajout de doc)
2023-07-23 11:53:07 -04:00
fd22af5e65 Revert FetchDatabaseStatic because it prevents builds 2023-07-22 01:32:22 -04:00
ecd32b09b8 Level 1 to 6 and allow loading levels in worldMap 2023-07-22 01:24:05 -04:00
4a1b773c2c Add game scene changes to HUD 2023-07-21 23:26:15 -04:00
babc3a24e8 Add FarmersAssociation unit + balance changes 2023-07-21 23:25:38 -04:00
768700a06e Added farmers Association 2023-07-21 17:31:03 -04:00
9b8b329340 Fixed scenes spawners 2023-07-18 20:40:53 -04:00
d4e3bb316c Changed levels, update rock sprite, added enemyspawnStart 2023-07-18 20:31:09 -04:00
9da10f580d Added tilesBackground and updated grass tiles 2023-07-18 20:06:59 -04:00
70a4048ee7 Axeman, miner, entities scaling and projectile angled 2023-07-18 15:43:21 -04:00