diff options
| author | Enchilado <crunchy@crunchy-Satellite-L300.(none)> | 2011-06-03 17:04:09 +1000 |
|---|---|---|
| committer | Enchilado <crunchy@crunchy-Satellite-L300.(none)> | 2011-06-03 17:04:09 +1000 |
| commit | e2b350fd91a53528307d49e4c20d86fece925ac1 (patch) | |
| tree | 55ae7cf8f877037bc7c8991db02d6f8185cbad7e /graphics | |
| parent | 5cdbe0174cdb8f2962e7613c1171554d8a1afd88 (diff) | |
| parent | be4b46b021c74427d74d5a8e337b711bce84f472 (diff) | |
| download | clientdata-e2b350fd91a53528307d49e4c20d86fece925ac1.tar.gz clientdata-e2b350fd91a53528307d49e4c20d86fece925ac1.tar.bz2 clientdata-e2b350fd91a53528307d49e4c20d86fece925ac1.tar.xz clientdata-e2b350fd91a53528307d49e4c20d86fece925ac1.zip | |
Merge branch 'master' of gitorious.org:+tmw-admins/tmw/tmwa-client-test
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/items/equipment/rings/rough-agility.png | bin | 495 -> 0 bytes | |||
| -rw-r--r-- | graphics/items/equipment/rings/rough-dexterity.png | bin | 496 -> 0 bytes | |||
| -rw-r--r-- | graphics/items/equipment/rings/rough-intelligence.png | bin | 496 -> 0 bytes | |||
| -rw-r--r-- | graphics/items/equipment/rings/rough-strength.png | bin | 522 -> 0 bytes | |||
| -rw-r--r-- | graphics/items/equipment/rings/rough-vitality.png | bin | 496 -> 0 bytes | |||
| -rw-r--r-- | graphics/items/equipment/rings/rough-willpower.png | bin | 496 -> 0 bytes | |||
| -rw-r--r-- | graphics/particles/magic.hit.evil.xml | 2 | ||||
| -rw-r--r-- | graphics/particles/magic.hit.xml | 2 | ||||
| -rw-r--r-- | graphics/sprites/npcs/nivalis_npc.xml | 2 |
9 files changed, 3 insertions, 3 deletions
diff --git a/graphics/items/equipment/rings/rough-agility.png b/graphics/items/equipment/rings/rough-agility.png Binary files differdeleted file mode 100644 index ce3a3b14..00000000 --- a/graphics/items/equipment/rings/rough-agility.png +++ /dev/null diff --git a/graphics/items/equipment/rings/rough-dexterity.png b/graphics/items/equipment/rings/rough-dexterity.png Binary files differdeleted file mode 100644 index 2ae35f49..00000000 --- a/graphics/items/equipment/rings/rough-dexterity.png +++ /dev/null diff --git a/graphics/items/equipment/rings/rough-intelligence.png b/graphics/items/equipment/rings/rough-intelligence.png Binary files differdeleted file mode 100644 index eabaf93e..00000000 --- a/graphics/items/equipment/rings/rough-intelligence.png +++ /dev/null diff --git a/graphics/items/equipment/rings/rough-strength.png b/graphics/items/equipment/rings/rough-strength.png Binary files differdeleted file mode 100644 index b860d6e3..00000000 --- a/graphics/items/equipment/rings/rough-strength.png +++ /dev/null diff --git a/graphics/items/equipment/rings/rough-vitality.png b/graphics/items/equipment/rings/rough-vitality.png Binary files differdeleted file mode 100644 index 8577e2ff..00000000 --- a/graphics/items/equipment/rings/rough-vitality.png +++ /dev/null diff --git a/graphics/items/equipment/rings/rough-willpower.png b/graphics/items/equipment/rings/rough-willpower.png Binary files differdeleted file mode 100644 index 1fd2b566..00000000 --- a/graphics/items/equipment/rings/rough-willpower.png +++ /dev/null diff --git a/graphics/particles/magic.hit.evil.xml b/graphics/particles/magic.hit.evil.xml index c0b5df22..9560df98 100644 --- a/graphics/particles/magic.hit.evil.xml +++ b/graphics/particles/magic.hit.evil.xml @@ -41,7 +41,7 @@ <property name="horizontal-angle" min="0" max="360"/> <property name="power" min="0" max="4"/> <property name="gravity" value="0.1"/> - <property name="image" value="graphics/particles/orb-medium.png#W:#000000"/> + <property name="image" value="graphics/particles/orb-medium.png|W:#000000"/> <property name="lifetime" min="0" max="80"/> <property name="output" min="60" max="80"/> <property name="fade-out" value="20"/> diff --git a/graphics/particles/magic.hit.xml b/graphics/particles/magic.hit.xml index 427e4163..96170247 100644 --- a/graphics/particles/magic.hit.xml +++ b/graphics/particles/magic.hit.xml @@ -41,7 +41,7 @@ <property name="horizontal-angle" min="0" max="360"/> <property name="power" min="0" max="3"/> <property name="gravity" value="0.1"/> - <property name="image" value="graphics/particles/orb-medium.png#W:#000000"/> + <property name="image" value="graphics/particles/orb-medium.png|W:#000000"/> <property name="lifetime" min="0" max="80"/> <property name="output" min="40" max="60"/> <property name="fade-out" value="20"/> diff --git a/graphics/sprites/npcs/nivalis_npc.xml b/graphics/sprites/npcs/nivalis_npc.xml index 79b76301..54129cab 100644 --- a/graphics/sprites/npcs/nivalis_npc.xml +++ b/graphics/sprites/npcs/nivalis_npc.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <sprite variants="6" variant_offset="1"> - <imageset name="base" src="graphics/sprites/npcs/nivalis_npcs.png" width="50" height="80" /> + <imageset name="base" src="graphics/sprites/npcs/nivalis_npc.png" width="50" height="80" /> <action name="stand" imageset="base"> <animation direction="default"> |
