[Commits] [wesnoth/wesnoth] 7e22e4: use a map for starting locations

GitHub noreply at github.com
Fri Jun 17 17:37:57 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 7e22e4034ff80bfb6807e363a7386c3d48a7e45f
      https://github.com/wesnoth/wesnoth/commit/7e22e4034ff80bfb6807e363a7386c3d48a7e45f
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

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

  Log Message:
  -----------
  use a map for starting locations

this will make it easier to have non-int keys later.


  Commit: 3cd73e407b73dc6864cabca479ce058e5e9b96f8
      https://github.com/wesnoth/wesnoth/commit/3cd73e407b73dc6864cabca479ce058e5e9b96f8
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M src/text.cpp

  Log Message:
  -----------
  fix msvc warning


  Commit: 672ef61a34d5ab2e3be473430668b3bd5d3e5f08
      https://github.com/wesnoth/wesnoth/commit/672ef61a34d5ab2e3be473430668b3bd5d3e5f08
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M src/editor/editor_display.cpp
    M src/editor/editor_display.hpp
    M src/editor/palette/common_palette.hpp
    M src/editor/palette/editor_palettes.cpp
    M src/editor/palette/editor_palettes.hpp
    M src/editor/palette/empty_palette.hpp
    M src/editor/palette/tristate_button.cpp
    M src/editor/palette/tristate_button.hpp
    M src/editor/toolkit/editor_toolkit.cpp

  Log Message:
  -----------
  small editor palette refactor

Remove unused editor_display::palette_report_ member
Added 'tristate_palette' interface to that classes inheriting from
common_palette don't have to implement select_fg_item/select_bg_item


  Commit: 6424d79f489129791fedb23e267565922dba3751
      https://github.com/wesnoth/wesnoth/commit/6424d79f489129791fedb23e267565922dba3751
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/editor/action/mouse/mouse_action.cpp
    M src/editor/action/mouse/mouse_action.hpp
    A src/editor/palette/location_palette.cpp
    A src/editor/palette/location_palette.hpp
    M src/editor/palette/palette_manager.cpp
    M src/editor/palette/palette_manager.hpp
    M src/editor/toolkit/editor_toolkit.cpp

  Log Message:
  -----------
  use palettes in for the starting positions tool instead of a popup dialog


  Commit: 1e088d9a5039de7c7aebae8ed0c828d94bc056f7
      https://github.com/wesnoth/wesnoth/commit/1e088d9a5039de7c7aebae8ed0c828d94bc056f7
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M src/controller_base.cpp
    M src/controller_base.hpp
    M src/editor/controller/editor_controller.cpp
    M src/editor/controller/editor_controller.hpp
    M src/editor/palette/common_palette.hpp
    M src/editor/palette/location_palette.cpp
    M src/editor/palette/location_palette.hpp
    M src/hotkey/hotkey_command.cpp
    M src/hotkey/hotkey_command.hpp

  Log Message:
  -----------
  add remove button to location palette


  Commit: a0ce7dc194811cea22a10419a12dea16bc1e524a
      https://github.com/wesnoth/wesnoth/commit/a0ce7dc194811cea22a10419a12dea16bc1e524a
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M src/terrain/translation.cpp

  Log Message:
  -----------
  less string copying in string_to_number_ (parsing terrains)


  Commit: 42d93236e0470944d5bb53993097910b89f9f19e
      https://github.com/wesnoth/wesnoth/commit/42d93236e0470944d5bb53993097910b89f9f19e
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M src/actions/unit_creator.cpp
    M src/editor/action/action.cpp
    M src/editor/action/action.hpp
    M src/editor/action/mouse/mouse_action.cpp
    M src/editor/controller/editor_controller.cpp
    M src/editor/map/editor_map.cpp
    M src/editor/palette/location_palette.cpp
    M src/generators/cave_map_generator.cpp
    M src/generators/default_map_generator_job.cpp
    M src/gui/dialogs/edit_text.cpp
    M src/map/map.cpp
    M src/map/map.hpp
    M src/terrain/filter.cpp
    M src/terrain/translation.cpp
    M src/terrain/translation.hpp

  Log Message:
  -----------
  allow to special apceisl locations in the map_data

it is now possible to specify locations in the editor that can then be
read with wml (without the create scenario editor mode). These special
locations can be placed like starting positions, and can them be used in
the wml code like:
'location_id=<id>' in standard location filters or 'placement=<id>' in
[unit], i also intend to add a lua interface wesnoth.special_locations
later.

It's currently not possible to have multiple special  locations in the
same hex, the main reason is that i'm unsure about how to integrate that
in the editor ui.


  Commit: 092bb15240f31efc1ddd27b9992df2025b5c779c
      https://github.com/wesnoth/wesnoth/commit/092bb15240f31efc1ddd27b9992df2025b5c779c
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

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

  Log Message:
  -----------
  fix starting positions beeing off by one.


Compare: https://github.com/wesnoth/wesnoth/compare/44fa6651c8c0...092bb15240f3


More information about the Commits mailing list