Merge branch 'master' of https://github.com/minetest/minetest

15 files changed, 311 insertions, 4 deletions

diff --git a/games/devtest/mods/testnodes/liquids.lua b/games/devtest/mods/testnodes/liquids.lua
index 3d2ea17f5..be33814af 100644
--- a/games/devtest/mods/testnodes/liquids.lua
+++ b/games/devtest/mods/testnodes/liquids.lua
@@ -40,9 +40,11 @@ for d=0, 8 do
 		liquid_range = d,
 	})
 
+	if d <= 7 then
+
 	local mod = "^[colorize:#000000:127"
 	minetest.register_node("testnodes:vliquid_"..d, {
-		description = "Test Liquid Source, Viscosity "..d,
+		description = "Test Liquid Source, Viscosity/Resistance "..d,
 		drawtype = "liquid",
 		tiles = {"testnodes_liquidsource_r"..d..".png"..mod},
 		special_tiles = {
@@ -61,7 +63,7 @@ for d=0, 8 do
 	})
 
 	minetest.register_node("testnodes:vliquid_flowing_"..d, {
-		description = "Flowing Test Liquid, Viscosity "..d,
+		description = "Flowing Test Liquid, Viscosity/Resistance "..d,
 		drawtype = "flowingliquid",
 		tiles = {"testnodes_liquidflowing_r"..d..".png"..mod},
 		special_tiles = {
@@ -80,4 +82,53 @@ for d=0, 8 do
 		liquid_viscosity = d,
 	})
 
+	mod = "^[colorize:#000000:192"
+	local v = 4
+	minetest.register_node("testnodes:vrliquid_"..d, {
+		description = "Test Liquid Source, Viscosity "..v..", Resistance "..d,
+		drawtype = "liquid",
+		tiles = {"testnodes_liquidsource_r"..d..".png"..mod},
+		special_tiles = {
+			{name = "testnodes_liquidsource_r"..d..".png"..mod, backface_culling = false},
+			{name = "testnodes_liquidsource_r"..d..".png"..mod, backface_culling = true},
+		},
+		use_texture_alpha = "blend",
+		paramtype = "light",
+		walkable = false,
+		pointable = false,
+		diggable = false,
+		buildable_to = true,
+		is_ground_content = false,
+		liquidtype = "source",
+		liquid_alternative_flowing = "testnodes:vrliquid_flowing_"..d,
+		liquid_alternative_source = "testnodes:vrliquid_"..d,
+		liquid_viscosity = v,
+		move_resistance = d,
+	})
+
+	minetest.register_node("testnodes:vrliquid_flowing_"..d, {
+		description = "Flowing Test Liquid, Viscosity "..v..", Resistance "..d,
+		drawtype = "flowingliquid",
+		tiles = {"testnodes_liquidflowing_r"..d..".png"..mod},
+		special_tiles = {
+			{name = "testnodes_liquidflowing_r"..d..".png"..mod, backface_culling = false},
+			{name = "testnodes_liquidflowing_r"..d..".png"..mod, backface_culling = false},
+		},
+		use_texture_alpha = "blend",
+		paramtype = "light",
+		paramtype2 = "flowingliquid",
+		walkable = false,
+		pointable = false,
+		diggable = false,
+		buildable_to = true,
+		is_ground_content = false,
+		liquidtype = "flowing",
+		liquid_alternative_flowing = "testnodes:vrliquid_flowing_"..d,
+		liquid_alternative_source = "testnodes:vrliquid_"..d,
+		liquid_viscosity = v,
+		move_resistance = d,
+	})
+
+	end
+
 end
diff --git a/games/devtest/mods/testnodes/properties.lua b/games/devtest/mods/testnodes/properties.lua
index a52cd1d6f..89facf71c 100644
--- a/games/devtest/mods/testnodes/properties.lua
+++ b/games/devtest/mods/testnodes/properties.lua
@@ -152,6 +152,66 @@ minetest.register_node("testnodes:liquidflowing_nojump", {
 	post_effect_color = {a = 70, r = 255, g = 0, b = 200},
 })
 
+-- A liquid which doesn't have liquid movement physics (source variant)
+minetest.register_node("testnodes:liquid_noswim", {
+	description = S("No-swim Liquid Source Node"),
+	liquidtype = "source",
+	liquid_range = 1,
+	liquid_viscosity = 0,
+	liquid_alternative_flowing = "testnodes:liquidflowing_noswim",
+	liquid_alternative_source = "testnodes:liquid_noswim",
+	liquid_renewable = false,
+	liquid_move_physics = false,
+	groups = {dig_immediate=3},
+	walkable = false,
+
+	drawtype = "liquid",
+	tiles = {"testnodes_liquidsource.png^[colorize:#FF00FF:127"},
+	special_tiles = {
+		{name = "testnodes_liquidsource.png^[colorize:#FF00FF:127", backface_culling = false},
+		{name = "testnodes_liquidsource.png^[colorize:#FF00FF:127", backface_culling = true},
+	},
+	use_texture_alpha = "blend",
+	paramtype = "light",
+	pointable = false,
+	liquids_pointable = true,
+	buildable_to = true,
+	is_ground_content = false,
+	post_effect_color = {a = 70, r = 255, g = 200, b = 200},
+})
+
+-- A liquid which doen't have liquid movement physics (flowing variant)
+minetest.register_node("testnodes:liquidflowing_noswim", {
+	description = S("No-swim Flowing Liquid Node"),
+	liquidtype = "flowing",
+	liquid_range = 1,
+	liquid_viscosity = 0,
+	liquid_alternative_flowing = "testnodes:liquidflowing_noswim",
+	liquid_alternative_source = "testnodes:liquid_noswim",
+	liquid_renewable = false,
+	liquid_move_physics = false,
+	groups = {dig_immediate=3},
+	walkable = false,
+
+
+	drawtype = "flowingliquid",
+	tiles = {"testnodes_liquidflowing.png^[colorize:#FF00FF:127"},
+	special_tiles = {
+		{name = "testnodes_liquidflowing.png^[colorize:#FF00FF:127", backface_culling = false},
+		{name = "testnodes_liquidflowing.png^[colorize:#FF00FF:127", backface_culling = false},
+	},
+	use_texture_alpha = "blend",
+	paramtype = "light",
+	paramtype2 = "flowingliquid",
+	pointable = false,
+	liquids_pointable = true,
+	buildable_to = true,
+	is_ground_content = false,
+	post_effect_color = {a = 70, r = 255, g = 200, b = 200},
+})
+
+
+
 -- Nodes that modify fall damage (various damage modifiers)
 for i=-100, 100, 25 do
 	if i ~= 0 then
@@ -192,9 +252,9 @@ for i=-100, 100, 25 do
 end
 
 -- Bouncy nodes (various bounce levels)
-for i=20, 180, 20 do
+for i=-140, 180, 20 do
 	local val = math.floor(((i-20)/200)*255)
-	minetest.register_node("testnodes:bouncy"..i, {
+	minetest.register_node(("testnodes:bouncy"..i):gsub("-","NEG"), {
 		description = S("Bouncy Node (@1%)", i),
 		groups = {bouncy=i, dig_immediate=3},
 
@@ -216,6 +276,54 @@ for i=1, 5 do
 	})
 end
 
+-- Move resistance nodes (various resistance levels)
+for r=0, 7 do
+	if r > 0 then
+		minetest.register_node("testnodes:move_resistance"..r, {
+			description = S("Move-resistant Node (@1)", r),
+			walkable = false,
+			move_resistance = r,
+
+			drawtype = "glasslike",
+			paramtype = "light",
+			sunlight_propagates = true,
+			tiles = { "testnodes_move_resistance.png" },
+			is_ground_content = false,
+			groups = { dig_immediate = 3 },
+			color = { b = 0, g = 255, r = math.floor((r/7)*255), a = 255 },
+		})
+	end
+
+	minetest.register_node("testnodes:move_resistance_liquidlike"..r, {
+		description = S("Move-resistant Node, liquidlike (@1)", r),
+		walkable = false,
+		move_resistance = r,
+		liquid_move_physics = true,
+
+		drawtype = "glasslike",
+		paramtype = "light",
+		sunlight_propagates = true,
+		tiles = { "testnodes_move_resistance.png" },
+		is_ground_content = false,
+		groups = { dig_immediate = 3 },
+		color = { b = 255, g = 0, r = math.floor((r/7)*255), a = 255 },
+	})
+end
+
+minetest.register_node("testnodes:climbable_move_resistance_4", {
+	description = S("Climbable Move-resistant Node (4)"),
+	walkable = false,
+	climbable = true,
+	move_resistance = 4,
+
+	drawtype = "glasslike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	tiles = {"testnodes_climbable_resistance_side.png"},
+	is_ground_content = false,
+	groups = { dig_immediate = 3 },
+})
+
 -- By placing something on the node, the node itself will be replaced
 minetest.register_node("testnodes:buildable_to", {
 	description = S("Replacable Node"),
diff --git a/games/devtest/mods/testnodes/textures.lua b/games/devtest/mods/testnodes/textures.lua
index 4652007d9..2faacdd78 100644
--- a/games/devtest/mods/testnodes/textures.lua
+++ b/games/devtest/mods/testnodes/textures.lua
@@ -102,12 +102,22 @@ local function gen_checkers(w, h, tile)
 end
 
 local fractal = mandelbrot(512, 512, 128)
+local frac_emb = mandelbrot(64, 64, 64)
 local checker = gen_checkers(512, 512, 32)
 
 local floor = math.floor
 local abs = math.abs
+local data_emb = {}
 local data_mb = {}
 local data_ck = {}
+for i=1, #frac_emb do
+	data_emb[i] = {
+		r = floor(abs(frac_emb[i] * 2 - 1) * 255),
+		g = floor(abs(1 - frac_emb[i]) * 255),
+		b = floor(frac_emb[i] * 255),
+		a = frac_emb[i] < 0.95 and 255 or 0,
+	}
+end
 for i=1, #fractal do
 	data_mb[i] = {
 		r = floor(fractal[i] * 255),
@@ -140,3 +150,141 @@ minetest.register_node("testnodes:generated_png_ck", {
 
 	groups = { dig_immediate = 2 },
 })
+
+local png_emb = "[png:" .. minetest.encode_base64(minetest.encode_png(64,64,data_emb))
+
+minetest.register_node("testnodes:generated_png_emb", {
+	description = S("Generated In-Band Mandelbrot PNG Test Node"),
+	tiles = { png_emb },
+
+	groups = { dig_immediate = 2 },
+})
+minetest.register_node("testnodes:generated_png_src_emb", {
+	description = S("Generated In-Band Source Blit Mandelbrot PNG Test Node"),
+	tiles = { png_emb .. "^testnodes_damage_neg.png" },
+
+	groups = { dig_immediate = 2 },
+})
+minetest.register_node("testnodes:generated_png_dst_emb", {
+	description = S("Generated In-Band Dest Blit Mandelbrot PNG Test Node"),
+	tiles = { "testnodes_generated_ck.png^" .. png_emb },
+
+	groups = { dig_immediate = 2 },
+})
+
+--[[
+
+The following nodes can be used to demonstrate the TGA format support.
+
+Minetest supports TGA types 1, 2, 3 & 10. While adding the support for
+TGA type 9 (RLE-compressed, color-mapped) is easy, it is not advisable
+to do so, as it is not backwards compatible with any Minetest pre-5.5;
+content creators should therefore either use TGA type 1 or 10, or PNG.
+
+TODO: Types 1, 2 & 10 should have two test nodes each (i.e. bottom-top
+and top-bottom) for 16bpp (A1R5G5B5), 24bpp (B8G8R8), 32bpp (B8G8R8A8)
+colors.
+
+Note: Minetest requires the optional TGA footer for a texture to load.
+If a TGA image does not load in Minetest, append eight (8) null bytes,
+then the string “TRUEVISION-XFILE.”, then another null byte.
+
+]]--
+
+minetest.register_node("testnodes:tga_type1_24bpp_bt", {
+	description = S("TGA Type 1 (color-mapped RGB) 24bpp bottom-top Test Node"),
+	drawtype = "glasslike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	tiles = { "testnodes_tga_type1_24bpp_bt.tga" },
+	groups = { dig_immediate = 2 },
+})
+
+minetest.register_node("testnodes:tga_type1_24bpp_tb", {
+	description = S("TGA Type 1 (color-mapped RGB) 24bpp top-bottom Test Node"),
+	drawtype = "glasslike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	tiles = { "testnodes_tga_type1_24bpp_tb.tga" },
+	groups = { dig_immediate = 2 },
+})
+
+minetest.register_node("testnodes:tga_type2_16bpp_bt", {
+	description = S("TGA Type 2 (uncompressed RGB) 16bpp bottom-top Test Node"),
+	drawtype = "glasslike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	tiles = { "testnodes_tga_type2_16bpp_bt.tga" },
+	use_texture_alpha = "clip",
+	groups = { dig_immediate = 2 },
+})
+
+minetest.register_node("testnodes:tga_type2_16bpp_tb", {
+	description = S("TGA Type 2 (uncompressed RGB) 16bpp top-bottom Test Node"),
+	drawtype = "glasslike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	tiles = { "testnodes_tga_type2_16bpp_tb.tga" },
+	use_texture_alpha = "clip",
+	groups = { dig_immediate = 2 },
+})
+
+minetest.register_node("testnodes:tga_type2_32bpp_bt", {
+	description = S("TGA Type 2 (uncompressed RGB) 32bpp bottom-top Test Node"),
+	drawtype = "glasslike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	tiles = { "testnodes_tga_type2_32bpp_bt.tga" },
+	use_texture_alpha = "blend",
+	groups = { dig_immediate = 2 },
+})
+
+minetest.register_node("testnodes:tga_type2_32bpp_tb", {
+	description = S("TGA Type 2 (uncompressed RGB) 32bpp top-bottom Test Node"),
+	drawtype = "glasslike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	tiles = { "testnodes_tga_type2_32bpp_tb.tga" },
+	use_texture_alpha = "blend",
+	groups = { dig_immediate = 2 },
+})
+
+minetest.register_node("testnodes:tga_type3_16bpp_bt", {
+	description = S("TGA Type 3 (uncompressed grayscale) 16bpp bottom-top Test Node"),
+	drawtype = "glasslike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	tiles = { "testnodes_tga_type3_16bpp_bt.tga" },
+	use_texture_alpha = "blend",
+	groups = { dig_immediate = 2 },
+})
+
+minetest.register_node("testnodes:tga_type3_16bpp_tb", {
+	description = S("TGA Type 3 (uncompressed grayscale) 16bpp top-bottom Test Node"),
+	drawtype = "glasslike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	tiles = { "testnodes_tga_type3_16bpp_tb.tga" },
+	use_texture_alpha = "blend",
+	groups = { dig_immediate = 2 },
+})
+
+minetest.register_node("testnodes:tga_type10_32bpp_bt", {
+	description = S("TGA Type 10 (RLE-compressed RGB) 32bpp bottom-top Test Node"),
+	tiles = { "testnodes_tga_type10_32bpp_bt.tga" },
+	drawtype = "glasslike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	use_texture_alpha = "blend",
+	groups = { dig_immediate = 2 },
+})
+
+minetest.register_node("testnodes:tga_type10_32bpp_tb", {
+	description = S("TGA Type 10 (RLE-compressed RGB) 32bpp top-bottom Test Node"),
+	drawtype = "glasslike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	tiles = { "testnodes_tga_type10_32bpp_tb.tga" },
+	use_texture_alpha = "blend",
+	groups = { dig_immediate = 2 },
+})
diff --git a/games/devtest/mods/testnodes/textures/testnodes_climbable_resistance_side.png b/games/devtest/mods/testnodes/textures/testnodes_climbable_resistance_side.png
new file mode 100644
index 000000000..be01583e6
--- /dev/null
+++ b/games/devtest/mods/testnodes/textures/testnodes_climbable_resistance_side.png
diff --git a/games/devtest/mods/testnodes/textures/testnodes_move_resistance.png b/games/devtest/mods/testnodes/textures/testnodes_move_resistance.png
new file mode 100644
index 000000000..cac3944bf
--- /dev/null
+++ b/games/devtest/mods/testnodes/textures/testnodes_move_resistance.png
diff --git a/games/devtest/mods/testnodes/textures/testnodes_tga_type10_32bpp_bt.tga b/games/devtest/mods/testnodes/textures/testnodes_tga_type10_32bpp_bt.tga
new file mode 100644
index 000000000..2dc587bc3
--- /dev/null
+++ b/games/devtest/mods/testnodes/textures/testnodes_tga_type10_32bpp_bt.tga
diff --git a/games/devtest/mods/testnodes/textures/testnodes_tga_type10_32bpp_tb.tga b/games/devtest/mods/testnodes/textures/testnodes_tga_type10_32bpp_tb.tga
new file mode 100644
index 000000000..b44a81c79
--- /dev/null
+++ b/games/devtest/mods/testnodes/textures/testnodes_tga_type10_32bpp_tb.tga
diff --git a/games/devtest/mods/testnodes/textures/testnodes_tga_type1_24bpp_bt.tga b/games/devtest/mods/testnodes/textures/testnodes_tga_type1_24bpp_bt.tga
new file mode 100644
index 000000000..d2c2ca6d2
--- /dev/null
+++ b/games/devtest/mods/testnodes/textures/testnodes_tga_type1_24bpp_bt.tga
diff --git a/games/devtest/mods/testnodes/textures/testnodes_tga_type1_24bpp_tb.tga b/games/devtest/mods/testnodes/textures/testnodes_tga_type1_24bpp_tb.tga
new file mode 100644
index 000000000..dfcb98864
--- /dev/null
+++ b/games/devtest/mods/testnodes/textures/testnodes_tga_type1_24bpp_tb.tga
diff --git a/games/devtest/mods/testnodes/textures/testnodes_tga_type2_16bpp_bt.tga b/games/devtest/mods/testnodes/textures/testnodes_tga_type2_16bpp_bt.tga
new file mode 100644
index 000000000..0206216bb
--- /dev/null
+++ b/games/devtest/mods/testnodes/textures/testnodes_tga_type2_16bpp_bt.tga
diff --git a/games/devtest/mods/testnodes/textures/testnodes_tga_type2_16bpp_tb.tga b/games/devtest/mods/testnodes/textures/testnodes_tga_type2_16bpp_tb.tga
new file mode 100644
index 000000000..2563f084b
--- /dev/null
+++ b/games/devtest/mods/testnodes/textures/testnodes_tga_type2_16bpp_tb.tga
diff --git a/games/devtest/mods/testnodes/textures/testnodes_tga_type2_32bpp_bt.tga b/games/devtest/mods/testnodes/textures/testnodes_tga_type2_32bpp_bt.tga
new file mode 100644
index 000000000..3350500f8
--- /dev/null
+++ b/games/devtest/mods/testnodes/textures/testnodes_tga_type2_32bpp_bt.tga
diff --git a/games/devtest/mods/testnodes/textures/testnodes_tga_type2_32bpp_tb.tga b/games/devtest/mods/testnodes/textures/testnodes_tga_type2_32bpp_tb.tga
new file mode 100644
index 000000000..216de0634
--- /dev/null
+++ b/games/devtest/mods/testnodes/textures/testnodes_tga_type2_32bpp_tb.tga
diff --git a/games/devtest/mods/testnodes/textures/testnodes_tga_type3_16bpp_bt.tga b/games/devtest/mods/testnodes/textures/testnodes_tga_type3_16bpp_bt.tga
new file mode 100644
index 000000000..695bb4bb1
--- /dev/null
+++ b/games/devtest/mods/testnodes/textures/testnodes_tga_type3_16bpp_bt.tga
diff --git a/games/devtest/mods/testnodes/textures/testnodes_tga_type3_16bpp_tb.tga b/games/devtest/mods/testnodes/textures/testnodes_tga_type3_16bpp_tb.tga
new file mode 100644
index 000000000..c08a093b2
--- /dev/null
+++ b/games/devtest/mods/testnodes/textures/testnodes_tga_type3_16bpp_tb.tga