Merged
Conversation
* feat: ci checks * fix: cspell version number * fix: cspell config path * fix: grammar * chore: fix linting warning * fix: linting
snorreks
added a commit
that referenced
this pull request
Jan 16, 2025
* Inventory-system * fix: inventory example * fix: inventory example * Merge branch 'master' of github.com:bearlysleeping/aikami into inventory-system * feat: inventory save and load * fix: inventory example * Merge branch 'inventory-system' of github.com:BearlySleeping/aikami into inventory-system * chore: fix linting warnings * feat: added equipped slots * fix: merge inventory * fix: merge inventory * feat: user inventory * chore: import logic from aarpg-tutorial * chore: update enemy logic * fix: scene manager refactor * chore: remove extra assets * chore: remove outdated addons * chore: refactor dialog ui * fix: npc refactor * fix: quest manager * feat: pause menu * feat: new npc portraits * chore: update bun dependencies * fix: user inventory equipment * chore: Spelling corrections (#2) * fix tts spelling mistake * spellcheck update * all speech fixed * Turn Based Combat (#6) * feat: turn-based-combat setup * Added github lint checks (#5) * feat: ci checks * fix: cspell version number * fix: cspell config path * fix: grammar * chore: fix linting warning * fix: linting * fix: formatting errors * fix: discord notifications * fix: update poetry * chore: cleanup unit script * chore: fix discord notifications --------- Co-authored-by: Adrian S.A. <44787687+maplesyrup18@users.noreply.github.com>
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
1 participant
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.
A basic turn based combat. To test run:
game\core\turn-based\battle_scene.tscn