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

Dragging - Add possiblity to rotate a carried object #7640

Merged
merged 3 commits into from
Apr 20, 2020
Merged

Conversation

bux
Copy link
Member

@bux bux commented Apr 16, 2020

When merged this pull request will:

  • title
  • use CBA_fnc_addDisplayHandler
  • fix wrong number of param in showMouseHint comment

@bux bux added the kind/enhancement Release Notes: **IMPROVED:** label Apr 16, 2020
@bux bux added this to the 3.13.2 milestone Apr 16, 2020
@bux
Copy link
Member Author

bux commented Apr 16, 2020

Example: https://streamable.com/qfaxkv

<Chinesesimp>提高/下降</Chinesesimp>
<Turkish>Yukarı/Aşağı</Turkish>
<Key ID="STR_ACE_Dragging_RaiseLowerRotate">
<English>Raise/Lower | (Ctrl + Scroll) Rotate</English>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<English>Raise/Lower | (Ctrl + Scroll) Rotate</English>
<English>Raise/Lower | (Ctrl + Scroll Wheel) Rotate</English>

<Turkish>Yukarı/Aşağı</Turkish>
<Key ID="STR_ACE_Dragging_RaiseLowerRotate">
<English>Raise/Lower | (Ctrl + Scroll) Rotate</English>
<German>Heben/Senken | (Strg + Scrollen) Drehen</German>
Copy link
Contributor

@commy2 commy2 Apr 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<German>Heben/Senken | (Strg + Scrollen) Drehen</German>
<German>Heben/Senken | (Strg + Scrollrad) Drehen</German>

Scroll is not a key. Scroll Lock is.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then change it there as well.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. Can be done in a separate PR.

Copy link
Member

@jonpas jonpas Apr 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, do not change. Scroll is scroll wheel rolling, there is also a Middle Mouse Button as key which is also used in Advanced Throwing and using "Scroll Wheel" could mean either of the two.

@PabstMirror PabstMirror modified the milestones: 3.13.2, 3.13.3 Apr 19, 2020
@PabstMirror
Copy link
Contributor

Would this be any better, it matches what we use on acex_fortify:
20200420102607_1

@bux
Copy link
Member Author

bux commented Apr 20, 2020

I used the same as in adv. throwing. Might be for a future improvement where we change this to use a small key cap icon Ctrl

Copy link
Contributor

@PabstMirror PabstMirror left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tested working in mp

@@ -63,7 +63,7 @@ _unit setVariable [QGVAR(ReleaseActionID), [
if (_target isKindOf "CAManBase") then {
[localize LSTRING(Drop), "", ""] call EFUNC(interaction,showMouseHint);
} else {
[localize LSTRING(Drop), "", localize LSTRING(LowerRaise)] call EFUNC(interaction,showMouseHint);
[localize LSTRING(Drop), "", localize LSTRING(RaiseLowerRotate)] call EFUNC(interaction,showMouseHint);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[localize LSTRING(Drop), "", localize LSTRING(RaiseLowerRotate)] call EFUNC(interaction,showMouseHint);
[localize LSTRING(Drop), "", LLSTRING(LowerRaise), [["control", LLSTRING(rotate)]]] call EFUNC(interaction,showMouseHint);

The advantage of doing this now is we don't have to drop our existing translations

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's hideous, though

@bux bux merged commit 3b15014 into master Apr 20, 2020
@bux bux deleted the scroll-rotate branch April 20, 2020 15:46
@PabstMirror PabstMirror modified the milestones: 3.13.3, 3.13.2 Apr 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants