diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-21 22:36:46 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-21 22:36:46 +0200 |
| commit | 6de854e3b43fedbf7be5c914b6f05812766ccfde (patch) | |
| tree | 9abba21bae5d9a157c8295c56a0034dd0563b9ff /graphics/tiles | |
| parent | 3061d90f72f8e374e457eec9c2b1a32b94b80e0b (diff) | |
| parent | fa86b982fd820a4cf7112719bd721db0dc811b28 (diff) | |
| download | clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.tar.gz clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.tar.bz2 clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.tar.xz clientdata-6de854e3b43fedbf7be5c914b6f05812766ccfde.zip | |
Merge remote-tracking branch 'wushin/tonori-cave-release'
Conflicts:
license.txt: graphics/tiles/Woodland_ground.png was changed in master
added also enchilado here, since that edit was forgotten
npcs.xml: id conflict with trapper and supply chest, moved supply chest down to 378
Diffstat (limited to 'graphics/tiles')
| -rw-r--r-- | graphics/tiles/cave2.png | bin | 0 -> 172060 bytes |
| -rw-r--r-- | graphics/tiles/cave2_bilevel.png | bin | 0 -> 210975 bytes |
| -rw-r--r-- | graphics/tiles/cave2_bilevel_water_lava.png | bin | 0 -> 241015 bytes |
| -rw-r--r-- | graphics/tiles/cave2_sewer_mine.png | bin | 0 -> 177933 bytes |
| -rw-r--r-- | graphics/tiles/cave2_sewer_mine_x2.png | bin | 0 -> 58117 bytes |
| -rw-r--r-- | graphics/tiles/cave2_sewer_mine_x3.png | bin | 0 -> 14987 bytes |
| -rw-r--r-- | graphics/tiles/cave2_sewer_mine_x4.png | bin | 0 -> 15582 bytes |
| -rw-r--r-- | graphics/tiles/cave2_sewers.png | bin | 0 -> 52031 bytes |
| -rw-r--r-- | graphics/tiles/cave2_transistions.png | bin | 0 -> 114205 bytes |
| -rw-r--r-- | graphics/tiles/cave2_x2.png | bin | 0 -> 35064 bytes |
| -rw-r--r-- | graphics/tiles/desert2.png | bin | 208018 -> 215559 bytes |
11 files changed, 0 insertions, 0 deletions
diff --git a/graphics/tiles/cave2.png b/graphics/tiles/cave2.png Binary files differnew file mode 100644 index 00000000..05a13b23 --- /dev/null +++ b/graphics/tiles/cave2.png diff --git a/graphics/tiles/cave2_bilevel.png b/graphics/tiles/cave2_bilevel.png Binary files differnew file mode 100644 index 00000000..63b6fb46 --- /dev/null +++ b/graphics/tiles/cave2_bilevel.png diff --git a/graphics/tiles/cave2_bilevel_water_lava.png b/graphics/tiles/cave2_bilevel_water_lava.png Binary files differnew file mode 100644 index 00000000..94ff06a0 --- /dev/null +++ b/graphics/tiles/cave2_bilevel_water_lava.png diff --git a/graphics/tiles/cave2_sewer_mine.png b/graphics/tiles/cave2_sewer_mine.png Binary files differnew file mode 100644 index 00000000..05542e47 --- /dev/null +++ b/graphics/tiles/cave2_sewer_mine.png diff --git a/graphics/tiles/cave2_sewer_mine_x2.png b/graphics/tiles/cave2_sewer_mine_x2.png Binary files differnew file mode 100644 index 00000000..858e08f0 --- /dev/null +++ b/graphics/tiles/cave2_sewer_mine_x2.png diff --git a/graphics/tiles/cave2_sewer_mine_x3.png b/graphics/tiles/cave2_sewer_mine_x3.png Binary files differnew file mode 100644 index 00000000..cf03b1fb --- /dev/null +++ b/graphics/tiles/cave2_sewer_mine_x3.png diff --git a/graphics/tiles/cave2_sewer_mine_x4.png b/graphics/tiles/cave2_sewer_mine_x4.png Binary files differnew file mode 100644 index 00000000..00ec4e79 --- /dev/null +++ b/graphics/tiles/cave2_sewer_mine_x4.png diff --git a/graphics/tiles/cave2_sewers.png b/graphics/tiles/cave2_sewers.png Binary files differnew file mode 100644 index 00000000..d677f165 --- /dev/null +++ b/graphics/tiles/cave2_sewers.png diff --git a/graphics/tiles/cave2_transistions.png b/graphics/tiles/cave2_transistions.png Binary files differnew file mode 100644 index 00000000..772d5733 --- /dev/null +++ b/graphics/tiles/cave2_transistions.png diff --git a/graphics/tiles/cave2_x2.png b/graphics/tiles/cave2_x2.png Binary files differnew file mode 100644 index 00000000..6acd5378 --- /dev/null +++ b/graphics/tiles/cave2_x2.png diff --git a/graphics/tiles/desert2.png b/graphics/tiles/desert2.png Binary files differindex 30d5c07f..fef450dc 100644 --- a/graphics/tiles/desert2.png +++ b/graphics/tiles/desert2.png |
