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.
Merge in CGD/gather-and-defend from feature/separate_cooldown_from_units to main
* commit '927c08559f2f0c8850be6c9b3e170165e8bccb27':
extraire les prix et cooldowns des unit cards
Merge in CGD/gather-and-defend from feature/InvestigationSpawnConstant to main
* commit '8e8c32ca68d7c740289bb40a64dbf8895c4a377c':
Fix misplaced variable
Comments + variable structure
Fixed spawning decrementation and changing spawner objectives dynamically
Fix ConstantSpawn to change constant spawn group when one group dies Keeps doing constant spawn after 2nd group dies
Temp reset
Fixed enemy death resuming spawner timers unexpectedly. Now checks if the constant spawn is done to decide if spawning should end.
Merge in CGD/gather-and-defend from origin/bugfix/AnimationNullCheck to main
* commit '25c9382dfd56e269d65e1a5af54d2a35de1beaac':
- Le jeu éteint l'animation des unités lorsque le joueur les drag-and-drop sur le terrain, réglant le problème avec l'événement dans l'animation.
problème : le fait que les prix et les cooldowns étaient dans les game objects directement rendait le design compliqué
solution : créer un scriptable object pour contenir l'info des unit cards
Merge in CGD/gather-and-defend from art/millAndPeasantCard to main
* commit 'ee5cf003b0fd0b4d5b03334f514649d04b96adf3':
Added animated mill and peasant card!
#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é
