103 Commits

Author	SHA1	Message	Date
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	7538b4c620	New map generator added (and SQLite, messed up the commits at that time...) (import from temporary git repo)	2011-06-25 04:25:14 +03:00
Perttu Ahola	682c9d8e7d	Moved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and content_mapblock.{h,cpp}	2011-06-17 23:20:31 +03:00