Fix damage flash when damage disabled

[oweals/minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index e629377ee06d64c1a95f39ac1723828a9be069c7..da5dcae94c96353c8220a08340c92b741fec15d9 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -43,6 +43,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_special1", "KEY_KEY_E");
        settings->setDefault("keymap_chat", "KEY_KEY_T");
        settings->setDefault("keymap_cmd", "/");
+       settings->setDefault("keymap_minimap", "KEY_F9");
        settings->setDefault("keymap_console", "KEY_F10");
        settings->setDefault("keymap_rangeselect", "KEY_KEY_R");
        settings->setDefault("keymap_freemove", "KEY_KEY_K");
@@ -106,7 +107,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("fov", "72");
        settings->setDefault("view_bobbing", "true");
        settings->setDefault("new_style_water", "false");
-       settings->setDefault("new_style_leaves", "true");
+       settings->setDefault("leaves_style", "fancy");
        settings->setDefault("connected_glass", "false");
        settings->setDefault("smooth_lighting", "true");
        settings->setDefault("display_gamma", "1.8");
@@ -127,6 +128,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("fall_bobbing_amount", "0.0");
        settings->setDefault("enable_3d_clouds", "true");
        settings->setDefault("cloud_height", "120");
+       settings->setDefault("cloud_radius", "12");
        settings->setDefault("menu_clouds", "true");
        settings->setDefault("opaque_water", "false");
        settings->setDefault("console_color", "(0,0,0)");
@@ -159,8 +161,10 @@ void set_default_settings(Settings *settings)
        settings->setDefault("generate_normalmaps", "false");
        settings->setDefault("normalmaps_strength", "0.6");
        settings->setDefault("normalmaps_smooth", "1");
-       settings->setDefault("parallax_occlusion_scale", "0.06");
-       settings->setDefault("parallax_occlusion_bias", "0.03");
+       settings->setDefault("parallax_occlusion_mode", "1");
+       settings->setDefault("parallax_occlusion_iterations", "4");
+       settings->setDefault("parallax_occlusion_scale", "0.08");
+       settings->setDefault("parallax_occlusion_bias", "0.04");
        settings->setDefault("enable_waving_water", "false");
        settings->setDefault("water_wave_height", "1.0");
        settings->setDefault("water_wave_length", "20.0");
@@ -171,7 +175,11 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_shaders", "true");
        settings->setDefault("repeat_rightclick_time", "0.25");
        settings->setDefault("enable_particles", "true");
-       settings->setDefault("enable_mesh_cache", "true");
+       settings->setDefault("enable_mesh_cache", "false");
+
+       settings->setDefault("enable_minimap", "true");
+       settings->setDefault("minimap_shape_round", "true");
+       settings->setDefault("minimap_double_scan_height", "true");
 
        settings->setDefault("curl_timeout", "5000");
        settings->setDefault("curl_parallel_limit", "8");
@@ -271,6 +279,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("emergequeue_limit_diskonly", "32");
        settings->setDefault("emergequeue_limit_generate", "32");
        settings->setDefault("num_emerge_threads", "1");
+       settings->setDefault("secure.enable_security", "false");
+       settings->setDefault("secure.trusted_mods", "");
 
        // physics stuff
        settings->setDefault("movement_acceleration_default", "3");
@@ -296,7 +306,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");
+       settings->setDefault("mgv6_spflags", "jungles, snowbiomes");
        settings->setDefault("enable_floating_dungeons", "true");
 
        // IPv6