Ader Alisma 01
308da140cf
Ajout ScriptableObject pour UnitUpgrades
2024-09-28 18:44:46 -04:00
Ader Alisma 01
eb82e6b853
Affichage bouttons interactifs + Suppression dummy gameobjects in Game scene
2024-09-21 15:06:14 -04:00
Ader Alisma 01
3ce5219946
Debuggins
2024-09-05 19:37:50 -04:00
Ader Alisma 01
3e0ddca9a4
Change l'unité par l'upgrade choisi
2024-08-04 18:40:50 -04:00
Ader Alisma 01
968f255cd5
Début lien entre upgradeUI et Unité
2024-07-07 19:21:49 -04:00
4a2ece2833
Rendu UpgradePlacementButton.cs indépendant des héritages de UnitPlacementButtons.
...
Interface d'amélioration s'affiche onClick pour FarmersAssociation
Interface n'est présentement pas rétroactive des infos de l'unité
2024-06-09 15:41:26 -04:00
97d1b6ba02
Prefab UpgadeButtons, utilisation de EventSystems pour clique sur unités.
...
Début changement selon héritage de UnitPlacementButton
2024-06-08 18:52:58 -04:00
12a8497708
Tentative d'associer le clique utilisateur à une position sur le jeu
2024-05-12 18:48:26 -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
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
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
849427777b
Merge remote-tracking branch 'origin/main' into feature/InvestigationSpawnConstant
2024-03-03 14:16:53 -05:00
10ec788979
Fix misplaced variable
2024-03-03 14:13:43 -05:00
bd28e30da5
Comments + variable structure
2024-03-03 13:41:23 -05:00
bc4b4c30a8
Fixed spawning decrementation and changing spawner objectives dynamically
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
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
d0371349db
Temp reset
2024-02-04 19:05:01 -05:00
ee5cf003b0
Added animated mill and peasant card!
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.
2024-02-04 18:25:23 -05:00
fabd51a9f5
Adjusted destination positions
2024-02-04 11:36:24 -05:00
a4f7accfcd
Removed Debug logs and prepared main rebase
2024-02-04 11:30:28 -05:00
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
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
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
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
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.
2023-11-04 13:32:14 -04:00
