[Commits] [wesnoth/wesnoth] 2682b6: Add force_lock_settings default to missed case

GitHub noreply at github.com
Sun Mar 20 20:20:18 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 2682b679cb329c7f3a6044701ef84fe7b5bcd410
      https://github.com/wesnoth/wesnoth/commit/2682b679cb329c7f3a6044701ef84fe7b5bcd410
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-03-20 (Sun, 20 Mar 2016)

  Changed paths:
    M src/game_initialization/multiplayer_wait.cpp

  Log Message:
  -----------
  Add force_lock_settings default to missed case


  Commit: fe0df4594724ac08abce79b011e948500dda1411
      https://github.com/wesnoth/wesnoth/commit/fe0df4594724ac08abce79b011e948500dda1411
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-03-20 (Sun, 20 Mar 2016)

  Changed paths:
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/CMakeLists.txt
    M src/SConscript
    M src/actions/move.cpp
    M src/addon/client.cpp
    M src/addon/manager.cpp
    M src/addon/manager_ui.cpp
    M src/ai/contexts.cpp
    M src/ai/default/contexts.hpp
    M src/ai/formula/ai.cpp
    M src/ai/formula/ai.hpp
    M src/ai/formula/callable_objects.hpp
    M src/ai/formula/candidates.hpp
    M src/ai/formula/function_table.hpp
    M src/ai/formula/stage_side_formulas.cpp
    M src/ai/formula/stage_side_formulas.hpp
    M src/ai/formula/stage_unit_formulas.cpp
    R src/callable_objects.cpp
    R src/callable_objects.hpp
    M src/construct_dialog.cpp
    M src/dialogs.cpp
    M src/editor/map/context_manager.cpp
    M src/editor/map/editor_map.cpp
    M src/editor/map/map_context.cpp
    M src/editor/palette/terrain_palettes.cpp
    R src/formula.cpp
    R src/formula.hpp
    A src/formula/callable.hpp
    A src/formula/callable_fwd.hpp
    A src/formula/callable_objects.cpp
    A src/formula/callable_objects.hpp
    A src/formula/debugger.cpp
    A src/formula/debugger.hpp
    A src/formula/debugger_fwd.cpp
    A src/formula/debugger_fwd.hpp
    A src/formula/formula.cpp
    A src/formula/formula.hpp
    A src/formula/formula_fwd.hpp
    A src/formula/function.cpp
    A src/formula/function.hpp
    A src/formula/string_utils.cpp
    A src/formula/string_utils.hpp
    A src/formula/tokenizer.cpp
    A src/formula/tokenizer.hpp
    A src/formula/variant.cpp
    A src/formula/variant.hpp
    R src/formula_callable.hpp
    R src/formula_callable_fwd.hpp
    R src/formula_debugger.cpp
    R src/formula_debugger.hpp
    R src/formula_debugger_fwd.cpp
    R src/formula_debugger_fwd.hpp
    R src/formula_function.cpp
    R src/formula_function.hpp
    R src/formula_fwd.hpp
    R src/formula_string_utils.cpp
    R src/formula_string_utils.hpp
    R src/formula_tokenizer.cpp
    R src/formula_tokenizer.hpp
    M src/game_classification.hpp
    M src/game_end_exceptions.hpp
    M src/game_events/handlers.cpp
    M src/game_events/manager.cpp
    M src/game_events/manager_impl.cpp
    M src/game_events/menu_item.cpp
    M src/game_initialization/configure_engine.cpp
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/create_engine.cpp
    M src/game_initialization/create_engine.hpp
    M src/game_initialization/depcheck.cpp
    M src/game_initialization/depcheck.hpp
    M src/game_initialization/flg_manager.cpp
    M src/game_initialization/mp_game_utils.cpp
    M src/game_initialization/multiplayer.cpp
    M src/game_initialization/multiplayer_configure.cpp
    M src/game_initialization/multiplayer_create.cpp
    M src/game_initialization/multiplayer_lobby.cpp
    M src/game_initialization/multiplayer_ui.cpp
    M src/game_initialization/multiplayer_wait.cpp
    M src/game_initialization/playcampaign.cpp
    M src/generators/default_map_generator_job.cpp
    M src/gui/auxiliary/canvas.hpp
    M src/gui/auxiliary/formula.hpp
    M src/gui/auxiliary/placer.hpp
    M src/gui/auxiliary/window_builder.cpp
    M src/gui/dialogs/addon/description.cpp
    M src/gui/dialogs/addon_list.cpp
    M src/gui/dialogs/advanced_graphics_options.cpp
    M src/gui/dialogs/advanced_graphics_options.hpp
    M src/gui/dialogs/campaign_difficulty.cpp
    M src/gui/dialogs/data_manage.cpp
    M src/gui/dialogs/depcheck_confirm_change.cpp
    M src/gui/dialogs/editor_set_starting_position.cpp
    M src/gui/dialogs/formula_debugger.cpp
    M src/gui/dialogs/game_load.cpp
    M src/gui/dialogs/game_version.cpp
    M src/gui/dialogs/label_settings.cpp
    M src/gui/dialogs/lobby/lobby_data.cpp
    M src/gui/dialogs/lobby/lobby_info.cpp
    M src/gui/dialogs/lobby_main.cpp
    M src/gui/dialogs/mp_alerts_options.cpp
    M src/gui/dialogs/mp_change_control.cpp
    M src/gui/dialogs/network_transmission.cpp
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp
    M src/gui/widgets/control.cpp
    M src/gui/widgets/helper.cpp
    M src/gui/widgets/settings.cpp
    M src/gui/widgets/unit_preview_pane.cpp
    M src/gui/widgets/window.cpp
    M src/gui/widgets/window.hpp
    M src/help/help_impl.cpp
    A src/hotkey/hotkey_handler.cpp
    A src/hotkey/hotkey_handler.hpp
    A src/hotkey/hotkey_handler_mp.cpp
    A src/hotkey/hotkey_handler_mp.hpp
    A src/hotkey/hotkey_handler_replay.cpp
    A src/hotkey/hotkey_handler_replay.hpp
    A src/hotkey/hotkey_handler_sp.cpp
    A src/hotkey/hotkey_handler_sp.hpp
    R src/hotkey_handler.cpp
    R src/hotkey_handler.hpp
    R src/hotkey_handler_mp.cpp
    R src/hotkey_handler_mp.hpp
    R src/hotkey_handler_replay.cpp
    R src/hotkey_handler_replay.hpp
    R src/hotkey_handler_sp.cpp
    R src/hotkey_handler_sp.hpp
    R src/make_enum.cpp
    R src/make_enum.hpp
    M src/map.cpp
    M src/map_label.cpp
    M src/map_location.cpp
    M src/menu_events.cpp
    M src/minimap.cpp
    M src/mp_game_settings.cpp
    M src/mp_game_settings.hpp
    M src/mp_ui_alerts.cpp
    M src/play_controller.cpp
    M src/playmp_controller.cpp
    M src/playsingle_controller.cpp
    M src/playturn.cpp
    M src/preferences_display.cpp
    M src/save_index.cpp
    M src/saved_game.cpp
    M src/savegame.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/plugins/manager.hpp
    M src/server/game.hpp
    M src/synced_commands.cpp
    M src/synced_user_choice.cpp
    M src/team.cpp
    M src/team.hpp
    M src/teambuilder.cpp
    M src/tests/test_formula_core.cpp
    M src/tests/test_make_enum.cpp
    M src/tod_manager.cpp
    M src/unit.cpp
    M src/unit_filter.cpp
    M src/unit_formula_manager.cpp
    M src/unit_formula_manager.hpp
    M src/unit_types.cpp
    M src/unit_types.hpp
    A src/utils/make_enum.cpp
    A src/utils/make_enum.hpp
    M src/variable.cpp
    R src/variant.cpp
    R src/variant.hpp
    M src/wesnoth.cpp
    M src/whiteboard/manager.cpp
    M src/wml_exception.cpp

  Log Message:
  -----------
  Consolidate formula and hotkey files in corresponding dirs


  Commit: bc711f5f432797eda0d6372a0cd2175bf7df0f2f
      https://github.com/wesnoth/wesnoth/commit/bc711f5f432797eda0d6372a0cd2175bf7df0f2f
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-03-20 (Sun, 20 Mar 2016)

  Changed paths:
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/CMakeLists.txt
    M src/SConscript
    M src/actions/attack.cpp
    M src/actions/attack.hpp
    M src/actions/create.cpp
    M src/actions/create.hpp
    M src/actions/heal.cpp
    M src/actions/move.cpp
    M src/actions/move.hpp
    M src/actions/shroud_clearing_action.cpp
    M src/actions/shroud_clearing_action.hpp
    M src/actions/undo.cpp
    M src/actions/undo.hpp
    M src/actions/undo_action.hpp
    M src/actions/undo_dismiss_action.hpp
    M src/actions/undo_move_action.cpp
    M src/actions/undo_move_action.hpp
    M src/actions/undo_recall_action.cpp
    M src/actions/undo_recall_action.hpp
    M src/actions/undo_recruit_action.cpp
    M src/actions/undo_recruit_action.hpp
    M src/actions/undo_update_shroud_action.hpp
    M src/actions/unit_creator.cpp
    M src/actions/unit_creator.hpp
    M src/actions/vision.cpp
    M src/ai/actions.cpp
    M src/ai/actions.hpp
    M src/ai/akihara/recruitment.cpp
    M src/ai/composite/component.cpp
    M src/ai/composite/engine_fai.cpp
    M src/ai/composite/engine_lua.cpp
    M src/ai/composite/goal.cpp
    M src/ai/composite/value_translator.hpp
    M src/ai/contexts.cpp
    M src/ai/contexts.hpp
    M src/ai/default/ai.cpp
    M src/ai/default/attack.cpp
    M src/ai/default/contexts.cpp
    M src/ai/formula/ai.cpp
    M src/ai/formula/ai.hpp
    M src/ai/formula/function_table.cpp
    M src/ai/formula/stage_unit_formulas.cpp
    M src/ai/game_info.hpp
    M src/ai/lua/core.cpp
    M src/ai/lua/lua_object.hpp
    M src/ai/lua/unit_advancements_aspect.cpp
    M src/ai/lua/unit_advancements_aspect.hpp
    M src/ai/manager.cpp
    M src/ai/recruitment/recruitment.cpp
    M src/ai/recruitment/recruitment.hpp
    M src/ai/registry.cpp
    M src/ai/simulated_actions.cpp
    M src/ai/testing.cpp
    M src/ai/testing/aspect_attacks.cpp
    M src/ai/testing/ca.cpp
    M src/ai/testing/ca.hpp
    M src/ai/testing/ca_global_fallback.cpp
    M src/ai/testing/ca_global_fallback.hpp
    M src/ai/testing/ca_testing_move_to_targets.cpp
    M src/ai/testing/ca_testing_move_to_targets.hpp
    M src/ai/testing/ca_testing_recruitment.cpp
    M src/ai/testing/ca_testing_recruitment.hpp
    M src/ai/testing/stage_sf_with_rca.cpp
    M src/ai/testing/stage_sf_with_rca.hpp
    M src/animated_game.cpp
    M src/attack_prediction_display.cpp
    M src/carryover.cpp
    M src/color_range.cpp
    M src/dialogs.cpp
    M src/dialogs.hpp
    M src/display.cpp
    M src/display_context.cpp
    M src/editor/action/action_label.hpp
    M src/editor/action/action_unit.cpp
    M src/editor/action/action_unit.hpp
    M src/editor/action/mouse/mouse_action_item.cpp
    M src/editor/action/mouse/mouse_action_map_label.hpp
    M src/editor/action/mouse/mouse_action_unit.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/editor_map.cpp
    M src/editor/map/editor_map.hpp
    M src/editor/map/map_context.cpp
    M src/editor/map/map_context.hpp
    M src/editor/palette/editor_palettes.cpp
    M src/editor/palette/unit_palette.cpp
    M src/editor/palette/unit_palette.hpp
    M src/fake_unit_manager.cpp
    M src/fake_unit_ptr.cpp
    M src/fake_unit_ptr.hpp
    M src/formula/callable_objects.cpp
    M src/formula/callable_objects.hpp
    M src/formula/formula.cpp
    M src/game_board.cpp
    M src/game_board.hpp
    M src/game_config_manager.cpp
    M src/game_config_manager.hpp
    M src/game_data.hpp
    M src/game_display.cpp
    M src/game_events/action_wml.cpp
    M src/game_events/action_wml.hpp
    M src/game_events/conditional_wml.cpp
    M src/game_events/entity_location.cpp
    M src/game_events/entity_location.hpp
    M src/game_events/menu_item.cpp
    M src/game_events/pump.cpp
    M src/game_events/wmi_container.cpp
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/create_engine.cpp
    M src/game_initialization/create_engine.hpp
    M src/game_initialization/flg_manager.cpp
    M src/game_initialization/mp_game_utils.cpp
    M src/game_initialization/multiplayer.cpp
    M src/game_initialization/multiplayer_configure.cpp
    M src/game_initialization/multiplayer_connect.cpp
    M src/game_initialization/multiplayer_create.cpp
    M src/game_initialization/multiplayer_lobby.cpp
    M src/game_initialization/multiplayer_wait.cpp
    M src/game_initialization/playcampaign.cpp
    M src/game_launcher.cpp
    M src/game_preferences.cpp
    M src/game_state.cpp
    M src/game_state.hpp
    M src/generators/cave_map_generator.cpp
    M src/generators/cave_map_generator.hpp
    M src/generators/default_map_generator.cpp
    M src/generators/default_map_generator_job.cpp
    M src/generators/default_map_generator_job.hpp
    M src/generators/map_generator.hpp
    M src/gui/auxiliary/filter.hpp
    M src/gui/dialogs/editor/editor_edit_label.hpp
    M src/gui/dialogs/editor_set_starting_position.cpp
    M src/gui/dialogs/gamestate_inspector.cpp
    M src/gui/dialogs/label_settings.cpp
    M src/gui/dialogs/lobby/lobby_data.cpp
    M src/gui/dialogs/lobby/lobby_info.cpp
    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_recruit.cpp
    M src/gui/widgets/minimap.cpp
    M src/halo.hpp
    M src/help/help.cpp
    M src/help/help_impl.cpp
    M src/help/help_topic_generators.cpp
    M src/hotkey/hotkey_handler.cpp
    M src/hotkey/hotkey_handler_sp.cpp
    M src/image.hpp
    M src/joystick.hpp
    M src/leader_scroll_dialog.cpp
    R src/map.cpp
    R src/map.hpp
    A src/map/exception.hpp
    A src/map/label.cpp
    A src/map/label.hpp
    A src/map/location.cpp
    A src/map/location.hpp
    A src/map/map.cpp
    A src/map/map.hpp
    A src/map/utils.hpp
    R src/map_exception.hpp
    R src/map_label.cpp
    R src/map_label.hpp
    R src/map_location.cpp
    R src/map_location.hpp
    R src/map_utils.hpp
    M src/menu_events.cpp
    M src/menu_events.hpp
    M src/minimap.cpp
    M src/minimap.hpp
    M src/mouse_events.cpp
    M src/mouse_events.hpp
    M src/mouse_handler_base.hpp
    M src/movetype.cpp
    M src/pathfind/astarsearch.cpp
    M src/pathfind/pathfind.cpp
    M src/pathfind/pathfind.hpp
    M src/pathfind/teleport.cpp
    M src/pathfind/teleport.hpp
    M src/pathutils.cpp
    M src/pathutils.hpp
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/playmp_controller.cpp
    M src/playsingle_controller.cpp
    M src/playturn.cpp
    M src/preferences.hpp
    M src/recall_list_manager.cpp
    M src/recall_list_manager.hpp
    M src/replay.cpp
    M src/replay.hpp
    M src/replay_helper.cpp
    M src/reports.cpp
    M src/savegame.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/lua_api.cpp
    M src/scripting/lua_api.hpp
    M src/scripting/lua_common.hpp
    M src/scripting/lua_map_location_ops.cpp
    M src/scripting/lua_pathfind_cost_calculator.hpp
    M src/scripting/lua_race.cpp
    M src/scripting/lua_unit_type.cpp
    M src/scripting/push_check.hpp
    M src/server/server.cpp
    M src/side_filter.cpp
    M src/soundsource.hpp
    M src/statistics.cpp
    M src/statistics_dialog.cpp
    M src/synced_commands.cpp
    M src/synced_context.cpp
    M src/team.cpp
    M src/team.hpp
    M src/teambuilder.cpp
    R src/terrain.cpp
    R src/terrain.hpp
    A src/terrain/builder.cpp
    A src/terrain/builder.hpp
    A src/terrain/filter.cpp
    A src/terrain/filter.hpp
    A src/terrain/terrain.cpp
    A src/terrain/terrain.hpp
    A src/terrain/translation.cpp
    A src/terrain/translation.hpp
    A src/terrain/type_data.cpp
    A src/terrain/type_data.hpp
    R src/terrain_builder.cpp
    R src/terrain_builder.hpp
    R src/terrain_filter.cpp
    R src/terrain_filter.hpp
    R src/terrain_translation.cpp
    R src/terrain_translation.hpp
    R src/terrain_type_data.cpp
    R src/terrain_type_data.hpp
    M src/tests/gui/test_save_dialog.cpp
    M src/tests/test_recall_list.cpp
    M src/tests/test_unit_map.cpp
    M src/tests/utils/fake_display.cpp
    M src/tests/utils/game_config_manager.cpp
    M src/tests/utils/play_scenario.cpp
    M src/tod_manager.cpp
    M src/tod_manager.hpp
    R src/unit.cpp
    R src/unit.hpp
    R src/unit_abilities.cpp
    R src/unit_abilities.hpp
    R src/unit_animation.cpp
    R src/unit_animation.hpp
    R src/unit_animation_component.cpp
    R src/unit_animation_component.hpp
    R src/unit_attack_type.cpp
    R src/unit_attack_type.hpp
    R src/unit_display.cpp
    R src/unit_display.hpp
    R src/unit_drawer.cpp
    R src/unit_drawer.hpp
    R src/unit_filter.cpp
    R src/unit_filter.hpp
    R src/unit_formula_manager.cpp
    R src/unit_formula_manager.hpp
    R src/unit_frame.cpp
    R src/unit_frame.hpp
    R src/unit_helper.cpp
    R src/unit_helper.hpp
    R src/unit_id.cpp
    R src/unit_id.hpp
    R src/unit_map.cpp
    R src/unit_map.hpp
    R src/unit_ptr.hpp
    R src/unit_types.cpp
    R src/unit_types.hpp
    A src/units/abilities.cpp
    A src/units/abilities.hpp
    A src/units/animation.cpp
    A src/units/animation.hpp
    A src/units/animation_component.cpp
    A src/units/animation_component.hpp
    A src/units/attack_type.cpp
    A src/units/attack_type.hpp
    A src/units/drawer.cpp
    A src/units/drawer.hpp
    A src/units/filter.cpp
    A src/units/filter.hpp
    A src/units/formula_manager.cpp
    A src/units/formula_manager.hpp
    A src/units/frame.cpp
    A src/units/frame.hpp
    A src/units/helper.cpp
    A src/units/helper.hpp
    A src/units/id.cpp
    A src/units/id.hpp
    A src/units/map.cpp
    A src/units/map.hpp
    A src/units/ptr.hpp
    A src/units/types.cpp
    A src/units/types.hpp
    A src/units/udisplay.cpp
    A src/units/udisplay.hpp
    A src/units/unit.cpp
    A src/units/unit.hpp
    M src/variable.cpp
    M src/whiteboard/action.cpp
    M src/whiteboard/action.hpp
    M src/whiteboard/attack.cpp
    M src/whiteboard/highlighter.cpp
    M src/whiteboard/highlighter.hpp
    M src/whiteboard/manager.cpp
    M src/whiteboard/manager.hpp
    M src/whiteboard/mapbuilder.cpp
    M src/whiteboard/move.cpp
    M src/whiteboard/recall.cpp
    M src/whiteboard/recall.hpp
    M src/whiteboard/recruit.cpp
    M src/whiteboard/recruit.hpp
    M src/whiteboard/side_actions.cpp
    M src/whiteboard/suppose_dead.cpp
    M src/whiteboard/typedefs.hpp
    M src/whiteboard/utility.cpp

  Log Message:
  -----------
  Consolidate related files into subdirectories


Compare: https://github.com/wesnoth/wesnoth/compare/6e37603538c6...bc711f5f4327


More information about the Commits mailing list