| Age | Commit message (Collapse) | Author |
|---|
|
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(import from temporary git repo)
|
|
|
|
|
|
|
|
|
|
by spongie)
|
|
high)
|
|
|
|
https://bitbucket.org/toabi/minetest-mac
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
and J)
|
|
|
|
|
|
content_mapblock.{h,cpp}
|
|
stuff from material.cpp to content_mapnode.{h,cpp}
|
|
the server
|
|
height than it should
|
|
|
|
|
|
and not suitable for real use yet, and might never be.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
