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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \| \|	Merge remote-tracking branch 'erlehmann/master'	Giuseppe Bilotta	2011-07-22	2	-1/+14
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts (from the introduction of fr translations): src/CMakeLists.txt
\| \| \| * \| \| \| \|	Added french translation.	Cyriaque Skrapits	2011-07-21	1	-1/+15
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	* different collision box for fireflies so they now hover above the ground	Nils Dagsson Moskopp	2011-07-21	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	changed some lines to fit the 80chars limit	Constantin Wenger	2011-07-22	5	-19/+38
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Reorganize cmake gettext message output to ease debugging	Giuseppe Bilotta	2011-07-21	1	-8/+8
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Restore "Leave address blank" position	Giuseppe Bilotta	2011-07-21	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Find correct library for MSVC vs MingW in Winows	Giuseppe Bilotta	2011-07-21	1	-4/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Only install locale files if using gettext	Giuseppe Bilotta	2011-07-21	1	-2/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Uppercase DEFINED or cmake 2.8.4 complains	Giuseppe Bilotta	2011-07-21	1	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Refactor and clean up gettext management	Giuseppe Bilotta	2011-07-21	1	-28/+26
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Make gettext optional	Giuseppe Bilotta	2011-07-21	2	-27/+48
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Tweak makefiles to add -delta suffix.	Weedy	2011-07-21	1	-13/+13
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix win32 MSVC compile. (screw gettext)	Weedy	2011-07-21	1	-3/+3
\| \| \|/ / / / /
\| \| * \| \| \| \|	Merge pull request #27 from Oblomov/master	Nils Dagsson Moskopp	2011-07-20	1	-2/+3
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* regression fix for windows build.
\| \| \| * \| \| \| \|	Move package search out of conditional	Giuseppe Bilotta	2011-07-20	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This unbreaks the Windows build which would otherwise have problems at the jthread level.
\| \| * \| \| \| \| \|	+ fireflies	Nils Dagsson Moskopp	2011-07-20	7	-2/+409
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'master' of github.com:erlehmann/minetest-delta	Nils Dagsson Moskopp	2011-07-20	1	-4/+4
\| \| \|\ \ \ \ \ \
\| \| \| * \ \ \ \ \	Merge pull request #24 from SpeedProg/master	Nils Dagsson Moskopp	2011-07-20	1	-4/+4
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \|/ / / / / \| \| \| \|/\| \| \| \| \|	gettext paths problem
\| \| \| \| * \| \| \| \|	fixed problem with wront paths in gettext	Constantin Wenger	2011-07-20	1	-4/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' of github.com:erlehmann/minetest-delta	Nils Dagsson Moskopp	2011-07-20	3	-7/+25
\| \| \|\\| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Set the window caption for the initial window too	Giuseppe Bilotta	2011-07-20	1	-0/+3
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Check the data path before usage	Giuseppe Bilotta	2011-07-20	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When not running in place, check if the assumed data path in ../share/APPNAME exists. If it doesn't exist, fall back to ../data instead. This allows the program to run successfully from the checkout directory even without the run-in-place flag active.
\| \| \| * \| \| \| \| \|	Use system sqlite3/jthread libs if available	Giuseppe Bilotta	2011-07-20	1	-7/+16
\| \| \| \|/ / / / /
\| \| * \| \| \| \| \|	Merge branch 'master' of github.com:erlehmann/minetest-delta	Nils Dagsson Moskopp	2011-07-20	8	-42/+102
\| \| \|\\| \| \| \| \|
\| \| \| * \| \| \| \|	added gettext support	Constantin Wenger	2011-07-20	8	-42/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	german translation file and bashscript to update translations
\| \| * \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \|