[Commits] [wesnoth/wesnoth] a87898: Fix bug: Map may not have starting positions

GitHub noreply at github.com
Sun Sep 18 19:38:23 UTC 2016


  Branch: refs/heads/fix-tunnel-issues
  Home:   https://github.com/wesnoth/wesnoth
  Commit: a878981628612317197e17ecfb2a09d8a0273ed5
      https://github.com/wesnoth/wesnoth/commit/a878981628612317197e17ecfb2a09d8a0273ed5
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-11 (Sun, 11 Sep 2016)

  Changed paths:
    M src/playsingle_controller.cpp

  Log Message:
  -----------
  Fix bug: Map may not have starting positions

Look before you leap ...


  Commit: fe08701b7ca3639b17dca20023d2bb34433042c6
      https://github.com/wesnoth/wesnoth/commit/fe08701b7ca3639b17dca20023d2bb34433042c6
  Author: Celtic Minstrel <celtic.minstrel.ca at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M src/actions/vision.cpp
    M src/addon/manager_ui.cpp
    M src/ai/default/ca.cpp
    M src/game_initialization/multiplayer_lobby.hpp
    M src/gui/dialogs/addon/filter_options.cpp
    M src/gui/dialogs/addon/filter_options.hpp
    M src/gui/dialogs/addon/list.cpp
    M src/gui/dialogs/game_load.cpp
    M src/gui/dialogs/lobby/info.hpp
    M src/gui/dialogs/multiplayer/mp_create_game.cpp
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/unit_create.cpp
    M src/gui/dialogs/unit_recall.cpp
    M src/gui/widgets/list.cpp
    M src/gui/widgets/list.hpp
    M src/gui/widgets/listbox.cpp
    M src/gui/widgets/listbox.hpp
    M src/playsingle_controller.cpp
    M src/reports.cpp
    M src/team.cpp
    M src/team.hpp
    M src/units/abilities.cpp
    M src/units/attack_type.hpp
    M src/units/unit.cpp
    M src/units/unit.hpp
    M src/whiteboard/manager.hpp
    M src/widgets/scrollpane.cpp

  Log Message:
  -----------
  Change most vector<bool> to dynamic_bitset

A few cases were skipped, most of which involved 2D bitsets (eg shroud)
or uses that could not be easily translated (eg GUI1 multimenu).

In a few cases, code needed to be updated for the different API that the
dynamic_bitset provides, but in most cases, this change is entirely
transparent.

There are probably a few unnecessary dynamic_bitset.hpp includes.

One use of vector<bool> was replaced instead with std::bitset, since
the dynamic size was not required.


  Commit: 8be428e9463daab3730550c79794c8af87ce19b1
      https://github.com/wesnoth/wesnoth/commit/8be428e9463daab3730550c79794c8af87ce19b1
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M changelog
    M src/map/map.cpp

  Log Message:
  -----------
  Honor special locations in terrain mask

A [terrain_mask] is simply a map. It can be smaller than the map, and can be offset. As a map, it can give special locations which can be used to position units, and queried by WML. With this change the names are properly applied to the underlying map, offset relative to the [terrain_mask]. A name given in the [terrain_mask] replaces that name in the underlying map, regardless of the original location. A map file can define only one name per location. A name can have only one location; but a location can have any number of names. To define additional names for a location, stack [terrain_mask] maps giving each. Once placed on the map, a name cannot be removed.


  Commit: b9a97d893d40136e32ee3b508dddde9464ce9dc4
      https://github.com/wesnoth/wesnoth/commit/b9a97d893d40136e32ee3b508dddde9464ce9dc4
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M changelog
    M src/map/map.cpp

  Log Message:
  -----------
  Merge pull request #775 from GregoryLundberg/GL_terrain_mask_positions

Honor special locations in terrain mask


  Commit: 4cf5be674c6e2972c26a43a1d74315cf671f5f96
      https://github.com/wesnoth/wesnoth/commit/4cf5be674c6e2972c26a43a1d74315cf671f5f96
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/actions/vision.cpp
    M src/addon/manager_ui.cpp
    M src/ai/default/ca.cpp
    M src/game_initialization/multiplayer_lobby.hpp
    M src/gui/dialogs/addon/filter_options.cpp
    M src/gui/dialogs/addon/filter_options.hpp
    M src/gui/dialogs/addon/list.cpp
    M src/gui/dialogs/game_load.cpp
    M src/gui/dialogs/lobby/info.hpp
    M src/gui/dialogs/multiplayer/mp_create_game.cpp
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/unit_create.cpp
    M src/gui/dialogs/unit_recall.cpp
    M src/gui/widgets/list.cpp
    M src/gui/widgets/list.hpp
    M src/gui/widgets/listbox.cpp
    M src/gui/widgets/listbox.hpp
    M src/playsingle_controller.cpp
    M src/reports.cpp
    M src/team.cpp
    M src/team.hpp
    M src/units/abilities.cpp
    M src/units/attack_type.hpp
    M src/units/unit.cpp
    M src/units/unit.hpp
    M src/whiteboard/manager.hpp
    M src/widgets/scrollpane.cpp

  Log Message:
  -----------
  Merge pull request #781 from wesnoth/dynamic_bitset

Change most vector<bool> to dynamic_bitset


  Commit: 002f9a83c6b152244769707a4ffdac227c2b7872
      https://github.com/wesnoth/wesnoth/commit/002f9a83c6b152244769707a4ffdac227c2b7872
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

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

  Log Message:
  -----------
  Yet again an attempt to appease travis


  Commit: 183abfdabb61b9eb1de9bdcb18957f813012f7a2
      https://github.com/wesnoth/wesnoth/commit/183abfdabb61b9eb1de9bdcb18957f813012f7a2
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M data/gui/window/game_load.cfg

  Log Message:
  -----------
  Game Load: fixed layout with small number of saves


  Commit: 7eb13d21861579a5040d6baf2e312e8b9b6d2a5f
      https://github.com/wesnoth/wesnoth/commit/7eb13d21861579a5040d6baf2e312e8b9b6d2a5f
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

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

  Log Message:
  -----------
  End Credits: removed the use of swap


  Commit: fff2e3f193721bcdab5b7b0c831323141acf19b1
      https://github.com/wesnoth/wesnoth/commit/fff2e3f193721bcdab5b7b0c831323141acf19b1
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

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

  Log Message:
  -----------
  End Credits: fixed crash if exiting before scrolling starts

If you exit the dialog before the initial timer fires, you'll end up with a crash when it attempts
to execute. This solution seemed simpler than assigning a temp timer to the delay timer.


  Commit: 7def4d57eb9699ff257fdfc95d6ae520b3be7462
      https://github.com/wesnoth/wesnoth/commit/7def4d57eb9699ff257fdfc95d6ae520b3be7462
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/gui/widgets/window.cpp

  Log Message:
  -----------
  Removed some accidentally-committed debug code


  Commit: b0fa8110f014a11ffbd81cb4d34afbb663a1f524
      https://github.com/wesnoth/wesnoth/commit/b0fa8110f014a11ffbd81cb4d34afbb663a1f524
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/campaign_server/campaign_server.cpp
    M src/server/server_base.cpp

  Log Message:
  -----------
  Convert remaining boost::bind to std::bind in campaignd code


  Commit: 86dc5174a8bd71267650274b401a6298b5c0b073
      https://github.com/wesnoth/wesnoth/commit/86dc5174a8bd71267650274b401a6298b5c0b073
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/tools/exploder_utils.cpp

  Log Message:
  -----------
  Fixed compile errors in exploder


  Commit: f821598ca3dcf9818ff20965a197d0549ba0cbc8
      https://github.com/wesnoth/wesnoth/commit/f821598ca3dcf9818ff20965a197d0549ba0cbc8
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/tools/exploder_utils.cpp

  Log Message:
  -----------
  Switch boost::shared_array to unique_ptr


  Commit: 1a25d297b81dead1fd0e6e3c5b5da8d5caea6254
      https://github.com/wesnoth/wesnoth/commit/1a25d297b81dead1fd0e6e3c5b5da8d5caea6254
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M changelog
    M src/statistics.cpp

  Log Message:
  -----------
  Don't duplicate recall count decrement when undoing a recall (bug #25060)

Looks like un_recall_unit_cost() is used to retrieve the unit cost of the recalled unit but it also decrements the recall count, duplicating the decrement in un_recall_unit().


  Commit: a477eb4014bad07bfe5662982b2cbb7596975ded
      https://github.com/wesnoth/wesnoth/commit/a477eb4014bad07bfe5662982b2cbb7596975ded
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/statistics.cpp

  Log Message:
  -----------
  Fixup 1a25d297b81d (unused variable)

This function can likely be removed now, but I don't want to do it just yet.


  Commit: ff9450eff2975c02549f867c5fd8dc8dee000f0f
      https://github.com/wesnoth/wesnoth/commit/ff9450eff2975c02549f867c5fd8dc8dee000f0f
  Author: mattsc <mattsc000 at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/actions/move.cpp
    M src/pathfind/teleport.cpp
    M src/pathfind/teleport.hpp

  Log Message:
  -----------
  Merge pull request #782 from wesnoth/fix-tunnel-issues

Fix issues with tunnels when exit hex is occupied by an allied unit


  Commit: f4fcb330c81d2c4090556671d5fcb6ce5630cbea
      https://github.com/wesnoth/wesnoth/commit/f4fcb330c81d2c4090556671d5fcb6ce5630cbea
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M src/actions/move.cpp

  Log Message:
  -----------
  Commented out unused parameter

Not removing since I don't know if it will be needed again later.


  Commit: 33e21fda4aaa4d131bf57a83f66ee65a6fb20733
      https://github.com/wesnoth/wesnoth/commit/33e21fda4aaa4d131bf57a83f66ee65a6fb20733
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M src/gui/widgets/generator.cpp

  Log Message:
  -----------
  Commented out some aserts that were causing problems in a few places

Specifically, if you applied a filter that matched no games and switched to the campaigns view in
MP Create, you'd trigger the vertical list assert. If you enabled horizontal_grow = true on the
tab bar (a horizontal listbox) in the same dialog, you'd trigger the horizontal list assert.


  Commit: 076c327d565eea06cd8324d2239cd81b0ce1894b
      https://github.com/wesnoth/wesnoth/commit/076c327d565eea06cd8324d2239cd81b0ce1894b
  Author: Celtic Minstrel <celtic.minstrel.ca at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/gui/widgets/generator.cpp

  Log Message:
  -----------
  "Reactivate" removed asserts as a log message


  Commit: bc7b27e4960493849aa8cabc5238a0e66eb2f101
      https://github.com/wesnoth/wesnoth/commit/bc7b27e4960493849aa8cabc5238a0e66eb2f101
  Author: Celtic Minstrel <celtic.minstrel.ca at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

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

  Log Message:
  -----------
  Minor end credits tweaks
- Increase max scroll speed
- Make help text smaller


  Commit: 94b092fa9d37f6aedd5f0fafd43abe0cf6a9c490
      https://github.com/wesnoth/wesnoth/commit/94b092fa9d37f6aedd5f0fafd43abe0cf6a9c490
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M data/gui/widget/button_default.cfg

  Log Message:
  -----------
  Added a definition for a really large button


  Commit: cf56400996142ca382ca57e26d11b3a6507658fd
      https://github.com/wesnoth/wesnoth/commit/cf56400996142ca382ca57e26d11b3a6507658fd
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M data/gui/window/mp_create_game.cfg
    M data/gui/window/mp_create_game/default_resolution.cfg
    M data/gui/window/mp_create_game/small_resolution.cfg
    M data/gui/window/mp_create_game/tiny_resolution.cfg
    A images/dialogs/multi_create/background.png
    A images/dialogs/multi_create/corner.png
    A images/dialogs/multi_create/decor.png
    M src/gui/dialogs/multiplayer/mp_create_game.cpp

  Log Message:
  -----------
  MP Create: significant layout improvements


  Commit: bb6baf8a78f7a58a09205ed13e2bd7de687e4ece
      https://github.com/wesnoth/wesnoth/commit/bb6baf8a78f7a58a09205ed13e2bd7de687e4ece
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M src/game_preferences.cpp

  Log Message:
  -----------
  Fixed bug where entering Preferences would clear saved password

After refactoring Prefs to use dialog fields, set_remember_password was called every time the dialog
closed. prv::password wasn't initialized at that point, meaning the password was always set to "".
This fixes the bug by explicitly clearing it if false is passed instead of setting it every time.

Previous iterations of the Prefs dialog only called the options setters when they were selected, meaning
this never came up as an issue. Toggling the option off would clear the saved password, and toggling it on
would leave it empty until it was re-entered.


  Commit: b48d08d687515ff06e29e51fe48f845fcb6cd9ea
      https://github.com/wesnoth/wesnoth/commit/b48d08d687515ff06e29e51fe48f845fcb6cd9ea
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M data/gui/window/drop_down_list.cfg

  Log Message:
  -----------
  Drop Down List: some border fixes

This fixes cases where the image height exceeded the label borders, which would lead to options
being too close together


  Commit: 9682df6ad0c70bc74f6a7d8761d769d0cbef1d16
      https://github.com/wesnoth/wesnoth/commit/9682df6ad0c70bc74f6a7d8761d769d0cbef1d16
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M data/gui/window/game_version.cfg

  Log Message:
  -----------
  Game Version: small max height bump to avoid a scrollbar in tab 2


  Commit: 6df17b37f481a72f6df65df0d87f1d589897af14
      https://github.com/wesnoth/wesnoth/commit/6df17b37f481a72f6df65df0d87f1d589897af14
  Author: Bär Halberkamp <fledaway at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M changelog
    M data/campaigns/Eastern_Invasion/maps/02_The_Escape_Tunnel.map
    M data/campaigns/Eastern_Invasion/scenarios/02_The_Escape_Tunnel.cfg
    M players_changelog

  Log Message:
  -----------
  EI: Rebalance S2


  Commit: 898cf3b35d9c63c2d01a3178f345e332f5e80bd2
      https://github.com/wesnoth/wesnoth/commit/898cf3b35d9c63c2d01a3178f345e332f5e80bd2
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/22_Return_to_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/25_HttT_Epilogue.cfg

  Log Message:
  -----------
  HttT S22 Gryphons return

This was an old TODO, now you know what that display was about at the end of S10!


  Commit: 479e9062db1c24220ac3c6179507842df236bf65
      https://github.com/wesnoth/wesnoth/commit/479e9062db1c24220ac3c6179507842df236bf65
  Author: Lari Nieminen <lari.nieminen at iki.fi>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/22_Return_to_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/25_HttT_Epilogue.cfg

  Log Message:
  -----------
  Merge pull request #737 from GregoryLundberg/GL_HttT_S22_gryphons_return

HttT S22 Gryphons Return


  Commit: fe85fa86cbf8b6335000bf1bc6742391203f9165
      https://github.com/wesnoth/wesnoth/commit/fe85fa86cbf8b6335000bf1bc6742391203f9165
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/playsingle_controller.cpp

  Log Message:
  -----------
  Merge pull request #772 from GregoryLundberg/GL_allow_no_starting_positions

Fix bug: Map may not have starting positions


  Commit: d4ec024048272aed0099ca8ca39d32b24219823a
      https://github.com/wesnoth/wesnoth/commit/d4ec024048272aed0099ca8ca39d32b24219823a
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/25_HttT_Epilogue.cfg

  Log Message:
  -----------
  HttT S20b Wose assistance quest

Help the wose and get a book which grants Elvish Ranger-like abilities in forest: move 1, defense 70% and ambush.


  Commit: f5b4ecf0c368b04b4d68e210a3e14ebeb1dc73be
      https://github.com/wesnoth/wesnoth/commit/f5b4ecf0c368b04b4d68e210a3e14ebeb1dc73be
  Author: Lari Nieminen <lari.nieminen at iki.fi>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/25_HttT_Epilogue.cfg

  Log Message:
  -----------
  Merge pull request #736 from GregoryLundberg/GL_HttT_S20b_wose_assistance

HttT S20b Wose Assistance


  Commit: 553ac0fd05290c5a3d3bbdb130e75f20d1c01bdb
      https://github.com/wesnoth/wesnoth/commit/553ac0fd05290c5a3d3bbdb130e75f20d1c01bdb
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/actions/attack.cpp
    M src/actions/move.cpp
    M src/actions/undo_action.cpp
    M src/actions/undo_move_action.cpp
    M src/actions/undo_move_action.hpp
    M src/ai/actions.cpp
    M src/ai/contexts.cpp
    M src/ai/default/ca_move_to_targets.cpp
    M src/ai/formula/function_table.cpp
    M src/ai/formula/stage_unit_formulas.cpp
    M src/ai/lua/aspect_advancements.cpp
    M src/ai/lua/core.cpp
    M src/ai/lua/engine_lua.cpp
    M src/ai/lua/lua_object.hpp
    M src/controller_base.cpp
    M src/editor/action/action_unit.cpp
    M src/editor/controller/editor_controller.cpp
    M src/editor/map/editor_map.cpp
    M src/formula/callable_objects.cpp
    M src/formula/callable_objects.hpp
    M src/formula/function.cpp
    M src/game_events/action_wml.cpp
    M src/game_events/entity_location.hpp
    M src/game_events/pump.cpp
    M src/game_events/wmi_container.cpp
    M src/game_preferences.cpp
    M src/game_state.cpp
    M src/gui/dialogs/editor/set_starting_position.cpp
    M src/joystick.cpp
    M src/map/label.cpp
    M src/map/location.cpp
    M src/map/location.hpp
    M src/map/map.cpp
    M src/menu_events.cpp
    M src/mouse_handler_base.hpp
    M src/pathfind/teleport.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/lua_common.cpp
    M src/scripting/lua_pathfind_cost_calculator.hpp
    M src/scripting/lua_unit.cpp
    M src/scripting/mapgen_lua_kernel.cpp
    M src/synced_commands.cpp
    M src/team.cpp
    M src/team.hpp
    M src/units/filter.cpp
    M src/units/unit.cpp
    M src/variable.cpp
    M src/variable.hpp
    M src/whiteboard/attack.cpp
    M src/whiteboard/move.cpp
    M src/whiteboard/recall.cpp
    M src/whiteboard/recruit.cpp
    M src/whiteboard/suppose_dead.cpp

  Log Message:
  -----------
  add wml_x/y() getter & setter in map_location


  Commit: 3de50e526366848ff3ca9016c892f55c2a262bba
      https://github.com/wesnoth/wesnoth/commit/3de50e526366848ff3ca9016c892f55c2a262bba
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/game_preferences.cpp
    M src/map/map.hpp

  Log Message:
  -----------
  also mark terrains in map border as encountered.


  Commit: b43e5e697e842527ae9faf01bfa8d07005c7e603
      https://github.com/wesnoth/wesnoth/commit/b43e5e697e842527ae9faf01bfa8d07005c7e603
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/server/server.cpp

  Log Message:
  -----------
  remove an include


  Commit: e8bf29c241a596d25aeb0ab35cc73aec80a1ac2c
      https://github.com/wesnoth/wesnoth/commit/e8bf29c241a596d25aeb0ab35cc73aec80a1ac2c
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/ai/actions.cpp
    M src/controller_base.cpp
    M src/game_initialization/create_engine.cpp
    M src/game_initialization/create_engine.hpp
    M src/game_initialization/multiplayer_lobby.cpp
    M src/game_initialization/playcampaign.cpp
    M src/hotkey/hotkey_handler.cpp
    M src/hotkey/hotkey_handler_sp.cpp
    M src/joystick.hpp
    M src/minimap.hpp
    M src/playsingle_controller.cpp
    M src/synced_commands.cpp
    M src/whiteboard/move.cpp

  Log Message:
  -----------
  clean some includes

this contains a fix in  playcampaign.cpp where an object was accidently
copied.


  Commit: 050ef3ecd9a586408868e962efb57a54779fea5e
      https://github.com/wesnoth/wesnoth/commit/050ef3ecd9a586408868e962efb57a54779fea5e
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/editor/map/editor_map.cpp
    M src/generators/cave_map_generator.cpp
    M src/generators/default_map_generator_job.cpp
    M src/map/map.cpp
    M src/map/map.hpp
    M src/terrain/builder.cpp
    M src/terrain/translation.cpp
    M src/terrain/translation.hpp

  Log Message:
  -----------
  make gamemap.tiles_ non-jagged


  Commit: 62bbab330d07a8d072d4296b571c8cc9088573f3
      https://github.com/wesnoth/wesnoth/commit/62bbab330d07a8d072d4296b571c8cc9088573f3
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/editor/map/editor_map.hpp
    M src/map/map.cpp
    M src/map/map.hpp

  Log Message:
  -----------
  remove unused code.


  Commit: 49621e3d2a7ae8ca19c581c4880e7905e066a49f
      https://github.com/wesnoth/wesnoth/commit/49621e3d2a7ae8ca19c581c4880e7905e066a49f
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/editor/action/action.cpp
    M src/game_board.cpp
    M src/game_board.hpp
    M src/game_events/action_wml.cpp
    M src/map/map.cpp
    M src/map/map.hpp

  Log Message:
  -----------
  remove border parameter from gamemap::overlay

This also moves the "map_data" atribute_value->sting conversion to the
game_board class becasue the config writing also happens in there.

This prepares a patch to remove the border_size_ member from
the gamemap object.


  Commit: d9a7729dbc1b3ad1e0d82c7282f0eb416e4e5fcd
      https://github.com/wesnoth/wesnoth/commit/d9a7729dbc1b3ad1e0d82c7282f0eb416e4e5fcd
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/map/map.cpp

  Log Message:
  -----------
  fix [terrain_mask][rule]use_old=yes


  Commit: 296faefa20ad023bfd578a4b1f1836d422d258f0
      https://github.com/wesnoth/wesnoth/commit/296faefa20ad023bfd578a4b1f1836d422d258f0
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/map/map.cpp
    M src/map/map.hpp
    M src/scripting/lua_common.cpp

  Log Message:
  -----------
  remove gamemap.border_size_

This also fixes a msvc compile warning in src/scripting/lua_common.cpp


  Commit: 94611c696730f11c7b177c325316bb6087245bd2
      https://github.com/wesnoth/wesnoth/commit/94611c696730f11c7b177c325316bb6087245bd2
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

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

  Log Message:
  -----------
  remove gamema::bordercache and gamema::terrainfrequencycache

Both are not used anymore because maps now always include a border and
gamemap::get_weighted_terrain_frequencies() was removed.


  Commit: e93c6ae75e1fe1a7141fe536a2002ee071b0991d
      https://github.com/wesnoth/wesnoth/commit/e93c6ae75e1fe1a7141fe536a2002ee071b0991d
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/terrain/filter.cpp

  Log Message:
  -----------
  make filter never pass on off-map locations

multiple mainline tags, specially [store_locations] assume that filter
only returns valid locations. This commit fixes an error in TSG scneario
'06 March'.


  Commit: 96a8635ed98923d8b9fa1169a0ed11a28d68fc4f
      https://github.com/wesnoth/wesnoth/commit/96a8635ed98923d8b9fa1169a0ed11a28d68fc4f
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/minimap.hpp

  Log Message:
  -----------
  fix travis build


  Commit: 8aa373246c6411004980a0dc5783cdf3907948ab
      https://github.com/wesnoth/wesnoth/commit/8aa373246c6411004980a0dc5783cdf3907948ab
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/map/map.cpp

  Log Message:
  -----------
  cleanup gamemap::overlay


  Commit: 0caaaaa596cb5e27f4a35a25991dc69fb052655b
      https://github.com/wesnoth/wesnoth/commit/0caaaaa596cb5e27f4a35a25991dc69fb052655b
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg

  Log Message:
  -----------
  HttT S13 Add some random snow

The amount of snow is based upon how quickly you made it through S12 (Northern Winter). It is 1/3rd the coverage from S12, so it varries from 0 to 33% total coverage of the map, since we don't want to really bog down the player. At 1/3rd coverage, if S12 was won on the last possible turn the player here should only lose a turn or two getting to the exits.


  Commit: 9bf3f9150367c0e58e136a84d023afe58a4299bc
      https://github.com/wesnoth/wesnoth/commit/9bf3f9150367c0e58e136a84d023afe58a4299bc
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg

  Log Message:
  -----------
  HttT S05b Use an Advisor

There was a TODO to use an actual unit to speak when the ship finally arrives, and to use the line on both victory events.


  Commit: 1ab9b923dfa3ffcecc8289a5e41b513b9890f99b
      https://github.com/wesnoth/wesnoth/commit/1ab9b923dfa3ffcecc8289a5e41b513b9890f99b
  Author: Lari Nieminen <lari.nieminen at iki.fi>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg

  Log Message:
  -----------
  Merge pull request #735 from GregoryLundberg/GL_HttT_S13_snow_ditritus

HttT S13 Snow Detritus


  Commit: 6d36550e1e7e0035028f609303e0e62901fffdbd
      https://github.com/wesnoth/wesnoth/commit/6d36550e1e7e0035028f609303e0e62901fffdbd
  Author: Lari Nieminen <lari.nieminen at iki.fi>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg

  Log Message:
  -----------
  Merge pull request #731 from GregoryLundberg/GL_HttT_S05b_use_advisor

HttT S05b Use Advisor


  Commit: 946be0c02ca09de4f0dabac0f2697dc42ae2f1a9
      https://github.com/wesnoth/wesnoth/commit/946be0c02ca09de4f0dabac0f2697dc42ae2f1a9
  Author: Celtic Minstrel <celtic.minstrel.ca at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M changelog
    M src/image_modifications.cpp
    M src/image_modifications.hpp
    M src/sdl/utils.cpp
    M src/sdl/utils.hpp

  Log Message:
  -----------
  ~ADJUST_ALPHA() now takes formula


  Commit: c9cbdb287dc3c158c5a17649d5053f583b180ea0
      https://github.com/wesnoth/wesnoth/commit/c9cbdb287dc3c158c5a17649d5053f583b180ea0
  Author: Celtic Minstrel <celtic.minstrel.ca at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M src/terrain/translation.hpp

  Log Message:
  -----------
  Fix MSVC 2013 build


  Commit: b84ec9f7755213171d0bdac89b8f3780c3c017b3
      https://github.com/wesnoth/wesnoth/commit/b84ec9f7755213171d0bdac89b8f3780c3c017b3
  Author: mattsc <mattsc000 at gmail.com>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M data/ai/micro_ais/mai-defs/animals.lua
    M data/ai/micro_ais/mai-defs/protect.lua

  Log Message:
  -----------
  Micro AIs: fix attacks aspect setup when ca_id= key not given

This is an optional key of the [micro_ai] tag.


  Commit: 8ceac00cd3d84d03fe7cade14563d01fa1e9aa03
      https://github.com/wesnoth/wesnoth/commit/8ceac00cd3d84d03fe7cade14563d01fa1e9aa03
  Author: Celtic Minstrel <celtic.minstrel.ca at gmail.com>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M src/gui/widgets/settings.cpp

  Log Message:
  -----------
  Finish support for GUI2 themes

A test theme that replaces one window and one window definition appears to
work correctly now. There is still no option in Preferences to change
the theme. Maybe that can be done when there actually are multiple themes.


  Commit: 31a972242a453be1b2f79043688eb3d07e4a7fac
      https://github.com/wesnoth/wesnoth/commit/31a972242a453be1b2f79043688eb3d07e4a7fac
  Author: Celtic Minstrel <celtic.minstrel.ca at gmail.com>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M src/log_windows.cpp
    M src/log_windows.hpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  When --wconsole causes the allocation of a new console,
print a 'press enter to continue' message when the program
terminates due to a caught exception.


  Commit: 33653e396945bf0e5d0ca56565149ae1f3328ba3
      https://github.com/wesnoth/wesnoth/commit/33653e396945bf0e5d0ca56565149ae1f3328ba3
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-18 (Sun, 18 Sep 2016)

  Changed paths:
    M data/gui/widget/chatbox.cfg
    M data/gui/window/lobby_main.cfg

  Log Message:
  -----------
  Reduced chatbox size slightly


  Commit: 304cb0dd1abad7b4a3d49fc91c51e1309adb8d30
      https://github.com/wesnoth/wesnoth/commit/304cb0dd1abad7b4a3d49fc91c51e1309adb8d30
  Author: mattsc <mattsc000 at gmail.com>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M src/pathfind/teleport.cpp

  Log Message:
  -----------
  [tunnel] tag: change default for pass_allied_units key to yes

This way it is consistent with how all other moves are done by default.


  Commit: 60d114b606b305099c690a8c9d6cc0eaff9a905c
      https://github.com/wesnoth/wesnoth/commit/60d114b606b305099c690a8c9d6cc0eaff9a905c
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
    M data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
    A data/lua/cave_map_generator.lua
    R data/multiplayer/scenarios/Random_Scenario_Lua_Cave.cfg
    R data/multiplayer/scenarios/Random_Scenario_Lua_Cave.lua
    M src/generators/cave_map_generator.cpp
    M src/generators/map_create.cpp

  Log Message:
  -----------
  finish moving cavegen (cave_map_generator.cpp)  to lua.

This map generator is used in HttT 17 and SoF 4. which needed to be updated aswell.

With this we finally have a lua generator that is used in mainline and that
can be used an an example by wml authors who want to write other map generators.

Unfortunateley there are still umc add ons in 1.12 that use
scenario_generation=cave so i didn't remove the cpp implementation yet.


  Commit: 55edd99c3eb7a471b33cfee36f7102d38679a728
      https://github.com/wesnoth/wesnoth/commit/55edd99c3eb7a471b33cfee36f7102d38679a728
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M src/game_initialization/flg_manager.cpp

  Log Message:
  -----------
  attempt to fix wrong recruitlist in UtBS 1


  Commit: 0e87d7fd436588f88fc093fd460b80903e1c5f4e
      https://github.com/wesnoth/wesnoth/commit/0e87d7fd436588f88fc093fd460b80903e1c5f4e
  Author: mattsc <mattsc000 at gmail.com>
  Date:   2016-09-17 (Sat, 17 Sep 2016)

  Changed paths:
    M data/ai/lua/ca_high_xp_attack.lua

  Log Message:
  -----------
  High XP attack CA: respect the default 'avoid' aspect


  Commit: fc4c75e56d6558689e56a38560d36c9342a74bb2
      https://github.com/wesnoth/wesnoth/commit/fc4c75e56d6558689e56a38560d36c9342a74bb2
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-18 (Sun, 18 Sep 2016)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg

  Log Message:
  -----------
  HttT S23 Fix bug: Unclear objective

The bonus is (1) recruit Knights and (2) the defeated leaders join you for the Battle for Wesnoth. You do not need to defeat all four for this.


  Commit: f2635e5ad65d991b8911fac1cfc60f88836c3f49
      https://github.com/wesnoth/wesnoth/commit/f2635e5ad65d991b8911fac1cfc60f88836c3f49
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-18 (Sun, 18 Sep 2016)

  Changed paths:
    M changelog

  Log Message:
  -----------
  Update changelog


  Commit: 8397201f60a7ceb2cce2160b2e306715bea8ff78
      https://github.com/wesnoth/wesnoth/commit/8397201f60a7ceb2cce2160b2e306715bea8ff78
  Author: Lari Nieminen <lari.nieminen at iki.fi>
  Date:   2016-09-18 (Sun, 18 Sep 2016)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg

  Log Message:
  -----------
  Merge pull request #789 from GregoryLundberg/GL_HttT_S23_objectives

HttT S23 Fix bug: Unclear objective


  Commit: 376d45a292fdf2bd24802bb5d6de636189d481f6
      https://github.com/wesnoth/wesnoth/commit/376d45a292fdf2bd24802bb5d6de636189d481f6
  Author: doofus-01 <doofus-01 at users.noreply.github.com>
  Date:   2016-09-18 (Sun, 18 Sep 2016)

  Changed paths:
    M changelog
    A data/core/images/terrain/castle/aquatic-camp/castle-concave-bl.png
    A data/core/images/terrain/castle/aquatic-camp/castle-concave-br.png
    A data/core/images/terrain/castle/aquatic-camp/castle-concave-l.png
    A data/core/images/terrain/castle/aquatic-camp/castle-concave-r.png
    A data/core/images/terrain/castle/aquatic-camp/castle-concave-tl.png
    A data/core/images/terrain/castle/aquatic-camp/castle-concave-tr.png
    A data/core/images/terrain/castle/aquatic-camp/castle-convex-bl.png
    A data/core/images/terrain/castle/aquatic-camp/castle-convex-br.png
    A data/core/images/terrain/castle/aquatic-camp/castle-convex-l.png
    A data/core/images/terrain/castle/aquatic-camp/castle-convex-r.png
    A data/core/images/terrain/castle/aquatic-camp/castle-convex-tl.png
    A data/core/images/terrain/castle/aquatic-camp/castle-convex-tr.png
    A data/core/images/terrain/castle/aquatic-camp/castle-to-ground-n-ne.png
    A data/core/images/terrain/castle/aquatic-camp/castle-to-ground-n.png
    A data/core/images/terrain/castle/aquatic-camp/castle-to-ground-ne.png
    A data/core/images/terrain/castle/aquatic-camp/castle-to-ground-nw-n-ne.png
    A data/core/images/terrain/castle/aquatic-camp/castle-to-ground-nw-n.png
    A data/core/images/terrain/castle/aquatic-camp/castle-to-ground-nw.png
    A data/core/images/terrain/castle/aquatic-camp/floor.png
    A data/core/images/terrain/castle/aquatic-camp/floor2.png
    A data/core/images/terrain/castle/aquatic-camp/floor3.png
    A data/core/images/terrain/castle/aquatic-camp/keep-rim-n.png
    A data/core/images/terrain/castle/aquatic-camp/keep-rim-ne.png
    A data/core/images/terrain/castle/aquatic-camp/keep-rim-nw.png
    A data/core/images/terrain/castle/aquatic-camp/keep-rim-s.png
    A data/core/images/terrain/castle/aquatic-camp/keep-rim-se.png
    A data/core/images/terrain/castle/aquatic-camp/keep-rim-sw.png
    A data/core/images/terrain/castle/aquatic-camp/keep-small-n.png
    A data/core/images/terrain/castle/aquatic-camp/keep-small-ne.png
    A data/core/images/terrain/castle/aquatic-camp/keep-small-nw.png
    A data/core/images/terrain/castle/aquatic-camp/keep-small-s.png
    A data/core/images/terrain/castle/aquatic-camp/keep-small-se.png
    A data/core/images/terrain/castle/aquatic-camp/keep-small-sw.png
    A data/core/images/terrain/castle/aquatic-camp/keep-tile.png
    A data/core/images/terrain/castle/aquatic-camp/reef-big.png
    A data/core/images/terrain/castle/aquatic-camp/reef.png
    A data/core/images/terrain/castle/aquatic-camp/reef2.png
    A data/core/images/terrain/castle/aquatic-camp/reef3.png
    A data/core/images/terrain/castle/aquatic-camp/reef4.png
    A data/core/images/terrain/castle/aquatic-camp/stone-post.png
    A data/core/images/terrain/castle/aquatic-camp/stone-post2.png
    A data/core/images/terrain/castle/aquatic-camp/stone-post3.png
    A data/core/images/terrain/castle/aquatic-camp/stone-post4.png
    A data/core/images/terrain/castle/aquatic-camp/tile.png
    M data/core/terrain-graphics.cfg
    A data/core/terrain-graphics/aquatic.cfg
    M data/core/terrain.cfg

  Log Message:
  -----------
  new terrain: Merfolk or aquatic camp (#773)

* adding aquatic encampment terrain

* Update changelog

* remove hardwired terrain codes and image-path from aquatic.cfg

* removed wood.png images

* touch-up to stone-posts in Kme-Cme transition


  Commit: 6f98888e246d0f13fe71e788e0c973169c2c595b
      https://github.com/wesnoth/wesnoth/commit/6f98888e246d0f13fe71e788e0c973169c2c595b
  Author: mattsc <mattsc000 at gmail.com>
  Date:   2016-09-18 (Sun, 18 Sep 2016)

  Changed paths:
    M src/pathfind/pathfind.cpp
    M src/pathfind/teleport.cpp
    M src/pathfind/teleport.hpp

  Log Message:
  -----------
  Tunnels: fix vision not being propagated through tunnels


  Commit: c505c962a28ae5faa5ee46d48f1029aa4d1cfcc8
      https://github.com/wesnoth/wesnoth/commit/c505c962a28ae5faa5ee46d48f1029aa4d1cfcc8
  Author: mattsc <mattsc000 at gmail.com>
  Date:   2016-09-18 (Sun, 18 Sep 2016)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/fix-tunnel-issues' into fix-tunnel-issues


Compare: https://github.com/wesnoth/wesnoth/compare/cc7ae4d65534...c505c962a28a


More information about the Commits mailing list