summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorParamat <paramat@users.noreply.github.com>2019-03-27 00:18:43 +0000
committerGitHub <noreply@github.com>2019-03-27 00:18:43 +0000
commit42e1a127140965cac1be6e51e48192e341c2a29e (patch)
tree9c1d824e6b70838a13afa4870f219108d4d97899 /builtin
parent5e7662ca168b47ed3e81901d53bff2eb712f571c (diff)
downloadminetest-42e1a127140965cac1be6e51e48192e341c2a29e.tar.gz
minetest-42e1a127140965cac1be6e51e48192e341c2a29e.tar.bz2
minetest-42e1a127140965cac1be6e51e48192e341c2a29e.zip
Require 'waving = 3' in a nodedef to apply the liquid waving shader (#8418)
Makes the liquid waving shader per-nodedef like waving leaves/plants, instead of being applied to all liquids. Like the waving leaves/plants shaders, the liquid waving shader can also be applied to meshes and nodeboxes. Derived from a PR by t0ny2.
Diffstat (limited to 'builtin')
-rw-r--r--builtin/mainmenu/tab_settings.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua
index 71b2d88fa..75d7ceee8 100644
--- a/builtin/mainmenu/tab_settings.lua
+++ b/builtin/mainmenu/tab_settings.lua
@@ -254,7 +254,7 @@ local function formspec(tabview, name, tabdata)
.. dump(core.settings:get_bool("generate_normalmaps")) .. "]" ..
"checkbox[8.25,2;cb_parallax;" .. fgettext("Parallax Occlusion") .. ";"
.. dump(core.settings:get_bool("enable_parallax_occlusion")) .. "]" ..
- "checkbox[8.25,2.5;cb_waving_water;" .. fgettext("Waving Water") .. ";"
+ "checkbox[8.25,2.5;cb_waving_water;" .. fgettext("Waving Liquids") .. ";"
.. dump(core.settings:get_bool("enable_waving_water")) .. "]" ..
"checkbox[8.25,3;cb_waving_leaves;" .. fgettext("Waving Leaves") .. ";"
.. dump(core.settings:get_bool("enable_waving_leaves")) .. "]" ..
@@ -271,7 +271,7 @@ local function formspec(tabview, name, tabdata)
"label[8.38,2.2;" .. core.colorize("#888888",
fgettext("Parallax Occlusion")) .. "]" ..
"label[8.38,2.7;" .. core.colorize("#888888",
- fgettext("Waving Water")) .. "]" ..
+ fgettext("Waving Liquids")) .. "]" ..
"label[8.38,3.2;" .. core.colorize("#888888",
fgettext("Waving Leaves")) .. "]" ..
"label[8.38,3.7;" .. core.colorize("#888888",