Commit Graph

Select branches

Hide Pull Requests

art/millAndPeasantCard

art/polishArcherMinerAxeman

bugfix/BerryUnitOverlay

bugfix/WaveConfigNullCheck

bugfix/placingOnTopOfEachOther

design/afterGala3BalancePatch

dev/hard-head

dev/knightOnHorse

dev/mill-workshop-blacksmith

feature/Corrupted-Factory

feature/Creeper

feature/monsterCore

feature/skill_tree

main

origin/feature/ChangeGameSpeed

testing/desertAndHouse

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#3

#4

#5

#6

#7

#8

#9

Mono Color

• 069c7eda00 Cards and level spawning balance testing, Fixed some error logs craftwill 2024-06-23 10:15:52 -04:00
• 4a2ece2833 Rendu UpgradePlacementButton.cs indépendant des héritages de UnitPlacementButtons. Ader Alisma 01 2024-06-09 15:41:26 -04:00
• 97d1b6ba02 Prefab UpgadeButtons, utilisation de EventSystems pour clique sur unités. Ader Alisma 01 2024-06-08 18:52:58 -04:00
• 8804450d99 Pull request #67: Add level select sprites to change island and resize island sprite Élia Gingras 01 2024-06-08 18:46:04 +00:00
• 43c569dfec Pull request #66: - Retiré temporairement l'erreur qui apparaît quand on intéragit avec un niveau qui n'a pas de WaveConfig. Maximilien Blanchard-Bizien 2024-05-25 23:18:45 +00:00
• bb898df7c4 Add level select sprites to change island and resize island sprite craftwill 2024-05-25 16:48:44 -04:00
• fce8ea5e3d Pull request #65: barre de vie sur les ennemis Felix-gabriel Boucher-luneau 2024-05-25 18:40:36 +00:00
• 12a8497708 Tentative d'associer le clique utilisateur à une position sur le jeu Ader Alisma 01 2024-05-12 18:48:26 -04:00
• 2ff5982821 - Retiré temporairement l'erreur qui apparaît quand on intéragit avec un niveau qui n'a pas de WaveConfig. bugfix/WaveConfigNullCheck MaximilienBlanchardBizien1 2024-04-27 09:57:24 -04:00
• d21f023e5c barre de vie sur les ennemis Felix Boucher 2024-03-26 19:58:08 -04:00
• 99655f7e09 Pull request #63: extraire les prix et cooldowns des unit cards Felix-gabriel Boucher-luneau 2024-03-17 19:03:14 +00:00
• 6dd08eb51c Pull request #62: InvestigationSpawnConstant Ader Alisma 01 2024-03-17 16:18:28 +00:00
• 8e8c32ca68 Merge remote-tracking branch 'origin/main' into feature/InvestigationSpawnConstant Ader Alisma 01 2024-03-17 12:10:04 -04:00
• 9f9b518b75 Pull request #64: - 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. Maximilien Blanchard-Bizien 2024-03-15 19:44:49 +00:00
• 927c08559f extraire les prix et cooldowns des unit cards Felix Boucher 2024-03-13 16:38:07 -04:00
• 6826eada7a skill tree visuals and functions start Felix Boucher 2024-03-13 16:08:40 -04:00
• 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. MaximilienBlanchardBizien1 2024-03-10 19:43:30 -04:00
• 849427777b Merge remote-tracking branch 'origin/main' into feature/InvestigationSpawnConstant Ader Alisma 01 2024-03-03 14:16:53 -05:00
• 10ec788979 Fix misplaced variable Ader Alisma 01 2024-03-03 14:13:43 -05:00
• bd28e30da5 Comments + variable structure Ader Alisma 01 2024-03-03 13:41:23 -05:00
• bc4b4c30a8 Fixed spawning decrementation and changing spawner objectives dynamically Ader Alisma 01 2024-03-02 16:26:47 -05:00
• 8921c898ec Fix ConstantSpawn to change constant spawn group when one group dies Keeps doing constant spawn after 2nd group dies Ader Alisma 01 2024-02-27 15:21:47 -05:00
• fd2e2e3991 Pull request #61: Added animated mill and peasant card! William Gingras 01 2024-02-19 17:07:14 +00:00
• 5c49721a4b Pull request #60: unit cooldown Felix-gabriel Boucher-luneau 2024-02-18 23:24:39 +00:00
• effe4ca2cc unit cooldown Felix Boucher 2024-02-18 11:11:03 -05:00
• d0371349db Temp reset Ader Alisma 01 2024-02-04 19:05:01 -05:00
• ee5cf003b0 Added animated mill and peasant card! art/millAndPeasantCard craftwill 2024-02-04 18:57:28 -05:00
• 0fd0584a50 Fixed enemy death resuming spawner timers unexpectedly. Now checks if the constant spawn is done to decide if spawning should end. Ader Alisma 01 2024-02-04 18:25:23 -05:00
• 734c754882 - Implémentation incompléte du code qui empêche l'utilisateur de mettre deux unités sur la même case. bugfix/BerryUnitOverlay MaximilienBlanchardBizien1 2024-02-04 18:23:56 -05:00
• 474b47be53 Pull request #59: Nouvelle destination des resources collectées Ader Alisma 01 2024-02-04 23:19:35 +00:00
• fabd51a9f5 Adjusted destination positions Ader Alisma 01 2024-02-04 11:36:24 -05:00
• a4f7accfcd Removed Debug logs and prepared main rebase Ader Alisma 01 2024-02-04 11:11:56 -05:00
• e1e3c42b00 Created destination placeholders where resource ui should be Ader Alisma 01 2024-01-23 14:18:35 -05:00
• 9188e86adb Pull request #58: Feature/delete button Felix-gabriel Boucher-luneau 2024-01-26 00:18:01 +00:00
• 27d329df71 fix unit cost not working anymore Felix Boucher 2024-01-25 14:45:50 -05:00
• 42fbffd306 working delete feature + placeholder refactor Felix Boucher 2024-01-19 15:30:54 -05:00
• 795d6751ec refactor placement buttons to accomodate delete Felix Boucher 2024-01-19 14:51:30 -05:00
• 637fec1410 update database for prefabs and scriptableobjects Felix Boucher 2024-01-19 14:30:58 -05:00
• db7cd3650c add delete button Felix Boucher 2024-01-19 14:25:01 -05:00
• 47338ecdaf Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cgd/gather-and-defend MaximilienBlanchardBizien1 2024-01-09 10:17:00 -05:00
• 2dcaa796ec Merge branch 'origin/feature/berriesInteractions' MaximilienBlanchardBizien1 2024-01-09 10:15:25 -05:00
• d31a47885b Pull request #57: Fix spawning for gala and fix archer atk speed William Gingras 01 2023-11-14 12:55:58 +00:00
• 8e50c6d455 Fix spawning for gala and fix archer atk speed craftwill 2023-11-13 22:26:24 -05:00
• 9ddef402d1 Pull request #56: Design/galaFixes William Gingras 01 2023-11-14 01:34:50 +00:00
• 28c9cb85c7 Merge with main craftwill 2023-11-13 20:12:17 -05:00
• c8d2e43326 Add timed victory and config changes craftwill 2023-11-13 20:03:28 -05:00
• 4bd16c7786 Pull request #55: add the save and unlock next level after finishing anyone Baptiste Girard 2023-11-14 01:02:21 +00:00
• 25d574714f add the save and unlock next level after finishing anyone Baptiste 2023-11-13 19:08:18 -05:00
• e8d89dbd03 Balanced level configs craftwill 2023-11-13 18:57:58 -05:00
• 2c701112ad Add levels missing config; Add island float animation craftwill 2023-11-13 17:56:14 -05:00
• e1ffb8c887 Add berries to all levels craftwill 2023-11-13 17:47:23 -05:00
• e1ae20e101 Pull request #52: fix detection range Felix-gabriel Boucher-luneau 2023-11-13 22:38:51 +00:00
• b3d11e2afc Pull request #53: Origin/feature/berriesInteractions Maximilien Blanchard-Bizien 2023-11-13 22:38:06 +00:00
• 2ec32f8832 Merge branch 'main' into origin/feature/berriesInteractions craftwill 2023-11-13 17:27:36 -05:00
• 4568c350bf toggle collider in coroutine instead of script Felix Boucher 2023-11-12 20:31:21 -05:00
• 7dba305d30 fixes to berry harvesting Felix Boucher 2023-11-12 18:26:36 -05:00
• fda64f1c3d Pull request #54: Delay pour groupSpawn Ader Alisma 01 2023-11-12 22:04:11 +00:00
• 7edbec43b3 End groupSpawn delay Ader Alisma 01 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. MaximilienBlanchardBizien1 2023-11-04 13:32:14 -04:00
• cba5364045 Création et implémentation des baies. Couramment, donne de la nourriture, mais pourra probablement donner des baies plus tard. MaximilienBlanchardBizien1 2023-11-01 16:29:44 -04:00
• bff2df154a fix detection range Felix Boucher 2023-11-05 11:52:48 -05:00
• 73810cd7bd - 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. MaximilienBlanchardBizien1 2023-11-04 13:32:14 -04:00
• 4ae8f0dcfa Start delay with for loop and breakTag Ader Alisma 01 2023-11-04 10:01:40 -04:00
• 6bdbbe60fb Création et implémentation des baies. Couramment, donne de la nourriture, mais pourra probablement donner des baies plus tard. MaximilienBlanchardBizien1 2023-11-01 16:29:44 -04:00
• 4c8b34993a Pull request #50: repair pause button + refactoring Felix-gabriel Boucher-luneau 2023-11-01 01:13:37 +00:00
• 4b800c73c2 Pull request #51: fix detection range Felix-gabriel Boucher-luneau 2023-11-01 01:13:17 +00:00
• 937624f54f remove underscore Felix Boucher 2023-10-31 21:12:24 -04:00
• c6f819bee1 Fix compile errors William 2023-10-31 21:06:05 -04:00
• 3c1a94257f fix detection range Felix Boucher 2023-10-30 21:28:21 -04:00
• 104f812c41 repair pause button + refactoring Felix Boucher 2023-10-30 20:45:47 -04:00
• 96d9b0fd7b Pull request #49: added population mechanic Felix-gabriel Boucher-luneau 2023-10-30 03:26:43 +00:00
• 6778880d5f reset resources for real each level loading Felix Boucher 2023-10-29 23:25:56 -04:00
• 7502417d26 Added berriesHarvester stickman craftwill 2023-10-29 20:09:03 -04:00
• f0323e0389 oops forgot some staging Felix Boucher 2023-10-29 19:49:10 -04:00
• b54627196c population mechanic with art Felix Boucher 2023-10-29 19:12:32 -04:00
• 3174b1f495 Pull request #48: Added some basic sounds including ambiant and res collection; Fixed level retry not working William Gingras 01 2023-10-29 21:20:16 +00:00
• b8d4907efb Removed useless script craftwill 2023-10-29 17:06:46 -04:00
• 570b3948d4 Added some basic sounds including ambiant and res collection; Fixed level retry not working craftwill 2023-10-29 16:54:13 -04:00
• 1067487749 Pull request #47: Design/baseLevelConfigsAndBalance William Gingras 01 2023-10-29 19:11:06 +00:00
• 5211bd9ae9 Fix spawn configs and levels to spawn ok amount of enemies craftwill 2023-10-23 21:56:10 -04:00
• 90f01233f4 Added smolEye craftwill 2023-10-23 21:37:41 -04:00
• c143d79fde Playing around with level configs and balanced units craftwill 2023-10-23 20:47:57 -04:00
• 8e767297e6 Pull request #46: WaveGroup Ader Alisma 01 2023-10-22 19:36:44 +00:00
• c57417a583 PR corrections Ader Alisma 01 2023-10-22 15:28:34 -04:00
• e4fe735fe5 Updated wave config Ader Alisma 01 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 Ader Alisma 01 2023-10-18 20:33:19 -04:00
• 749d2c5643 Finished group spawn Ader Alisma 01 2023-10-18 20:30:31 -04:00
• 13f00e326c Start group spawn Ader Alisma 01 2023-10-01 19:32:51 -04:00
• af66cd5cfa Finished group spawn Ader Alisma 01 2023-10-18 20:30:31 -04:00
• 1453e7d060 Pull request #43: ajout classe building + debut condition victoire defaite (script et ui) Baptiste Girard 2023-10-15 23:23:39 +00:00
• 2478c8b3fb Added show victory and defeat screens animation William 2023-10-15 19:23:24 -04:00
• e2ff56264e Fix game conflict and added correct UI for the victory and defeat screens William 2023-10-15 18:34:42 -04:00
• fc9da646c6 Pull request #42: ajout de transition avant de loader le level Felix-gabriel Boucher-luneau 2023-10-15 21:52:11 +00:00
• 449744cdc7 Merged with main William 2023-10-15 17:51:21 -04:00
• 915fed0cbe Apply prefab William 2023-10-15 17:47:33 -04:00
• 02b56c5b4b Pull request #44: Art/basicMonster William Gingras 01 2023-10-15 21:12:10 +00:00
• 8adc563d47 make transition fool proof Felix Boucher 2023-10-09 22:21:06 -04:00
• f9a54513cd repair camera calibrating + finish adding configs Felix Boucher 2023-09-24 10:48:37 -04:00
• ef6b345a03 added some doc + some global configs Felix Boucher 2023-09-17 20:30:02 -04:00
• 9e07c48fd4 ajout de transition avant de loader le level Felix Boucher 2023-09-17 18:10:04 -04:00