Merge support for anaglyph stereo

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

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index f1858c2e78af900894302a85619d0097ccb22ada..333d98cd862cbb032211234858392c6a78e5bdcd 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -109,12 +109,17 @@ void set_default_settings(Settings *settings)
        settings->setDefault("sound_volume", "0.8");
        settings->setDefault("desynchronize_mapblock_texture_animation", "true");
 
+       settings->setDefault("mip_map", "false");
+       settings->setDefault("anisotropic_filter", "false");
+       settings->setDefault("bilinear_filter", "false");
+       settings->setDefault("trilinear_filter", "false");
+
        // Server stuff
        // "map-dir" doesn't exist by default.
        settings->setDefault("default_game", "minetest");
        settings->setDefault("motd", "");
        settings->setDefault("max_users", "100");
-       settings->setDefault("strict_protocol_version_checking", "true");
+       settings->setDefault("strict_protocol_version_checking", "false");
        settings->setDefault("creative_mode", "false");
        settings->setDefault("enable_damage", "true");
        settings->setDefault("only_peaceful_mobs", "false");
@@ -143,12 +148,10 @@ void set_default_settings(Settings *settings)
        settings->setDefault("server_unload_unused_data_timeout", "29");
        settings->setDefault("server_map_save_interval", "5.3");
        settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
-       settings->setDefault("dedicated_server_step", "0.05");
+       settings->setDefault("dedicated_server_step", "0.1");
        settings->setDefault("ignore_world_load_errors", "false");
-       settings->setDefault("mip_map", "false");
-       settings->setDefault("anisotropic_filter", "false");
-       settings->setDefault("bilinear_filter", "false");
-       settings->setDefault("trilinear_filter", "false");
-
+       settings->setDefault("congestion_control_aim_rtt", "0.2");
+       settings->setDefault("congestion_control_max_rate", "400");
+       settings->setDefault("congestion_control_min_rate", "10");
 }