Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity
305 Commits 16 Branches 0 Tags
Commit Graph

245 Commits

Author SHA1 Message Date
craftwill
82a76c4180 Change range so it maybe unbugs the swords users; Also balance costs of units and cooldowns 2024-10-27 15:27:38 -04:00
craftwill
a38388ad90 Added swordsman and renamed the knight 2024-10-27 14:33:43 -04:00
MaximilienBlanchardBizien1
c9e791633f Increased the layer levels of the monsters currently in the game, making it so that they walk over the farm tiles instead of under. 2024-10-12 13:56:26 -04:00
MaximilienBlanchardBizien1
1fd249a0d2 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. 2024-09-24 10:50:46 -04:00
craftwill
58fc194bb8 Add unitUpgrade UI sprites and prefab; Also added hpBars to buildings 2024-09-09 10:16:01 -04:00
MaximilienBlanchardBizien1
884d4a9ee6 Fixed issue where farmer can be placed on a non-resource tile. 2024-09-03 15:43:38 -04:00
Élia Gingras 01
8eb2a7d5cc Pull request #72: Balance level 1-6 and archer 
Merge in CGD/gather-and-defend from design/finallyBalanceLevels to main

* commit '321d6bdff760ad7062b19189c6bb6f9f714a655d':
  Balance level 1-6 and archer
 2024-07-12 15:46:00 +00:00
William
321d6bdff7 Balance level 1-6 and archer 2024-07-12 11:19:51 -04:00
craftwill
d8e3e72b1e Add island 2 2024-07-09 11:40:05 -04:00
Maximilien Blanchard-Bizien
a39aebf9f7 Pull request #70: Ajouter deuxième île au menu de choix de niveau 
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.
 2024-06-23 23:18:37 +00:00
craftwill
dcdc0d7fc8 Merge branch 'main' into bugfix/spawnLevelConfigOddBehaviour 2024-06-23 18:36:14 -04:00
craftwill
7e9385db30 revert object instantiate on level config 2024-06-23 18:34:54 -04:00
craftwill
18b97c4fd9 reset WaveObserver state wip 2024-06-23 18:31:56 -04:00
MaximilienBlanchardBizien1
b5351f58ee - Ajouter deuxième île au menu de choix de niveau; 
- Ajouté boutons pour passer entre les deux îles.
 2024-06-23 15:13:06 -04:00
craftwill
18babd7d6c Merge branch 'main' into design/summerBalance 2024-06-23 10:36:45 -04:00
craftwill
069c7eda00 Cards and level spawning balance testing, Fixed some error logs 2024-06-23 10:15:52 -04:00
Élia Gingras 01
8804450d99 Pull request #67: Add level select sprites to change island and resize island sprite 
Merge in CGD/gather-and-defend from art/levelSelectSprites to main

* commit 'bb898df7c42ce83c7949857e4dc1b75fbfb7f47f':
  Add level select sprites to change island and resize island sprite
 2024-06-08 18:46:04 +00:00
Maximilien Blanchard-Bizien
43c569dfec Pull request #66: - 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 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.
 2024-05-25 23:18:45 +00:00
craftwill
bb898df7c4 Add level select sprites to change island and resize island sprite 2024-05-25 16:48:44 -04:00
MaximilienBlanchardBizien1
2ff5982821 - Retiré temporairement l'erreur qui apparaît quand on intéragit avec un niveau qui n'a pas de WaveConfig. 2024-04-27 09:57:24 -04:00
Felix Boucher
d21f023e5c barre de vie sur les ennemis 
Il était impossible de savoir la vie des ennemis et des alliés durant une partie

Ajout d'une barre de vie sur les ennemis et les alliés
 2024-03-26 19:58:08 -04:00
Felix-gabriel Boucher-luneau
99655f7e09 Pull request #63: extraire les prix et cooldowns des unit cards 
Merge in CGD/gather-and-defend from feature/separate_cooldown_from_units to main

* commit '927c08559f2f0c8850be6c9b3e170165e8bccb27':
  extraire les prix et cooldowns des unit cards
 2024-03-17 19:03:14 +00:00
Ader Alisma 01
8e8c32ca68 Merge remote-tracking branch 'origin/main' into feature/InvestigationSpawnConstant 2024-03-17 12:10:04 -04:00
Felix Boucher
927c08559f extraire les prix et cooldowns des unit cards 
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
 2024-03-13 16:38:07 -04:00
MaximilienBlanchardBizien1
25c9382dfd - 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. 2024-03-10 19:43:30 -04:00
Ader Alisma 01
849427777b Merge remote-tracking branch 'origin/main' into feature/InvestigationSpawnConstant 2024-03-03 14:16:53 -05:00
Ader Alisma 01
10ec788979 Fix misplaced variable 2024-03-03 14:13:43 -05:00
Ader Alisma 01
bd28e30da5 Comments + variable structure 2024-03-03 13:41:23 -05:00
Ader Alisma 01
bc4b4c30a8 Fixed spawning decrementation and changing spawner objectives dynamically 2024-03-02 16:26:47 -05:00
Ader Alisma 01
8921c898ec Fix ConstantSpawn to change constant spawn group when one group dies 
Keeps doing constant spawn after 2nd group dies

To test: 2 groups die, what about the 3rd one
 2024-02-27 15:44:11 -05:00
William Gingras 01
fd2e2e3991 Pull request #61: Added animated mill and peasant card! 
Merge in CGD/gather-and-defend from art/millAndPeasantCard to main

* commit 'ee5cf003b0fd0b4d5b03334f514649d04b96adf3':
  Added animated mill and peasant card!
 2024-02-19 17:07:14 +00:00
Felix Boucher
effe4ca2cc unit cooldown 
#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é
 2024-02-18 11:11:03 -05:00
Ader Alisma 01
d0371349db Temp reset 2024-02-04 19:05:01 -05:00
craftwill
ee5cf003b0 Added animated mill and peasant card! 2024-02-04 18:57:28 -05:00
Ader Alisma 01
0fd0584a50 Fixed enemy death resuming spawner timers unexpectedly. Now checks if the constant spawn is done to decide if spawning should end. 2024-02-04 18:25:23 -05:00
Ader Alisma 01
fabd51a9f5 Adjusted destination positions 2024-02-04 11:36:24 -05:00
Ader Alisma 01
a4f7accfcd Removed Debug logs and prepared main rebase 2024-02-04 11:30:28 -05:00
Ader Alisma 01
e1e3c42b00 Created destination placeholders where resource ui should be 2024-02-04 11:30:28 -05:00
Felix-gabriel Boucher-luneau
9188e86adb Pull request #58: Feature/delete button 
Merge in CGD/gather-and-defend from feature/delete_button to main

* commit '27d329df7170a12e850d11355ccd33118a94fb7e':
  fix unit cost not working anymore
  working delete feature + placeholder refactor
  refactor placement buttons to accomodate delete
  update database for prefabs and scriptableobjects
  add delete button
 2024-01-26 00:18:01 +00:00
Felix Boucher
27d329df71 fix unit cost not working anymore 
turns out it was an inheritance problem
 2024-01-25 14:45:50 -05:00
Felix Boucher
42fbffd306 working delete feature + placeholder refactor 2024-01-19 15:30:54 -05:00
Felix Boucher
795d6751ec refactor placement buttons to accomodate delete 2024-01-19 14:51:30 -05:00
Felix Boucher
637fec1410 update database for prefabs and scriptableobjects 2024-01-19 14:30:58 -05:00
Felix Boucher
db7cd3650c add delete button 2024-01-19 14:25:01 -05:00
MaximilienBlanchardBizien1
47338ecdaf Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cgd/gather-and-defend 
# Conflicts:
#	Assets/Tiles/BushTile.asset
 2024-01-09 10:17:00 -05:00
MaximilienBlanchardBizien1
2dcaa796ec Merge branch 'origin/feature/berriesInteractions' 
# Conflicts:
#	Assets/Prefabs/UI/ResourceGUI.prefab
#	Assets/Scripts/Resource/ResourceMaker.cs
#	Assets/Scripts/Resource/ResourceManager.cs
#	Assets/Scripts/Resource/ResourceText.cs
 2024-01-09 10:15:25 -05:00
craftwill
8e50c6d455 Fix spawning for gala and fix archer atk speed 2023-11-13 22:26:24 -05:00
craftwill
28c9cb85c7 Merge with main 2023-11-13 20:12:17 -05:00
craftwill
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