Remove texture atlas / AtlasPointer, rename getTextureRaw to getTexture

[minetest.git] / minetest.conf.example

diff --git a/minetest.conf.example b/minetest.conf.example
index 838987c33dc99b725c58396881565f68d26f22b4..75e546c2f353aa9e458db434cca212c373ac3435 100644 (file)
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -8,11 +8,11 @@
 # Uncomment settings by removing the preceding #.
 #
 # Further documentation:
-# http://c55.me/minetest/wiki/doku.php
+# http://wiki.minetest.com/
 #
 # NOTE: This file might not be up-to-date, refer to the
 #       defaultsettings.cpp file for an up-to-date list:
-# https://bitbucket.org/celeron55/minetest/src/tip/src/defaultsettings.cpp
+# https://github.com/minetest/minetest/blob/master/src/defaultsettings.cpp
 #
 # A vim command to convert most of defaultsettings.cpp to conf file format:
 # :'<,'>s/\tsettings->setDefault("\([^"]*\)", "\([^"]*\)");.*/#\1 = \2/g
@@ -93,11 +93,17 @@
 #new_style_water = false
 # Constant volume liquids
 #liquid_finite = false
+# Max liquids processed per step
+#liquid_loop_max = 1000
 # Update liquids every .. recommend for finite: 0.2
 #liquid_update = 1.0
-# When finite liquid: relax flowing blocks to source if level near max and N nearby source blocks, more realistic, but not true constant. values: 0,1,2,3,4 : 0 - disable, 1 - most aggresive
+# Relax flowing blocks to source if level near max and N nearby
+#  source blocks, more realistic, but not true constant.
+#  values: 0,1,2,3,4 : 0 - disable, 1 - most aggresive
+#  (for finite liquids)
 #liquid_relax = 2
 # Optimization: faster cave flood (and not true constant)
+#  (for finite liquids)
 #liquid_fast_flood = 1
 # Underground water and lava springs, its infnity sources if liquid_finite enabled
 #underground_springs = 1
@@ -106,9 +112,6 @@
 # Enable smooth lighting with simple ambient occlusion;
 # disable for speed or for different looks.
 #smooth_lighting = true
-# Enable combining mainly used textures to a bigger one for improved speed
-# disable if it causes graphics glitches.
-#enable_texture_atlas = false
 # Path to texture directory. All textures are first searched from here.
 #texture_path = 
 # Video back-end.
@@ -136,6 +139,8 @@
 #screenshot_path = .
 # Amount of view bobbing (0 = no view bobbing, 1.0 = normal, 2.0 = double)
 #view_bobbing_amount = 1.0
+# Amount of fall bobbing (0 = no fall bobbing, 1.0 = normal, 2.0 = double)
+#fall_bobbing_amount = 0.0
 # Anaglyph stereo
 #anaglyph = false
 #anaglyph_strength = 0.1
@@ -149,6 +154,8 @@
 #crosshair_color = (255,255,255)
 # Cross alpha (opaqueness, between 0 and 255)
 #crosshair_alpha = 255
+# Sensitivity multiplier
+#mouse_sensitivity = 0.2
 # Sound settings
 #enable_sound = true
 #sound_volume = 0.7
@@ -250,6 +257,10 @@
 #max_block_send_distance = 10
 # From how far blocks are generated for clients (value * 16 nodes)
 #max_block_generate_distance = 6
+# 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)
+#max_clearobjects_extra_loaded_blocks = 4096
 # Interval of sending time of day to clients
 #time_send_interval = 5
 # Length of day/night cycle. 72=20min, 360=4min, 1=24hour, 0=day/night/whatever stays unchanged
@@ -311,13 +322,13 @@
 # Mapgen stuff
 #
 
-# Name of map generator to be used.  Currently v6, indev and singlenode are supported.
+# Name of map generator to be used.  Currently supported: v6, indev, singlenode, math
 #mg_name = v6
 # Water level of map.
 #water_level = 1
 # Size of chunks to be generated.
 #chunksize = 5
-# Map generation attributes.  Currently supported: trees, caves, flat, v6_biome_blend, v6_jungles, dungeons
+# Map generation attributes.  Currently supported: trees, caves, flat, v6_biome_blend, v6_jungles, dungeons, nolight
 #mg_flags = trees, caves, v6_biome_blend
 # How large deserts and beaches are
 #mgv6_freq_desert = 0.45
@@ -353,3 +364,12 @@
 
 # Float islands starts from height, 0 to disable
 #mgindev_float_islands = 500
+
+# Math mapgen generator: sphere, mandelbox, mengersponge      dont forget to lower water_level = -30000
+#mgmath_generator = mandelbox
+
+# Enable/disable IPv6
+#enable_ipv6 = true
+# Enable/disable running an IPv6 server.  An IPv6 server may be restricted
+# to IPv6 clients, depending on system configuration.
+#ipv6_server = false