[Commits] [wesnoth/wesnoth] 64ab66: add advanced_settings button to campaign_selection

Wed Aug 13 18:45:01 UTC 2014

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 64ab665426c6cd77452705d352bcaeb451063249
      https://github.com/wesnoth/wesnoth/commit/64ab665426c6cd77452705d352bcaeb451063249
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    M data/gui/default/window/campaign_dialog.cfg
    M src/gui/dialogs/campaign_selection.cpp
    M src/gui/dialogs/campaign_selection.hpp

  Log Message:
  -----------
  add advanced_settings button to campaign_selection

functionality to be implemented in tcampaign_selection::show_settings().

  Commit: 41c9e5bdeba1b384e26aa20a4a02a4d10681d92a
      https://github.com/wesnoth/wesnoth/commit/41c9e5bdeba1b384e26aa20a4a02a4d10681d92a
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    M src/playcampaign.cpp
    M src/saved_game.cpp
    M src/singleplayer.cpp

  Log Message:
  -----------
  fix era carryover for sp

firstly, state_.mp_settings() wasn't being written to config for sp (and therefore wasn't being restored in level_to_gamestate()).
also, I've edit playcampaign.cpp so that sp uses the mp (IO_SERVER) code between scenarios (using connect_engine).
I've disabled the mp_connect screen between sp scenarios for now, but it may be useful to add it as an advanced option later.

  Commit: b1514a5bcded9516dc1567c30ed9fd1f9fbbfeab
      https://github.com/wesnoth/wesnoth/commit/b1514a5bcded9516dc1567c30ed9fd1f9fbbfeab
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    A data/gui/default/window/campaign_settings.cfg
    M data/gui/schema.cfg
    M src/CMakeLists.txt
    M src/SConscript
    M src/create_engine.cpp
    M src/create_engine.hpp
    M src/game_launcher.cpp
    M src/gui/auxiliary/window_builder/listbox.cpp
    M src/gui/auxiliary/window_builder/listbox.hpp
    M src/gui/dialogs/campaign_selection.cpp
    M src/gui/dialogs/campaign_selection.hpp
    A src/gui/dialogs/campaign_settings.cpp
    A src/gui/dialogs/campaign_settings.hpp
    M src/gui/widgets/listbox.cpp
    M src/gui/widgets/listbox.hpp
    M src/mp_game_settings.cpp
    M src/mp_game_settings.hpp
    M src/multiplayer.cpp
    M src/multiplayer.hpp
    M src/singleplayer.cpp

  Log Message:
  -----------
  experimental implementation of sp advanced settings dialog

Era and mod selection is functional, as well as options to enable mp_configure and mp_create dialogs.
There is still an issue of realoading config. If you load multiplayer, then exit, then load campaign, there is no config reload, so the multiplayer eras/mods stay in config and are selectable. However, since state.classification().campaign_type is not set to multiplayer, when config is reloaded for a specific campaign, multiplayer won't be defined and therefore the selected era may no longer be available. So, we need some way to handle this case better. Also, it may be desirable to add a button to advanced settings which would change the campaign_type to multiplayer and reload (if we actually did want to load some mp era). Another potential option for this dialog could be IO type (to make the game networked, etc).

  Commit: 7ca092dc215810fc68017b8bef673c6edbe0f68e
      https://github.com/wesnoth/wesnoth/commit/7ca092dc215810fc68017b8bef673c6edbe0f68e
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    M src/create_engine.cpp
    M src/game_config_manager.hpp

  Log Message:
  -----------
  fix reloading for sp campaign selection

added a config load before campaign select, unless previous load was for title screen. this way, there is a reload between multiplayer and sp (to make mp-specific eras/mods unavailable). also, it fixes mp_configure screen being left showing behind campaign select when configure is canceled, since there is now another load (from cache) there.

  Commit: 049ae13a5a92388d0ad27830d889309e400489e2
      https://github.com/wesnoth/wesnoth/commit/049ae13a5a92388d0ad27830d889309e400489e2
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    M data/gui/default/window/campaign_settings.cfg
    M src/gui/dialogs/campaign_selection.cpp
    M src/gui/dialogs/campaign_settings.cpp
    M src/singleplayer.cpp

  Log Message:
  -----------
  implement allow_era_choice wml for sp settings

  Commit: baba52d8beeec2fbe609bb520cb58d8b2f24f7da
      https://github.com/wesnoth/wesnoth/commit/baba52d8beeec2fbe609bb520cb58d8b2f24f7da
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    M src/configure_engine.cpp
    M src/multiplayer_configure.cpp

  Log Message:
  -----------
  disable allow_observers option for sp

  Commit: 0feaa96e8635ec0af3dbbeec992af7cb5800ab0e
      https://github.com/wesnoth/wesnoth/commit/0feaa96e8635ec0af3dbbeec992af7cb5800ab0e
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

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

  Log Message:
  -----------
  fix getting value of checkboxes in sp settings

  Commit: c27d89394f15f6e8620d710863584228f3e165ff
      https://github.com/wesnoth/wesnoth/commit/c27d89394f15f6e8620d710863584228f3e165ff
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

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

  Log Message:
  -----------
  add "show_configure" and "show_connect" wml

in [campaign] tag. these can be set to a boolean (locked value) or "user" (user selectable)

  Commit: 0d58f86a6979f1c272e367fde61c5dc99867823e
      https://github.com/wesnoth/wesnoth/commit/0d58f86a6979f1c272e367fde61c5dc99867823e
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    M src/create_engine.cpp

  Log Message:
  -----------
  remove hybrid campaigns from sp campaign list (mp)

now hybrid campaigns are only included in "campaign" list in mp create.
they are still added to the list of sp campaigns when in sp (since sp campaign select uses that list)

  Commit: 3920056a8d81fe9e50c78291fca14ec93ea09051
      https://github.com/wesnoth/wesnoth/commit/3920056a8d81fe9e50c78291fca14ec93ea09051
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    M src/singleplayer.cpp

  Log Message:
  -----------
  add era/mod define support to sp

I had previously forgotten to include this line.

  Commit: 82c00976045592a0cc5ecb3d737c313fd4e5a24d
      https://github.com/wesnoth/wesnoth/commit/82c00976045592a0cc5ecb3d737c313fd4e5a24d
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    M src/game_launcher.cpp
    M src/playcampaign.cpp
    M src/playcampaign.hpp

  Log Message:
  -----------
  remove IO_NONE in playcampaign.cpp

  Commit: 6cc891fbf6247c59b1852d8c11f4fea821155d69
      https://github.com/wesnoth/wesnoth/commit/6cc891fbf6247c59b1852d8c11f4fea821155d69
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

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

  Log Message:
  -----------
  fix unit test for campaign_selection

  Commit: 0cc7c6d76ccb3b84a16e22fa2b3a9d7d275aa5d3
      https://github.com/wesnoth/wesnoth/commit/0cc7c6d76ccb3b84a16e22fa2b3a9d7d275aa5d3
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

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

  Log Message:
  -----------
  add unit test for campaign_settings dlg

  Commit: 6c2071a1519def98daf91a39731e3bd258bcb7d7
      https://github.com/wesnoth/wesnoth/commit/6c2071a1519def98daf91a39731e3bd258bcb7d7
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-09 (Sat, 09 Aug 2014)

  Changed paths:
    M changelog

  Log Message:
  -----------
  update changelog

  Commit: 2e362fb75eaf5d65126f1bcb1f8ebfeac52c254c
      https://github.com/wesnoth/wesnoth/commit/2e362fb75eaf5d65126f1bcb1f8ebfeac52c254c
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-09 (Sat, 09 Aug 2014)

  Changed paths:
    M projectfiles/CodeBlocks-SCons/wesnoth.cbp
    M projectfiles/VC9/wesnoth.vcproj

  Log Message:
  -----------
  update project files for campaign_settings

  Commit: 9104aa17243f73d1590636b2b2e1d3202cb65479
      https://github.com/wesnoth/wesnoth/commit/9104aa17243f73d1590636b2b2e1d3202cb65479
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-11 (Mon, 11 Aug 2014)

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

  Log Message:
  -----------
  add wiki entry for campaign_settings

  Commit: 8138e2510c0e8777e4f1f2dde055e98865f806de
      https://github.com/wesnoth/wesnoth/commit/8138e2510c0e8777e4f1f2dde055e98865f806de
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-11 (Mon, 11 Aug 2014)

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

  Log Message:
  -----------
  more user-friendly labels for additional dialogs

changed "multiplayer configure" to "level options" and "multiplayer connect" to "configure sides"

  Commit: 15bdcf0fee75dcde5e5ac27baab6762394c19ac7
      https://github.com/wesnoth/wesnoth/commit/15bdcf0fee75dcde5e5ac27baab6762394c19ac7
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-11 (Mon, 11 Aug 2014)

  Changed paths:
    M src/gui/auxiliary/window_builder/listbox.cpp

  Log Message:
  -----------
  update wiki for listbox changes

added has_minimum and has_maximum attributes.

  Commit: 5ff81aec707394e202607fec1311d79502586a6c
      https://github.com/wesnoth/wesnoth/commit/5ff81aec707394e202607fec1311d79502586a6c
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-12 (Tue, 12 Aug 2014)

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

  Log Message:
  -----------
  add "none found" text to sp modifications list

also, added extra newline between era/mod list titles and "None found"/"Not allowed" text.

  Commit: e03369a0b151ec166de172abbd22ffff13e04022
      https://github.com/wesnoth/wesnoth/commit/e03369a0b151ec166de172abbd22ffff13e04022
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-13 (Wed, 13 Aug 2014)

  Changed paths:
    M src/saved_game.cpp
    M src/savegame.cpp

  Log Message:
  -----------
  fix saves

added relevant multiplayer info to both new and old sp saves

  Commit: 4b9ffe6c780d041828d91a67a25ea1d16d0013d9
      https://github.com/wesnoth/wesnoth/commit/4b9ffe6c780d041828d91a67a25ea1d16d0013d9
  Author: Rift-Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-08-13 (Wed, 13 Aug 2014)

  Changed paths:
    M changelog
    M data/gui/default/window/campaign_dialog.cfg
    A data/gui/default/window/campaign_settings.cfg
    M data/gui/schema.cfg
    M projectfiles/CodeBlocks-SCons/wesnoth.cbp
    M projectfiles/VC9/wesnoth.vcproj
    M src/CMakeLists.txt
    M src/SConscript
    M src/configure_engine.cpp
    M src/create_engine.cpp
    M src/create_engine.hpp
    M src/game_config_manager.hpp
    M src/game_launcher.cpp
    M src/gui/auxiliary/window_builder/listbox.cpp
    M src/gui/auxiliary/window_builder/listbox.hpp
    M src/gui/dialogs/campaign_selection.cpp
    M src/gui/dialogs/campaign_selection.hpp
    A src/gui/dialogs/campaign_settings.cpp
    A src/gui/dialogs/campaign_settings.hpp
    M src/gui/widgets/listbox.cpp
    M src/gui/widgets/listbox.hpp
    M src/mp_game_settings.cpp
    M src/mp_game_settings.hpp
    M src/multiplayer.cpp
    M src/multiplayer.hpp
    M src/multiplayer_configure.cpp
    M src/playcampaign.cpp
    M src/playcampaign.hpp
    M src/saved_game.cpp
    M src/savegame.cpp
    M src/singleplayer.cpp
    M src/tests/gui/test_gui2.cpp

  Log Message:
  -----------
  Merge pull request #266 from Rift-Walker/sp_advanced_settings

Eras and mods for sp. Configure, [option]s, and connect for sp. Fix saves for updated sp codepath.

Compare: https://github.com/wesnoth/wesnoth/compare/8f49cbad5508...4b9ffe6c780d