diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-11-23 00:23:50 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-11-23 00:23:50 -0700 |
| commit | 5e3b3ca60fd86cc0872901dcd888d20077c040a0 (patch) | |
| tree | c4260b129e4ca6105559017fa09f3c02294fd397 /graphics | |
| parent | a1d23a0a3dae86aa3a20a0fe3fbb4e953045427a (diff) | |
| parent | c3a4cf5300255bb08c50827b89baceccc42bdd3a (diff) | |
| download | clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.tar.gz clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.tar.bz2 clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.tar.xz clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.zip | |
Merge branch 'real-master' into fresh-master
Conflicts:
graphics/sprites/head-deserthat.xml
Diffstat (limited to 'graphics')
60 files changed, 1 insertions, 1 deletions
diff --git a/graphics/images/minimap_new_1-1.png b/graphics/images/minimap_new_1-1.png Binary files differdeleted file mode 100644 index d4c16c0d..00000000 --- a/graphics/images/minimap_new_1-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_10-1.png b/graphics/images/minimap_new_10-1.png Binary files differdeleted file mode 100644 index f73e17c4..00000000 --- a/graphics/images/minimap_new_10-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_11-1.png b/graphics/images/minimap_new_11-1.png Binary files differdeleted file mode 100644 index 7266ae85..00000000 --- a/graphics/images/minimap_new_11-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_12-1.png b/graphics/images/minimap_new_12-1.png Binary files differdeleted file mode 100644 index e9d16939..00000000 --- a/graphics/images/minimap_new_12-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_14-1.png b/graphics/images/minimap_new_14-1.png Binary files differdeleted file mode 100644 index e066d167..00000000 --- a/graphics/images/minimap_new_14-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_15-1.png b/graphics/images/minimap_new_15-1.png Binary files differdeleted file mode 100644 index ca399a4e..00000000 --- a/graphics/images/minimap_new_15-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_16-1.png b/graphics/images/minimap_new_16-1.png Binary files differdeleted file mode 100644 index 6218e430..00000000 --- a/graphics/images/minimap_new_16-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_17-1.png b/graphics/images/minimap_new_17-1.png Binary files differdeleted file mode 100644 index 60395c23..00000000 --- a/graphics/images/minimap_new_17-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_18-1.png b/graphics/images/minimap_new_18-1.png Binary files differdeleted file mode 100644 index 868208c1..00000000 --- a/graphics/images/minimap_new_18-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_19-1.png b/graphics/images/minimap_new_19-1.png Binary files differdeleted file mode 100644 index ba2ab383..00000000 --- a/graphics/images/minimap_new_19-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_2-1.png b/graphics/images/minimap_new_2-1.png Binary files differdeleted file mode 100644 index 89936fad..00000000 --- a/graphics/images/minimap_new_2-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_21-1.png b/graphics/images/minimap_new_21-1.png Binary files differdeleted file mode 100644 index e628e105..00000000 --- a/graphics/images/minimap_new_21-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_22-1.png b/graphics/images/minimap_new_22-1.png Binary files differdeleted file mode 100644 index 273d60a0..00000000 --- a/graphics/images/minimap_new_22-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_24-1.png b/graphics/images/minimap_new_24-1.png Binary files differdeleted file mode 100644 index 2161bd8f..00000000 --- a/graphics/images/minimap_new_24-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_25-1.png b/graphics/images/minimap_new_25-1.png Binary files differdeleted file mode 100644 index 8f5f03de..00000000 --- a/graphics/images/minimap_new_25-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_26-1.png b/graphics/images/minimap_new_26-1.png Binary files differdeleted file mode 100644 index ca6b59e1..00000000 --- a/graphics/images/minimap_new_26-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_27-1.png b/graphics/images/minimap_new_27-1.png Binary files differdeleted file mode 100644 index cb7c88ba..00000000 --- a/graphics/images/minimap_new_27-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_28-1.png b/graphics/images/minimap_new_28-1.png Binary files differdeleted file mode 100644 index 3538f93d..00000000 --- a/graphics/images/minimap_new_28-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_29-1.png b/graphics/images/minimap_new_29-1.png Binary files differdeleted file mode 100644 index 9fab6b63..00000000 --- a/graphics/images/minimap_new_29-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_3-1.png b/graphics/images/minimap_new_3-1.png Binary files differdeleted file mode 100644 index 93521f3d..00000000 --- a/graphics/images/minimap_new_3-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_30-1.png b/graphics/images/minimap_new_30-1.png Binary files differdeleted file mode 100644 index ed2d2c1f..00000000 --- a/graphics/images/minimap_new_30-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_31-1.png b/graphics/images/minimap_new_31-1.png Binary files differdeleted file mode 100644 index f0654e3e..00000000 --- a/graphics/images/minimap_new_31-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_32-1.png b/graphics/images/minimap_new_32-1.png Binary files differdeleted file mode 100644 index afff39a2..00000000 --- a/graphics/images/minimap_new_32-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_4-1.png b/graphics/images/minimap_new_4-1.png Binary files differdeleted file mode 100644 index d6df9a4c..00000000 --- a/graphics/images/minimap_new_4-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_5-1.png b/graphics/images/minimap_new_5-1.png Binary files differdeleted file mode 100644 index 257bbb25..00000000 --- a/graphics/images/minimap_new_5-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_7-1.png b/graphics/images/minimap_new_7-1.png Binary files differdeleted file mode 100644 index c110d39d..00000000 --- a/graphics/images/minimap_new_7-1.png +++ /dev/null diff --git a/graphics/images/minimap_new_9-1.png b/graphics/images/minimap_new_9-1.png Binary files differdeleted file mode 100644 index c692108e..00000000 --- a/graphics/images/minimap_new_9-1.png +++ /dev/null diff --git a/graphics/minimaps/001-1.png b/graphics/minimaps/001-1.png Binary files differnew file mode 100644 index 00000000..166dbc83 --- /dev/null +++ b/graphics/minimaps/001-1.png diff --git a/graphics/minimaps/001-3.png b/graphics/minimaps/001-3.png Binary files differnew file mode 100644 index 00000000..65ea6f1b --- /dev/null +++ b/graphics/minimaps/001-3.png diff --git a/graphics/minimaps/002-1.png b/graphics/minimaps/002-1.png Binary files differnew file mode 100644 index 00000000..16b6bf3e --- /dev/null +++ b/graphics/minimaps/002-1.png diff --git a/graphics/minimaps/002-3.png b/graphics/minimaps/002-3.png Binary files differnew file mode 100644 index 00000000..2928f096 --- /dev/null +++ b/graphics/minimaps/002-3.png diff --git a/graphics/minimaps/002-4.png b/graphics/minimaps/002-4.png Binary files differnew file mode 100644 index 00000000..f47e980d --- /dev/null +++ b/graphics/minimaps/002-4.png diff --git a/graphics/minimaps/003-1.png b/graphics/minimaps/003-1.png Binary files differnew file mode 100644 index 00000000..65c545df --- /dev/null +++ b/graphics/minimaps/003-1.png diff --git a/graphics/minimaps/004-1.png b/graphics/minimaps/004-1.png Binary files differnew file mode 100644 index 00000000..e2c72051 --- /dev/null +++ b/graphics/minimaps/004-1.png diff --git a/graphics/minimaps/005-1.png b/graphics/minimaps/005-1.png Binary files differnew file mode 100644 index 00000000..d92255b7 --- /dev/null +++ b/graphics/minimaps/005-1.png diff --git a/graphics/minimaps/005-3.png b/graphics/minimaps/005-3.png Binary files differnew file mode 100644 index 00000000..007eaa1c --- /dev/null +++ b/graphics/minimaps/005-3.png diff --git a/graphics/minimaps/006-1.png b/graphics/minimaps/006-1.png Binary files differnew file mode 100644 index 00000000..6a6675ef --- /dev/null +++ b/graphics/minimaps/006-1.png diff --git a/graphics/minimaps/006-3.png b/graphics/minimaps/006-3.png Binary files differnew file mode 100644 index 00000000..7e8ae7a7 --- /dev/null +++ b/graphics/minimaps/006-3.png diff --git a/graphics/minimaps/007-1.png b/graphics/minimaps/007-1.png Binary files differnew file mode 100644 index 00000000..777186eb --- /dev/null +++ b/graphics/minimaps/007-1.png diff --git a/graphics/minimaps/008-1.png b/graphics/minimaps/008-1.png Binary files differnew file mode 100644 index 00000000..f78351e7 --- /dev/null +++ b/graphics/minimaps/008-1.png diff --git a/graphics/minimaps/009-1.png b/graphics/minimaps/009-1.png Binary files differnew file mode 100644 index 00000000..7025d51a --- /dev/null +++ b/graphics/minimaps/009-1.png diff --git a/graphics/minimaps/009-3.png b/graphics/minimaps/009-3.png Binary files differnew file mode 100644 index 00000000..434cee00 --- /dev/null +++ b/graphics/minimaps/009-3.png diff --git a/graphics/minimaps/010-1.png b/graphics/minimaps/010-1.png Binary files differnew file mode 100644 index 00000000..70930b48 --- /dev/null +++ b/graphics/minimaps/010-1.png diff --git a/graphics/minimaps/011-1.png b/graphics/minimaps/011-1.png Binary files differnew file mode 100644 index 00000000..f175b6fd --- /dev/null +++ b/graphics/minimaps/011-1.png diff --git a/graphics/minimaps/011-3.png b/graphics/minimaps/011-3.png Binary files differnew file mode 100644 index 00000000..e72f9855 --- /dev/null +++ b/graphics/minimaps/011-3.png diff --git a/graphics/minimaps/011-4.png b/graphics/minimaps/011-4.png Binary files differnew file mode 100644 index 00000000..2c055241 --- /dev/null +++ b/graphics/minimaps/011-4.png diff --git a/graphics/minimaps/012-1.png b/graphics/minimaps/012-1.png Binary files differnew file mode 100644 index 00000000..2c54ee90 --- /dev/null +++ b/graphics/minimaps/012-1.png diff --git a/graphics/minimaps/012-3.png b/graphics/minimaps/012-3.png Binary files differnew file mode 100644 index 00000000..57153798 --- /dev/null +++ b/graphics/minimaps/012-3.png diff --git a/graphics/minimaps/013-1.png b/graphics/minimaps/013-1.png Binary files differnew file mode 100644 index 00000000..ad412ad3 --- /dev/null +++ b/graphics/minimaps/013-1.png diff --git a/graphics/minimaps/014-1.png b/graphics/minimaps/014-1.png Binary files differnew file mode 100644 index 00000000..3460fda9 --- /dev/null +++ b/graphics/minimaps/014-1.png diff --git a/graphics/minimaps/014-3.png b/graphics/minimaps/014-3.png Binary files differnew file mode 100644 index 00000000..e46516e2 --- /dev/null +++ b/graphics/minimaps/014-3.png diff --git a/graphics/minimaps/015-1.png b/graphics/minimaps/015-1.png Binary files differnew file mode 100644 index 00000000..d4f879f4 --- /dev/null +++ b/graphics/minimaps/015-1.png diff --git a/graphics/minimaps/016-1.png b/graphics/minimaps/016-1.png Binary files differnew file mode 100644 index 00000000..b76b7ac4 --- /dev/null +++ b/graphics/minimaps/016-1.png diff --git a/graphics/minimaps/017-1.png b/graphics/minimaps/017-1.png Binary files differnew file mode 100644 index 00000000..bdb0153c --- /dev/null +++ b/graphics/minimaps/017-1.png diff --git a/graphics/minimaps/018-1.png b/graphics/minimaps/018-1.png Binary files differnew file mode 100644 index 00000000..fdf15b99 --- /dev/null +++ b/graphics/minimaps/018-1.png diff --git a/graphics/minimaps/019-1.png b/graphics/minimaps/019-1.png Binary files differnew file mode 100644 index 00000000..ab0d22c8 --- /dev/null +++ b/graphics/minimaps/019-1.png diff --git a/graphics/minimaps/020-1.png b/graphics/minimaps/020-1.png Binary files differnew file mode 100644 index 00000000..82c1faa7 --- /dev/null +++ b/graphics/minimaps/020-1.png diff --git a/graphics/minimaps/020-3.png b/graphics/minimaps/020-3.png Binary files differnew file mode 100644 index 00000000..a5e67d83 --- /dev/null +++ b/graphics/minimaps/020-3.png diff --git a/graphics/minimaps/020-4.png b/graphics/minimaps/020-4.png Binary files differnew file mode 100644 index 00000000..e65bbefc --- /dev/null +++ b/graphics/minimaps/020-4.png diff --git a/graphics/sprites/head-deserthat.xml b/graphics/sprites/head-deserthat.xml index 09297c3f..5eab2ef7 100644 --- a/graphics/sprites/head-deserthat.xml +++ b/graphics/sprites/head-deserthat.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <sprite> - <imageset name="base" src="graphics/sprites/item007.png|R" width="32" height="35" /> + <imageset name="base" src="graphics/sprites/head-deserthat.png|R;W" width="32" height="35" /> <action name="stand" imageset="base"> <animation direction="down"> |
