Commit Graph

Select branches

Hide Pull Requests

art/millAndPeasantCard

art/polishArcherMinerAxeman

bugfix/BerryUnitOverlay

bugfix/WaveConfigNullCheck

bugfix/placingOnTopOfEachOther

design/afterGala3BalancePatch

dev/hard-head

dev/knightOnHorse

dev/mill-workshop-blacksmith

feature/Corrupted-Factory

feature/Creeper

feature/monsterCore

feature/skill_tree

main

origin/feature/ChangeGameSpeed

testing/desertAndHouse

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#3

#4

#5

#6

#7

#8

#9

Mono Color

• 3a4ec88cbc Deselect fonctionne Ader Alisma 01 2025-06-09 16:29:48 -04:00
• d14b00fe10 Progress observer Ader Alisma 01 2025-06-01 18:31:39 -04:00
• 921449fc1d Flèches droites peuvent changer d'angle (#7) MaximilienBB 2025-05-30 23:42:34 +00:00
• 6410c860b5 Merge branch 'main' into origin/feature/StraightArrowChangesAngle #7 MaximilienBB 2025-05-30 23:42:23 +00:00
• a6a24a87f8 Ajouté commentaires "If" MaximilienBlanchardBizien1 2025-05-30 19:30:56 -04:00
• 6b2fe4738d Actualiser Assets/Scripts/Projectile.cs MaximilienBB 2025-05-30 22:31:34 +00:00
• b98eeb70aa Projectile Code Cleanup MaximilienBlanchardBizien1 2025-05-30 16:22:19 -04:00
• 9b7778ee6a Merge remote-tracking branch 'origin/main' into bugfix/HideUpgradesOnDeselect Ader Alisma 01 2025-05-30 15:06:08 -04:00
• 8ec062892a Added Unit Tooltip (#6) Ader_Alisma 2025-05-30 19:05:03 +00:00
• 90b4fc3df6 Fix Start signature #6 Ader Alisma 01 2025-05-30 15:03:15 -04:00
• 23ecdd6ab4 Added a OnTriggerExit2D to stop attack when entity not detected Adam Hamid Salah Salah 2025-05-28 19:16:04 -04:00
• b46d8b66e8 created Rider prefab and assets + added test spawn button Adam 2025-05-28 13:38:52 -04:00
• 7904619816 Update Projectile.cs MaximilienBlanchardBizien1 2025-05-18 18:27:54 -04:00
• 770047a272 Merge remote-tracking branch 'origin/main' into feature/UnitTooltip Ader Alisma 01 2025-05-17 11:29:02 -04:00
• e1a71fce3d Integrated Tooltip to Game scene Ader Alisma 01 2025-05-17 11:26:36 -04:00
• 4cd2d70a35 Merge remote-tracking branch 'origin/main' into feature/UnitTooltip Ader Alisma 01 2025-05-17 11:18:09 -04:00
• 5054750642 Temp game scene emptied Ader Alisma 01 2025-05-17 11:16:27 -04:00
• 1eef2c2dc0 Fixed Angle Conditional Logic MaximilienBlanchardBizien1 2025-05-04 19:50:00 -04:00
• cf1df05d6d Added warning on house card to let player know to build one (#5) craftwill 2025-04-29 18:59:31 +00:00
• 97f4ac9fc4 Added warning on house card to let player know to build one #5 craftwill 2025-04-29 14:06:03 -04:00
• 679876ee21 Progress Ader Alisma 01 2025-04-28 12:57:13 -04:00
• 3fdbbee765 Fix placing multiple units on the same tile (#2) EliaGingras1 2025-04-06 22:31:07 +00:00
• 069f05e445 Merge branch 'main' into bugfix/placeUnitOnSameTile #2 EliaGingras1 2025-04-06 22:30:52 +00:00
• 5f253e05a7 Removed false comment craftwill 2025-04-06 18:30:30 -04:00
• 9ffc98db9a Merge branch 'main' into bugfix/placeUnitOnSameTile craftwill 2025-04-06 18:23:36 -04:00
• e5c9e327e4 Added an exemple challenge in the UI (#4) craftwill 2025-04-06 22:23:14 +00:00
• d454865a24 Updated Straight Projectile Workings MaximilienBlanchardBizien1 2025-03-22 16:35:44 -04:00
• 0273f42840 Added an exemple challenge in the UI #4 craftwill 2025-03-20 18:42:52 -04:00
• ad66f2e22c Created Dynamic Angle Basis MaximilienBlanchardBizien1 2025-03-03 14:56:47 -05:00
• 05a9fa2112 Add castle sprite and change its dmg 2->3 (#3) craftwill 2025-03-02 18:06:54 +00:00
• 25308695e2 Semi works. Console issues Ader Alisma 01 2025-03-01 22:00:02 -05:00
• 204ec8b42b Fix undefined tooltip bug on slinger unitcard Ader Alisma 01 2025-03-01 20:36:32 -05:00
• 91301d750d Merge remote-tracking branch 'origin/main' into feature/UnitTooltip Ader Alisma 01 2025-03-01 19:29:50 -05:00
• adf8ad313a Fix placing multiple units on the same tile craftwill 2025-02-16 19:17:44 -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) MaximilienBlanchardBizien1 2025-02-13 21:30:36 +00:00
• c268b0ca01 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 MaximilienBlanchardBizien1 2025-02-05 15:17:06 -05:00
• 637257610f Start deselected Handler Ader Alisma 01 2025-02-02 13:23:23 -05:00
• ff197945b5 Merge branch 'main' into feature/UnitTooltip Ader Alisma 01 2025-02-01 18:06:06 -05:00
• 5c7d3e645d Fixed display untouchable units Ader Alisma 01 2025-02-01 15:37:38 -05:00
• aceaa544a4 Add castle sprite and change its dmg 2->3 #3 craftwill 2025-02-01 14:57:38 -05:00
• 219aa36d62 Pull request #85: Castle Unit Implementation Maximilien Blanchard-Bizien 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. MaximilienBlanchardBizien1 2025-01-05 16:33:16 -05:00
• dacd0f6b3c Debug log Ader Alisma 01 2025-01-05 14:49:47 -05:00
• 503a8dedbc Implemented the basis for the castle unit, including having it shoot, the shooting range, and the upgrading logic. MaximilienBlanchardBizien1 2025-01-05 10:49:19 -05:00
• 458da2371d Centralized tooltip placeholder descriptions Ader Alisma 01 2024-12-08 14:11:21 -05:00
• b7af95c232 Fixed tooltip hiding on upgrade click + Unique tooltip for no health or no damage units Ader Alisma 01 2024-12-08 14:01:40 -05:00
• a8ca27ebcd Pull request #83: Destroys unitTree onDestroy Ader Alisma 01 2024-11-24 20:44:47 +00:00
• b123b9c0f7 Pull request #82: Fix detection collider qui empêche le click sur les unités qu'elle couvre Ader Alisma 01 2024-11-24 20:44:03 +00:00
• 2e94cad31c Merge branch 'main' into feature/UnitTooltip Ader Alisma 01 2024-11-20 22:20:00 -05:00
• ae86a6dc59 Merge prep Ader Alisma 01 2024-11-20 22:17:40 -05:00
• f1a53cd9cf squash! Fin Tooltip Ader Alisma 01 2024-11-20 22:07:01 -05:00
• 5017fe7ac5 SkillTreeSO WIP (i hate the GameAssembly (;-;) ) TheWulfRick 2024-11-14 11:01:21 -05:00
• d126255f4a Destroys unitTree onDestroy Ader Alisma 01 2024-11-10 13:32:33 -05:00
• 4c699f63c2 Changed detection layer to InvisibleToCamera Ader Alisma 01 2024-11-10 13:11:37 -05:00
• 116d9610c4 Implemented Castle data to the game. The only thing it's missing is the attack pattern. MaximilienBlanchardBizien1 2024-11-07 15:35:36 -05:00
• bad4685988 Pull request #80: Integration of upgrades for melee, ranged and house units and more Élia Gingras 01 2024-11-04 00:25:02 +00:00
• b0c3bf5ba1 Add Scorpion unit; balance ranged units; balanced level13 craftwill 2024-11-02 16:42:54 -04:00
• b90ece779d added level 13 craftwill 2024-11-02 14:35:23 -04:00
• 14c4cf4c88 Merge branch 'main' into dev/unitUpgradeIntegration craftwill 2024-10-30 11:35:30 -04:00
• 02a1f63e44 Pull request #81: Fixed allies sometimes not attacking by redoing the detection code Élia Gingras 01 2024-10-30 15:34:55 +00:00
• 823b1f5da8 Fixed allies sometimes not attacking by redoing the detection code craftwill 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) craftwill 2024-10-29 15:46:57 -04:00
• f06f619174 Pull request #78: UpgradeIndividuel Ader Alisma 01 2024-10-27 20:28:26 +00:00
• 60a56cc7d0 Pull request #79: Added swordsman and renamed the knight Élia Gingras 01 2024-10-27 19:57:54 +00:00
• 7852709519 Pull request #77: Added missing Ally tags and sorting order type for enemies Élia Gingras 01 2024-10-27 19:57:46 +00:00
• 507b2ce8e0 Null check so that buildings dont need an animator craftwill 2024-10-27 15:57:26 -04:00
• 196740676d Permettre 1 à 3 upgrades Ader Alisma 01 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 craftwill 2024-10-27 15:27:38 -04:00
• c8ecace848 Suppression debug logs Ader Alisma 01 2024-10-27 14:52:51 -04:00
• a38388ad90 Added swordsman and renamed the knight craftwill 2024-10-27 14:33:43 -04:00
• 37568663fb WIP fix placement on same tile bugfix/placingOnTopOfEachOther craftwill 2024-10-27 14:02:08 -04:00
• 20a6393888 Revert UI Ader Alisma 01 2024-10-27 11:49:12 -04:00
• 12e5f4bc55 Added missing Ally tags and sorting order type for enemies craftwill 2024-10-13 12:10:18 -04:00
• 56b5dd3361 Pull request #76: Fixed Enemy Farm Overlay Maximilien Blanchard-Bizien 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. MaximilienBlanchardBizien1 2024-10-12 13:56:26 -04:00
• aa4224e7b9 Utilisation du UI d'Élia Ader Alisma 01 2024-09-29 14:40:34 -04:00
• 4490600691 Merge remote-tracking branch 'origin/main' into feature/UpgradeIndividuel Ader Alisma 01 2024-09-28 18:50:05 -04:00
• 308da140cf Ajout ScriptableObject pour UnitUpgrades Ader Alisma 01 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 Maximilien Blanchard-Bizien 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. MaximilienBlanchardBizien1 2024-09-24 10:50:46 -04:00
• eb82e6b853 Affichage bouttons interactifs + Suppression dummy gameobjects in Game scene Ader Alisma 01 2024-09-21 15:06:14 -04:00
• 932aeb6e82 Pull request #74: Add unitUpgrade UI sprites and prefab; Also added hpBars to buildings Élia Gingras 01 2024-09-13 23:18:15 +00:00
• 58fc194bb8 Add unitUpgrade UI sprites and prefab; Also added hpBars to buildings craftwill 2024-09-09 10:16:01 -04:00
• 15782ad8c2 Pull request #73: Fixed issue where farmer can be placed on a non-resource tile. Maximilien Blanchard-Bizien 2024-09-06 00:16:00 +00:00
• 3ce5219946 Debuggins Ader Alisma 01 2024-09-05 19:37:50 -04:00
• 884d4a9ee6 Fixed issue where farmer can be placed on a non-resource tile. MaximilienBlanchardBizien1 2024-09-03 15:43:38 -04:00
• 3e0ddca9a4 Change l'unité par l'upgrade choisi Ader Alisma 01 2024-08-04 18:40:50 -04:00
• 8eb2a7d5cc Pull request #72: Balance level 1-6 and archer Élia Gingras 01 2024-07-12 15:46:00 +00:00
• 87a795f879 Pull request #71: Add island 2 Élia Gingras 01 2024-07-12 15:25:05 +00:00
• 321d6bdff7 Balance level 1-6 and archer William 2024-07-12 11:19:51 -04:00
• d8e3e72b1e Add island 2 craftwill 2024-07-09 11:40:05 -04:00
• 968f255cd5 Début lien entre upgradeUI et Unité Ader Alisma 01 2024-07-07 19:21:49 -04:00
• a39aebf9f7 Pull request #70: Ajouter deuxième île au menu de choix de niveau Maximilien Blanchard-Bizien 2024-06-23 23:18:37 +00:00
• 556b09734e Pull request #69: Bugfix/spawnLevelConfigOddBehaviour Élia Gingras 01 2024-06-23 22:57:47 +00:00
• dcdc0d7fc8 Merge branch 'main' into bugfix/spawnLevelConfigOddBehaviour craftwill 2024-06-23 18:36:14 -04:00
• 564ce33175 Pull request #68: Design/summerBalance Élia Gingras 01 2024-06-23 22:35:45 +00:00
• 7e9385db30 revert object instantiate on level config craftwill 2024-06-23 18:34:54 -04:00
• 18b97c4fd9 reset WaveObserver state wip craftwill 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. MaximilienBlanchardBizien1 2024-06-23 15:13:06 -04:00
• 18babd7d6c Merge branch 'main' into design/summerBalance craftwill 2024-06-23 10:36:45 -04:00