Ader Alisma 01
b18290dc76
Comment cleanup
2025-06-29 17:53:20 -04:00
Ader Alisma 01
abcc1de8c7
Optimisation + cleanup comments
2025-06-29 17:52:29 -04:00
Ader Alisma 01
d74647054a
Actual cleanup
2025-06-29 17:48:43 -04:00
Ader Alisma 01
73a9231845
Revert "Cleanup"
...
This reverts commit f571fbf5807ebcaecc741b34a6c933449edc03c9.
Revert "Cleanup"
This reverts commit f571fbf5807ebcaecc741b34a6c933449edc03c9.
2025-06-29 17:46:55 -04:00
Ader Alisma 01
f571fbf580
Cleanup
2025-06-29 17:44:15 -04:00
Ader Alisma 01
9e20b0d463
Deselect fonctionnel
2025-06-29 17:40:51 -04:00
Ader Alisma 01
f39f019912
Optimised observer
2025-06-09 19:19:15 -04:00
Ader Alisma 01
3a4ec88cbc
Deselect fonctionne
...
Bug avec tooltip quand clique sur upgrade rouge
2025-06-09 16:29:48 -04:00
Ader Alisma 01
d14b00fe10
Progress observer
2025-06-01 18:31:39 -04:00
Ader Alisma 01
9b7778ee6a
Merge remote-tracking branch 'origin/main' into bugfix/HideUpgradesOnDeselect
2025-05-30 15:06:08 -04: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
cf1df05d6d
Added warning on house card to let player know to build one ( #5 )
...
Reviewed-on: #5
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-29 18:59:31 +00:00
Ader Alisma 01
679876ee21
Progress
2025-04-28 12:57:13 -04:00
3fdbbee765
Fix placing multiple units on the same tile ( #2 )
...
Reviewed-on: #2
Reviewed-by: Ader_Alisma <ader.alisma.1@ens.etsmtl.ca>
2025-04-06 22:31:07 +00:00
Ader Alisma 01
25308695e2
Semi works. Console issues
2025-03-01 22:00:02 -05: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
Ader Alisma 01
637257610f
Start deselected Handler
2025-02-02 13:32:07 -05:00
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
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
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
d126255f4a
Destroys unitTree onDestroy
2024-11-10 13:32:33 -05:00
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
b0c3bf5ba1
Add Scorpion unit; balance ranged units; balanced level13
2024-11-02 16:42:54 -04:00
b90ece779d
added level 13
2024-11-02 14:35:23 -04:00
14c4cf4c88
Merge branch 'main' into dev/unitUpgradeIntegration
2024-10-30 11:35:30 -04:00
823b1f5da8
Fixed allies sometimes not attacking by redoing the detection code
2024-10-30 11:22:29 -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
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
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
Ader Alisma 01
c8ecace848
Suppression debug logs
2024-10-27 14:52:51 -04:00
Ader Alisma 01
20a6393888
Revert UI
2024-10-27 11:49:12 -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
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
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
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
dcdc0d7fc8
Merge branch 'main' into bugfix/spawnLevelConfigOddBehaviour
2024-06-23 18:36:14 -04: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
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
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
