summaryrefslogtreecommitdiff
path: root/src/content_mapblock.cpp
Commit message (Collapse)AuthorAge
* merged the content type extension and deltaPerttu Ahola2011-07-23
|\
| * * refactored liquid transformation code (has some flaws)Felix Krause2011-07-18
| | | | | | | | | | | | Completely rewrote the liquid transformation. The algorithm now exclusively modifies the current node in one iteration. Another change is that MapNode.param2 now stores a bit that tells other nodes if a flowing liquid node flows downwards. This is accomplished by two masks on param2 for the "flow down" bit and the "liquid level" bits. This will be the base of future improvements to the liquid flow. However, in the current state flowing liquid does not always disappear when cut off its source. Be aware that this branch is work in progress.
| * Merge branch 'upstream/master'Nils Dagsson Moskopp2011-07-14
| |\ | | | | | | | | | | | | | | | Conflicts: data/oerkki1.png src/client.cpp
| * | Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git ↵Sebastian Rühl2011-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | extended content-type rangePerttu Ahola2011-07-23
| |/ |/|
* | changed one "if" to "else if" in content_mapblock.cppPerttu Ahola2011-06-26
|/
* New map generator added (and SQLite, messed up the commits at that time...) ↵Perttu Ahola2011-06-25
| | | | (import from temporary git repo)
* Moved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and ↵Perttu Ahola2011-06-17
content_mapblock.{h,cpp}