Add Hotkeys for the unit and building commands #216

Rampoina · 2022-07-18T17:30:14Z

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

andy5995 · 2022-07-18T17:38:01Z

@titiger would you like to test this with me and @Rampoina soon? Is this something you'd consider merging?

andy5995 · 2022-07-19T23:10:10Z

@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?

Jammyjamjamman

Looks good so far 👍 . @andy5995 and I gave it a test. I've listed changes that I think are required, based on our testing.

mk/shared/glestkeys.ini

source/glest_game/gui/gui.cpp

Rampoina

This commit adds the hotkey text on hover. It's going to need translations for the text "Hotkey".

source/glest_game/gui/gui.cpp

Jammyjamjamman

Looks good. I don't have the final say on merging this but the changes look good to me.

pavanvo · 2022-08-02T03:01:30Z

Yo @Rampoina , Good work!!! but wait up, tech engineer can't build Balista with hotkey. We need add at least 11 command.
And Summoner can't update to dragon, cuz we checking by numberCommands
at source/glest_game/gui/gui.cpp
line 460
if (i < numberCommands) {
mouseDownDisplayUnitSkills(i);
computeDisplay();
}
but some units like above have 3 commands in second line!

Rampoina · 2022-08-02T07:47:12Z

@pavanvo thanks for testing!
I've bumped the number of hotkeys to 12 (the full grid) and fixed the issue with the morphing units (numberCommands wasn't updated correctly again ... I don't know if I'm missing something here, it seems like a variable that should exist, but I wasn't able to find it)

pavanvo · 2022-08-02T08:25:35Z

@Rampoina you forget to commit gui.h
Now, with simple increment, it's working fine, but I'm trying to create another kind of check.

Rampoina · 2022-08-02T08:50:43Z

@pavanvo It's not only an increment, now it uses posDisplay which is updated inside the previous for, including the case for morphing units.
(I force pushed the missing gui.h in the same commit)

andy5995 · 2022-08-08T19:34:39Z

@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?

Seems like this hasn't been done yet. @Jammyjamjamman imo this should be done before this gets merged.

andy5995

Currently there are conflicts (as shown at the bottom).

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

…tarted (MegaGlest#248)

…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

Jammyjamjamman · 2022-08-27T23:57:50Z

There's some mods that crash the game with this patch:

prax 0.5.9.7 (find in mod center)
https://github.com/Robotkiller001/Megaglest-Improved-Mod
https://github.com/Robotkiller001/Insects-World-Mod

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".

pavanvo · 2022-08-28T10:46:04Z

There's some mods that crash the game with this patch:
* prax 0.5.9.7 (find in mod center)

* https://github.com/Robotkiller001/Megaglest-Improved-Mod

* https://github.com/Robotkiller001/Insects-World-Mod
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 found problem with "haxer"

fixes for mods with many commands + refactoring

shows attack as empty position

fix: non-uniform selection showing attack as an empty position

Jammyjamjamman self-requested a review July 19, 2022 21:55

Rampoina force-pushed the hotkeys branch from 537f218 to ac0db40 Compare July 20, 2022 05:46

Jammyjamjamman requested changes Jul 20, 2022

View reviewed changes

mk/shared/glestkeys.ini Outdated Show resolved Hide resolved

mk/shared/glestkeys.ini Show resolved Hide resolved

source/glest_game/gui/gui.cpp Show resolved Hide resolved

source/glest_game/gui/gui.cpp Show resolved Hide resolved

source/glest_game/gui/gui.cpp Outdated Show resolved Hide resolved

Rampoina commented Jul 21, 2022

View reviewed changes

source/glest_game/gui/gui.cpp Show resolved Hide resolved

Jammyjamjamman self-requested a review July 28, 2022 17:37

Jammyjamjamman reviewed Jul 28, 2022

View reviewed changes

Jammyjamjamman approved these changes Jul 28, 2022

View reviewed changes

Rampoina force-pushed the hotkeys branch from dcef01f to ab7438e Compare August 2, 2022 08:36

Rampoina force-pushed the hotkeys branch from 10eae55 to b7fa811 Compare August 11, 2022 18:00

andy5995 suggested changes Aug 13, 2022

View reviewed changes

Rampoina force-pushed the hotkeys branch from ef14062 to 7fcbe7a Compare August 14, 2022 09:33

Rampoina added 11 commits August 14, 2022 12:26

add hotkeybuild1

ff9c9ad

Add building and unit hotkeys

e9b7712

Check the number of shared commands before trying to click from a hotkey

5783db3

Add command grid hotkeys to the default hotkeys

f322a3e

Retabulate (use only tabs)

2cd190d

Update commonCommands for a uniform selection

c3e8a25

Rename commonCommands to numberCommands

1922522

Rename HotKeyBuildN to CommandKeyN

3313f18

Update the GUI immediately after calling the command from a hotkey

9276fae

Otherwise the gui takes a bit to update

Correctly update numberCommands

c549a6b

Display hotkey on hover

c4caa6b

Rampoina added 3 commits August 14, 2022 12:26

Remove key conflics

7945fa8

Move back the camera hotkeys to a and d, this means that the equivalent command hotkeys won't be usable in free camera mode

Fix numberCommands

e209dcb

It wasn't updated correctly for units with morphing abilities

Bump Command Keys to 12

46d5904

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

Rampoina force-pushed the hotkeys branch from 7fcbe7a to 449b944 Compare August 14, 2022 10:27

pavanvo and others added 5 commits August 14, 2022 13:38

feat: standart for cammand grid

f1e4a1b

fix: if two build buttons, move second to basics

f2b8d76

refactor: command sorting code

5523bba

Add key mappings to docs

e277c47

Use the cancel icon for the unused grid locations

a5438f6

Rampoina force-pushed the hotkeys branch from 449b944 to a5438f6 Compare August 14, 2022 11:42

pavanvo and others added 11 commits August 16, 2022 21:56

refactor: remove some useless code,

afc2619

since we removed this hotkeys, we don't need this code any more

refactor: remove incompatible code,

ea3ede3

code blocking switching from attack to anothe command

fix: reset command position for build commands

aec7bf5

fix: reset command position for non-target commands

8caa800

Revert "refactor: remove some useless code,"

d5f15d2

This reverts commit afc2619.

Merge pull request #4 from pavanvo/feat/hotkeys_rebase

ebb0a5c

Fixes for non-target commands

.github/workflows/cmake.yml:cancel in progress jobs if newer job is s…

5b443a4

…tarted (MegaGlest#248)

Fix unit/building progress not getting restored when loading a game

b9ac40d

Load the game on double click on the loading menu

02478ea

Add missing check for the selected button

085edd2

pavanvo and others added 7 commits August 28, 2022 16:21

fix: check if unit have too match commands

339ff32

fix: if every basic command more than one time

78a3eb1

refactor: remove some useles code

a0c8383

refactor: empty positions

1c1dd0a

Merge pull request #5 from pavanvo/feat/hotkeys_rebase

926da20

fixes for mods with many commands + refactoring

fix: non-uniform selection

d3c19ce

shows attack as empty position

Merge pull request #6 from pavanvo/feat/hotkeys_rebase

267fb82

fix: non-uniform selection showing attack as an empty position

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Hotkeys for the unit and building commands #216

Add Hotkeys for the unit and building commands #216

Rampoina commented Jul 18, 2022 •

edited

andy5995 commented Jul 18, 2022

andy5995 commented Jul 19, 2022

Jammyjamjamman left a comment

Rampoina left a comment

Jammyjamjamman left a comment

pavanvo commented Aug 2, 2022 •

edited

Rampoina commented Aug 2, 2022

pavanvo commented Aug 2, 2022

Rampoina commented Aug 2, 2022

andy5995 commented Aug 8, 2022

andy5995 left a comment

Jammyjamjamman commented Aug 27, 2022

pavanvo commented Aug 28, 2022 •

edited

Add Hotkeys for the unit and building commands #216

Are you sure you want to change the base?

Add Hotkeys for the unit and building commands #216

Conversation

Rampoina commented Jul 18, 2022 • edited

andy5995 commented Jul 18, 2022

andy5995 commented Jul 19, 2022

Jammyjamjamman left a comment

Choose a reason for hiding this comment

Rampoina left a comment

Choose a reason for hiding this comment

Jammyjamjamman left a comment

Choose a reason for hiding this comment

pavanvo commented Aug 2, 2022 • edited

Rampoina commented Aug 2, 2022

pavanvo commented Aug 2, 2022

Rampoina commented Aug 2, 2022

andy5995 commented Aug 8, 2022

andy5995 left a comment

Choose a reason for hiding this comment

Jammyjamjamman commented Aug 27, 2022

pavanvo commented Aug 28, 2022 • edited

Rampoina commented Jul 18, 2022 •

edited

pavanvo commented Aug 2, 2022 •

edited

pavanvo commented Aug 28, 2022 •

edited