summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2011-08-24 22:42:17 +0200
committerReid <reidyaro@gmail.com>2011-08-24 22:42:17 +0200
commit43c19a8321bd0c4bcf36655d74e895397aff7eea (patch)
treec8f7933367ae1e757a3166a04772274896d58c9c /data
parentc1ec2b921389cb5c44d9ae572ea4851891cf8bc9 (diff)
parent9505e3789cc9db6a10a68b9794a586604271b76f (diff)
downloadmv-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.gz
mv-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.bz2
mv-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.xz
mv-43c19a8321bd0c4bcf36655d74e895397aff7eea.zip
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'data')
-rw-r--r--data/fonts/dejavusans-bold.ttfbin672300 -> 672300 bytes
-rw-r--r--data/fonts/dejavusans.ttfbin720012 -> 720012 bytes
-rw-r--r--data/fonts/dejavusansmono-bold.ttfbin313856 -> 313856 bytes
-rw-r--r--data/fonts/dejavusansmono.ttfbin333636 -> 333636 bytes
-rw-r--r--data/fonts/mplus-1p-bold.ttfbin1013984 -> 1054004 bytes
-rw-r--r--data/fonts/mplus-1p-regular.ttfbin1016044 -> 1049988 bytes
-rw-r--r--data/graphics/gui/colors.xml5
-rw-r--r--data/help/tips/13.txt2
-rw-r--r--data/themes/blackwood/colors.xml5
-rw-r--r--data/themes/enchilado/colors.xml7
-rw-r--r--data/themes/mana/colors.xml5
-rw-r--r--data/themes/pink/colors.xml5
-rw-r--r--data/themes/redandblack/colors.xml5
-rw-r--r--data/themes/wood/colors.xml5
14 files changed, 37 insertions, 2 deletions
diff --git a/data/fonts/dejavusans-bold.ttf b/data/fonts/dejavusans-bold.ttf
index 5808f5e51..e5991cc44 100644
--- a/data/fonts/dejavusans-bold.ttf
+++ b/data/fonts/dejavusans-bold.ttf
Binary files differ
diff --git a/data/fonts/dejavusans.ttf b/data/fonts/dejavusans.ttf
index 4c9b0aa55..072c14e76 100644
--- a/data/fonts/dejavusans.ttf
+++ b/data/fonts/dejavusans.ttf
Binary files differ
diff --git a/data/fonts/dejavusansmono-bold.ttf b/data/fonts/dejavusansmono-bold.ttf
index f9c8026b3..a2bd7b0da 100644
--- a/data/fonts/dejavusansmono-bold.ttf
+++ b/data/fonts/dejavusansmono-bold.ttf
Binary files differ
diff --git a/data/fonts/dejavusansmono.ttf b/data/fonts/dejavusansmono.ttf
index f1cc7a34e..4e0848b4b 100644
--- a/data/fonts/dejavusansmono.ttf
+++ b/data/fonts/dejavusansmono.ttf
Binary files differ
diff --git a/data/fonts/mplus-1p-bold.ttf b/data/fonts/mplus-1p-bold.ttf
index 75bca9845..ca127dd28 100644
--- a/data/fonts/mplus-1p-bold.ttf
+++ b/data/fonts/mplus-1p-bold.ttf
Binary files differ
diff --git a/data/fonts/mplus-1p-regular.ttf b/data/fonts/mplus-1p-regular.ttf
index 340b6705e..9c71c2ef3 100644
--- a/data/fonts/mplus-1p-regular.ttf
+++ b/data/fonts/mplus-1p-regular.ttf
Binary files differ
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index df42dcdfd..2091494b3 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" />
diff --git a/data/help/tips/13.txt b/data/help/tips/13.txt
index da68593f6..5587cff28 100644
--- a/data/help/tips/13.txt
+++ b/data/help/tips/13.txt
@@ -1,2 +1,2 @@
You can use mumble voice chat for talking with other players.
-Start mumble before client start and enable mumber in settings.
+Start mumble before client start and enable mumble in settings.
diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml
index 51eba63fe..ef06fdc9f 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" />
diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml
index e7ab17da2..f4ae878e4 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" />
diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml
index 557ba34d5..c623b8396 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" />
diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml
index b49be8015..6be3ab630 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" />
diff --git a/data/themes/redandblack/colors.xml b/data/themes/redandblack/colors.xml
index 50384ce3a..8fe785114 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" />
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index 13d942d62..1f1ac1776 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" />
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-25 21:27:59 +0000