Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
Conflicts:
data/oerkki1.png
src/client.cpp
|
|
|
|
when block has been unloaded
|
|
|
|
|
|
doing it
|
|
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)
|
|
stuff from material.cpp to content_mapnode.{h,cpp}
|
|
|
|
while no players are near it.
|
|
--HG--
extra : rebase_source : 8ad4d13fc7ab1088ebd18cf968d912949aab8eae
|
|
--HG--
extra : rebase_source : 7260636295d9068fbeeddf4143c89f2b8a91446c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ActiveObjects
|
|
and other stuff.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
being a messy object oriented cludge, it now is a messy cludge with separate parameters.
|
|
|
|
so small that it doesn't increment the value)
|
|
--HG--
rename : data/luaobjects/test/client.lua => data/scripts/objects/test/client.lua
rename : data/luaobjects/test/server.lua => data/scripts/objects/test/server.lua
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
loading player position from disk because map is regenerated always.
|
|
|
|
|
|
|