-
Notifications
You must be signed in to change notification settings - Fork 95
Add Hotkeys for the unit and building commands #216
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
base: develop
Are you sure you want to change the base?
Conversation
@Jammyjamjamman The controls are listed here in the README: https://raw.githubusercontent.com/MegaGlest/megaglest-source/master/docs/README.txt Is that generated from a script? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good so far 👍 . @andy5995 and I gave it a test. I've listed changes that I think are required, based on our testing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This commit adds the hotkey text on hover. It's going to need translations for the text "Hotkey".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. I don't have the final say on merging this but the changes look good to me.
Yo @Rampoina , Good work!!! but wait up, tech engineer can't build Balista with hotkey. We need add at least 11 command. |
@pavanvo thanks for testing! |
@Rampoina you forget to commit gui.h |
@pavanvo It's not only an increment, now it uses |
Seems like this hasn't been done yet. @Jammyjamjamman imo this should be done before this gets merged. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently there are conflicts (as shown at the bottom).
449b944
to
a5438f6
Compare
There's some mods that crash the game with this patch:
There might be more that don't work. I'm not sure what causes the crash. In e.g. prax the crash happens when loading "hexer". |
i am tested on linux and windows - everything works fine, I think problem in build |
I added a patch for these changes in #317 (There are some merge conflicts in this PR, so I fixed them locally first and then generated a patch using |
Hi @andy5995 here most updated hotkeys branch |
@Rampoina @pavanvo I reverted the commits that had already been merged into develop, which brought the "files changed" down from 31 to 10. I accidentally added the data submodule but that's a minor point. I formatted the files so rebasing, if anyone ever does it, shouldn't be too difficult. I tried doing it but it was too convoluted due to the way the commits were done on this PR, so I'm sure I would have got something wrong if I had continued. |
73dcb54
to
88641f2
Compare
Any merge conflicts remaining now are not due to the code reformatting that's been merged into develop recently. But quite unexplainedly, the diff for this PR shown on the Files tab is different than actual. For example, when I compare gui.cpp locally, I get the expected result (some differences are due to the unit portait PR that was merged last month):
|
Author: Rampoina <[email protected]> Author: pavanvo <[email protected]>
This is a proposal to add hotkeys for every command.
This adds 10 configurable keys that map to the commands as displayed in the GUI.
It's meant to be used in a grid layout such as QWER ASDF ZXCV to make the locations more intuitive. (although it doesn't have to, users can set each hotkey wherever they want to)
Fixes #212