[wesnoth-commits] [wesnoth/wesnoth] 8d4343: unit_recall: Show unrecallable units grayed out.

Wed Nov 13 10:43:33 UTC 2019

  Branch: refs/heads/1.14
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 8d4343c8bf8d2d448e7862c8b51475c7c9c3ab83
      https://github.com/wesnoth/wesnoth/commit/8d4343c8bf8d2d448e7862c8b51475c7c9c3ab83
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M data/gui/window/unit_recall.cfg
    M src/gui/dialogs/unit_recall.cpp
    M src/units/unit.hpp

  Log Message:
  -----------
  unit_recall: Show unrecallable units grayed out.

Part of issue #1282.

(cherry picked from commit a7fc184ccd205997c5387ed72f7cc443eed20a22)

  Commit: 8adc3323c7165dfa722ab2a113e05e8baa6e674f
      https://github.com/wesnoth/wesnoth/commit/8adc3323c7165dfa722ab2a113e05e8baa6e674f
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M src/gui/dialogs/unit_recall.cpp

  Log Message:
  -----------
  unit_recall: Allow filtering unrecallable units using the textbox

(cherry picked from commit 7c8492d97a606926c269964b8b9062b730bd9425)

  Commit: ba863fc22b728c8d95e98e1442e9ac6b2d1f9962
      https://github.com/wesnoth/wesnoth/commit/ba863fc22b728c8d95e98e1442e9ac6b2d1f9962
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M data/gui/window/unit_recall.cfg
    M src/gui/dialogs/unit_recall.cpp

  Log Message:
  -----------
  unit_recall: Move the image path back to the cfg file

(cherry picked from commit 26a710d6fb0f0459f53d2245d130233b98387e89)

  Commit: ad5476f5644a2e0efaa9e03e895da1e1d692d84e
      https://github.com/wesnoth/wesnoth/commit/ad5476f5644a2e0efaa9e03e895da1e1d692d84e
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M src/gui/dialogs/unit_recruit.cpp

  Log Message:
  -----------
  unit_recruit: Show unrecruitable units in gray, rather than red

Matches new unit_recall behavior

(cherry picked from commit cb07373251484289fcc5a4ded634275a5535ddc2)

  Commit: 316a0f533422e90df43c69f084ce0a07b8719faf
      https://github.com/wesnoth/wesnoth/commit/316a0f533422e90df43c69f084ce0a07b8719faf
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M src/gui/dialogs/unit_recall.cpp

  Log Message:
  -----------
  unit_recall: Take whiteboard into account in gold calculations

Copied from unit_recruit.

(cherry picked from commit f54405cf51126cd8e551004e2081ba835b2cd211)

  Commit: 4962bb1ded4b2d1d3b2ebb683dc135974b4e18b2
      https://github.com/wesnoth/wesnoth/commit/4962bb1ded4b2d1d3b2ebb683dc135974b4e18b2
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M src/menu_events.cpp

  Log Message:
  -----------
  recall: When checking whether the recall list is empty, account for whiteboard.

This makes it so if you try to recall and your recall list is empty when
accounting for the whiteboard, you get the "There are no troops" error
rather than the "You currently can't recall" error below it.

(cherry picked from commit 065f639dffce8d76135bee22a61d38998fd3c5f2)

  Commit: 9d44fe976428c227e20b1da68f73e9ea1c49eee0
      https://github.com/wesnoth/wesnoth/commit/9d44fe976428c227e20b1da68f73e9ea1c49eee0
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M src/gui/dialogs/unit_recall.cpp

  Log Message:
  -----------
  unit_recall: Add tooltip explaining the gray

(cherry picked from commit 83148c923a19c5ae81a4a130d12db9098b26fed4)

  Commit: 02074127c69bf052289841df922b3c08ecb74a9d
      https://github.com/wesnoth/wesnoth/commit/02074127c69bf052289841df922b3c08ecb74a9d
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M src/gui/dialogs/unit_recruit.cpp

  Log Message:
  -----------
  unit_recruit: Add tooltip explaining the gray

(cherry picked from commit c9ba3ee18f4415ee4cab3e49baa4d37fc58755e7)

  Commit: 495e9faf1a2efcfc47a876463acbe33817288886
      https://github.com/wesnoth/wesnoth/commit/495e9faf1a2efcfc47a876463acbe33817288886
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M changelog.md

  Log Message:
  -----------
  Add #4362 to changelog

(cherry picked from commit 28d1db51dac3a8c39b43aa1dd3588a3421fef894)

  Commit: 257f1f8f67e824bcf467b3e871186539448642ba
      https://github.com/wesnoth/wesnoth/commit/257f1f8f67e824bcf467b3e871186539448642ba
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M src/menu_events.cpp

  Log Message:
  -----------
  recruit: Show a transient message if repeating a recruit failed

Reproducible in WoV S3 by recruiting a unit and trying to repeat the recruit.
Previously it failed silently, now it shows a message.

(cherry picked from commit 534549daa3741ff3f6cd5647c19485c8e1bae7de)

  Commit: 337aa978d89f0db8a40e793fc2c7a399db821060
      https://github.com/wesnoth/wesnoth/commit/337aa978d89f0db8a40e793fc2c7a399db821060
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M src/menu_events.cpp
    M src/menu_events.hpp

  Log Message:
  -----------
  recruit: Add menu_handler::can_recruit that returns a reason

For #4443

(cherry picked from commit eaf67247400d301063b227ea35934f068d74f3f9)

  Commit: 088c2deafbc3b01673bce8e75706ebd23d6036b2
      https://github.com/wesnoth/wesnoth/commit/088c2deafbc3b01673bce8e75706ebd23d6036b2
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M src/gui/dialogs/unit_recruit.hpp
    M src/menu_events.cpp

  Log Message:
  -----------
  unit_recruit: Minor refactoring

(cherry picked from commit b3e04ba54debf1e9e96ba61dcf4626ef5bc193c4)

  Commit: ff1f23c03cce89529e3b7ab0f884ff636ab9ef97
      https://github.com/wesnoth/wesnoth/commit/ff1f23c03cce89529e3b7ab0f884ff636ab9ef97
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M src/actions/create.cpp
    M src/gui/dialogs/unit_recruit.cpp
    M src/gui/dialogs/unit_recruit.hpp
    M src/menu_events.cpp

  Log Message:
  -----------
  unit_recruit: Gray out units that would not be able to be recruited

Fixes #4443

(cherry picked from commit 1fbf9d935610e9e363c2325064cb34f6178a05c8)

  Commit: 803af029f86e7bddca7040eff1093269fa5af8f1
      https://github.com/wesnoth/wesnoth/commit/803af029f86e7bddca7040eff1093269fa5af8f1
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M src/gui/dialogs/unit_recruit.cpp
    M src/menu_events.cpp

  Log Message:
  -----------
  unit_recruit: Move the planning mode gold computation out of the dialog

(cherry picked from commit c7adc3ad9f671773f45f504c691b98c100229e01)

  Commit: 919f76f273d0f8d51bdc9c45ae3b674c67575de5
      https://github.com/wesnoth/wesnoth/commit/919f76f273d0f8d51bdc9c45ae3b674c67575de5
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M src/gui/dialogs/unit_recruit.cpp

  Log Message:
  -----------
  unit_recruit: Rename variable

(cherry picked from commit 9fdeebfa0e91d3f03ac156c89ae209dfa442eb49)

  Commit: f673fed921b5ab61bcbaf7824790ba9265b7f55c
      https://github.com/wesnoth/wesnoth/commit/f673fed921b5ab61bcbaf7824790ba9265b7f55c
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M src/gui/dialogs/unit_recruit.hpp

  Log Message:
  -----------
  unit_recruit: Edit comments

(cherry picked from commit 69f7ba660c150afdcbfab3d24bf205fff2af2407)

  Commit: 5781f26d87acdd5675954daafbb191241395383c
      https://github.com/wesnoth/wesnoth/commit/5781f26d87acdd5675954daafbb191241395383c
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M src/gui/dialogs/unit_recruit.cpp
    M src/gui/dialogs/unit_recruit.hpp
    M src/menu_events.cpp
    M src/menu_events.hpp

  Log Message:
  -----------
  unit_recruit: Pass the error strings as t_string

(cherry picked from commit 129e53b660f868c3a9ddc548517ddc60474d2270)

  Commit: 772a7bbea20f54167f18af6b909513191e431469
      https://github.com/wesnoth/wesnoth/commit/772a7bbea20f54167f18af6b909513191e431469
  Author: josteph <josteph at fastmail.com>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M changelog.md

  Log Message:
  -----------
  Add #4444 to changelog

(cherry picked from commit 70a2046f8f7f4c60e96245319d03b9aad4a40ec5)

Compare: https://github.com/wesnoth/wesnoth/compare/7bb7d94eed43...772a7bbea20f