Commit by fendrin :: r52998 /trunk/src/ (2 files in 2 dirs):

Throw the right exception if the dialog gets canceled.
Preselection for the current difficulty level.

Commit by shadowmaster :: r52997 /trunk/src/ (2 files):

Remove unused support for saving hotkeys to arbitrary WML objects

This change is entirely internal and has no user-facing aspects.

Commit by anonymissimus :: r52996 /trunk/data/lua/helper.lua:

update helper.lua to use wesnoth.wml_actions instead of wesnoth.fire
(patch #3040 by SigurdFireDragon, slightly modified)

Commit by anonymissimus :: r52995 /trunk/data/ (multiplayer/eras.cfg scenario-test.cfg):

adapt mainline lua and embedded lua to the deprecations I made in r52978

(no occurrences in other files...)

Commit by shadowmaster :: r52994 /branches/1.10/changelog:

Update changelog

Commit by anonymissimus :: r52993 /trunk/ (changelog players_changelog):

changelog update

Commit by anonymissimus :: r52992 /branches/1.10/ (changelog players_changelog):

changelog update

Commit by elvish_hunter :: r52991 /trunk/ (changelog data/lua/wml-tags.lua):

[find_path]: length -> hexes

Commit by elvish_hunter :: r52990 /trunk/ (2 files in 2 dirs):

Fixed General's experience when using DISABLE_GRAND_MARSHAL

Commit by alarantalara :: r52989 /trunk/changelog:

update other changelog

Commit by alarantalara :: r52988 /branches/1.10/changelog:

update changelog

Commit by shadowmaster :: r52987 /trunk/ (4 files in 3 dirs):

Implement ~BLEND(r,g,b,o) image path function (bug #11590)

It takes a specified RGB color and blends it with the target image by
certain opacity, specified either as a factor (e.g. 0.25) or percentage
(25%).

I chose BLEND over TINT for consistency with AnimationWML. Feel free to
discuss.

Commit by anonymissimus :: r52986 /trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg:

fix keys which got lost on some macro deprecation (fix for bug #19400)

Commit by anonymissimus :: r52985 /branches/1.10/data/multiplayer/scenarios/6p_Team_Survival.cfg:

fix keys which got lost on some macro deprecation (fix for bug #19400)

Backported from trunk.

Commit by alarantalara :: r52984 /branches/1.10/src/terrain.cpp:

Backport r52983 to 1.10. Fixes bug #19411

Commit by alarantalara :: r52983 /trunk/src/terrain.cpp:

Look in more locations for the description of mixed terrain
If overlay description not present, try overlay name, then base description
Fixes bug #19411

Commit by fendrin :: r52982 /trunk/src/savegame.cpp:

code cleanup

Commit by fendrin :: r52981 /trunk/src/ (6 files):

Separated the difficulty dialog call from the filename one when loading a savefile.

Commit by anonymissimus :: r52980 /trunk/changelog:

changelog update

Commit by anonymissimus :: r52979 /trunk/data/ (3 files in 2 dirs):

rename compatibility-1.8.lua to backwards-compatibility