Skip to content
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
wants to merge 11 commits into
base: master
Choose a base branch
from

Conversation

eXpl0it3r
Copy link
Owner

@eXpl0it3r eXpl0it3r commented Oct 20, 2022

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:

  • Rebase onto master
  • Fix CMake build
  • Remove Appveyor
  • Generate *.cpp and *.hpp files with resgen, so we don't need C support

Things that might still closer investigation:

  • The rescue percentage text sticks out of the banner and never vanishes from the screen
  • Get the Linux build building (again)
  • Cursor is rendered behind the "Ja" / "Nein" buttons
  • Somehow never get a branch while play testing
  • Did it always switch between night and day view when showing the text banner?
  • Do we already want to change how the credits look?
  • Review the non-refactoring changes in this PR
  • when starting a new game, I still have the material from the previous game. Work around: quit the game, delete save.date (in the current working directory), start the game
  • there is no mark on the map
  • disabling water animation hides fields
  • start animation often does not play properly on game start. Moving the mouse shows it. It does more likely when starting a new game.
  • when landing with the boat in an edge of the corner, the boat sometimes lands on the wrong edge and a tree is removed or even the river delta (beach with river)
  • man walked once out over the water, before leaving the game (by ESC or btn)
  • Reapply wanted formatting

@eXpl0it3r eXpl0it3r mentioned this pull request Oct 20, 2022
6 tasks
@eXpl0it3r eXpl0it3r force-pushed the feature/refactor_english_renewed branch 6 times, most recently from dfde5fb to c33a166 Compare October 25, 2022 07:26
sandsmark and others added 10 commits October 25, 2022 09:36
- 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.
@eXpl0it3r eXpl0it3r force-pushed the feature/refactor_english_renewed branch from c33a166 to 4c3203a Compare October 25, 2022 11:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants