198 Commits

Author SHA1 Message Date
Felix Boucher
db7cd3650c add delete button 2024-01-19 14:25:01 -05:00
8e50c6d455 Fix spawning for gala and fix archer atk speed 2023-11-13 22:26:24 -05:00
28c9cb85c7 Merge with main 2023-11-13 20:12:17 -05:00
c8d2e43326 Add timed victory and config changes 2023-11-13 20:03:28 -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
e8d89dbd03 Balanced level configs 2023-11-13 18:57:58 -05:00
2c701112ad Add levels missing config; Add island float animation 2023-11-13 17:56:14 -05:00
e1ffb8c887 Add berries to all levels 2023-11-13 17:47:23 -05:00
Felix-gabriel Boucher-luneau
e1ae20e101 Pull request #52: fix detection range
Merge in CGD/gather-and-defend from prog/fix_detection_range to main

* commit '4568c350bfec91842dc9a8fe0917798fbfce7dda':
  toggle collider in coroutine instead of script
  fix detection range
2023-11-13 22:38:51 +00:00
2ec32f8832 Merge branch 'main' into origin/feature/berriesInteractions 2023-11-13 17:27:36 -05:00
Felix Boucher
4568c350bf toggle collider in coroutine instead of script 2023-11-12 20:31:21 -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
7edbec43b3 End groupSpawn delay
Adds a ~3 seconds delay when a group has more ennemies than available rows·.

Added groupSpawnDelay to GlobalConfigFile
2023-11-12 16:18:52 -05:00
2a2f0a5a66 - Déplacement des données de la case des buissons de baies;
- Correction de la case des buissons pour qu'on puisse mettre des unités dessus.
2023-11-11 14:06:31 -05:00
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
Felix Boucher
bff2df154a fix detection range
besoin :

- quand une unité meurt, la prochaine unité n'est pas targetted

solution :

- deactivate and reactivate collider to re-trigger collision
2023-11-05 11:52:48 -05:00
4ae8f0dcfa Start delay with for loop and breakTag 2023-11-04 10:01:40 -04:00
Felix-gabriel Boucher-luneau
4c8b34993a Pull request #50: repair pause button + refactoring
Merge in CGD/gather-and-defend from prog/fix_pause to main

* commit '104f812c41a2f9a15a9672316c8aeded23752d67':
  repair pause button + refactoring
2023-11-01 01:13:37 +00:00
Felix-gabriel Boucher-luneau
4b800c73c2 Pull request #51: fix detection range
Merge in CGD/gather-and-defend from prog/fix_detection_range to main

* commit '937624f54fafd20cbc70dd752fa00314139ec795':
  remove underscore
  fix detection range
2023-11-01 01:13:17 +00:00
Felix Boucher
937624f54f remove underscore 2023-10-31 21:12:24 -04:00
c6f819bee1 Fix compile errors 2023-10-31 21:06:05 -04:00
Felix Boucher
3c1a94257f fix detection range
problem :

detection range didn't show anymore on placeholders

solution :

calculate detection range from collider's offset and size instead of it's bound
2023-10-30 21:28:21 -04:00
Felix Boucher
104f812c41 repair pause button + refactoring
problem :

- pause button needed 2 times to press

solution

- decouple pause from resume
- refactor
2023-10-30 20:45:47 -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
Felix Boucher
6778880d5f reset resources for real each level loading 2023-10-29 23:25:56 -04:00
7502417d26 Added berriesHarvester stickman 2023-10-29 20:09:03 -04:00
Felix Boucher
f0323e0389 oops forgot some staging 2023-10-29 19:49:10 -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
b8d4907efb Removed useless script 2023-10-29 17:06:46 -04:00
570b3948d4 Added some basic sounds including ambiant and res collection; Fixed level retry not working 2023-10-29 16:54:13 -04:00
5211bd9ae9 Fix spawn configs and levels to spawn ok amount of enemies 2023-10-23 21:56:10 -04:00
90f01233f4 Added smolEye 2023-10-23 21:37:41 -04:00
c143d79fde Playing around with level configs and balanced units 2023-10-23 20:47:57 -04:00
c57417a583 PR corrections 2023-10-22 15:28:34 -04:00
e4fe735fe5 Updated wave config 2023-10-18 20:44:07 -04:00
749d2c5643 Finished group spawn
Created Serializable class GroupList in WaveConfig.cs to contain multiple enemy types per group
2023-10-18 20:31:57 -04:00
13f00e326c Start group spawn 2023-10-18 20:31:57 -04:00
2478c8b3fb Added show victory and defeat screens animation 2023-10-15 19:23:24 -04:00
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
449744cdc7 Merged with main 2023-10-15 17:51:21 -04:00
915fed0cbe Apply prefab 2023-10-15 17:47:33 -04:00
William Gingras 01
02b56c5b4b Pull request #44: Art/basicMonster
Merge in CGD/gather-and-defend from art/basicMonster to main

* commit '8ac8a90af7a5dfa7ecd29083a60f8ec1d65ac7b4':
  Fix walk anim and center monster
  Added basicMonster
2023-10-15 21:12:10 +00:00
Felix Boucher
8adc563d47 make transition fool proof
problème :
Il y avait plusieurs manières de faire planter le loading screen en appuyant sur des boutons

changements:
- turn off buttons when loading screen is active
- turn on buttons when loading screen is not active
- add event aggregator class to project and migrate every event to it
- fix bugs and regressions
2023-10-09 22:21:06 -04:00
Felix Boucher
f9a54513cd repair camera calibrating + finish adding configs 2023-10-01 21:50:15 -04:00
Felix Boucher
ef6b345a03 added some doc + some global configs 2023-10-01 21:50:12 -04:00
Felix Boucher
9e07c48fd4 ajout de transition avant de loader le level
besoin :

- le level était loadé directement au moment de cliquer dans le level selector ce qui n'est pas très fenshui

solution :

- fade out avec nuages
- les tuiles tombent à leur place au lieu d'apparaitre toutes en même temps
2023-10-01 21:48:35 -04:00
da9257f78e Pull request #45: Origin/feature/ChangeGameSpeed
Merge in CGD/gather-and-defend from origin/feature/ChangeGameSpeed to main

* commit '059b6d5bd84b3f07963f222f575a61c7dc7b86a2':
  Correction du nom d'une méthode.
  Ajout du menu pause et de son interface.
  - Ajout d'une fonction qui met le jeu en pause.
  - Implémentation d'une méthode pour accèler le jeux pendant un partie;
2023-10-02 01:01:31 +00:00
059b6d5bd8 Correction du nom d'une méthode. 2023-10-01 20:54:45 -04:00