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

XEEN fixes and further Russian translation #3287

Merged
merged 1 commit into from Sep 5, 2021

Conversation

@Ardash
Copy link
Contributor

@Ardash Ardash commented Aug 18, 2021

XEEN:
Click on 'Auto Notes' shows 'Items' button animation - Fixed
'Up'/'Down' pressed buttons in create_char dialog shows wrong icon - Fixed

XEEN: RU
Items button not working because it uses 'd' alias, same as down button ('d', 'down', kp2) - Fixed
Fixed PARTY_DIALOG_TEXT margins
Translated map title area names
Translated moster names
Translated spell names

@dreammaster
Copy link
Member

@dreammaster dreammaster commented Aug 21, 2021

Looks mostly fine overall, apart from some housekeeping I'd like to request

  1. The first two listed commits don't have proper descriptions after XEEN: prefix. Even if there's further description below, a summary commit line is still advised
  2. Only have a single commit that regenerates xeen.ccs. Since it's a binary blob file I want to keep down the number of times it gets redundantly committed in. Do you intend there to be any more changes in the near future? If so, I request rebasing the commits to remove it from both. Or if you think this is going to be the final version, just rebase and remove it from whichever commit is older.

@sev-
Copy link
Member

@sev- sev- commented Sep 2, 2021

@Ardash Please hurry up, so we could put these changes into the releaae.

@Ardash Ardash force-pushed the XEEN_RU_CLOUDS branch 2 times, most recently from cb3edfb to e8cd811 Sep 2, 2021
XEEN:
Click on 'Auto Notes' shows 'Items' button animation - Fixed
'Up'/'Down' pressed buttons in create_char dialog shows wrong icon - Fixed
Fix 'Yes'/'No' (thumbs up/down) click area

XEEN: RU
'Items' button not working because it uses 'd' alias, same as down button ('d', 'down', 'kp2') - Fixed
Fixed PARTY_DIALOG_TEXT margins
Map title area names translated
Translated monster names
Translated spell names
Add spaces to mae_names
@Ardash Ardash force-pushed the XEEN_RU_CLOUDS branch from e8cd811 to 26f25e9 Sep 2, 2021
@Ardash
Copy link
Contributor Author

@Ardash Ardash commented Sep 2, 2021

@dreammaster @sev- fixed

Do you intend there to be any more changes in the near future?

Some people testing it now, but there is no more reports for RU at this moment.
There is some non-critical reports for BASE now, but I think I can fix it later.
I'm working on DARKSIDE RU now, but it is still a very long way.

@dreammaster
Copy link
Member

@dreammaster dreammaster commented Sep 5, 2021

That's fine. So the changes done so far would be fine to go in this release, and some minor changes would be included in a later patch for Darkside. If so, I return to my original point - could you rebase the pull request commits to remove the regeneration of xeen.ccs from the oldest commit. Thereafter, there should be only the one commit that has xeen.ccs in it. Also, at the same time, flesh out the commit messages. Thanks.

@dreammaster
Copy link
Member

@dreammaster dreammaster commented Sep 5, 2021

Oh, wait. I see the commits have been squashed. My bad. Let me review it further immediately..

@dreammaster dreammaster merged commit 5d37243 into scummvm:master Sep 5, 2021
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants