aboutsummaryrefslogtreecommitdiff
path: root/builtin/mainmenu
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/mainmenu')
-rw-r--r--builtin/mainmenu/dlg_settings_advanced.lua11
-rw-r--r--builtin/mainmenu/pkgmgr.lua74
-rw-r--r--builtin/mainmenu/tab_credits.lua81
-rw-r--r--builtin/mainmenu/tab_online.lua1
4 files changed, 111 insertions, 56 deletions
diff --git a/builtin/mainmenu/dlg_settings_advanced.lua b/builtin/mainmenu/dlg_settings_advanced.lua
index 24b71d957..c16e4aad0 100644
--- a/builtin/mainmenu/dlg_settings_advanced.lua
+++ b/builtin/mainmenu/dlg_settings_advanced.lua
@@ -639,12 +639,23 @@ local function create_change_setting_formspec(dialogdata)
-- Flags
formspec = table.concat(fields)
.. "checkbox[0.5," .. height - 0.6 .. ";cb_defaults;"
+ --[[~ "defaults" is a noise parameter flag.
+ It describes the default processing options
+ for noise settings in main menu -> "All Settings". ]]
.. fgettext("defaults") .. ";" -- defaults
.. tostring(flags["defaults"] == true) .. "]" -- to get false if nil
.. "checkbox[5," .. height - 0.6 .. ";cb_eased;"
+ --[[~ "eased" is a noise parameter flag.
+ It is used to make the map smoother and
+ can be enabled in noise settings in
+ main menu -> "All Settings". ]]
.. fgettext("eased") .. ";" -- eased
.. tostring(flags["eased"] == true) .. "]"
.. "checkbox[5," .. height - 0.15 .. ";cb_absvalue;"
+ --[[~ "absvalue" is a noise parameter flag.
+ It is short for "absolute value".
+ It can be enabled in noise settings in
+ main menu -> "All Settings". ]]
.. fgettext("absvalue") .. ";" -- absvalue
.. tostring(flags["absvalue"] == true) .. "]"
height = height + 1
diff --git a/builtin/mainmenu/pkgmgr.lua b/builtin/mainmenu/pkgmgr.lua
index f87367689..5b8807310 100644
--- a/builtin/mainmenu/pkgmgr.lua
+++ b/builtin/mainmenu/pkgmgr.lua
@@ -16,6 +16,62 @@
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--------------------------------------------------------------------------------
+local function get_last_folder(text,count)
+ local parts = text:split(DIR_DELIM)
+
+ if count == nil then
+ return parts[#parts]
+ end
+
+ local retval = ""
+ for i=1,count,1 do
+ retval = retval .. parts[#parts - (count-i)] .. DIR_DELIM
+ end
+
+ return retval
+end
+
+local function cleanup_path(temppath)
+
+ local parts = temppath:split("-")
+ temppath = ""
+ for i=1,#parts,1 do
+ if temppath ~= "" then
+ temppath = temppath .. "_"
+ end
+ temppath = temppath .. parts[i]
+ end
+
+ parts = temppath:split(".")
+ temppath = ""
+ for i=1,#parts,1 do
+ if temppath ~= "" then
+ temppath = temppath .. "_"
+ end
+ temppath = temppath .. parts[i]
+ end
+
+ parts = temppath:split("'")
+ temppath = ""
+ for i=1,#parts,1 do
+ if temppath ~= "" then
+ temppath = temppath .. ""
+ end
+ temppath = temppath .. parts[i]
+ end
+
+ parts = temppath:split(" ")
+ temppath = ""
+ for i=1,#parts,1 do
+ if temppath ~= "" then
+ temppath = temppath
+ end
+ temppath = temppath .. parts[i]
+ end
+
+ return temppath
+end
+
function get_mods(path,retval,modpack)
local mods = core.get_dir_list(path, true)
@@ -403,9 +459,9 @@ function pkgmgr.enable_mod(this, toset)
-- Make a list of mod ids indexed by their names
local mod_ids = {}
- for id, mod in pairs(list) do
- if mod.type == "mod" and not mod.is_modpack then
- mod_ids[mod.name] = id
+ for id, mod2 in pairs(list) do
+ if mod2.type == "mod" and not mod2.is_modpack then
+ mod_ids[mod2.name] = id
end
end
@@ -429,17 +485,17 @@ function pkgmgr.enable_mod(this, toset)
if not enabled_mods[name] then
enabled_mods[name] = true
- local mod = list[mod_ids[name]]
- if not mod then
+ local mod_to_enable = list[mod_ids[name]]
+ if not mod_to_enable then
minetest.log("warning", "Mod dependency \"" .. name ..
"\" not found!")
else
- if mod.enabled == false then
- mod.enabled = true
- toggled_mods[#toggled_mods+1] = mod.name
+ if mod_to_enable.enabled == false then
+ mod_to_enable.enabled = true
+ toggled_mods[#toggled_mods+1] = mod_to_enable.name
end
-- Push the dependencies of the dependency onto the stack
- local depends = pkgmgr.get_dependencies(mod.path)
+ local depends = pkgmgr.get_dependencies(mod_to_enable.path)
for i = 1, #depends do
if not enabled_mods[name] then
sp = sp+1
diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua
index 58db129fb..962d2a3b4 100644
--- a/builtin/mainmenu/tab_credits.lua
+++ b/builtin/mainmenu/tab_credits.lua
@@ -20,51 +20,31 @@
local core_developers = {
"Perttu Ahola (celeron55) <celeron55@gmail.com>",
"sfan5 <sfan5@live.de>",
- "ShadowNinja <shadowninja@minetest.net>",
"Nathanaël Courant (Nore/Ekdohibs) <nore@mesecons.net>",
"Loic Blot (nerzhul/nrz) <loic.blot@unix-experience.fr>",
"paramat",
"Auke Kok (sofar) <sofar@foo-projects.org>",
- "rubenwardy <rw@rubenwardy.com>",
+ "Andrew Ward (rubenwardy) <rw@rubenwardy.com>",
"Krock/SmallJoker <mk939@ymail.com>",
"Lars Hofhansl <larsh@apache.org>",
}
local active_contributors = {
- "numberZero [Audiovisuals: meshgen]",
- "stujones11 [Android UX improvements]",
- "red-001 <red-001@outlook.ie> [CSM & Menu fixes]",
- "Paul Ouellette (pauloue) [Docs, fixes]",
- "Dániel Juhász (juhdanad) <juhdanad@gmail.com> [Audiovisuals: lighting]",
- "Hybrid Dog [API]",
- "srifqi [Android]",
- "Vincent Glize (Dumbeldor) [Cleanups, CSM APIs]",
- "Ben Deutsch [Rendering, Fixes, SQLite auth]",
- "Wuzzy [Translation, Slippery]",
- "ANAND (ClobberXD) [Docs, Fixes]",
- "Shara/Ezhh [Docs, Game API]",
- "DTA7 [Fixes, mute key]",
- "Thomas-S [Disconnected, Formspecs]",
- "Raymoo [Tool Capabilities]",
- "Elijah Duffy (octacian) [Mainmenu]",
- "noob3167 [Fixes]",
- "adelcoding1 [Formspecs]",
- "adrido [Windows Installer, Formspecs]",
- "Rui [Sound Pitch]",
- "Jean-Patrick G (kilbith) <jeanpatrick.guerrero@gmail.com> [Audiovisuals]",
- "Esteban (EXio4) [Cleanups]",
- "Vaughan Lapsley (vlapsley) [Carpathian mapgen]",
- "CoderForTheBetter [Add set_rotation]",
- "Quentin Bazin (Unarelith) [Cleanups]",
+ "Hugues Ross [Formspecs]",
"Maksim (MoNTE48) [Android]",
- "Gaël-de-Sailly [Mapgen, pitch fly]",
- "zeuner [Docs, Fixes]",
- "ThomasMonroe314 (tre) [Fixes]",
- "Rob Blanckaert (basicer) [Fixes]",
- "Jozef Behran (osjc) [Fixes]",
- "random-geek [Fixes]",
- "Pedro Gimeno (pgimeno) [Fixes]",
- "lisacvuk [Fixes]",
+ "DS [Formspecs]",
+ "pyrollo [Formspecs: Hypertext]",
+ "v-rob [Formspecs]",
+ "Jordach [set_sky]",
+ "random-geek [Formspecs]",
+ "Wuzzy [Pathfinder, builtin, translations]",
+ "ANAND (ClobberXD) [Fixes, per-player FOV]",
+ "Warr1024 [Fixes]",
+ "Paul Ouellette (pauloue) [Fixes, Script API]",
+ "Jean-Patrick G (kilbith) <jeanpatrick.guerrero@gmail.com> [Audiovisuals]",
+ "HybridDog [Script API]",
+ "dcbrwn [Object shading]",
+ "srifqi [Fixes]",
}
local previous_core_developers = {
@@ -79,24 +59,31 @@ local previous_core_developers = {
"Ryan Kwolek (kwolekr) <kwolekr@minetest.net>",
"sapier",
"Zeno",
+ "ShadowNinja <shadowninja@minetest.net>",
}
local previous_contributors = {
- "Gregory Currie (gregorycu) [optimisation]",
- "Diego Martínez (kaeza) <kaeza@users.sf.net>",
- "T4im [Profiler]",
- "TeTpaAka [Hand overriding, nametag colors]",
- "Duane Robertson <duane@duanerobertson.com> [MGValleys]",
- "neoascetic [OS X Fixes]",
- "TriBlade9 <triblade9@mail.com> [Audiovisuals]",
- "Jurgen Doser (doserj) <jurgen.doser@gmail.com> [Fixes]",
- "MirceaKitsune <mirceakitsune@gmail.com> [Audiovisuals]",
- "Guiseppe Bilotta (Oblomov) <guiseppe.bilotta@gmail.com> [Fixes]",
- "matttpt <matttpt@gmail.com> [Fixes]",
"Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net> [Minetest Logo]",
+ "Dániel Juhász (juhdanad) <juhdanad@gmail.com>",
+ "red-001 <red-001@outlook.ie>",
+ "numberZero [Audiovisuals: meshgen]",
+ "Giuseppe Bilotta",
+ "MirceaKitsune <mirceakitsune@gmail.com>",
+ "Constantin Wenger (SpeedProg)",
+ "Ciaran Gultnieks (CiaranG)",
+ "stujones11 [Android UX improvements]",
"Jeija <jeija@mesecons.net> [HTTP, particles]",
- "bigfoot547 [CSM]",
+ "Vincent Glize (Dumbeldor) [Cleanups, CSM APIs]",
+ "Ben Deutsch [Rendering, Fixes, SQLite auth]",
+ "TeTpaAka [Hand overriding, nametag colors]",
+ "Rui [Sound Pitch]",
+ "Duane Robertson <duane@duanerobertson.com> [MGValleys]",
+ "Raymoo [Tool Capabilities]",
"Rogier <rogier777@gmail.com> [Fixes]",
+ "Gregory Currie (gregorycu) [optimisation]",
+ "TriBlade9 <triblade9@mail.com> [Audiovisuals]",
+ "T4im [Profiler]",
+ "Jurgen Doser (doserj) <jurgen.doser@gmail.com>",
}
local function buildCreditList(source)
diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua
index 8733f7618..7985fd84a 100644
--- a/builtin/mainmenu/tab_online.lua
+++ b/builtin/mainmenu/tab_online.lua
@@ -78,6 +78,7 @@ local function get_formspec(tabview, name, tabdata)
"text,align=right,padding=0.25;" .. -- clients_max
image_column(fgettext("Creative mode"), "creative") .. ",padding=1;" ..
image_column(fgettext("Damage enabled"), "damage") .. ",padding=0.25;" ..
+ --~ PvP = Player versus Player
image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" ..
"color,span=1;" ..
"text,padding=1]" ..
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-07 09:42:26 +0000