[Commits] [wesnoth/wesnoth] aba935: Revert "AOI: Make the named loyal units unnameable...

Sat Feb 27 19:46:56 UTC 2016

  Branch: refs/heads/guifixes
  Home:   https://github.com/wesnoth/wesnoth
  Commit: aba935060aeaa34d5efe9e2afed5cc4d2f343ff8
      https://github.com/wesnoth/wesnoth/commit/aba935060aeaa34d5efe9e2afed5cc4d2f343ff8
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-24 (Wed, 24 Feb 2016)

  Changed paths:
    M data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg
    M data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg

  Log Message:
  -----------
  Revert "AOI: Make the named loyal units unnameable."

  Commit: b76813c8ac0ccb3144a05d99ea8f4b99d1f3d2de
      https://github.com/wesnoth/wesnoth/commit/b76813c8ac0ccb3144a05d99ea8f4b99d1f3d2de
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-24 (Wed, 24 Feb 2016)

  Changed paths:
    M data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg
    M data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg

  Log Message:
  -----------
  Merge pull request #608 from wesnoth/revert-607-AOI_Named_Loyals

Revert "AOI: Make the named loyal units unnameable."

  Commit: b338a894b704e7eb55a7c6a59eee3c885f57a106
      https://github.com/wesnoth/wesnoth/commit/b338a894b704e7eb55a7c6a59eee3c885f57a106
  Author: ln-zookeeper <lari.nieminen at iki.fi>
  Date:   2016-02-24 (Wed, 24 Feb 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
    M data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg
    M data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg

  Log Message:
  -----------
  Added some missing unrenamable=yes keys and removed unnecessary ones

  Commit: a33e37a2fc47b3086dbb1734f038de2e815ae5f9
      https://github.com/wesnoth/wesnoth/commit/a33e37a2fc47b3086dbb1734f038de2e815ae5f9
  Author: ln-zookeeper <lari.nieminen at iki.fi>
  Date:   2016-02-24 (Wed, 24 Feb 2016)

  Changed paths:
    M data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg
    M data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg
    M data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_of_Peace.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
    M data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg

  Log Message:
  -----------
  Added unrenamable=yes to some more units

  Commit: b282ef7236cee438b3e6dde650a4c7f82bfda485
      https://github.com/wesnoth/wesnoth/commit/b282ef7236cee438b3e6dde650a4c7f82bfda485
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-02-24 (Wed, 24 Feb 2016)

  Changed paths:
    M src/ai/testing/stage_sf_with_rca.cpp
    M src/game_events/action_wml.cpp
    M src/play_controller.cpp
    M src/synced_commands.cpp
    M src/tod_manager.cpp
    M src/tod_manager.hpp

  Log Message:
  -----------
  use game_data* instead of boost::optional<game_data&> in tod_manager

after updating to boost 1.60 boost have me erros related to
boost::optional<game_data&> in stage_sf_with_rca.cpp where game_data is
not defined (only declared).

Using game_data* solved this problems and also simplies the code by
using simpler datatypes.

  Commit: bcb06e4a7a74b894b5247ad867df905722d334a4
      https://github.com/wesnoth/wesnoth/commit/bcb06e4a7a74b894b5247ad867df905722d334a4
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-02-24 (Wed, 24 Feb 2016)

  Changed paths:
    M src/gettext.hpp
    M src/gettext_boost.cpp
    M src/lua/lvm.cpp
    M src/scripting/lua_common.cpp

  Log Message:
  -----------
  fix lua string and tstring comparision

lua string now use a locale indpenedent comparision, this prevents OOS.

This commit also implements comparision operators for lua tstring which
use a language dependend collate facet from boost locale. (which usually
uses an icu or a winapi backend)

  Commit: bcf2710cc64e586f6f865bb8ebaed680417ae512
      https://github.com/wesnoth/wesnoth/commit/bcf2710cc64e586f6f865bb8ebaed680417ae512
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-02-24 (Wed, 24 Feb 2016)

  Changed paths:
    M src/game_initialization/multiplayer_ui.cpp

  Log Message:
  -----------
  add a comment

  Commit: ac6439efdc26cf5be0a9341e25fa9aa44f69543d
      https://github.com/wesnoth/wesnoth/commit/ac6439efdc26cf5be0a9341e25fa9aa44f69543d
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-02-24 (Wed, 24 Feb 2016)

  Changed paths:
    M src/hotkey/command_executor.cpp

  Log Message:
  -----------
  fix lua console showing twice

  Commit: c970efa6bf44da11736430955dae6f5bf0a7cb84
      https://github.com/wesnoth/wesnoth/commit/c970efa6bf44da11736430955dae6f5bf0a7cb84
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2016-02-24 (Wed, 24 Feb 2016)

  Changed paths:
    M data/campaigns/tutorial/lua/character_selection.lua
    M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
    M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg

  Log Message:
  -----------
  T: Make Konrad & Li'sar unnameable.

  Commit: d99806cbbfb2ae86eb48f147c724a3751d134210
      https://github.com/wesnoth/wesnoth/commit/d99806cbbfb2ae86eb48f147c724a3751d134210
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2016-02-24 (Wed, 24 Feb 2016)

  Changed paths:
    M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg

  Log Message:
  -----------
  T: Make Delfador have same traits as HttT.

Except loyal, because he's not on your side here.

  Commit: 9358af7ad12b0a251792fdf4b8d48677e899dde6
      https://github.com/wesnoth/wesnoth/commit/9358af7ad12b0a251792fdf4b8d48677e899dde6
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M data/campaigns/tutorial/lua/character_selection.lua
    M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
    M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg

  Log Message:
  -----------
  Merge pull request #609 from sigurdfdragon/Tutorial_Fixes_2016_02_24

Tutorial fixes 2016 02 24

  Commit: d2be47f5ddd1e546756ef9e8360913c945677115
      https://github.com/wesnoth/wesnoth/commit/d2be47f5ddd1e546756ef9e8360913c945677115
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M src/replay.hpp

  Log Message:
  -----------
  Fix broken build in VC

#include <iterator> is needed for back_insert_iterator. This was included in config.hpp, but inclusion of that header here was removed in the previous commit.

  Commit: dd705441391aef97649fd046dedadf6eb591f4a9
      https://github.com/wesnoth/wesnoth/commit/dd705441391aef97649fd046dedadf6eb591f4a9
  Author: Andreas <andreas at alternating.net>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M src/replay.hpp

  Log Message:
  -----------
  Merge pull request #610 from Wedge009/Fix_VC_build

Fix broken build in VC

  Commit: dfe7fcca8839bd926c3ee312e7411c892f00d787
      https://github.com/wesnoth/wesnoth/commit/dfe7fcca8839bd926c3ee312e7411c892f00d787
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M projectfiles/CodeBlocks/wesnoth.cbp
    A src/gui/widgets/group.hpp

  Log Message:
  -----------
  gui2: implement widget groups

Groups are handled on a per-dialog basis, and are currently specialized for tselectable_
inheritors. They provide a convenient vector-of-pairs interface that ensure only one
widget is selected at one time and allows binding of values to widgets which can be
fetched at a later point.

  Commit: 6d883e10f429cbd3ba29b6553728f8f0470df0e5
      https://github.com/wesnoth/wesnoth/commit/6d883e10f429cbd3ba29b6553728f8f0470df0e5
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp

  Log Message:
  -----------
  tpreferences: reimplement radio toggle setup to use groups

  Commit: 2185faa4032031c6a542814b792782da5d4dbc3c
      https://github.com/wesnoth/wesnoth/commit/2185faa4032031c6a542814b792782da5d4dbc3c
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M projectfiles/CodeBlocks/wesnoth.cbp
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp
    A src/gui/widgets/group.hpp

  Log Message:
  -----------
  Merge pull request #588 from Vultraz/gui2_widget_groups

gui2: implement widget groups

  Commit: 1fd5eb63e1e9896bd00b25c565a21dedbff03b6a
      https://github.com/wesnoth/wesnoth/commit/1fd5eb63e1e9896bd00b25c565a21dedbff03b6a
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M changelog

  Log Message:
  -----------
  Updated changelog

  Commit: 8691ae247d0b9b8fc4acf9646d72757b753e715e
      https://github.com/wesnoth/wesnoth/commit/8691ae247d0b9b8fc4acf9646d72757b753e715e
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M src/gui/widgets/group.hpp

  Log Message:
  -----------
  tgroup: implement remove_member (C++11 only)

  Commit: a0909a9d4749bee9c2432d044052a553a1b7cdc2
      https://github.com/wesnoth/wesnoth/commit/a0909a9d4749bee9c2432d044052a553a1b7cdc2
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M src/gui/dialogs/unit_create.cpp
    M src/gui/dialogs/unit_create.hpp

  Log Message:
  -----------
  tunit_create: simplified gender toggle using a group

  Commit: ec88475d2309e4b89436ef255c6a82b975457da4
      https://github.com/wesnoth/wesnoth/commit/ec88475d2309e4b89436ef255c6a82b975457da4
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

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

  Log Message:
  -----------
  tunit_create: refactored out display argument

  Commit: 6612b71b8d03601e9254b719f6ea7cb3a602b8fc
      https://github.com/wesnoth/wesnoth/commit/6612b71b8d03601e9254b719f6ea7cb3a602b8fc
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M src/gui/dialogs/unit_attack.cpp
    M src/gui/dialogs/unit_attack.hpp
    M src/mouse_events.cpp

  Log Message:
  -----------
  tunit_attack: refactored out display argument

  Commit: 02995731ced7808e25e2ecefbf4d7d7a292d450d
      https://github.com/wesnoth/wesnoth/commit/02995731ced7808e25e2ecefbf4d7d7a292d450d
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M src/gui/dialogs/addon_connect.cpp
    M src/gui/dialogs/addon_connect.hpp

  Log Message:
  -----------
  taddon_connect: removed unused display argument

  Commit: e23a4764971bc71dc615e7a433a379f4cdca9865
      https://github.com/wesnoth/wesnoth/commit/e23a4764971bc71dc615e7a433a379f4cdca9865
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M src/editor/map/context_manager.cpp
    M src/gui/dialogs/editor_generate_map.cpp
    M src/gui/dialogs/editor_generate_map.hpp

  Log Message:
  -----------
  teditor_generate_map: refactored out reliance on display

  Commit: f84fc5cb0b3e62a766d3bedf3a565e68fc3b936d
      https://github.com/wesnoth/wesnoth/commit/f84fc5cb0b3e62a766d3bedf3a565e68fc3b936d
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

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

  Log Message:
  -----------
  Fixup a0909a9d4749 (unused parameter)

  Commit: e67dd6b3dfd1774c1acaf426a150cf153170cdb3
      https://github.com/wesnoth/wesnoth/commit/e67dd6b3dfd1774c1acaf426a150cf153170cdb3
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M src/gui/dialogs/editor/editor_edit_side.cpp
    M src/gui/dialogs/editor/editor_edit_side.hpp

  Log Message:
  -----------
  teditor_edit_side: simplified radio toggles with groups

  Commit: e5cf2e8eea01fc497937458a4d3ec8437270793e
      https://github.com/wesnoth/wesnoth/commit/e5cf2e8eea01fc497937458a4d3ec8437270793e
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M src/tests/gui/test_gui2.cpp

  Log Message:
  -----------
  Attempt to fix gui2 unit tests (post-e23a4764971b)

  Commit: 90ae1151c72eecb6eb9806ded5d2f9d6952b3b4e
      https://github.com/wesnoth/wesnoth/commit/90ae1151c72eecb6eb9806ded5d2f9d6952b3b4e
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M projectfiles/CodeBlocks/wesnoth.cbp

  Log Message:
  -----------
  CB: add -Wunused compiler flag

  Commit: 82b089e4788df4e65c08de284661ca4b0f257edf
      https://github.com/wesnoth/wesnoth/commit/82b089e4788df4e65c08de284661ca4b0f257edf
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M src/gui/widgets/group.hpp

  Log Message:
  -----------
  tgroup: add a clear() function

  Commit: dfe6f6c935cc35cfb18bfd364a9d098b05b5d72c
      https://github.com/wesnoth/wesnoth/commit/dfe6f6c935cc35cfb18bfd364a9d098b05b5d72c
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M src/gui/dialogs/addon/filter_options.cpp
    M src/gui/dialogs/addon/filter_options.hpp

  Log Message:
  -----------
  taddon_filter_options: simplify radio buttons with groups

  Commit: 9a77b81fc7dbbcce5bdddfd4b96ab8c45297a090
      https://github.com/wesnoth/wesnoth/commit/9a77b81fc7dbbcce5bdddfd4b96ab8c45297a090
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj

  Log Message:
  -----------
  Update XCode and MSVC projects

  Commit: 5d5f89d31b1f6a6200ebee7fc3706667a9265d6f
      https://github.com/wesnoth/wesnoth/commit/5d5f89d31b1f6a6200ebee7fc3706667a9265d6f
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M src/gui/widgets/group.hpp

  Log Message:
  -----------
  tgroup: Pre-C++11 implementation of remove_member
(In case someone needs it)

  Commit: 63a3312e705d4e1d9ce92b7b7b32d77b1df421ef
      https://github.com/wesnoth/wesnoth/commit/63a3312e705d4e1d9ce92b7b7b32d77b1df421ef
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M src/gui/dialogs/select_orb_colors.cpp
    M src/gui/dialogs/select_orb_colors.hpp

  Log Message:
  -----------
  Use widget groups in orb selection dialog

  Commit: 2e36ed230fa77f07a9b098c48fa5c40b8965c1f7
      https://github.com/wesnoth/wesnoth/commit/2e36ed230fa77f07a9b098c48fa5c40b8965c1f7
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-02-26 (Fri, 26 Feb 2016)

  Changed paths:
    M data/gui/default/window/advanced_graphics_options.cfg
    M src/gui/dialogs/advanced_graphics_options.cpp
    M src/gui/dialogs/advanced_graphics_options.hpp
    M src/image.cpp

  Log Message:
  -----------
  Use widget groups in the advanced graphics options dialog

  Commit: 2ee1cf3cc01f7cac7b5edc0f65bacdb69441e109
      https://github.com/wesnoth/wesnoth/commit/2ee1cf3cc01f7cac7b5edc0f65bacdb69441e109
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-27 (Sat, 27 Feb 2016)

  Changed paths:
    M src/editor/controller/editor_controller.cpp
    M src/editor/map/context_manager.cpp
    M src/editor/map/context_manager.hpp

  Log Message:
  -----------
  editor: don't switch contexts if attempting to switch to current context

This extends ae305e9cc7885294617a86562bf8705cbbc7181e to add context switching

  Commit: 86746aaaf094ece1540d143c8d58c8f9e551e243
      https://github.com/wesnoth/wesnoth/commit/86746aaaf094ece1540d143c8d58c8f9e551e243
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-27 (Sat, 27 Feb 2016)

  Changed paths:
    M src/editor/map/context_manager.cpp

  Log Message:
  -----------
  editor: don't redraw entire screen when switching contexts

  Commit: 6b827e68d49481aa37467d98db0c8a01efad282a
      https://github.com/wesnoth/wesnoth/commit/6b827e68d49481aa37467d98db0c8a01efad282a
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-27 (Sat, 27 Feb 2016)

  Changed paths:
    M data/gui/default/macros/_initial.cfg
    M data/gui/default/window/lobby_main.cfg
    M data/gui/default/window/title_screen.cfg

  Log Message:
  -----------
  GUI2: added a macro for fullscreen window layout settings

  Commit: 9afb987574be72504ba1f8a6c6c9ab23613c5909
      https://github.com/wesnoth/wesnoth/commit/9afb987574be72504ba1f8a6c6c9ab23613c5909
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-27 (Sat, 27 Feb 2016)

  Changed paths:
    M data/gui/default/window/gamestate_inspector.cfg

  Log Message:
  -----------
  tgamestate_inspector: display as fullscreen window and adjusted layout as relevant

  Commit: 0eb6d28664462669c082698593981e2ad80a9433
      https://github.com/wesnoth/wesnoth/commit/0eb6d28664462669c082698593981e2ad80a9433
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-27 (Sat, 27 Feb 2016)

  Changed paths:
    M images/editor/brush.png

  Log Message:
  -----------
  Improve look of editor brush

  Commit: 7115b501025965c1f46c1606e70e362bc206cd96
      https://github.com/wesnoth/wesnoth/commit/7115b501025965c1f46c1606e70e362bc206cd96
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-27 (Sat, 27 Feb 2016)

  Changed paths:
    M src/editor/editor_display.cpp

  Log Message:
  -----------
  editor: fixed editor having two hex overlays drawing over each other

images/editor/brush.png and images/misc/hover-hex.png were being drawn
on top of each other, resulting in an unsightly editor brush. Removed the
latter.

  Commit: d5b20f9c210281d4ae047cdbdd0a22abcd252e0f
      https://github.com/wesnoth/wesnoth/commit/d5b20f9c210281d4ae047cdbdd0a22abcd252e0f
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-27 (Sat, 27 Feb 2016)

  Changed paths:
    M images/editor/selection-overlay.png

  Log Message:
  -----------
  Apply slight tint behind editor selection overlay

  Commit: e5c5b0213e44299f320a5eb57fd2b5ff02779e28
      https://github.com/wesnoth/wesnoth/commit/e5c5b0213e44299f320a5eb57fd2b5ff02779e28
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-27 (Sat, 27 Feb 2016)

  Changed paths:
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_A_New_Land.cfg

  Log Message:
  -----------
  TRoW S15: added Lord Typhon's death to lose objectives (bug #24461)

  Commit: 2732b21610de09fc894438d6e355e4fc95bdbedd
      https://github.com/wesnoth/wesnoth/commit/2732b21610de09fc894438d6e355e4fc95bdbedd
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-02-27 (Sat, 27 Feb 2016)

  Changed paths:
    M data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg

  Log Message:
  -----------
  UtBS S2: slightly more consistent ID for Go'hag

  Commit: f4cb6569211316d496e6896d595e5f66da1f15e1
      https://github.com/wesnoth/wesnoth/commit/f4cb6569211316d496e6896d595e5f66da1f15e1
  Author: ln-zookeeper <lari.nieminen at iki.fi>
  Date:   2016-02-27 (Sat, 27 Feb 2016)

  Changed paths:
    M src/actions/unit_creator.cpp

  Log Message:
  -----------
  Fixed the unit_creator crash part of bug #24439

  Commit: 46a0eb0e558f2d705b6a5dfe8b55dd2a91e59b98
      https://github.com/wesnoth/wesnoth/commit/46a0eb0e558f2d705b6a5dfe8b55dd2a91e59b98
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2016-02-28 (Sun, 28 Feb 2016)

  Changed paths:
    M changelog
    M data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg
    M data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
    M data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg
    M data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg
    M data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_of_Peace.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
    M data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_A_New_Land.cfg
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
    M data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg
    M data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
    M data/campaigns/tutorial/lua/character_selection.lua
    M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
    M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
    M data/gui/default/macros/_initial.cfg
    M data/gui/default/window/advanced_graphics_options.cfg
    M data/gui/default/window/gamestate_inspector.cfg
    M data/gui/default/window/lobby_main.cfg
    M data/gui/default/window/title_screen.cfg
    M images/editor/brush.png
    M images/editor/selection-overlay.png
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/actions/unit_creator.cpp
    M src/ai/testing/stage_sf_with_rca.cpp
    M src/editor/controller/editor_controller.cpp
    M src/editor/editor_display.cpp
    M src/editor/map/context_manager.cpp
    M src/editor/map/context_manager.hpp
    M src/game_events/action_wml.cpp
    M src/game_initialization/multiplayer_ui.cpp
    M src/gettext.hpp
    M src/gettext_boost.cpp
    M src/gui/dialogs/addon/filter_options.cpp
    M src/gui/dialogs/addon/filter_options.hpp
    M src/gui/dialogs/addon_connect.cpp
    M src/gui/dialogs/addon_connect.hpp
    M src/gui/dialogs/advanced_graphics_options.cpp
    M src/gui/dialogs/advanced_graphics_options.hpp
    M src/gui/dialogs/editor/editor_edit_side.cpp
    M src/gui/dialogs/editor/editor_edit_side.hpp
    M src/gui/dialogs/editor_generate_map.cpp
    M src/gui/dialogs/editor_generate_map.hpp
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp
    M src/gui/dialogs/select_orb_colors.cpp
    M src/gui/dialogs/select_orb_colors.hpp
    M src/gui/dialogs/unit_attack.cpp
    M src/gui/dialogs/unit_attack.hpp
    M src/gui/dialogs/unit_create.cpp
    M src/gui/dialogs/unit_create.hpp
    A src/gui/widgets/group.hpp
    M src/hotkey/command_executor.cpp
    M src/image.cpp
    M src/lua/lvm.cpp
    M src/menu_events.cpp
    M src/mouse_events.cpp
    M src/play_controller.cpp
    M src/replay.hpp
    M src/scripting/lua_common.cpp
    M src/synced_commands.cpp
    M src/tests/gui/test_gui2.cpp
    M src/tod_manager.cpp
    M src/tod_manager.hpp

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into guifixes

Compare: https://github.com/wesnoth/wesnoth/compare/cc760cb33fa4...46a0eb0e558f