Wuzzy/BlockColor-Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge last minetest commits

Browse Source
This commit is contained in:
Maksim Gamarnik 2015-11-27 12:57:52 +02:00
commit e150219b9d
45 changed files with 5365 additions and 846 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/android/jni/Android.mk
View File

@ -173,6 +173,7 @@ LOCAL_SRC_FILES := \
jni/src/mapblock.cpp \
jni/src/mapblock_mesh.cpp \
jni/src/mapgen.cpp \
jni/src/mapgen_flat.cpp \
jni/src/mapgen_fractal.cpp \
jni/src/mapgen_singlenode.cpp \
jni/src/mapgen_v5.cpp \

3
builtin/game/item.lua
View File

@ -348,7 +348,7 @@ function core.item_place(itemstack, placer, pointed_thing, param2)
end
function core.item_drop(itemstack, dropper, pos)
if dropper.is_player then
if dropper and dropper:is_player() then
local v = dropper:get_look_dir()
local p = {x=pos.x, y=pos.y+1.2, z=pos.z}
local cs = itemstack:get_count()
@ -362,6 +362,7 @@ function core.item_drop(itemstack, dropper, pos)
v.y = v.y*2 + 2
v.z = v.z*2
obj:setvelocity(v)
obj:get_luaentity().dropped_by = dropper:get_player_name()
return itemstack
end

4
builtin/game/item_entity.lua
View File

@ -74,7 +74,8 @@ core.register_entity(":__builtin:item", {
return core.serialize({
itemstring = self.itemstring,
always_collect = self.always_collect,
age = self.age
age = self.age,
dropped_by = self.dropped_by
})
end,
@ -89,6 +90,7 @@ core.register_entity(":__builtin:item", {
else
self.age = dtime_s
end
self.dropped_by = data.dropped_by
end
else
self.itemstring = staticdata

12
builtin/game/register.lua
View File

@ -51,20 +51,24 @@ local forbidden_item_names = {
local function check_modname_prefix(name)
if name:sub(1,1) == ":" then
-- Escape the modname prefix enforcement mechanism
-- If the name starts with a colon, we can skip the modname prefix
-- mechanism.
return name:sub(2)
else
-- Modname prefix enforcement
-- Enforce that the name starts with the correct mod name.
local expected_prefix = core.get_current_modname() .. ":"
if name:sub(1, #expected_prefix) ~= expected_prefix then
error("Name " .. name .. " does not follow naming conventions: " ..
"\"modname:\" or \":\" prefix required")
"\"" .. expected_prefix .. "\" or \":\" prefix required")
end
-- Enforce that the name only contains letters, numbers and underscores.
local subname = name:sub(#expected_prefix+1)
if subname:find("[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]") then
if subname:find("[^%w_]") then
error("Name " .. name .. " does not follow naming conventions: " ..
"contains unallowed characters")
end
return name
end
end

22
builtin/game/static_spawn.lua
View File

@ -3,31 +3,23 @@
local function warn_invalid_static_spawnpoint()
if core.setting_get("static_spawnpoint") and
not core.setting_get_pos("static_spawnpoint") then
core.log('error', "The static_spawnpoint setting is invalid: \""..
core.log("error", "The static_spawnpoint setting is invalid: \""..
core.setting_get("static_spawnpoint").."\"")
end
end
warn_invalid_static_spawnpoint()
local function put_player_in_spawn(obj)
warn_invalid_static_spawnpoint()
local function put_player_in_spawn(player_obj)
local static_spawnpoint = core.setting_get_pos("static_spawnpoint")
if not static_spawnpoint then
return false
end
core.log('action', "Moving "..obj:get_player_name()..
" to static spawnpoint at "..
core.pos_to_string(static_spawnpoint))
obj:setpos(static_spawnpoint)
core.log("action", "Moving " .. player_obj:get_player_name() ..
" to static spawnpoint at " .. core.pos_to_string(static_spawnpoint))
player_obj:setpos(static_spawnpoint)
return true
end
core.register_on_newplayer(function(obj)
put_player_in_spawn(obj)
end)
core.register_on_respawnplayer(function(obj)
return put_player_in_spawn(obj)
end)
core.register_on_newplayer(put_player_in_spawn)
core.register_on_respawnplayer(put_player_in_spawn)

106
builtin/settingtypes.txt
View File

@ -812,7 +812,7 @@ liquid_update (Liquid update tick) float 1.0
# Name of map generator to be used when creating a new world.
# Creating a world in the main menu will override this.
mg_name (Mapgen name) enum v6 v5,v6,v7,fractal,singlenode
mg_name (Mapgen name) enum v6 v5,v6,v7,flat,fractal,singlenode
# Water surface level of the world.
water_level (Water level) int 1
@ -829,10 +829,11 @@ max_block_generate_distance (Max block generate distance) int 6
map_generation_limit (Map generation limit) int 31000 0 31000
# Global map generation attributes.
# In Mapgen v6 the 'decorations' flag controls all decorations except trees
# and junglegrass, in all other mapgens this flag controls all decorations.
# Flags that are not specified in the flag string are not modified from the default.
# Flags starting with "no" are used to explicitly disable them.
# 'trees' and 'flat' flags only have effect in mgv6.
mg_flags (Mapgen flags) flags trees,caves,dungeons,light trees,caves,dungeons,light,flat,notrees,nocaves,nodungeons,nolight,noflat
mg_flags (Mapgen flags) flags caves,dungeons,light,decorations caves,dungeons,light,decorations,nocaves,nodungeons,nolight,nodecorations
[**Advanced]
@ -889,7 +890,7 @@ mgv5_np_cave2 (Mapgen v5 cave2 noise parameters) noise_params 0, 12, (50, 50, 50
# When snowbiomes are enabled jungles are enabled and the jungles flag is ignored.
# Flags that are not specified in the flag string are not modified from the default.
# Flags starting with "no" are used to explicitly disable them.
mgv6_spflags (Mapgen v6 flags) flags jungles,biomeblend,mudflow,snowbiomes jungles,biomeblend,mudflow,snowbiomes,nojungles,nobiomeblend,nomudflow,nosnowbiomes
mgv6_spflags (Mapgen v6 flags) flags jungles,biomeblend,mudflow,snowbiomes,trees jungles,biomeblend,mudflow,snowbiomes,flat,trees,nojungles,nobiomeblend,nomudflow,nosnowbiomes,noflat,notrees
# Controls size of deserts and beaches in Mapgen v6.
# When snowbiomes are enabled 'mgv6_freq_desert' is ignored.
@ -928,57 +929,90 @@ mgv7_np_ridge (Mapgen v7 ridge noise parameters) noise_params 0, 1, (100, 100, 1
mgv7_np_cave1 (Mapgen v7 cave1 noise parameters) noise_params 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0
mgv7_np_cave2 (Mapgen v7 cave2 noise parameters) noise_params 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0
[***Mapgen fractal]
[***Mapgen flat]
# Map generation attributes specific to Mapgen fractal.
# 'julia' selects a julia set to be generated instead of a mandelbrot set.
# Map generation attributes specific to Mapgen flat.
# Occasional lakes and hills added to the flat world.
# Flags that are not specified in the flag string are not modified from the default.
# Flags starting with "no" are used to explicitly disable them.
mgfractal_spflags (Mapgen fractal flags) flags nojulia julia,nojulia
mgflat_spflags (Mapgen flat flags) flags nolakes,nohills lakes,hills,nolakes,nohills
# Mandelbrot set: Iterations of the recursive function.
# Y of flat ground.
mgflat_ground_level (Mapgen flat ground level) int 8
# Y of upper limit of large pseudorandom caves.
mgflat_large_cave_depth (Mapgen flat large cave depth) int -33
# Terrain noise threshold for lakes.
# Controls proportion of world area covered by lakes.
# Adjust towards 0.0 for a larger proportion.
mgflat_lake_threshold (Mapgen flat lake threshold) float -0.45
# Controls steepness/depth of lake depressions.
mgflat_lake_steepness (Mapgen flat lake steepness) float 48.0
# Terrain noise threshold for hills.
# Controls proportion of world area covered by hills.
# Adjust towards 0.0 for a larger proportion.
mgflat_hill_threshold (Mapgen flat hill threshold) float 0.45
# Controls steepness/height of hills.
mgflat_hill_steepness (Mapgen flat hill steepness) float 64.0
# Determines terrain shape.
# The 3 numbers in brackets control the scale of the
# terrain, the 3 numbers should be identical.
mgflat_np_terrain (Mapgen flat terrain noise parameters) noise_params 0, 1, (600, 600, 600), 7244, 5, 0.6, 2.0
mgflat_np_filler_depth (Mapgen flat filler depth noise parameters) noise_params 0, 1.2, (150, 150, 150), 261, 3, 0.7, 2.0
mgflat_np_cave1 (Mapgen flat cave1 noise parameters) noise_params 0, 12, (128, 128, 128), 52534, 4, 0.5, 2.0
mgflat_np_cave2 (Mapgen flat cave2 noise parameters) noise_params 0, 12, (128, 128, 128), 10325, 4, 0.5, 2.0
[***Mapgen fractal]
# Choice of 8 4-dimensional fractals.
# 1 = "Roundy" mandelbrot set.
# 2 = "Roundy" julia set.
# 3 = "Squarry" mandelbrot set.
# 4 = "Squarry" julia set.
# 5 = "Mandy Cousin" mandelbrot set.
# 6 = "Mandy Cousin" julia set.
# 7 = "Variation" mandelbrot set.
# 8 = "Variation" julia set.
mgfractal_formula (Mapgen fractal formula) int 1 1 8
# Iterations of the recursive function.
# Controls scale of finest detail.
mgfractal_m_iterations (Mapgen fractal mandelbrot iterations) int 9
mgfractal_iterations (Mapgen fractal iterations) int 11
# Mandelbrot set: Approximate (X,Y,Z) scales in nodes.
mgfractal_m_scale (Mapgen fractal mandelbrot scale) v3f (1024.0, 256.0, 1024.0)
# Approximate (X,Y,Z) scale of fractal in nodes.
mgfractal_scale (Mapgen fractal scale) v3f (4096.0, 1024.0, 4096.0)
# Mandelbrot set: (X,Y,Z) offsets from world centre.
# Range roughly -2 to 2, multiply by m_scale for offsets in nodes.
mgfractal_m_offset (Mapgen fractal mandelbrot offset) v3f (1.75, 0.0, 0.0)
# (X,Y,Z) offset of fractal from world centre.
# Used to move a suitable spawn area of low land close to (0, 0).
# The default is suitable for mandelbrot sets, it needs to be edited for julia sets,
# do this by greatly reducing 'scale' and setting 'offset' initially to (0, 0, 0).
# Range roughly -2 to 2. Multiply by 'scale' for offset in nodes.
mgfractal_offset (Mapgen fractal offset) v3f (1.79, 0.0, 0.0)
# Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.
# W co-ordinate of the generated 3D slice of the 4D shape.
# Alters the generated 3D shape.
# Range roughly -2 to 2.
mgfractal_m_slice_w (Mapgen fractal mandelbrot slice w) float 0.0
mgfractal_slice_w (Mapgen fractal slice w) float 0.0
# Julia set: Iterations of the recursive function.
# Controls scale of finest detail.
mgfractal_j_iterations (Mapgen fractal julia iterations) int 9
# Julia set: Approximate (X,Y,Z) scales in nodes.
mgfractal_j_scale (Mapgen fractal julia scale) v3f (2048.0, 512.0, 2048.0)
# Julia set: (X,Y,Z) offsets from world centre.
# Range roughly -2 to 2, multiply by j_scale for offsets in nodes.
mgfractal_j_offset (Mapgen fractal julia offset) v3f (0.0, 1.0, 0.0)
# Julia set: W co-ordinate of the generated 3D slice of the 4D shape.
# Range roughly -2 to 2.
mgfractal_j_slice_w (Mapgen fractal julia slice w) float 0.0
# Julia set: X value determining the 4D shape.
# Julia set only: X value determining the 4D shape.
# Range roughly -2 to 2.
mgfractal_julia_x (Mapgen fractal julia x) float 0.33
# Julia set: Y value determining the 4D shape.
# Julia set only: Y value determining the 4D shape.
# Range roughly -2 to 2.
mgfractal_julia_y (Mapgen fractal julia y) float 0.33
# Julia set: Z value determining the 4D shape.
# Julia set only: Z value determining the 4D shape.
# Range roughly -2 to 2.
mgfractal_julia_z (Mapgen fractal julia z) float 0.33
# Julia set: W value determining the 4D shape.
# Julia set only: W value determining the 4D shape.
# Range roughly -2 to 2.
mgfractal_julia_w (Mapgen fractal julia w) float 0.33

3620
po/ca/minetest.po Normal file
View File

File diff suppressed because it is too large Load Diff

205
po/de/minetest.po
View File

@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: 0.0.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-08 21:23+0100\n"
"PO-Revision-Date: 2015-10-30 19:48+0200\n"
"Last-Translator: hybriddog <ovvv@web.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/minetest/minetest/"
"de/>\n"
"PO-Revision-Date: 2015-11-12 18:10+0000\n"
"Last-Translator: Wuzzy <almikes@aol.com>\n"
"Language-Team: German "
"<https://hosted.weblate.org/projects/minetest/minetest/de/>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -334,7 +334,7 @@ msgstr "Adresse / Port:"
#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
msgid "Client"
msgstr "Klient"
msgstr "Client"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
msgid "Connect"
@ -421,7 +421,7 @@ msgstr "Spiel starten"
#: builtin/mainmenu/tab_settings.lua
msgid "\"$1\" is not a valid flag."
msgstr ""
msgstr "„$1“ ist kein gültiger Bitschalter."
#: builtin/mainmenu/tab_settings.lua
msgid "(No description of setting given)"
@ -450,6 +450,8 @@ msgstr "Aktiviert"
#: builtin/mainmenu/tab_settings.lua
msgid "Format is 3 numbers separated by commas and inside brackets."
msgstr ""
"Das Format besteht aus 3 mit Komma getrennten Zahlen, die sich\n"
"in Klammern befinden."
#: builtin/mainmenu/tab_settings.lua
msgid ""
@ -472,7 +474,9 @@ msgstr ""
#: builtin/mainmenu/tab_settings.lua
msgid "Please enter a comma seperated list of flags."
msgstr "Bitte geben Sie eine mit Kommata getrennte Liste von Flags an."
msgstr ""
"Bitte geben Sie eine mit Kommata getrennte Liste von\n"
"Bitschaltern an."
#: builtin/mainmenu/tab_settings.lua
msgid "Please enter a valid integer."
@ -1361,7 +1365,7 @@ msgstr "Transparente Texturen säubern"
#: src/settings_translation_file.cpp
msgid "Client and Server"
msgstr "Klient und Server"
msgstr "Client und Server"
#: src/settings_translation_file.cpp
msgid "Climbing speed"
@ -1453,13 +1457,13 @@ msgstr ""
"Veränderung."
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Controls size of deserts and beaches in Mapgen v6.\n"
"When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
msgstr ""
"Verändert die Größe der Wüsten und Strände in Kartengenerator V6.\n"
"Wenn Schneebiome aktiviert sind, wird diese Einstellung ignoriert."
"Verändert die Größe der Wüsten und Strände im\n"
"Kartengenerator v6. Wenn Schneebiome aktiviert sind, wird\n"
"diese Einstellung ignoriert."
#: src/settings_translation_file.cpp
msgid "Crash message"
@ -1619,6 +1623,10 @@ msgid ""
"Note that this is not quite optimized and that smooth lighting on the\n"
"water surface doesn't work with this."
msgstr ""
"Eine etwas niedrigere Wasseroberfläche aktivieren, damit der Node\n"
"nicht vollständig „gefüllt“ wird. Beachten Sie, dass dies nicht wirklich\n"
"optimiert wurde, und dass weiches Licht auf der Wasseroberfläche\n"
"nicht mit dieser Einstellung funktioniert."
#: src/settings_translation_file.cpp
msgid "Enable mod security"
@ -1774,13 +1782,12 @@ msgid "Fast movement"
msgstr "Schnell bewegen"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Fast movement (via use key).\n"
"This requires the \"fast\" privilege on the server."
msgstr ""
"Schnelles Laufen (aux1 Taste).\n"
"Das benötigt das "
"Schnelle Bewegung (mittels Benutzen-Taste).\n"
"Dazu wird das „fast“-Privileg auf dem Server benötigt."
#: src/settings_translation_file.cpp
msgid "Field of view"
@ -1925,7 +1932,6 @@ msgid "Generate normalmaps"
msgstr "Normalmaps generieren"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Global map generation attributes.\n"
"Flags that are not specified in the flag string are not modified from the "
@ -1933,11 +1939,13 @@ msgid ""
"Flags starting with \"no\" are used to explicitly disable them.\n"
"'trees' and 'flat' flags only have effect in mgv6."
msgstr ""
"Kartengenerierungsattribute speziell für Kartengenerator V7.\n"
"'ridges' sind die Flüsse.\n"
"Flags, die nicht im flag text angegeben wurden, werden ihre Standartwerte "
"zugewiesen.\n"
"Flags, die mit starten "
"Globale Kartengenerierungsattribute.\n"
"Bitschalter, welche nicht in der Bitschalterzeichenkette festgelegt sind, "
"werden\n"
"nicht von der Standardeinstellung abweichen.\n"
"Bitschalter, die mit „no“ beginnen, werden benutzt, um sie explizit zu "
"deaktivieren.\n"
"Die Bitschalter „trees“ und „flat“ haben nur mit mgv6 eine Wirkung."
#: src/settings_translation_file.cpp
msgid "Graphics"
@ -2002,7 +2010,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "How many blocks are flying in the wire simultaneously per client."
msgstr ""
"Wie viele Kartenblöcke gleichzeitig pro Klient auf der Leitung unterwegs "
"Wie viele Kartenblöcke gleichzeitig pro Client auf der Leitung unterwegs "
"sind."
#: src/settings_translation_file.cpp
@ -2040,23 +2048,27 @@ msgid ""
"If disabled \"use\" key is used to fly fast if both fly and fast mode are "
"enabled."
msgstr ""
"Falls deaktiviert, wird die „Benutzen“-Taste benutzt, um schnell zu fliegen,"
"\n"
"wenn sowohl der Flug- als auch der Schnellmodus aktiviert ist."
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"If enabled together with fly mode, player is able to fly through solid "
"nodes.\n"
"This requires the \"noclip\" privilege on the server."
msgstr ""
"Falls es aktiviert ist, kann der Spieler im Flugmodus durch solide Blöcke "
"Falls es aktiviert ist, kann der Spieler im Flugmodus durch feste Blöcke "
"fliegen.\n"
"Es benötigt den "
"Dafür wird das „noclip“-Privileg auf dem Server benötigt."
#: src/settings_translation_file.cpp
msgid ""
"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
"and descending."
msgstr ""
"Falls aktiviert, wird die „Benutzen“-Taste statt der „Schleichen“-Taste zum\n"
"Herunterklettern und Sinken benutzt."
#: src/settings_translation_file.cpp
msgid ""
@ -2153,46 +2165,61 @@ msgid ""
"Julia set: (X,Y,Z) offsets from world centre.\n"
"Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
msgstr ""
"Julia-Menge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n"
"Reichweite liegt grob von -2 bis 2, wird mit j_scale für Versätze in\n"
"Nodes multipliziert."
#: src/settings_translation_file.cpp
msgid "Julia set: Approximate (X,Y,Z) scales in nodes."
msgstr ""
msgstr "Julia-Menge: Approximative (X,Y,Z)-Skalierungen in Nodes."
#: src/settings_translation_file.cpp
msgid ""
"Julia set: Iterations of the recursive function.\n"
"Controls scale of finest detail."
msgstr ""
"Julia-Menge: Iterationen der rekursiven Funktion.\n"
"Steuert die Skalierung mit einem sehr hohem Detailgrad."
#: src/settings_translation_file.cpp
msgid ""
"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
"Range roughly -2 to 2."
msgstr ""
"Julia-Menge: W-Koordinate des generierten 3D-Ausschnitts der 4D-Form.\n"
"Die Weite liegt grob zwischen -2 und 2."
#: src/settings_translation_file.cpp
msgid ""
"Julia set: W value determining the 4D shape.\n"
"Range roughly -2 to 2."
msgstr ""
"Julia-Menge: W-Wert, der die 4D-Form festlegt.\n"
"Weite liegt grob zwischen -2 und 2."
#: src/settings_translation_file.cpp
msgid ""
"Julia set: X value determining the 4D shape.\n"
"Range roughly -2 to 2."
msgstr ""
"Julia-Menge: X-Wert, der die 4D-Form festlegt.\n"
"Weite liegt grob zwischen -2 und 2."
#: src/settings_translation_file.cpp
msgid ""
"Julia set: Y value determining the 4D shape.\n"
"Range roughly -2 to 2."
msgstr ""
"Julia-Menge: Y-Wert, der die 4D-Form festlegt.\n"
"Weite liegt grob zwischen -2 und 2."
#: src/settings_translation_file.cpp
msgid ""
"Julia set: Z value determining the 4D shape.\n"
"Range roughly -2 to 2."
msgstr ""
"Julia-Menge: Z-Wert, der die 4D-Form festlegt.\n"
"Weite liegt grob zwischen -2 und 2."
#: src/settings_translation_file.cpp
msgid "Jump key"
@ -2497,7 +2524,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Key use for climbing/descending"
msgstr "\"Benutzen\"-Taste zum runterklettern"
msgstr "„Benutzen“-Taste zum Runterklettern"
#: src/settings_translation_file.cpp
msgid "Language"
@ -2635,29 +2662,35 @@ msgid ""
"Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
"Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
msgstr ""
"Mandelbrotmenge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n"
"Reichweite liegt grob von -2 bis 2, wird mit m_scale für\n"
"Versätze in Nodes multipliziert."
#: src/settings_translation_file.cpp
msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
msgstr ""
msgstr "Mandelbrotmenge: Approximative (X,Y,Z)-Skalierungen in Nodes."
#: src/settings_translation_file.cpp
msgid ""
"Mandelbrot set: Iterations of the recursive function.\n"
"Controls scale of finest detail."
msgstr ""
"Mandelbrotmenge: Iterationen der rekursiven Funktion.\n"
"Steuert die Skalierung mit einem sehr hohem Detailgrad."
#: src/settings_translation_file.cpp
msgid ""
"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
"Range roughly -2 to 2."
msgstr ""
"Madnelbrotmenge: W-Koordinate des generierten 3D-Ausschnitts der 4D-Form.\n"
"Die Weite liegt grob zwischen -2 und 2."
#: src/settings_translation_file.cpp
msgid "Map directory"
msgstr "Weltordner"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Map generation attributes specific to Mapgen fractal.\n"
"'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
@ -2665,14 +2698,16 @@ msgid ""
"default.\n"
"Flags starting with \"no\" are used to explicitly disable them."
msgstr ""
"Kartengenerierungsattribute speziell für Kartengenerator V7.\n"
"'ridges' sind die Flüsse.\n"
"Flags, die nicht im flag text angegeben wurden, werden ihre Standartwerte "
"zugewiesen.\n"
"Flags, die mit starten "
"Kartengenerierungsattribute, die speziell für den Fraktale-\n"
"Kartenerzeuger sind.\n"
"„julia“ wählt für die Erzeugung eine Julia-Menge statt einer\n"
"Mandelbrotmenge aus.\n"
"Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n"
"werden von der Standardeinstellung unverändert gelassen.\n"
"Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
"zu deaktivieren."
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Map generation attributes specific to Mapgen v6.\n"
"When snowbiomes are enabled jungles are enabled and the jungles flag is "
@ -2681,14 +2716,15 @@ msgid ""
"default.\n"
"Flags starting with \"no\" are used to explicitly disable them."
msgstr ""
"Kartengenerierungsattribute speziell für Kartengenerator V7.\n"
"'ridges' sind die Flüsse.\n"
"Flags, die nicht im flag text angegeben wurden, werden ihre Standartwerte "
"zugewiesen.\n"
"Flags, die mit starten "
"Kartengenerierungsattribute speziell für den Kartengenerator v6.\n"
"Falls Schneebiome aktiviert sind, werden Dschungel aktiviert und der\n"
"„jungles“-Bitschalter wird ignoriert.\n"
"Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n"
"werden von der Standardeinstellung unverändert gelassen.\n"
"Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
"zu deaktivieren."
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Map generation attributes specific to Mapgen v7.\n"
"'ridges' are the rivers.\n"
@ -2696,11 +2732,12 @@ msgid ""
"default.\n"
"Flags starting with \"no\" are used to explicitly disable them."
msgstr ""
"Kartengenerierungsattribute speziell für Kartengenerator V7.\n"
"'ridges' sind die Flüsse.\n"
"Flags, die nicht im flag text angegeben wurden, werden ihre Standartwerte "
"zugewiesen.\n"
"Flags, die mit starten "
"Kartengenerierungsattribute speziell für Kartengenerator v7.\n"
"„ridges“ sind die Flüsse.\n"
"Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n"
"werden von der Standardeinstellung unverändert gelassen.\n"
"Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n"
"zu deaktivieren."
#: src/settings_translation_file.cpp
msgid "Map generation limit"
@ -2736,87 +2773,79 @@ msgstr "Kartengenerator-Debugging"
#: src/settings_translation_file.cpp
msgid "Mapgen flags"
msgstr "Kartengenerator-Flags"
msgstr "Kartenerzeuger-Bitschalter"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal"
msgstr "Kartengenerator-Flags"
msgstr "Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal cave1 noise parameters"
msgstr "Höhlen-Rauschparameter 1"
msgstr "cave1-Rauschparameter für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal cave2 noise parameters"
msgstr "Höhlen-Rauschparameter 2"
msgstr "cave2-Rauschparameter für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal filler depth noise parameters"
msgstr "Fülltiefen-Rauschparameter"
msgstr "Fülltiefenrauschparameter für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal flags"
msgstr "Kartengenerator-Flags"
msgstr "Bitschalter für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal julia iterations"
msgstr "Parallax-Occlusion-Iterationen"
msgstr "Julia-Iterationen für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal julia offset"
msgstr ""
msgstr "Julia-Versatz für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal julia scale"
msgstr ""
msgstr "Julia-Skalierung für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal julia slice w"
msgstr ""
msgstr "w-Ausschnitt für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal julia w"
msgstr ""
msgstr "w-Parameter für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal julia x"
msgstr ""
msgstr "x-Parameter für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal julia y"
msgstr ""
msgstr "y-Parameter für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal julia z"
msgstr ""
msgstr "z-Parameter für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal mandelbrot iterations"
msgstr "Max. Pakete pro Iteration"
msgstr "Mandelbrotiterationen für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal mandelbrot offset"
msgstr ""
msgstr "Mandelbrotversatz für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal mandelbrot scale"
msgstr ""
msgstr "Mandelbrotskalierung für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal mandelbrot slice w"
msgstr ""
msgstr "Mandelbrot-w-Ausschnitt für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal seabed noise parameters"
msgstr "Hitzenübergangs-Rauschparameter"
msgstr "Meeresgrundrauschparameter für Fraktale-Kartenerzeuger"
#: src/settings_translation_file.cpp
msgid "Mapgen heat blend noise parameters"
@ -2860,7 +2889,7 @@ msgstr "Apfelbaum-Rauschparameter"
#: src/settings_translation_file.cpp
msgid "Mapgen v6 beach frequency"
msgstr "Standhäufigkeit"
msgstr "Strandhäufigkeit"
#: src/settings_translation_file.cpp
msgid "Mapgen v6 beach noise parameters"
@ -2880,7 +2909,7 @@ msgstr "Wüsten-Rauschparameter"
#: src/settings_translation_file.cpp
msgid "Mapgen v6 flags"
msgstr "Flags"
msgstr "v6-Kartengenerator-Bitschalter"
#: src/settings_translation_file.cpp
msgid "Mapgen v6 height select noise parameters"
@ -2928,7 +2957,7 @@ msgstr "Fülltiefen-Rauschparameter"
#: src/settings_translation_file.cpp
msgid "Mapgen v7 flags"
msgstr "Flags"
msgstr "v7-Kartengenerator-Bitschalter"
#: src/settings_translation_file.cpp
msgid "Mapgen v7 height select noise parameters"
@ -2997,6 +3026,12 @@ msgid ""
"Smaller values may result in a suitable spawn point not being found,\n"
"resulting in a spawn at (0, 0, 0) possibly buried underground."
msgstr ""
"Höchstabstand über dem Meeresspiegel für den Spieler-\n"
"startpunkt. Größere Werte führen zu Startpunkten näher an\n"
"(x = 0, z = 0). Kleinere Werte können dazu führen, dass kein\n"
"brauchbarer Startpunkt gefunden wird, was wiederum zu einem\n"
"Startpunkt bei (0, 0, 0) führt, der möglicherweise im Untergrund\n"
"eingegraben ist."
#: src/settings_translation_file.cpp
msgid "Maximum forceloaded blocks"
@ -3037,8 +3072,8 @@ msgid ""
"Maximum number of mapblocks for client to be kept in memory.\n"
"Set to -1 for unlimited amount."
msgstr ""
"Maximale Anzahl der Kartenblöcke, die der Klient im Speicher vorhalten "
"soll.\n"
"Maximale Anzahl der Kartenblöcke, die der Client im Speicher vorhalten soll."
"\n"
"Auf -1 setzen, um keine Obergrenze zu verwenden."
#: src/settings_translation_file.cpp
@ -3074,7 +3109,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Maximum simultaneously blocks send per client"
msgstr "Max. gleichzeitig versendete Kartenblöcke pro Klient"
msgstr "Max. gleichzeitig versendete Kartenblöcke pro Client"
#: src/settings_translation_file.cpp
msgid "Maximum simultaneously bocks send total"
@ -3083,7 +3118,7 @@ msgstr "Max. gleichzeitig versendete Kartenblöcke"
#: src/settings_translation_file.cpp
msgid "Maximum time in ms a file download (e.g. a mod download) may take."
msgstr ""
"Maximale Zeit in ms, die das Herunterladen einer Datei (z.B. eine Mod) "
"Maximale Zeit in ms, die das Herunterladen einer Datei (z.B. einer Mod) "
"dauern darf."
#: src/settings_translation_file.cpp
@ -3357,13 +3392,12 @@ msgid "Physics"
msgstr "Physik"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Player is able to fly without being affected by gravity.\n"
"This requires the \"fly\" privilege on the server."
msgstr ""
"Der Spieler kann unabhängig von der Schwerkraft fliegen.\n"
"Das benötigt die "
"Dafür wird das „fly“-Privileg auf dem Server benötigt."
#: src/settings_translation_file.cpp
msgid "Player name"
@ -3632,13 +3666,12 @@ msgid "Smooth lighting"
msgstr "Geglättetes Licht"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Smooths camera when moving and looking around.\n"
"Useful for recording videos."
msgstr ""
"Glättet Kamerabewegungen beim Umsehen.\n"
"Nützlich zum Aufnehmen von Videos."
"Glättet Kamerabewegungen bei der Fortbewegung und\n"
"beim Umsehen. Nützlich zum Aufnehmen von Videos."
#: src/settings_translation_file.cpp
msgid "Smooths rotation of camera in cinematic mode. 0 to disable."
@ -3783,7 +3816,7 @@ msgstr "Zeitgeschwindigkeit"
#: src/settings_translation_file.cpp
msgid "Timeout for client to remove unused map data from memory."
msgstr ""
"Zeit, nach der der Klient nicht benutzte Kartendaten aus\n"
"Zeit, nach der der Client nicht benutzte Kartendaten aus\n"
"dem Speicher löscht."
#: src/settings_translation_file.cpp
@ -3889,7 +3922,7 @@ msgstr "Vertikale Bildschirmsynchronisation."
#: src/settings_translation_file.cpp
msgid "Vertical spawn range"
msgstr ""
msgstr "Vertikaler Startpunktbereich"
#: src/settings_translation_file.cpp
msgid "Video driver"

287
po/es/minetest.po
View File

@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-08 21:23+0100\n"
"PO-Revision-Date: 2015-10-27 19:39+0200\n"
"Last-Translator: ShadowNinja <shadowninja@minetest.net>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/minetest/"
"minetest/es/>\n"
"PO-Revision-Date: 2015-11-13 21:07+0000\n"
"Last-Translator: Joan Ciprià Moreno <joancipria@gmail.com>\n"
"Language-Team: Spanish "
"<https://hosted.weblate.org/projects/minetest/minetest/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -21,7 +21,7 @@ msgstr ""
#: builtin/fstk/ui.lua
msgid "An error occured in a Lua script, such as a mod:"
msgstr "Ha ocurrido un error en un script de Lua, por ejemplo en un mod:"
msgstr "Ha ocurrido un error en un script Lua, por ejemplo un mod:"
#: builtin/fstk/ui.lua
msgid "An error occured:"
@ -37,7 +37,7 @@ msgstr "Aceptar"
#: builtin/fstk/ui.lua
msgid "Reconnect"
msgstr "Volver a conectar"
msgstr "Reconectar"
#: builtin/fstk/ui.lua
msgid "The server has requested a reconnect:"
@ -48,22 +48,21 @@ msgid "Loading..."
msgstr "Cargando..."
#: builtin/mainmenu/common.lua
#, fuzzy
msgid "Protocol version mismatch. "
msgstr "No concuerda la versión del protocolo, servidor "
msgstr "Desajuste con la versión del protocolo. "
#: builtin/mainmenu/common.lua
msgid "Server enforces protocol version $1. "
msgstr ""
msgstr "El servidor hace cumplir la versión $1 del protocolo "
#: builtin/mainmenu/common.lua
msgid "Server supports protocol versions between $1 and $2. "
msgstr ""
msgstr "El servidor soporta versiones del protocolo entre $1 y $2."
#: builtin/mainmenu/common.lua
msgid "Try reenabling public serverlist and check your internet connection."
msgstr ""
"Intenta re-habilitar la lista de servidores públicos y verifica tu conexión "
"Intente re-habilitar la lista de servidores públicos y verifique su conexión "
"a Internet."
#: builtin/mainmenu/common.lua
@ -72,7 +71,7 @@ msgstr "Sólo soportamos protocolos versión $1"
#: builtin/mainmenu/common.lua
msgid "We support protocol versions between version $1 and $2."
msgstr ""
msgstr "Nosotros soportamos versiones de protocolo entre la versíon $1 y $2."
#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua
@ -425,11 +424,11 @@ msgstr "Iniciar juego"
#: builtin/mainmenu/tab_settings.lua
msgid "\"$1\" is not a valid flag."
msgstr ""
msgstr "\"$ 1\" no es un indicador válido."
#: builtin/mainmenu/tab_settings.lua
msgid "(No description of setting given)"
msgstr ""
msgstr "(Ninguna descripción de ajuste dada)"
#: builtin/mainmenu/tab_settings.lua
msgid "Browse"
@ -440,28 +439,29 @@ msgid "Change keys"
msgstr "Configurar teclas"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Disabled"
msgstr "Desactivar paquete"
msgstr "Desactivado"
#: builtin/mainmenu/tab_settings.lua
msgid "Edit"
msgstr "Editar"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Enabled"
msgstr "Activado"
#: builtin/mainmenu/tab_settings.lua
msgid "Format is 3 numbers separated by commas and inside brackets."
msgstr ""
"El formato es 3 números separados por comas y éstos dentro de paréntesis."
#: builtin/mainmenu/tab_settings.lua
msgid ""
"Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
"<octaves>, <persistence>"
msgstr ""
"Formato: <offset> <escala> (<extensión X>, <extensión> Y, <extensión Z>), "
"<semilla>, <octavas>, <persistencia>"
#: builtin/mainmenu/tab_settings.lua
msgid "Games"
@ -473,28 +473,27 @@ msgstr ""
#: builtin/mainmenu/tab_settings.lua
msgid "Please enter a comma seperated list of flags."
msgstr ""
msgstr "Por favor, introduzca una lista separada por comas de indicadores."
#: builtin/mainmenu/tab_settings.lua
msgid "Please enter a valid integer."
msgstr ""
msgstr "Por favor, introduzca un entero válido."
#: builtin/mainmenu/tab_settings.lua
msgid "Please enter a valid number."
msgstr ""
msgstr "Por favor, introduzca un número válido."
#: builtin/mainmenu/tab_settings.lua
msgid "Possible values are: "
msgstr ""
msgstr "Los posibles valores son: "
#: builtin/mainmenu/tab_settings.lua
msgid "Restore Default"
msgstr ""
msgstr "Restablecer por defecto"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Select path"
msgstr "Seleccionar"
msgstr "Seleccionar ruta"
#: builtin/mainmenu/tab_settings.lua
msgid "Settings"
@ -502,15 +501,15 @@ msgstr "Configuración"
#: builtin/mainmenu/tab_settings.lua
msgid "Show technical names"
msgstr ""
msgstr "Mostrar los nombres técnicos"
#: builtin/mainmenu/tab_settings.lua
msgid "The value must be greater than $1."
msgstr ""
msgstr "El valor debe ser mayor que $ 1."
#: builtin/mainmenu/tab_settings.lua
msgid "The value must be lower than $1."
msgstr ""
msgstr "El valor debe ser menor que $ 1."
#: builtin/mainmenu/tab_simple_main.lua
msgid "Config mods"
@ -612,13 +611,12 @@ msgid "needs_fallback_font"
msgstr "no"
#: src/game.cpp
#, fuzzy
msgid ""
"\n"
"Check debug.txt for details."
msgstr ""
"\n"
"Revisa el archivo debug.txt para más detalles."
"Revisa debug.txt para más detalles."
#: src/game.cpp
msgid "Change Keys"
@ -887,7 +885,7 @@ msgstr "Aplicaciones"
#: src/keycode.cpp
msgid "Attn"
msgstr "Attn"
msgstr "Atentamente"
#: src/keycode.cpp
msgid "Back"
@ -1176,14 +1174,12 @@ msgid ""
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "3D clouds"
msgstr "Nubes 3D"
msgstr "Nubes en 3D"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "3D mode"
msgstr "Modo vuelo"
msgstr "Modo 3D"
#: src/settings_translation_file.cpp
msgid ""
@ -1205,10 +1201,13 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "A message to be displayed to all clients when the server crashes."
msgstr ""
"Un mensaje para ser mostrado a todos los clientes cuando el servidor cae."
#: src/settings_translation_file.cpp
msgid "A message to be displayed to all clients when the server shuts down."
msgstr ""
"Un mensaje para ser mostrado a todos los clientes cuando el servidor se "
"apaga."
#: src/settings_translation_file.cpp
msgid "Absolute limit of emerge queues"
@ -1216,11 +1215,11 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Acceleration in air"
msgstr ""
msgstr "Aceleración en el aire"
#: src/settings_translation_file.cpp
msgid "Active block range"
msgstr ""
msgstr "Rango de bloque activo"
#: src/settings_translation_file.cpp
msgid "Active object send range"
@ -1247,11 +1246,11 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Advanced"
msgstr ""
msgstr "Avanzado"
#: src/settings_translation_file.cpp
msgid "Always fly and fast"
msgstr ""
msgstr "Siempre volar y rápido"
#: src/settings_translation_file.cpp
msgid "Ambient occlusion gamma"
@ -1259,11 +1258,11 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Anisotropic filtering"
msgstr ""
msgstr "Filtrado anisotrópico"
#: src/settings_translation_file.cpp
msgid "Announce server"
msgstr ""
msgstr "Anunciar servidor"
#: src/settings_translation_file.cpp
msgid ""
@ -1274,34 +1273,33 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Ask to reconnect after crash"
msgstr ""
msgstr "Preguntar para volver a conectar despues de una caída"
#: src/settings_translation_file.cpp
msgid "Automaticaly report to the serverlist."
msgstr ""
msgstr "Automáticamente informar a la lista del servidor."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Backward key"
msgstr "Atrás"
msgstr "Tecla retroceso"
#: src/settings_translation_file.cpp
msgid "Basic"
msgstr ""
msgstr "Básico"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Bilinear filtering"
msgstr "Filtro bi-lineal"
msgstr "Filtrado bilineal"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Bind address"
msgstr "Asociar dirección"
msgstr "Dirección BIND"
#: src/settings_translation_file.cpp
msgid "Bits per pixel (aka color depth) in fullscreen mode."
msgstr ""
"Bits por píxel (también conocido como profundidad de color) en modo de "
"pantalla completa."
#: src/settings_translation_file.cpp
msgid "Build inside player"
@ -1313,77 +1311,71 @@ msgstr "Mapeado de relieve"
#: src/settings_translation_file.cpp
msgid "Camera smoothing"
msgstr ""
msgstr "Suavizado de cámara"
#: src/settings_translation_file.cpp
msgid "Camera smoothing in cinematic mode"
msgstr ""
msgstr "Suavizado de cámara en modo cinematográfico"
#: src/settings_translation_file.cpp
msgid "Camera update toggle key"
msgstr ""
msgstr "Tecla alternativa para la actualización de la cámara"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Chat key"
msgstr "Configurar teclas"
msgstr "Tecla del Chat"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Chat toggle key"
msgstr "Configurar teclas"
msgstr "Tecla alternativa para el chat"
#: src/settings_translation_file.cpp
msgid "Chunk size"
msgstr ""
msgstr "Tamaño del chunk"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Cinematic mode"
msgstr "Modo creativo"
msgstr "Modo cinematográfico"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Cinematic mode key"
msgstr "Modo creativo"
msgstr "Tecla modo cinematográfico"
#: src/settings_translation_file.cpp
msgid "Clean transparent textures"
msgstr ""
msgstr "Limpiar texturas transparentes"
#: src/settings_translation_file.cpp
msgid "Client and Server"
msgstr ""
msgstr "Cliente y servidor"
#: src/settings_translation_file.cpp
msgid "Climbing speed"
msgstr ""
msgstr "Velocidad de escalada"
#: src/settings_translation_file.cpp
msgid "Cloud height"
msgstr ""
msgstr "Altura de la nube"
#: src/settings_translation_file.cpp
msgid "Cloud radius"
msgstr ""
msgstr "Radio de nube"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Clouds"
msgstr "Nubes 3D"
msgstr "Nubes"
#: src/settings_translation_file.cpp
msgid "Clouds are a client side effect."
msgstr ""
msgstr "Las nubes son un efecto del lado del cliente."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Clouds in menu"
msgstr "Menú principal"
msgstr "Nubes en el menú"
#: src/settings_translation_file.cpp
msgid "Colored fog"
msgstr ""
msgstr "Niebla colorida"
#: src/settings_translation_file.cpp
msgid ""
@ -1392,9 +1384,8 @@ msgid ""
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Command key"
msgstr "Comando"
msgstr "Tecla comando"
#: src/settings_translation_file.cpp
#, fuzzy
@ -1402,9 +1393,8 @@ msgid "Connect glass"
msgstr "Vidrios conectados"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Connect to external media server"
msgstr "Conectando al servidor..."
msgstr "Conectar a un servidor media externo"
#: src/settings_translation_file.cpp
msgid "Connects glass if supported by node."
@ -1416,27 +1406,24 @@ msgid "Console alpha"
msgstr "Consola"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Console color"
msgstr "Consola"
msgstr "Color de la consola"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Console key"
msgstr "Consola"
msgstr "Tecla de la consola"
#: src/settings_translation_file.cpp
msgid "Continuous forward"
msgstr ""
msgstr "Avance continuo"
#: src/settings_translation_file.cpp
msgid "Continuous forward movement (only used for testing)."
msgstr ""
msgstr "Avance continuo (sólo utilizado para la testing)."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Controls"
msgstr "Control"
msgstr "Controles"
#: src/settings_translation_file.cpp
msgid ""
@ -1453,7 +1440,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Crash message"
msgstr ""
msgstr "Mensaje de error"
#: src/settings_translation_file.cpp
msgid "Crosshair alpha"
@ -1465,11 +1452,11 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Crosshair color"
msgstr ""
msgstr "Color de la cruz"
#: src/settings_translation_file.cpp
msgid "Crosshair color (R,G,B)."
msgstr ""
msgstr "Color de la cruz (R,G,B)."
#: src/settings_translation_file.cpp
msgid "Crouch speed"
@ -1477,16 +1464,15 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "DPI"
msgstr ""
msgstr "DPI"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Damage"
msgstr "Permitir daños"
msgstr "Daño"
#: src/settings_translation_file.cpp
msgid "Debug info toggle key"
msgstr ""
msgstr "Tecla alternativa para la información de la depuración"
#: src/settings_translation_file.cpp
msgid "Debug log level"
@ -1498,11 +1484,11 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Default acceleration"
msgstr ""
msgstr "Aceleración por defecto"
#: src/settings_translation_file.cpp
msgid "Default game"
msgstr ""
msgstr "Juego por defecto"
#: src/settings_translation_file.cpp
msgid ""
@ -1511,13 +1497,12 @@ msgid ""
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Default password"
msgstr "Contraseña nueva"
msgstr "Contraseña por defecto"
#: src/settings_translation_file.cpp
msgid "Default privileges"
msgstr ""
msgstr "Privilegios por defecto"
#: src/settings_translation_file.cpp
msgid ""
@ -1566,9 +1551,8 @@ msgid "Detailed mod profiling"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Disable anticheat"
msgstr "Habilitar partículas"
msgstr "Desactivar Anticheat"
#: src/settings_translation_file.cpp
msgid "Disallow empty passwords"
@ -1579,14 +1563,12 @@ msgid "Domain name of server, to be displayed in the serverlist."
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Double tap jump for fly"
msgstr "Pulsar dos veces \"saltar\" para volar"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Double-tapping the jump key toggles fly mode."
msgstr "Pulsar dos veces \"saltar\" para volar"
msgstr "Pulsar dos veces \"saltar\" alterna el modo vuelo."
#: src/settings_translation_file.cpp
msgid "Drop item key"
@ -1605,9 +1587,8 @@ msgid ""
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Enable mod security"
msgstr "Repositorio de mods en línea"
msgstr "Activar seguridad de mods"
#: src/settings_translation_file.cpp
msgid "Enable players getting damage and dying."
@ -1664,9 +1645,8 @@ msgid "Enables caching of facedir rotated meshes."
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Enables minimap."
msgstr "Permitir daños"
msgstr "Activar mini-mapa."
#: src/settings_translation_file.cpp
msgid ""
@ -1760,18 +1740,16 @@ msgid ""
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Filtering"
msgstr "Sin filtro"
msgstr "Filtrado"
#: src/settings_translation_file.cpp
msgid "Fixed map seed"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Fly key"
msgstr "Modo vuelo"
msgstr "Tecla vuelo"
#: src/settings_translation_file.cpp
msgid "Flying"
@ -1810,9 +1788,8 @@ msgid "Font size"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Forward key"
msgstr "Adelante"
msgstr "Tecla Avanzar"
#: src/settings_translation_file.cpp
msgid "Freetype fonts"
@ -1864,7 +1841,6 @@ msgid "Gamma"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Generate normalmaps"
msgstr "Generar mapas normales"
@ -2029,9 +2005,8 @@ msgid "Interval of sending time of day to clients."
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Inventory key"
msgstr "Inventario"
msgstr "Tecla Inventario"
#: src/settings_translation_file.cpp
msgid "Invert mouse"
@ -2092,9 +2067,8 @@ msgid ""
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Jump key"
msgstr "Saltar"
msgstr "Tecla Saltar"
#: src/settings_translation_file.cpp
msgid "Jumping speed"
@ -2326,9 +2300,8 @@ msgid ""
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Left key"
msgstr "Menú izq."
msgstr "Tecla izquierda"
#: src/settings_translation_file.cpp
msgid ""
@ -2398,14 +2371,12 @@ msgid "Main menu game manager"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Main menu mod manager"
msgstr "Menú principal"
msgstr "Menú principal del gestor de mods"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Main menu script"
msgstr "Menú principal"
msgstr "Script del menú principal"
#: src/settings_translation_file.cpp
msgid ""
@ -2499,9 +2470,8 @@ msgid "Mapgen biome humidity noise parameters"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen debug"
msgstr "Generador de mapas"
msgstr "Depuración del generador de mapas"
#: src/settings_translation_file.cpp
#, fuzzy
@ -2843,9 +2813,8 @@ msgid "Maxmimum objects per block"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Menus"
msgstr "Menú"
msgstr "Menús"
#: src/settings_translation_file.cpp
msgid "Mesh cache"
@ -2976,9 +2945,8 @@ msgid "Noclip key"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Node highlighting"
msgstr "Resaltar nodos"
msgstr "Resaltado de los nodos"
#: src/settings_translation_file.cpp
msgid "Noise parameters for biome API temperature, humidity and biome blend."
@ -3081,9 +3049,8 @@ msgid ""
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Player name"
msgstr "Nombre de jugador demasiado largo."
msgstr "Nombre del jugador"
#: src/settings_translation_file.cpp
msgid "Player transfer distance"
@ -3108,9 +3075,8 @@ msgid ""
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Preload inventory textures"
msgstr "Cargando texturas..."
msgstr "Precarga de las texturas del inventario"
#: src/settings_translation_file.cpp
msgid "Prevent mods from doing insecure things like running shell commands."
@ -3140,9 +3106,8 @@ msgid "Random input"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Range select key"
msgstr "Seleccionar distancia"
msgstr "Tecla seleccionar rango de visión"
#: src/settings_translation_file.cpp
msgid "Remote media"
@ -3157,9 +3122,8 @@ msgid "Replaces the default main menu with a custom one."
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Right key"
msgstr "Menú der."
msgstr "Tecla derecha"
#: src/settings_translation_file.cpp
msgid "Rightclick repetition interval"
@ -3199,7 +3163,6 @@ msgid "Screen width"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Screenshot"
msgstr "Captura de pantalla"
@ -3228,44 +3191,36 @@ msgid "Selection box width"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Server / Singleplayer"
msgstr "Comenzar un jugador"
msgstr "Servidor / Un jugador"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Server URL"
msgstr "Servidor"
msgstr "URL del servidor"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Server address"
msgstr "Puerto del servidor"
msgstr "Dirección del servidor"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Server description"
msgstr "Puerto del servidor"
msgstr "Descripción del servidor"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Server name"
msgstr "Servidor"
msgstr "Nombre del servidor"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Server port"
msgstr "Puerto del servidor"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Serverlist URL"
msgstr "Lista de servidores públicos"
msgstr "Lista de las URLs de servidores"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Serverlist file"
msgstr "Lista de servidores públicos"
msgstr "Archivo de la lista de servidores"
#: src/settings_translation_file.cpp
msgid ""
@ -3321,7 +3276,6 @@ msgid ""
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Smooth lighting"
msgstr "Iluminación suave"
@ -3340,9 +3294,8 @@ msgid "Smooths rotation of camera. 0 to disable."
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Sneak key"
msgstr "Caminar"
msgstr "Tecla sigilo"
#: src/settings_translation_file.cpp
msgid "Sound"
@ -3379,9 +3332,8 @@ msgstr ""
# No cabe "Paquetes de texturas".
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Texture path"
msgstr "Texturas"
msgstr "Ruta de la textura"
#: src/settings_translation_file.cpp
msgid ""
@ -3464,9 +3416,8 @@ msgid "Tooltip delay"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Trilinear filtering"
msgstr "Filtro tri-lineal"
msgstr "Filtrado trilineal"
#: src/settings_translation_file.cpp
msgid ""
@ -3508,9 +3459,8 @@ msgid "Use bilinear filtering when scaling textures."
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Use key"
msgstr "pulsa una tecla"
msgstr "Usa la tecla"
#: src/settings_translation_file.cpp
msgid "Use mip mapping to scale textures. May slightly increase performance."
@ -3521,9 +3471,8 @@ msgid "Use trilinear filtering when scaling textures."
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Useful for mod developers."
msgstr "Antiguos desarrolladores"
msgstr "Útil para los desarrolladores de mods."
#: src/settings_translation_file.cpp
msgid "V-Sync"
@ -3566,14 +3515,12 @@ msgid "Viewing range minimum"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Volume"
msgstr "Volumen del sonido"
msgstr "Volumen"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Walking speed"
msgstr "Movimiento de hojas"
msgstr "Velocidad del caminar"
#: src/settings_translation_file.cpp
msgid "Wanted FPS"
@ -3593,17 +3540,14 @@ msgid "Waving Nodes"
msgstr "Movimiento de hojas"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Waving leaves"
msgstr "Movimiento de hojas"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Waving plants"
msgstr "Movimiento de plantas"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Waving water"
msgstr "Oleaje en el agua"
@ -3618,9 +3562,8 @@ msgid "Waving water length"
msgstr "Oleaje en el agua"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Waving water speed"
msgstr "Oleaje en el agua"
msgstr "Velocidad del oleaje en el agua"
#: src/settings_translation_file.cpp
msgid ""

69
po/et/minetest.po
View File

@ -8,15 +8,16 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-08 21:23+0100\n"
"PO-Revision-Date: 2013-12-18 21:28+0200\n"
"Last-Translator: Jabo Babo <bb7b@gmx.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"PO-Revision-Date: 2015-11-11 12:12+0000\n"
"Last-Translator: Kristjan Räts <kristjanrats@gmail.com>\n"
"Language-Team: Estonian "
"<https://hosted.weblate.org/projects/minetest/minetest/et/>\n"
"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 1.7-dev\n"
"X-Generator: Weblate 2.5-dev\n"
#: builtin/fstk/ui.lua
msgid "An error occured in a Lua script, such as a mod:"
@ -27,18 +28,16 @@ msgid "An error occured:"
msgstr ""
#: builtin/fstk/ui.lua
#, fuzzy
msgid "Main menu"
msgstr "Menüü"
msgstr "Peamenüü"
#: builtin/fstk/ui.lua builtin/mainmenu/store.lua
msgid "Ok"
msgstr "kinnitama"
#: builtin/fstk/ui.lua
#, fuzzy
msgid "Reconnect"
msgstr "Liitu"
msgstr "Taasta ühendus"
#: builtin/fstk/ui.lua
msgid "The server has requested a reconnect:"
@ -79,24 +78,20 @@ msgid "Cancel"
msgstr "Tühista"
#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua
#, fuzzy
msgid "Depends:"
msgstr "Vajab:"
msgstr "Sõltub:"
#: builtin/mainmenu/dlg_config_world.lua
#, fuzzy
msgid "Disable MP"
msgstr "Lülita kõik välja"
msgstr "Keela MP"
#: builtin/mainmenu/dlg_config_world.lua
#, fuzzy
msgid "Enable MP"
msgstr "Lülita kõik sisse"
msgstr "Luba MP"
#: builtin/mainmenu/dlg_config_world.lua
#, fuzzy
msgid "Enable all"
msgstr "Lülita kõik sisse"
msgstr "Luba kõik"
#: builtin/mainmenu/dlg_config_world.lua
msgid ""
@ -105,9 +100,8 @@ msgid ""
msgstr ""
#: builtin/mainmenu/dlg_config_world.lua
#, fuzzy
msgid "Hide Game"
msgstr "Mäng"
msgstr "Peida mäng"
#: builtin/mainmenu/dlg_config_world.lua
msgid "Hide mp content"
@ -123,18 +117,16 @@ msgid "Save"
msgstr "Salvesta"
#: builtin/mainmenu/dlg_config_world.lua
#, fuzzy
msgid "World:"
msgstr "Vali maailm:"
msgstr "Maailm:"
#: builtin/mainmenu/dlg_config_world.lua
msgid "enabled"
msgstr "Sisse lülitatud"
#: builtin/mainmenu/dlg_create_world.lua
#, fuzzy
msgid "A world named \"$1\" already exists"
msgstr "Maailma loomine ebaõnnestus: Samanimeline maailm on juba olemas"
msgstr "Maailm nimega \"$1\" on juba olemas"
#: builtin/mainmenu/dlg_create_world.lua
msgid "Create"
@ -153,9 +145,8 @@ msgid "Game"
msgstr "Mäng"
#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen"
msgstr "Põlvkonna kaardid"
msgstr "Kaardi generaator"
#: builtin/mainmenu/dlg_create_world.lua
msgid "No worldname given or no game selected"
@ -198,9 +189,8 @@ msgid "Yes"
msgstr "Jah"
#: builtin/mainmenu/dlg_delete_world.lua
#, fuzzy
msgid "Delete World \"$1\"?"
msgstr "Kustuta maailm: \"$1\"?"
msgstr "Kas kustutada maailm \"$1\"?"
#: builtin/mainmenu/dlg_delete_world.lua
msgid "No"
@ -221,9 +211,8 @@ msgid ""
msgstr ""
#: builtin/mainmenu/modmgr.lua
#, fuzzy
msgid "Failed to install $1 to $2"
msgstr "Maailma initsialiseerimine ebaõnnestus"
msgstr "$1 paigaldamine $2 nurjus"
#: builtin/mainmenu/modmgr.lua
msgid "Install Mod: file: \"$1\""
@ -262,9 +251,8 @@ msgid "Search"
msgstr ""
#: builtin/mainmenu/store.lua
#, fuzzy
msgid "Shortname:"
msgstr "Maailma nimi"
msgstr "Lühike nimi:"
#: builtin/mainmenu/store.lua
msgid "Successfully installed:"
@ -295,9 +283,8 @@ msgid "Previous Contributors"
msgstr "Early arendajad"
#: builtin/mainmenu/tab_credits.lua
#, fuzzy
msgid "Previous Core Developers"
msgstr "Põhiline arendaja"
msgstr "Eelmised põhilised arendajad"
#: builtin/mainmenu/tab_mods.lua
msgid "Installed Mods:"
@ -320,9 +307,8 @@ msgid "Rename"
msgstr ""
#: builtin/mainmenu/tab_mods.lua
#, fuzzy
msgid "Select Mod File:"
msgstr "Vali maailm:"
msgstr "Vali modifikatsiooni fail:"
#: builtin/mainmenu/tab_mods.lua
msgid "Uninstall selected mod"
@ -333,9 +319,8 @@ msgid "Uninstall selected modpack"
msgstr ""
#: builtin/mainmenu/tab_multiplayer.lua
#, fuzzy
msgid "Address / Port :"
msgstr "IP/Port"
msgstr "Aadress / Port:"
#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
msgid "Client"
@ -346,14 +331,12 @@ msgid "Connect"
msgstr "Liitu"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
#, fuzzy
msgid "Creative mode"
msgstr "Kujunduslik mängumood"
msgstr "Loov režiim"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
#, fuzzy
msgid "Damage enabled"
msgstr "Sisse lülitatud"
msgstr "Kahjustamine lubatud"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua
#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp
@ -361,14 +344,12 @@ msgid "Delete"
msgstr "Kustuta"
#: builtin/mainmenu/tab_multiplayer.lua
#, fuzzy
msgid "Name / Password :"
msgstr "Nimi/Parool"
msgstr "Nimi / Parool:"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
#, fuzzy
msgid "Public Serverlist"
msgstr "Avatud serverite nimekiri:"
msgstr "Avalikud serverid"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
#, fuzzy

114
po/fr/minetest.po
View File

@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: 0.0.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-08 21:23+0100\n"
"PO-Revision-Date: 2015-10-28 12:55+0200\n"
"PO-Revision-Date: 2015-11-08 22:26+0000\n"
"Last-Translator: Jean-Patrick G. <jeanpatrick.guerrero@gmail.com>\n"
"Language-Team: French <https://hosted.weblate.org/projects/minetest/minetest/"
"fr/>\n"
"Language-Team: French "
"<https://hosted.weblate.org/projects/minetest/minetest/fr/>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -421,7 +421,7 @@ msgstr "Démarrer"
#: builtin/mainmenu/tab_settings.lua
msgid "\"$1\" is not a valid flag."
msgstr ""
msgstr "\"$1\" n'est pas un drapeau valide."
#: builtin/mainmenu/tab_settings.lua
msgid "(No description of setting given)"
@ -450,6 +450,7 @@ msgstr "Activé"
#: builtin/mainmenu/tab_settings.lua
msgid "Format is 3 numbers separated by commas and inside brackets."
msgstr ""
"Le format est 3 nombres séparés par des virgules et entre les parenthèses."
#: builtin/mainmenu/tab_settings.lua
msgid ""
@ -1444,7 +1445,6 @@ msgstr ""
"reste figé(e)."
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Controls size of deserts and beaches in Mapgen v6.\n"
"When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
@ -1609,6 +1609,12 @@ msgid ""
"Note that this is not quite optimized and that smooth lighting on the\n"
"water surface doesn't work with this."
msgstr ""
"Rend la surface de l'eau légèrement plus basse, de façon à ce qu'elle ne "
"submerge pas\n"
"entièrement le bloc voisin.\n"
"Cette fonctionnalité est encore expérimentale et la lumière douce n’apparaît "
"pas à la\n"
"surface de l'eau."
#: src/settings_translation_file.cpp
msgid "Enable mod security"
@ -1764,13 +1770,12 @@ msgid "Fast movement"
msgstr "Mouvement rapide"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Fast movement (via use key).\n"
"This requires the \"fast\" privilege on the server."
msgstr ""
"Mouvement rapide (via la touche utiliser).\n"
"Nécessite le privilège \"fast\" sur un serveur. "
"Nécessite le privilège \"fast\" sur un serveur."
#: src/settings_translation_file.cpp
msgid "Field of view"
@ -1914,7 +1919,6 @@ msgid "Generate normalmaps"
msgstr "Normal mapping"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Global map generation attributes.\n"
"Flags that are not specified in the flag string are not modified from the "
@ -1924,7 +1928,7 @@ msgid ""
msgstr ""
"Attributs généraux de la génération de terrain.\n"
"Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent leurs "
"valeurs par défaut. "
"valeurs par défaut."
#: src/settings_translation_file.cpp
msgid "Graphics"
@ -2022,22 +2026,25 @@ msgid ""
"If disabled \"use\" key is used to fly fast if both fly and fast mode are "
"enabled."
msgstr ""
"Si désactivé la touche \"Utiliser\" est utilisée pour voler + mode rapide ("
"si ceux-ci sont activés)."
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"If enabled together with fly mode, player is able to fly through solid "
"nodes.\n"
"This requires the \"noclip\" privilege on the server."
msgstr ""
"Si activé avec le mode vol, le joueur sera capable de traverser les blocs "
"solides. "
"solides en volant."
#: src/settings_translation_file.cpp
msgid ""
"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down "
"and descending."
msgstr ""
"Si activé, la touche \"Utiliser\" est utilisée à la place de la touche \""
"Sneak\" pour monter ou descendre."
#: src/settings_translation_file.cpp
msgid ""
@ -2127,46 +2134,61 @@ msgid ""
"Julia set: (X,Y,Z) offsets from world centre.\n"
"Range roughly -2 to 2, multiply by j_scale for offsets in nodes."
msgstr ""
"Série Julia : décalages (X,Y,Z) à partir du centre du monde.\n"
"La portée est environ entre -2 et 2. Multiplier par j_scale pour décaler en "
"nombre de blocs."
#: src/settings_translation_file.cpp
msgid "Julia set: Approximate (X,Y,Z) scales in nodes."
msgstr ""
msgstr "Série Julia : échelles (X,Y,Z) en blocs."
#: src/settings_translation_file.cpp
msgid ""
"Julia set: Iterations of the recursive function.\n"
"Controls scale of finest detail."
msgstr ""
"Série Julia : itérations de la fonction récursive.\n"
"Contrôle l'échelle du détail le plus subtil."
#: src/settings_translation_file.cpp
msgid ""
"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
"Range roughly -2 to 2."
msgstr ""
"Série Julia : coordonnée W de la couche 3D de la forme 4D.\n"
"La portée est environ entre -2 et 2."
#: src/settings_translation_file.cpp
msgid ""
"Julia set: W value determining the 4D shape.\n"
"Range roughly -2 to 2."
msgstr ""
"Série Julia : valeur W déterminant la forme 4D.\n"
"La portée est environ entre -2 et 2."
#: src/settings_translation_file.cpp
msgid ""
"Julia set: X value determining the 4D shape.\n"
"Range roughly -2 to 2."
msgstr ""
"Série Julia : valeur X déterminant la forme 4D.\n"
"La portée est environ entre -2 et 2."
#: src/settings_translation_file.cpp
msgid ""
"Julia set: Y value determining the 4D shape.\n"
"Range roughly -2 to 2."
msgstr ""
"Série Julia : valeur Y déterminant la forme 4D.\n"
"La portée est environ entre -2 et 2."
#: src/settings_translation_file.cpp
msgid ""
"Julia set: Z value determining the 4D shape.\n"
"Range roughly -2 to 2."
msgstr ""
"Série Julia : valeur Z déterminant la forme 4D.\n"
"La portée est environ entre -2 et 2."
#: src/settings_translation_file.cpp
msgid "Jump key"
@ -2607,29 +2629,35 @@ msgid ""
"Mandelbrot set: (X,Y,Z) offsets from world centre.\n"
"Range roughly -2 to 2, multiply by m_scale for offsets in nodes."
msgstr ""
"Série Mandelbrot : décalages (X,Y,Z) à partir du centre du monde.\n"
"La portée est environ entre -2 et 2. Multiplier par m_scale pour décaler en "
"nombre de blocs."
#: src/settings_translation_file.cpp
msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes."
msgstr ""
msgstr "Série Mandelbrot : échelles (X,Y,Z) en blocs."
#: src/settings_translation_file.cpp
msgid ""
"Mandelbrot set: Iterations of the recursive function.\n"
"Controls scale of finest detail."
msgstr ""
"Série Mandelbrot : itérations de la fonction récursive.\n"
"Contrôle l'échelle du détail le plus subtil."
#: src/settings_translation_file.cpp
msgid ""
"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n"
"Range roughly -2 to 2."
msgstr ""
"Série Mandelbrot : coordonnée W de la couche 3D de la forme 4D.\n"
"La portée est environ entre -2 et 2."
#: src/settings_translation_file.cpp
msgid "Map directory"
msgstr "Chemin du monde"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Map generation attributes specific to Mapgen fractal.\n"
"'julia' selects a julia set to be generated instead of a mandelbrot set.\n"
@ -2641,10 +2669,9 @@ msgstr ""
"'ridges' sont les rivières.\n"
"Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par "
"défaut.\n"
"Les drapeaux commençant par \"non\" sont désactivés. "
"Les drapeaux commençant par \"non\" sont désactivés."
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Map generation attributes specific to Mapgen v6.\n"
"When snowbiomes are enabled jungles are enabled and the jungles flag is "
@ -2658,10 +2685,9 @@ msgstr ""
"drapeaux jungle est ignoré.\n"
"Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par "
"défaut.\n"
"Les drapeaux commençant par \"non\" sont désactivés. "
"Les drapeaux commençant par \"non\" sont désactivés."
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Map generation attributes specific to Mapgen v7.\n"
"'ridges' are the rivers.\n"
@ -2673,7 +2699,7 @@ msgstr ""
"'ridges' sont les rivières.\n"
"Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par "
"défaut.\n"
"Les drapeaux commençant par \"non\" sont désactivés. "
"Les drapeaux commençant par \"non\" sont désactivés."
#: src/settings_translation_file.cpp
msgid "Map generation limit"
@ -2712,84 +2738,76 @@ msgid "Mapgen flags"
msgstr "Drapeaux de génération de terrain"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal"
msgstr "Drapeaux de génération de terrain"
msgstr "Fractales de la génération de terrain"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal cave1 noise parameters"
msgstr "Mapgen V5 : paramètres de bruit cave1"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal cave2 noise parameters"
msgstr "Mapgen V5 : paramètre de bruit cave2"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal filler depth noise parameters"
msgstr "Mapgen V5 : paramètres de bruit sur la profondeur"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal flags"
msgstr "Drapeaux de génération de terrain"
msgstr "Drapeaux des fractales de la génération de terrain"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal julia iterations"
msgstr "Nombre d'itérations sur l'occlusion parallaxe"
msgstr "Mapgen Julia : itérations fractales"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal julia offset"
msgstr ""
msgstr "Mapgen Julia : décalages fractals"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal julia scale"
msgstr ""
msgstr "Mapgen Julia : échelles fractales"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal julia slice w"
msgstr ""
msgstr "Mapgen Julia : couche fractale W"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal julia w"
msgstr ""
msgstr "Mapgen Julia : fractale W"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal julia x"
msgstr ""
msgstr "Mapgen Julia : fractale X"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal julia y"
msgstr ""
msgstr "Mapgen Julia : fractale Y"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal julia z"
msgstr ""
msgstr "Mapgen Julia : fractale Z"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal mandelbrot iterations"
msgstr "Paquets maximum par itération"
msgstr "Mapgen Mandelbrot : itérations fractales"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal mandelbrot offset"
msgstr ""
msgstr "Mapgen Mandelbrot : décalages fractals"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal mandelbrot scale"
msgstr ""
msgstr "Mapgen Mandelbrot : échelles fractales"
#: src/settings_translation_file.cpp
msgid "Mapgen fractal mandelbrot slice w"
msgstr ""
msgstr "Mapgen Mandelbrot : couche fractale W"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal seabed noise parameters"
msgstr "Mapgen : paramètres de mélange de la température"
msgstr "Mapgen : paramètres de bruit du fond de l'eau"
#: src/settings_translation_file.cpp
msgid "Mapgen heat blend noise parameters"
@ -2970,6 +2988,12 @@ msgid ""
"Smaller values may result in a suitable spawn point not being found,\n"
"resulting in a spawn at (0, 0, 0) possibly buried underground."
msgstr ""
"Distance maximum au-dessus du niveau de l'eau où le joueur apparaît.\n"
"Des valeurs plus grandes aboutissent à des locations plus proches de (x = 0, "
"z = 0).\n"
"Des valeurs plus petites peut résulter à une location de spawn non-trouvée, "
"résultant\n"
"à une location située à (0, 0, 0) probablement enterrée sous le sol."
#: src/settings_translation_file.cpp
msgid "Maximum forceloaded blocks"
@ -3317,13 +3341,12 @@ msgid "Physics"
msgstr "Physique"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Player is able to fly without being affected by gravity.\n"
"This requires the \"fly\" privilege on the server."
msgstr ""
"Le joueur est capable de voler sans être affecté par la gravité.\n"
"Nécessite le privilège \"fly\" sur un serveur. "
"Nécessite le privilège \"fly\" sur un serveur."
#: src/settings_translation_file.cpp
msgid "Player name"
@ -3589,7 +3612,6 @@ msgid "Smooth lighting"
msgstr "Lumière douce"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Smooths camera when moving and looking around.\n"
"Useful for recording videos."
@ -3835,7 +3857,7 @@ msgstr "Synchronisation verticale de la fenêtre de jeu."
#: src/settings_translation_file.cpp
msgid "Vertical spawn range"
msgstr ""
msgstr "Portée verticale du spawn"
#: src/settings_translation_file.cpp
msgid "Video driver"

26
po/it/minetest.po
View File

@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: Minetest 0.4.9\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-08 21:23+0100\n"
"PO-Revision-Date: 2015-11-06 17:28+0000\n"
"Last-Translator: Elia Argentieri <elia.argentieri@openmailbox.org>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/minetest/"
"minetest/it/>\n"
"PO-Revision-Date: 2015-11-14 22:10+0000\n"
"Last-Translator: LelixSuperHD <lele98super@gmail.com>\n"
"Language-Team: Italian "
"<https://hosted.weblate.org/projects/minetest/minetest/it/>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -22,7 +22,7 @@ msgstr ""
#: builtin/fstk/ui.lua
msgid "An error occured in a Lua script, such as a mod:"
msgstr ""
"Si è verificato un errore in uno script Lua, come ad esempio un modulo:"
"Si è verificato un errore in uno script in Lua, come ad esempio una mod:"
#: builtin/fstk/ui.lua
msgid "An error occured:"
@ -427,7 +427,7 @@ msgstr "Avviare il gioco"
#: builtin/mainmenu/tab_settings.lua
msgid "\"$1\" is not a valid flag."
msgstr ""
msgstr "\"$1\" non è una bandiera valida."
#: builtin/mainmenu/tab_settings.lua
msgid "(No description of setting given)"
@ -442,18 +442,16 @@ msgid "Change keys"
msgstr "Cambiare i tasti"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Disabled"
msgstr "Disatt. pacch."
msgstr "Disabilitato"
#: builtin/mainmenu/tab_settings.lua
msgid "Edit"
msgstr "Modifica"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Enabled"
msgstr "attivata"
msgstr "Attivato"
#: builtin/mainmenu/tab_settings.lua
msgid "Format is 3 numbers separated by commas and inside brackets."
@ -464,6 +462,8 @@ msgid ""
"Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
"<octaves>, <persistence>"
msgstr ""
"Formato: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
"<octaves>, <persistence>"
#: builtin/mainmenu/tab_settings.lua
msgid "Games"
@ -494,9 +494,8 @@ msgid "Restore Default"
msgstr "Ripristina predefiniti"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Select path"
msgstr "Selezionare"
msgstr "Selezionare il percorso"
#: builtin/mainmenu/tab_settings.lua
msgid "Settings"
@ -541,14 +540,13 @@ msgstr "Nessuna informazione disponibile"
#: builtin/mainmenu/tab_texturepacks.lua
msgid "None"
msgstr ""
msgstr "Niente"
#: builtin/mainmenu/tab_texturepacks.lua
msgid "Select texture pack:"
msgstr "Selezionare un pacchetto di immagini:"
#: builtin/mainmenu/tab_texturepacks.lua
#, fuzzy
msgid "Texturepacks"
msgstr "Pacch. Texture"

72
po/ja/minetest.po
View File

@ -3,10 +3,10 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-08 21:23+0100\n"
"PO-Revision-Date: 2015-11-05 04:46+0000\n"
"Last-Translator: Onee Chan <i157575@trbvm.com>\n"
"Language-Team: Japanese <https://hosted.weblate.org/projects/minetest/"
"minetest/ja/>\n"
"PO-Revision-Date: 2015-11-12 02:44+0000\n"
"Last-Translator: nobb <nobb.hero+weblate@gmail.com>\n"
"Language-Team: Japanese "
"<https://hosted.weblate.org/projects/minetest/minetest/ja/>\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -43,17 +43,16 @@ msgid "Loading..."
msgstr "読み込み中..."
#: builtin/mainmenu/common.lua
#, fuzzy
msgid "Protocol version mismatch. "
msgstr "プロトコルバージョンの不一致、サーバー "
msgstr "プロトコルバージョンが一致していません。 "
#: builtin/mainmenu/common.lua
msgid "Server enforces protocol version $1. "
msgstr ""
msgstr "サーバーのプロトコルバージョンは$1が適用されます。 "
#: builtin/mainmenu/common.lua
msgid "Server supports protocol versions between $1 and $2. "
msgstr ""
msgstr "サーバーは$1から$2までのプロトコルバージョンをサポートしています。 "
#: builtin/mainmenu/common.lua
msgid "Try reenabling public serverlist and check your internet connection."
@ -61,11 +60,11 @@ msgstr "インターネット接続を確認し、公開サーバーリストを
#: builtin/mainmenu/common.lua
msgid "We only support protocol version $1."
msgstr ""
msgstr "プロトコルバージョンは$1のみサポートしています。"
#: builtin/mainmenu/common.lua
msgid "We support protocol versions between version $1 and $2."
msgstr ""
msgstr "プロトコルバージョンは$1から$2までをサポートしています。"
#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua
@ -413,72 +412,73 @@ msgstr "ゲームスタート"
#: builtin/mainmenu/tab_settings.lua
msgid "\"$1\" is not a valid flag."
msgstr ""
msgstr "\"$1\"は有効なフラグではありません。"
#: builtin/mainmenu/tab_settings.lua
msgid "(No description of setting given)"
msgstr ""
msgstr "(設定の説明はありません)"
#: builtin/mainmenu/tab_settings.lua
msgid "Browse"
msgstr ""
msgstr "参照"
#: builtin/mainmenu/tab_settings.lua
msgid "Change keys"
msgstr "操作変更"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Disabled"
msgstr "無効化"
msgstr "無効"
#: builtin/mainmenu/tab_settings.lua
msgid "Edit"
msgstr ""
msgstr "編集"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Enabled"
msgstr "有効化"
msgstr "有効"
#: builtin/mainmenu/tab_settings.lua
msgid "Format is 3 numbers separated by commas and inside brackets."
msgstr ""
msgstr "書式は、コンマとかっこで区切られた 3 つの数字です。"
#: builtin/mainmenu/tab_settings.lua
msgid ""
"Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
"<octaves>, <persistence>"
msgstr ""
"書式: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, <octaves>, "
"<persistence>"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Games"
msgstr "ゲーム"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Optionally the lacunarity can be appended with a leading comma."
msgstr ""
msgstr "空隙性随意大手カンマを付加することができます。"
#: builtin/mainmenu/tab_settings.lua
msgid "Please enter a comma seperated list of flags."
msgstr ""
msgstr "フラグのリストはカンマで区切って入力してください。"
#: builtin/mainmenu/tab_settings.lua
msgid "Please enter a valid integer."
msgstr ""
msgstr "有効な整数を入力してください。"
#: builtin/mainmenu/tab_settings.lua
msgid "Please enter a valid number."
msgstr ""
msgstr "有効な数字を入力してください。"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Possible values are: "
msgstr ""
msgstr "可能な値: "
#: builtin/mainmenu/tab_settings.lua
msgid "Restore Default"
msgstr ""
msgstr "初期設定に戻す"
#: builtin/mainmenu/tab_settings.lua
msgid "Select path"
@ -489,16 +489,17 @@ msgid "Settings"
msgstr "設定"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Show technical names"
msgstr ""
msgstr "技術名称を表示"
#: builtin/mainmenu/tab_settings.lua
msgid "The value must be greater than $1."
msgstr ""
msgstr "$1より大きな値でなければいけません。"
#: builtin/mainmenu/tab_settings.lua
msgid "The value must be lower than $1."
msgstr ""
msgstr "$1より小さい値でなければいけません。"
#: builtin/mainmenu/tab_simple_main.lua
msgid "Config mods"
@ -1185,27 +1186,30 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "A message to be displayed to all clients when the server crashes."
msgstr ""
msgstr "サーバークラッシュ時に全てのクライアントへ表示するメッセージ。"
#: src/settings_translation_file.cpp
msgid "A message to be displayed to all clients when the server shuts down."
msgstr ""
msgstr "サーバー終了時に全てのクライアントへ表示するメッセージ。"
#: src/settings_translation_file.cpp
msgid "Absolute limit of emerge queues"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Acceleration in air"
msgstr ""
msgstr "空中での加速"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Active block range"
msgstr ""
msgstr "アクティブなブロックの範囲"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Active object send range"
msgstr ""
msgstr "アクティブなオブジェクトの送信の範囲"
#: src/settings_translation_file.cpp
msgid ""

346
po/nl/minetest.po
View File

@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-08 21:23+0100\n"
"PO-Revision-Date: 2015-10-27 16:44+0200\n"
"Last-Translator: PilzAdam <PilzAdam@minetest.net>\n"
"Language-Team: Dutch <https://hosted.weblate.org/projects/minetest/minetest/"
"nl/>\n"
"PO-Revision-Date: 2015-11-11 20:55+0000\n"
"Last-Translator: Rogier <rogier777@gmail.com>\n"
"Language-Team: Dutch "
"<https://hosted.weblate.org/projects/minetest/minetest/nl/>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -28,22 +28,20 @@ msgid "An error occured:"
msgstr "Er is een fout opgetreden:"
#: builtin/fstk/ui.lua
#, fuzzy
msgid "Main menu"
msgstr "Hoofdmenu"
msgstr "Naar hoofdmenu"
#: builtin/fstk/ui.lua builtin/mainmenu/store.lua
msgid "Ok"
msgstr "Ok"
#: builtin/fstk/ui.lua
#, fuzzy
msgid "Reconnect"
msgstr "Verbinden"
msgstr "Opnieuw verbinding maken"
#: builtin/fstk/ui.lua
msgid "The server has requested a reconnect:"
msgstr ""
msgstr "De server heeft verzocht opnieuw verbinding te maken:"
#: builtin/mainmenu/common.lua src/game.cpp
msgid "Loading..."
@ -51,15 +49,15 @@ msgstr "Bezig met laden..."
#: builtin/mainmenu/common.lua
msgid "Protocol version mismatch. "
msgstr ""
msgstr "Protocol versie stemt niet overeen. "
#: builtin/mainmenu/common.lua
msgid "Server enforces protocol version $1. "
msgstr ""
msgstr "De server vereist protocol versie $1. "
#: builtin/mainmenu/common.lua
msgid "Server supports protocol versions between $1 and $2. "
msgstr ""
msgstr "De server ondersteunt protocol versies $1 tot en met $2. "
#: builtin/mainmenu/common.lua
msgid "Try reenabling public serverlist and check your internet connection."
@ -69,11 +67,11 @@ msgstr ""
#: builtin/mainmenu/common.lua
msgid "We only support protocol version $1."
msgstr ""
msgstr "Wij ondersteunen enkel protocol versie $1."
#: builtin/mainmenu/common.lua
msgid "We support protocol versions between version $1 and $2."
msgstr ""
msgstr "Wij ondersteunen protocol versies $1 tot en met $2."
#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua
@ -102,6 +100,8 @@ msgid ""
"Failed to enable mod \"$1\" as it contains disallowed characters. Only "
"chararacters [a-z0-9_] are allowed."
msgstr ""
"Mod \"$1\" kan niet gebruikt worden: de naam bevat ongeldige karakters. "
"Enkel [a-z0-9_] zijn toegestaan."
#: builtin/mainmenu/dlg_config_world.lua
msgid "Hide Game"
@ -418,37 +418,37 @@ msgstr "Start Server"
#: builtin/mainmenu/tab_settings.lua
msgid "\"$1\" is not a valid flag."
msgstr ""
msgstr "\"$1\" is geen geldige vlag."
#: builtin/mainmenu/tab_settings.lua
msgid "(No description of setting given)"
msgstr ""
msgstr "(Geen beschrijving beschikbaar)"
#: builtin/mainmenu/tab_settings.lua
msgid "Browse"
msgstr ""
msgstr "Bladeren"
#: builtin/mainmenu/tab_settings.lua
msgid "Change keys"
msgstr "Toetsen"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Disabled"
msgstr "MP uitschakelen"
msgstr "uitgeschakeld"
#: builtin/mainmenu/tab_settings.lua
msgid "Edit"
msgstr ""
msgstr "Bewerken"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Enabled"
msgstr "ingeschakeld"
#: builtin/mainmenu/tab_settings.lua
msgid "Format is 3 numbers separated by commas and inside brackets."
msgstr ""
"Formaat is 3 getallen, gescheiden door komma's en tussen vierkante haken "
"(bijvoorbeeld: [4,-34,138])."
#: builtin/mainmenu/tab_settings.lua
msgid ""
@ -461,33 +461,36 @@ msgid "Games"
msgstr "Spellen"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Optionally the lacunarity can be appended with a leading comma."
msgstr ""
"Optioneel: de lacunaritie (uit de fractal-meetkunde: een maat voor "
"hoeveelheid en grootte van 'gaten') kan aan het einde toegevoegd worden, "
"voorafgegaan door een komma."
#: builtin/mainmenu/tab_settings.lua
msgid "Please enter a comma seperated list of flags."
msgstr ""
msgstr "Geef een lijst van vlaggen, door komma's gescheiden."
#: builtin/mainmenu/tab_settings.lua
msgid "Please enter a valid integer."
msgstr ""
msgstr "Voer een geldig geheel getal in."
#: builtin/mainmenu/tab_settings.lua
msgid "Please enter a valid number."
msgstr ""
msgstr "Voer een geldig getal in."
#: builtin/mainmenu/tab_settings.lua
msgid "Possible values are: "
msgstr ""
msgstr "Mogelijke waarden zijn: "
#: builtin/mainmenu/tab_settings.lua
msgid "Restore Default"
msgstr ""
msgstr "Standaardwaarde herstellen"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Select path"
msgstr "Selecteren"
msgstr "Pad selecteren"
#: builtin/mainmenu/tab_settings.lua
msgid "Settings"
@ -495,15 +498,15 @@ msgstr "Instellingen"
#: builtin/mainmenu/tab_settings.lua
msgid "Show technical names"
msgstr ""
msgstr "Technische namen weergeven"
#: builtin/mainmenu/tab_settings.lua
msgid "The value must be greater than $1."
msgstr ""
msgstr "De waarde moet groter zijn dan $1."
#: builtin/mainmenu/tab_settings.lua
msgid "The value must be lower than $1."
msgstr ""
msgstr "De waarde moet lager zijn dan $1."
#: builtin/mainmenu/tab_simple_main.lua
msgid "Config mods"
@ -532,7 +535,7 @@ msgstr "Geen informatie aanwezig"
#: builtin/mainmenu/tab_texturepacks.lua
msgid "None"
msgstr ""
msgstr "Geen"
#: builtin/mainmenu/tab_texturepacks.lua
msgid "Select texture pack:"
@ -544,9 +547,8 @@ msgid "Texturepacks"
msgstr "Texturen"
#: src/client.cpp
#, fuzzy
msgid "Connection timed out."
msgstr "Fout bij verbinden (time out?)"
msgstr "Time-out bij opzetten verbinding."
#: src/client.cpp
msgid "Done!"
@ -677,6 +679,18 @@ msgid ""
"- touch&drag, tap 2nd finger\n"
" --> place single item to slot\n"
msgstr ""
"Standaardbesturing:\n"
"Geen menu getoond:\n"
"- enkele tik: activeren\n"
"- dubbele tik: plaats / gebruik\n"
"- vinger schuiven: rondkijken\n"
"Menu of inventaris getoond:\n"
"- dubbele tik buiten menu:\n"
" --> sluiten\n"
"- aanraken stapel of slot:\n"
" --> stapel verplaatsen\n"
"- aanraken & slepen, tik met tweede vinger\n"
" --> plaats enkel object in slot\n"
#: src/game.cpp
msgid "Exit to Menu"
@ -786,7 +800,7 @@ msgstr "Toets is al in gebruik"
msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
msgstr ""
"Sneltoetsen. (Als dit menu stuk gaat, verwijder dan instellingen uit "
"minetest.conf)."
"minetest.conf)"
#: src/guiKeyChangeMenu.cpp src/keycode.cpp
msgid "Left"
@ -794,7 +808,7 @@ msgstr "Links"
#: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
msgid "Print stacks"
msgstr "Print stacks"
msgstr "Print debug-stacks"
#: src/guiKeyChangeMenu.cpp
msgid "Range select"
@ -1150,19 +1164,21 @@ msgid "Zoom"
msgstr "Zoom"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"0 = parallax occlusion with slope information (faster).\n"
"1 = relief mapping (slower, more accurate)."
msgstr ""
"0 = parallax occlusie met helling-informatie (sneller).\n"
"1 = 'relief mapping' (lanzamer, nauwkeuriger)."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "3D clouds"
msgstr "3D wolken"
#: src/settings_translation_file.cpp
msgid "3D mode"
msgstr ""
msgstr "3D modus"
#: src/settings_translation_file.cpp
msgid ""
@ -1174,36 +1190,51 @@ msgid ""
"- topbottom: split screen top/bottom.\n"
"- sidebyside: split screen side by side."
msgstr ""
"3D ondersteuning.\n"
"Op dit moment beschikbaar:\n"
"- none: geen 3D.\n"
"- anaglyph: 3D met de kleuren cyaan en magenta.\n"
"- interlaced: 3D voor polariserend scherm (even/oneven beeldlijnen).\n"
"- topbottom: 3D met horizontaal gedeeld scherm (boven/onder).\n"
"- sidebyside: 3D met vertikaal gedeeld scherm (links/rechts)."
#: src/settings_translation_file.cpp
msgid ""
"A chosen map seed for a new map, leave empty for random.\n"
"Will be overridden when creating a new world in the main menu."
msgstr ""
"Vooringestelde zaadwaarde voor de wereld. Indien leeg, wordt een "
"willekeurige waarde gekozen.\n"
"Wanneer in het hoofdmenu een nieuwe wereld gecreëerd wordt, kan een andere "
"waarde gekozen worden."
#: src/settings_translation_file.cpp
msgid "A message to be displayed to all clients when the server crashes."
msgstr ""
"Een bericht dat wordt getoond aan alle verbonden spelers als de server "
"crasht."
#: src/settings_translation_file.cpp
msgid "A message to be displayed to all clients when the server shuts down."
msgstr ""
"Een bericht dat wordt getoond aan alle verbonden spelers als de server "
"afgesloten wordt."
#: src/settings_translation_file.cpp
msgid "Absolute limit of emerge queues"
msgstr ""
msgstr "Maximaal aantal 'emerge' blokken in de wachtrij"
#: src/settings_translation_file.cpp
msgid "Acceleration in air"
msgstr ""
msgstr "Versnelling in lucht"
#: src/settings_translation_file.cpp
msgid "Active block range"
msgstr ""
msgstr "Bereik waarbinnen blokken actief zijn"
#: src/settings_translation_file.cpp
msgid "Active object send range"
msgstr ""
msgstr "Bereik waarbinnen actieve objecten gestuurd worden"
#: src/settings_translation_file.cpp
msgid ""
@ -1211,18 +1242,27 @@ msgid ""
"Leave this blank to start a local server.\n"
"Note that the address field in the main menu overrides this setting."
msgstr ""
"Standaard serveradres waarmee verbinding gemaakt moet worden.\n"
"Indien leeg, wordt een lokale server gestart.\n"
"In het hoofdmenu kan een ander adres opgegeven worden."
#: src/settings_translation_file.cpp
msgid ""
"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
"screens."
msgstr ""
"Aangepaste DPI (dots per inch) instelling voor het scherm, bijv. voor 4k "
"schermen (niet voor X11 of Android)."
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n"
"This setting is for the client only and is ignored by the server."
msgstr ""
"Aangepaste gamma voor de licht-tabellen. Lagere waardes zijn helderder.\n"
"Deze instelling wordt enkel gebruikt door de cliënt, en wordt genegeerd door "
"de server."
#: src/settings_translation_file.cpp
msgid "Advanced"
@ -1230,7 +1270,7 @@ msgstr "Geavanceerd"
#: src/settings_translation_file.cpp
msgid "Always fly and fast"
msgstr ""
msgstr "Zet 'snel' altijd aan bij vliegen"
#: src/settings_translation_file.cpp
msgid "Ambient occlusion gamma"
@ -1243,7 +1283,7 @@ msgstr "Anisotrope Filtering"
#: src/settings_translation_file.cpp
msgid "Announce server"
msgstr ""
msgstr "Meldt server aan bij de server-lijst"
#: src/settings_translation_file.cpp
msgid ""
@ -1251,23 +1291,25 @@ msgid ""
"If you want to announce your ipv6 address, use serverlist_url = v6.servers."
"minetest.net."
msgstr ""
"URL van de serverlijst.\n"
"Voor het aanmelden van een ipv6 adres bij de minetest serverlijst, "
"configureer 'serverlist_url = v6.servers.minetest.net'."
#: src/settings_translation_file.cpp
msgid "Ask to reconnect after crash"
msgstr ""
msgstr "Vraag om de verbinding te herstellen na een server-crash"
#: src/settings_translation_file.cpp
msgid "Automaticaly report to the serverlist."
msgstr ""
msgstr "Meldt de server automatisch aan bij de serverlijst."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Backward key"
msgstr "Achteruit"
#: src/settings_translation_file.cpp
msgid "Basic"
msgstr ""
msgstr "Basis"
#: src/settings_translation_file.cpp
#, fuzzy
@ -1275,18 +1317,17 @@ msgid "Bilinear filtering"
msgstr "Bi-Lineaire Filtering"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Bind address"
msgstr "Adres"
#: src/settings_translation_file.cpp
msgid "Bits per pixel (aka color depth) in fullscreen mode."
msgstr ""
msgstr "Adres te gebruiken door lokale server"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Bits per pixel (aka color depth) in fullscreen mode."
msgstr "Aantal bits per pixel (oftewel: kleurdiepte) in full-screen modus."
#: src/settings_translation_file.cpp
msgid "Build inside player"
msgstr "Multiplayer"
msgstr "Bouwen op de plaats van de speler"
#: src/settings_translation_file.cpp
msgid "Bumpmapping"
@ -1294,39 +1335,35 @@ msgstr "Bumpmapping"
#: src/settings_translation_file.cpp
msgid "Camera smoothing"
msgstr ""
msgstr "Vloeiender maken van de camerabeweging"
#: src/settings_translation_file.cpp
msgid "Camera smoothing in cinematic mode"
msgstr ""
msgstr "Vloeiender maken van de camerabeweging (in cinematic modus)"
#: src/settings_translation_file.cpp
msgid "Camera update toggle key"
msgstr ""
msgstr "Toets voor cameraverversing aan/uit"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Chat key"
msgstr "Toetsen"
msgstr "Chat-toets"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Chat toggle key"
msgstr "Toetsen"
msgstr "Toets voor tonen/verbergen chat"
#: src/settings_translation_file.cpp
msgid "Chunk size"
msgstr ""
msgstr "Chunk-grootte"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Cinematic mode"
msgstr "Creatieve Modus"
msgstr "Cinematic modus"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Cinematic mode key"
msgstr "Creatieve Modus"
msgstr "Cinematic modus aan/uit toets"
#: src/settings_translation_file.cpp
msgid "Clean transparent textures"
@ -1338,44 +1375,44 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Climbing speed"
msgstr ""
msgstr "Klimsnelheid"
#: src/settings_translation_file.cpp
msgid "Cloud height"
msgstr ""
msgstr "Hoogte van de wolken"
#: src/settings_translation_file.cpp
msgid "Cloud radius"
msgstr ""
msgstr "Diameter van de wolken"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Clouds"
msgstr "3D wolken"
msgstr "Wolken"
#: src/settings_translation_file.cpp
msgid "Clouds are a client side effect."
msgstr ""
msgstr "Wolken bestaan enkel aan de kant van de cliënt."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Clouds in menu"
msgstr "Hoofdmenu"
msgstr "Wolken in het menu"
#: src/settings_translation_file.cpp
msgid "Colored fog"
msgstr ""
msgstr "Gekleurde mist"
#: src/settings_translation_file.cpp
msgid ""
"Comma-separated list of trusted mods that are allowed to access insecure\n"
"functions even when mod security is on (via request_insecure_environment())."
msgstr ""
"Lijst (met komma's gescheiden) van vertrouwde mods die onveilige functies "
"mogen gebruiken,\n"
"zelfs als mod-beveiliging aan staat (via request_insecure_environment())."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Command key"
msgstr "Opdracht"
msgstr "Opdracht-toets"
#: src/settings_translation_file.cpp
#, fuzzy
@ -1383,41 +1420,36 @@ msgid "Connect glass"
msgstr "Verbonden glas"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Connect to external media server"
msgstr "Verbinding met de server wordt gemaakt..."
msgstr "Gebruik van externe media-server toestaan"
#: src/settings_translation_file.cpp
msgid "Connects glass if supported by node."
msgstr ""
msgstr "Verbind glas-nodes met elkaar (indien ondersteund door het type node)."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Console alpha"
msgstr "Console"
msgstr "Console-alpha"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Console color"
msgstr "Console"
msgstr "Console-kleur"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Console key"
msgstr "Console"
msgstr "Console-toets"
#: src/settings_translation_file.cpp
msgid "Continuous forward"
msgstr ""
msgstr "Continu vooruit lopen"
#: src/settings_translation_file.cpp
msgid "Continuous forward movement (only used for testing)."
msgstr ""
msgstr "Speler loopt continu vooruit (enkel gebruikt voor testen)."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Controls"
msgstr "Control"
msgstr "Besturing"
#: src/settings_translation_file.cpp
msgid ""
@ -1425,87 +1457,96 @@ msgid ""
"Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays "
"unchanged."
msgstr ""
"Bepaalt de lengte van de dag/nacht cyclus\n"
"Voorbeeld: 72 = 20min, 360 = 4min, 1 = 24 uur, 0 = de kloktijd (dag, nacht, "
"schemering) verandert niet."
#: src/settings_translation_file.cpp
msgid ""
"Controls size of deserts and beaches in Mapgen v6.\n"
"When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
msgstr ""
"Bepaalt de grootte van woestijnen en stranden in de wereld-generator (mapgen)"
" v6.\n"
"Als 'snowbiomes' aan staat, wordt deze instelling genegeerd."
#: src/settings_translation_file.cpp
msgid "Crash message"
msgstr ""
msgstr "Crash boodschap"
#: src/settings_translation_file.cpp
msgid "Crosshair alpha"
msgstr ""
msgstr "Draadkruis-alpha"
#: src/settings_translation_file.cpp
msgid "Crosshair alpha (opaqueness, between 0 and 255)."
msgstr ""
msgstr "Draadkruis-alphawaarde. (ondoorzichtigheid; tussen 0 en 255)."
#: src/settings_translation_file.cpp
msgid "Crosshair color"
msgstr ""
msgstr "Draadkruis-kleur"
#: src/settings_translation_file.cpp
msgid "Crosshair color (R,G,B)."
msgstr ""
msgstr "Draadkruis-kleur (R,G,B)."
#: src/settings_translation_file.cpp
msgid "Crouch speed"
msgstr ""
msgstr "Snelheid bij hurken"
#: src/settings_translation_file.cpp
msgid "DPI"
msgstr ""
msgstr "Scherm DPI"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Damage"
msgstr "Schade inschakelen"
msgstr "Verwondingen"
#: src/settings_translation_file.cpp
msgid "Debug info toggle key"
msgstr ""
msgstr "Toets voor aan/uitzetten debug informatie"
#: src/settings_translation_file.cpp
msgid "Debug log level"
msgstr ""
#: src/settings_translation_file.cpp
msgid "Dedicated server step"
msgstr ""
#: src/settings_translation_file.cpp
msgid "Default acceleration"
msgstr ""
msgstr "Debug logniveau"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Dedicated server step"
msgstr "Tijdsstaplengte van de server"
#: src/settings_translation_file.cpp
msgid "Default acceleration"
msgstr "Standaardversnelling"
#: src/settings_translation_file.cpp
msgid "Default game"
msgstr "spel aanpassen"
msgstr "Standaardwereld"
#: src/settings_translation_file.cpp
msgid ""
"Default game when creating a new world.\n"
"This will be overridden when creating a world from the main menu."
msgstr ""
"Standaardnaam voor een nieuwe wereld.\n"
"In het hoofdmenu kan een andere naam opgegeven worden."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Default password"
msgstr "Nieuw wachtwoord"
msgstr "Standaardwachtwoord"
#: src/settings_translation_file.cpp
msgid "Default privileges"
msgstr ""
msgstr "Standaardrechten"
#: src/settings_translation_file.cpp
msgid ""
"Default timeout for cURL, stated in milliseconds.\n"
"Only has an effect if compiled with cURL."
msgstr ""
"Standaard time-out voor cURL, in milliseconden.\n"
"Wordt alleen gebruikt indien gecompileerd met cURL ingebouwd."
#: src/settings_translation_file.cpp
msgid ""
@ -1516,49 +1557,54 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
msgstr ""
"Maximale afstand (in blokken van 16 nodes) waarbinnen andere spelers "
"zichtbaar zijn (0 = oneindig ver)."
#: src/settings_translation_file.cpp
msgid "Delay showing tooltips, stated in milliseconds."
msgstr ""
msgstr "Vertraging bij het tonen van tooltips, in milliseconden."
#: src/settings_translation_file.cpp
msgid "Deprecated Lua API handling"
msgstr ""
msgstr "Actie bij gebruik van verouderde Lua API functies"
#: src/settings_translation_file.cpp
msgid "Descending speed"
msgstr ""
msgstr "Daalsnelheid"
#: src/settings_translation_file.cpp
msgid ""
"Description of server, to be displayed when players join and in the "
"serverlist."
msgstr ""
#: src/settings_translation_file.cpp
msgid "Desynchronize block animation"
msgstr ""
#: src/settings_translation_file.cpp
msgid "Detailed mod profile data. Useful for mod developers."
msgstr ""
#: src/settings_translation_file.cpp
msgid "Detailed mod profiling"
msgstr ""
"Beschrijving van de server. Wordt getoond in de server-lijst, en wanneer "
"spelers inloggen."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Desynchronize block animation"
msgstr "Textuur-animaties niet synchroniseren"
#: src/settings_translation_file.cpp
msgid "Detailed mod profile data. Useful for mod developers."
msgstr "Gedetailleerde profiling-data voor mods. Nuttig voor mod-ontwikkelaars."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Detailed mod profiling"
msgstr "Gedetailleerde profiling van mods"
#: src/settings_translation_file.cpp
msgid "Disable anticheat"
msgstr "Deeltjes aanzetten"
msgstr "Valsspeelbescherming uitschakelen"
#: src/settings_translation_file.cpp
msgid "Disallow empty passwords"
msgstr ""
msgstr "Lege wachtwoorden niet toestaan"
#: src/settings_translation_file.cpp
msgid "Domain name of server, to be displayed in the serverlist."
msgstr ""
msgstr "Domeinnaam van de server, wordt getoond in de serverlijst."
#: src/settings_translation_file.cpp
#, fuzzy
@ -1572,24 +1618,28 @@ msgstr "2x \"springen\" om te vliegen"
#: src/settings_translation_file.cpp
msgid "Drop item key"
msgstr ""
msgstr "Weggooi-toets"
#: src/settings_translation_file.cpp
msgid "Dump the mapgen debug infos."
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Enable a bit lower water surface, so it doesn't \"fill\" the node "
"completely.\n"
"Note that this is not quite optimized and that smooth lighting on the\n"
"water surface doesn't work with this."
msgstr ""
"Maak de wateroppervlakte iets lager, zodat het niet de hele node vult.\n"
"Dit is niet echt geoptimaliseerd, en vloeiende belichting van de\n"
"wateroppervlakte werkt niet als dit is ingeschakeld."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Enable mod security"
msgstr "Online mod opslagplaats"
msgstr "Veilige modus voor mods aanzetten"
#: src/settings_translation_file.cpp
msgid "Enable players getting damage and dying."
@ -1957,20 +2007,26 @@ msgid ""
"If enabled, actions are recorded for rollback.\n"
"This option is only read when server starts."
msgstr ""
"Indien aangeschakeld worden speleracties opgeslagen zodat ze teruggerold "
"kunnen worden.\n"
"Deze instelling wordt alleen bij het starten van de server gelezen."
#: src/settings_translation_file.cpp
msgid "If enabled, disable cheat prevention in multiplayer."
msgstr ""
msgstr "Valsspeelbescherming uitschakelen multiplayer modus."
#: src/settings_translation_file.cpp
msgid ""
"If enabled, invalid world data won't cause the server to shut down.\n"
"Only enable this if you know what you are doing."
msgstr ""
"Zorg dat de server niet stopt in geval van ongeldige wereld-data.\n"
"Alleen aan te schakelen door mensen die weten wat de consequenties zijn."
#: src/settings_translation_file.cpp
msgid "If enabled, new players cannot join with an empty password."
msgstr ""
"Spelers kunnen zich niet aanmelden zonder wachtwoord indien ingeschakeld."
#: src/settings_translation_file.cpp
msgid ""
@ -1978,14 +2034,17 @@ msgid ""
"you stand.\n"
"This is helpful when working with nodeboxes in small areas."
msgstr ""
"Indien ingeschakeld, kan een speler blokken plaatsen op de eigen positie ("
"niveau van de voeten en van de ogen).\n"
"Dit vergemakkelijkt het werken in nauwe ruimtes."
#: src/settings_translation_file.cpp
msgid "If this is set, players will always (re)spawn at the given position."
msgstr ""
msgstr "Indien ingeschakeld, dan spawnen spelers altijd op deze coördinaten."
#: src/settings_translation_file.cpp
msgid "Ignore world errors"
msgstr ""
msgstr "Wereldfouten negeren"
#: src/settings_translation_file.cpp
#, fuzzy
@ -2952,8 +3011,9 @@ msgid "Noclip"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Noclip key"
msgstr ""
msgstr "Noclip-toets"
#: src/settings_translation_file.cpp
#, fuzzy
@ -2974,7 +3034,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Number of emerge threads"
msgstr ""
msgstr "Aantal 'emerge' threads"
#: src/settings_translation_file.cpp
msgid ""
@ -2984,6 +3044,10 @@ msgid ""
"speed greatly\n"
"at the cost of slightly buggy caves."
msgstr ""
"Aantal 'emerge' threads. Standaardwaarde hangt af van het aantal processoren."
"\n"
"Op multiprocessor systemen kan dit de generatie van de wereld versnellen.\n"
"Het kan echter vreemde grotten veroorzaken."
#: src/settings_translation_file.cpp
msgid ""
@ -2991,6 +3055,12 @@ msgid ""
"This is a trade-off between sqlite transaction overhead and\n"
"memory consumption (4096=100MB, as a rule of thumb)."
msgstr ""
"Aantal extra blokken (van 16x16x16 nodes) dat door het commando '/"
"clearobjects' tegelijk\n"
"geladen mag worden.\n"
"Dit aantal is een compromis tussen snelheid enerzijds (vanwege de overhead "
"van een sqlite\n"
"transactie), en geheugengebruik anderzijds (4096 = ca. 100MB)."
#: src/settings_translation_file.cpp
msgid "Number of parallax occlusion iterations."

153
po/pl/minetest.po
View File

@ -8,16 +8,17 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-08 21:23+0100\n"
"PO-Revision-Date: 2013-10-08 21:22+0200\n"
"Last-Translator: Maciej Kasatkin <maciej.kasatkin@yahoo.com>\n"
"Language-Team: Polish <>\n"
"PO-Revision-Date: 2015-11-12 13:08+0000\n"
"Last-Translator: Maciej Kasatkin <maciej.kasatkin@o2.pl>\n"
"Language-Team: Polish "
"<https://hosted.weblate.org/projects/minetest/minetest/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 1.7-dev\n"
"X-Generator: Weblate 2.5-dev\n"
#: builtin/fstk/ui.lua
msgid "An error occured in a Lua script, such as a mod:"
@ -25,10 +26,9 @@ msgstr ""
#: builtin/fstk/ui.lua
msgid "An error occured:"
msgstr ""
msgstr "Wystąpił błąd:"
#: builtin/fstk/ui.lua
#, fuzzy
msgid "Main menu"
msgstr "Menu główne"
@ -37,13 +37,12 @@ msgid "Ok"
msgstr "OK"
#: builtin/fstk/ui.lua
#, fuzzy
msgid "Reconnect"
msgstr "Połącz"
msgstr "Połącz ponownie"
#: builtin/fstk/ui.lua
msgid "The server has requested a reconnect:"
msgstr ""
msgstr "Serwer zażądał ponownego połączenia:"
#: builtin/mainmenu/common.lua src/game.cpp
msgid "Loading..."
@ -51,27 +50,27 @@ msgstr "Ładowanie..."
#: builtin/mainmenu/common.lua
msgid "Protocol version mismatch. "
msgstr ""
msgstr "Wesje protokołu niezgodne. "
#: builtin/mainmenu/common.lua
msgid "Server enforces protocol version $1. "
msgstr ""
msgstr "Serwer narzuca wersję protokołu $1. "
#: builtin/mainmenu/common.lua
msgid "Server supports protocol versions between $1 and $2. "
msgstr ""
msgstr "Serwer wspiera wersje protokołu od $1 do $2. "
#: builtin/mainmenu/common.lua
msgid "Try reenabling public serverlist and check your internet connection."
msgstr ""
msgstr "Spróbuj włączyć ponownie publiczną listę serwerów i sprawdź połączenie."
#: builtin/mainmenu/common.lua
msgid "We only support protocol version $1."
msgstr ""
msgstr "Wspieramy tylko protokół w wersji $1."
#: builtin/mainmenu/common.lua
msgid "We support protocol versions between version $1 and $2."
msgstr ""
msgstr "Wspieramy protokół w wersji od $1 do $2."
#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua
@ -84,14 +83,12 @@ msgid "Depends:"
msgstr "Zależy od:"
#: builtin/mainmenu/dlg_config_world.lua
#, fuzzy
msgid "Disable MP"
msgstr "Wyłącz wszystkie"
msgstr "Wyłącz MP"
#: builtin/mainmenu/dlg_config_world.lua
#, fuzzy
msgid "Enable MP"
msgstr "Włącz wszystkie"
msgstr "Włącz MP"
#: builtin/mainmenu/dlg_config_world.lua
msgid "Enable all"
@ -102,6 +99,8 @@ msgid ""
"Failed to enable mod \"$1\" as it contains disallowed characters. Only "
"chararacters [a-z0-9_] are allowed."
msgstr ""
"Nie można włączyć moda \"$1\" gdyż nazwa zawiera niedozwolone znaki. "
"Dozwolone są znaki [a-z0-9_]."
#: builtin/mainmenu/dlg_config_world.lua
msgid "Hide Game"
@ -109,7 +108,7 @@ msgstr "Ukryj Grę"
#: builtin/mainmenu/dlg_config_world.lua
msgid "Hide mp content"
msgstr ""
msgstr "Ukryj zawartość MP"
#: builtin/mainmenu/dlg_config_world.lua
msgid "Mod:"
@ -138,11 +137,11 @@ msgstr "Utwórz"
#: builtin/mainmenu/dlg_create_world.lua
msgid "Download a subgame, such as minetest_game, from minetest.net"
msgstr ""
msgstr "Ściągnij podgrę, taką jak minetest_game, z minetest.net"
#: builtin/mainmenu/dlg_create_world.lua
msgid "Download one from minetest.net"
msgstr ""
msgstr "Ściągninj z minetest.net"
#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
msgid "Game"
@ -158,11 +157,11 @@ msgstr "Nie podano nazwy świata lub nie wybrano gry"
#: builtin/mainmenu/dlg_create_world.lua
msgid "Seed"
msgstr ""
msgstr "Ziarno"
#: builtin/mainmenu/dlg_create_world.lua
msgid "Warning: The minimal development test is meant for developers."
msgstr ""
msgstr "Ostrzeżenie: Gra minimalna jest przeznaczona dla dewelperów."
#: builtin/mainmenu/dlg_create_world.lua
msgid "World name"
@ -170,7 +169,7 @@ msgstr "Nazwa świata"
#: builtin/mainmenu/dlg_create_world.lua
msgid "You have no subgames installed."
msgstr ""
msgstr "Nie masz zainstalowanych żadnych podgier."
#: builtin/mainmenu/dlg_delete_mod.lua
msgid "Are you sure you want to delete \"$1\"?"
@ -209,13 +208,12 @@ msgid "Rename Modpack:"
msgstr "Zmień nazwe Paczki Modów:"
#: builtin/mainmenu/modmgr.lua
#, fuzzy
msgid ""
"\n"
"Install Mod: unsupported filetype \"$1\" or broken archive"
msgstr ""
"\n"
"Instalacja moda: nieznany typ pliku \"$1\""
"Instalacja moda: nieznany typ pliku \"$1\" lub archiwum uszkodzone"
#: builtin/mainmenu/modmgr.lua
msgid "Failed to install $1 to $2"
@ -236,11 +234,11 @@ msgstr ""
#: builtin/mainmenu/store.lua
msgid "Close store"
msgstr ""
msgstr "Zamknij sklep"
#: builtin/mainmenu/store.lua
msgid "Downloading $1, please wait..."
msgstr ""
msgstr "Ściąganie $1, czekaj..."
#: builtin/mainmenu/store.lua
msgid "Install"
@ -256,20 +254,19 @@ msgstr "Ocena"
#: builtin/mainmenu/store.lua
msgid "Search"
msgstr ""
msgstr "Szukaj"
#: builtin/mainmenu/store.lua
#, fuzzy
msgid "Shortname:"
msgstr "Nazwa świata"
msgstr "Nazwa świata:"
#: builtin/mainmenu/store.lua
msgid "Successfully installed:"
msgstr ""
msgstr "Udana instalacja:"
#: builtin/mainmenu/store.lua
msgid "Unsorted"
msgstr ""
msgstr "Nieposortowane"
#: builtin/mainmenu/store.lua
msgid "re-Install"
@ -301,18 +298,16 @@ msgid "Installed Mods:"
msgstr "Zainstalowane Mody:"
#: builtin/mainmenu/tab_mods.lua
#, fuzzy
msgid "Mod information:"
msgstr "Brak informacjii"
msgstr "Informacje o modzie:"
#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua
msgid "Mods"
msgstr "Mody"
#: builtin/mainmenu/tab_mods.lua
#, fuzzy
msgid "No mod description available"
msgstr "Brak informacjii"
msgstr "Brak informacji o modzie"
#: builtin/mainmenu/tab_mods.lua
msgid "Rename"
@ -329,12 +324,11 @@ msgstr "Usuń zaznaczony mod"
#: builtin/mainmenu/tab_mods.lua
msgid "Uninstall selected modpack"
msgstr ""
msgstr "Usuń zaznaczony modpack"
#: builtin/mainmenu/tab_multiplayer.lua
#, fuzzy
msgid "Address / Port :"
msgstr "Adres/Port"
msgstr "Adres / Port :"
#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
msgid "Client"
@ -350,9 +344,8 @@ msgid "Creative mode"
msgstr "Tryb kreatywny"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
#, fuzzy
msgid "Damage enabled"
msgstr "włączone"
msgstr "Obrażenia włączone"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua
#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp
@ -360,18 +353,16 @@ msgid "Delete"
msgstr "Usuń"
#: builtin/mainmenu/tab_multiplayer.lua
#, fuzzy
msgid "Name / Password :"
msgstr "Nazwa gracza/Hasło"
msgstr "Nazwa gracza / Hasło :"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
msgid "Public Serverlist"
msgstr "Lista publicznych serwerów"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
#, fuzzy
msgid "PvP enabled"
msgstr "włączone"
msgstr "PvP włączone"
#: builtin/mainmenu/tab_server.lua
msgid "Bind Address"
@ -400,13 +391,12 @@ msgid "New"
msgstr "Nowy"
#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
#, fuzzy
msgid "No world created or selected!"
msgstr "Nie podano nazwy świata lub nie wybrano gry"
msgstr "Nie stworzono lub nie wybrano świata!"
#: builtin/mainmenu/tab_server.lua
msgid "Port"
msgstr ""
msgstr "Port"
#: builtin/mainmenu/tab_server.lua
msgid "Public"
@ -430,43 +420,43 @@ msgstr "Rozpocznij grę/Połącz"
#: builtin/mainmenu/tab_settings.lua
msgid "\"$1\" is not a valid flag."
msgstr ""
msgstr "\"$1\" nie jest poprawną flagą."
#: builtin/mainmenu/tab_settings.lua
msgid "(No description of setting given)"
msgstr ""
msgstr "(Brak opisu ustawienia)"
#: builtin/mainmenu/tab_settings.lua
msgid "Browse"
msgstr ""
msgstr "Przeglądaj"
#: builtin/mainmenu/tab_settings.lua
msgid "Change keys"
msgstr "Zmień klawisze"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Disabled"
msgstr "Wyłącz wszystkie"
msgstr "Wyłączone"
#: builtin/mainmenu/tab_settings.lua
msgid "Edit"
msgstr ""
msgstr "Edytuj"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Enabled"
msgstr "włączone"
msgstr "Włączone"
#: builtin/mainmenu/tab_settings.lua
msgid "Format is 3 numbers separated by commas and inside brackets."
msgstr ""
msgstr "Składnia to 3 liczby oddzielone przecinkami i w nawiasach."
#: builtin/mainmenu/tab_settings.lua
msgid ""
"Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
"<octaves>, <persistence>"
msgstr ""
"Składnia: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
"<octaves>, <persistence>"
#: builtin/mainmenu/tab_settings.lua
msgid "Games"
@ -478,28 +468,27 @@ msgstr ""
#: builtin/mainmenu/tab_settings.lua
msgid "Please enter a comma seperated list of flags."
msgstr ""
msgstr "Wprowadź listę flag oddzielonych przecinkami."
#: builtin/mainmenu/tab_settings.lua
msgid "Please enter a valid integer."
msgstr ""
msgstr "Wprowadź poprawną liczbę całkowitą."
#: builtin/mainmenu/tab_settings.lua
msgid "Please enter a valid number."
msgstr ""
msgstr "Wprowadź poprawną liczbę."
#: builtin/mainmenu/tab_settings.lua
msgid "Possible values are: "
msgstr ""
msgstr "Możliwe wartości: "
#: builtin/mainmenu/tab_settings.lua
msgid "Restore Default"
msgstr ""
msgstr "Przywróć domyślne"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Select path"
msgstr "Select"
msgstr "Wybierz ścieżkę"
#: builtin/mainmenu/tab_settings.lua
msgid "Settings"
@ -507,20 +496,19 @@ msgstr "Ustawienia"
#: builtin/mainmenu/tab_settings.lua
msgid "Show technical names"
msgstr ""
msgstr "Pokaż nazwy ustawień"
#: builtin/mainmenu/tab_settings.lua
msgid "The value must be greater than $1."
msgstr ""
msgstr "Wartość musi być większa od $1."
#: builtin/mainmenu/tab_settings.lua
msgid "The value must be lower than $1."
msgstr ""
msgstr "Wartość musi być mniejsza od $1."
#: builtin/mainmenu/tab_simple_main.lua
#, fuzzy
msgid "Config mods"
msgstr "Ustaw"
msgstr "Skonfiguruj mody"
#: builtin/mainmenu/tab_simple_main.lua
#, fuzzy
@ -546,7 +534,7 @@ msgstr "Brak informacjii"
#: builtin/mainmenu/tab_texturepacks.lua
msgid "None"
msgstr ""
msgstr "Brak"
#: builtin/mainmenu/tab_texturepacks.lua
msgid "Select texture pack:"
@ -564,29 +552,27 @@ msgstr "Błąd połączenia (brak odpowiedzi?)"
#: src/client.cpp
msgid "Done!"
msgstr ""
msgstr "Zrobione!"
#: src/client.cpp
msgid "Initializing nodes"
msgstr ""
msgstr "Initializownie nod"
#: src/client.cpp
msgid "Initializing nodes..."
msgstr ""
msgstr "Initializowanie nod..."
#: src/client.cpp
msgid "Item textures..."
msgstr "Tekstury przedmiotów..."
#: src/client.cpp
#, fuzzy
msgid "Loading textures..."
msgstr "Ładowanie..."
msgstr "Ładowanie tekstur..."
#: src/client.cpp
#, fuzzy
msgid "Rebuilding shaders..."
msgstr "Sprawdzanie adresu..."
msgstr "Kompilowanie shaderów..."
#: src/client/clientlauncher.cpp
msgid "Connection error (timed out?)"
@ -610,15 +596,15 @@ msgstr "Nie wybrano świata ani adresu."
#: src/client/clientlauncher.cpp
msgid "Player name too long."
msgstr ""
msgstr "Nazwa gracza zbyt długa."
#: src/client/clientlauncher.cpp
msgid "Provided world path doesn't exist: "
msgstr ""
msgstr "Podana ścieżka do świata nie istnieje: "
#: src/fontengine.cpp
msgid "needs_fallback_font"
msgstr ""
msgstr "yes"
#: src/game.cpp
msgid ""
@ -3690,8 +3676,9 @@ msgid "cURL parallel limit"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "cURL timeout"
msgstr ""
msgstr "Limit czasu cURL"
#, fuzzy
#~ msgid "Opaque Leaves"

14
src/CMakeLists.txt
View File

@ -160,6 +160,19 @@ find_package(Lua REQUIRED)
find_package(GMP REQUIRED)
option(ENABLE_CURSES "Enable ncurses console" TRUE)
set(USE_CURSES FALSE)
if(ENABLE_CURSES)
find_package(Ncursesw)
if(CURSES_FOUND)
set(USE_CURSES TRUE)
message(STATUS "ncurses console enabled.")
include_directories(${CURSES_INCLUDE_DIRS})
else()
message(STATUS "ncurses not found!")
endif()
endif(ENABLE_CURSES)
option(ENABLE_LEVELDB "Enable LevelDB backend" TRUE)
set(USE_LEVELDB FALSE)
@ -354,6 +367,7 @@ set(common_SRCS
map.cpp
mapblock.cpp
mapgen.cpp
mapgen_flat.cpp
mapgen_fractal.cpp
mapgen_singlenode.cpp
mapgen_v5.cpp

1
src/cavegen.cpp
View File

@ -786,7 +786,6 @@ void CaveV7::carveRoute(v3f vec, float f, bool randomize_xz)
v3s16 p(cp.X + x0, cp.Y + y0, cp.Z + z0);
p += of;
if (vm->m_area.contains(p) == false)
continue;

1
src/cavegen.h
View File

@ -162,7 +162,6 @@ public:
void makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height);
void makeTunnel(bool dirswitch);
void carveRoute(v3f vec, float f, bool randomize_xz);
};
#endif

1
src/clouds.cpp
View File

@ -62,7 +62,6 @@ Clouds::Clouds(
g_settings->registerChangedCallback("enable_3d_clouds",
&cloud_3d_setting_changed, this);
m_box = core::aabbox3d<f32>(-BS*1000000,m_cloud_y-BS,-BS*1000000,
BS*1000000,m_cloud_y+BS,BS*1000000);

2
src/craftdef.cpp
View File

@ -214,7 +214,7 @@ static void craftDecrementOrReplaceInput(CraftInput &input,
for (std::vector<std::pair<std::string, std::string> >::iterator
j = pairs.begin();
j != pairs.end(); ++j) {
if (item.name == craftGetItemName(j->first, gamedef)) {
if (inputItemMatchesRecipe(item.name, j->first, gamedef->idef())) {
if (item.count == 1) {
item.deSerialize(j->second, gamedef->idef());
found_replacement = true;

2
src/defaultsettings.cpp
View File

@ -313,7 +313,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("water_level", "1");
settings->setDefault("chunksize", "5");
settings->setDefault("mg_flags", "dungeons");
settings->setDefault("mgv6_spflags", "jungles, snowbiomes");
settings->setDefault("mgv6_spflags", "jungles, snowbiomes, trees");
// IPv6
settings->setDefault("enable_ipv6", "true");

4
src/emerge.cpp
View File

@ -34,6 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "log.h"
#include "map.h"
#include "mapblock.h"
#include "mapgen_flat.h"
#include "mapgen_fractal.h"
#include "mapgen_v5.h"
#include "mapgen_v6.h"
@ -105,7 +106,8 @@ MapgenDesc g_reg_mapgens[] = {
{"v5", new MapgenFactoryV5, true},
{"v6", new MapgenFactoryV6, true},
{"v7", new MapgenFactoryV7, true},
{"fractal", new MapgenFactoryFractal, false},
{"flat", new MapgenFactoryFlat, false},
{"fractal", new MapgenFactoryFractal, true},
{"singlenode", new MapgenFactorySinglenode, false},
};

35
src/game.cpp
View File

@ -1127,26 +1127,26 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
float ypos = singleplayermode ? 0.5 : 0.1;
std::ostringstream os;
os << FORMSPEC_VERSION_STRING << PAUSE_MENU_SIZE_TAG
<< "button_exit[" << PAUSE_MENU_BUTTON_LEFT << "," << (ypos++) << ";3,0.5;btn_continue;"
os << FORMSPEC_VERSION_STRING << SIZE_TAG
<< "button_exit[4," << (ypos++) << ";3,0.5;btn_continue;"
<< strgettext("Continue") << "]";
if (!singleplayermode) {
os << "button_exit[" << PAUSE_MENU_BUTTON_LEFT << "," << (ypos++) << ";3,0.5;btn_change_password;"
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_change_password;"
<< strgettext("Change Password") << "]";
}
#ifndef __ANDROID__
os << "button_exit[" << PAUSE_MENU_BUTTON_LEFT << "," << (ypos++) << ";3,0.5;btn_sound;"
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_sound;"
<< strgettext("Sound Volume") << "]";
os << "button_exit[" << PAUSE_MENU_BUTTON_LEFT << "," << (ypos++) << ";3,0.5;btn_key_config;"
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_key_config;"
<< strgettext("Change Keys") << "]";
os << "button_exit[" << PAUSE_MENU_BUTTON_LEFT << "," << (ypos++) << ";3,0.5;btn_exit_menu;"
<< strgettext("Exit to Menu") << "]";
#endif
os << "button_exit[" << PAUSE_MENU_BUTTON_LEFT << "," << (ypos++) << ";3,0.5;btn_exit_os;"
<< strgettext("Exit") << "]"
#ifndef __ANDROID__
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_menu;"
<< strgettext("Exit to Menu") << "]";
//#endif
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_os;"
<< strgettext("Exit to OS") << "]"
<< "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";]"
<< "textarea[0.4,0.25;3.5,6;;" << PROJECT_NAME_C "\n"
<< g_build_info << "\n"
@ -1507,6 +1507,7 @@ protected:
void toggleFast(float *statustext_time);
void toggleNoClip(float *statustext_time);
void toggleCinematic(float *statustext_time);
void toggleAutorun(float *statustext_time);
void toggleChat(float *statustext_time, bool *flag);
void toggleHud(float *statustext_time, bool *flag);
@ -2635,10 +2636,8 @@ void Game::processKeyboardInput(VolatileRunFlags *flags,
if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_DROP])) {
dropSelectedItem();
// Add WoW-style autorun by toggling continuous forward.
} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_AUTORUN])) {
bool autorun_setting = g_settings->getBool("continuous_forward");
g_settings->setBool("continuous_forward", !autorun_setting);
toggleAutorun(statustext_time);
} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_INVENTORY])) {
openInventory();
} else if (input->wasKeyDown(EscapeKey) || input->wasKeyDown(CancelKey)) {
@ -2868,6 +2867,16 @@ void Game::toggleCinematic(float *statustext_time)
statustext = msg[cinematic];
}
// Add WoW-style autorun by toggling continuous forward.
void Game::toggleAutorun(float *statustext_time)
{
static const wchar_t *msg[] = { L"autorun disabled", L"autorun enabled" };
bool autorun_enabled = !g_settings->getBool("continuous_forward");
g_settings->set("continuous_forward", bool_to_cstr(autorun_enabled));
*statustext_time = 0;
statustext = msg[autorun_enabled ? 1 : 0];
}
void Game::toggleChat(float *statustext_time, bool *flag)
{

2
src/guiFormSpecMenu.cpp
View File

@ -450,7 +450,7 @@ void GUIFormSpecMenu::parseScrollBar(parserData* data, std::string element)
if (parts.size() >= 5) {
std::vector<std::string> v_pos = split(parts[0],',');
std::vector<std::string> v_dim = split(parts[1],',');
std::string name = parts[2];
std::string name = parts[3];
std::string value = parts[4];
MY_CHECKPOS("scrollbar",0);

11
src/mapgen.cpp
View File

@ -41,11 +41,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "log.h"
FlagDesc flagdesc_mapgen[] = {
{"trees", MG_TREES},
{"caves", MG_CAVES},
{"dungeons", MG_DUNGEONS},
{"flat", MG_FLAT},
{"light", MG_LIGHT},
{"trees", MG_TREES},
{"caves", MG_CAVES},
{"dungeons", MG_DUNGEONS},
{"flat", MG_FLAT},
{"light", MG_LIGHT},
{"decorations", MG_DECORATIONS},
{NULL, 0}
};

13
src/mapgen.h
View File

@ -29,11 +29,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define DEFAULT_MAPGEN "v6"
/////////////////// Mapgen flags
#define MG_TREES 0x01
#define MG_CAVES 0x02
#define MG_DUNGEONS 0x04
#define MG_FLAT 0x08
#define MG_LIGHT 0x10
#define MG_TREES 0x01
#define MG_CAVES 0x02
#define MG_DUNGEONS 0x04
#define MG_FLAT 0x08
#define MG_LIGHT 0x10
#define MG_DECORATIONS 0x20
class Settings;
class MMVManip;
@ -126,7 +127,7 @@ struct MapgenParams {
chunksize(5),
seed(0),
water_level(1),
flags(MG_TREES | MG_CAVES | MG_LIGHT),
flags(MG_CAVES | MG_LIGHT | MG_DECORATIONS),
np_biome_heat(NoiseParams(50, 50, v3f(750.0, 750.0, 750.0), 5349, 3, 0.5, 2.0)),
np_biome_heat_blend(NoiseParams(0, 1.5, v3f(8.0, 8.0, 8.0), 13, 2, 1.0, 2.0)),
np_biome_humidity(NoiseParams(50, 50, v3f(750.0, 750.0, 750.0), 842, 3, 0.5, 2.0)),

582
src/mapgen_flat.cpp Normal file
View File

@ -0,0 +1,582 @@
/*
Minetest
Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
Copyright (C) 2010-2015 paramat, Matt Gregory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "mapgen.h"
#include "voxel.h"
#include "noise.h"
#include "mapblock.h"
#include "mapnode.h"
#include "map.h"
#include "content_sao.h"
#include "nodedef.h"
#include "voxelalgorithms.h"
//#include "profiler.h" // For TimeTaker
#include "settings.h" // For g_settings
#include "emerge.h"
#include "dungeongen.h"
#include "cavegen.h"
#include "treegen.h"
#include "mg_biome.h"
#include "mg_ore.h"
#include "mg_decoration.h"
#include "mapgen_flat.h"
FlagDesc flagdesc_mapgen_flat[] = {
{"lakes", MGFLAT_LAKES},
{"hills", MGFLAT_HILLS},
{NULL, 0}
};
///////////////////////////////////////////////////////////////////////////////////////
MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge)
: Mapgen(mapgenid, params, emerge)
{
this->m_emerge = emerge;
this->bmgr = emerge->biomemgr;
//// amount of elements to skip for the next index
//// for noise/height/biome maps (not vmanip)
this->ystride = csize.X;
this->zstride = csize.X * (csize.Y + 2);
this->biomemap = new u8[csize.X * csize.Z];
this->heightmap = new s16[csize.X * csize.Z];
this->heatmap = NULL;
this->humidmap = NULL;
MapgenFlatParams *sp = (MapgenFlatParams *)params->sparams;
this->spflags = sp->spflags;
this->ground_level = sp->ground_level;
this->large_cave_depth = sp->large_cave_depth;
this->lake_threshold = sp->lake_threshold;
this->lake_steepness = sp->lake_steepness;
this->hill_threshold = sp->hill_threshold;
this->hill_steepness = sp->hill_steepness;
//// 2D noise
noise_terrain = new Noise(&sp->np_terrain, seed, csize.X, csize.Z);
noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z);
//// 3D noise
noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 2, csize.Z);
noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 2, csize.Z);
//// Biome noise
noise_heat = new Noise(&params->np_biome_heat, seed, csize.X, csize.Z);
noise_humidity = new Noise(&params->np_biome_humidity, seed, csize.X, csize.Z);
noise_heat_blend = new Noise(&params->np_biome_heat_blend, seed, csize.X, csize.Z);
noise_humidity_blend = new Noise(&params->np_biome_humidity_blend, seed, csize.X, csize.Z);
//// Resolve nodes to be used
INodeDefManager *ndef = emerge->ndef;
c_stone = ndef->getId("mapgen_stone");
c_water_source = ndef->getId("mapgen_water_source");
c_lava_source = ndef->getId("mapgen_lava_source");
c_desert_stone = ndef->getId("mapgen_desert_stone");
c_ice = ndef->getId("mapgen_ice");
c_sandstone = ndef->getId("mapgen_sandstone");
c_cobble = ndef->getId("mapgen_cobble");
c_stair_cobble = ndef->getId("mapgen_stair_cobble");
c_mossycobble = ndef->getId("mapgen_mossycobble");
c_sandstonebrick = ndef->getId("mapgen_sandstonebrick");
c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
if (c_ice == CONTENT_IGNORE)
c_ice = CONTENT_AIR;
if (c_mossycobble == CONTENT_IGNORE)
c_mossycobble = c_cobble;
if (c_stair_cobble == CONTENT_IGNORE)
c_stair_cobble = c_cobble;
if (c_sandstonebrick == CONTENT_IGNORE)
c_sandstonebrick = c_sandstone;
if (c_stair_sandstonebrick == CONTENT_IGNORE)
c_stair_sandstonebrick = c_sandstone;
}
MapgenFlat::~MapgenFlat()
{
delete noise_terrain;
delete noise_filler_depth;
delete noise_cave1;
delete noise_cave2;
delete noise_heat;
delete noise_humidity;
delete noise_heat_blend;
delete noise_humidity_blend;
delete[] heightmap;
delete[] biomemap;
}
MapgenFlatParams::MapgenFlatParams()
{
spflags = 0;
ground_level = 8;
large_cave_depth = -33;
lake_threshold = -0.45;
lake_steepness = 48.0;
hill_threshold = 0.45;
hill_steepness = 64.0;
np_terrain = NoiseParams(0, 1, v3f(600, 600, 600), 7244, 5, 0.6, 2.0);
np_filler_depth = NoiseParams(0, 1.2, v3f(150, 150, 150), 261, 3, 0.7, 2.0);
np_cave1 = NoiseParams(0, 12, v3f(128, 128, 128), 52534, 4, 0.5, 2.0);
np_cave2 = NoiseParams(0, 12, v3f(128, 128, 128), 10325, 4, 0.5, 2.0);
}
void MapgenFlatParams::readParams(const Settings *settings)
{
settings->getFlagStrNoEx("mgflat_spflags", spflags, flagdesc_mapgen_flat);
settings->getS16NoEx("mgflat_ground_level", ground_level);
settings->getS16NoEx("mgflat_large_cave_depth", large_cave_depth);
settings->getFloatNoEx("mgflat_lake_threshold", lake_threshold);
settings->getFloatNoEx("mgflat_lake_steepness", lake_steepness);
settings->getFloatNoEx("mgflat_hill_threshold", hill_threshold);
settings->getFloatNoEx("mgflat_hill_steepness", hill_steepness);
settings->getNoiseParams("mgflat_np_terrain", np_terrain);
settings->getNoiseParams("mgflat_np_filler_depth", np_filler_depth);
settings->getNoiseParams("mgflat_np_cave1", np_cave1);
settings->getNoiseParams("mgflat_np_cave2", np_cave2);
}
void MapgenFlatParams::writeParams(Settings *settings) const
{
settings->setFlagStr("mgflat_spflags", spflags, flagdesc_mapgen_flat, U32_MAX);
settings->setS16("mgflat_ground_level", ground_level);
settings->setS16("mgflat_large_cave_depth", large_cave_depth);
settings->setFloat("mgflat_lake_threshold", lake_threshold);
settings->setFloat("mgflat_lake_steepness", lake_steepness);
settings->setFloat("mgflat_hill_threshold", hill_threshold);
settings->setFloat("mgflat_hill_steepness", hill_steepness);
settings->setNoiseParams("mgflat_np_terrain", np_terrain);
settings->setNoiseParams("mgflat_np_filler_depth", np_filler_depth);
settings->setNoiseParams("mgflat_np_cave1", np_cave1);
settings->setNoiseParams("mgflat_np_cave2", np_cave2);
}
/////////////////////////////////////////////////////////////////
int MapgenFlat::getGroundLevelAtPoint(v2s16 p)
{
float n_terrain = NoisePerlin2D(&noise_terrain->np, p.X, p.Y, seed);
if ((spflags & MGFLAT_LAKES) && n_terrain < lake_threshold) {
s16 depress = (lake_threshold - n_terrain) * lake_steepness;
return ground_level - depress;
} else if ((spflags & MGFLAT_HILLS) && n_terrain > hill_threshold) {
s16 rise = (n_terrain - hill_threshold) * hill_steepness;
return ground_level + rise;
} else {
return ground_level;
}
}
void MapgenFlat::makeChunk(BlockMakeData *data)
{
// Pre-conditions
assert(data->vmanip);
assert(data->nodedef);
assert(data->blockpos_requested.X >= data->blockpos_min.X &&
data->blockpos_requested.Y >= data->blockpos_min.Y &&
data->blockpos_requested.Z >= data->blockpos_min.Z);
assert(data->blockpos_requested.X <= data->blockpos_max.X &&
data->blockpos_requested.Y <= data->blockpos_max.Y &&
data->blockpos_requested.Z <= data->blockpos_max.Z);
this->generating = true;
this->vm = data->vmanip;
this->ndef = data->nodedef;
//TimeTaker t("makeChunk");
v3s16 blockpos_min = data->blockpos_min;
v3s16 blockpos_max = data->blockpos_max;
node_min = blockpos_min * MAP_BLOCKSIZE;
node_max = (blockpos_max + v3s16(1, 1, 1)) * MAP_BLOCKSIZE - v3s16(1, 1, 1);
full_node_min = (blockpos_min - 1) * MAP_BLOCKSIZE;
full_node_max = (blockpos_max + 2) * MAP_BLOCKSIZE - v3s16(1, 1, 1);
blockseed = getBlockSeed2(full_node_min, seed);
// Make some noise
calculateNoise();
// Generate base terrain, mountains, and ridges with initial heightmaps
s16 stone_surface_max_y = generateTerrain();
// Create heightmap
updateHeightmap(node_min, node_max);
// Create biomemap at heightmap surface
bmgr->calcBiomes(csize.X, csize.Z, noise_heat->result,
noise_humidity->result, heightmap, biomemap);
// Actually place the biome-specific nodes
MgStoneType stone_type = generateBiomes(noise_heat->result, noise_humidity->result);
if (flags & MG_CAVES)
generateCaves(stone_surface_max_y);
if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
DungeonParams dp;
dp.np_rarity = nparams_dungeon_rarity;
dp.np_density = nparams_dungeon_density;
dp.np_wetness = nparams_dungeon_wetness;
dp.c_water = c_water_source;
if (stone_type == STONE) {
dp.c_cobble = c_cobble;
dp.c_moss = c_mossycobble;
dp.c_stair = c_stair_cobble;
dp.diagonal_dirs = false;
dp.mossratio = 3.0;
dp.holesize = v3s16(1, 2, 1);
dp.roomsize = v3s16(0, 0, 0);
dp.notifytype = GENNOTIFY_DUNGEON;
} else if (stone_type == DESERT_STONE) {
dp.c_cobble = c_desert_stone;
dp.c_moss = c_desert_stone;
dp.c_stair = c_desert_stone;
dp.diagonal_dirs = true;
dp.mossratio = 0.0;
dp.holesize = v3s16(2, 3, 2);
dp.roomsize = v3s16(2, 5, 2);
dp.notifytype = GENNOTIFY_TEMPLE;
} else if (stone_type == SANDSTONE) {
dp.c_cobble = c_sandstonebrick;
dp.c_moss = c_sandstonebrick;
dp.c_stair = c_sandstonebrick;
dp.diagonal_dirs = false;
dp.mossratio = 0.0;
dp.holesize = v3s16(2, 2, 2);
dp.roomsize = v3s16(2, 0, 2);
dp.notifytype = GENNOTIFY_DUNGEON;
}
DungeonGen dgen(this, &dp);
dgen.generate(blockseed, full_node_min, full_node_max);
}
// Generate the registered decorations
if (flags & MG_DECORATIONS)
m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
// Generate the registered ores
m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max);
// Sprinkle some dust on top after everything else was generated
dustTopNodes();
//printf("makeChunk: %dms\n", t.stop());
updateLiquid(&data->transforming_liquid, full_node_min, full_node_max);
if (flags & MG_LIGHT)
calcLighting(node_min - v3s16(0, 1, 0), node_max + v3s16(0, 1, 0),
full_node_min, full_node_max);
//setLighting(node_min - v3s16(1, 0, 1) * MAP_BLOCKSIZE,
// node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE, 0xFF);
this->generating = false;
}
void MapgenFlat::calculateNoise()
{
//TimeTaker t("calculateNoise", NULL, PRECISION_MICRO);
int x = node_min.X;
int y = node_min.Y - 1;
int z = node_min.Z;
if ((spflags & MGFLAT_LAKES) || (spflags & MGFLAT_HILLS))
noise_terrain->perlinMap2D(x, z);
noise_filler_depth->perlinMap2D(x, z);
if (flags & MG_CAVES) {
noise_cave1->perlinMap3D(x, y, z);
noise_cave2->perlinMap3D(x, y, z);
}
noise_heat->perlinMap2D(x, z);
noise_humidity->perlinMap2D(x, z);
noise_heat_blend->perlinMap2D(x, z);
noise_humidity_blend->perlinMap2D(x, z);
for (s32 i = 0; i < csize.X * csize.Z; i++) {
noise_heat->result[i] += noise_heat_blend->result[i];
noise_humidity->result[i] += noise_humidity_blend->result[i];
}
heatmap = noise_heat->result;
humidmap = noise_humidity->result;
//printf("calculateNoise: %dus\n", t.stop());
}
s16 MapgenFlat::generateTerrain()
{
MapNode n_air(CONTENT_AIR);
MapNode n_stone(c_stone);
MapNode n_water(c_water_source);
v3s16 em = vm->m_area.getExtent();
s16 stone_surface_max_y = -MAX_MAP_GENERATION_LIMIT;
u32 ni2d = 0;
for (s16 z = node_min.Z; z <= node_max.Z; z++)
for (s16 x = node_min.X; x <= node_max.X; x++, ni2d++) {
s16 stone_level = ground_level;
float n_terrain = 0.0f;
if ((spflags & MGFLAT_LAKES) || (spflags & MGFLAT_HILLS))
n_terrain = noise_terrain->result[ni2d];
if ((spflags & MGFLAT_LAKES) && n_terrain < lake_threshold) {
s16 depress = (lake_threshold - n_terrain) * lake_steepness;
stone_level = ground_level - depress;
} else if ((spflags & MGFLAT_HILLS) && n_terrain > hill_threshold) {
s16 rise = (n_terrain - hill_threshold) * hill_steepness;
stone_level = ground_level + rise;
}
u32 vi = vm->m_area.index(x, node_min.Y - 1, z);
for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) {
if (vm->m_data[vi].getContent() == CONTENT_IGNORE) {
if (y <= stone_level) {
vm->m_data[vi] = n_stone;
if (y > stone_surface_max_y)
stone_surface_max_y = y;
} else if (y <= water_level) {
vm->m_data[vi] = n_water;
} else {
vm->m_data[vi] = n_air;
}
}
vm->m_area.add_y(em, vi, 1);
}
}
return stone_surface_max_y;
}
MgStoneType MapgenFlat::generateBiomes(float *heat_map, float *humidity_map)
{
v3s16 em = vm->m_area.getExtent();
u32 index = 0;
MgStoneType stone_type = STONE;
for (s16 z = node_min.Z; z <= node_max.Z; z++)
for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
Biome *biome = NULL;
u16 depth_top = 0;
u16 base_filler = 0;
u16 depth_water_top = 0;
u32 vi = vm->m_area.index(x, node_max.Y, z);
// Check node at base of mapchunk above, either a node of a previously
// generated mapchunk or if not, a node of overgenerated base terrain.
content_t c_above = vm->m_data[vi + em.X].getContent();
bool air_above = c_above == CONTENT_AIR;
bool water_above = c_above == c_water_source;
// If there is air or water above enable top/filler placement, otherwise force
// nplaced to stone level by setting a number exceeding any possible filler depth.
u16 nplaced = (air_above || water_above) ? 0 : U16_MAX;
for (s16 y = node_max.Y; y >= node_min.Y; y--) {
content_t c = vm->m_data[vi].getContent();
// Biome is recalculated each time an upper surface is detected while
// working down a column. The selected biome then remains in effect for
// all nodes below until the next surface and biome recalculation.
// Biome is recalculated:
// 1. At the surface of stone below air or water.
// 2. At the surface of water below air.
// 3. When stone or water is detected but biome has not yet been calculated.
if ((c == c_stone && (air_above || water_above || !biome)) ||
(c == c_water_source && (air_above || !biome))) {
biome = bmgr->getBiome(heat_map[index], humidity_map[index], y);
depth_top = biome->depth_top;
base_filler = MYMAX(depth_top + biome->depth_filler
+ noise_filler_depth->result[index], 0);
depth_water_top = biome->depth_water_top;
// Detect stone type for dungeons during every biome calculation.
// This is more efficient than detecting per-node and will not
// miss any desert stone or sandstone biomes.
if (biome->c_stone == c_desert_stone)
stone_type = DESERT_STONE;
else if (biome->c_stone == c_sandstone)
stone_type = SANDSTONE;
}
if (c == c_stone) {
content_t c_below = vm->m_data[vi - em.X].getContent();
// If the node below isn't solid, make this node stone, so that
// any top/filler nodes above are structurally supported.
// This is done by aborting the cycle of top/filler placement
// immediately by forcing nplaced to stone level.
if (c_below == CONTENT_AIR || c_below == c_water_source)
nplaced = U16_MAX;
if (nplaced < depth_top) {
vm->m_data[vi] = MapNode(biome->c_top);
nplaced++;
} else if (nplaced < base_filler) {
vm->m_data[vi] = MapNode(biome->c_filler);
nplaced++;
} else {
vm->m_data[vi] = MapNode(biome->c_stone);
}
air_above = false;
water_above = false;
} else if (c == c_water_source) {
vm->m_data[vi] = MapNode((y > (s32)(water_level - depth_water_top)) ?
biome->c_water_top : biome->c_water);
nplaced = 0; // Enable top/filler placement for next surface
air_above = false;
water_above = true;
} else if (c == CONTENT_AIR) {
nplaced = 0; // Enable top/filler placement for next surface
air_above = true;
water_above = false;
} else { // Possible various nodes overgenerated from neighbouring mapchunks
nplaced = U16_MAX; // Disable top/filler placement
air_above = false;
water_above = false;
}
vm->m_area.add_y(em, vi, -1);
}
}
return stone_type;
}
void MapgenFlat::dustTopNodes()
{
if (node_max.Y < water_level)
return;
v3s16 em = vm->m_area.getExtent();
u32 index = 0;
for (s16 z = node_min.Z; z <= node_max.Z; z++)
for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
Biome *biome = (Biome *)bmgr->getRaw(biomemap[index]);
if (biome->c_dust == CONTENT_IGNORE)
continue;
u32 vi = vm->m_area.index(x, full_node_max.Y, z);
content_t c_full_max = vm->m_data[vi].getContent();
s16 y_start;
if (c_full_max == CONTENT_AIR) {
y_start = full_node_max.Y - 1;
} else if (c_full_max == CONTENT_IGNORE) {
vi = vm->m_area.index(x, node_max.Y + 1, z);
content_t c_max = vm->m_data[vi].getContent();
if (c_max == CONTENT_AIR)
y_start = node_max.Y;
else
continue;
} else {
continue;
}
vi = vm->m_area.index(x, y_start, z);
for (s16 y = y_start; y >= node_min.Y - 1; y--) {
if (vm->m_data[vi].getContent() != CONTENT_AIR)
break;
vm->m_area.add_y(em, vi, -1);
}
content_t c = vm->m_data[vi].getContent();
if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE && c != biome->c_dust) {
vm->m_area.add_y(em, vi, 1);
vm->m_data[vi] = MapNode(biome->c_dust);
}
}
}
void MapgenFlat::generateCaves(s16 max_stone_y)
{
if (max_stone_y >= node_min.Y) {
u32 index = 0;
for (s16 z = node_min.Z; z <= node_max.Z; z++)
for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) {
u32 vi = vm->m_area.index(node_min.X, y, z);
for (s16 x = node_min.X; x <= node_max.X; x++, vi++, index++) {
float d1 = contour(noise_cave1->result[index]);
float d2 = contour(noise_cave2->result[index]);
if (d1 * d2 > 0.4f) {
content_t c = vm->m_data[vi].getContent();
if (!ndef->get(c).is_ground_content || c == CONTENT_AIR)
continue;
vm->m_data[vi] = MapNode(CONTENT_AIR);
}
}
}
}
if (node_max.Y > large_cave_depth)
return;
PseudoRandom ps(blockseed + 21343);
u32 bruises_count = (ps.range(1, 4) == 1) ? ps.range(1, 2) : 0;
for (u32 i = 0; i < bruises_count; i++) {
CaveV5 cave(this, &ps);
cave.makeCave(node_min, node_max, max_stone_y);
}
}

125
src/mapgen_flat.h Normal file
View File

@ -0,0 +1,125 @@
/*
Minetest
Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
Copyright (C) 2010-2015 paramat, Matt Gregory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MAPGEN_FLAT_HEADER
#define MAPGEN_FLAT_HEADER
#include "mapgen.h"
/////// Mapgen Flat flags
#define MGFLAT_LAKES 0x01
#define MGFLAT_HILLS 0x02
class BiomeManager;
extern FlagDesc flagdesc_mapgen_flat[];
struct MapgenFlatParams : public MapgenSpecificParams {
u32 spflags;
s16 ground_level;
s16 large_cave_depth;
float lake_threshold;
float lake_steepness;
float hill_threshold;
float hill_steepness;
NoiseParams np_terrain;
NoiseParams np_filler_depth;
NoiseParams np_cave1;
NoiseParams np_cave2;
MapgenFlatParams();
~MapgenFlatParams() {}
void readParams(const Settings *settings);
void writeParams(Settings *settings) const;
};
class MapgenFlat : public Mapgen {
public:
EmergeManager *m_emerge;
BiomeManager *bmgr;
int ystride;
int zstride;
u32 spflags;
v3s16 node_min;
v3s16 node_max;
v3s16 full_node_min;
v3s16 full_node_max;
s16 ground_level;
s16 large_cave_depth;
float lake_threshold;
float lake_steepness;
float hill_threshold;
float hill_steepness;
Noise *noise_terrain;
Noise *noise_filler_depth;
Noise *noise_cave1;
Noise *noise_cave2;
Noise *noise_heat;
Noise *noise_humidity;
Noise *noise_heat_blend;
Noise *noise_humidity_blend;
content_t c_stone;
content_t c_water_source;
content_t c_lava_source;
content_t c_desert_stone;
content_t c_ice;
content_t c_sandstone;
content_t c_cobble;
content_t c_stair_cobble;
content_t c_mossycobble;
content_t c_sandstonebrick;
content_t c_stair_sandstonebrick;
MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge);
~MapgenFlat();
virtual void makeChunk(BlockMakeData *data);
int getGroundLevelAtPoint(v2s16 p);
void calculateNoise();
s16 generateTerrain();
MgStoneType generateBiomes(float *heat_map, float *humidity_map);
void dustTopNodes();
void generateCaves(s16 max_stone_y);
};
struct MapgenFactoryFlat : public MapgenFactory {
Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
{
return new MapgenFlat(mgid, params, emerge);
};
MapgenSpecificParams *createMapgenParams()
{
return new MapgenFlatParams();
};
};
#endif

125
src/mapgen_fractal.cpp
View File

@ -5,7 +5,7 @@ Copyright (C) 2010-2015 paramat, Matt Gregory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 3.0 of the License, or
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "content_sao.h"
#include "nodedef.h"
#include "voxelalgorithms.h"
#include "profiler.h" // For TimeTaker
//#include "profiler.h" // For TimeTaker
#include "settings.h" // For g_settings
#include "emerge.h"
#include "dungeongen.h"
@ -41,7 +41,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
FlagDesc flagdesc_mapgen_fractal[] = {
{"julia", MGFRACTAL_JULIA},
{NULL, 0}
};
@ -59,23 +58,20 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *
this->ystride = csize.X;
this->zstride = csize.X * (csize.Y + 2);
this->biomemap = new u8[csize.X * csize.Z];
this->heightmap = new s16[csize.X * csize.Z];
this->heatmap = NULL;
this->humidmap = NULL;
this->biomemap = new u8[csize.X * csize.Z];
this->heightmap = new s16[csize.X * csize.Z];
this->heatmap = NULL;
this->humidmap = NULL;
MapgenFractalParams *sp = (MapgenFractalParams *)params->sparams;
this->spflags = sp->spflags;
this->m_iterations = sp->m_iterations;
this->m_scale = sp->m_scale;
this->m_offset = sp->m_offset;
this->m_slice_w = sp->m_slice_w;
this->formula = sp->formula;
this->iterations = sp->iterations;
this->scale = sp->scale;
this->offset = sp->offset;
this->slice_w = sp->slice_w;
this->j_iterations = sp->j_iterations;
this->j_scale = sp->j_scale;
this->j_offset = sp->j_offset;
this->j_slice_w = sp->j_slice_w;
this->julia_x = sp->julia_x;
this->julia_y = sp->julia_y;
this->julia_z = sp->julia_z;
@ -145,15 +141,12 @@ MapgenFractalParams::MapgenFractalParams()
{
spflags = 0;
m_iterations = 9; // Mandelbrot set only
m_scale = v3f(1024.0, 256.0, 1024.0);
m_offset = v3f(1.75, 0.0, 0.0);
m_slice_w = 0.0;
formula = 1;
iterations = 11;
scale = v3f(4096.0, 1024.0, 4096.0);
offset = v3f(1.79, 0.0, 0.0);
slice_w = 0.0;
j_iterations = 9; // Julia set only
j_scale = v3f(2048.0, 512.0, 2048.0);
j_offset = v3f(0.0, 1.0, 0.0);
j_slice_w = 0.0;
julia_x = 0.33;
julia_y = 0.33;
julia_z = 0.33;
@ -170,15 +163,12 @@ void MapgenFractalParams::readParams(const Settings *settings)
{
settings->getFlagStrNoEx("mgfractal_spflags", spflags, flagdesc_mapgen_fractal);
settings->getU16NoEx("mgfractal_m_iterations", m_iterations);
settings->getV3FNoEx("mgfractal_m_scale", m_scale);
settings->getV3FNoEx("mgfractal_m_offset", m_offset);
settings->getFloatNoEx("mgfractal_m_slice_w", m_slice_w);
settings->getU16NoEx("mgfractal_formula", formula);
settings->getU16NoEx("mgfractal_iterations", iterations);
settings->getV3FNoEx("mgfractal_scale", scale);
settings->getV3FNoEx("mgfractal_offset", offset);
settings->getFloatNoEx("mgfractal_slice_w", slice_w);
settings->getU16NoEx("mgfractal_j_iterations", j_iterations);
settings->getV3FNoEx("mgfractal_j_scale", j_scale);
settings->getV3FNoEx("mgfractal_j_offset", j_offset);
settings->getFloatNoEx("mgfractal_j_slice_w", j_slice_w);
settings->getFloatNoEx("mgfractal_julia_x", julia_x);
settings->getFloatNoEx("mgfractal_julia_y", julia_y);
settings->getFloatNoEx("mgfractal_julia_z", julia_z);
@ -195,15 +185,12 @@ void MapgenFractalParams::writeParams(Settings *settings) const
{
settings->setFlagStr("mgfractal_spflags", spflags, flagdesc_mapgen_fractal, U32_MAX);
settings->setU16("mgfractal_m_iterations", m_iterations);
settings->setV3F("mgfractal_m_scale", m_scale);
settings->setV3F("mgfractal_m_offset", m_offset);
settings->setFloat("mgfractal_m_slice_w", m_slice_w);
settings->setU16("mgfractal_formula", formula);
settings->setU16("mgfractal_iterations", iterations);
settings->setV3F("mgfractal_scale", scale);
settings->setV3F("mgfractal_offset", offset);
settings->setFloat("mgfractal_slice_w", slice_w);
settings->setU16("mgfractal_j_iterations", j_iterations);
settings->setV3F("mgfractal_j_scale", j_scale);
settings->setV3F("mgfractal_j_offset", j_offset);
settings->setFloat("mgfractal_j_slice_w", j_slice_w);
settings->setFloat("mgfractal_julia_x", julia_x);
settings->setFloat("mgfractal_julia_y", julia_y);
settings->setFloat("mgfractal_julia_z", julia_z);
@ -248,7 +235,7 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
this->generating = true;
this->vm = data->vmanip;
this->ndef = data->nodedef;
TimeTaker t("makeChunk");
//TimeTaker t("makeChunk");
v3s16 blockpos_min = data->blockpos_min;
v3s16 blockpos_max = data->blockpos_max;
@ -322,7 +309,8 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
}
// Generate the registered decorations
m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
if (flags & MG_DECORATIONS)
m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
// Generate the registered ores
m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max);
@ -330,7 +318,7 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
// Sprinkle some dust on top after everything else was generated
dustTopNodes();
printf("makeChunk: %dms\n", t.stop());
//printf("makeChunk: %dms\n", t.stop());
updateLiquid(&data->transforming_liquid, full_node_min, full_node_max);
@ -380,34 +368,53 @@ bool MapgenFractal::getFractalAtPoint(s16 x, s16 y, s16 z)
{
float cx, cy, cz, cw, ox, oy, oz, ow;
if (spflags & MGFRACTAL_JULIA) { // Julia set
if (formula % 2 == 0) { // Julia sets, formula = 2, 4, 6, 8
cx = julia_x;
cy = julia_y;
cz = julia_z;
cw = julia_w;
ox = (float)x / j_scale.X - j_offset.X;
oy = (float)y / j_scale.Y - j_offset.Y;
oz = (float)z / j_scale.Z - j_offset.Z;
ow = j_slice_w;
} else { // Mandelbrot set
cx = (float)x / m_scale.X - m_offset.X;
cy = (float)y / m_scale.Y - m_offset.Y;
cz = (float)z / m_scale.Z - m_offset.Z;
cw = m_slice_w;
ox = (float)x / scale.X - offset.X;
oy = (float)y / scale.Y - offset.Y;
oz = (float)z / scale.Z - offset.Z;
ow = slice_w;
} else { // Mandelbrot sets, formula = 1, 3, 5, 7
cx = (float)x / scale.X - offset.X;
cy = (float)y / scale.Y - offset.Y;
cz = (float)z / scale.Z - offset.Z;
cw = slice_w;
ox = 0.0f;
oy = 0.0f;
oz = 0.0f;
ow = 0.0f;
}
u16 iterations = spflags & MGFRACTAL_JULIA ? j_iterations : m_iterations;
for (u16 iter = 0; iter < iterations; iter++) {
// 4D "Roundy" Mandelbrot set
float nx = ox * ox - oy * oy - oz * oz - ow * ow + cx;
float ny = 2.0f * (ox * oy + oz * ow) + cy;
float nz = 2.0f * (ox * oz + oy * ow) + cz;
float nw = 2.0f * (ox * ow + oy * oz) + cw;
float nx = 0.0f;
float ny = 0.0f;
float nz = 0.0f;
float nw = 0.0f;
if (formula == 1 || formula == 2) { // 4D "Roundy" Mandelbrot/Julia Set
nx = ox * ox - oy * oy - oz * oz - ow * ow + cx;
ny = 2.0f * (ox * oy + oz * ow) + cy;
nz = 2.0f * (ox * oz + oy * ow) + cz;
nw = 2.0f * (ox * ow + oy * oz) + cw;
} else if (formula == 3 || formula == 4) { // 4D "Squarry" Mandelbrot/Julia Set
nx = ox * ox - oy * oy - oz * oz - ow * ow + cx;
ny = 2.0f * (ox * oy + oz * ow) + cy;
nz = 2.0f * (ox * oz + oy * ow) + cz;
nw = 2.0f * (ox * ow - oy * oz) + cw;
} else if (formula == 5 || formula == 6) { // 4D "Mandy Cousin" Mandelbrot/Julia Set
nx = ox * ox - oy * oy - oz * oz + ow * ow + cx;
ny = 2.0f * (ox * oy + oz * ow) + cy;
nz = 2.0f * (ox * oz + oy * ow) + cz;
nw = 2.0f * (ox * ow + oy * oz) + cw;
} else if (formula == 7 || formula == 8) { // 4D "Variation" Mandelbrot/Julia Set
nx = ox * ox - oy * oy - oz * oz - ow * ow + cx;
ny = 2.0f * (ox * oy + oz * ow) + cy;
nz = 2.0f * (ox * oz - oy * ow) + cz;
nw = 2.0f * (ox * ow + oy * oz) + cw;
}
if (nx * nx + ny * ny + nz * nz + nw * nw > 4.0f)
return false;

31
src/mapgen_fractal.h
View File

@ -5,7 +5,7 @@ Copyright (C) 2010-2015 paramat, Matt Gregory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 3.0 of the License, or
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@ -25,9 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define MGFRACTAL_LARGE_CAVE_DEPTH -33
/////////////////// Mapgen Fractal flags
#define MGFRACTAL_JULIA 0x01
class BiomeManager;
extern FlagDesc flagdesc_mapgen_fractal[];
@ -36,15 +33,12 @@ extern FlagDesc flagdesc_mapgen_fractal[];
struct MapgenFractalParams : public MapgenSpecificParams {
u32 spflags;
u16 m_iterations;
v3f m_scale;
v3f m_offset;
float m_slice_w;
u16 formula;
u16 iterations;
v3f scale;
v3f offset;
float slice_w;
u16 j_iterations;
v3f j_scale;
v3f j_offset;
float j_slice_w;
float julia_x;
float julia_y;
float julia_z;
@ -76,15 +70,12 @@ public:
v3s16 full_node_min;
v3s16 full_node_max;
u16 m_iterations;
v3f m_scale;
v3f m_offset;
float m_slice_w;
u16 formula;
u16 iterations;
v3f scale;
v3f offset;
float slice_w;
u16 j_iterations;
v3f j_scale;
v3f j_offset;
float j_slice_w;
float julia_x;
float julia_y;
float julia_z;

3
src/mapgen_v5.cpp
View File

@ -296,7 +296,8 @@ void MapgenV5::makeChunk(BlockMakeData *data)
}
// Generate the registered decorations
m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
if (flags & MG_DECORATIONS)
m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
// Generate the registered ores
m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max);

15
src/mapgen_v6.cpp
View File

@ -42,6 +42,8 @@ FlagDesc flagdesc_mapgen_v6[] = {
{"biomeblend", MGV6_BIOMEBLEND},
{"mudflow", MGV6_MUDFLOW},
{"snowbiomes", MGV6_SNOWBIOMES},
{"flat", MGV6_FLAT},
{"trees", MGV6_TREES},
{NULL, 0}
};
@ -263,7 +265,7 @@ float MapgenV6::baseTerrainLevel(float terrain_base, float terrain_higher,
float MapgenV6::baseTerrainLevelFromNoise(v2s16 p)
{
if (flags & MG_FLAT)
if ((spflags & MGV6_FLAT) || (flags & MG_FLAT))
return water_level;
float terrain_base = NoisePerlin2D_PO(&noise_terrain_base->np,
@ -289,7 +291,7 @@ float MapgenV6::baseTerrainLevelFromMap(v2s16 p)
float MapgenV6::baseTerrainLevelFromMap(int index)
{
if (flags & MG_FLAT)
if ((spflags & MGV6_FLAT) || (flags & MG_FLAT))
return water_level;
float terrain_base = noise_terrain_base->result[index];
@ -386,7 +388,7 @@ bool MapgenV6::getHaveAppleTree(v2s16 p)
float MapgenV6::getMudAmount(int index)
{
if (flags & MG_FLAT)
if ((spflags & MGV6_FLAT) || (flags & MG_FLAT))
return MGV6_AVERAGE_MUD_AMOUNT;
/*return ((float)AVERAGE_MUD_AMOUNT + 2.0 * noise2d_perlin(
@ -579,11 +581,12 @@ void MapgenV6::makeChunk(BlockMakeData *data)
growGrass();
// Generate some trees, and add grass, if a jungle
if (flags & MG_TREES)
if ((spflags & MGV6_TREES) || (flags & MG_TREES))
placeTreesAndJungleGrass();
// Generate the registered decorations
m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
if (flags & MG_DECORATIONS)
m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
// Generate the registered ores
m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max);
@ -603,7 +606,7 @@ void MapgenV6::calculateNoise()
int fx = full_node_min.X;
int fz = full_node_min.Z;
if (!(flags & MG_FLAT)) {
if (!((spflags & MGV6_FLAT) || (flags & MG_FLAT))) {
noise_terrain_base->perlinMap2D_PO(x, 0.5, z, 0.5);
noise_terrain_higher->perlinMap2D_PO(x, 0.5, z, 0.5);
noise_steepness->perlinMap2D_PO(x, 0.5, z, 0.5);

2
src/mapgen_v6.h
View File

@ -36,6 +36,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define MGV6_BIOMEBLEND 0x02
#define MGV6_MUDFLOW 0x04
#define MGV6_SNOWBIOMES 0x08
#define MGV6_FLAT 0x10
#define MGV6_TREES 0x20
extern FlagDesc flagdesc_mapgen_v6[];

3
src/mapgen_v7.cpp
View File

@ -317,7 +317,8 @@ void MapgenV7::makeChunk(BlockMakeData *data)
}
// Generate the registered decorations
m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
if (flags & MG_DECORATIONS)
m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
// Generate the registered ores
m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max);

10
src/mg_decoration.cpp
View File

@ -117,7 +117,15 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
float nval = (flags & DECO_USE_NOISE) ?
NoisePerlin2D(&np, p2d_center.X, p2d_center.Y, mapseed) :
fill_ratio;
u32 deco_count = area * MYMAX(nval, 0.f);
u32 deco_count = 0;
float deco_count_f = (float)area * nval;
if (deco_count_f >= 1.f) {
deco_count = deco_count_f;
} else if (deco_count_f > 0.f) {
// For low density decorations calculate a chance for 1 decoration
if (ps.range(1000) <= deco_count_f * 1000.f)
deco_count = 1;
}
for (u32 i = 0; i < deco_count; i++) {
s16 x = ps.range(p2d_min.X, p2d_max.X);

4
src/minimap.h
View File

@ -4,7 +4,11 @@ Copyright (C) 2010-2015 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
<<<<<<< HEAD
the Free Software Foundation; either version 3.0 of the License, or
=======
the Free Software Foundation; either version 2.1 of the License, or
>>>>>>> 900db310638531a8b9fb1a587f75a02a15ae0c24
(at your option) any later version.
This program is distributed in the hope that it will be useful,

3
src/network/serverpackethandler.cpp
View File

@ -1063,7 +1063,8 @@ void Server::handleCommand_ChatMessage(NetworkPacket* pkt)
std::string name = player->getName();
std::wstring wname = narrow_to_wide(name);
std::wstring answer_to_sender = handleChat(name, wname, message, pkt->getPeerId());
std::wstring answer_to_sender = handleChat(name, wname, message,
true, pkt->getPeerId());
if (!answer_to_sender.empty()) {
// Send the answer to sender
SendChatMessage(pkt->getPeerId(), answer_to_sender);

4
src/script/cpp_api/s_player.cpp
View File

@ -193,3 +193,7 @@ void ScriptApiPlayer::on_playerReceiveFields(ServerActiveObject *player,
ScriptApiPlayer::~ScriptApiPlayer()
{
}
ScriptApiPlayer::~ScriptApiPlayer()
{
}

19
src/server.cpp
View File

@ -2753,7 +2753,8 @@ void Server::handleChatInterfaceEvent(ChatEvent *evt)
}
std::wstring Server::handleChat(const std::string &name, const std::wstring &wname,
const std::wstring &wmessage, u16 peer_id_to_avoid_sending)
const std::wstring &wmessage, bool check_shout_priv,
u16 peer_id_to_avoid_sending)
{
// If something goes wrong, this player is to blame
RollbackScopeActor rollback_scope(m_rollback,
@ -2781,10 +2782,15 @@ std::wstring Server::handleChat(const std::string &name, const std::wstring &wna
else
line += L"-!- Invalid command: " + str_split(wcmd, L' ')[0];
} else {
line += L"<";
line += wname;
line += L"> ";
line += wmessage;
if (check_shout_priv && !checkPriv(name, "shout")) {
line += L"-!- You don't have permission to shout.";
broadcast_line = false;
} else {
line += L"<";
line += wname;
line += L"> ";
line += wmessage;
}
}
/*
@ -3026,7 +3032,8 @@ bool Server::hudSetFlags(Player *player, u32 flags, u32 mask)
return false;
SendHUDSetFlags(player->peer_id, flags, mask);
player->hud_flags = flags;
player->hud_flags &= ~mask;
player->hud_flags |= flags;
PlayerSAO* playersao = player->getPlayerSAO();

1
src/server.h
View File

@ -482,6 +482,7 @@ private:
// This returns the answer to the sender of wmessage, or "" if there is none
std::wstring handleChat(const std::string &name, const std::wstring &wname,
const std::wstring &wmessage,
bool check_shout_priv = false,
u16 peer_id_to_avoid_sending = PEER_ID_INEXISTENT);
void handleAdminChat(const ChatEventChat *evt);

136
src/sound_openal.cpp
View File

@ -39,7 +39,6 @@ with this program; ifnot, write to the Free Software Foundation, Inc.,
#include <vorbis/vorbisfile.h>
#include <assert.h>
#include "log.h"
#include "filesys.h"
#include "util/numeric.h" // myrand()
#include "porting.h"
#include <map>
@ -111,31 +110,19 @@ struct SoundBuffer
std::vector<char> buffer;
};
SoundBuffer* loadOggFile(const std::string &filepath)
SoundBuffer *load_opened_ogg_file(OggVorbis_File *oggFile,
const std::string &filename_for_logging)
{
int endian = 0; // 0 for Little-Endian, 1 for Big-Endian
int bitStream;
long bytes;
char array[BUFFER_SIZE]; // Local fixed size array
vorbis_info *pInfo;
OggVorbis_File oggFile;
// Do a dumb-ass static string copy for old versions of ov_fopen
// because they expect a non-const char*
char nonconst[10000];
snprintf(nonconst, 10000, "%s", filepath.c_str());
// Try opening the given file
//if(ov_fopen(filepath.c_str(), &oggFile) != 0)
if(ov_fopen(nonconst, &oggFile) != 0)
{
infostream<<"Audio: Error opening "<<filepath<<" for decoding"<<std::endl;
return NULL;
}
SoundBuffer *snd = new SoundBuffer;
// Get some information about the OGG file
pInfo = ov_info(&oggFile, -1);
pInfo = ov_info(oggFile, -1);
// Check the number of channels... always use 16-bit samples
if(pInfo->channels == 1)
@ -150,12 +137,13 @@ SoundBuffer* loadOggFile(const std::string &filepath)
do
{
// Read up to a buffer's worth of decoded sound data
bytes = ov_read(&oggFile, array, BUFFER_SIZE, endian, 2, 1, &bitStream);
bytes = ov_read(oggFile, array, BUFFER_SIZE, endian, 2, 1, &bitStream);
if(bytes < 0)
{
ov_clear(&oggFile);
infostream<<"Audio: Error decoding "<<filepath<<std::endl;
ov_clear(oggFile);
infostream << "Audio: Error decoding "
<< filename_for_logging << std::endl;
return NULL;
}
@ -175,14 +163,100 @@ SoundBuffer* loadOggFile(const std::string &filepath)
<<"preparing sound buffer"<<std::endl;
}
infostream<<"Audio file "<<filepath<<" loaded"<<std::endl;
infostream << "Audio file "
<< filename_for_logging << " loaded" << std::endl;
// Clean up!
ov_clear(&oggFile);
ov_clear(oggFile);
return snd;
}
SoundBuffer *load_ogg_from_file(const std::string &path)
{
OggVorbis_File oggFile;
// Try opening the given file.
// This requires libvorbis >= 1.3.2, as
// previous versions expect a non-const char *
if (ov_fopen(path.c_str(), &oggFile) != 0) {
infostream << "Audio: Error opening " << path
<< " for decoding" << std::endl;
return NULL;
}
return load_opened_ogg_file(&oggFile, path);
}
struct BufferSource {
const char *buf;
size_t cur_offset;
size_t len;
};
size_t buffer_sound_read_func(void *ptr, size_t size, size_t nmemb, void *datasource)
{
BufferSource *s = (BufferSource *)datasource;
size_t copied_size = MYMIN(s->len - s->cur_offset, size);
memcpy(ptr, s->buf + s->cur_offset, copied_size);
s->cur_offset += copied_size;
return copied_size;
}
int buffer_sound_seek_func(void *datasource, ogg_int64_t offset, int whence)
{
BufferSource *s = (BufferSource *)datasource;
if (whence == SEEK_SET) {
if (offset < 0 || (size_t)MYMAX(offset, 0) >= s->len) {
// offset out of bounds
return -1;
}
s->cur_offset = offset;
return 0;
} else if (whence == SEEK_CUR) {
if ((size_t)MYMIN(-offset, 0) > s->cur_offset
|| s->cur_offset + offset > s->len) {
// offset out of bounds
return -1;
}
s->cur_offset += offset;
return 0;
}
// invalid whence param (SEEK_END doesn't have to be supported)
return -1;
}
long BufferSourceell_func(void *datasource)
{
BufferSource *s = (BufferSource *)datasource;
return s->cur_offset;
}
static ov_callbacks g_buffer_ov_callbacks = {
&buffer_sound_read_func,
&buffer_sound_seek_func,
NULL,
&BufferSourceell_func
};
SoundBuffer *load_ogg_from_buffer(const std::string &buf, const std::string &id_for_log)
{
OggVorbis_File oggFile;
BufferSource s;
s.buf = buf.c_str();
s.cur_offset = 0;
s.len = buf.size();
if (ov_open_callbacks(&s, &oggFile, NULL, 0, g_buffer_ov_callbacks) != 0) {
infostream << "Audio: Error opening " << id_for_log
<< " for decoding" << std::endl;
return NULL;
}
return load_opened_ogg_file(&oggFile, id_for_log);
}
struct PlayingSound
{
ALuint source_id;
@ -449,26 +523,18 @@ public:
bool loadSoundFile(const std::string &name,
const std::string &filepath)
{
SoundBuffer *buf = loadOggFile(filepath);
if(buf)
SoundBuffer *buf = load_ogg_from_file(filepath);
if (buf)
addBuffer(name, buf);
return false;
}
bool loadSoundData(const std::string &name,
const std::string &filedata)
{
// The vorbis API sucks; just write it to a file and use vorbisfile
// TODO: Actually load it directly from memory
std::string basepath = porting::path_user + DIR_DELIM + "cache" +
DIR_DELIM + "tmp";
std::string path = basepath + DIR_DELIM + "tmp.ogg";
verbosestream<<"OpenALSoundManager::loadSoundData(): Writing "
<<"temporary file to ["<<path<<"]"<<std::endl;
fs::CreateAllDirs(basepath);
std::ofstream of(path.c_str(), std::ios::binary);
of.write(filedata.c_str(), filedata.size());
of.close();
return loadSoundFile(name, path);
SoundBuffer *buf = load_ogg_from_buffer(filedata, name);
if (buf)
addBuffer(name, buf);
return false;
}
void updateListener(v3f pos, v3f vel, v3f at, v3f up)

2
src/util/auth.h
View File

@ -4,7 +4,7 @@ Copyright (C) 2015 est31 <MTest31@outlook.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 3.0 of the License, or
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,

2
src/wieldmesh.cpp
View File

@ -283,7 +283,7 @@ void WieldMeshSceneNode::setExtruded(const std::string &imagename,
// Customize material
video::SMaterial &material = m_meshnode->getMaterial(0);
material.setTexture(0, tsrc->getTexture(imagename));
material.setTexture(0, tsrc->getTextureForMesh(imagename));
material.TextureLayer[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE;
material.TextureLayer[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE;
material.MaterialType = m_material_type;

BIN
textures/base/pack/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB