CollisionMoveSimple: Collide with 'ignore' nodes

[minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 3bd4f4ac671e24bac6f4a8f355c5a4dc05e59edc..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
@@ -254,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");
@@ -345,7 +347,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("dedicated_server_step", "0.09");
        settings->setDefault("active_block_mgmt_interval", "2.0");
        settings->setDefault("abm_interval", "1.0");
-       settings->setDefault("active_object_interval", "0.1");
        settings->setDefault("nodetimer_interval", "0.2");
        settings->setDefault("ignore_world_load_errors", "false");
        settings->setDefault("remote_media", "");