360 Commits

Author SHA1 Message Date
William Gingras 01
1067487749 Pull request #47: Design/baseLevelConfigsAndBalance
Merge in CGD/gather-and-defend from design/baseLevelConfigsAndBalance to main

* commit '5211bd9ae94564c81098c190821acd2a459083db':
  Fix spawn configs and levels to spawn ok amount of enemies
  Added smolEye
  Playing around with level configs and balanced units
2023-10-29 19:11:06 +00: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
8e767297e6 Pull request #46: WaveGroup
Merge in CGD/gather-and-defend from feature/waveGroup to main

* commit 'c57417a583816bcd1c3d33a8422c5c91275d0377':
  PR corrections
  Updated wave config
  Finished group spawn
  Start group spawn
  Finished group spawn
  Start group spawn
2023-10-22 19:36:44 +00:00
c57417a583 PR corrections 2023-10-22 15:28:34 -04:00
e4fe735fe5 Updated wave config 2023-10-18 20:44:07 -04:00
146e090630 Merge branch 'feature/waveGroup' of https://bitbucket.clubconjure.com/scm/cgd/gather-and-defend into feature/waveGroup 2023-10-18 20:33:19 -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
af66cd5cfa Finished group spawn
Created Serializable class GroupList in WaveConfig.cs to contain multiple enemy types per group
2023-10-18 20:30:31 -04:00
Baptiste Girard
1453e7d060 Pull request #43: ajout classe building + debut condition victoire defaite (script et ui)
Merge in CGD/gather-and-defend from animation_unites to main

* commit '2478c8b3fb42097b4ad87b20771eb9d096a0fcae':
  Added show victory and defeat screens animation
  Apply prefab
  ajout des fonctionnalité des boutons + ajout de la condition de défaite fonctionnelle
  ajout classe building + debut condition victoire defaite (script et ui)
2023-10-15 23:23:39 +00: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
8ac8a90af7 Fix walk anim and center monster 2023-10-01 20:00:43 -04:00
0d70c942a3 Added basicMonster 2023-10-01 19:54:03 -04:00
1ee9e0b27b Pull request #34: WaveEditor
Merge in CGD/gather-and-defend from feature/waveEditor to main

* commit '0ce0acae5e21971dab1a72d87f5d151b7bcc3058':
  Fix MissingRefException when monster calls method OnDestroy
  Reworked constant spawn
  Start reworking constant spawn
  Removed debuging comments
  Changed comments to english
  Fix enemy count bug where the number of enemies spawned was inconsistent with the amount desired
  Ajout d'un WaveConfig aux niveaux du LevelSelect
  Changement du nom de dossier de LevelConfig vers WaveConfig
  Ajout d'instructions pour la configuration de la vague d'ennemi
  Progrès WaveEditor
  Progrès WaveEditor
  Debut Wave Editor
2023-10-01 23:34:21 +00:00
b076430b34 Start group spawn 2023-10-01 19:32:51 -04:00
1eba2adce8 Ajout du menu pause et de son interface. 2023-10-01 18:26:56 -04:00
Baptiste
e25b7da389 ajout des fonctionnalité des boutons + ajout de la condition de défaite fonctionnelle 2023-09-30 15:25:18 -04:00
fd57c8247d Merge branch 'feature/waveEditor' into feature/waveGroup 2023-09-24 17:30:16 -04:00
Baptiste
2d2cfecbc4 ajout classe building + debut condition victoire defaite (script et ui) 2023-09-18 16:47:06 -04:00
0ce0acae5e Fix MissingRefException when monster calls method OnDestroy
Changes to Entity.cs to override Death method
2023-09-17 20:45:11 -04:00
def7c9f30d Merge remote-tracking branch 'origin/main' into feature/waveEditor 2023-09-17 20:03:00 -04:00
56410139fd Reworked constant spawn
One row will spawn at a set interval

Maximum enemy per row determined by active toughness on that row
2023-09-17 18:56:30 -04:00
73eaf47726 - Ajout d'une fonction qui met le jeu en pause. 2023-09-17 17:09:34 -04:00
William Gingras 01
9c976a9cc5 Pull request #41: Added berries, updated rock and trees; Added decos to axeman, miner and archer
Merge in CGD/gather-and-defend from art/polishArcherMinerAxemanTreesBerries to main

* commit '62b8385739a59e16880e0f4f1383acfab72d913b':
  Added berries, updated rock and trees; Added decos to axeman, miner and archer
2023-09-10 20:39:30 +00:00
6345febb35 Start reworking constant spawn
Made interval between spawns adapt to enemies spawned at the Start

Removed the random factor of interval to respect the game duration

Made max spawn per row dependent of enemy toughness on that row
2023-09-10 15:39:19 -04:00
62b8385739 Added berries, updated rock and trees; Added decos to axeman, miner and archer 2023-09-10 11:29:40 -04:00
Felix-gabriel Boucher-luneau
ce058aee7f Pull request #39: global config file
Merge in CGD/gather-and-defend from feature/globalConfigFile to main

* commit '0714036b57f45e2c04dc8de469ce99b1b8a2d6d3':
  separate ally and enemy config + bugfixes
  appliquer global config aux différents endroits
  forgot changes in game.unity
  creer le scriptable object GlobalConfig
2023-09-03 16:21:20 +00:00
William Gingras 01
44d32b3347 Pull request #40: Added swordsman
Merge in CGD/gather-and-defend from art/swordsman to main

* commit '496a6eb7382de64241446b950ea3f89e197beeb0':
  Added swordsman
2023-08-30 19:11:28 +00:00
Felix Boucher
0714036b57 separate ally and enemy config + bugfixes
la config des ennemis influencait la config des alliés, ce qui était un bug maintenant, il y a une config différente pour les alliés et les ennemis.

l'animation d'attaque ne se terminait pas à temps pour faire le dégat, il a donc fallu multiplier la vitesse d'animation par le attack speed quand on attaque

j'en ai profité pour faire la même chose pour le walk animation et le speed

j'ai changé l'attribut des unités "attack speed" pour un "attack interval", pour que ça représente mieux son utilisation. Le multiplicateur reste sur la vitesse, et non sur l'interval.

Les configs pour les ressources sont les valeurs des ressources directement (pas des multiplicateurs)
2023-08-30 14:57:01 -04:00
4d7d59bda7 - Implémentation d'une méthode pour accèler le jeux pendant un partie;
- Création d'une méthode qui remet la vitesse de jeux à son état normal lorsque le dernier ennemi est mort, mais n'est pas encore implémenté;
2023-08-30 14:09:38 -04:00
496a6eb738 Added swordsman 2023-08-21 16:54:03 -04:00
fcc29ad88a Removed debuging comments
Fixed the behavior of WaveObserver when a monster dies
2023-08-06 18:51:27 -04:00
a0aa9cfb64 Changed comments to english
Added a limit to how many monsters are created per lane
Unfixed issue where SpawnOnStart breaks the system
2023-08-06 18:27:23 -04:00
Felix Boucher
0aa3327433 appliquer global config aux différents endroits
PROBLÈME :

la config existait mais n'était pas appliquée nulle part

SOLUTION :

maintenant elle l'est

NOTES :

Elle n'est pas encore appliquée au flash de dégat
2023-08-05 15:55:54 -04:00
35f0796ad1 Merge remote-tracking branch 'origin/main' into feature/waveEditor 2023-08-02 15:10:19 -04:00
76c90cacdd Pull request #38: Fixed resource collecting bug
Merge in CGD/gather-and-defend from feature/fixRecolteBug to main

* commit '5deeb528b8783c2e3c2e54753e7c369b4c910d59':
  Ajusted the behavior to be performance efficient
  Fixed yield collecting bug
  Ajustement de l'ordre des sprite des recoltes
2023-08-02 19:06:57 +00:00
5deeb528b8 Merge remote-tracking branch 'origin/main' into feature/fixRecolteBug 2023-08-02 15:02:45 -04:00