0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:wesnoth/wesnoth-old

Browse source
This commit is contained in:
Alexander van Gessel 2013-12-22 04:16:09 +01:00
commit c825dd0e72
6 changed files with 316 additions and 324 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg
View file

@ -33,6 +33,13 @@
user_team_name= _ "team_name^Quenoth Elves"
[/side]
# These two are referred to for searching the recall list, but wmllint
# will still complain about "unknown '<NAME>' referred to by id" without
# these comments.
#
# wmllint: recognize Nym
# wmllint: recognize Zhul
# Prestart functions:
[event]

3
data/multiplayer/eras.cfg
View file

@ -201,6 +201,9 @@
[era]
id=era_khalifate
name= _ "Default + Khalifate"
description= _ "An era featuring an additional faction besides the six factions from Default Era. Khalifate units use no magic, but instead rely on careful use of terrain and coordinated strikes around dusk or dawn.
This era is still under development, so please be sure to report any problems that arise."
{ERA_DEFAULT}
{multiplayer/factions/khalifate.cfg}

1
data/scenario-test.cfg
View file

@ -231,7 +231,6 @@ Xu , Xu , Qxu , Qxu , Ql , Ql
range=ranged
[/effect]
[/object]
[/modifications]
[abilities]
{ABILITY_SKIRMISHER}

14
data/themes/default.cfg
View file

@ -254,7 +254,6 @@
yanchor=fixed
[/label]
[label]
id=gold-icon
icon=themes/gold.png
@ -302,7 +301,6 @@
[/label]
[status]
[zoom_level]
id=zoom-level
ref=map-zoom-slider
@ -337,7 +335,6 @@
yanchor=fixed
[/terrain]
# the time of day image
[time_of_day]
id=image-tod
@ -584,7 +581,6 @@
xanchor=right
yanchor=top
[/unit_weapons]
[/status]
{REPLAY_THEME {DEFAULT_FONT_SMALL}}
@ -602,9 +598,9 @@
image=themes/editor/classic/minimap-800.png
rect="843,=+2,+181,+155"
[/change]
# # increase size in middle panel since minimap is smaller
# increase size in middle panel since minimap is smaller
# # reduce size of minimap
# reduce size of minimap
[change]
id=mini-map
rect="=+51,=+10,=-14,+131"
@ -623,7 +619,6 @@
#id=zoom_in_button_editor
#ref=zoom_default_button_editor
rect="=,+20,+25,+25"
[/change]
[change]
id=minimap_button_3
@ -642,8 +637,6 @@
rect="=,+2,+25,+25"
[/change]
# {CHANGE_STATUS_BOX =+9 +1 +122 +36 tod}
# {CHANGE_STATUS_BOX =-125 +2 +72 +72 unit}
@ -696,9 +689,6 @@
# rect="=,+0,=,+11"
# [/change]
# # [change]
# # id=unit-description
# # rect="=+3,+2,+200,+18"

1
data/themes/macros.cfg
View file

@ -179,7 +179,6 @@
[/change]
#enddef
#define COUNTDOWN_THEME
{STATUS_BOX +5 =+0 +90 +15 timeout income-box-topright fixed fixed}
[label]

10
data/themes/pandora.cfg
View file

@ -60,8 +60,6 @@
# rightside panel
{STATUS_BOX =+1 =+3 794 271 minimap sidebar-panel fixed fixed}
[mini_map]
@ -124,7 +122,6 @@
{STATUS_BOX +4 =+15 +122 +36 tod menu-main fixed fixed}
{STATUS_BOX =-2 +2 +57 +15 gold zoom-default-button fixed fixed}
{STATUS_BOX = =+1 +57 +15 income gold-box-botleft fixed fixed}
{STATUS_BOX = =+1 +57 +15 countdown income-box-botleft fixed fixed}
@ -187,7 +184,6 @@ Turn"
[/label]
[status]
## The size of these rectangles only accommodates hex coordinates
## up to 999.
[position]
@ -222,7 +218,7 @@ Turn"
yanchor=fixed
[/tod_stats]
# #put the side playing indicator next to the turn indicator
#put the side playing indicator next to the turn indicator
[side_playing]
id=icon-sideplaying
ref=turn-box-center
@ -232,7 +228,7 @@ Turn"
yanchor=fixed
[/side_playing]
# # the game status
# the game status
[turn]
id=turn
font_size={DEFAULT_FONT_SMALL}
@ -360,12 +356,10 @@ Turn"
# xanchor=fixed
# yanchor=fixed
#[/unit_defense]
[/status]
#{REPLAY_THEME {DEFAULT_FONT_SMALL}}
[/resolution]
[/theme]
#undef DEFAULT_FONT_NORMAL