-
Notifications
You must be signed in to change notification settings - Fork 92
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
Feat/hotkeys rebase #318
base: develop
Are you sure you want to change the base?
Feat/hotkeys rebase #318
Conversation
Otherwise the gui takes a bit to update
Move back the camera hotkeys to a and d, this means that the equivalent command hotkeys won't be usable in free camera mode
It wasn't updated correctly for units with morphing abilities
Otherwise some units in the game don't have enough hotkeys like the ballista. Moves the hotkey for attacking units to , Moves the hotkey for font cOlor to O
since we removed this hotkeys, we don't need this code any more
code blocking switching from attack to anothe command
This reverts commit afc2619.
Fixes for non-target commands
…koutv3 (MegaGlest#250) * workflows/cmake.yml:test on Ubuntu Jammy (22.04);migrate to checkoutv3 This should also fix MegaGlest#247 * maybe fix ssh link error on Ubuntu Jammy gcc and clang build is failing on Jammy with the message: 'cannot find -lssh: No such file or directory' Basically I added libcurl-openssl-dev to the deps * remove libcurl4-gnutls-dev Trying to correct: The following packages have unmet dependencies: libcurl4-gnutls-dev : Conflicts: libcurl4-openssl-dev but 7.81.0-1ubuntu1.3 is to be installed libcurl4-openssl-dev : Conflicts: libcurl4-gnutls-dev but 7.81.0-1ubuntu1.3 is to be installed E: Unable to correct problems, you have held broken packages. An error occurred while installing build dependencies. * use cmake FindCURL module * for OpenSSL, use include instead of find_package * remove jammy, add gcc-10 and 11 test * revert now-unrelated changes * clean-up * add VERBOSE flag to make * Update .github/workflows/cmake.yml * Update .github/workflows/cmake.yml * use '-f' option from build script to force clang * force dynamic libs with '-d' fixes MegaGlest#251 * mk/linux/setupBuildDeps.sh:fix script so 22.04 is detected *remove vlc deps (not required for the CI) *remove ubuntu-18.04 from the build matrix, see https://github.blog/changelog/2022-08-09-github-actions-the-ubuntu-18-04-actions-runner-image-is-being-deprecated-and-will-be-removed-by-12-1-22/ * revert removal of commented macos jobs * run apt-get update and upgrade * cleanup Prep snapshot section
shows attack as empty position
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.
@pavanvo Thank you. It's still showing merge conflicts at the bottom, so it seems the rebase is not complete.
But really, I don't think there's a need for you to spend any time on this right now. As far as I know, I'm saddened to say, it won't be approved by the project leads, to be quite honest with you.
If that changes, me or someone else will definitely let you know. I would definitely like to see hotkeys added, and I know a lot of people would as well.
I will fix merge conflict later |
No description provided.