106 Commits

Author	SHA1	Message	Date
Felix Krause	f1e8ff2245	* refactored liquid transformation code (has some flaws) ... 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.	2011-07-18 02:37:19 +02:00
Nils Dagsson Moskopp	3560f0de08	Merge branch 'upstream/master' ... Conflicts: data/oerkki1.png src/client.cpp	2011-07-14 22:43:28 +02:00
Perttu Ahola	97840e93b5	changed one "if" to "else if" in content_mapblock.cpp	2011-06-26 19:23:05 +03:00
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