diff options
| author | Wushin <pasekei@gmail.com> | 2015-05-07 22:02:03 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-05-07 22:02:03 -0500 |
| commit | 69e9ff671d3dbf772a100d542f634bece4c26f16 (patch) | |
| tree | bd6f1128c6df13fa6ef41774ec90e154e9f2cb27 | |
| parent | 4fdcd4fd11b36bdaaa851f3a763bed0d19298298 (diff) | |
| parent | cf328297b5019daa2bde675a7a6fcfe79598b65b (diff) | |
| download | clientdata-69e9ff671d3dbf772a100d542f634bece4c26f16.tar.gz clientdata-69e9ff671d3dbf772a100d542f634bece4c26f16.tar.bz2 clientdata-69e9ff671d3dbf772a100d542f634bece4c26f16.tar.xz clientdata-69e9ff671d3dbf772a100d542f634bece4c26f16.zip | |
Merge pull request #266 from wushin/snow-license-fix
Clean up the old unknown Xmas tree
| -rw-r--r-- | graphics/tiles/christmastree.png | bin | 52905 -> 0 bytes | |||
| -rw-r--r-- | graphics/tiles/snow_x3.png | bin | 42095 -> 11723 bytes | |||
| -rw-r--r-- | license.txt | 3 | ||||
| -rw-r--r-- | tilesets/snow_x3.tsx | 2 |
4 files changed, 2 insertions, 3 deletions
diff --git a/graphics/tiles/christmastree.png b/graphics/tiles/christmastree.png Binary files differdeleted file mode 100644 index 6255a4b1..00000000 --- a/graphics/tiles/christmastree.png +++ /dev/null diff --git a/graphics/tiles/snow_x3.png b/graphics/tiles/snow_x3.png Binary files differindex 1d48fe48..f03b9b51 100644 --- a/graphics/tiles/snow_x3.png +++ b/graphics/tiles/snow_x3.png diff --git a/license.txt b/license.txt index 49477416..d9d149d5 100644 --- a/license.txt +++ b/license.txt @@ -149,7 +149,6 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/equipment/head/captain_hat.png (Black Don) (GPLv2) graphics/items/equipment/head/catears.png (Angeliex) (GPLv2) graphics/items/equipment/head/chefhat.png (Nami) (GPLv2), (CC BY-SA 3.0) - graphics/items/equipment/head/christmastree.png (????) (GPLv2) graphics/items/equipment/head/circlet.png (VictorSan) (GPLv2) graphics/items/equipment/head/cowboyblack.png (Black Don) (GPLv2) graphics/items/equipment/head/cowboywhite.png (Black Don) (GPLv2) @@ -995,7 +994,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/tiles/snow_village_x3.png (bagzie, mekolat, ????) (GPLv2) graphics/tiles/snow_village_x4.png (bagzie, mekolat, ????) (GPLv2) graphics/tiles/snow_village2.png (bagzie, mekolat, ????) (GPLv2) - graphics/tiles/snow_x2.png (????, Nami, Salmondine, Arkhen) (GPLv2), (CC BY 4.0) + graphics/tiles/snow_x2.png (Nami, Salmondine, Arkhen) (GPLv2), (CC BY 4.0) graphics/tiles/snow_x3.png (????) (GPLv2) graphics/tiles/snow_x4.png (mekolat) (GPLv2) graphics/tiles/snow.png (bagzie, mekolat, wushin, ????) (GPLv2) diff --git a/tilesets/snow_x3.tsx b/tilesets/snow_x3.tsx index 7bd67be4..df57224a 100644 --- a/tilesets/snow_x3.tsx +++ b/tilesets/snow_x3.tsx @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <tileset name="snow_x3" tilewidth="32" tileheight="96"> - <image source="../graphics/tiles/snow_x3.png" width="512" height="96"/> + <image source="../graphics/tiles/snow_x3.png" width="128" height="96"/> </tileset> |
