360 Commits

Author SHA1 Message Date
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
474b47be53 Pull request #59: Nouvelle destination des resources collectées
Merge in CGD/gather-and-defend from feature/YieldDestination to main

* commit 'fabd51a9f516416c3745f24c774120441fa7b16b':
  Adjusted destination positions
  Removed Debug logs and prepared main rebase
  Created destination placeholders where resource ui should be
2024-02-04 23:19:35 +00: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
William Gingras 01
d31a47885b Pull request #57: Fix spawning for gala and fix archer atk speed
Merge in CGD/gather-and-defend from design/galaFixes2 to main

* commit '8e50c6d45539b846c411f65c445eb42704690ae0':
  Fix spawning for gala and fix archer atk speed
2023-11-14 12:55:58 +00:00
8e50c6d455 Fix spawning for gala and fix archer atk speed 2023-11-13 22:26:24 -05:00
William Gingras 01
9ddef402d1 Pull request #56: Design/galaFixes
Merge in CGD/gather-and-defend from design/galaFixes to main

* commit '28c9cb85c70757567fe5b36682f92f3fee85ffad':
  Add timed victory and config changes
  Balanced level configs
  Add levels missing config; Add island float animation
  Add berries to all levels
2023-11-14 01:34:50 +00: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
b3d11e2afc Pull request #53: Origin/feature/berriesInteractions
Merge in CGD/gather-and-defend from origin/feature/berriesInteractions to main

* commit '2ec32f883236a3eb4755287737f6dd1830827efc':
  fixes to berry harvesting
  - 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.
  Création et implémentation des baies. Couramment, donne de la nourriture, mais pourra probablement donner des baies plus tard.
2023-11-13 22:38:06 +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
fda64f1c3d Pull request #54: Delay pour groupSpawn
Merge in CGD/gather-and-defend from feature/waveGroupDelay to main

* commit '7edbec43b35029ebcd5391e36f868065a7fadd4e':
  End groupSpawn delay
  Start delay with for loop and breakTag
2023-11-12 22:04:11 +00: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
4ae8f0dcfa Start delay with for loop and breakTag 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. 2023-11-01 16:29:44 -04:00
Felix-gabriel Boucher-luneau
4c8b34993a Pull request #50: repair pause button + refactoring
Merge in CGD/gather-and-defend from prog/fix_pause to main

* commit '104f812c41a2f9a15a9672316c8aeded23752d67':
  repair pause button + refactoring
2023-11-01 01:13:37 +00:00
Felix-gabriel Boucher-luneau
4b800c73c2 Pull request #51: fix detection range
Merge in CGD/gather-and-defend from prog/fix_detection_range to main

* commit '937624f54fafd20cbc70dd752fa00314139ec795':
  remove underscore
  fix detection range
2023-11-01 01:13:17 +00:00
Felix Boucher
937624f54f remove underscore 2023-10-31 21:12:24 -04:00
c6f819bee1 Fix compile errors 2023-10-31 21:06:05 -04:00
Felix Boucher
3c1a94257f fix detection range
problem :

detection range didn't show anymore on placeholders

solution :

calculate detection range from collider's offset and size instead of it's bound
2023-10-30 21:28:21 -04:00
Felix Boucher
104f812c41 repair pause button + refactoring
problem :

- pause button needed 2 times to press

solution

- decouple pause from resume
- refactor
2023-10-30 20:45:47 -04:00
Felix-gabriel Boucher-luneau
96d9b0fd7b Pull request #49: added population mechanic
Merge in CGD/gather-and-defend from prog/population to main

* commit '6778880d5fed0d60c92f48995e62eca289bfaec3':
  reset resources for real each level loading
  oops forgot some staging
  population mechanic with art
2023-10-30 03:26:43 +00:00
Felix Boucher
6778880d5f reset resources for real each level loading 2023-10-29 23:25:56 -04:00
7502417d26 Added berriesHarvester stickman 2023-10-29 20:09:03 -04:00
Felix Boucher
f0323e0389 oops forgot some staging 2023-10-29 19:49:10 -04:00
Felix Boucher
b54627196c population mechanic with art
- added art for house and UI
- put population in ResourceManager
- create house prefab
- added code for adding and removing pop depending on entity
- refactor harvesters so they inherit from ally
- modify placeholders and buttons so that only units cost population
- add events for population and resources changing
- add population relative configs to global config
- add start resources values to Levels
- add debug feature for generating resources for free
2023-10-29 19:12:32 -04:00
William Gingras 01
3174b1f495 Pull request #48: Added some basic sounds including ambiant and res collection; Fixed level retry not working
Merge in CGD/gather-and-defend from design/addedBasicSounds to main

* commit 'b8d4907efb345017630f546155ea4cd19e300413':
  Removed useless script
  Added some basic sounds including ambiant and res collection; Fixed level retry not working
2023-10-29 21:20:16 +00:00
b8d4907efb Removed useless script 2023-10-29 17:06:46 -04:00
570b3948d4 Added some basic sounds including ambiant and res collection; Fixed level retry not working 2023-10-29 16:54:13 -04:00