diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
| commit | 62ec17f6e489ec50f17219444468aeb8969dc961 (patch) | |
| tree | 350d7edb5c26c282a4e1906544536d68831228ac /data/graphics/gui | |
| parent | 71d924d7dcdac067f02a317e9353ee067dbd0bde (diff) | |
| parent | fd484fc70fca32ff9065b91c175089b65aa3fd26 (diff) | |
| download | manaplus-62ec17f6e489ec50f17219444468aeb8969dc961.tar.gz manaplus-62ec17f6e489ec50f17219444468aeb8969dc961.tar.bz2 manaplus-62ec17f6e489ec50f17219444468aeb8969dc961.tar.xz manaplus-62ec17f6e489ec50f17219444468aeb8969dc961.zip | |
Merge branch 'master' into strippedstripped1.1.9.4
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/include/guichan/basiccontainer.hpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'data/graphics/gui')
| -rw-r--r-- | data/graphics/gui/colors.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index df42dcdfd..4203b482c 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -2,6 +2,7 @@ <color id="TEXT" color="#000000" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#000000" /> + <color id="BORDER" color="#000000" /> <color id="PROGRESS_BAR" color="#ffffff" /> <color id="BUTTON" color="#000000" /> <color id="BUTTON_DISABLED" color="#333333" /> @@ -11,11 +12,15 @@ <color id="GUILD_CHAT_TAB" color="#f48055" /> <color id="GUILD_SOCIAL_TAB" color="#f48055" /> <color id="BACKGROUND" color="#ffffff" /> + <color id="BACKGROUND_GRAY" color="#404040" /> + <color id="SCROLLBAR_GRAY" color="#000000" /> + <color id="DROPDOWN_SHADOW" color="#c0c0c0" /> <color id="HIGHLIGHT" color="#ebc873" /> <color id="TAB_FLASH" color="#ff0000" effect="pulse" /> <color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" /> <color id="SHOP_WARNING" color="#910000" /> <color id="ITEM_EQUIPPED" color="#000091" /> + <color id="ITEM_NOT_EQUIPPED" color="#000000" /> <color id="CHAT" color="#000000" /> <color id="GM" color="#ff0000" /> <color id="PLAYER" color="#003000" /> @@ -44,6 +49,16 @@ <color id="WARNING" color="#FF0000" /> <color id="PLAYER_ADVANCED" color="#005000" /> + <color id="RED" color="#ff0000" /> + <color id="GREEN" color="#009000" /> + <color id="BLUE" color="#0000ff" /> + <color id="ORANGE" color="#e0980e" /> + <color id="YELLOW" color="#f1dc27" /> + <color id="PINK" color="#ff00d8" /> + <color id="PURPLE" color="#8415e2" /> + <color id="GRAY" color="#919191" /> + <color id="BROWN" color="#8e4c17" /> + <progressbar id="DEFAULT" color="#969696" /> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> <progressbar id="MP" color="#1a66e6" /> |