This website requires JavaScript.
da9257f78e
Pull request #45 : Origin/feature/ChangeGameSpeed
Maximilien Blanchard-Bizien
2023-10-02 01:01:31 +00:00
059b6d5bd8
Correction du nom d'une méthode.
MaximilienBlanchardBizien1
2023-10-01 20:54:45 -04:00
8ac8a90af7
Fix walk anim and center monster
craftwill
2023-10-01 20:00:43 -04:00
0d70c942a3
Added basicMonster
craftwill
2023-10-01 19:54:03 -04:00
1ee9e0b27b
Pull request #34 : WaveEditor
Ader Alisma 01
2023-10-01 23:34:21 +00:00
b076430b34
Start group spawn
Ader Alisma 01
2023-10-01 19:32:51 -04:00
1eba2adce8
Ajout du menu pause et de son interface.
MaximilienBlanchardBizien1
2023-10-01 18:26:56 -04:00
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
Ader Alisma 01
2023-09-24 17:30:16 -04:00
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
Ader Alisma 01
2023-09-17 20:45:11 -04:00
def7c9f30d
Merge remote-tracking branch 'origin/main' into feature/waveEditor
Ader Alisma 01
2023-09-17 20:03:00 -04:00
56410139fd
Reworked constant spawn
Ader Alisma 01
2023-09-17 18:56:30 -04:00
73eaf47726
- Ajout d'une fonction qui met le jeu en pause.
MaximilienBlanchardBizien1
2023-09-17 17:09:34 -04:00
9c976a9cc5
Pull request #41 : 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
Ader Alisma 01
2023-09-10 15:39:19 -04:00
d8d70db706
Testing desert and house gmaeplay
William
2023-09-10 12:26:44 -04:00
62b8385739
Added berries, updated rock and trees; Added decos to axeman, miner and archer
William
2023-09-10 11:29:40 -04:00
ce058aee7f
Pull request #39 : global config file
2023-09-03 16:21:20 +00:00
44d32b3347
Pull request #40 : Added swordsman
2023-08-30 19:11:28 +00:00
0714036b57
separate ally and enemy config + bugfixes
2023-08-30 14:57:01 -04:00
4d7d59bda7
- Implémentation d'une méthode pour accèler le jeux pendant un partie;
MaximilienBlanchardBizien1
2023-08-30 14:09:38 -04:00
496a6eb738
Added swordsman
craftwill
2023-08-21 16:54:03 -04:00
fcc29ad88a
Removed debuging comments
Ader Alisma 01
2023-08-06 18:51:27 -04:00
a0aa9cfb64
Changed comments to english
Ader Alisma 01
2023-08-06 18:27:23 -04:00
0aa3327433
appliquer global config aux différents endroits
2023-08-05 15:55:54 -04:00
35f0796ad1
Merge remote-tracking branch 'origin/main' into feature/waveEditor
Ader Alisma 01
2023-08-02 15:10:19 -04:00
76c90cacdd
Pull request #38 : Fixed resource collecting bug
Ader Alisma 01
2023-08-02 19:06:57 +00:00
5deeb528b8
Merge remote-tracking branch 'origin/main' into feature/fixRecolteBug
Ader Alisma 01
2023-08-02 15:02:45 -04:00
333a6e00bf
Ajusted the behavior to be performance efficient
Ader Alisma 01
2023-08-02 15:00:21 -04:00
b9908ab717
forgot changes in game.unity
2023-08-02 01:39:57 -04:00
defe6ed4ff
creer le scriptable object GlobalConfig
2023-08-02 01:39:24 -04:00
d44bf44624
Merge remote-tracking branch 'origin/main' into feature/fixRecolteBug
Ader Alisma 01
2023-07-30 15:56:28 -04:00
cfeb6bb09b
Fixed yield collecting bug
Ader Alisma 01
2023-07-30 15:55:54 -04:00
c9c47f1417
Fix enemy count bug where the number of enemies spawned was inconsistent with the amount desired
Ader Alisma 01
2023-07-30 11:56:13 -04:00
fb80cc3c9b
Pull request #37 : Finish integrating level selector
2023-07-25 23:07:22 +00:00
f50266cf7a
Added details on miner, axeman and archer
William
2023-07-24 19:32:50 -04:00
9696ee614e
spawners n'apparaissent plus + beau back button
2023-07-23 20:22:29 -04:00
27d72368aa
finish integrating level selector
2023-07-23 20:16:44 -04:00
3d919455e9
Pull request #36 : AJout detection de l'ennemi le plus proche, correction bug collision, correction bug monstres attaque de loin
2023-07-23 23:24:47 +00:00
adea3b05d4
Ajustement de l'ordre des sprite des recoltes
Ader Alisma 01
2023-07-23 19:14:35 -04:00
33e5d14c9e
isTrigger ajouté
2023-07-23 16:28:08 -04:00
8b13efe012
restored broken prefabs
craftwill
2023-07-23 16:26:27 -04:00
7de3727297
no message
2023-07-23 16:01:54 -04:00
d60d333743
Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cgd/gather-and-defend into animation_unites
2023-07-23 15:59:36 -04:00
b3bb49d9e1
AJout detection de l'ennemi le plus proche, correction bug collision, correction bug monstres attaque de loin
2023-07-23 15:45:58 -04:00
15f95d5bc4
Pull request #35 : changer l'apparence du harvester
2023-07-23 16:37:00 +00:00
b1cfb714a6
changer l'apparence du harvester
2023-07-23 11:53:07 -04:00
3b9964debd
Ajout d'un WaveConfig aux niveaux du LevelSelect
Ader Alisma 01
2023-07-22 17:59:55 -04:00
7dcf3e8217
Changement du nom de dossier de LevelConfig vers WaveConfig
Ader Alisma 01
2023-07-22 17:57:52 -04:00
84470e8d0e
Merge branch 'main' into feature/waveEditor
Ader Alisma 01
2023-07-22 17:50:56 -04:00
b35325d949
Pull request #33 : Axeman, miner, entities scaling and projectile angled
2023-07-22 18:57:03 +00:00
b57efc49a8
Ajout d'instructions pour la configuration de la vague d'ennemi
Ader Alisma 01
2023-07-22 14:21:44 -04:00
fd22af5e65
Revert FetchDatabaseStatic because it prevents builds
craftwill
2023-07-22 01:32:22 -04:00
ecd32b09b8
Level 1 to 6 and allow loading levels in worldMap
craftwill
2023-07-22 01:24:05 -04:00
4a1b773c2c
Add game scene changes to HUD
craftwill
2023-07-21 23:26:15 -04:00
babc3a24e8
Add FarmersAssociation unit + balance changes
craftwill
2023-07-21 23:25:38 -04:00
768700a06e
Added farmers Association
William
2023-07-21 17:31:03 -04:00
9b8b329340
Fixed scenes spawners
craftwill
2023-07-18 20:40:53 -04:00
d4e3bb316c
Changed levels, update rock sprite, added enemyspawnStart
craftwill
2023-07-18 20:31:09 -04:00
9da10f580d
Added tilesBackground and updated grass tiles
craftwill
2023-07-18 20:06:59 -04:00
70a4048ee7
Axeman, miner, entities scaling and projectile angled
craftwill
2023-07-18 15:43:21 -04:00
f733a84ebf
Pull request #32 : Art/maquetteAccurateGameScene
2023-07-17 22:00:55 +00:00
d83f621c3e
Merge remote-tracking branch 'origin/main' into feature/animationRecolte
Ader Alisma 01
2023-07-14 23:16:26 -04:00
cad2436773
Progrès WaveEditor
Ader Alisma 01
2023-07-14 23:15:18 -04:00
d75a1ec747
Progrès WaveEditor
Ader Alisma 01
2023-07-14 19:44:07 -04:00
1ceb1da60d
Archer anim; Farmer anim; Fix HUD issues
craftwill
2023-07-14 14:57:39 -04:00
84184b4968
restored testGame scene
craftwill
2023-07-14 14:19:11 -04:00
c39bbba683
Made game scene look like maquette
craftwill
2023-07-14 14:15:07 -04:00
af0e65e754
Pull request #14 : Origin/feature/Interface Carte
Maximilien Blanchard-Bizien
2023-07-14 17:02:57 +00:00
1d147bb207
Clean code; Remove text on levels; Load game scene for now when clicking on a level btn
craftwill
2023-07-14 13:01:21 -04:00
d12b9c2a62
Merge branch 'main' into origin/feature/Interface-Carte
craftwill
2023-07-14 12:47:13 -04:00
9de78c62db
Pull request #31 : harvesters
2023-07-14 16:43:36 +00:00
9889ca76a7
harvesters
2023-07-13 12:40:37 -04:00
1554bd2315
Pull request #30 : Feature/implementGameSceneConflictSolved
2023-07-11 20:01:09 +00:00
588d491b6a
cards should be aligned top left
2023-07-11 15:37:30 -04:00
87622e8a69
oubli des universioned files
2023-07-09 14:23:33 -04:00
43bc2c75f2
work on game scene + fix bugs
2023-07-09 13:50:04 -04:00
2ec13ed7e2
ajout placeholder pour fast forward
2023-06-30 17:03:50 -04:00
1cf027cb1c
animator de l'archer etait brisé + oublis
2023-06-30 16:42:10 -04:00
1b85e1c37f
mettre tout le stock dans la scene Game
2023-06-30 16:30:50 -04:00
25776067e3
cards should be aligned top left
2023-07-11 15:37:30 -04:00
525a1ba729
Pull request #26 : Animation unites
2023-07-11 17:37:08 +00:00
e44264d66f
ajout event animation, ajout classe Root qui sert de transition entre la classe Entity et l'animator.
2023-07-09 21:33:35 -04:00
15b5976cb0
Debut Wave Editor
Ader Alisma 01
2023-07-09 18:59:37 -04:00
7d22c4633d
oubli des universioned files
2023-07-09 14:23:33 -04:00
e05cf77b75
work on game scene + fix bugs
2023-07-09 13:50:04 -04:00
c4f5e677bf
- Implémentation complète de l'affichage des icônes sur la sélection des niveaux;
MaximilienBlanchardBizien1
2023-07-08 13:27:46 -04:00
5238cb2e8a
correction du merge request
2023-07-07 19:15:56 -04:00
920356d706
ajout placeholder pour fast forward
2023-06-30 17:03:50 -04:00
ad8361d96f
animator de l'archer etait brisé + oublis
2023-06-30 16:42:10 -04:00
f682972e0c
mettre tout le stock dans la scene Game
2023-06-30 16:30:50 -04:00
e08f59d8a3
Pull request #28 : retirer limite resources
2023-07-02 13:27:10 +00:00
14c15426c7
Pull request #29 : réparer le drag and drop
2023-07-02 13:26:17 +00:00
878a80b1d7
réparer le drag and drop
2023-06-30 17:27:26 -04:00
3bf9dae121
retirer limite resources
2023-06-30 17:08:24 -04:00
93e3ab1929
Pull request #25 : Animation de la récolte au clic et au commencement. Aussi, ajout au HUD
Ader Alisma 01
2023-06-30 14:41:21 +00:00
1dcca774d5
Correction des commentaires de merge pour ResourceMaker
Ader Alisma 01
2023-06-30 10:33:54 -04:00
ccd2e898e5
Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cgd/gather-and-defend into animation_unites
2023-06-25 20:05:54 -04:00
11d617db90
no message
2023-06-25 20:05:35 -04:00
Maximilien Blanchard-Bizien
craftwill
Ader Alisma 01
Baptiste