Sync develop w/ main#53
Closed
dmccoystephenson wants to merge 45 commits into
Closed
Conversation
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
…umes 10 per hour, sleep restores full energy Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
…44c1-4436-af95-28a92b47c66b Implement Energy System - Player energy depletes when fishing and restores when sleeping
…20a9-4a51-9e54-ce58430cdf33 Fix recursive gambling issue causing multiple "Go Back" selections - resolves #22
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
…d705-44d8-9b09-eff13cb14b98 Fix player being informed they won $0 when winning dice rolls at the Tavern
…143c-46e3-9d11-04ae22aa78a7 Allow decimal values for bank deposits and withdrawals
…a9f6-4aa1-ae17-c4129e6f261c Create Config class to hold configuration options
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
…ests Expand unit test coverage and add CI workflow for automated testing
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
…ace, improve tests Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
…ckgrounds Add named NPCs with backstories and dialogue system
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
…interactive Add interactive timing minigame to fishing activity
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
… coverage Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
…ue-options Add interactive dialogue system for NPC tutorials
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
…dd migration Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
…save-files-support Add multiple save file support with save slot management
Member
Author
|
@copilot resolve the merge conflicts in this pull request |
Contributor
|
@dmccoystephenson I can’t apply these changes because the pull request’s branch is the repository’s default branch, which I’m not allowed to push to directly. You can ask me to create a new pull request with the requested changes instead and I'll open a separate PR on a new branch. |
Member
Author
|
@copilot Create a new pull request that merges 'main' into 'develop' and resolves all merge conflicts. The target branch should be 'develop'. |
Contributor
|
@dmccoystephenson I've opened a new pull request, #54, to work on those changes. Once the pull request is ready, I'll request review from you. |
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
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.