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
|
47e4eda4bb
|
Reorganizing stuff (import from temporary git repo)
|
2011-06-25 04:23:21 +03:00 |
|
Perttu Ahola
|
a649d43fe7
|
Messed around with genmap.py. Now supports format version 17.
|
2011-06-05 00:10:06 +03:00 |
|
Perttu Ahola
|
81ac026e1f
|
updated example map generator python script
|
2011-04-11 18:33:05 +03:00 |
|
Perttu Ahola
|
2990f5d90b
|
commit before some radical changes
|
2011-04-02 13:44:06 +03:00 |
|
Perttu Ahola
|
c18af6e728
|
- added map generating script
- dropped support for versions older than 2 because of lighting support
|
2010-11-29 12:16:17 +02:00 |