[Commits] [wesnoth/wesnoth] 95bab7: Allow unit_attack() to play an optional list of ex...

Wed Sep 9 10:04:34 UTC 2015

  Branch: refs/heads/sdl2
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 95bab79eab497204d015ff4488a19860fbd5ba37
      https://github.com/wesnoth/wesnoth/commit/95bab79eab497204d015ff4488a19860fbd5ba37
  Author: Lari Nieminen <lari.nieminen at iki.fi>
  Date:   2015-08-28 (Fri, 28 Aug 2015)

  Changed paths:
    M src/unit_display.cpp
    M src/unit_display.hpp

  Log Message:
  -----------
  Allow unit_attack() to play an optional list of extra sounds on a hit

  Commit: f6c6c482de6e036c38d8af28a343cacf477211ae
      https://github.com/wesnoth/wesnoth/commit/f6c6c482de6e036c38d8af28a343cacf477211ae
  Author: Lari Nieminen <lari.nieminen at iki.fi>
  Date:   2015-08-28 (Fri, 28 Aug 2015)

  Changed paths:
    M src/game_config.cpp
    M src/game_config.hpp

  Log Message:
  -----------
  Added list of customizable poison/slow/petrify sounds to game_config

  Commit: 9f27fb73f44bf1c84f3d23bdcd1f81f901ef3a53
      https://github.com/wesnoth/wesnoth/commit/9f27fb73f44bf1c84f3d23bdcd1f81f901ef3a53
  Author: Lari Nieminen <lari.nieminen at iki.fi>
  Date:   2015-08-28 (Fri, 28 Aug 2015)

  Changed paths:
    M src/actions/attack.cpp

  Log Message:
  -----------
  Play poison/slow/petrify sounds from game_config when status inflicted

  Commit: 212ef61fff529fafc6b2955b9ce49dfd5df768ca
      https://github.com/wesnoth/wesnoth/commit/212ef61fff529fafc6b2955b9ce49dfd5df768ca
  Author: Lari Nieminen <lari.nieminen at iki.fi>
  Date:   2015-08-28 (Fri, 28 Aug 2015)

  Changed paths:
    M src/unit_animation.cpp

  Log Message:
  -----------
  Use the poison sound from game_config in "poisoned" animations

  Commit: d89ab75b637475b5f747848348ae64dba0906912
      https://github.com/wesnoth/wesnoth/commit/d89ab75b637475b5f747848348ae64dba0906912
  Author: Lari Nieminen <lari.nieminen at iki.fi>
  Date:   2015-08-29 (Sat, 29 Aug 2015)

  Changed paths:
    M src/game_config.cpp

  Log Message:
  -----------
  Fixed custom status sounds not getting read

  Commit: 252d723dfba1bfa603c1cf0e3ecc5e8d118b7744
      https://github.com/wesnoth/wesnoth/commit/252d723dfba1bfa603c1cf0e3ecc5e8d118b7744
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2015-09-06 (Sun, 06 Sep 2015)

  Changed paths:
    M src/terrain_builder.cpp

  Log Message:
  -----------
  remove support for [terrain_graphics][tile]loc=x,y

loc=x,y was previously undocumented so it's unlikeley that someone used it.
loc=4,2 had the same effect as x,y=4,2

  Commit: 3f0839b98ae41482176bdf7b440a67417b9217bf
      https://github.com/wesnoth/wesnoth/commit/3f0839b98ae41482176bdf7b440a67417b9217bf
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2015-09-06 (Sun, 06 Sep 2015)

  Changed paths:
    M src/terrain_builder.cpp

  Log Message:
  -----------
  Merge pull request #484 from wesnoth/gfgtdf-patch-terrain_loc

remove support for [terrain_graphics][tile]loc=x,y

  Commit: f06030b0f5d57012d3d2cc855c2b7b4bb514a8bd
      https://github.com/wesnoth/wesnoth/commit/f06030b0f5d57012d3d2cc855c2b7b4bb514a8bd
  Author: mattsc <mattsc at MSMB.local>
  Date:   2015-09-06 (Sun, 06 Sep 2015)

  Changed paths:
    M data/ai/micro_ais/cas/ca_fast_attack_utils.lua
    M data/ai/micro_ais/cas/ca_fast_combat.lua
    M data/ai/micro_ais/cas/ca_fast_move.lua
    M data/ai/micro_ais/micro_ai_wml_tag.lua

  Log Message:
  -----------
  Fast Micro AI: add support for [avoid] tags

This can either be an [avoid] tag inside the [micro_ai] tag itself, or
the [avoid] tag of the default AI (e.g. as defined in the side
definition).  If both are given, the former has priority.

  Commit: 10ee2f65d49f5022a3d9d99570fd822302ab629a
      https://github.com/wesnoth/wesnoth/commit/10ee2f65d49f5022a3d9d99570fd822302ab629a
  Author: mattsc <mattsc at MSMB.local>
  Date:   2015-09-06 (Sun, 06 Sep 2015)

  Changed paths:
    M data/ai/micro_ais/cas/ca_fast_combat.lua

  Log Message:
  -----------
  Fast Micro AI: enable support of the default attacks aspect

Attackers and targets can now also be selected through the default
attacks aspect. [filter] and [filter_second] inside the [micro_ai] tag
have priority though, if either of them is given.

  Commit: 8a70775cb3843c0a6d2e1b109c2c3530f8765fe1
      https://github.com/wesnoth/wesnoth/commit/8a70775cb3843c0a6d2e1b109c2c3530f8765fe1
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M src/game_initialization/configure_engine.cpp

  Log Message:
  -----------
  attempt to fix mp entry point selection

  Commit: 6c1e64a4e44ca2abdc1ba288f1991e05f82bcf34
      https://github.com/wesnoth/wesnoth/commit/6c1e64a4e44ca2abdc1ba288f1991e05f82bcf34
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M src/game_initialization/mp_game_utils.cpp

  Log Message:
  -----------
  attempt to fix assertion failure at connect_engine.cpp:876

  Commit: e046f713ed1e2a31f3c2d8fffa2b6a7a9be35bf1
      https://github.com/wesnoth/wesnoth/commit/e046f713ed1e2a31f3c2d8fffa2b6a7a9be35bf1
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-06 (Sun, 06 Sep 2015)

  Changed paths:
    M src/unit_types.cpp

  Log Message:
  -----------
  When patching movetypes, don't let default= override everything

  Commit: cf18825a821c82c30ecc0c1f8379b2d0de0bf432
      https://github.com/wesnoth/wesnoth/commit/cf18825a821c82c30ecc0c1f8379b2d0de0bf432
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-06 (Sun, 06 Sep 2015)

  Changed paths:
    M src/unit_types.cpp

  Log Message:
  -----------
  Merge branch 'CelticMinstrel/movetype'

  Commit: a4b957c347db782b94b14d6a3e33dbc6d6b83930
      https://github.com/wesnoth/wesnoth/commit/a4b957c347db782b94b14d6a3e33dbc6d6b83930
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M data/ai/micro_ais/cas/ca_fast_attack_utils.lua
    M data/ai/micro_ais/cas/ca_fast_combat.lua
    M data/ai/micro_ais/cas/ca_fast_move.lua
    M data/ai/micro_ais/micro_ai_wml_tag.lua
    M src/game_initialization/configure_engine.cpp
    M src/game_initialization/mp_game_utils.cpp
    M src/terrain_builder.cpp
    M src/unit_types.cpp

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

  Commit: 5533d5728ac5f5b30a204811c5ef38a639beff06
      https://github.com/wesnoth/wesnoth/commit/5533d5728ac5f5b30a204811c5ef38a639beff06
  Author: mattsc <mattsc at MSMB.local>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M data/ai/micro_ais/cas/ca_fast_combat.lua
    A data/ai/micro_ais/cas/ca_fast_combat_leader.lua
    M data/ai/micro_ais/micro_ai_wml_tag.lua

  Log Message:
  -----------
  Fast Micro AI: separate out attacks by AI leader

In the previous version, the leader would sometimes leave the keep for
truly suicidal attacks. This commit adds an extra layer of analysis to
evaluate whether an attack position is safe enough.

This evaluation is too expensive to be done for all units for the
purpose of this AI, or even to be done for the leader more than once,
so this is separated out into its own candidate action that is only
evaluated once everything else is done.

  Commit: 5c2927f52df20ce6777cb793906b01a6e57788a5
      https://github.com/wesnoth/wesnoth/commit/5c2927f52df20ce6777cb793906b01a6e57788a5
  Author: Lari Nieminen <lari.nieminen at iki.fi>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M src/actions/attack.cpp

  Log Message:
  -----------
  Moved extra_hit_sounds to a smaller scope

  Commit: 67f868306e8dde0ce914d7369855a219da46ecb2
      https://github.com/wesnoth/wesnoth/commit/67f868306e8dde0ce914d7369855a219da46ecb2
  Author: mattsc <mattsc at MSMB.local>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M data/ai/micro_ais/cas/ca_fast_attack_utils.lua
    M data/ai/micro_ais/cas/ca_fast_combat.lua
    M data/ai/micro_ais/cas/ca_fast_combat_leader.lua

  Log Message:
  -----------
  Fast Micro AI: clean up unused debug output

  Commit: 78e03f33f35770b630e6391226b9ac68bff7ccf6
      https://github.com/wesnoth/wesnoth/commit/78e03f33f35770b630e6391226b9ac68bff7ccf6
  Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M data/tools/wmllint-1.4

  Log Message:
  -----------
  wmllint-1.4: removed tabs

  Commit: 3cbbede2717c948fbf1819248e202aecdc7a49ce
      https://github.com/wesnoth/wesnoth/commit/3cbbede2717c948fbf1819248e202aecdc7a49ce
  Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M data/tools/GUI.pyw

  Log Message:
  -----------
  GUI.pyw: use specific tooltip font

  Commit: 814d9d14781c915b01a73274679cb90b8bcd09ff
      https://github.com/wesnoth/wesnoth/commit/814d9d14781c915b01a73274679cb90b8bcd09ff
  Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M data/tools/GUI.pyw

  Log Message:
  -----------
  GUI.pyw: allow changing tooltip text at runtime

  Commit: 2e574252cb74ae13808f301beb470703f026deee
      https://github.com/wesnoth/wesnoth/commit/2e574252cb74ae13808f301beb470703f026deee
  Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M data/tools/GUI.pyw

  Log Message:
  -----------
  GUI.pyw: added more tooltips

  Commit: 39033be9d3afa3acf9f897557036ea64d25dcec6
      https://github.com/wesnoth/wesnoth/commit/39033be9d3afa3acf9f897557036ea64d25dcec6
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M src/quit_confirmation.cpp
    M src/quit_confirmation.hpp

  Log Message:
  -----------
  Doxygen and other comment formatting

  Commit: e131262080783896db74777b0aefcd86abc968be
      https://github.com/wesnoth/wesnoth/commit/e131262080783896db74777b0aefcd86abc968be
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M data/scenario-test.cfg

  Log Message:
  -----------
  Rephrase a bit of unwieldy Lua that causes issues with my text editor

  Commit: 85a5c1c9c79af7e2567b5e9aefe6725b4331633f
      https://github.com/wesnoth/wesnoth/commit/85a5c1c9c79af7e2567b5e9aefe6725b4331633f
  Author: soliton- <soliton at wesnoth.org>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M src/actions/attack.cpp
    M src/game_config.cpp
    M src/game_config.hpp
    M src/unit_animation.cpp
    M src/unit_display.cpp
    M src/unit_display.hpp

  Log Message:
  -----------
  Merge pull request #478 from ln-zookeeper/status_sounds

Fix problems with animation-based status sounds

  Commit: 05bbd701db2834afed3a9a046f4ec1be328ff7e4
      https://github.com/wesnoth/wesnoth/commit/05bbd701db2834afed3a9a046f4ec1be328ff7e4
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M src/attack_prediction_display.cpp

  Log Message:
  -----------
  Correct transparent damage graphs in SDL2

Alpha channel was set to 0, which means that these graphs are not displayed under SDL2. Changed alpha values to 255 to restore the graphs.

SDL1.2 builds are unaffected because they (at least going by the struct definition) ignore the value fourth colour channel.

Other changes are just white-space formatting.

  Commit: e4ed29c0ce236a1c8a99081f60d6029422aa663e
      https://github.com/wesnoth/wesnoth/commit/e4ed29c0ce236a1c8a99081f60d6029422aa663e
  Author: ln-zookeeper <lari.nieminen at iki.fi>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M data/campaigns/Dead_Water/units/Kraken.cfg
    M data/campaigns/Delfadors_Memoirs/units/Wose_Shaman.cfg
    M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg
    M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg
    M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Witness.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Druid.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Hunter.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Prowler.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Sentinel.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shaman.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shyde.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Nym.cfg
    M data/campaigns/Under_the_Burning_Suns/units/orcs/Dark_Assassin1.cfg
    M data/core/units/elves/Druid.cfg
    M data/core/units/elves/Enchantress.cfg
    M data/core/units/elves/Shaman.cfg
    M data/core/units/elves/Shyde.cfg
    M data/core/units/elves/Sorceress.cfg
    M data/core/units/elves/Sylph.cfg
    M data/core/units/goblins/Direwolf_Rider.cfg
    M data/core/units/goblins/Pillager.cfg
    M data/core/units/humans/Outlaw_Assassin.cfg
    M data/core/units/khalifate/Ghazi.cfg
    M data/core/units/khalifate/Khalid.cfg
    M data/core/units/khalifate/Shuja.cfg
    M data/core/units/merfolk/Entangler.cfg
    M data/core/units/merfolk/Netcaster.cfg
    M data/core/units/monsters/Cuttle_Fish.cfg
    M data/core/units/monsters/Giant_Scorpion.cfg
    M data/core/units/monsters/Giant_Spider.cfg
    M data/core/units/monsters/Water_Serpent.cfg
    M data/core/units/orcs/Assassin.cfg
    M data/core/units/orcs/Nightblade.cfg
    M data/core/units/orcs/Slayer.cfg
    M data/core/units/undead/Corpse_Ghast.cfg
    M data/core/units/undead/Corpse_Ghoul.cfg
    M data/core/units/undead/Corpse_Necrophage.cfg

  Log Message:
  -----------
  Removed all uses of the now unnecessary SOUND:SLOW and SOUND:POISON

  Commit: 632b7f3a6300096e24021075a21c194c865dc297
      https://github.com/wesnoth/wesnoth/commit/632b7f3a6300096e24021075a21c194c865dc297
  Author: ln-zookeeper <lari.nieminen at iki.fi>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M data/game_config.cfg

  Log Message:
  -----------
  Defined slow/poison/petrify status sounds (same as hardcoded defaults)

  Commit: 30fa10eb291dcac20dfeb6d0b2465de247dbba69
      https://github.com/wesnoth/wesnoth/commit/30fa10eb291dcac20dfeb6d0b2465de247dbba69
  Author: ln-zookeeper <lari.nieminen at iki.fi>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M changelog

  Log Message:
  -----------
  Updated changelog

  Commit: fedf2478d3e3225ac1018df9f5c6bd7ad03b85b2
      https://github.com/wesnoth/wesnoth/commit/fedf2478d3e3225ac1018df9f5c6bd7ad03b85b2
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M changelog
    M data/ai/micro_ais/cas/ca_fast_attack_utils.lua
    M data/ai/micro_ais/cas/ca_fast_combat.lua
    A data/ai/micro_ais/cas/ca_fast_combat_leader.lua
    M data/ai/micro_ais/micro_ai_wml_tag.lua
    M data/campaigns/Dead_Water/units/Kraken.cfg
    M data/campaigns/Delfadors_Memoirs/units/Wose_Shaman.cfg
    M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg
    M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg
    M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Witness.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Druid.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Hunter.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Prowler.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Sentinel.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shaman.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shyde.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg
    M data/campaigns/Under_the_Burning_Suns/units/elves/Nym.cfg
    M data/campaigns/Under_the_Burning_Suns/units/orcs/Dark_Assassin1.cfg
    M data/core/units/elves/Druid.cfg
    M data/core/units/elves/Enchantress.cfg
    M data/core/units/elves/Shaman.cfg
    M data/core/units/elves/Shyde.cfg
    M data/core/units/elves/Sorceress.cfg
    M data/core/units/elves/Sylph.cfg
    M data/core/units/goblins/Direwolf_Rider.cfg
    M data/core/units/goblins/Pillager.cfg
    M data/core/units/humans/Outlaw_Assassin.cfg
    M data/core/units/khalifate/Ghazi.cfg
    M data/core/units/khalifate/Khalid.cfg
    M data/core/units/khalifate/Shuja.cfg
    M data/core/units/merfolk/Entangler.cfg
    M data/core/units/merfolk/Netcaster.cfg
    M data/core/units/monsters/Cuttle_Fish.cfg
    M data/core/units/monsters/Giant_Scorpion.cfg
    M data/core/units/monsters/Giant_Spider.cfg
    M data/core/units/monsters/Water_Serpent.cfg
    M data/core/units/orcs/Assassin.cfg
    M data/core/units/orcs/Nightblade.cfg
    M data/core/units/orcs/Slayer.cfg
    M data/core/units/undead/Corpse_Ghast.cfg
    M data/core/units/undead/Corpse_Ghoul.cfg
    M data/core/units/undead/Corpse_Necrophage.cfg
    M data/game_config.cfg
    M data/scenario-test.cfg
    M data/tools/GUI.pyw
    M data/tools/wmllint-1.4
    M src/actions/attack.cpp
    M src/game_config.cpp
    M src/game_config.hpp
    M src/quit_confirmation.cpp
    M src/quit_confirmation.hpp
    M src/unit_animation.cpp
    M src/unit_display.cpp
    M src/unit_display.hpp

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

  Commit: 530ff130be33d91ba67e1e9c22aa6e571a1d00bd
      https://github.com/wesnoth/wesnoth/commit/530ff130be33d91ba67e1e9c22aa6e571a1d00bd
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/attack_prediction_display.cpp

  Log Message:
  -----------
  Merge pull request #485 from wedge009/SDL2_damage_graphs

Compare: https://github.com/wesnoth/wesnoth/compare/91cd168ec82d...530ff130be33