-
Notifications
You must be signed in to change notification settings - Fork 11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rebase & Squash the English Rework #18
Open
eXpl0it3r
wants to merge
11
commits into
master
Choose a base branch
from
feature/refactor_english_renewed
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains 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
dfde5fb
to
c33a166
Compare
- Use astyle formatting - Fix buggy calculations - Refactor renderer to use SFML
- Use windowed fullscreen by default - Update appveyor config - Change the load ordering to make sure there isn't some static internal state in SFML - Load images as PNG
- Fix miscellaneous stuff - Fix ambigious sprite enum references once and for all - Use more descriptive and less direct translation variable name - Use a bit better API for the renderer - Replace C-style char array with std::string for safety
Language has to be configured at compile time.
Happened with text messages on paper.
Overflow happened with special character codes that were replaced with number of days, change in health, and probability of rescue.
c33a166
to
4c3203a
Compare
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.
This PR essentially supersedes #12 and #11
Additionally, it includes three commits from @akrinke's clone https://github.com/akrinke/Schiffbruch
The commits from #11 were mostly squashed as on their own it made it near impossible to properly rebase the work.
Additionally, I've included the reworked CMake and GitHub Actions changes from master.
Done in this PR:
Things that might still closer investigation: