diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/graphics/sprites/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | data/graphics/sprites/Makefile.am | 6 | ||||
| -rw-r--r-- | data/graphics/sprites/manaplus_emotes.xml | 36 | ||||
| -rw-r--r-- | data/graphics/sprites/manaverse_emote.xml (renamed from data/graphics/sprites/manaplus_emote.xml) | 2 | ||||
| -rw-r--r-- | data/graphics/sprites/manaverse_emotes.xml | 36 | ||||
| -rw-r--r-- | data/graphics/sprites/manaverse_emotions.png (renamed from data/graphics/sprites/manaplus_emotions.png) | bin | 38357 -> 38357 bytes | |||
| -rw-r--r-- | data/graphics/sprites/test.xml | 2 | ||||
| -rw-r--r-- | data/icons/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | data/icons/Makefile.am | 16 | ||||
| -rw-r--r-- | data/icons/manaverse.hqx (renamed from data/icons/manaplus.hqx) | 0 | ||||
| -rw-r--r-- | data/icons/manaverse.icns (renamed from data/icons/manaplus.icns) | bin | 27744 -> 27744 bytes | |||
| -rw-r--r-- | data/icons/manaverse.ico (renamed from data/icons/manaplus.ico) | bin | 533366 -> 533366 bytes | |||
| -rw-r--r-- | data/icons/manaverse.png (renamed from data/icons/manaplus.png) | bin | 4544 -> 4544 bytes | |||
| -rw-r--r-- | data/icons/manaverse.svg (renamed from data/icons/manaplus.svg) | 0 | ||||
| -rw-r--r-- | data/icons/manaverse.xpm (renamed from data/icons/manaplus.xpm) | 2 | ||||
| -rw-r--r-- | data/tmw/Makefile.am | 4 | ||||
| -rw-r--r-- | data/tmw/tmw.desktop.in | 2 | ||||
| -rwxr-xr-x | data/tmw/tmw.in | 2 | ||||
| -rw-r--r-- | data/tmw/tmw.mana (renamed from data/tmw/tmw.manaplus) | 0 |
19 files changed, 59 insertions, 59 deletions
diff --git a/data/graphics/sprites/CMakeLists.txt b/data/graphics/sprites/CMakeLists.txt index bc5d7d70c..4fb08d5cb 100644 --- a/data/graphics/sprites/CMakeLists.txt +++ b/data/graphics/sprites/CMakeLists.txt @@ -6,9 +6,9 @@ SET(FILES chatemotes.png error.png error.xml - manaplus_emotions.png - manaplus_emote.xml - manaplus_emotes.xml + manaverse_emotions.png + manaverse_emote.xml + manaverse_emotes.xml test.xml ) diff --git a/data/graphics/sprites/Makefile.am b/data/graphics/sprites/Makefile.am index 8001e7016..3c3ad7887 100644 --- a/data/graphics/sprites/Makefile.am +++ b/data/graphics/sprites/Makefile.am @@ -8,9 +8,9 @@ sprites_DATA = \ chatemotes.png \ error.png \ error.xml \ - manaplus_emotions.png\ - manaplus_emote.xml \ - manaplus_emotes.xml \ + manaverse_emotions.png\ + manaverse_emote.xml \ + manaverse_emotes.xml \ test.xml EXTRA_DIST = \ diff --git a/data/graphics/sprites/manaplus_emotes.xml b/data/graphics/sprites/manaplus_emotes.xml deleted file mode 100644 index 8daf57630..000000000 --- a/data/graphics/sprites/manaplus_emotes.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<emotes> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule selector="//emote/sprite/@name" translate="yes"/> - <its:translateRule selector="//*" translate="no"/> - </its:rules> - - <emote id="100"><sprite name="Kitty" variant="0">manaplus_emote.xml</sprite></emote> - <emote id="101"><sprite name="xD" variant="1">manaplus_emote.xml</sprite></emote> - <emote id="102"><sprite name="^.^" variant="2">manaplus_emote.xml</sprite></emote> - <emote id="103"><sprite name="Heart eye" variant="3">manaplus_emote.xml</sprite></emote> - <emote id="104"><sprite name="Gold eye" variant="4">manaplus_emote.xml</sprite></emote> - <emote id="105"><sprite name="Sleepy" variant="5">manaplus_emote.xml</sprite></emote> - <emote id="106"><sprite name="u.u" variant="6">manaplus_emote.xml</sprite></emote> - <emote id="107"><sprite name="-.-'" variant="7">manaplus_emote.xml</sprite></emote> - <emote id="108"><sprite name="Surprised" variant="8">manaplus_emote.xml</sprite></emote> - <emote id="109"><sprite name="Dead" variant="9">manaplus_emote.xml</sprite></emote> - <emote id="110"><sprite name="Look away" variant="10">manaplus_emote.xml</sprite></emote> - <emote id="111"><sprite name="Sad" variant="11">manaplus_emote.xml</sprite></emote> - <emote id="112"><sprite name="Palmhead" variant="12">manaplus_emote.xml</sprite></emote> - <emote id="113"><sprite name="Evil" variant="13">manaplus_emote.xml</sprite></emote> - <emote id="114"><sprite name="Angry" variant="14">manaplus_emote.xml</sprite></emote> - <emote id="115"><sprite name="Purple Sad" variant="15">manaplus_emote.xml</sprite></emote> - <emote id="116"><sprite name="Insult Buble" variant="16">manaplus_emote.xml</sprite></emote> - <emote id="117"><sprite name="Heart" variant="17">manaplus_emote.xml</sprite></emote> - <emote id="118"><sprite name="Emote" variant="18">manaplus_emote.xml</sprite></emote> - <emote id="119"><sprite name="Pumpkin" variant="19">manaplus_emote.xml</sprite></emote> - <emote id="120"><sprite name="Evil" variant="20">manaplus_emote.xml</sprite></emote> - <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> - <emote id="125"><sprite name="Troll" variant="25">manaplus_emote.xml</sprite></emote> - <emote id="126"><sprite name="Metal" variant="26">manaplus_emote.xml</sprite></emote> - <emote id="127"><sprite name="Crying" variant="27">manaplus_emote.xml</sprite></emote> -</emotes> diff --git a/data/graphics/sprites/manaplus_emote.xml b/data/graphics/sprites/manaverse_emote.xml index 7c5c48046..857436201 100644 --- a/data/graphics/sprites/manaplus_emote.xml +++ b/data/graphics/sprites/manaverse_emote.xml @@ -2,7 +2,7 @@ <!-- Author : Reid, 4144 Copyright (C) 2011-2012 Manaplus --> <sprite variants="28" variant_offset="1"> - <imageset name="base" src="graphics/sprites/manaplus_emotions.png" width="30" height="32" /> + <imageset name="base" src="graphics/sprites/manaverse_emotions.png" width="30" height="32" /> <action name="stand" imageset="base"> <animation direction="default"> diff --git a/data/graphics/sprites/manaverse_emotes.xml b/data/graphics/sprites/manaverse_emotes.xml new file mode 100644 index 000000000..e951379d5 --- /dev/null +++ b/data/graphics/sprites/manaverse_emotes.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<emotes> + <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> + <its:translateRule selector="//emote/sprite/@name" translate="yes"/> + <its:translateRule selector="//*" translate="no"/> + </its:rules> + + <emote id="100"><sprite name="Kitty" variant="0">manaverse_emote.xml</sprite></emote> + <emote id="101"><sprite name="xD" variant="1">manaverse_emote.xml</sprite></emote> + <emote id="102"><sprite name="^.^" variant="2">manaverse_emote.xml</sprite></emote> + <emote id="103"><sprite name="Heart eye" variant="3">manaverse_emote.xml</sprite></emote> + <emote id="104"><sprite name="Gold eye" variant="4">manaverse_emote.xml</sprite></emote> + <emote id="105"><sprite name="Sleepy" variant="5">manaverse_emote.xml</sprite></emote> + <emote id="106"><sprite name="u.u" variant="6">manaverse_emote.xml</sprite></emote> + <emote id="107"><sprite name="-.-'" variant="7">manaverse_emote.xml</sprite></emote> + <emote id="108"><sprite name="Surprised" variant="8">manaverse_emote.xml</sprite></emote> + <emote id="109"><sprite name="Dead" variant="9">manaverse_emote.xml</sprite></emote> + <emote id="110"><sprite name="Look away" variant="10">manaverse_emote.xml</sprite></emote> + <emote id="111"><sprite name="Sad" variant="11">manaverse_emote.xml</sprite></emote> + <emote id="112"><sprite name="Palmhead" variant="12">manaverse_emote.xml</sprite></emote> + <emote id="113"><sprite name="Evil" variant="13">manaverse_emote.xml</sprite></emote> + <emote id="114"><sprite name="Angry" variant="14">manaverse_emote.xml</sprite></emote> + <emote id="115"><sprite name="Purple Sad" variant="15">manaverse_emote.xml</sprite></emote> + <emote id="116"><sprite name="Insult Buble" variant="16">manaverse_emote.xml</sprite></emote> + <emote id="117"><sprite name="Heart" variant="17">manaverse_emote.xml</sprite></emote> + <emote id="118"><sprite name="Emote" variant="18">manaverse_emote.xml</sprite></emote> + <emote id="119"><sprite name="Pumpkin" variant="19">manaverse_emote.xml</sprite></emote> + <emote id="120"><sprite name="Evil" variant="20">manaverse_emote.xml</sprite></emote> + <emote id="121"><sprite name="Epic" variant="21">manaverse_emote.xml</sprite></emote> + <emote id="122"><sprite name="Bad geek" variant="22">manaverse_emote.xml</sprite></emote> + <emote id="123"><sprite name="Mimi" variant="23">manaverse_emote.xml</sprite></emote> + <emote id="124"><sprite name="Alien" variant="24">manaverse_emote.xml</sprite></emote> + <emote id="125"><sprite name="Troll" variant="25">manaverse_emote.xml</sprite></emote> + <emote id="126"><sprite name="Metal" variant="26">manaverse_emote.xml</sprite></emote> + <emote id="127"><sprite name="Crying" variant="27">manaverse_emote.xml</sprite></emote> +</emotes> diff --git a/data/graphics/sprites/manaplus_emotions.png b/data/graphics/sprites/manaverse_emotions.png Binary files differindex c93262ba4..c93262ba4 100644 --- a/data/graphics/sprites/manaplus_emotions.png +++ b/data/graphics/sprites/manaverse_emotions.png diff --git a/data/graphics/sprites/test.xml b/data/graphics/sprites/test.xml index 7243254af..54944216e 100644 --- a/data/graphics/sprites/test.xml +++ b/data/graphics/sprites/test.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <sprite> - <imageset name="base" src="graphics/sprites/manaplus_emotions.png" width="30" height="32" /> + <imageset name="base" src="graphics/sprites/manaverse_emotions.png" width="30" height="32" /> <action name="default" imageset="base"> <animation direction="default"> diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt index 2d5a0a899..0106dc8ef 100644 --- a/data/icons/CMakeLists.txt +++ b/data/icons/CMakeLists.txt @@ -1,7 +1,7 @@ SET(FILES - manaplus.svg + manaverse.svg ) INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/icons) -INSTALL(FILES "manaplus.svg" DESTINATION share/icons/hicolor/scalable/apps) +INSTALL(FILES "manaverse.svg" DESTINATION share/icons/hicolor/scalable/apps) diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 37eb702fd..dab4f85c0 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,19 +1,19 @@ iconsdir = $(pkgdatadir)/data/icons -icons_DATA = manaplus.png \ - manaplus.svg \ - manaplus.icns \ - manaplus.ico \ - manaplus.hqx \ - manaplus.xpm +icons_DATA = manaverse.png \ + manaverse.svg \ + manaverse.icns \ + manaverse.ico \ + manaverse.hqx \ + manaverse.xpm install-data-local: $(mkinstalldirs) $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps - $(INSTALL) $(srcdir)/manaplus.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/manaplus.svg + $(INSTALL) $(srcdir)/manaverse.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/manaverse.svg uninstall-local: - rm -f $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/manaplus.svg + rm -f $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/manaverse.svg EXTRA_DIST = \ $(icons_DATA) \ diff --git a/data/icons/manaplus.hqx b/data/icons/manaverse.hqx index 77b9e3b98..77b9e3b98 100644 --- a/data/icons/manaplus.hqx +++ b/data/icons/manaverse.hqx diff --git a/data/icons/manaplus.icns b/data/icons/manaverse.icns Binary files differindex 6556fccb1..6556fccb1 100644 --- a/data/icons/manaplus.icns +++ b/data/icons/manaverse.icns diff --git a/data/icons/manaplus.ico b/data/icons/manaverse.ico Binary files differindex bb2dea3b8..bb2dea3b8 100644 --- a/data/icons/manaplus.ico +++ b/data/icons/manaverse.ico diff --git a/data/icons/manaplus.png b/data/icons/manaverse.png Binary files differindex 423d1c6c2..423d1c6c2 100644 --- a/data/icons/manaplus.png +++ b/data/icons/manaverse.png diff --git a/data/icons/manaplus.svg b/data/icons/manaverse.svg index ea9564037..ea9564037 100644 --- a/data/icons/manaplus.svg +++ b/data/icons/manaverse.svg diff --git a/data/icons/manaplus.xpm b/data/icons/manaverse.xpm index c8480d214..80476fab4 100644 --- a/data/icons/manaplus.xpm +++ b/data/icons/manaverse.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * manaplus_xpm[] = { +static char * manaverse_xpm[] = { "32 32 3 1", " c None", ". c #001FC6", diff --git a/data/tmw/Makefile.am b/data/tmw/Makefile.am index f8135b488..bb02dd7bb 100644 --- a/data/tmw/Makefile.am +++ b/data/tmw/Makefile.am @@ -6,14 +6,14 @@ branding: mkdir -p "$(DESTDIR)$(datarootdir)/icons" mkdir -p "$(DESTDIR)$(desktopdir)" cp tmw.desktop "$(DESTDIR)$(desktopdir)" - cp tmw.manaplus "$(DESTDIR)$(pkgdatadir)/data/tmw" + cp tmw.manverse "$(DESTDIR)$(pkgdatadir)/data/tmw" cp icons/tmw-client.png "$(DESTDIR)$(pkgdatadir)/data/tmw/icons/tmw.png" cp icons/tmw-client.png "$(DESTDIR)$(datarootdir)/icons/tmw.png" cp -r images "$(DESTDIR)$(pkgdatadir)/data/tmw" EXTRA_DIST = tmw.desktop.in \ tmw.in \ - tmw.manaplus \ + tmw.mana \ icons/tmw-client.ico \ icons/tmw-client.png \ icons/tmw-client.xpm \ diff --git a/data/tmw/tmw.desktop.in b/data/tmw/tmw.desktop.in index 358877af0..5900f4d0d 100644 --- a/data/tmw/tmw.desktop.in +++ b/data/tmw/tmw.desktop.in @@ -8,7 +8,7 @@ Comment[de]=ein Online Fantasy Spiel Comment[it]=Un gioco fantasy online Comment[nl]=Een online role playing game Comment[sv]=Ett fantasyrollspel online -Exec=manaplus @datadir@/manaplus/data/tmw/tmw.manaplus +Exec=manaverse @datadir@/manaverse/data/tmw/tmw.mana StartupNotify=false Terminal=false Type=Application diff --git a/data/tmw/tmw.in b/data/tmw/tmw.in index d726db2c3..4e03b2b3f 100755 --- a/data/tmw/tmw.in +++ b/data/tmw/tmw.in @@ -1,2 +1,2 @@ #!/bin/sh -exec manaplus @datadir@/manaplus/data/tmw/tmw.manaplus "$@" +exec manaverse @datadir@/manaverse/data/tmw/tmw.mana "$@" diff --git a/data/tmw/tmw.manaplus b/data/tmw/tmw.mana index c4b66237e..c4b66237e 100644 --- a/data/tmw/tmw.manaplus +++ b/data/tmw/tmw.mana |
