Commit Graph

4896 Commits

Author SHA1 Message Date
pavanvo 92cdcca576
Merge branch 'feat/command-priority' into play 2022-09-07 02:12:56 +04:00
pavanvo 204bac403e
fix: usabillity 2022-09-07 02:11:40 +04:00
pavanvo db66662a8b
Merge branch 'fix/internet' into play 2022-09-06 21:04:41 +04:00
pavanvo 8f0abb60b3
Merge branch 'build/windows_cmake_msbuild' into play 2022-09-06 20:53:08 +04:00
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
pavanvo 935be6fc8f
Merge branch 'feat/hotkeys_rebase' into build/windows_cmake_msbuild 2022-08-25 06:55:11 +04:00
James Sherratt c46d1260f5 Tidy up 2022-08-24 23:26:25 +01:00
James Sherratt 0a0ca7507d Fix windows g3d xml tools build 2022-08-24 23:26:25 +01:00
Jammyjamjamman c5245a9e73 More fixes to cmake builds
- Add icons to windows exes.
- Revert removal of CurlGetConfig.cmake. This is still required in
ubuntu. (Perhaps only for static builds.)
2022-08-24 23:26:24 +01:00
Jammyjamjamman 6723924b5b Fix map editor and g3d viewer build for linux and macos 2022-08-24 23:26:24 +01:00
Jammyjamjamman b405ce86ca Get map editor and model viewer building with VS cmake builds
* Map editor and model viewer build, but only as "Release" build.
* Unwanted flags not set for msbuild, such as FPIC, -g3, -O3, -sse...
* Wanted flags set for msbuild e.g. /arch:SSE2 /fp:fast -D__SSE__
-D__SSE2__
* Allow including wx, used for vcpkg wx.
* Mapeditor is WIN32 exe for VS_BUILD. (Not sure why this is needed...)
* g3d viewer and map editor mains edited to remove unnecessary windows-
only code(, for strings).
2022-08-24 23:26:24 +01:00
Jammyjamjamman 523229ab55 More progress with cmake for Visual Studio projects
* Change conditon so that L137 onwards of main CMakelists.txt is
executed fro VS project target. Main reason to do this was to make sure
project actually built with streflop.
* Change conditions after L137 so unwanted compile flags aren't added.
* Project now builds multi threaded for VS project. Tries to use max
number of cores.
* Simplify cxx flags. Remove unneeded MT and MTd flags.
* Set VS build output to mk/windoze.
* Add FPUSettings.asm to streflop in cmake, if VS project specified.
* Remove STREFLOP compile definitions. Not needed now streflop is
configured properly.
* Simplify cmake by adding "VS_BUILD" variable, instead of doing string
comparisons all the time to check if is "Visual Studio" target.
2022-08-24 23:26:24 +01:00
Jammyjamjamman c6a632c33c Fix for linux and mac 2022-08-24 23:26:24 +01:00
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
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
Rampoina 332780950b Fix unit/building progress not getting restored when loading a game 2022-08-23 00:07:20 +01: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
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
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