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

10 files changed, 108 insertions, 2 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" />
diff --git a/data/graphics/sprites/manaplus_emote.xml b/data/graphics/sprites/manaplus_emote.xml
index 55f5cc91f..8f27c4f83 100644
--- a/data/graphics/sprites/manaplus_emote.xml
+++ b/data/graphics/sprites/manaplus_emote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<sprite variants="24" variant_offset="1">
+<sprite variants="25" variant_offset="1">
     <imageset name="base" src="graphics/sprites/manaplus_emotions.png" width="30" height="32" />
 
     <action name="stand" imageset="base">
diff --git a/data/graphics/sprites/manaplus_emotes.xml b/data/graphics/sprites/manaplus_emotes.xml
index 9263c2d49..38628dc30 100644
--- a/data/graphics/sprites/manaplus_emotes.xml
+++ b/data/graphics/sprites/manaplus_emotes.xml
@@ -23,4 +23,5 @@
     <emote id="121"><sprite name="Epic" variant="21">manaplus_emote.xml</sprite></emote>
     <emote id="122"><sprite name="Bad geek" variant="22">manaplus_emote.xml</sprite></emote>
     <emote id="123"><sprite name="Mimi" variant="23">manaplus_emote.xml</sprite></emote>
+    <emote id="124"><sprite name="Alien" variant="24">manaplus_emote.xml</sprite></emote>
 </emotes>
diff --git a/data/graphics/sprites/manaplus_emotions.png b/data/graphics/sprites/manaplus_emotions.png
index a3c29e164..c6f49ff29 100644
--- a/data/graphics/sprites/manaplus_emotions.png
+++ b/data/graphics/sprites/manaplus_emotions.png
diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml
index 51eba63fe..523d164c7 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -2,6 +2,7 @@
 	<color id="TEXT" color="#7a7972" />
 	<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="#ff00d8" />
 	<color id="GUILD_SOCIAL_TAB" color="#ff00d8" />
 	<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="#361c00" />
 	<color id="TAB_FLASH" color="#000000" 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="#744c04" />
 	<color id="GM" color="#ff0000" />
 	<color id="PLAYER" color="#00ff00" />
@@ -43,6 +48,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" />
diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml
index e7ab17da2..0c19f5a47 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/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,16 +12,20 @@
 	<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="#009000" />
 	<color id="WHISPER" color="#0000ff" />
-    <color id="WHISPER_OFFLINE" color="#000050" />
+	<color id="WHISPER_OFFLINE" color="#000050" />
 	<color id="IS" color="#705000" />
 	<color id="SERVER" color="#8415e2" />
 	<color id="LOGGER" color="#919191" />
@@ -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" />
diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml
index 557ba34d5..45937e268 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/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="#ff00d8" />
 	<color id="GUILD_SOCIAL_TAB" color="#ff00d8" />
 	<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="#c0c0c0" />
 	<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" />
diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml
index b49be8015..f2b20567e 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -2,6 +2,7 @@
 	<color id="TEXT" color="#FF00FF" />
 	<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="#FF00FF" />
 	<color id="BUTTON_DISABLED" color="#FF00FF" />
@@ -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="#FFFEFF" />
 	<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="#FF00FF" />
 	<color id="GM" color="#ff0000" />
 	<color id="PLAYER" color="#009000" />
@@ -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" />
diff --git a/data/themes/redandblack/colors.xml b/data/themes/redandblack/colors.xml
index 50384ce3a..d5e6a7f7b 100644
--- a/data/themes/redandblack/colors.xml
+++ b/data/themes/redandblack/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="#ff00d8" />
 	<color id="GUILD_SOCIAL_TAB" color="#ff00d8" />
 	<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="#c0c0c0" />
 	<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="#1fa052" />
@@ -44,6 +49,16 @@
 	<color id="WARNING" color="#0000FF" />
 	<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" />
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index 13d942d62..606b45301 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/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="#cccccc" />
@@ -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" />