Perttu Ahola
|
2587bb361c
|
merged the content type extension and delta
|
2011-07-23 19:04:37 +03:00 |
|
Perttu Ahola
|
90d793f8f3
|
extended content-type range
|
2011-07-23 16:55:26 +03:00 |
|
Nils Dagsson Moskopp
|
8129d16dd3
|
+ fireflies
|
2011-07-20 22:05:57 +02:00 |
|
Nils Dagsson Moskopp
|
3560f0de08
|
Merge branch 'upstream/master'
Conflicts:
data/oerkki1.png
src/client.cpp
|
2011-07-14 22:43:28 +02:00 |
|
Perttu Ahola
|
91cfbe2891
|
reorganized a lot of stuff and modified mapgen and objects slightly while doing it
|
2011-06-26 15:48:56 +03:00 |
|
Sebastian Rühl
|
9d09103e48
|
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>
|
2011-06-26 12:24:32 +02:00 |
|
Perttu Ahola
|
cced6aaf8d
|
separated inventory-related game content to content_inventory.{h,cpp}
|
2011-06-18 02:30:33 +03:00 |
|