diff options
author | Wushin <pasekei@gmail.com> | 2015-01-07 21:59:42 -0600 |
---|---|---|
committer | Wushin <pasekei@gmail.com> | 2015-01-07 21:59:42 -0600 |
commit | 655d2d66678fb84e7cc861f688e9c0901be2c55e (patch) | |
tree | e8acfb15aa136b8195a8e859776bf98378fc877e | |
parent | b08cc18e4b220762282693b8cbf3ee0a70dd3274 (diff) | |
parent | dee49de48f4f0bd2d2bbb998bd6af5cdf35ae196 (diff) | |
download | clientdata-655d2d66678fb84e7cc861f688e9c0901be2c55e.tar.gz clientdata-655d2d66678fb84e7cc861f688e9c0901be2c55e.tar.bz2 clientdata-655d2d66678fb84e7cc861f688e9c0901be2c55e.tar.xz clientdata-655d2d66678fb84e7cc861f688e9c0901be2c55e.zip |
Merge pull request #197 from mekolat/sanguine05
Fight club v0.5
-rw-r--r-- | graphics/guiicons/edit.png | bin | 0 -> 264 bytes | |||
-rw-r--r-- | graphics/guiicons/restart.png | bin | 0 -> 671 bytes | |||
-rw-r--r-- | graphics/guiicons/toggle.png | bin | 0 -> 209 bytes | |||
-rw-r--r-- | license.txt | 5 | ||||
-rw-r--r-- | npcs/npc322.xml | 2 |
5 files changed, 6 insertions, 1 deletions
diff --git a/graphics/guiicons/edit.png b/graphics/guiicons/edit.png Binary files differnew file mode 100644 index 00000000..36617ce9 --- /dev/null +++ b/graphics/guiicons/edit.png diff --git a/graphics/guiicons/restart.png b/graphics/guiicons/restart.png Binary files differnew file mode 100644 index 00000000..f65ffb25 --- /dev/null +++ b/graphics/guiicons/restart.png diff --git a/graphics/guiicons/toggle.png b/graphics/guiicons/toggle.png Binary files differnew file mode 100644 index 00000000..6289854a --- /dev/null +++ b/graphics/guiicons/toggle.png diff --git a/license.txt b/license.txt index e613c05d..9fcb6967 100644 --- a/license.txt +++ b/license.txt @@ -55,6 +55,11 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/emotes/vicious.png (Reid) (GPLv2), (CC BY-SA 3.0) graphics/emotes/wink.png (Modanung) (GPLv2), (CC BY-SA 3.0) +#Gui Icons + graphics/guiicons/edit.png (wushin) (GPLv2), (CC BY-SA 3.0) + graphics/guiicons/restart.png (enchilado,wushin) (GPLv2), (CC BY-SA 3.0) + graphics/guiicons/toggle.png (wushin) (GPLv2), (CC BY-SA 3.0) + # Images graphics/images/axe.png (????) (GPLv2) graphics/images/bow.png (????) (GPLv2) diff --git a/npcs/npc322.xml b/npcs/npc322.xml index 25b2901d..d2464ef1 100644 --- a/npcs/npc322.xml +++ b/npcs/npc322.xml @@ -2,7 +2,7 @@ <npcs> <npc id="322"> <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> - <sprite>equipment/weapons/polearm-chop-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> + <sprite variant="7">equipment/weapons/polearm-chop-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> <sprite>equipment/head/crusadehelm-male.xml</sprite> <sprite>equipment/chest/warlordplate-male.xml|#573f10,9c8226,d3c04b,ffffff</sprite> <sprite>equipment/hands/generic-male.xml|#4e2e18,c8752f</sprite> |