42 Commits

Author SHA1 Message Date
0eb512710f tweaked animations + sprites for desert heavy 2025-07-29 22:48:50 -04:00
4bc8c7aab5 added placeholder art for desert heavy 2025-07-29 20:38:08 -04: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
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
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
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
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
a38388ad90 Added swordsman and renamed the knight 2024-10-27 14:33:43 -04:00
58fc194bb8 Add unitUpgrade UI sprites and prefab; Also added hpBars to buildings 2024-09-09 10:16:01 -04:00
d8e3e72b1e Add island 2 2024-07-09 11:40:05 -04:00
bb898df7c4 Add level select sprites to change island and resize island sprite 2024-05-25 16:48:44 -04:00
ee5cf003b0 Added animated mill and peasant card! 2024-02-04 18:57:28 -05:00
Felix Boucher
db7cd3650c add delete button 2024-01-19 14:25:01 -05: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
7502417d26 Added berriesHarvester stickman 2023-10-29 20:09:03 -04: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
90f01233f4 Added smolEye 2023-10-23 21:37:41 -04:00
e2ff56264e Fix game conflict and added correct UI for the victory and defeat screens 2023-10-15 18:34:42 -04:00
William Gingras 01
02b56c5b4b Pull request #44: Art/basicMonster
Merge in CGD/gather-and-defend from art/basicMonster to main

* commit '8ac8a90af7a5dfa7ecd29083a60f8ec1d65ac7b4':
  Fix walk anim and center monster
  Added basicMonster
2023-10-15 21:12:10 +00: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
8ac8a90af7 Fix walk anim and center monster 2023-10-01 20:00:43 -04:00
0d70c942a3 Added basicMonster 2023-10-01 19:54:03 -04:00
1eba2adce8 Ajout du menu pause et de son interface. 2023-10-01 18:26:56 -04:00
62b8385739 Added berries, updated rock and trees; Added decos to axeman, miner and archer 2023-09-10 11:29:40 -04:00
496a6eb738 Added swordsman 2023-08-21 16:54:03 -04:00
768700a06e Added farmers Association 2023-07-21 17:31:03 -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
c39bbba683 Made game scene look like maquette 2023-07-14 14:15:07 -04:00
d12b9c2a62 Merge branch 'main' into origin/feature/Interface-Carte 2023-07-14 12:47:13 -04:00
Felix Boucher
87622e8a69 oubli des universioned files 2023-07-11 15:52:43 -04:00
Felix Boucher
092aa026c8 drag&drop - montrer range et tweaker outline
problème :

- le range d'attaque n'apparaissait pas sur le placeholder des unités
- le outline ne fonctionnait pas bien sur toutes les unités
- le placeholder étant opaque, on ne pouvait pas voir la tuile en dessous

solutions :
- utiliser les bounds du collider de détection pour tracer le range des unités sur le placeholder
- utiliser un shader pour tracer un outline colorable autour des unités
- rendre le placeholder plus transparent
2023-06-13 18:30:15 -04:00
6d4f18e32d Added animated ClawClawRough 2023-06-11 18:15:10 -04:00
0eb33966d4 Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cgd/gather-and-defend into origin/feature/Interface-Carte
# Conflicts:
#	Assets/Scripts/LevelEditor/WorldEditor.cs
#	Assets/Scripts/LevelEditor/WorldEditor.cs.meta
2023-06-10 14:03:24 -04:00
b1fc63de50 Finalisations de base pour la sélection de niveau. Aussi, ajout des images pour les boutons des niveaux. 2023-06-04 14:47:10 -04:00
9d8b2f89b3 Added sprites from mockups 2023-06-02 14:15:04 -04:00
81e157eb16 Création de base pour l'interface de la selection de niveau. 2023-05-21 15:45:35 -04:00
ef7ee26ce1 Added demo project sprites and a basic animated stickman 2023-05-09 19:20:41 -04:00
69aad5b451 First push 2023-05-07 18:28:47 -04:00