Merge in CGD/gather-and-defend from bugfix/enemeisNotAttacked to main
* commit '823b1f5da8c6213424966f0536a9121614cceb7b':
Fixed allies sometimes not attacking by redoing the detection code
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
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
Merge in CGD/gather-and-defend from dev/tagsAndSortingOrder to main
* commit '507b2ce8e069ed105bb9bc6ac59a5aba39022750':
Null check so that buildings dont need an animator
Added missing Ally tags and sorting order type for enemies
Merge in CGD/gather-and-defend from origin/bugfix/enemyFarmOverlay to main
* commit 'c9e791633f7d91da852be5a4e4d8c31a39d9f5d4':
Increased the layer levels of the monsters currently in the game, making it so that they walk over the farm tiles instead of under.
Merge in CGD/gather-and-defend from origin/bugfix/BuildingsExludedFromPopulation to main
* commit '1fd249a0d2a7687ba203a899ca9ced8a12989e00':
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.
Merge in CGD/gather-and-defend from art/unitUpgradeUISprites to main
* commit '58fc194bb8c57ac8f7771bc643b04f2e7634ef5a':
Add unitUpgrade UI sprites and prefab; Also added hpBars to buildings
Merge in CGD/gather-and-defend from origin/bugfix/FarmerTileRestriction to main
* commit '884d4a9ee6fb0bb68dccebb797b4617dc4cac1da':
Fixed issue where farmer can be placed on a non-resource tile.
Merge in CGD/gather-and-defend from design/finallyBalanceLevels to main
* commit '321d6bdff760ad7062b19189c6bb6f9f714a655d':
Balance level 1-6 and archer
Merge in CGD/gather-and-defend from feature/World2Map to main
* commit 'b5351f58ee6fbe53c28ac1efa75696e21b4c64ea':
- Ajouter deuxième île au menu de choix de niveau; - Ajouté boutons pour passer entre les deux îles.
Merge in CGD/gather-and-defend from bugfix/spawnLevelConfigOddBehaviour to main
* commit 'dcdc0d7fc8033a332cf0b0dd260aeeea18b3a3b5':
reset WaveObserver state wip
Merge in CGD/gather-and-defend from design/summerBalance to main
* commit '7e9385db30127a2b7a5ca4703a168393f0b68adc':
revert object instantiate on level config
Cards and level spawning balance testing, Fixed some error logs
Merge in CGD/gather-and-defend from art/levelSelectSprites to main
* commit 'bb898df7c42ce83c7949857e4dc1b75fbfb7f47f':
Add level select sprites to change island and resize island sprite
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.
