add border fade-out to the editor
code changes by mordante, gimp-magic/theming by me
|
@ -1,4 +1,7 @@
|
|||
Version 1.3.18+svn:
|
||||
* map editor:
|
||||
* activate border transitions in the editor using more translucent images
|
||||
than used ingame
|
||||
* language and i18n:
|
||||
* updated translations: Chinese, Czech, Danish, Filipino, French, Hungarian,
|
||||
Italian, Lithuanian, Polish, Turkish
|
||||
|
|
After Width: | Height: | Size: 2.7 KiB |
After Width: | Height: | Size: 3.1 KiB |
BIN
data/core/images/terrain/off-map/fade_border_left_editor.png
Normal file
After Width: | Height: | Size: 3.3 KiB |
BIN
data/core/images/terrain/off-map/fade_border_right_editor.png
Normal file
After Width: | Height: | Size: 3.3 KiB |
BIN
data/core/images/terrain/off-map/fade_border_top_even_editor.png
Normal file
After Width: | Height: | Size: 3 KiB |
BIN
data/core/images/terrain/off-map/fade_border_top_odd_editor.png
Normal file
After Width: | Height: | Size: 2.7 KiB |
After Width: | Height: | Size: 2.2 KiB |
After Width: | Height: | Size: 2.2 KiB |
After Width: | Height: | Size: 4 KiB |
BIN
data/core/images/terrain/off-map/fade_corner_top_left_editor.png
Normal file
After Width: | Height: | Size: 3.9 KiB |
After Width: | Height: | Size: 3.9 KiB |
After Width: | Height: | Size: 2.1 KiB |
|
@ -523,7 +523,7 @@
|
|||
yanchor=top
|
||||
[/main_map]
|
||||
|
||||
#not shown/used in the editor but might eventually be activated...
|
||||
# use a more transparent set for the borders than is used ingame
|
||||
[main_map_border]
|
||||
border_size = 0.5
|
||||
background_image = "terrain/off-map/background.png"
|
||||
|
@ -533,25 +533,25 @@
|
|||
# and the '.png' suffix
|
||||
tile_image = "off-map/alpha"
|
||||
|
||||
corner_image_top_left = "terrain/off-map/fade_corner_top_left.png"
|
||||
corner_image_bottom_left = "terrain/off-map/fade_corner_bottom_left.png"
|
||||
corner_image_top_left = "terrain/off-map/fade_corner_top_left_editor.png"
|
||||
corner_image_bottom_left = "terrain/off-map/fade_corner_bottom_left_editor.png"
|
||||
|
||||
# odd means the corner is on a tile with an odd x value,
|
||||
# the tile is the ingame tile not the odd in C++
|
||||
corner_image_top_right_odd = "terrain/off-map/fade_corner_top_right_odd.png"
|
||||
corner_image_top_right_even = "terrain/off-map/fade_corner_top_right_even.png"
|
||||
corner_image_top_right_odd = "terrain/off-map/fade_corner_top_right_odd_editor.png"
|
||||
corner_image_top_right_even = "terrain/off-map/fade_corner_top_right_even_editor.png"
|
||||
|
||||
corner_image_bottom_right_odd = "terrain/off-map/fade_corner_bottom_right_odd.png"
|
||||
corner_image_bottom_right_even = "terrain/off-map/fade_corner_bottom_right_even.png"
|
||||
corner_image_bottom_right_odd = "terrain/off-map/fade_corner_bottom_right_odd_editor.png"
|
||||
corner_image_bottom_right_even = "terrain/off-map/fade_corner_bottom_right_even_editor.png"
|
||||
|
||||
border_image_left = "terrain/off-map/fade_border_left.png"
|
||||
border_image_right = "terrain/off-map/fade_border_right.png"
|
||||
border_image_left = "terrain/off-map/fade_border_left_editor.png"
|
||||
border_image_right = "terrain/off-map/fade_border_right_editor.png"
|
||||
|
||||
border_image_top_odd = "terrain/off-map/fade_border_top_odd.png"
|
||||
border_image_top_even = "terrain/off-map/fade_border_top_even.png"
|
||||
border_image_top_odd = "terrain/off-map/fade_border_top_odd_editor.png"
|
||||
border_image_top_even = "terrain/off-map/fade_border_top_even_editor.png"
|
||||
|
||||
border_image_bottom_odd = "terrain/off-map/fade_border_bottom_odd.png"
|
||||
border_image_bottom_even = "terrain/off-map/fade_border_bottom_even.png"
|
||||
border_image_bottom_odd = "terrain/off-map/fade_border_bottom_odd_editor.png"
|
||||
border_image_bottom_even = "terrain/off-map/fade_border_bottom_even_editor.png"
|
||||
[/main_map_border]
|
||||
|
||||
# rightside panel
|
||||
|
|
|
@ -4,11 +4,15 @@ changelog: http://svn.gna.org/viewcvs/*checkout*/wesnoth/trunk/changelog
|
|||
|
||||
Version 1.3.18+svn:
|
||||
* Language and translations
|
||||
* Updated translations: Chinese, Czech, Danish, Filipino, French, Italian,
|
||||
Lithuanian, Polish, Turkish.
|
||||
* Updated translations: Chinese, Czech, Danish, Filipino, French, Hungarian,
|
||||
Italian, Lithuanian, Polish, Turkish.
|
||||
|
||||
* Map Editor:
|
||||
* Activate border transitions in the editor using more translucent images
|
||||
than used ingame.
|
||||
|
||||
* Miscellaneous and bug fixes
|
||||
* Idle, standing and selection animations are not accelerated anymore
|
||||
* Idle, standing and selection animations are not accelerated anymore.
|
||||
|
||||
|
||||
Version 1.3.18:
|
||||
|
|
|
@ -97,6 +97,12 @@ void editor_display::draw(bool update,bool force)
|
|||
tile_stack_append(mouseover_hex_overlay_);
|
||||
|
||||
tile_stack_render(xpos, ypos);
|
||||
|
||||
// If the tile is at the border, we start to blend it
|
||||
if(!map_.on_board(*it) &&
|
||||
(map_.get_terrain(*it) != t_translation::OFF_MAP_USER)) {
|
||||
draw_border(*it, xpos, ypos);
|
||||
}
|
||||
}
|
||||
|
||||
invalidated_.clear();
|
||||
|
|