CollisionMoveSimple: Collide with 'ignore' nodes

[minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 1a2656f0e6f246bb66db8972b6a3536aae55a248..0d1b3aa86c052c3f77280797d543e6a4a76e39ea 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -58,6 +58,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_remote_media_server", "true");
        settings->setDefault("enable_client_modding", "false");
        settings->setDefault("max_out_chat_queue_size", "20");
+       settings->setDefault("pause_on_lost_focus", "false");
 
        // Keymap
        settings->setDefault("remote_port", "30000");
@@ -89,7 +90,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_cinematic", "");
        settings->setDefault("keymap_toggle_hud", "KEY_F1");
        settings->setDefault("keymap_toggle_chat", "KEY_F2");
-       settings->setDefault("keymap_toggle_force_fog_off", "KEY_F3");
+       settings->setDefault("keymap_toggle_fog", "KEY_F3");
 #if DEBUG
        settings->setDefault("keymap_toggle_update_camera", "KEY_F4");
 #else
@@ -147,7 +148,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("3d_paralax_strength", "0.025");
        settings->setDefault("tooltip_show_delay", "400");
        settings->setDefault("tooltip_append_itemname", "false");
-       settings->setDefault("zoom_fov", "15");
        settings->setDefault("fps_max", "60");
        settings->setDefault("pause_fps_max", "20");
        settings->setDefault("viewing_range", "100");
@@ -163,8 +163,11 @@ void set_default_settings(Settings *settings)
        settings->setDefault("connected_glass", "false");
        settings->setDefault("smooth_lighting", "true");
        settings->setDefault("lighting_alpha", "0.0");
-       settings->setDefault("lighting_beta", "0.0");
+       settings->setDefault("lighting_beta", "1.5");
        settings->setDefault("display_gamma", "1.0");
+       settings->setDefault("lighting_boost", "0.2");
+       settings->setDefault("lighting_boost_center", "0.5");
+       settings->setDefault("lighting_boost_spread", "0.2");
        settings->setDefault("texture_path", "");
        settings->setDefault("shader_path", "");
        settings->setDefault("video_driver", "opengl");
@@ -178,7 +181,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("cloud_radius", "12");
        settings->setDefault("menu_clouds", "true");
        settings->setDefault("opaque_water", "false");
-       settings->setDefault("console_height", "1.0");
+       settings->setDefault("console_height", "0.6");
        settings->setDefault("console_color", "(0,0,0)");
        settings->setDefault("console_alpha", "200");
        settings->setDefault("formspec_fullscreen_bg_color", "(0,0,0)");
@@ -252,6 +255,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("joystick_frustum_sensitivity", "170");
 
        // Main menu
+       settings->setDefault("main_menu_style", "auto");
        settings->setDefault("main_menu_path", "");
        settings->setDefault("main_menu_mod_mgr", "1");
        settings->setDefault("main_menu_game_mgr", "0");
@@ -327,7 +331,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("max_block_send_distance", "9");
        settings->setDefault("block_send_optimize_distance", "4");
        settings->setDefault("server_side_occlusion_culling", "true");
-       settings->setDefault("csm_flavour_limits", "3");
+       settings->setDefault("csm_flavour_limits", "18");
        settings->setDefault("csm_flavour_noderange_limit", "8");
        settings->setDefault("max_clearobjects_extra_loaded_blocks", "4096");
        settings->setDefault("time_speed", "72");
@@ -347,6 +351,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("ignore_world_load_errors", "false");
        settings->setDefault("remote_media", "");
        settings->setDefault("debug_log_level", "action");
+       settings->setDefault("log_color", "detect");
        settings->setDefault("emergequeue_limit_total", "256");
        settings->setDefault("emergequeue_limit_diskonly", "32");
        settings->setDefault("emergequeue_limit_generate", "32");