Commit Graph

5915 Commits

Author SHA1 Message Date
Jammyjamjamman 1e8ff3642c Cmake: Add build configuration for VS builds
* Build vs 2019 project using cmake.
* Cmake configured to work in windows. Hopefully still works in linux
too!
* Update vcpkg install script.
* Configures build for MG game release or debug mode.
* Still need to fix building mapeditor and g3d viewer.
* Remove CurlGetConfig.cmake (not needed!)
2022-08-24 23:26:24 +01:00
Jammyjamjamman dd7139ee10 Add script to install build deps using vcpkg. 2022-08-24 23:26:24 +01: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
pavanvo a8a51d4ef7
style: tabs insted of spaces 2022-08-14 16:37:07 +04: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
Rampoina c3e8a25e9e Update commonCommands for a uniform selection 2022-08-14 12:26:38 +02:00
Rampoina 2cd190d822 Retabulate (use only tabs) 2022-08-14 12:26:38 +02:00
Rampoina f322a3ee52 Add command grid hotkeys to the default hotkeys 2022-08-14 12:26:38 +02:00
Rampoina 5783db3033 Check the number of shared commands before trying to click from a hotkey 2022-08-14 12:26:38 +02:00
Rampoina e9b771241f Add building and unit hotkeys 2022-08-14 12:26:38 +02:00
Rampoina ff9c9ad864 add hotkeybuild1 2022-08-14 12:26:38 +02:00
Rampoina 3b03b458e5 Load the game on double click on the loading menu 2022-08-09 21:14:10 +02:00
Rampoina 22a474b93b
Allow a selected group to have the attack command even if some units … (#217)
* Allow a selected group to have the attack command even if some units don't have it

* Add getUnitFromCC function

* return NULL if getFirstCtOfClass founds no unit

* Search for the unit containing the attack command in a non uniform selection

Co-authored-by: Rampoina <Rampoina@protonmail.com>
2022-08-08 23:26:47 +01:00
pavanvo d514b5510b
fix: run internet scenario or host game 2022-08-01 12:21:26 +04:00
Jammyjamjamman 94fa13cde7 Update data submodule 2022-07-30 20:20:01 +01:00
James Sherratt ebecdbb5ed
try vs 2022 2022-07-28 18:51:38 +01:00
NetSysFire 873217577a
Replace some http links with https (#211)
* Replace working http links with https

* downloads also has working https

* forum also has working https

* Fix get_started link

* fix get_started link

Co-authored-by: James Sherratt <jdsherratt3@gmail.com>
2022-07-20 22:59:09 +01:00
titiger 1e4441e099 data was changed 2022-03-02 01:05:39 +01:00
titiger 04bd8e8038 new norse faces 2022-02-16 00:03:39 +01:00
titiger e3af470288 Level up should not be effect boosts 2021-11-23 18:17:45 +01:00
Jammyjamjamman 3c0858318d Fix colours in endgame statistics.
Text colours where the colour wasn't explicitly set was rendering as the
previous (incorrect) colour instead of white. Now text colour is
explicitly set.
2021-11-09 21:48:38 +00:00
titiger ae5e308a28 set meeting point for whole selection ( via icon ) 2021-10-06 23:40:18 +02:00
titiger f344fa7fbd Fixed mixed upgrades and boosts of EP and HP regeneration 2021-09-13 22:33:47 +02:00
Jammyjamjamman 680c868aa9 FTGL required + Manjaro wx package corrected to wxgtk-common
Fixes bugs found in iss #206. Building without FTGL fails and the error
is confusing. So we'll fail at the cmake stage (suggested by andy5995).
People who don't want it can disable this at their own peril! ;-)
2021-07-14 22:28:06 +01:00
Jammyjamjamman 0e5d3a2d49 Add macos workflow
Macos workflow does not work atm, so it's commented out. But this shows
the general idea of how it should work.
2021-07-02 19:49:53 +01:00
Jammyjamjamman 367c6e61ec More improvements to actions
* Better naming for "preparing snapshot".
* Strip debug info on linux builds for artifact, to make smaller.
2021-06-20 22:56:41 +01:00
Jammyjamjamman d18cbac6d4 Another fix to artifact generation 2021-06-20 18:00:21 +01:00