WIP: Defend Component - #7
Open
zalsaigh wants to merge 9 commits into
Open
Conversation
LeMichael88
approved these changes
Nov 16, 2024
LeMichael88
left a comment
LeMichael88
left a comment
Collaborator
There was a problem hiding this comment.
I think this makes sense to me, the core component values are here. Attack and defend components are not being used yet so it will probably be more clear how/where these functions are used once they are hooked up to stuff.
commit 33a5f1f Merge: 1429f9d 255c0ef Author: zalsaigh <60819371+zalsaigh@users.noreply.github.com> Date: Mon Nov 18 01:48:12 2024 -0500 Merge pull request #5 from zalsaigh/feature/attack-component Attack component commit 255c0ef Merge: 0808ec7 1429f9d Author: zalsaigh <60819371+zalsaigh@users.noreply.github.com> Date: Mon Nov 18 01:48:02 2024 -0500 Merge branch 'main' into feature/attack-component commit 0808ec7 Author: Zaid Alsaigh <zalsaigh@uwaterloo.ca> Date: Mon Nov 18 01:45:28 2024 -0500 Update attack_rsc.gd commit 58972d9 Author: Zaid Alsaigh <zalsaigh@uwaterloo.ca> Date: Mon Nov 18 01:44:15 2024 -0500 Update variable names back commit 581b0a3 Author: Zaid Alsaigh <zalsaigh@uwaterloo.ca> Date: Mon Nov 18 01:32:02 2024 -0500 Update constructor and class variables of attack_rsc.gd commit 3803fee Author: Zaid Alsaigh <zalsaigh@uwaterloo.ca> Date: Sun Nov 17 19:38:40 2024 -0500 Squashed commit of the following: commit 1429f9d Merge: d233d4d d7de065 Author: zalsaigh <60819371+zalsaigh@users.noreply.github.com> Date: Sun Nov 17 13:36:04 2024 -0500 Merge pull request #8 from zalsaigh/start-combat Start combat + Combat Manager as Autoload (singleton) commit d233d4d Author: Michael Le <43327291+LeMichael88@users.noreply.github.com> Date: Sat Nov 16 13:44:59 2024 -0500 Implement Spell Component (#2) * Files that godot automatically generated or edited * Implement spell component, spell class, and sample spells * Update combat gui to test spells component PoC * Address comments commit d7de065 Author: Ada Vu <vu.hanh.ada@gmail.com> Date: Thu Nov 14 14:09:08 2024 -0800 Combat Manager as Autoload (singleton) added groups(or tags) to enemies as "enemy" get all enemies in a scene using group switch from overworld to combat scene commit 1429f9d Merge: d233d4d d7de065 Author: zalsaigh <60819371+zalsaigh@users.noreply.github.com> Date: Sun Nov 17 13:36:04 2024 -0500 Merge pull request #8 from zalsaigh/start-combat Start combat + Combat Manager as Autoload (singleton) commit d233d4d Author: Michael Le <43327291+LeMichael88@users.noreply.github.com> Date: Sat Nov 16 13:44:59 2024 -0500 Implement Spell Component (#2) * Files that godot automatically generated or edited * Implement spell component, spell class, and sample spells * Update combat gui to test spells component PoC * Address comments commit d7de065 Author: Ada Vu <vu.hanh.ada@gmail.com> Date: Thu Nov 14 14:09:08 2024 -0800 Combat Manager as Autoload (singleton) added groups(or tags) to enemies as "enemy" get all enemies in a scene using group switch from overworld to combat scene commit 2e5121a Merge: 38f411e ed1b4b7 Author: Zaid Alsaigh <zalsaigh@uwaterloo.ca> Date: Wed Oct 16 22:14:11 2024 -0400 Merge branch 'main' into feature/attack-component
Owner
Author
|
This is not being merged because we're holding off on a Defend option in general |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.