diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-09-18 17:22:00 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-09-18 18:07:58 +0300 |
commit | 9d18345d84b0c294b0fe7743cb263259f8cc9447 (patch) | |
tree | 4b6c8dce89ed13c672f8672f96411e397fb41641 | |
parent | 64fc4f0ccf6cfb25864e67e3f8cf29d4671c64d5 (diff) | |
download | manaverse-9d18345d84b0c294b0fe7743cb263259f8cc9447.tar.gz manaverse-9d18345d84b0c294b0fe7743cb263259f8cc9447.tar.bz2 manaverse-9d18345d84b0c294b0fe7743cb263259f8cc9447.tar.xz manaverse-9d18345d84b0c294b0fe7743cb263259f8cc9447.zip |
Add skill cooldown color.
New color: SKILL_COOLDOWN
-rw-r--r-- | data/graphics/gui/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/blacknblack/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/blackwood/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/enchilado/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/golden-delicious/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/jewelry/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/mana/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/pink/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/unity/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/wood/colors.xml | 1 | ||||
-rw-r--r-- | src/gui/theme.cpp | 3 | ||||
-rw-r--r-- | src/gui/theme.h | 1 |
12 files changed, 13 insertions, 1 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index f876629a1..0b697eff6 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -121,6 +121,7 @@ <color id="STATUS_BAR_OUTLINE" color="#000000" /> <color id="JOB_BAR" color="#ffffff" /> <color id="JOB_BAR_OUTLINE" color="#000000" /> + <color id="SKILL_COOLDOWN" color="#5090ff" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index 3cdf14382..c42bdda57 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -122,6 +122,7 @@ <color id="BROWN" color="#ffffff" /> <color id="OLDCHAT" color="#ffffff" /> <color id="AWAYCHAT" color="#ffffff" /> + <color id="SKILL_COOLDOWN" color="#5090ff" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index 10783b846..951b0035d 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -121,6 +121,7 @@ <color id="BROWN" color="#8e4c17" /> <color id="OLDCHAT" color="#8e4c17" /> <color id="AWAYCHAT" color="#8e4c17" /> + <color id="SKILL_COOLDOWN" color="#5090ff" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index e2ee35822..fbf9321cb 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -122,6 +122,7 @@ <color id="BROWN" color="#8e4c17" /> <color id="OLDCHAT" color="#8e4c17" /> <color id="AWAYCHAT" color="#8e4c17" /> + <color id="SKILL_COOLDOWN" color="#5090ff" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/data/themes/golden-delicious/colors.xml b/data/themes/golden-delicious/colors.xml index 67129f420..6af08729b 100644 --- a/data/themes/golden-delicious/colors.xml +++ b/data/themes/golden-delicious/colors.xml @@ -108,6 +108,7 @@ <color id="JOB_BAR" color="#ffa0a0" /> <color id="JOB_BAR_OUTLINE" color="#221111" /> <color id="SHOP_WARNING" color="#701111" /> + <color id="SKILL_COOLDOWN" color="#5090ff" /> </palette> <palette id="1"> diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml index 616d57db6..0e2961e79 100644 --- a/data/themes/jewelry/colors.xml +++ b/data/themes/jewelry/colors.xml @@ -107,6 +107,7 @@ <color id="STATUS_BAR_OUTLINE" color="#000000" /> <color id="JOB_BAR" color="#ffffff" /> <color id="JOB_BAR_OUTLINE" color="#000000" /> + <color id="SKILL_COOLDOWN" color="#5090ff" /> </palette> <palette id="1"> diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index 9a56ee44e..ea26b3457 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -122,6 +122,7 @@ <color id="BROWN" color="#8e4c17" /> <color id="OLDCHAT" color="#8e4c17" /> <color id="AWAYCHAT" color="#8e4c17" /> + <color id="SKILL_COOLDOWN" color="#5090ff" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index f720bb8fc..b3e2b1f92 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -122,6 +122,7 @@ <color id="BROWN" color="#8e4c17" /> <color id="OLDCHAT" color="#8e4c17" /> <color id="AWAYCHAT" color="#8e4c17" /> + <color id="SKILL_COOLDOWN" color="#b090ff" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index 942f19d77..872a902e2 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -121,6 +121,7 @@ <color id="BROWN" color="#05FF2E" /> <color id="OLDCHAT" color="#05FF2E" /> <color id="AWAYCHAT" color="#05FF2E" /> + <color id="SKILL_COOLDOWN" color="#5090ff" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index f3059f820..2553fffd8 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -122,6 +122,7 @@ <color id="BROWN" color="#8e4c17" /> <color id="OLDCHAT" color="#8e4c17" /> <color id="AWAYCHAT" color="#8e4c17" /> + <color id="SKILL_COOLDOWN" color="#5090ff" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 1d2c1d2b2..03b7b7097 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -838,7 +838,8 @@ static int readColorType(const std::string &type) "OLDCHAT", "OLDCHAT_OUTLINE", "AWAYCHAT", - "AWAYCHAT_OUTLINE" + "AWAYCHAT_OUTLINE", + "SKILL_COOLDOWN" }; if (type.empty()) diff --git a/src/gui/theme.h b/src/gui/theme.h index 282240222..93fd263dd 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -299,6 +299,7 @@ class Theme final : public Palette, OLDCHAT_OUTLINE, AWAYCHAT, AWAYCHAT_OUTLINE, + SKILL_COOLDOWN, THEME_COLORS_END }; |