CollisionMoveSimple: Collide with 'ignore' nodes

[minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 5e4cf526c9ef8e30f4987cca96155fd881ed9963..0d1b3aa86c052c3f77280797d543e6a4a76e39ea 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -37,6 +37,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("address", "");
        settings->setDefault("enable_sound", "true");
        settings->setDefault("sound_volume", "0.8");
+       settings->setDefault("mute_sound", "false");
        settings->setDefault("enable_mesh_cache", "false");
        settings->setDefault("mesh_generation_interval", "0");
        settings->setDefault("meshgen_block_cache_size", "20");
@@ -57,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");
@@ -88,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
@@ -123,15 +125,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_slot21", "");
        settings->setDefault("keymap_slot22", "");
        settings->setDefault("keymap_slot23", "");
-       settings->setDefault("enable_build_where_you_stand", "false" );
-       settings->setDefault("3d_mode", "none");
-       settings->setDefault("3d_paralax_strength", "0.025");
-       settings->setDefault("aux1_descends", "false");
-       settings->setDefault("doubletap_jump", "false");
-       settings->setDefault("always_fly_fast", "true");
-       settings->setDefault("directional_colored_fog", "true");
-       settings->setDefault("tooltip_show_delay", "400");
-       settings->setDefault("zoom_fov", "15");
 
        // Some (temporary) keys for debugging
        settings->setDefault("keymap_quicktune_prev", "KEY_HOME");
@@ -147,15 +140,18 @@ void set_default_settings(Settings *settings)
 #endif
        settings->setDefault("fsaa", "0");
        settings->setDefault("undersampling", "0");
+       settings->setDefault("world_aligned_mode", "enable");
+       settings->setDefault("autoscale_mode", "disable");
        settings->setDefault("enable_fog", "true");
        settings->setDefault("fog_start", "0.4");
        settings->setDefault("3d_mode", "none");
        settings->setDefault("3d_paralax_strength", "0.025");
        settings->setDefault("tooltip_show_delay", "400");
-       settings->setDefault("zoom_fov", "15");
+       settings->setDefault("tooltip_append_itemname", "false");
        settings->setDefault("fps_max", "60");
        settings->setDefault("pause_fps_max", "20");
        settings->setDefault("viewing_range", "100");
+       settings->setDefault("near_plane", "0.1");
        settings->setDefault("screen_w", "1024");
        settings->setDefault("screen_h", "600");
        settings->setDefault("autosave_screensize", "true");
@@ -167,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");
@@ -182,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)");
@@ -194,6 +193,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("node_highlighting", "box");
        settings->setDefault("crosshair_color", "(255,255,255)");
        settings->setDefault("crosshair_alpha", "255");
+       settings->setDefault("recent_chat_messages", "6");
        settings->setDefault("hud_scaling", "1.0");
        settings->setDefault("gui_scaling", "1.0");
        settings->setDefault("gui_scaling_filter", "false");
@@ -255,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");
@@ -308,6 +309,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("default_password", "");
        settings->setDefault("default_privs", "interact, shout");
        settings->setDefault("enable_pvp", "true");
+       settings->setDefault("enable_mod_channels", "false");
        settings->setDefault("disallow_empty_password", "false");
        settings->setDefault("disable_anticheat", "false");
        settings->setDefault("enable_rollback_recording", "false");
@@ -329,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");
@@ -349,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");