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

Allow Attack Move and Guard OGs to be activated while shift is held. #16908

Merged
merged 2 commits into from Aug 10, 2019

Conversation

@pchote
Copy link
Member

commented Aug 8, 2019

This PR generalizes the fix from #15596 to also work for Attack Move and Guard.

Fixes #16907.
Fixes #16381.

In the future (it is well out of scope for this PR) we should consider expanding the hotkey system and UI to prevent players from rebinding these commands against Shift, which would prevent them from ever working.

@pchote pchote added this to the Next Release milestone Aug 8, 2019

@pchote pchote force-pushed the pchote:fix-queued-amove branch from ee1b9b6 to eaf982c Aug 8, 2019

@matjaeck
Copy link
Contributor

left a comment

This works well and is definitely an improvement. 👍

For people who use the hotkey instead of the command bar it would be nice to allow deactivating the order generator with the hotkey without losing the selection, as described in #16381 (comment).

It would be much more practical if it would either act like a true switch...

By switch I mean: Press 'a' and the cursor will stay in attack-move mode until you press 'a' again (or another order generator hotkey). This is similar to how the sell/repair/power order generators already work.

Since this closes the issue, I'm wondering whether I should open a new issue specifically for this request.

Edit: I think, after this PR, #13390 is fixed.

@pchote pchote force-pushed the pchote:fix-queued-amove branch from eaf982c to 4801a7a Aug 9, 2019

@pchote

This comment has been minimized.

Copy link
Member Author

commented Aug 9, 2019

Added a commit to fix left clicking while a-move was active clearing the selection instead of just cancelling the OG (like C&C3).

This was supposed to work, and did for Guard, but was regressed for a-move by #14010.

@matjaeck
Copy link
Contributor

left a comment

Can someone confirm that the last change regressed activating attack-move while shift is held? It still works for guard, but not for attack-move on my end (even when I reset the head back to the first commit). Deactivating with left mouse click is even better than with the hotkey, so I'm hoping this is a trivial error on my end or a bug that can be fixed.

@pchote pchote force-pushed the pchote:fix-queued-amove branch from 4801a7a to 898f4f9 Aug 9, 2019

@pchote

This comment has been minimized.

Copy link
Member Author

commented Aug 9, 2019

Fixed.

@matjaeck
Copy link
Contributor

left a comment

Works.

@pchote pchote force-pushed the pchote:fix-queued-amove branch from 898f4f9 to ee36fc4 Aug 10, 2019

@pchote

This comment has been minimized.

Copy link
Member Author

commented Aug 10, 2019

Fixed and rebased.

@pchote pchote force-pushed the pchote:fix-queued-amove branch from ee36fc4 to 5cdbb4e Aug 10, 2019

@abcdefg30 abcdefg30 merged commit 292196e into OpenRA:bleed Aug 10, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@abcdefg30

This comment has been minimized.

Copy link
Member

commented Aug 10, 2019

@pchote pchote deleted the pchote:fix-queued-amove branch Aug 26, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.