Merge remote-tracking branch 'upstream/master' into Visuals-Vol-2

builtin/mainmenu/tab_about.lua

@@ -32,6 +32,27 @@ local function get_credits()
 	return json
 end
 
+local function get_renderer_info()
+	local ret = {}
+
+	-- OpenGL version, stripped to just the important part
+	local s1 = core.get_active_renderer()
+	if s1:sub(1, 7) == "OpenGL " then
+		s1 = s1:sub(8)
+	end
+	local m = s1:match("^[%d.]+")
+	if not m then
+		m = s1:match("^ES [%d.]+")
+	end
+	ret[#ret+1] = m or s1
+	-- video driver
+	ret[#ret+1] = core.get_active_driver():lower()
+	-- irrlicht device
+	ret[#ret+1] = core.get_active_irrlicht_device():upper()
+
+	return table.concat(ret, " / ")
+end
+
 return {
 	name = "about",
 	caption = fgettext("About"),
@@ -81,20 +102,12 @@ return {
 			"button_url[1.5,4.1;2.5,0.8;homepage;luanti.org;https://www.luanti.org/]" ..
 			"hypertext[5.5,0.25;9.75,6.6;credits;" .. core.formspec_escape(hypertext) .. "]"
 
-		-- Render information
-		local active_renderer_info = fgettext("Active renderer:") .. " " ..
-			core.formspec_escape(core.get_active_renderer())
+		local active_renderer_info = fgettext("Active renderer:") .. "\n" ..
+			core.formspec_escape(get_renderer_info())
 		fs = fs .. "style[label_button2;border=false]" ..
-			"button[0.1,6;5.3,0.5;label_button2;" .. active_renderer_info .. "]"..
+			"button[0.1,6;5.3,1;label_button2;" .. active_renderer_info .. "]"..
 			"tooltip[label_button2;" .. active_renderer_info .. "]"
 
-		-- Irrlicht device information
-		local irrlicht_device_info = fgettext("Irrlicht device:") .. " " ..
-			core.formspec_escape(core.get_active_irrlicht_device())
-		fs = fs .. "style[label_button3;border=false]" ..
-			"button[0.1,6.5;5.3,0.5;label_button3;" .. irrlicht_device_info .. "]"..
-			"tooltip[label_button3;" .. irrlicht_device_info .. "]"
-
 		if PLATFORM == "Android" then
 			fs = fs .. "button[0.5,5.1;4.5,0.8;share_debug;" .. fgettext("Share debug log") .. "]"
 		else

builtin/mainmenu/tab_online.lua

@@ -112,6 +112,7 @@ local function get_formspec(tabview, name, tabdata)
 	local retval =
 		-- Search
 		"field[0.25,0.25;7,0.75;te_search;;" .. core.formspec_escape(tabdata.search_for) .. "]" ..
+		"tooltip[te_search;" .. fgettext("Possible filters\ngame:<name>\nmod:<name>\nplayer:<name>") .. "]" ..
 		"field_enter_after_edit[te_search;true]" ..
 		"container[7.25,0.25]" ..
 		"image_button[0,0;0.75,0.75;" .. core.formspec_escape(defaulttexturedir .. "search.png") .. ";btn_mp_search;]" ..
@@ -271,19 +272,106 @@ end
 
 --------------------------------------------------------------------------------
 
+local function parse_search_input(input)
+	if not input:find("%S") then
+		return -- Return nil if nothing to search for
+	end
+
+	-- Search is not case sensitive
+	input = input:lower()
+
+	local query = {keywords = {}, mods = {}, players = {}}
+
+	-- Process quotation enclosed parts
+	input = input:gsub('(%S?)"([^"]*)"(%S?)', function(before, match, after)
+		if before == "" and after == "" then -- Also have be separated by spaces
+			table.insert(query.keywords, match)
+			return " "
+		end
+		return before..'"'..match..'"'..after
+	end)
+
+	-- Separate by space characters and handle special prefixes
+	-- (words with special prefixes need an exact match and none of them can contain spaces)
+	for word in input:gmatch("%S+") do
+		local mod = word:match("^mod:(.*)")
+		table.insert(query.mods, mod)
+		local player = word:match("^player:(.*)")
+		table.insert(query.players, player)
+		local game = word:match("^game:(.*)")
+		query.game = query.game or game
+		if not (mod or player or game) then
+			table.insert(query.keywords, word)
+		end
+	end
+
+	return query
+end
+
+-- Prepares the server to be used for searching
+local function uncapitalize_server(server)
+	local function table_lower(t)
+		local r = {}
+		for i, s in ipairs(t or {}) do
+			r[i] = s:lower()
+		end
+		return r
+	end
+
+	return {
+		name = (server.name or ""):lower(),
+		description = (server.description or ""):lower(),
+		gameid = (server.gameid or ""):lower(),
+		mods = table_lower(server.mods),
+		clients_list = table_lower(server.clients_list),
+	}
+end
+
+-- Returns false if the query does not match
+-- otherwise returns a number to adjust the sorting priority
+local function matches_query(server, query)
+	-- Search is not case sensitive
+	server = uncapitalize_server(server)
+
+	-- Check if mods found
+	for _, mod in ipairs(query.mods) do
+		if table.indexof(server.mods, mod) < 0 then
+			return false
+		end
+	end
+
+	-- Check if players found
+	for _, player in ipairs(query.players) do
+		if table.indexof(server.clients_list, player) < 0 then
+			return false
+		end
+	end
+
+	-- Check if game matches
+	if query.game and query.game ~= server.gameid then
+		return false
+	end
+
+	-- Check if keyword found
+	local name_matches = true
+	local description_matches = true
+	for _, keyword in ipairs(query.keywords) do
+		name_matches = name_matches and server.name:find(keyword, 1, true)
+		description_matches = description_matches and server.description:find(keyword, 1, true)
+	end
+
+	return name_matches and 50 or description_matches and 0
+end
+
 local function search_server_list(input)
 	menudata.search_result = nil
 	if #serverlistmgr.servers < 2 then
 		return
 	end
 
-	-- setup the keyword list
-	local keywords = {}
-	for word in input:gmatch("%S+") do
-		table.insert(keywords, word:lower())
-	end
-
-	if #keywords == 0 then
+	-- setup the search query
+	local query = parse_search_input(input)
+	if not query then
 		return
 	end
 
@@ -292,16 +380,9 @@ local function search_server_list(input)
 	-- Search the serverlist
 	local search_result = {}
 	for i, server in ipairs(serverlistmgr.servers) do
-		local name_matches, description_matches = true, true
-		for _, keyword in ipairs(keywords) do
-			name_matches = name_matches and not not
-					(server.name or ""):lower():find(keyword, 1, true)
-			description_matches = description_matches and not not
-					(server.description or ""):lower():find(keyword, 1, true)
-		end
-		if name_matches or description_matches then
-			server.points = #serverlistmgr.servers - i
-					+ (name_matches and 50 or 0)
+		local match = matches_query(server, query)
+		if match then
+			server.points = #serverlistmgr.servers - i + match
 			table.insert(search_result, server)
 		end
 	end
@@ -395,7 +476,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
 
 	if fields.btn_mp_search or fields.key_enter_field == "te_search" then
 		tabdata.search_for = fields.te_search
-		search_server_list(fields.te_search:lower())
+		search_server_list(fields.te_search)
 		if menudata.search_result then
 			-- Note: This clears the selection if there are no results
 			set_selected_server(menudata.search_result[1])

builtin/settingtypes.txt

@@ -406,6 +406,7 @@ bilinear_filter (Bilinear filtering) bool false
 trilinear_filter (Trilinear filtering) bool false
 
 #    Use anisotropic filtering when looking at textures from an angle.
+#    This provides a significant improvement when used together with mipmapping.
 anisotropic_filter (Anisotropic filtering) bool false
 
 #    Select the antialiasing method to apply.
@@ -1881,6 +1882,10 @@ mesh_generation_interval (Mapblock mesh generation delay) int 0 0 50
 #    Value of 0 (default) will let Luanti autodetect the number of available threads.
 mesh_generation_threads (Mapblock mesh generation threads) int 0 0 8
 
+#    All mesh buffers with less than this number of vertices will be merged
+#    during map rendering. This improves rendering performance.
+mesh_buffer_min_vertices (Minimum vertex count for mesh buffers) int 100 0 1000
+
 #    True = 256
 #    False = 128
 #    Usable to make minimap smoother on slower machines.
@@ -1902,12 +1907,11 @@ world_aligned_mode (World-aligned textures mode) enum enable disable,enable,forc
 #    Warning: This option is EXPERIMENTAL!
 autoscale_mode (Autoscaling mode) enum disable disable,enable,force
 
-#    When using bilinear/trilinear/anisotropic filters, low-resolution textures
-#    can be blurred, so automatically upscale them with nearest-neighbor
-#    interpolation to preserve crisp pixels. This sets the minimum texture size
-#    for the upscaled textures; higher values look sharper, but require more
-#    memory. Powers of 2 are recommended. This setting is ONLY applied if
-#    bilinear/trilinear/anisotropic filtering is enabled.
+#    When using bilinear/trilinear filtering, low-resolution textures
+#    can be blurred, so this option automatically upscales them to preserve
+#    crisp pixels. This defines the minimum texture size for the upscaled textures;
+#    higher values look sharper, but require more memory.
+#    This setting is ONLY applied if any of the mentioned filters are enabled.
 #    This is also used as the base node texture size for world-aligned
 #    texture autoscaling.
 texture_min_size (Base texture size) int 64 1 32768