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

104 Commits

Author SHA1 Message Date
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
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
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
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
3e0ddca9a4 Change l'unité par l'upgrade choisi 2024-08-04 18:40:50 -04:00
William
321d6bdff7 Balance level 1-6 and archer 2024-07-12 11:19:51 -04:00
Ader Alisma 01
968f255cd5 Début lien entre upgradeUI et Unité 2024-07-07 19:21:49 -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
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
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
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
William Gingras 01
fd2e2e3991 Pull request #61: Added animated mill and peasant card! 
Merge in CGD/gather-and-defend from art/millAndPeasantCard to main

* commit 'ee5cf003b0fd0b4d5b03334f514649d04b96adf3':
  Added animated mill and peasant card!
 2024-02-19 17:07:14 +00:00
Felix Boucher
effe4ca2cc unit cooldown 
#Le besoin addressé par le commit
les unités et bâtiments devrait avoir un temps de cooldown avant de pouvoir être spawné à nouveau

#Comment le besoin est-il addressé? (modifications)
les unités et bâtiments prennent maintenant 3 secondes avant de redevenir interactif après avoir été spawné
 2024-02-18 11:11:03 -05:00
craftwill
ee5cf003b0 Added animated mill and peasant card! 2024-02-04 18:57:28 -05:00
Ader Alisma 01
e1e3c42b00 Created destination placeholders where resource ui should be 2024-02-04 11:30:28 -05:00
Felix-gabriel Boucher-luneau
9188e86adb Pull request #58: Feature/delete button 
Merge in CGD/gather-and-defend from feature/delete_button to main

* commit '27d329df7170a12e850d11355ccd33118a94fb7e':
  fix unit cost not working anymore
  working delete feature + placeholder refactor
  refactor placement buttons to accomodate delete
  update database for prefabs and scriptableobjects
  add delete button
 2024-01-26 00:18:01 +00:00
Felix Boucher
42fbffd306 working delete feature + placeholder refactor 2024-01-19 15:30:54 -05:00
MaximilienBlanchardBizien1
47338ecdaf Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cgd/gather-and-defend 
# Conflicts:
#	Assets/Tiles/BushTile.asset
 2024-01-09 10:17:00 -05:00
MaximilienBlanchardBizien1
2dcaa796ec Merge branch 'origin/feature/berriesInteractions' 
# Conflicts:
#	Assets/Prefabs/UI/ResourceGUI.prefab
#	Assets/Scripts/Resource/ResourceMaker.cs
#	Assets/Scripts/Resource/ResourceManager.cs
#	Assets/Scripts/Resource/ResourceText.cs
 2024-01-09 10:15:25 -05:00
craftwill
8e50c6d455 Fix spawning for gala and fix archer atk speed 2023-11-13 22:26:24 -05:00
craftwill
28c9cb85c7 Merge with main 2023-11-13 20:12:17 -05:00
Baptiste Girard
4bd16c7786 Pull request #55: add the save and unlock next level after finishing anyone 
Merge in CGD/gather-and-defend from progress_worldmap to main

* commit '25d574714f32e7eec33f90451d2054cb643722ff':
  add the save and unlock next level after finishing anyone
 2023-11-14 01:02:21 +00:00
Baptiste
25d574714f add the save and unlock next level after finishing anyone 2023-11-13 19:08:18 -05:00
craftwill
2c701112ad Add levels missing config; Add island float animation 2023-11-13 17:56:14 -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
MaximilienBlanchardBizien1
cba5364045 Création et implémentation des baies. Couramment, donne de la nourriture, mais pourra probablement donner des baies plus tard. 2023-11-11 14:06:28 -05:00
MaximilienBlanchardBizien1
6bdbbe60fb Création et implémentation des baies. Couramment, donne de la nourriture, mais pourra probablement donner des baies plus tard. 2023-11-01 16:29:44 -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
craftwill
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
craftwill
570b3948d4 Added some basic sounds including ambiant and res collection; Fixed level retry not working 2023-10-29 16:54:13 -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
William
2478c8b3fb Added show victory and defeat screens animation 2023-10-15 19:23:24 -04:00
William
e2ff56264e Fix game conflict and added correct UI for the victory and defeat screens 2023-10-15 18:34:42 -04:00
Felix-gabriel Boucher-luneau
fc9da646c6 Pull request #42: ajout de transition avant de loader le level 
Merge in CGD/gather-and-defend from prog/load_level_transition to main

* commit '8adc563d47b55bdd37fede8466d0b455d6ecd49c':
  make transition fool proof
  repair camera calibrating + finish adding configs
  added some doc + some global configs
  ajout de transition avant de loader le level
 2023-10-15 21:52:11 +00:00
William
449744cdc7 Merged with main 2023-10-15 17:51:21 -04:00
William
915fed0cbe Apply prefab 2023-10-15 17:47:33 -04:00
Felix Boucher
ef6b345a03 added some doc + some global configs 2023-10-01 21:50:12 -04:00