summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2012-01-25 22:05:36 +0100
committerReid <reidyaro@gmail.com>2012-01-25 22:05:36 +0100
commit8b612abb42853a22c1a9545e2c9280d154646543 (patch)
treef466167087c2b2de4b8aa9e6d1d1986f72f84147 /data
parenta913dd41df61760de6ece552f941e002251ff54c (diff)
parentd340b5a27a8f3b05d1764da9c114f5f59bd0cd46 (diff)
downloadmv-8b612abb42853a22c1a9545e2c9280d154646543.tar.gz
mv-8b612abb42853a22c1a9545e2c9280d154646543.tar.bz2
mv-8b612abb42853a22c1a9545e2c9280d154646543.tar.xz
mv-8b612abb42853a22c1a9545e2c9280d154646543.zip
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'data')
-rw-r--r--data/evol/evol.manaplus17
-rw-r--r--data/evol/images/loginwallpaper_800x600.pngbin0 -> 1481772 bytes
-rw-r--r--data/graphics/CMakeLists.txt9
-rw-r--r--data/graphics/Makefile.am9
-rw-r--r--data/graphics/gui/CMakeLists.txt12
-rw-r--r--data/graphics/gui/Makefile.am12
-rw-r--r--data/graphics/gui/target-cursor-blue-l.pngbin23803 -> 0 bytes
-rw-r--r--data/graphics/gui/target-cursor-blue-m.pngbin18439 -> 0 bytes
-rw-r--r--data/graphics/gui/target-cursor-blue-s.pngbin8353 -> 0 bytes
-rw-r--r--data/graphics/gui/target-cursor-in-range-l.png (renamed from data/graphics/target-cursor-in-range-l.png)bin23803 -> 23803 bytes
-rw-r--r--data/graphics/gui/target-cursor-in-range-m.png (renamed from data/graphics/target-cursor-in-range-m.png)bin18439 -> 18439 bytes
-rw-r--r--data/graphics/gui/target-cursor-in-range-s.png (renamed from data/graphics/target-cursor-in-range-s.png)bin8353 -> 8353 bytes
-rw-r--r--data/graphics/gui/target-cursor-normal-l.png (renamed from data/graphics/target-cursor-normal-l.png)bin25586 -> 25586 bytes
-rw-r--r--data/graphics/gui/target-cursor-normal-m.png (renamed from data/graphics/target-cursor-normal-m.png)bin17950 -> 17950 bytes
-rw-r--r--data/graphics/gui/target-cursor-normal-s.png (renamed from data/graphics/target-cursor-normal-s.png)bin8361 -> 8361 bytes
-rw-r--r--data/graphics/gui/target-cursor-red-l.pngbin25586 -> 0 bytes
-rw-r--r--data/graphics/gui/target-cursor-red-m.pngbin17950 -> 0 bytes
-rw-r--r--data/graphics/gui/target-cursor-red-s.pngbin8361 -> 0 bytes
-rw-r--r--data/help/es/team.txt8
-rw-r--r--data/help/fr/team.txt8
-rw-r--r--data/help/ru/team.txt7
-rw-r--r--data/help/team.txt8
-rw-r--r--data/themes/wood/colors.xml2
-rw-r--r--data/tmw/images/loginwallpaper_800x600.pngbin0 -> 903998 bytes
-rw-r--r--data/tmw/tmw.manaplus17
25 files changed, 67 insertions, 42 deletions
diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus
new file mode 100644
index 000000000..af5c1ea1e
--- /dev/null
+++ b/data/evol/evol.manaplus
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<configuration>
+ <option name="appName" value="Evol Online"/>
+ <option name="appShort" value="mana"/>
+ <option name="appIcon" value="icons/manaplus.png"/>
+ <option name="loginMusic" value="Artis - The Adventure Begins.ogg"/>
+ <option name="onlineServerList" value="http://manaplus.evolonline.org/serverlist.xml"/>
+ <option name="defaultServer" value="world.evolonline.org"/>
+ <option name="defaultPort" value="6901"/>
+ <option name="defaultServerType" value="evol"/>
+ <option name="font" value="fonts/dejavusans.ttf" />
+ <option name="boldFont" value="fonts/dejavusans-bold.ttf" />
+ <option name="theme" value="wood" />
+ <option name="wallpapersPath" value="evol/images/" />
+ <option name="wallpaperFile" value="loginwallpaper_800x600.png" />
+</configuration>
diff --git a/data/evol/images/loginwallpaper_800x600.png b/data/evol/images/loginwallpaper_800x600.png
new file mode 100644
index 000000000..a1fe4f83b
--- /dev/null
+++ b/data/evol/images/loginwallpaper_800x600.png
Binary files differ
diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt
index a46ccfd0e..5a9b0f65b 100644
--- a/data/graphics/CMakeLists.txt
+++ b/data/graphics/CMakeLists.txt
@@ -1,12 +1,3 @@
ADD_SUBDIRECTORY(gui)
ADD_SUBDIRECTORY(images)
ADD_SUBDIRECTORY(sprites)
-
-SET (FILES
- target-cursor-in-range-l.png
- target-cursor-in-range-m.png
- target-cursor-in-range-s.png
- target-cursor-normal-l.png
- target-cursor-normal-m.png
- target-cursor-normal-s.png
- )
diff --git a/data/graphics/Makefile.am b/data/graphics/Makefile.am
index d2f93f584..c0e91d050 100644
--- a/data/graphics/Makefile.am
+++ b/data/graphics/Makefile.am
@@ -1,16 +1,7 @@
graphicsdir = $(pkgdatadir)/data/graphics
-graphics_DATA = \
- target-cursor-in-range-l.png \
- target-cursor-in-range-m.png \
- target-cursor-in-range-s.png \
- target-cursor-normal-l.png \
- target-cursor-normal-m.png \
- target-cursor-normal-s.png
-
EXTRA_DIST = \
- $(graphics_DATA) \
CMakeLists.txt
SUBDIRS = gui images sprites
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 2c6e4b933..aba42b39c 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -33,12 +33,12 @@ SET (FILES
tab.png
tab_hilight.png
tabselected.png
- target-cursor-blue-l.png
- target-cursor-blue-m.png
- target-cursor-blue-s.png
- target-cursor-red-l.png
- target-cursor-red-m.png
- target-cursor-red-s.png
+ target-cursor-in-range-l.png
+ target-cursor-in-range-m.png
+ target-cursor-in-range-s.png
+ target-cursor-normal-l.png
+ target-cursor-normal-m.png
+ target-cursor-normal-s.png
unknown-item.png
vscroll_down_default.png
vscroll_down_highlight.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 388d01663..7fb82f545 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -36,12 +36,12 @@ gui_DATA = \
tab.png \
tab_hilight.png \
tabselected.png \
- target-cursor-blue-l.png \
- target-cursor-blue-m.png \
- target-cursor-blue-s.png \
- target-cursor-red-l.png \
- target-cursor-red-m.png \
- target-cursor-red-s.png \
+ target-cursor-in-range-l.png \
+ target-cursor-in-range-m.png \
+ target-cursor-in-range-s.png \
+ target-cursor-normal-l.png \
+ target-cursor-normal-m.png \
+ target-cursor-normal-s.png \
unknown-item.png \
vscroll_down_default.png \
vscroll_down_highlight.png \
diff --git a/data/graphics/gui/target-cursor-blue-l.png b/data/graphics/gui/target-cursor-blue-l.png
deleted file mode 100644
index 77cdf4b6d..000000000
--- a/data/graphics/gui/target-cursor-blue-l.png
+++ /dev/null
Binary files differ
diff --git a/data/graphics/gui/target-cursor-blue-m.png b/data/graphics/gui/target-cursor-blue-m.png
deleted file mode 100644
index c0107357a..000000000
--- a/data/graphics/gui/target-cursor-blue-m.png
+++ /dev/null
Binary files differ
diff --git a/data/graphics/gui/target-cursor-blue-s.png b/data/graphics/gui/target-cursor-blue-s.png
deleted file mode 100644
index 3e81c75de..000000000
--- a/data/graphics/gui/target-cursor-blue-s.png
+++ /dev/null
Binary files differ
diff --git a/data/graphics/target-cursor-in-range-l.png b/data/graphics/gui/target-cursor-in-range-l.png
index 77cdf4b6d..77cdf4b6d 100644
--- a/data/graphics/target-cursor-in-range-l.png
+++ b/data/graphics/gui/target-cursor-in-range-l.png
Binary files differ
diff --git a/data/graphics/target-cursor-in-range-m.png b/data/graphics/gui/target-cursor-in-range-m.png
index c0107357a..c0107357a 100644
--- a/data/graphics/target-cursor-in-range-m.png
+++ b/data/graphics/gui/target-cursor-in-range-m.png
Binary files differ
diff --git a/data/graphics/target-cursor-in-range-s.png b/data/graphics/gui/target-cursor-in-range-s.png
index 3e81c75de..3e81c75de 100644
--- a/data/graphics/target-cursor-in-range-s.png
+++ b/data/graphics/gui/target-cursor-in-range-s.png
Binary files differ
diff --git a/data/graphics/target-cursor-normal-l.png b/data/graphics/gui/target-cursor-normal-l.png
index 76d2101b1..76d2101b1 100644
--- a/data/graphics/target-cursor-normal-l.png
+++ b/data/graphics/gui/target-cursor-normal-l.png
Binary files differ
diff --git a/data/graphics/target-cursor-normal-m.png b/data/graphics/gui/target-cursor-normal-m.png
index e2ab79c29..e2ab79c29 100644
--- a/data/graphics/target-cursor-normal-m.png
+++ b/data/graphics/gui/target-cursor-normal-m.png
Binary files differ
diff --git a/data/graphics/target-cursor-normal-s.png b/data/graphics/gui/target-cursor-normal-s.png
index 09195f440..09195f440 100644
--- a/data/graphics/target-cursor-normal-s.png
+++ b/data/graphics/gui/target-cursor-normal-s.png
Binary files differ
diff --git a/data/graphics/gui/target-cursor-red-l.png b/data/graphics/gui/target-cursor-red-l.png
deleted file mode 100644
index 76d2101b1..000000000
--- a/data/graphics/gui/target-cursor-red-l.png
+++ /dev/null
Binary files differ
diff --git a/data/graphics/gui/target-cursor-red-m.png b/data/graphics/gui/target-cursor-red-m.png
deleted file mode 100644
index e2ab79c29..000000000
--- a/data/graphics/gui/target-cursor-red-m.png
+++ /dev/null
Binary files differ
diff --git a/data/graphics/gui/target-cursor-red-s.png b/data/graphics/gui/target-cursor-red-s.png
deleted file mode 100644
index 09195f440..000000000
--- a/data/graphics/gui/target-cursor-red-s.png
+++ /dev/null
Binary files differ
diff --git a/data/help/es/team.txt b/data/help/es/team.txt
index 494b5221c..ca3aac19c 100644
--- a/data/help/es/team.txt
+++ b/data/help/es/team.txt
@@ -13,18 +13,20 @@
##9Mihail Barer (Necromonger) <>
##3== Traductores ==
+##9alastrim (pt)
##9Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR)
##9Andrei Karas (4144) <akaras inbox ru> (ru)
##9Bernard Hugonnet (Nard) <> (fr)
+##9Candy (jp)
+##9Derpella (pl)
##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE)
-##9Mihail Barer (Necromonger) <> (ru)
+##9Mihail Barer (Necromonger) <> (ru, jp)
+##9Nina O'Reilly (Reid) <reidyaro gmail com> (fr)
##9Petr Varkoček (pitriss) <> (cs)
##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi)
##9Yohann Ferreira (Bertram) <bertram cegetel net> (fr)
##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es)
##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es)
-##9alastrim
-##9GonzoDark
##3== Colaboradores con Artes o Imágenes ==
##9Aline Ferraz de Souza (Freya) <freya.df gmail com>
diff --git a/data/help/fr/team.txt b/data/help/fr/team.txt
index ca93d3edd..042b76d0a 100644
--- a/data/help/fr/team.txt
+++ b/data/help/fr/team.txt
@@ -13,18 +13,20 @@
##9Mihail Barer (Necromonger) <>
##3== traducteurs ==
+##9alastrim (pt)
##9Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR)
##9Andrei Karas (4144) <akaras inbox ru> (ru)
##9Bernard Hugonnet (Nard) <> (fr)
+##9Candy (jp)
+##9Derpella (pl)
##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE)
-##9Mihail Barer (Necromonger) <> (ru)
+##9Mihail Barer (Necromonger) <> (ru, jp)
+##9Nina O'Reilly (Reid) <reidyaro gmail com> (fr)
##9Petr Varkoček (pitriss) <> (cs)
##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi)
##9Yohann Ferreira (Bertram) <bertram cegetel net> (fr)
##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es)
##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es)
-##9alastrim
-##9GonzoDark
##3== Contribution art ou images ==
##9Aline Ferraz de Souza (Freya) <freya.df gmail com>
diff --git a/data/help/ru/team.txt b/data/help/ru/team.txt
index 5b2bea822..1b0696405 100644
--- a/data/help/ru/team.txt
+++ b/data/help/ru/team.txt
@@ -13,17 +13,20 @@
##9Mihail Barer (Necromonger) <>
##3== Переводчики ==
+##9alastrim (pt)
##9Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR)
##9Andrei Karas (4144) <akaras inbox ru> (ru)
##9Bernard Hugonnet (Nard) <> (fr)
+##9Candy (jp)
+##9Derpella (pl)
##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE)
-##9Mihail Barer (Necromonger) <> (ru)
+##9Mihail Barer (Necromonger) <> (ru, jp)
+##9Nina O'Reilly (Reid) <reidyaro gmail com> (fr)
##9Petr Varkoček (pitriss) <> (cs)
##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi)
##9Yohann Ferreira (Bertram) <bertram cegetel net> (fr)
##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es)
##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es)
-##9alastrim
##3== Художники ==
##9Aline Ferraz de Souza (Freya) <freya.df gmail com>
diff --git a/data/help/team.txt b/data/help/team.txt
index 4f2c85826..5411f496c 100644
--- a/data/help/team.txt
+++ b/data/help/team.txt
@@ -13,18 +13,20 @@
##9Mihail Barer (Necromonger) <>
##3== Translators ==
+##9alastrim (jp)
##9Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR)
##9Andrei Karas (4144) <akaras inbox ru> (ru)
##9Bernard Hugonnet (Nard) <> (fr)
+##9Candy (jp)
+##9Derpella (pl)
##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE)
-##9Mihail Barer (Necromonger) <> (ru)
+##9Mihail Barer (Necromonger) <> (ru, jp)
+##9Nina O'Reilly (Reid) <reidyaro gmail com> (fr)
##9Petr Varkoček (pitriss) <> (cs)
##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi)
##9Yohann Ferreira (Bertram) <bertram cegetel net> (fr)
##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es)
##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es)
-##9alastrim
-##9GonzoDark
##3== Art or images contributors ==
##9Aline Ferraz de Souza (Freya) <freya.df gmail com>
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index ba541fb88..83842b503 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -26,7 +26,7 @@
<color id="PLAYER" color="#003000" />
<color id="WHISPER" color="#00feaf" />
<color id="WHISPER_OFFLINE" color="#000a40" />
- <color id="IS" color="#009000" />
+ <color id="IS" color="#006000" />
<color id="SERVER" color="#8415e2" />
<color id="LOGGER" color="#919191" />
<color id="HYPERLINK" color="#e50d0d" />
diff --git a/data/tmw/images/loginwallpaper_800x600.png b/data/tmw/images/loginwallpaper_800x600.png
new file mode 100644
index 000000000..e3a6e492d
--- /dev/null
+++ b/data/tmw/images/loginwallpaper_800x600.png
Binary files differ
diff --git a/data/tmw/tmw.manaplus b/data/tmw/tmw.manaplus
new file mode 100644
index 000000000..47688e1d0
--- /dev/null
+++ b/data/tmw/tmw.manaplus
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<configuration>
+ <option name="appName" value="The Mana World"/>
+ <option name="appShort" value="mana"/>
+ <option name="appIcon" value="icons/manaplus.png"/>
+ <option name="loginMusic" value="Magick - Real.ogg"/>
+ <option name="onlineServerList" value="http://manasource.org/serverlist.xml"/>
+ <option name="defaultServer" value="server.themanaworld.org"/>
+ <option name="defaultPort" value="6901"/>
+ <option name="defaultServerType" value="evol"/>
+ <option name="font" value="fonts/dejavusans.ttf" />
+ <option name="boldFont" value="fonts/dejavusans-bold.ttf" />
+ <option name="theme" value="wood" />
+ <option name="wallpapersPath" value="tmw/images/" />
+ <option name="wallpaperFile" value="loginwallpaper_800x600.png" />
+</configuration>