Merge commit 'v1.2.1.22' into stripped

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/CMakeLists.txt
	src/Makefile.am
	src/guichan/gui.cpp

26 files changed, 107 insertions, 81 deletions

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
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
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
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
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
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
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
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
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
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
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
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
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/icons/manaplus.png b/data/icons/manaplus.png
index 72a527e94..bace39c78 100644
--- a/data/icons/manaplus.png
+++ b/data/icons/manaplus.png
diff --git a/data/icons/manaplus.xpm b/data/icons/manaplus.xpm
index 4ff88af40..33de9197a 100644
--- a/data/icons/manaplus.xpm
+++ b/data/icons/manaplus.xpm
@@ -1,40 +1,41 @@
 /* XPM */
 static char * manaplus_xpm[] = {
-"32 32 5 1",
+"32 32 6 1",
 " 	c None",
 ".	c #FF6600",
 "+	c #FF6500",
-"@	c #FF6700",
-"#	c #FF6400",
-"            ...+.....@          ",
-"          .....+.......+        ",
-"        @....+          ..      ",
-"       +...+               .    ",
-"      ....                 ..   ",
-"     +...                  ..   ",
-"    ...+                ....... ",
-"   +..+                  .......",
-"  #...                     ..   ",
-"  ...       ..++    ++++   ..   ",
-" +..+  @+........++.......  .   ",
-" +..   +.....+......++....+     ",
-" ..+   .....  +.....  .....     ",
-"+..+   ....+   .....   ....     ",
-"+...   ....    ....    ....     ",
+"@	c #FF6400",
+"#	c #FF6700",
+"$	c #FF6300",
+"              .+.++..           ",
+"           ..+...@  .+.#        ",
+"         ++..@              @   ",
+"        ..+.               +@   ",
+"      +.+.              $  ++   ",
+"     ..+.               @@$@+$$ ",
+"    ....                  $++++@",
+"   +..+                    @@   ",
+"   ..+                    +@    ",
+"  +..        ...     ...        ",
+"  ..+   ...+.+.....+....++      ",
+" ...   #....  ....+.  .....     ",
+" ...   ....+   .....   ....     ",
+"@..+   +...    ....    ...+     ",
 "+..    ....    ....    ....     ",
-"+..   +...+   @...+   +....     ",
-"..+   .....   +...+   .....     ",
-"+..   +....   +....   ....+     ",
-"...   +...@   .....   +...#     ",
-"+.+   ....+   +...    ....@ @+. ",
-" ..   ....    +...    +...@++...",
-" +.#  ++++    +++@    +++.+#   .",
-"  ++                    ++     .",
-"  +.                    .+    +.",
-"   +.                  ..    .. ",
-"    .+                @...  .+  ",
-"     ..               .......   ",
-"      ..            .+.....+    ",
-"       ..+        @......+.     ",
-"         .++..+++.......@       ",
-"            ..+.++.+..          "};
+"...    ....    ....    ....     ",
+"...    ....    ....    ...+     ",
+"...    ....    ....    ...+     ",
+"...   +...+   .....    ...+     ",
+"...   +...    +...    +...      ",
+" ..   ....    ....    +..+      ",
+" ..   ...+    ....    ....+++.+.",
+" +.   ...     ...     ..+..    +",
+"  .+                     +     .",
+"  +.                    ..    .+",
+"   +.                  ..    ++ ",
+"    ..                 +.+  ++  ",
+"     ++               +...+..   ",
+"      .+             +.....+    ",
+"        ++         ....+..      ",
+"          +++.#.++.+.+..        ",
+"             ..+..+..           "};
diff --git a/data/perserver/default/CMakeLists.txt b/data/perserver/default/CMakeLists.txt
index 61bd98df1..f4e5c6cae 100644
--- a/data/perserver/default/CMakeLists.txt
+++ b/data/perserver/default/CMakeLists.txt
@@ -1,5 +1,6 @@
 SET (FILES
     charcreation.xml
+    gmcommands.txt
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/perserver/default)
diff --git a/data/perserver/default/Makefile.am b/data/perserver/default/Makefile.am
index 7ab87da67..08e324ca3 100644
--- a/data/perserver/default/Makefile.am
+++ b/data/perserver/default/Makefile.am
@@ -1,7 +1,8 @@
 defaultdir = $(pkgdatadir)/data/perserver/default
 
 default_DATA =				\
-	charcreation.xml
+	charcreation.xml		\
+	gmcommands.txt
 
 EXTRA_DIST =				\
 	$(default_DATA) \
diff --git a/data/perserver/default/gmcommands.txt b/data/perserver/default/gmcommands.txt
new file mode 100644
index 000000000..da271a12f
--- /dev/null
+++ b/data/perserver/default/gmcommands.txt
@@ -0,0 +1,32 @@
+@spawn 
+@item 
+@hugo
+@linus
+@warp 
+@goto 
+@jump 
+@save
+@storage
+@gstorage
+@hide
+@visible
+@invisible
+@die
+@kill 
+@alive
+@blvl 
+@jlvl 
+@pvpon
+@pvpoff
+@killmonster
+@kick 
+@broadcast 
+@localbroadcast 
+@hairstyle 
+@haircolor 
+@ignorelist
+@killer
+@killable
+@summon 
+@skill-learn 
+@ipcheck 
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index 606b45301..83842b503 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -7,10 +7,10 @@
 	<color id="BUTTON" color="#000000" />
 	<color id="BUTTON_DISABLED" color="#cccccc" />
 	<color id="TAB" color="#000000" />
-	<color id="PARTY_CHAT_TAB" color="#f48055" />
-	<color id="PARTY_SOCIAL_TAB" color="#f48055" />
-	<color id="GUILD_CHAT_TAB" color="#f48055" />
-	<color id="GUILD_SOCIAL_TAB" color="#f48055" />
+	<color id="PARTY_CHAT_TAB" color="#c04000" />
+	<color id="PARTY_SOCIAL_TAB" color="#c04000" />
+	<color id="GUILD_CHAT_TAB" color="#c04000" />
+	<color id="GUILD_SOCIAL_TAB" color="#c04000" />
 	<color id="BACKGROUND" color="#ffffff" />
 	<color id="BACKGROUND_GRAY" color="#404040" />
 	<color id="SCROLLBAR_GRAY" color="#000000" />
@@ -26,7 +26,7 @@
 	<color id="PLAYER" color="#003000" />
 	<color id="WHISPER" color="#00feaf" />
 	<color id="WHISPER_OFFLINE" color="#000a40" />
-	<color id="IS" color="#a08527" />
+	<color id="IS" color="#006000" />
 	<color id="SERVER" color="#8415e2" />
 	<color id="LOGGER" color="#919191" />
 	<color id="HYPERLINK" color="#e50d0d" />