[Commits] [wesnoth/wesnoth] d7acb1: Revert "Added util function for converting an RGB ...

GitHub noreply at github.com
Thu Dec 10 21:12:22 UTC 2015


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: d7acb178d28babf7546f938e7b2a1b8ebc447d06
      https://github.com/wesnoth/wesnoth/commit/d7acb178d28babf7546f938e7b2a1b8ebc447d06
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-10 (Thu, 10 Dec 2015)

  Changed paths:
    M src/formula_function.cpp
    M src/game_display.cpp
    M src/game_display.hpp
    M src/game_events/action_wml.cpp
    M src/help/help_text_area.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/sdl/utils.cpp
    M src/sdl/utils.hpp
    M src/unit_frame.cpp

  Log Message:
  -----------
  Revert "Added util function for converting an RGB string to color"

And also other commits that used that function.

This reverts commit 0d8c008018996c8a147051464a51925a265f7983.
This reverts commit 956e5f932259517fd45efa4fcdffa60542a95d45.
This reverts commit 8f35c4bfcfd3b029ef17d3a3626d5c013a8d0a5d.
This reverts commit dcb265ae701d14fecdc66097d7ee26cd05abb080.

This commit just contained too many bugs, including:
1) string_to_color not parsing any input correctly
2) string_to_color segfaulting on some input strings
3) missing backwards compability in [unstore_unit]


  Commit: 7f13156c289d02ea2ca18be6be54089b8b641488
      https://github.com/wesnoth/wesnoth/commit/7f13156c289d02ea2ca18be6be54089b8b641488
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-10 (Thu, 10 Dec 2015)

  Changed paths:
    M data/test/maps/pathfind_1.cfg
    M data/test/scenarios/filter_vision.cfg
    M data/test/scenarios/has_ally.cfg
    M data/test/scenarios/move_skip_sighted.cfg
    M data/test/scenarios/test_check_victory.cfg
    M data/test/scenarios/test_move.cfg
    M src/ai/formula/function_table.cpp
    M src/ai/testing/ca_global_fallback.cpp
    M src/display.cpp
    M src/display.hpp
    M src/display_context.cpp
    M src/editor/action/action_label.cpp
    M src/editor/action/action_label.hpp
    M src/editor/action/mouse/mouse_action_map_label.cpp
    M src/editor/map/context_manager.cpp
    M src/editor/map/map_context.cpp
    M src/game_config.cpp
    M src/game_config.hpp
    M src/game_display.cpp
    M src/game_display.hpp
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/connect_engine.hpp
    M src/game_initialization/create_engine.cpp
    M src/game_initialization/multiplayer.cpp
    M src/game_initialization/multiplayer_wait.cpp
    M src/gui/dialogs/editor/editor_edit_label.cpp
    M src/gui/dialogs/editor/editor_edit_side.cpp
    M src/gui/dialogs/editor/editor_edit_side.hpp
    M src/gui/dialogs/label_settings.cpp
    M src/leader_scroll_dialog.cpp
    M src/map_label.cpp
    M src/map_label.hpp
    M src/menu_events.cpp
    M src/overlay.hpp
    M src/replay.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/lua_team.cpp
    M src/server/game.cpp
    M src/server/game.hpp
    M src/side_filter.cpp
    M src/team.cpp
    M src/team.hpp
    M src/tests/test_team.cpp

  Log Message:
  -----------
  Revert "Rename team_name/user_team_name to team_id/team_name (old syntax still valid)"

And related commits.

This reverts commit 545253ec2b117b413e7ef40e06e65d358ce20f77.
This reverts commit 1215f65eb875cc3070e8d087ce699c0a2ff8d8b0.
This reverts commit 11664f4024cb760de7db5fec54661cd14fc05ac8.
This reverts commit e948df3424657c5843b1fb65a1319449bb6311bc.
This reverts commit 3781e7839f29915292a2452c37b08a1e1fce9841.

This commits were reverted to exclude them from wesnoth 1.13.2 release because:
1) We are still unsure about the best name oftthese attributes
2) This breaks multiple campaigns, including LoW and the tutorial.
Feel free to revert this revert after 1.13.2 when thse issues can be solved..


Compare: https://github.com/wesnoth/wesnoth/compare/667d6910bedb...7f13156c289d


More information about the Commits mailing list