From ba997be747666c74c46c734cb636a8de84c582b3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 17 Dec 2011 16:42:27 +0300 Subject: Move target cursors to themes. Remove old unused target cursors. --- data/graphics/CMakeLists.txt | 9 --------- data/graphics/Makefile.am | 9 --------- data/graphics/gui/CMakeLists.txt | 12 ++++++------ data/graphics/gui/Makefile.am | 12 ++++++------ data/graphics/gui/target-cursor-blue-l.png | Bin 23803 -> 0 bytes data/graphics/gui/target-cursor-blue-m.png | Bin 18439 -> 0 bytes data/graphics/gui/target-cursor-blue-s.png | Bin 8353 -> 0 bytes data/graphics/gui/target-cursor-in-range-l.png | Bin 0 -> 23803 bytes data/graphics/gui/target-cursor-in-range-m.png | Bin 0 -> 18439 bytes data/graphics/gui/target-cursor-in-range-s.png | Bin 0 -> 8353 bytes data/graphics/gui/target-cursor-normal-l.png | Bin 0 -> 25586 bytes data/graphics/gui/target-cursor-normal-m.png | Bin 0 -> 17950 bytes data/graphics/gui/target-cursor-normal-s.png | Bin 0 -> 8361 bytes data/graphics/gui/target-cursor-red-l.png | Bin 25586 -> 0 bytes data/graphics/gui/target-cursor-red-m.png | Bin 17950 -> 0 bytes data/graphics/gui/target-cursor-red-s.png | Bin 8361 -> 0 bytes data/graphics/target-cursor-in-range-l.png | Bin 23803 -> 0 bytes data/graphics/target-cursor-in-range-m.png | Bin 18439 -> 0 bytes data/graphics/target-cursor-in-range-s.png | Bin 8353 -> 0 bytes data/graphics/target-cursor-normal-l.png | Bin 25586 -> 0 bytes data/graphics/target-cursor-normal-m.png | Bin 17950 -> 0 bytes data/graphics/target-cursor-normal-s.png | Bin 8361 -> 0 bytes 22 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 data/graphics/gui/target-cursor-blue-l.png delete mode 100644 data/graphics/gui/target-cursor-blue-m.png delete mode 100644 data/graphics/gui/target-cursor-blue-s.png create mode 100644 data/graphics/gui/target-cursor-in-range-l.png create mode 100644 data/graphics/gui/target-cursor-in-range-m.png create mode 100644 data/graphics/gui/target-cursor-in-range-s.png create mode 100644 data/graphics/gui/target-cursor-normal-l.png create mode 100644 data/graphics/gui/target-cursor-normal-m.png create mode 100644 data/graphics/gui/target-cursor-normal-s.png delete mode 100644 data/graphics/gui/target-cursor-red-l.png delete mode 100644 data/graphics/gui/target-cursor-red-m.png delete mode 100644 data/graphics/gui/target-cursor-red-s.png delete mode 100644 data/graphics/target-cursor-in-range-l.png delete mode 100644 data/graphics/target-cursor-in-range-m.png delete mode 100644 data/graphics/target-cursor-in-range-s.png delete mode 100644 data/graphics/target-cursor-normal-l.png delete mode 100644 data/graphics/target-cursor-normal-m.png delete mode 100644 data/graphics/target-cursor-normal-s.png (limited to 'data') 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 Binary files a/data/graphics/gui/target-cursor-blue-l.png and /dev/null 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 Binary files a/data/graphics/gui/target-cursor-blue-m.png and /dev/null 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 Binary files a/data/graphics/gui/target-cursor-blue-s.png and /dev/null differ diff --git a/data/graphics/gui/target-cursor-in-range-l.png b/data/graphics/gui/target-cursor-in-range-l.png new file mode 100644 index 000000000..77cdf4b6d Binary files /dev/null and b/data/graphics/gui/target-cursor-in-range-l.png differ diff --git a/data/graphics/gui/target-cursor-in-range-m.png b/data/graphics/gui/target-cursor-in-range-m.png new file mode 100644 index 000000000..c0107357a Binary files /dev/null and b/data/graphics/gui/target-cursor-in-range-m.png differ diff --git a/data/graphics/gui/target-cursor-in-range-s.png b/data/graphics/gui/target-cursor-in-range-s.png new file mode 100644 index 000000000..3e81c75de Binary files /dev/null and b/data/graphics/gui/target-cursor-in-range-s.png differ diff --git a/data/graphics/gui/target-cursor-normal-l.png b/data/graphics/gui/target-cursor-normal-l.png new file mode 100644 index 000000000..76d2101b1 Binary files /dev/null and b/data/graphics/gui/target-cursor-normal-l.png differ diff --git a/data/graphics/gui/target-cursor-normal-m.png b/data/graphics/gui/target-cursor-normal-m.png new file mode 100644 index 000000000..e2ab79c29 Binary files /dev/null and b/data/graphics/gui/target-cursor-normal-m.png differ diff --git a/data/graphics/gui/target-cursor-normal-s.png b/data/graphics/gui/target-cursor-normal-s.png new file mode 100644 index 000000000..09195f440 Binary files /dev/null and b/data/graphics/gui/target-cursor-normal-s.png 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 Binary files a/data/graphics/gui/target-cursor-red-l.png and /dev/null 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 Binary files a/data/graphics/gui/target-cursor-red-m.png and /dev/null 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 Binary files a/data/graphics/gui/target-cursor-red-s.png and /dev/null differ diff --git a/data/graphics/target-cursor-in-range-l.png b/data/graphics/target-cursor-in-range-l.png deleted file mode 100644 index 77cdf4b6d..000000000 Binary files a/data/graphics/target-cursor-in-range-l.png and /dev/null differ diff --git a/data/graphics/target-cursor-in-range-m.png b/data/graphics/target-cursor-in-range-m.png deleted file mode 100644 index c0107357a..000000000 Binary files a/data/graphics/target-cursor-in-range-m.png and /dev/null differ diff --git a/data/graphics/target-cursor-in-range-s.png b/data/graphics/target-cursor-in-range-s.png deleted file mode 100644 index 3e81c75de..000000000 Binary files a/data/graphics/target-cursor-in-range-s.png and /dev/null differ diff --git a/data/graphics/target-cursor-normal-l.png b/data/graphics/target-cursor-normal-l.png deleted file mode 100644 index 76d2101b1..000000000 Binary files a/data/graphics/target-cursor-normal-l.png and /dev/null differ diff --git a/data/graphics/target-cursor-normal-m.png b/data/graphics/target-cursor-normal-m.png deleted file mode 100644 index e2ab79c29..000000000 Binary files a/data/graphics/target-cursor-normal-m.png and /dev/null differ diff --git a/data/graphics/target-cursor-normal-s.png b/data/graphics/target-cursor-normal-s.png deleted file mode 100644 index 09195f440..000000000 Binary files a/data/graphics/target-cursor-normal-s.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 7b72cf9d4c1f737f1ff5a1018785b92bc5feae31 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 4 Jan 2012 22:06:10 +0300 Subject: Fix color in wood theme for /me messages. --- data/themes/wood/colors.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') 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 @@ - + -- cgit v1.2.3-70-g09d2 From 3910b94e502787e552a360d290c54ad26b3e6c5a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 6 Jan 2012 03:02:01 +0300 Subject: Add Candy and Nina O'Reilly as translators in authors list. Add Derpella to missing translated pages as translator. --- AUTHORS | 7 ++++--- data/help/es/team.txt | 8 +++++--- data/help/fr/team.txt | 8 +++++--- data/help/ru/team.txt | 7 +++++-- data/help/team.txt | 8 +++++--- 5 files changed, 24 insertions(+), 14 deletions(-) (limited to 'data') diff --git a/AUTHORS b/AUTHORS index c96baedfa..e87e41627 100644 --- a/AUTHORS +++ b/AUTHORS @@ -10,19 +10,20 @@ Maarten Vanraes (AL13N) Mihail Barer (Necromonger) <> == Translators == +alastrim (pt) Aline Ferraz de Souza (Freya) (pt, pt_BR) Andrei Karas (4144) (ru) Bernard Hugonnet (Nard) <> (fr) +Candy (jp) Derpella (pl) Maarten Vanraes (AL13N) (nl_BE) -Mihail Barer (Necromonger) <> (ru) +Mihail Barer (Necromonger) <> (ru, jp) +Nina O'Reilly (Reid) (fr) Petr Varkoček (pitriss) <> (cs) Sini Ruohomaa (Byakushin) (fi) Yohann Ferreira (Bertram) (fr) Antoine Ruck (Jumpy) (fr,es) Nelson Martell (nelson6e65) (es) -alastrim -GonzoDark == Art or images contributors == Aline Ferraz de Souza (Freya) Themes 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) (pt, pt_BR) ##9Andrei Karas (4144) (ru) ##9Bernard Hugonnet (Nard) <> (fr) +##9Candy (jp) +##9Derpella (pl) ##9Maarten Vanraes (AL13N) (nl_BE) -##9Mihail Barer (Necromonger) <> (ru) +##9Mihail Barer (Necromonger) <> (ru, jp) +##9Nina O'Reilly (Reid) (fr) ##9Petr Varkoček (pitriss) <> (cs) ##9Sini Ruohomaa (Byakushin) (fi) ##9Yohann Ferreira (Bertram) (fr) ##9Antoine Ruck (Jumpy) (fr,es) ##9Nelson Martell (nelson6e65) (es) -##9alastrim -##9GonzoDark ##3== Colaboradores con Artes o Imágenes == ##9Aline Ferraz de Souza (Freya) 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) (pt, pt_BR) ##9Andrei Karas (4144) (ru) ##9Bernard Hugonnet (Nard) <> (fr) +##9Candy (jp) +##9Derpella (pl) ##9Maarten Vanraes (AL13N) (nl_BE) -##9Mihail Barer (Necromonger) <> (ru) +##9Mihail Barer (Necromonger) <> (ru, jp) +##9Nina O'Reilly (Reid) (fr) ##9Petr Varkoček (pitriss) <> (cs) ##9Sini Ruohomaa (Byakushin) (fi) ##9Yohann Ferreira (Bertram) (fr) ##9Antoine Ruck (Jumpy) (fr,es) ##9Nelson Martell (nelson6e65) (es) -##9alastrim -##9GonzoDark ##3== Contribution art ou images == ##9Aline Ferraz de Souza (Freya) 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) (pt, pt_BR) ##9Andrei Karas (4144) (ru) ##9Bernard Hugonnet (Nard) <> (fr) +##9Candy (jp) +##9Derpella (pl) ##9Maarten Vanraes (AL13N) (nl_BE) -##9Mihail Barer (Necromonger) <> (ru) +##9Mihail Barer (Necromonger) <> (ru, jp) +##9Nina O'Reilly (Reid) (fr) ##9Petr Varkoček (pitriss) <> (cs) ##9Sini Ruohomaa (Byakushin) (fi) ##9Yohann Ferreira (Bertram) (fr) ##9Antoine Ruck (Jumpy) (fr,es) ##9Nelson Martell (nelson6e65) (es) -##9alastrim ##3== Художники == ##9Aline Ferraz de Souza (Freya) 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) (pt, pt_BR) ##9Andrei Karas (4144) (ru) ##9Bernard Hugonnet (Nard) <> (fr) +##9Candy (jp) +##9Derpella (pl) ##9Maarten Vanraes (AL13N) (nl_BE) -##9Mihail Barer (Necromonger) <> (ru) +##9Mihail Barer (Necromonger) <> (ru, jp) +##9Nina O'Reilly (Reid) (fr) ##9Petr Varkoček (pitriss) <> (cs) ##9Sini Ruohomaa (Byakushin) (fi) ##9Yohann Ferreira (Bertram) (fr) ##9Antoine Ruck (Jumpy) (fr,es) ##9Nelson Martell (nelson6e65) (es) -##9alastrim -##9GonzoDark ##3== Art or images contributors == ##9Aline Ferraz de Souza (Freya) -- cgit v1.2.3-70-g09d2 From 504f93b83e6f7448c5eb3fbcb421e94b7f34f699 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 24 Jan 2012 14:27:54 +0300 Subject: Add evol and tmw branding. --- data/evol/evol.manaplus | 17 +++++++++++++++++ data/evol/images/loginwallpaper_800x600.png | Bin 0 -> 1481772 bytes data/tmw/images/loginwallpaper_800x600.png | Bin 0 -> 903998 bytes data/tmw/tmw.manaplus | 17 +++++++++++++++++ docs/example.manaplus | 2 +- 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 data/evol/evol.manaplus create mode 100644 data/evol/images/loginwallpaper_800x600.png create mode 100644 data/tmw/images/loginwallpaper_800x600.png create mode 100644 data/tmw/tmw.manaplus (limited to 'data') 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 @@ + + + + diff --git a/data/evol/images/loginwallpaper_800x600.png b/data/evol/images/loginwallpaper_800x600.png new file mode 100644 index 000000000..a1fe4f83b Binary files /dev/null and b/data/evol/images/loginwallpaper_800x600.png differ diff --git a/data/tmw/images/loginwallpaper_800x600.png b/data/tmw/images/loginwallpaper_800x600.png new file mode 100644 index 000000000..e3a6e492d Binary files /dev/null and b/data/tmw/images/loginwallpaper_800x600.png 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 @@ + + + + diff --git a/docs/example.manaplus b/docs/example.manaplus index 8be9c675e..80d4c9ce3 100644 --- a/docs/example.manaplus +++ b/docs/example.manaplus @@ -9,7 +9,7 @@ filename / path as a command line parameter --> -