From 01a784bd11d833724fdf826d805429d3a6f7b1f5 Mon Sep 17 00:00:00 2001 From: paramat Date: Thu, 12 May 2016 04:39:05 +0100 Subject: Documentation: Remove incorrect and excessive mapgen flags text --- minetest.conf.example | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index 5090a620b..a5ca16e51 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1046,8 +1046,6 @@ # 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. -# The default flags set in the engine are: caves, light, decorations -# The flags string modifies the engine defaults. # 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. # type: flags possible values: caves, dungeons, light, decorations, nocaves, nodungeons, nolight, nodecorations @@ -1121,8 +1119,6 @@ # Map generation attributes specific to Mapgen v6. # When snowbiomes are enabled jungles are automatically enabled, the 'jungles' flag is ignored. -# The default flags set in the engine are: biomeblend, mudflow -# The flags string modifies the engine defaults. # 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. # type: flags possible values: jungles, biomeblend, mudflow, snowbiomes, flat, trees, nojungles, nobiomeblend, nomudflow, nosnowbiomes, noflat, notrees @@ -1173,8 +1169,6 @@ # Map generation attributes specific to Mapgen v7. # The 'ridges' flag controls the rivers. -# The default flags set in the engine are: mountains, ridges -# The flags string modifies the engine defaults. # 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. # type: flags possible values: mountains, ridges, nomountains, noridges @@ -1221,8 +1215,6 @@ # Map generation attributes specific to Mapgen flat. # Occasional lakes and hills can be added to the flat world. -# The default flags set in the engine are: none -# The flags string modifies the engine defaults. # 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. # type: flags possible values: lakes, hills, , nolakes, nohills @@ -1367,8 +1359,6 @@ # 'altitude_chill' makes higher elevations colder, which may cause biome issues. # 'humid_rivers' modifies the humidity around rivers and in areas where water would tend to pool, # it may interfere with delicately adjusted biomes. -# The default flags set in the engine are: altitude_chill, humid_rivers -# The flags string modifies the engine defaults. # 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. # type: flags possible values: altitude_chill, noaltitude_chill, humid_rivers, nohumid_rivers -- cgit v1.2.3 From 9997e2030c86b938d1889ee71522bc26d01226e6 Mon Sep 17 00:00:00 2001 From: paramat Date: Tue, 21 Jun 2016 03:48:24 +0100 Subject: Mgflat/fractal/v7/valleys: Denser 3D noise tunnels Reduce spread from 96 to primes 61 and 67 (either side of 64) Prime spreads help to keep 3D noise periodic features unaligned 'cave width' 0.2 to preserve tunnel width Reduce octaves to 3 to improve network structure --- minetest.conf.example | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index a5ca16e51..35675dfe3 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1176,7 +1176,7 @@ # Controls width of tunnels, a smaller value creates wider tunnels. # type: float -# mgv7_cave_width = 0.3 +# mgv7_cave_width = 0.2 # type: noise_params # mgv7_np_terrain_base = 4, 70, (600, 600, 600), 82341, 5, 0.6, 2.0 @@ -1206,10 +1206,10 @@ # mgv7_np_ridge = 0, 1, (100, 100, 100), 6467, 4, 0.75, 2.0 # type: noise_params -# mgv7_np_cave1 = 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0 +# mgv7_np_cave1 = 0, 12, (61, 61, 61), 52534, 3, 0.5, 2.0 # type: noise_params -# mgv7_np_cave2 = 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0 +# mgv7_np_cave2 = 0, 12, (67, 67, 67), 10325, 3, 0.5, 2.0 #### Mapgen flat @@ -1230,7 +1230,7 @@ # Controls width of tunnels, a smaller value creates wider tunnels. # type: float -# mgflat_cave_width = 0.3 +# mgflat_cave_width = 0.2 # Terrain noise threshold for lakes. # Controls proportion of world area covered by lakes. @@ -1262,16 +1262,16 @@ # mgflat_np_filler_depth = 0, 1.2, (150, 150, 150), 261, 3, 0.7, 2.0 # type: noise_params -# mgflat_np_cave1 = 0, 12, (128, 128, 128), 52534, 4, 0.5, 2.0 +# mgflat_np_cave1 = 0, 12, (61, 61, 61), 52534, 3, 0.5, 2.0 # type: noise_params -# mgflat_np_cave2 = 0, 12, (128, 128, 128), 10325, 4, 0.5, 2.0 +# mgflat_np_cave2 = 0, 12, (67, 67, 67), 10325, 3, 0.5, 2.0 #### Mapgen fractal # Controls width of tunnels, a smaller value creates wider tunnels. # type: float -# mgfractal_cave_width = 0.3 +# mgfractal_cave_width = 0.2 # Choice of 18 fractals from 9 formulas. # 1 = 4D "Roundy" mandelbrot set. @@ -1346,10 +1346,10 @@ # mgfractal_np_filler_depth = 0, 1.2, (150, 150, 150), 261, 3, 0.7, 2.0 # type: noise_params -# mgfractal_np_cave1 = 0, 12, (128, 128, 128), 52534, 4, 0.5, 2.0 +# mgfractal_np_cave1 = 0, 12, (61, 61, 61), 52534, 3, 0.5, 2.0 # type: noise_params -# mgfractal_np_cave2 = 0, 12, (128, 128, 128), 10325, 4, 0.5, 2.0 +# mgfractal_np_cave2 = 0, 12, (67, 67, 67), 10325, 3, 0.5, 2.0 #### Mapgen Valleys @@ -1396,17 +1396,17 @@ # Controls width of tunnels, a smaller value creates wider tunnels. # type: float -# mgvalleys_cave_width = 0.3 +# mgvalleys_cave_width = 0.2 ##### Noises # Caves and tunnels form at the intersection of the two noises # type: noise_params -# mgvalleys_np_cave1 = 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0 +# mgvalleys_np_cave1 = 0, 12, (61, 61, 61), 52534, 3, 0.5, 2.0 # Caves and tunnels form at the intersection of the two noises # type: noise_params -# mgvalleys_np_cave2 = 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0 +# mgvalleys_np_cave2 = 0, 12, (67, 67, 67), 10325, 3, 0.5, 2.0 # The depth of dirt or other filler # type: noise_params -- cgit v1.2.3 From 538af97d8d0d0a3c50a7092c029d8585079144c4 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Mon, 4 Jul 2016 18:01:58 +0100 Subject: Remove cinematic toggle on F8 Also update cinematic mode's description to include mouse --- minetest.conf.example | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index 35675dfe3..bc0d4c527 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -38,7 +38,7 @@ # type: bool # noclip = false -# Smooths camera when moving and looking around. +# Smooths camera when looking around. Also called look or mouse smoothing. # Useful for recording videos. # type: bool # cinematic = false @@ -162,7 +162,7 @@ # Key for toggling cinematic mode. # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 # type: key -# keymap_cinematic = KEY_F8 +# keymap_cinematic = # Key for toggling display of minimap. # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 @@ -1527,4 +1527,3 @@ # type: string # modstore_details_url = https://forum.minetest.net/mmdb/mod/*/ - -- cgit v1.2.3 From 24ca754bd5cc2a6340d8a393a37b71643c6fda60 Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 12 Jul 2016 20:49:33 +0200 Subject: Update minetest.conf.example, and settings_translation_file.cpp --- minetest.conf.example | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index bc0d4c527..704501f36 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -83,6 +83,20 @@ # type: bool # continuous_forward = false +# Enable Joysticks +# type: bool +# enable_joysticks = false + +# The time in seconds it takes between repeated events +# when holding down a joystick button combination. +# type: float +# repeat_joystick_button_time = 0.17 + +# The sensitivity of the joystick axes for moving the +# ingame view frustum around. +# type: float +# joystick_frustum_sensitivity = 170 + # Key for moving the player forward. # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 # type: key @@ -732,6 +746,12 @@ # type: string # serverlist_url = servers.minetest.net +# Disable escape sequences, e.g. chat coloring. +# Use this if you want to run a server with pre-0.4.14 clients and you want to disable +# the escape sequences generated by mods. +# type: bool +# disable_escape_sequences = false + ## Network # Network port to listen (UDP). @@ -1527,3 +1547,4 @@ # type: string # modstore_details_url = https://forum.minetest.net/mmdb/mod/*/ + -- cgit v1.2.3 From f833159a68f2ff605224ed7a5ac956e5a0ca42d8 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 24 Jul 2016 17:41:36 +0200 Subject: Update minetest.conf.example and the settings translation file --- minetest.conf.example | 73 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 61 insertions(+), 12 deletions(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index 704501f36..139909d29 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -973,18 +973,6 @@ # type: enum values: legacy, log, error # deprecated_lua_api_handling = legacy -# Useful for mod developers. -# type: bool -# mod_profiling = false - -# Detailed mod profile data. Useful for mod developers. -# type: bool -# detailed_profiling = false - -# Profiler data print interval. 0 = disable. Useful for developers. -# type: int -# profiler_print_interval = 0 - # Number of extra blocks that can be loaded by /clearobjects at once. # This is a trade-off between sqlite transaction overhead and # memory consumption (4096=100MB, as a rule of thumb). @@ -1476,6 +1464,63 @@ # type: string # secure.http_mods = +## Advanced + +### Profiling + +# Load the game profiler to collect game profiling data. +# Provides a /profiler command to access the compiled profile. +# Useful for mod developers and server operators. +# type: bool +# profiler.load = false + +# The default format in which profiles are being saved, +# when calling `/profiler save [format]` without format. +# type: enum values: txt, csv, lua, json, json_pretty +# profiler.default_report_format = txt + +# The file path relative to your worldpath in which profiles will be saved to. +# +# type: string +# profiler.report_path = "" + +#### Instrumentation + +# Instrument the methods of entities on registration. +# type: bool +# instrument.entity = true + +# Instrument the action function of Active Block Modifiers on registration. +# type: bool +# instrument.abm = true + +# Instrument the action function of Loading Block Modifiers on registration. +# type: bool +# instrument.lbm = true + +# Instrument chatcommands on registration. +# type: bool +# instrument.chatcommand = true + +# Instrument global callback functions on registration. +# (anything you pass to a minetest.register_*() function) +# type: bool +# instrument.global_callback = true + +##### Advanced + +# Instrument builtin. +# This is usually only needed by core/builtin contributors +# type: bool +# instrument.builtin = false + +# Have the profiler instrument itself: +# * Instrument an empty function. +# This estimates the overhead, that instrumentation is adding (+1 function call). +# * Instrument the sampler being used to update the statistics. +# type: bool +# instrument.profiler = false + # # Client and Server # @@ -1548,3 +1593,7 @@ # type: string # modstore_details_url = https://forum.minetest.net/mmdb/mod/*/ +# Print the engine's profiling data in regular intervals (in seconds). 0 = disable. Useful for developers. +# type: int +# profiler_print_interval = 0 + -- cgit v1.2.3 From d1df09841d0eac7a88f638676b80ec848522cca5 Mon Sep 17 00:00:00 2001 From: Ben Deutsch Date: Tue, 2 Aug 2016 22:47:47 +0200 Subject: Document zoom_fov in settingtypes.txt and minetest.conf.example --- minetest.conf.example | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index 139909d29..03a917a39 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -496,6 +496,11 @@ # type: int min: 30 max: 160 # fov = 72 +# Field of view while zooming in degrees. +# This requires the "zoom" privilege on the server. +# type: int min: 15 max: 160 +# zoom_fov = 15 + # Adjust the gamma encoding for the light tables. Lower numbers are brighter. # This setting is for the client only and is ignored by the server. # type: float min: 1 max: 3 -- cgit v1.2.3 From d767f025cb0d5cca29c1f2147d2a0931a088b717 Mon Sep 17 00:00:00 2001 From: est31 Date: Mon, 22 Aug 2016 04:27:44 +0200 Subject: Client: disable pre v25 init sending by default Disable the ability to connect to old servers by default to improve password security. If people still want to connect to old (0.4.12 and earlier) servers, they can flip the send_pre_v25_init setting. Add the ability to detect if we've tried to connect to a server which only supports the pre v25 init protocol, and show an apropriate error message. Most times the error will already be catched at the serverlist level, the detection mechanism only acts as last resort, because the "Connection timed out" error message that would be shown otherwise would be very confusing. Automatic "fixing" of this condition is not desired, as it would allow for downgrade attacks. As already 161 of the 167 servers on the serverlist support the new srp based auth protocol (> 96%), the breakage should be minimal. Follow up of commit af30183124d40a969040d7de4b3a487feec466e4 "Add option to not send pre v25 init packet" Also change the pessimistic assumption of masterlist server versions to optimistic, in order to avoid buggy behaviour (favourites not in the serverlist would be denied to connect to, etc). --- minetest.conf.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index 03a917a39..48c54c320 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -261,7 +261,7 @@ # Servers starting with 0.4.13 will work, 0.4.12-dev servers may work. # Disabling this option will protect your password better. # type: bool -# send_pre_v25_init = true +# send_pre_v25_init = false # Save the map received by the client on disk. # type: bool @@ -1485,7 +1485,7 @@ # profiler.default_report_format = txt # The file path relative to your worldpath in which profiles will be saved to. -# +# # type: string # profiler.report_path = "" -- cgit v1.2.3 From 1f2ff860f53438e8afacc859cc6f48ebfcfc21db Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 30 Aug 2016 04:40:54 +0200 Subject: Update minetest.conf.example and settings_translation_file.cpp --- minetest.conf.example | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index 48c54c320..2465907ad 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -208,7 +208,7 @@ # type: key # keymap_toggle_force_fog_off = KEY_F3 -# Key for toggling the camrea update. Only used for development +# Key for toggling the camera update. Only used for development # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 # type: key # keymap_toggle_update_camera = @@ -369,7 +369,7 @@ #### Shaders -# Shaders allow advanced visul effects and may increase performance on some video cards. +# Shaders allow advanced visual effects and may increase performance on some video cards. # Thy only work with the OpenGL video backend. # type: bool # enable_shaders = true @@ -633,7 +633,7 @@ # When gui_scaling_filter_txr2img is true, copy those images # from hardware to software for scaling. When false, fall back # to the old scaling method, for video drivers that don't -# propery support downloading textures back from hardware. +# properly support downloading textures back from hardware. # type: bool # gui_scaling_filter_txr2img = true @@ -789,11 +789,11 @@ ### Advanced -# How many blocks are flying in the wire simultaneously per client. +# Maximum number of blocks that are simultaneously sent per client. # type: int # max_simultaneous_block_sends_per_client = 10 -# How many blocks are flying in the wire simultaneously for the whole server. +# Maximum number of blocks that are simultaneously sent in total. # type: int # max_simultaneous_block_sends_server_total = 40 @@ -1464,7 +1464,7 @@ # type: string # secure.trusted_mods = -# Comma-seperated list of mods that are allowed to access HTTP APIs, which +# Comma-separated list of mods that are allowed to access HTTP APIs, which # allow them to upload and download data to/from the internet. # type: string # secure.http_mods = @@ -1485,7 +1485,7 @@ # profiler.default_report_format = txt # The file path relative to your worldpath in which profiles will be saved to. -# +# # type: string # profiler.report_path = "" -- cgit v1.2.3 From 3b0f7659c75f24f4ae2411c7ab49fe150e1911c1 Mon Sep 17 00:00:00 2001 From: Rui Date: Tue, 30 Aug 2016 12:40:48 +0900 Subject: Document keymap_autorun in settingtypes.txt and minetest.conf.example (#4486) --- minetest.conf.example | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index 2465907ad..3d9b77306 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -173,6 +173,11 @@ # type: key # keymap_noclip = KEY_KEY_H +# Key for toggling autorun. +# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 +# type: key +# keymap_autorun = + # Key for toggling cinematic mode. # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 # type: key -- cgit v1.2.3 From 679c8de63ffb7119f2b99b00883bc959f5917da4 Mon Sep 17 00:00:00 2001 From: James Stevenson Date: Thu, 15 Sep 2016 11:53:17 -0400 Subject: Increase default font size by 1 --- minetest.conf.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index 3d9b77306..bedc8c579 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -655,7 +655,7 @@ # font_path = fonts/liberationsans.ttf # type: int -# font_size = 15 +# font_size = 16 # Font shadow offset, if 0 then shadow will not be drawn. # type: int @@ -663,7 +663,7 @@ # Font shadow alpha (opaqueness, between 0 and 255). # type: int min: 0 max: 255 -# font_shadow_alpha = 128 +# font_shadow_alpha = 127 # type: path # mono_font_path = fonts/liberationmono.ttf -- cgit v1.2.3 From cd2c8ade2d86f709d9a82b7ad86284cc3e9ce8c3 Mon Sep 17 00:00:00 2001 From: paramat Date: Fri, 23 Sep 2016 17:01:49 +0100 Subject: Conf.example: Re-add deleted noise parameter documentation Re-add documentation of noise parameter formats. Re-add 'mgv5_np_ground' noise parameters in group format. Both these were deleted through auto-generation of conf.example. Add note to builtin/mainmenu/dlg_settings_advanced.lua that this documentation must be preserved. --- minetest.conf.example | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index bedc8c579..9c8015625 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1099,6 +1099,25 @@ # type: int # num_emerge_threads = 1 +#### Noise parameters and formats + +# Noise parameters can be specified as a set of positional values, for example: +# Offset, scale, (spread factors), seed offset, number of octaves, persistence, lacunarity +# mgv6_np_terrain_base = -4, 20, (250, 250, 250), 82341, 5, 0.6, 2.0 +# Or the group format can be used instead, for example: +# mgv6_np_terrain_base = { +# offset = -4, +# scale = 20, +# spread = (250, 250, 250), +# seed = 82341, +# octaves = 5, +# persistence = 0.6, +# lacunarity = 2.0, +# flags = "defaults" +# } +# Only the group format supports noise flags which are needed for eased noise. +# Mgv5 uses eased noise for np_ground so this is shown in group format below. + # Noise parameters for biome API temperature, humidity and biome blend. # type: noise_params # mg_biome_np_heat = 50, 50, (750, 750, 750), 5349, 3, 0.5, 2.0 @@ -1133,6 +1152,20 @@ # type: noise_params # mgv5_np_cave2 = 0, 12, (50, 50, 50), 10325, 4, 0.5, 2.0 +# Noise parameters in group format, unsupported by advanced settings +# menu but settable in minetest.conf. +# See documentation of noise parameter formats above. +# mgv5_np_ground = { +# offset = 0, +# scale = 40, +# spread = (80, 80, 80), +# seed = 983240, +# octaves = 4, +# persistence = 0.55, +# lacunarity = 2.0, +# flags = "eased" +# } + #### Mapgen v6 # Map generation attributes specific to Mapgen v6. -- cgit v1.2.3 From d4c76258e37337ea585cf24d8e05b50a30fa307d Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Tue, 4 Oct 2016 18:17:12 +0200 Subject: Chat: new settings to prevent spam Added the following chat coreside features * Chat messages length limit * Message rate limiting * Message rate kicking Note: * handleChat now takes RemotePlayer pointer instead of u16 to remove useless lookups --- minetest.conf.example | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index 9c8015625..b1b202786 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -933,6 +933,18 @@ # type: float # server_map_save_interval = 5.3 +# Set the maximum character length of a chat message sent by clients. (0 to disable) +# type: integer +# chat_message_max_size = 500 + +# Limit a single player to send X messages per 10 seconds. (0 to disable) +# type: float +# chat_message_limit_per_10sec = 8.0 + +# Kick player if send more than X messages per 10 seconds. (0 to disable) +# type: integer +# chat_message_limit_trigger_kick = 50 + ### Physics # type: float @@ -1523,7 +1535,7 @@ # profiler.default_report_format = txt # The file path relative to your worldpath in which profiles will be saved to. -# +# # type: string # profiler.report_path = "" -- cgit v1.2.3 From b6569f1c699e8bd3dfef50c64272fdb035b43b6c Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Sun, 9 Oct 2016 10:53:13 +0200 Subject: Add missing languages to the settings --- minetest.conf.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index b1b202786..465e1d069 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1588,7 +1588,7 @@ # Set the language. Leave empty to use the system language. # A restart is required after changing this. -# type: enum values: , be, cs, da, de, eo, es, et, fr, hu, id, it, ja, jbo, ko, ky, lt, nb, nl, pl, pt, pt_BR, ro, ru, tr, uk, zh_CN, zh_TW +# type: enum values: , be, ca, cs, da, de, en, eo, es, et, fr, he, hu, id, it, ja, jbo, ko, ky, lt, nb, nl, pl, pt, pt_BR, ro, ru, sr_Cyrl, tr, uk, zh_CN, zh_TW # language = # Level of logging to be written to debug.txt: -- cgit v1.2.3 From 2ff054d0419535a9422a957d50491ed119d6eb73 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sun, 9 Oct 2016 14:36:22 -0400 Subject: Enable mod security by default --- minetest.conf.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index 465e1d069..e24d3a384 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1507,7 +1507,7 @@ # Prevent mods from doing insecure things like running shell commands. # type: bool -# secure.enable_security = false +# secure.enable_security = true # Comma-separated list of trusted mods that are allowed to access insecure # functions even when mod security is on (via request_insecure_environment()). -- cgit v1.2.3 From 63a3bb229a9ff288ab01e3e80c8477da5e84ee1e Mon Sep 17 00:00:00 2001 From: paramat Date: Wed, 19 Oct 2016 01:37:12 +0100 Subject: Changes to static object storage limit and error message Move static object storage force-delete message from errorstream to warningstream. Increase 'max objects per block' setting to 64. Add missing spaces in warning code. --- minetest.conf.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index e24d3a384..b7d705bac 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1008,7 +1008,7 @@ # Maximum number of statically stored objects in a block. # type: int -# max_objects_per_block = 49 +# max_objects_per_block = 64 # See http://www.sqlite.org/pragma.html#pragma_synchronous # type: enum values: 0, 1, 2 -- cgit v1.2.3 From c79370023b322df2195f80a2f2d2b5b142add2bb Mon Sep 17 00:00:00 2001 From: Lars Hofhansl Date: Mon, 7 Nov 2016 20:44:40 -0800 Subject: Conf.example: Document block_send_optimize_distance Add missing documentation. --- minetest.conf.example | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index b7d705bac..02f31779f 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -945,6 +945,14 @@ # type: integer # chat_message_limit_trigger_kick = 50 +# At this distance the server will aggressively optimize which blocks are sent to clients. +# Small values potentially improve performance a lot, at the expense of visible rendering glitches. +# (some blocks will not be rendered under water and in caves, as well as sometimes on land) +# Setting this to a value greater than max_block_send_distance disables this optimization. +# Stated in mapblocks (16 nodes) +# type: int +# block_send_optimize_distance = 4 + ### Physics # type: float -- cgit v1.2.3 From bc3980e1d69ca9f848f80eb7386525fa4fb326cd Mon Sep 17 00:00:00 2001 From: paramat Date: Fri, 16 Sep 2016 04:59:25 +0100 Subject: Mgv7: Add optional floatlands, disabled by default --- minetest.conf.example | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index 02f31779f..361311ba0 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1239,16 +1239,35 @@ #### Mapgen v7 # Map generation attributes specific to Mapgen v7. -# The 'ridges' flag controls the rivers. +# The 'ridges' flag enables the rivers. +# Floatlands are currently experimental and subject to change. # 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. -# type: flags possible values: mountains, ridges, nomountains, noridges +# type: flags possible values: mountains, ridges, floatlands, +# nomountains, noridges, nofloatlands # mgv7_spflags = mountains,ridges # Controls width of tunnels, a smaller value creates wider tunnels. # type: float # mgv7_cave_width = 0.2 +# Controls the density of floatland mountain terrain. +# Is an offset added to the 'np_mountain' noise value. +# type: float +# mgv7_float_mount_density = 0.6 + +# Typical maximum height, above and below midpoint, of floatland mountain terrain. +# type: float +# mgv7_float_mount_height = 128.0 + +# Y-level of floatland midpoint and lake surface. +# type: int +# mgv7_floatland_level = 1280 + +# Y-level to which floatland shadows extend. +# type: int +# mgv7_shadow_limit = 1024 + # type: noise_params # mgv7_np_terrain_base = 4, 70, (600, 600, 600), 82341, 5, 0.6, 2.0 @@ -1270,6 +1289,12 @@ # type: noise_params # mgv7_np_ridge_uwater = 0, 1, (1000, 1000, 1000), 85039, 5, 0.6, 2.0 +# type: noise_params +# mgv7_np_floatland_base = -0.6, 1.5, (600, 600, 600), 114, 5, 0.6, 2.0 + +# type: noise_params +# mgv7_np_float_base_height = 48, 24, (300, 300, 300), 907, 4, 0.7, 2.0 + # type: noise_params # mgv7_np_mountain = -0.6, 1, (250, 350, 250), 5333, 5, 0.63, 2.0 -- cgit v1.2.3 From 075833e39368e63e06889f21140f816420e83541 Mon Sep 17 00:00:00 2001 From: Lars Hofhansl Date: Sat, 3 Dec 2016 21:43:25 -0800 Subject: Fog: Make fraction of visible distance at which fog starts configurable Optimise the fetching of global settings 'camera_smoothing', 'cinematic' and 'cinematic_camera_smoothing'. Cache 'cam_smoothing'. --- minetest.conf.example | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index 361311ba0..90d7af0a3 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -615,6 +615,10 @@ # type: bool # inventory_items_animations = false +# Fraction of the visible distance at which fog starts to be rendered +# Range 0 - 0.99 +# fog_start = 0.4 + ### Menus # Use a cloud animation for the main menu background. -- cgit v1.2.3 From 02112f84e2102182816ffa48d5444a7321730936 Mon Sep 17 00:00:00 2001 From: Rogier Date: Sun, 11 Dec 2016 00:23:32 +0100 Subject: View range: Set maximum to 4000 nodes The network protocol does not support larger than 255 mapblocks. --- minetest.conf.example | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index 90d7af0a3..f0e5f1d47 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -473,8 +473,7 @@ # pause_fps_max = 20 # View distance in nodes. -# Min = 20 -# type: int +# type: int min: 20 max: 4000 # viewing_range = 100 # Width component of the initial window size. -- cgit v1.2.3 From 0d94bfabcc71efac20210746430a2b9e401425b1 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Mon, 12 Dec 2016 17:10:16 +0100 Subject: Mgv7: Change default cave width to 0.09 --- minetest.conf.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index f0e5f1d47..e372e5833 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1252,7 +1252,7 @@ # Controls width of tunnels, a smaller value creates wider tunnels. # type: float -# mgv7_cave_width = 0.2 +# mgv7_cave_width = 0.09 # Controls the density of floatland mountain terrain. # Is an offset added to the 'np_mountain' noise value. -- cgit v1.2.3 From 211d919b546e25e798982dd8df24ec82ecee2d6b Mon Sep 17 00:00:00 2001 From: est31 Date: Wed, 14 Dec 2016 00:15:11 +0100 Subject: Update minetest.conf.example and settings_translation_file.cpp --- minetest.conf.example | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index e372e5833..bdd28cda6 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -615,7 +615,7 @@ # inventory_items_animations = false # Fraction of the visible distance at which fog starts to be rendered -# Range 0 - 0.99 +# type: float min: 0 max: 0.99 # fog_start = 0.4 ### Menus @@ -936,26 +936,6 @@ # type: float # server_map_save_interval = 5.3 -# Set the maximum character length of a chat message sent by clients. (0 to disable) -# type: integer -# chat_message_max_size = 500 - -# Limit a single player to send X messages per 10 seconds. (0 to disable) -# type: float -# chat_message_limit_per_10sec = 8.0 - -# Kick player if send more than X messages per 10 seconds. (0 to disable) -# type: integer -# chat_message_limit_trigger_kick = 50 - -# At this distance the server will aggressively optimize which blocks are sent to clients. -# Small values potentially improve performance a lot, at the expense of visible rendering glitches. -# (some blocks will not be rendered under water and in caves, as well as sometimes on land) -# Setting this to a value greater than max_block_send_distance disables this optimization. -# Stated in mapblocks (16 nodes) -# type: int -# block_send_optimize_distance = 4 - ### Physics # type: float @@ -1060,6 +1040,14 @@ # type: float # liquid_update = 1.0 +# At this distance the server will aggressively optimize which blocks are sent to clients. +# Small values potentially improve performance a lot, at the expense of visible rendering glitches. +# (some blocks will not be rendered under water and in caves, as well as sometimes on land) +# Setting this to a value greater than max_block_send_distance disables this optimization. +# Stated in mapblocks (16 nodes) +# type: int min: 2 +# block_send_optimize_distance = 4 + ## Mapgen # Name of map generator to be used when creating a new world. @@ -1246,8 +1234,7 @@ # Floatlands are currently experimental and subject to change. # 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. -# type: flags possible values: mountains, ridges, floatlands, -# nomountains, noridges, nofloatlands +# type: flags possible values: mountains, ridges, floatlands, nomountains, noridges, nofloatlands # mgv7_spflags = mountains,ridges # Controls width of tunnels, a smaller value creates wider tunnels. @@ -1571,7 +1558,7 @@ # profiler.default_report_format = txt # The file path relative to your worldpath in which profiles will be saved to. -# +# # type: string # profiler.report_path = "" -- cgit v1.2.3 From f8408398f56b19ea277cb5921f0843ba06002574 Mon Sep 17 00:00:00 2001 From: paramat Date: Tue, 13 Dec 2016 04:08:23 +0000 Subject: Cavegen: Wider tunnels in mgflat, mgfractal, mgvalleys As mgv7 is now the default mapgen i re-checked its tunnel width on request, discovered they needed to be wider, and have made this change. This commit widens the identical 3D noise tunnels in the other mapgens in exactly the same way. --- minetest.conf.example | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index bdd28cda6..ff365466f 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1316,7 +1316,7 @@ # Controls width of tunnels, a smaller value creates wider tunnels. # type: float -# mgflat_cave_width = 0.2 +# mgflat_cave_width = 0.09 # Terrain noise threshold for lakes. # Controls proportion of world area covered by lakes. @@ -1357,7 +1357,7 @@ # Controls width of tunnels, a smaller value creates wider tunnels. # type: float -# mgfractal_cave_width = 0.2 +# mgfractal_cave_width = 0.09 # Choice of 18 fractals from 9 formulas. # 1 = 4D "Roundy" mandelbrot set. @@ -1482,7 +1482,7 @@ # Controls width of tunnels, a smaller value creates wider tunnels. # type: float -# mgvalleys_cave_width = 0.2 +# mgvalleys_cave_width = 0.09 ##### Noises -- cgit v1.2.3 From 78bf7c46e5fe8845e9a9f65b98db32b0ff398ad3 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Thu, 15 Dec 2016 20:55:41 -0800 Subject: Mapgen: Make mgv7 the default in UI The actual menu default comes from defaultsettings.cpp. --- minetest.conf.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index ff365466f..6c7d1e66b 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1053,7 +1053,7 @@ # Name of map generator to be used when creating a new world. # Creating a world in the main menu will override this. # type: enum values: v5, v6, v7, flat, valleys, fractal, singlenode -# mg_name = v6 +# mg_name = v7 # Water surface level of the world. # type: int -- cgit v1.2.3 From 09f1a0c1ff8b5d73443603d85fccc3eb25cf4650 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Wed, 21 Dec 2016 14:04:46 +0100 Subject: Disable mod security by default (closes #4944) --- minetest.conf.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'minetest.conf.example') diff --git a/minetest.conf.example b/minetest.conf.example index 6c7d1e66b..867d98584 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1530,7 +1530,7 @@ # Prevent mods from doing insecure things like running shell commands. # type: bool -# secure.enable_security = true +# secure.enable_security = false # Comma-separated list of trusted mods that are allowed to access insecure # functions even when mod security is on (via request_insecure_environment()). -- cgit v1.2.3