diff options
| author | Sebastian Rühl <bahamada_basti@yahoo.de> | 2011-06-26 12:24:32 +0200 |
|---|---|---|
| committer | Sebastian Rühl <bahamada_basti@yahoo.de> | 2011-06-26 12:24:32 +0200 |
| commit | 9d09103e481c4979ebb0130a9dee6265d0d6223b (patch) | |
| tree | c1c89aa8868975537758fe77a2b174d8ae3e5ed3 /data | |
| parent | a80025c352fb91ff295423940b3ded22755b70f0 (diff) | |
| parent | 158b054e72582005d895f1ed0e1cb0c9b22a8e57 (diff) | |
| download | minetest-9d09103e481c4979ebb0130a9dee6265d0d6223b.tar.gz minetest-9d09103e481c4979ebb0130a9dee6265d0d6223b.tar.bz2 minetest-9d09103e481c4979ebb0130a9dee6265d0d6223b.zip | |
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
Conflicts:
.gitignore
CMakeLists.txt
data/heart.png
src/CMakeLists.txt
src/game.cpp
src/guiMainMenu.cpp
src/inventory.cpp
src/map.cpp
src/mapblock.cpp
src/mapnode.cpp
src/mapnode.h
src/materials.cpp
src/server.cpp
Signed-off-by: Sebastian Rühl <bahamada_basti@yahoo.de>
Diffstat (limited to 'data')
| -rw-r--r-- | data/book.png | bin | 0 -> 292 bytes |
| -rw-r--r-- | data/bookshelf.png | bin | 0 -> 597 bytes |
| -rw-r--r-- | data/brick.png | bin | 0 -> 604 bytes |
| -rw-r--r-- | data/cactus_side.png | bin | 0 -> 279 bytes |
| -rw-r--r-- | data/cactus_top.png | bin | 0 -> 236 bytes |
| -rw-r--r-- | data/clay.png | bin | 0 -> 613 bytes |
| -rw-r--r-- | data/clay_brick.png | bin | 0 -> 249 bytes |
| -rw-r--r-- | data/fence.png | bin | 0 -> 539 bytes |
| -rw-r--r-- | data/glass.png | bin | 1309 -> 381 bytes |
| -rw-r--r-- | data/lump_of_clay.png | bin | 0 -> 210 bytes |
| -rw-r--r-- | data/menulogo.png | bin | 498 -> 653 bytes |
| -rw-r--r-- | data/oerkki1.png | bin | 212 -> 270 bytes |
| -rw-r--r-- | data/paper.png | bin | 0 -> 242 bytes |
| -rw-r--r-- | data/papyrus.png | bin | 0 -> 366 bytes |
| -rw-r--r-- | data/player.png | bin | 212 -> 652 bytes |
| -rw-r--r-- | data/player_back.png | bin | 201 -> 292 bytes |
| -rw-r--r-- | data/rail.png | bin | 0 -> 507 bytes |
| -rw-r--r-- | data/rail_crossing.png | bin | 0 -> 555 bytes |
| -rw-r--r-- | data/rail_curved.png | bin | 0 -> 545 bytes |
| -rw-r--r-- | data/rail_t_junction.png | bin | 0 -> 542 bytes |
| -rw-r--r-- | data/rat.png | bin | 920 -> 276 bytes |
| -rw-r--r-- | data/sandstone.png | bin | 0 -> 772 bytes |
22 files changed, 0 insertions, 0 deletions
diff --git a/data/book.png b/data/book.png Binary files differnew file mode 100644 index 000000000..176fb6aa9 --- /dev/null +++ b/data/book.png diff --git a/data/bookshelf.png b/data/bookshelf.png Binary files differnew file mode 100644 index 000000000..5ecc50ff3 --- /dev/null +++ b/data/bookshelf.png diff --git a/data/brick.png b/data/brick.png Binary files differnew file mode 100644 index 000000000..32d77f347 --- /dev/null +++ b/data/brick.png diff --git a/data/cactus_side.png b/data/cactus_side.png Binary files differnew file mode 100644 index 000000000..fc479fde6 --- /dev/null +++ b/data/cactus_side.png diff --git a/data/cactus_top.png b/data/cactus_top.png Binary files differnew file mode 100644 index 000000000..f9e68df51 --- /dev/null +++ b/data/cactus_top.png diff --git a/data/clay.png b/data/clay.png Binary files differnew file mode 100644 index 000000000..3557429d8 --- /dev/null +++ b/data/clay.png diff --git a/data/clay_brick.png b/data/clay_brick.png Binary files differnew file mode 100644 index 000000000..e36648e48 --- /dev/null +++ b/data/clay_brick.png diff --git a/data/fence.png b/data/fence.png Binary files differnew file mode 100644 index 000000000..0b99f0eb5 --- /dev/null +++ b/data/fence.png diff --git a/data/glass.png b/data/glass.png Binary files differindex 8598ce670..35ea596d5 100644 --- a/data/glass.png +++ b/data/glass.png diff --git a/data/lump_of_clay.png b/data/lump_of_clay.png Binary files differnew file mode 100644 index 000000000..be0bab9d7 --- /dev/null +++ b/data/lump_of_clay.png diff --git a/data/menulogo.png b/data/menulogo.png Binary files differindex 76595c48d..cb6983e5c 100644 --- a/data/menulogo.png +++ b/data/menulogo.png diff --git a/data/oerkki1.png b/data/oerkki1.png Binary files differindex c32fb99db..aad2ddb41 100644 --- a/data/oerkki1.png +++ b/data/oerkki1.png diff --git a/data/paper.png b/data/paper.png Binary files differnew file mode 100644 index 000000000..ae5c06bc6 --- /dev/null +++ b/data/paper.png diff --git a/data/papyrus.png b/data/papyrus.png Binary files differnew file mode 100644 index 000000000..bf0dec7fe --- /dev/null +++ b/data/papyrus.png diff --git a/data/player.png b/data/player.png Binary files differindex 90adf9747..60ac4854b 100644 --- a/data/player.png +++ b/data/player.png diff --git a/data/player_back.png b/data/player_back.png Binary files differindex 530aa7519..447c1fd8f 100644 --- a/data/player_back.png +++ b/data/player_back.png diff --git a/data/rail.png b/data/rail.png Binary files differnew file mode 100644 index 000000000..18176d9f3 --- /dev/null +++ b/data/rail.png diff --git a/data/rail_crossing.png b/data/rail_crossing.png Binary files differnew file mode 100644 index 000000000..984640577 --- /dev/null +++ b/data/rail_crossing.png diff --git a/data/rail_curved.png b/data/rail_curved.png Binary files differnew file mode 100644 index 000000000..62afa3d2b --- /dev/null +++ b/data/rail_curved.png diff --git a/data/rail_t_junction.png b/data/rail_t_junction.png Binary files differnew file mode 100644 index 000000000..9985f63cd --- /dev/null +++ b/data/rail_t_junction.png diff --git a/data/rat.png b/data/rat.png Binary files differindex d1a0e2ae2..96d44c3fa 100644 --- a/data/rat.png +++ b/data/rat.png diff --git a/data/sandstone.png b/data/sandstone.png Binary files differnew file mode 100644 index 000000000..c4759b4d0 --- /dev/null +++ b/data/sandstone.png |
