[Commits] [wesnoth/wesnoth] c99af6: new aquatic castles terrain, but still needs keep-...

GitHub noreply at github.com
Thu Oct 6 20:09:26 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: c99af653d7a5eaa972e9e252b826dfb1135d5e47
      https://github.com/wesnoth/wesnoth/commit/c99af653d7a5eaa972e9e252b826dfb1135d5e47
  Author: doofus-01 <doofus-01 at users.noreply.github.com>
  Date:   2016-09-18 (Sun, 18 Sep 2016)

  Changed paths:
    A data/core/images/terrain/castle/aquatic-castle/castle-concave-bl.png
    A data/core/images/terrain/castle/aquatic-castle/castle-concave-br.png
    A data/core/images/terrain/castle/aquatic-castle/castle-concave-l.png
    A data/core/images/terrain/castle/aquatic-castle/castle-concave-r.png
    A data/core/images/terrain/castle/aquatic-castle/castle-concave-tl.png
    A data/core/images/terrain/castle/aquatic-castle/castle-concave-tr.png
    A data/core/images/terrain/castle/aquatic-castle/castle-convex-bl.png
    A data/core/images/terrain/castle/aquatic-castle/castle-convex-br.png
    A data/core/images/terrain/castle/aquatic-castle/castle-convex-l.png
    A data/core/images/terrain/castle/aquatic-castle/castle-convex-r.png
    A data/core/images/terrain/castle/aquatic-castle/castle-convex-tl.png
    A data/core/images/terrain/castle/aquatic-castle/castle-convex-tr.png
    A data/core/images/terrain/castle/aquatic-castle/castle-tile.png
    A data/core/images/terrain/castle/aquatic-castle/castle-to-ground-n-ne.png
    A data/core/images/terrain/castle/aquatic-castle/castle-to-ground-n.png
    A data/core/images/terrain/castle/aquatic-castle/castle-to-ground-ne.png
    A data/core/images/terrain/castle/aquatic-castle/castle-to-ground-nw-n-ne.png
    A data/core/images/terrain/castle/aquatic-castle/castle-to-ground-nw-n.png
    A data/core/images/terrain/castle/aquatic-castle/castle-to-ground-nw.png
    A data/core/images/terrain/castle/aquatic-castle/castle2-concave-bl.png
    A data/core/images/terrain/castle/aquatic-castle/castle2-concave-br.png
    A data/core/images/terrain/castle/aquatic-castle/cobbles.png
    A data/core/images/terrain/castle/aquatic-castle/keep-concave-bl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-concave-br.png
    A data/core/images/terrain/castle/aquatic-castle/keep-concave-l.png
    A data/core/images/terrain/castle/aquatic-castle/keep-concave-r.png
    A data/core/images/terrain/castle/aquatic-castle/keep-concave-tl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-concave-tr.png
    A data/core/images/terrain/castle/aquatic-castle/keep-convex-bl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-convex-br.png
    A data/core/images/terrain/castle/aquatic-castle/keep-convex-l.png
    A data/core/images/terrain/castle/aquatic-castle/keep-convex-r.png
    A data/core/images/terrain/castle/aquatic-castle/keep-convex-tl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-convex-tr.png
    A data/core/images/terrain/castle/aquatic-castle/keep-tile.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-n-ne.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-n.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-ne-se.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-ne.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-nw-n-ne-se.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-nw-n-ne.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-nw-n.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-nw.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-sw-nw-n-ne.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-sw-nw.png
    M data/core/terrain-graphics.cfg
    M data/core/terrain.cfg

  Log Message:
  -----------
  new aquatic castles terrain, but still needs keep-castle images


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

  Changed paths:
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-bl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-br.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-l.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-r.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-tl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-tr.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-bl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-br.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-l.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-r.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-tl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-tr.png
    M data/core/terrain-graphics.cfg
    M data/core/terrain-graphics/aquatic.cfg

  Log Message:
  -----------
  adding keep-castle corner transitions


  Commit: 9d30fdacf40deefa1386070c7989c4e4232bba18
      https://github.com/wesnoth/wesnoth/commit/9d30fdacf40deefa1386070c7989c4e4232bba18
  Author: doofus-01 <doofus-01 at users.noreply.github.com>
  Date:   2016-09-24 (Sat, 24 Sep 2016)

  Changed paths:
    M INSTALL
    M data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/25_HttT_Epilogue.cfg
    M data/gui/schema.cfg
    M data/gui/widget/button_25x25.cfg
    M data/gui/widget/slider_default.cfg
    A data/gui/window/mp_staging.cfg
    M data/lua/wml/harm_unit.lua
    A images/icons/arrows/double_arrow_right_30-active.png
    A images/icons/arrows/double_arrow_right_30-pressed.png
    A images/icons/arrows/double_arrow_right_30.png
    M players_changelog
    M po/wesnoth/eo.po
    M projectfiles/CodeBlocks-SCons/wesnoth.cbp
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC12/liblua.vcxproj
    M projectfiles/VC12/liblua.vcxproj.filters
    M projectfiles/VC12/wesnoth.vcxproj
    M projectfiles/VC12/wesnoth.vcxproj.filters
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/CMakeLists.txt
    M src/SConscript
    M src/ai/manager.cpp
    R src/asserts.hpp
    M src/editor/controller/editor_controller.cpp
    M src/format_time_summary.cpp
    M src/game_initialization/multiplayer.cpp
    M src/gettext.hpp
    M src/gettext_boost.cpp
    M src/global.hpp
    M src/gui/auxiliary/iterator/walker_grid.cpp
    M src/gui/auxiliary/iterator/walker_tree_node.cpp
    M src/gui/auxiliary/iterator/walker_widget.cpp
    M src/gui/core/placer.cpp
    M src/gui/core/window_builder.cpp
    A src/gui/dialogs/multiplayer/mp_staging.cpp
    A src/gui/dialogs/multiplayer/mp_staging.hpp
    M src/gui/widgets/control.cpp
    M src/gui/widgets/control.hpp
    M src/gui/widgets/generator.cpp
    M src/gui/widgets/generator_private.hpp
    M src/gui/widgets/settings.cpp
    M src/gui/widgets/tree_view_node.cpp
    M src/play_controller.cpp
    M src/save_index.cpp
    M src/storyscreen/controller.cpp
    M src/storyscreen/part.cpp
    M src/storyscreen/render.cpp
    M src/synced_commands.cpp
    M src/tests/gui/test_gui2.cpp
    M src/wml_exception.hpp

  Log Message:
  -----------
  Merge branch 'master' into merfolk_castle


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

  Changed paths:
    A data/core/images/terrain/castle/aquatic-castle/keep-to-water-n.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-water-ne.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-water-nw.png
    M data/core/terrain-graphics.cfg

  Log Message:
  -----------
  start of keep-to-water transitions


  Commit: 20ec27c682595d4edabcb357ab8f15193a55e2c1
      https://github.com/wesnoth/wesnoth/commit/20ec27c682595d4edabcb357ab8f15193a55e2c1
  Author: doofus-01 <doofus-01 at users.noreply.github.com>
  Date:   2016-09-30 (Fri, 30 Sep 2016)

  Changed paths:
    M INSTALL
    M RELEASE_NOTES
    M changelog
    M data/ai/lua/ca_high_xp_attack.lua
    M data/ai/lua/generic_recruit_engine.lua
    M data/campaigns/Eastern_Invasion/ai/ca_ogres_flee.lua
    M data/campaigns/Eastern_Invasion/utils/schedule.cfg
    M data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-dodge-1.png
    M data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-dodge-2.png
    A data/campaigns/Heir_To_The_Throne/images/units/human-princess-defend-1.png
    A data/campaigns/Heir_To_The_Throne/images/units/human-princess-defend-2.png
    A data/campaigns/Heir_To_The_Throne/images/units/human-princess-leading-1.png
    A data/campaigns/Heir_To_The_Throne/images/units/human-princess-leading-2.png
    M data/campaigns/Heir_To_The_Throne/images/units/human-princess.png
    A data/campaigns/Heir_To_The_Throne/images/units/human-queen-attack.png
    A data/campaigns/Heir_To_The_Throne/images/units/human-queen-defend1.png
    A data/campaigns/Heir_To_The_Throne/images/units/human-queen-defend2.png
    A data/campaigns/Heir_To_The_Throne/images/units/human-queen-magic-1.png
    A data/campaigns/Heir_To_The_Throne/images/units/human-queen-magic-2.png
    A data/campaigns/Heir_To_The_Throne/images/units/human-queen-swoosh.png
    M data/campaigns/Heir_To_The_Throne/images/units/human-queen.png
    M data/campaigns/Heir_To_The_Throne/images/units/sea-orc-attack.png
    M data/campaigns/Heir_To_The_Throne/images/units/sea-orc-defend.png
    A data/campaigns/Heir_To_The_Throne/images/units/sea-orc-swim1.png
    A data/campaigns/Heir_To_The_Throne/images/units/sea-orc-swim2.png
    A data/campaigns/Heir_To_The_Throne/images/units/sea-orc-swoosh.png
    M data/campaigns/Heir_To_The_Throne/images/units/sea-orc.png
    M data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg
    M data/campaigns/Heir_To_The_Throne/units/Princess.cfg
    M data/campaigns/Heir_To_The_Throne/units/Sea_Orc.cfg
    M data/campaigns/Son_Of_The_Black_Eye/ai/ca_transport_S6.lua
    M data/campaigns/The_Rise_Of_Wesnoth/ai/ca_aggressive_attack_no_suicide.lua
    M data/campaigns/The_Rise_Of_Wesnoth/ai/ca_retreat.lua
    M data/core/about.cfg
    M data/core/images/misc/blank-hex.png
    M data/core/images/terrain/interior/wood-chasm/wood-burnt-n.png
    M data/core/images/terrain/interior/wood-chasm/wood-burnt-ne.png
    M data/core/images/terrain/interior/wood-chasm/wood-burnt-nw-n-ne.png
    M data/core/images/terrain/interior/wood-chasm/wood-burnt-nw.png
    M data/core/images/terrain/interior/wood-chasm/wood-burnt-s.png
    M data/core/images/terrain/interior/wood-chasm/wood-burnt-se-s-sw.png
    M data/core/images/terrain/interior/wood-chasm/wood-burnt-se.png
    M data/core/images/terrain/interior/wood-chasm/wood-burnt-sw.png
    M data/core/images/terrain/interior/wood-chasm/wood-clean-n-ne.png
    M data/core/images/terrain/interior/wood-chasm/wood-clean-n.png
    M data/core/images/terrain/interior/wood-chasm/wood-clean-ne.png
    M data/core/images/terrain/interior/wood-chasm/wood-clean-nw-n-ne.png
    M data/core/images/terrain/interior/wood-chasm/wood-clean-nw-n.png
    M data/core/images/terrain/interior/wood-chasm/wood-clean-nw.png
    M data/core/images/terrain/interior/wood-chasm/wood-clean-s-sw.png
    M data/core/images/terrain/interior/wood-chasm/wood-clean-s.png
    M data/core/images/terrain/interior/wood-chasm/wood-clean-se-s-sw.png
    M data/core/images/terrain/interior/wood-chasm/wood-clean-se-s.png
    M data/core/images/terrain/interior/wood-chasm/wood-clean-se.png
    M data/core/images/terrain/interior/wood-chasm/wood-clean-sw.png
    M data/core/images/terrain/interior/wood-chasm/wood-regular-n-ne.png
    M data/core/images/terrain/interior/wood-chasm/wood-regular-n.png
    M data/core/images/terrain/interior/wood-chasm/wood-regular-ne.png
    M data/core/images/terrain/interior/wood-chasm/wood-regular-nw-n-ne.png
    M data/core/images/terrain/interior/wood-chasm/wood-regular-nw-n.png
    M data/core/images/terrain/interior/wood-chasm/wood-regular-nw.png
    M data/core/images/terrain/interior/wood-chasm/wood-regular-s-sw.png
    M data/core/images/terrain/interior/wood-chasm/wood-regular-s.png
    M data/core/images/terrain/interior/wood-chasm/wood-regular-se-s-sw.png
    M data/core/images/terrain/interior/wood-chasm/wood-regular-se-s.png
    M data/core/images/terrain/interior/wood-chasm/wood-regular-se.png
    M data/core/images/terrain/interior/wood-chasm/wood-regular-sw.png
    R data/core/images/terrain/interior/wood-chasm/wood-ruined.png
    R data/core/images/terrain/interior/wood-chasm/wood-ruined2.png
    R data/core/images/terrain/interior/wood-chasm/wood-ruined3.png
    R data/core/images/terrain/interior/wood-chasm/wood-ruined4.png
    A data/core/images/terrain/interior/wood-ruined.png
    A data/core/images/terrain/interior/wood-ruined2.png
    A data/core/images/terrain/interior/wood-ruined3.png
    A data/core/images/terrain/interior/wood-ruined4.png
    M data/core/images/units/human-loyalists/duelist-attack.png
    M data/core/images/units/human-loyalists/duelist-defend.png
    M data/core/images/units/human-loyalists/duelist-die1.png
    M data/core/images/units/human-loyalists/duelist-die2.png
    M data/core/images/units/human-loyalists/duelist-die3.png
    M data/core/images/units/human-loyalists/duelist-die4.png
    M data/core/images/units/human-loyalists/duelist-die5.png
    M data/core/images/units/human-loyalists/duelist-die6.png
    M data/core/images/units/human-loyalists/duelist-die7.png
    M data/core/images/units/human-loyalists/duelist-die8.png
    M data/core/images/units/human-loyalists/duelist-ranged.png
    M data/core/images/units/human-loyalists/duelist.png
    M data/core/images/units/undead/bat-se-3.png
    M data/core/macros/schedules.cfg
    M data/core/macros/sound-utils.cfg
    M data/core/terrain-graphics.cfg
    M data/core/terrain.cfg
    M data/core/units/trolls/Troll_Shaman.cfg
    M data/gui/window/drop_down_list.cfg
    M data/gui/window/game_stats.cfg
    M data/gui/window/lobby_main.cfg
    M data/gui/window/mp_create_game.cfg
    M data/gui/window/mp_faction_select.cfg
    A data/gui/window/mp_join_game.cfg
    M data/gui/window/mp_method_selection.cfg
    M data/gui/window/mp_staging.cfg
    M data/lua/wml-tags.lua
    M data/tips.cfg
    M host-gui2.lua
    M host.lua
    A images/icons/icon-female.png
    A images/icons/icon-male.png
    A images/icons/icon-random.png
    M join-gui2.lua
    M join.lua
    M players_changelog
    M po/wesnoth/en at shaw.po
    M projectfiles/CodeBlocks/README.md
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/CodeBlocks/wesnothd.cbp
    M projectfiles/VC12/WindowsTimeout.vcxproj
    M projectfiles/VC12/liblua.vcxproj
    M projectfiles/VC12/schema_generator.vcxproj
    M projectfiles/VC12/wesnoth.vcxproj
    M projectfiles/VC12/wesnoth.vcxproj.filters
    M projectfiles/VC12/wesnothd.vcxproj
    M projectfiles/VC12/wesnothd.vcxproj.filters
    M projectfiles/VC12/wesnothlib.vcxproj
    M projectfiles/VC12/wesnothlib.vcxproj.filters
    M projectfiles/Xcode/readme.md
    A simulate-lobby-activity.lua
    M src/CMakeLists.txt
    M src/SConscript
    M src/SDL_SavePNG/savepng.c
    M src/actions/move.cpp
    M src/addon/info.hpp
    M src/addon/manager_ui.cpp
    M src/ai/actions.cpp
    M src/attack_prediction.cpp
    M src/attack_prediction_display.cpp
    M src/campaign_server/campaign_server.cpp
    M src/cursor.hpp
    M src/display.cpp
    M src/editor/action/mouse/mouse_action.cpp
    M src/editor/action/mouse/mouse_action_item.cpp
    M src/editor/action/mouse/mouse_action_map_label.cpp
    M src/editor/action/mouse/mouse_action_select.cpp
    M src/editor/action/mouse/mouse_action_unit.cpp
    M src/editor/action/mouse/mouse_action_village.cpp
    M src/editor/map/context_manager.cpp
    M src/editor/map/context_manager.hpp
    M src/editor/palette/tristate_button.cpp
    M src/fake_unit_manager.hpp
    M src/floating_label.cpp
    M src/font.cpp
    M src/game_display.cpp
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/connect_engine.hpp
    M src/game_initialization/multiplayer.cpp
    M src/gui/core/window_builder.cpp
    M src/gui/dialogs/drop_down_list.cpp
    M src/gui/dialogs/game_load.cpp
    M src/gui/dialogs/game_version.cpp
    M src/gui/dialogs/lobby/data.cpp
    M src/gui/dialogs/lobby/info.cpp
    M src/gui/dialogs/lobby/info.hpp
    M src/gui/dialogs/lobby/lobby.cpp
    M src/gui/dialogs/multiplayer/faction_select.cpp
    M src/gui/dialogs/multiplayer/mp_create_game.cpp
    M src/gui/dialogs/multiplayer/mp_create_game.hpp
    A src/gui/dialogs/multiplayer/mp_join_game.cpp
    A src/gui/dialogs/multiplayer/mp_join_game.hpp
    M src/gui/dialogs/multiplayer/mp_staging.cpp
    M src/gui/dialogs/multiplayer/mp_staging.hpp
    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/chatbox.cpp
    M src/gui/widgets/chatbox.hpp
    M src/gui/widgets/group.hpp
    M src/gui/widgets/helper.cpp
    M src/gui/widgets/helper.hpp
    M src/gui/widgets/settings.cpp
    M src/gui/widgets/tree_view.cpp
    M src/gui/widgets/tree_view.hpp
    M src/gui/widgets/tree_view_node.cpp
    M src/gui/widgets/tree_view_node.hpp
    M src/gui/widgets/unit_preview_pane.cpp
    M src/image.cpp
    M src/image_modifications.cpp
    M src/marked-up_text.hpp
    M src/minimap.cpp
    M src/minimap.hpp
    M src/pathfind/pathfind.cpp
    M src/pathfind/teleport.cpp
    M src/pathfind/teleport.hpp
    M src/playsingle_controller.cpp
    M src/preferences.cpp
    M src/preferences.hpp
    M src/random_new.cpp
    M src/reports.cpp
    R src/scoped_resource.hpp
    M src/scripting/application_lua_kernel.cpp
    M src/scripting/lua_kernel_base.cpp
    A src/scripting/lua_preferences.cpp
    A src/scripting/lua_preferences.hpp
    M src/scripting/lua_unit_type.cpp
    R src/sdl/alpha.cpp
    R src/sdl/alpha.hpp
    M src/sdl/image.hpp
    M src/sdl/rect.cpp
    M src/sdl/utils.cpp
    M src/sdl/utils.hpp
    M src/sdl/window.hpp
    M src/server/server.cpp
    M src/storyscreen/render.cpp
    M src/tests/gui/test_gui2.cpp
    M src/text.cpp
    M src/units/drawer.hpp
    M src/video.hpp
    M src/whiteboard/highlighter.cpp
    M src/whiteboard/manager.cpp
    M src/widgets/button.cpp
    M src/widgets/multimenu.cpp
    M src/widgets/multimenu.hpp
    M src/widgets/textbox.cpp
    M utils/travis/mp_test_executor-gui2.sh
    M utils/wesnoth-defaults

  Log Message:
  -----------
  Merge branch 'master' into merfolk_castle


  Commit: 4bd2c006e988d3e5eb575077814df3645ca1d0a6
      https://github.com/wesnoth/wesnoth/commit/4bd2c006e988d3e5eb575077814df3645ca1d0a6
  Author: doofus-01 <doofus-01 at users.noreply.github.com>
  Date:   2016-10-01 (Sat, 01 Oct 2016)

  Changed paths:
    M data/core/images/terrain/castle/aquatic-castle/keep-to-ground-n.png
    M data/core/images/terrain/castle/aquatic-castle/keep-to-water-n.png
    M data/core/images/terrain/castle/aquatic-castle/keep-to-water-ne.png
    M data/core/images/terrain/castle/aquatic-castle/keep-to-water-nw.png
    A data/core/images/terrain/castle/aquatic-castle/mask-n.png
    A data/core/images/terrain/castle/aquatic-castle/mask-ne.png
    A data/core/images/terrain/castle/aquatic-castle/mask-nw.png
    M data/core/terrain-graphics.cfg
    M data/core/terrain-graphics/aquatic.cfg

  Log Message:
  -----------
  corner edge transition rules, and first keep-to-water transition images


  Commit: 16e730eacc80dc88216606311605dc5a9cfadbc6
      https://github.com/wesnoth/wesnoth/commit/16e730eacc80dc88216606311605dc5a9cfadbc6
  Author: doofus-01 <doofus-01 at users.noreply.github.com>
  Date:   2016-10-01 (Sat, 01 Oct 2016)

  Changed paths:
    M data/core/images/terrain/castle/aquatic-castle/castle-to-ground-ne.png
    M data/core/images/terrain/castle/aquatic-castle/castle-to-ground-nw.png
    M data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-tl.png
    M data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-tr.png
    M data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-tl.png
    M data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-tr.png
    M data/core/images/terrain/castle/aquatic-castle/keep-concave-bl.png
    M data/core/images/terrain/castle/aquatic-castle/keep-concave-br.png
    M data/core/images/terrain/castle/aquatic-castle/keep-concave-tl.png
    M data/core/images/terrain/castle/aquatic-castle/keep-convex-tl.png
    M data/core/images/terrain/castle/aquatic-castle/keep-convex-tr.png
    M data/core/images/terrain/castle/aquatic-castle/keep-to-ground-n.png
    M data/core/images/terrain/castle/aquatic-castle/keep-to-ground-nw-n-ne-se.png
    M data/core/images/terrain/castle/aquatic-castle/keep-to-ground-nw-n-ne.png
    M data/core/images/terrain/castle/aquatic-castle/keep-to-ground-nw-n.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-se.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-sw.png
    M data/core/images/terrain/castle/aquatic-castle/keep-to-water-n.png
    M data/core/images/terrain/castle/aquatic-castle/keep-to-water-ne.png
    M data/core/images/terrain/castle/aquatic-castle/keep-to-water-nw.png
    M data/core/images/terrain/castle/aquatic-castle/mask-n.png
    M data/core/images/terrain/castle/aquatic-castle/mask-ne.png
    M data/core/images/terrain/castle/aquatic-castle/mask-nw.png
    A data/core/images/terrain/castle/aquatic-castle/mask-se.png
    A data/core/images/terrain/castle/aquatic-castle/mask-sw.png
    M data/core/terrain-graphics.cfg
    M data/core/terrain-graphics/aquatic.cfg

  Log Message:
  -----------
  more work on the transitions


  Commit: bfe2bb594d9cd5b3921465fcda7f08fcd6c9d640
      https://github.com/wesnoth/wesnoth/commit/bfe2bb594d9cd5b3921465fcda7f08fcd6c9d640
  Author: doofus-01 <doofus-01 at users.noreply.github.com>
  Date:   2016-10-02 (Sun, 02 Oct 2016)

  Changed paths:
    M data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-bl.png
    M data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-br.png
    M data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-r.png
    M data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-tl.png
    M data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-tr.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-bl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-br.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-l.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-r.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-tl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-tr.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-bl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-br.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-l.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-r.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-tl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-tr.png
    M data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-bl.png
    M data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-br.png
    M data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-l.png
    M data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-r.png
    M data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-tl.png
    M data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-tr.png
    M data/core/images/terrain/castle/aquatic-castle/keep-concave-bl.png
    M data/core/images/terrain/castle/aquatic-castle/keep-concave-br.png
    M data/core/images/terrain/castle/aquatic-castle/keep-concave-tl.png
    M data/core/images/terrain/castle/aquatic-castle/keep-concave-tr.png
    M data/core/images/terrain/castle/aquatic-castle/keep-convex-bl.png
    M data/core/images/terrain/castle/aquatic-castle/keep-convex-br.png
    M data/core/images/terrain/castle/aquatic-castle/keep-convex-tl.png
    M data/core/images/terrain/castle/aquatic-castle/keep-convex-tr.png
    M data/core/images/terrain/castle/aquatic-castle/keep-to-water-n.png
    M data/core/terrain-graphics.cfg

  Log Message:
  -----------
  fixes to the gates of the keep walls


  Commit: 1f3a4851340f72b6d3eaa92374b8cee63137a90f
      https://github.com/wesnoth/wesnoth/commit/1f3a4851340f72b6d3eaa92374b8cee63137a90f
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-10-07 (Fri, 07 Oct 2016)

  Changed paths:
    A data/core/images/terrain/castle/aquatic-castle/castle-concave-bl.png
    A data/core/images/terrain/castle/aquatic-castle/castle-concave-br.png
    A data/core/images/terrain/castle/aquatic-castle/castle-concave-l.png
    A data/core/images/terrain/castle/aquatic-castle/castle-concave-r.png
    A data/core/images/terrain/castle/aquatic-castle/castle-concave-tl.png
    A data/core/images/terrain/castle/aquatic-castle/castle-concave-tr.png
    A data/core/images/terrain/castle/aquatic-castle/castle-convex-bl.png
    A data/core/images/terrain/castle/aquatic-castle/castle-convex-br.png
    A data/core/images/terrain/castle/aquatic-castle/castle-convex-l.png
    A data/core/images/terrain/castle/aquatic-castle/castle-convex-r.png
    A data/core/images/terrain/castle/aquatic-castle/castle-convex-tl.png
    A data/core/images/terrain/castle/aquatic-castle/castle-convex-tr.png
    A data/core/images/terrain/castle/aquatic-castle/castle-tile.png
    A data/core/images/terrain/castle/aquatic-castle/castle-to-ground-n-ne.png
    A data/core/images/terrain/castle/aquatic-castle/castle-to-ground-n.png
    A data/core/images/terrain/castle/aquatic-castle/castle-to-ground-ne.png
    A data/core/images/terrain/castle/aquatic-castle/castle-to-ground-nw-n-ne.png
    A data/core/images/terrain/castle/aquatic-castle/castle-to-ground-nw-n.png
    A data/core/images/terrain/castle/aquatic-castle/castle-to-ground-nw.png
    A data/core/images/terrain/castle/aquatic-castle/castle2-concave-bl.png
    A data/core/images/terrain/castle/aquatic-castle/castle2-concave-br.png
    A data/core/images/terrain/castle/aquatic-castle/cobbles.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-bl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-br.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-l.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-r.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-tl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-tr.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-bl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-br.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-l.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-r.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-tl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-tr.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-bl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-br.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-l.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-r.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-tl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-tr.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-bl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-br.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-l.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-r.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-tl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-tr.png
    A data/core/images/terrain/castle/aquatic-castle/keep-concave-bl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-concave-br.png
    A data/core/images/terrain/castle/aquatic-castle/keep-concave-l.png
    A data/core/images/terrain/castle/aquatic-castle/keep-concave-r.png
    A data/core/images/terrain/castle/aquatic-castle/keep-concave-tl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-concave-tr.png
    A data/core/images/terrain/castle/aquatic-castle/keep-convex-bl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-convex-br.png
    A data/core/images/terrain/castle/aquatic-castle/keep-convex-l.png
    A data/core/images/terrain/castle/aquatic-castle/keep-convex-r.png
    A data/core/images/terrain/castle/aquatic-castle/keep-convex-tl.png
    A data/core/images/terrain/castle/aquatic-castle/keep-convex-tr.png
    A data/core/images/terrain/castle/aquatic-castle/keep-tile.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-n-ne.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-n.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-ne-se.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-ne.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-nw-n-ne-se.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-nw-n-ne.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-nw-n.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-nw.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-se.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-sw-nw-n-ne.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-sw-nw.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-ground-sw.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-water-n.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-water-ne.png
    A data/core/images/terrain/castle/aquatic-castle/keep-to-water-nw.png
    A data/core/images/terrain/castle/aquatic-castle/mask-n.png
    A data/core/images/terrain/castle/aquatic-castle/mask-ne.png
    A data/core/images/terrain/castle/aquatic-castle/mask-nw.png
    A data/core/images/terrain/castle/aquatic-castle/mask-se.png
    A data/core/images/terrain/castle/aquatic-castle/mask-sw.png
    M data/core/terrain-graphics.cfg
    M data/core/terrain-graphics/aquatic.cfg
    M data/core/terrain.cfg

  Log Message:
  -----------
  Merge pull request #791 from doofus-01/merfolk_castle

new terrain:  aquatic castles


Compare: https://github.com/wesnoth/wesnoth/compare/ea5728c19a05...1f3a4851340f


More information about the Commits mailing list