diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
| commit | 9a3a196dbf633a699c26d0227802a42f025c8bfd (patch) | |
| tree | dfbdb2ff1e2c54d75a2bf6411d3f70df22518c28 /data/graphics | |
| parent | fc17ff22d9df50df9c5d1cf3dc0de358001271ed (diff) | |
| parent | ece36a40d4e9a838cde01075d7681b8fc517b19f (diff) | |
| download | plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.gz plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.bz2 plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.xz plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.zip | |
Merge branch 'master' into stripped
Conflicts:
src/guichan/gui.cpp
src/guichan/include/guichan/sdl/sdlpixel.hpp
Diffstat (limited to 'data/graphics')
| -rw-r--r-- | data/graphics/sprites/manaplus_emote.xml | 4 | ||||
| -rw-r--r-- | data/graphics/sprites/manaplus_emotes.xml | 8 | ||||
| -rw-r--r-- | data/graphics/sprites/manaplus_emotions.png | bin | 34648 -> 39205 bytes |
3 files changed, 11 insertions, 1 deletions
diff --git a/data/graphics/sprites/manaplus_emote.xml b/data/graphics/sprites/manaplus_emote.xml index 8f27c4f83..1ec57dff2 100644 --- a/data/graphics/sprites/manaplus_emote.xml +++ b/data/graphics/sprites/manaplus_emote.xml @@ -1,5 +1,7 @@ <?xml version="1.0"?> -<sprite variants="25" variant_offset="1"> +<!-- 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" /> <action name="stand" imageset="base"> diff --git a/data/graphics/sprites/manaplus_emotes.xml b/data/graphics/sprites/manaplus_emotes.xml index 38628dc30..240b2d4b8 100644 --- a/data/graphics/sprites/manaplus_emotes.xml +++ b/data/graphics/sprites/manaplus_emotes.xml @@ -1,4 +1,9 @@ <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> @@ -24,4 +29,7 @@ <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_emotions.png b/data/graphics/sprites/manaplus_emotions.png Binary files differindex c6f49ff29..1b2815b87 100644 --- a/data/graphics/sprites/manaplus_emotions.png +++ b/data/graphics/sprites/manaplus_emotions.png |
