Commit Graph

5886 Commits

Author SHA1 Message Date
pavanvo edc9de3d15
Merge branch 'feat/command-priority' into play 2022-09-06 17:54:44 +04:00
pavanvo e7cf0a01de
fix: switch nextUnitTypeId from unitTypeId 2022-09-06 17:46:45 +04:00
pavanvo a1a93ae3d8
fix: add param nextUnitTypeId
to NetworkCommand class to prevent collision morph with build
2022-09-06 17:43:54 +04:00
pavanvo 8d141ca57f
fix: add check 2022-09-06 03:08:28 +04:00
pavanvo 8bc5abbfd3
fix: auto command for morph queue 2022-09-06 02:21:35 +04:00
pavanvo 60d8bf7fd2
feat: custom UnitType,
for unit->computeCommandType
2022-09-06 02:21:35 +04:00
pavanvo 3e58c7d03d
fix: Morph Queue 2022-09-06 02:21:35 +04:00
pavanvo d2fbc3f857
fix: add check,
if(unitType != NULL && ct->getClass() == ccBuild)
2022-09-06 02:21:34 +04:00
pavanvo 22a2abd3f4
fix: non-targed commands 2022-09-06 02:21:32 +04:00
pavanvo c9c1adf8d0
refactor: correct tabs 2022-09-06 02:18:18 +04:00
pavanvo 35f755841d
feat: gui hotkey released 2022-09-06 02:18:17 +04:00
pavanvo d2d691024e
fix: non-targed commands + TODO 2022-09-06 02:18:10 +04:00
pavanvo 37b6fbb12e
fix: checkCommand + TODO 2022-09-06 02:11:27 +04:00
pavanvo 0b1dcc70f5
feat: allow queue after Morph commands 2022-09-06 02:11:27 +04:00
Banestorm 35ff02052c
Remove command priority system
This was resulting in non-intuitive and surprising behaviour when queuing
commands. Removing this system results in Megaglest behaving more like
other RTS games.

For instance, the following are now possible and weren't previously:
- Queuing multiple attack ground commands to move along a specific path
attacking all enemies on the way.
- Queuing attack ground followed by hold position, which is a sensible
  thing to do if you want a unit to guard a specific area.
- Queuing a move command followed by a produce command, if you want to
  have your summoner summon a daemon at a specific location.

The behaviour of queuing the stop command is unchanged, and commands that
must be the last in the queue, such as morphing, are still properly replaced when something
else is queued.
2022-09-06 02:11:05 +04:00
pavanvo d3c19ce9a5
fix: non-uniform selection
shows attack as empty position
2022-09-02 11:04:31 +04:00
pavanvo 1c1dd0a393
refactor: empty positions 2022-08-30 14:25:06 +04:00
pavanvo a0c8383be0
refactor: remove some useles code 2022-08-28 19:21:44 +04:00
pavanvo 78a3eb1abb
fix: if every basic command more than one time 2022-08-28 19:06:29 +04:00
pavanvo 339ff320cb
fix: check if unit have too match commands 2022-08-28 16:21:45 +04:00
Rampoina 085edd203a Add missing check for the selected button 2022-08-25 19:47:03 +02:00
Rampoina 02478ea3bc Load the game on double click on the loading menu 2022-08-25 19:47:03 +02:00
Rampoina b9ac40d3d9 Fix unit/building progress not getting restored when loading a game 2022-08-25 19:47:03 +02:00
Andy Alt c4c426ed74 workflows/cmake.yml:add tests for recent gcc versions;migrate to checkoutv3 (#250)
* workflows/cmake.yml:test on Ubuntu Jammy (22.04);migrate to checkoutv3

This should also fix #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 #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
2022-08-25 19:47:03 +02:00
Andy Alt 5b443a4c08 .github/workflows/cmake.yml:cancel in progress jobs if newer job is started (#248) 2022-08-25 19:47:03 +02:00
titiger 08cf0c49fb
Merge pull request #243 from Rampoina/loadMenuDoubleClick
Load the game on double click on the loading menu.
2022-08-24 23:09:03 +02:00
titiger e10a60ea6f
Merge pull request #244 from Rampoina/saveProgress
Fix unit/building progress not getting restored when loading a game
2022-08-23 01:23:23 +02:00
Rampoina 332780950b Fix unit/building progress not getting restored when loading a game 2022-08-23 00:07:20 +01:00
Andy Alt 77d696138a
workflows/cmake.yml:add tests for recent gcc versions;migrate to checkoutv3 (#250)
* workflows/cmake.yml:test on Ubuntu Jammy (22.04);migrate to checkoutv3

This should also fix #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 #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
2022-08-20 23:29:38 +01:00
Rampoina ebb0a5c731
Merge pull request #4 from pavanvo/feat/hotkeys_rebase
Fixes for non-target commands
2022-08-18 16:48:58 +00:00
pavanvo d5f15d2c72 Revert "refactor: remove some useless code,"
This reverts commit afc26199f7.
2022-08-18 05:57:20 +04:00
pavanvo 8caa800ee1
fix: reset command position for non-target commands 2022-08-16 22:00:31 +04:00
pavanvo aec7bf5c80
fix: reset command position for build commands 2022-08-16 21:59:41 +04:00
pavanvo ea3ede3c08
refactor: remove incompatible code,
code blocking switching from attack to anothe command
2022-08-16 21:58:18 +04:00
pavanvo afc26199f7
refactor: remove some useless code,
since we removed this hotkeys, we don't need this code any more
2022-08-16 21:56:36 +04:00
Rampoina 00fc8bcee3 Add missing check for the selected button 2022-08-15 01:44:37 +02:00
Andy Alt e63d8142dc
.github/workflows/cmake.yml:cancel in progress jobs if newer job is started (#248) 2022-08-14 22:41:35 +01:00
Rampoina a5438f6a93 Use the cancel icon for the unused grid locations 2022-08-14 13:38:16 +02:00
Jammyjamjamman e277c47583 Add key mappings to docs 2022-08-14 13:38:16 +02:00
pavanvo 5523bba192 refactor: command sorting code 2022-08-14 13:38:16 +02:00
pavanvo f2b8d76383 fix: if two build buttons, move second to basics 2022-08-14 13:38:16 +02:00
pavanvo f1e4a1bf83 feat: standart for cammand grid 2022-08-14 13:38:15 +02:00
Rampoina 46d5904578 Bump Command Keys to 12
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
2022-08-14 12:26:38 +02:00
Rampoina e209dcbd35 Fix numberCommands
It wasn't updated correctly for units with morphing abilities
2022-08-14 12:26:38 +02:00
Rampoina 7945fa8c80 Remove key conflics
Move back the camera hotkeys to a and d, this means that the equivalent command
hotkeys won't be usable in free camera mode
2022-08-14 12:26:38 +02:00
Rampoina c4caa6b912 Display hotkey on hover 2022-08-14 12:26:38 +02:00
Rampoina c549a6b66c Correctly update numberCommands 2022-08-14 12:26:38 +02:00
Rampoina 9276faeeb5 Update the GUI immediately after calling the command from a hotkey
Otherwise the gui takes a bit to update
2022-08-14 12:26:38 +02:00
Rampoina 3313f187bb Rename HotKeyBuildN to CommandKeyN 2022-08-14 12:26:38 +02:00
Rampoina 1922522009 Rename commonCommands to numberCommands 2022-08-14 12:26:38 +02:00