kahrl

diff --git a/doc/minetest.6 b/doc/minetest.6
index 8099128..f837303 100644
--- a/doc/minetest.6
+++ b/doc/minetest.6
@@ -78,7 +78,7 @@ Set world path
 .TP
 \-\-migrate <value>
 Migrate from current map backend to another. Possible values are sqlite3
-and leveldb. Only works when using --server.
+and leveldb.

kahrl

diff --git a/src/debug.h b/src/debug.h
index 1532be8..ba2e870 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -73,6 +73,14 @@ class Nullstream : public std::ostream {
 extern Nullstream dummyout;
 
 /*
+	Include assert.h and immediately undef assert so that it can't override
+	our assert later on. leveldb/slice.h is a notable offender.

kahrl

diff --git a/doc/minetest.6 b/doc/minetest.6
index c690229..8099128 100644
--- a/doc/minetest.6
+++ b/doc/minetest.6
@@ -1,5 +1,5 @@
 .\" Minetest man page
-.TH minetest 6 "11 March 2012" "" ""
+.TH minetest 6 "10 September 2013" "" ""
 
 .SH NAME

kahrl

diff --git a/minetest.conf.example b/minetest.conf.example
index aeeff82..929f39a 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -166,10 +166,8 @@
 #trilinear_filter = false
 # Set to true to pre-generate all item visuals
 #preload_item_visuals = true
-# 0: disable shaders
-# (1: low level shaders; not implemented)

kahrl

diff --git a/src/game.cpp b/src/game.cpp
index 650b5e2..d3d49d7 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -794,9 +794,9 @@ class GameGlobalShaderConstantSetter : public IShaderConstantSetter
 		services->setPixelShaderConstant("skyBgColor", bgcolorfa, 4);
 
 		// Fog distance
-		float fog_distance = *m_fog_range;
-		if(*m_force_fog_off)

kahrl

jsonstr = '[1, 2, 3, 4, 5, 6]'
json = engine.parse_json(jsonstr)
dump2(json)

kahrl

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 94397e1..1d2f295 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1471,6 +1471,12 @@ minetest.get_content_id(name) -> integer
 ^ Gets the internal content ID of name
 minetest.get_name_from_content_id(content_id) -> string
 ^ Gets the name of the content with that content ID
+minetest.parse_json(string[, nullvalue]) -> something
+^ Convert a string containing JSON data into the Lua equivalent

kahrl

tc qdisc del dev eth0 root
tc qdisc add dev eth0 root handle 1: prio
tc qdisc add dev eth0 parent 1:1 handle 2: netem delay 1000ms
tc filter add dev eth0 parent 1:0 protocol ip pref 55 handle ::55 u32 match ip dst 176.9.122.10 flowid 2:1

kahrl

--- collectstatic.sh	2013-08-27 12:15:00.311295847 +0200
+++ collectstatic_new.sh	2013-08-27 12:29:50.307039963 +0200
@@ -9,40 +9,40 @@
 	exit 1
 }
 
-if [ ! -f $MINETESTDIR ]; then
-	echo "Please specify a valid Minetest directory"
+if [ ! -d $MINETESTDIR ]; then
+	die "Please specify a valid Minetest directory"

kahrl

diff --git a/src/client.cpp b/src/client.cpp
index 380c25f..eaf578f 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1672,9 +1672,14 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 			file_requests.push_back(MediaRequest(name));
 		}
 
-		std::string remote_media = "";
+		std::vector<std::string> remote_media;