hax-minetest-server.git - Server-optimized Minetest 5.6.0

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \|	Merge branch 'upstream/master'	Nils Dagsson Moskopp	2011-07-20	2	-5/+26
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| / / / / / / \| \| \|/ / / / / /
\| * \| \| \| \| \| \|	* by popular request, fewer clouds	Nils Dagsson Moskopp	2011-07-20	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	* initialize liquid_kind properly so compiler does not bitch about it	Nils Dagsson Moskopp	2011-07-19	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	+ fake shading for the volumetric clouds	Nils Dagsson Moskopp	2011-07-19	1	-6/+19
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	+ volumetric clouds (thanks teddydestodes)	Nils Dagsson Moskopp	2011-07-18	1	-11/+62
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	final fixes to liquid flow, works now as intended	Felix Krause	2011-07-18	1	-15/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fixes to liquid transformation	Felix Krause	2011-07-18	1	-5/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fixed refactoring issues // slowed down water flow a bit	Felix Krause	2011-07-18	1	-7/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* liquid flow no longer does random things when transformed * if a flowi ng liquid node doesn't have a solid block as neighbor, its spread distan ce is shortened by 1
\| * \| \| \| \| \| \|	* refactored liquid transformation code (has some flaws)	Felix Krause	2011-07-18	3	-252/+208
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \| \| \| \| \|	* changed GUI to indicate Minetest Δ	Nils Dagsson Moskopp	2011-07-17	2	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'origin/upstream'	Nils Dagsson Moskopp	2011-07-16	4	-4/+4
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	* fix automerge regression	Nils Dagsson Moskopp	2011-07-15	1	-73/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	* regression fix, clay occurs again now	Nils Dagsson Moskopp	2011-07-15	1	-7/+9
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	* possibly nicer trees	Nils Dagsson Moskopp	2011-07-15	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'upstream/master'	Nils Dagsson Moskopp	2011-07-14	47	-2762/+3247
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: data/oerkki1.png src/client.cpp
\| * \| \| \| \| \| \|	* possibly improved water flow, by flyx86	Nils Dagsson Moskopp	2011-07-14	3	-8/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- When flowing liquid starts to flow down, it stops contributing to its neighboring nodes' liquid level (possibly transforming it back to air) - Flowing liquid turns into a source if there are at least 2 adjacent liquid source nodes - If a new liquid flow reaches existing flowing liquid, the existing liquid is now updated properly.
\| * \| \| \| \| \| \|	* possible fix for large cubic holes in map	Nils Dagsson Moskopp	2011-07-13	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	* slightly different values for 3d perlin noise	Nils Dagsson Moskopp	2011-07-13	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	* regression fix, papyrus should appear again now	Nils Dagsson Moskopp	2011-07-13	1	-10/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	+ farmesh config options	Jiří Procházka	2011-07-11	4	-15/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	backported cactus, papyrus and clay	Sebastian Rühl	2011-06-26	1	-10/+67
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	small fix	Sebastian Rühl	2011-06-26	2	-0/+731
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git ↵	Sebastian Rühl	2011-06-26	13	-41/+603
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
\| \| * \| \| \| \| \|	+ rail block bounding box	Nils Dagsson Moskopp	2011-06-08	1	-0/+37
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	+ rail	Nils Dagsson Moskopp	2011-06-07	5	-0/+138
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	* point out setInventoryTextureCube() is broken with a FIXME	Nils Dagsson Moskopp	2011-06-03	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	+ paper, book, bookshelf	Nils Dagsson Moskopp	2011-06-03	6	-0/+67
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	+ papyrus	Nils Dagsson Moskopp	2011-06-03	7	-2/+97
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	added new submenu for key assignment	teddydestodes	2011-06-01	8	-103/+913
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configwriting/saving isn't complete and will break your config if you use fancy keys
\| \| * \| \| \| \| \|	Merge remote-tracking branch 'bucket-t/master'	teddydestodes	2011-06-01	1	-3/+20
\| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \|	MacOSX build support	MrLoom	2011-06-01	1	-3/+20
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	teddydestodes	2011-06-01	7	-9/+115
\| \| \|\\| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	* clay is rarer now	Nils Dagsson Moskopp	2011-06-01	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	+ clay and associated items	Nils Dagsson Moskopp	2011-06-01	7	-3/+61
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	+ brick	Nils Dagsson Moskopp	2011-05-31	5	-0/+12
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	+ fence inventory icon	Nils Dagsson Moskopp	2011-05-31	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	* improved fence dimensions (cuboid side lengths now multiples of 2, ↵	Nils Dagsson Moskopp	2011-05-31	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	textures should fit better)
\| \| \| * \| \| \| \| \|	+ cactii	Nils Dagsson Moskopp	2011-05-30	6	-7/+42
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	* improved fence dimensions (cuboid side lengths now multiples of 2, ↵	Nils Dagsson Moskopp	2011-06-01	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	textures should fit better)
\| \| * \| \| \| \| \| \|	fast_move and free_move can now be toggled	teddydestodes	2011-05-29	2	-0/+24
\| \| \|/ / / / / /
\| \| * \| \| \| \| /	+ sandstone	Nils Dagsson Moskopp	2011-05-29	5	-0/+27
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
* \| \| \| \| \| \|	extended content-type range	Perttu Ahola	2011-07-23	26	-314/+421
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	Fixed the problem of <=r548 clients fucking up maps on >=r549 servers. Also, ↵	Perttu Ahola	2011-07-22	1	-15/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	already fucked up maps are now loaded correctly.
* \| \| \| \| \|	added an unit test for the Settings thingy (the python ConfigParser -like thing)	Perttu Ahola	2011-07-22	1	-0/+33
\| \| \| \| \| \|
* \| \| \| \| \|	Fixed small error in mapnode.cpp (didn't cause any harm though)	Perttu Ahola	2011-07-22	1	-1/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Fixed new map generator causing a crash when generating at map limit	Perttu Ahola	2011-07-22	2	-28/+42
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Hopefully fixed u64 to be the actual 64-bit type on 64-bit architectures. ↵	Perttu Ahola	2011-07-17	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should fix the compiler error caused by irrlicht on 64-bit fedora defining u64 to be different.
* \| \| \| \|	A small fix to an unlikely situation where the map generator requires a ↵	Perttu Ahola	2011-07-17	1	-4/+17
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	block that hasn't been loaded from disk. Now it is actually loaded from disk in that case.
* \| \| \|	Attempt to fix a problem with the factory mappings of objects residing in ↵	Perttu Ahola	2011-07-16	4	-4/+4
\| \|_\|/ \|/\| \| \| \| \| \| \| \|	different source files than the prototype objects that fill them in
* \| \|	initial steps in doing content type extension	Perttu Ahola	2011-07-02	5	-144/+151
\| \| \|