]> git.lizzy.rs Git - minetest.git/blobdiff - src/defaultsettings.cpp
Biome API: Enable biome generation to lower world limit
[minetest.git] / src / defaultsettings.cpp
index e7b0e374516fd7a6157ac92064b84d68d24819c9..eab81009f35a3beb2e7ff86e0e0d65ea673f2f7a 100644 (file)
@@ -48,16 +48,23 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_freemove", "KEY_KEY_K");
        settings->setDefault("keymap_fastmove", "KEY_KEY_J");
        settings->setDefault("keymap_noclip", "KEY_KEY_H");
+       settings->setDefault("keymap_cinematic", "KEY_F8");
        settings->setDefault("keymap_screenshot", "KEY_F12");
        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_update_camera", "KEY_F4");
+       settings->setDefault("keymap_toggle_update_camera",
+#if DEBUG
+                       "KEY_F4");
+#else
+                       "none");
+#endif
        settings->setDefault("keymap_toggle_debug", "KEY_F5");
        settings->setDefault("keymap_toggle_profiler", "KEY_F6");
        settings->setDefault("keymap_camera_mode", "KEY_F7");
        settings->setDefault("keymap_increase_viewing_range_min", "+");
        settings->setDefault("keymap_decrease_viewing_range_min", "-");
+       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");
@@ -102,12 +109,16 @@ void set_default_settings(Settings *settings)
        settings->setDefault("new_style_leaves", "true");
        settings->setDefault("connected_glass", "false");
        settings->setDefault("smooth_lighting", "true");
+       settings->setDefault("display_gamma", "1.8");
        settings->setDefault("texture_path", "");
        settings->setDefault("shader_path", "");
        settings->setDefault("video_driver", "opengl");
        settings->setDefault("free_move", "false");
        settings->setDefault("noclip", "false");
        settings->setDefault("continuous_forward", "false");
+       settings->setDefault("cinematic", "false");
+       settings->setDefault("camera_smoothing", "0");
+       settings->setDefault("cinematic_camera_smoothing", "0.7");
        settings->setDefault("fast_move", "false");
        settings->setDefault("invert_mouse", "false");
        settings->setDefault("enable_clouds", "true");
@@ -116,6 +127,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)");
@@ -124,7 +136,10 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_node_highlighting", "false");
        settings->setDefault("crosshair_color", "(255,255,255)");
        settings->setDefault("crosshair_alpha", "255");
+       settings->setDefault("hud_scaling", "1.0");
        settings->setDefault("gui_scaling", "1.0");
+       settings->setDefault("gui_scaling_filter", "false");
+       settings->setDefault("gui_scaling_filter_txr2img", "true");
        settings->setDefault("mouse_sensitivity", "0.2");
        settings->setDefault("enable_sound", "true");
        settings->setDefault("sound_volume", "0.8");
@@ -137,20 +152,25 @@ void set_default_settings(Settings *settings)
        settings->setDefault("anisotropic_filter", "false");
        settings->setDefault("bilinear_filter", "false");
        settings->setDefault("trilinear_filter", "false");
+       settings->setDefault("texture_clean_transparent", "false");
+       settings->setDefault("texture_min_size", "64");
        settings->setDefault("preload_item_visuals", "false");
        settings->setDefault("enable_bumpmapping", "false");
        settings->setDefault("enable_parallax_occlusion", "false");
        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");
        settings->setDefault("water_wave_speed", "5.0");
        settings->setDefault("enable_waving_leaves", "false");
        settings->setDefault("enable_waving_plants", "false");
+       settings->setDefault("ambient_occlusion_gamma", "2.2");
        settings->setDefault("enable_shaders", "true");
        settings->setDefault("repeat_rightclick_time", "0.25");
        settings->setDefault("enable_particles", "true");
@@ -181,10 +201,23 @@ void set_default_settings(Settings *settings)
 
        settings->setDefault("fallback_font_shadow", "1");
        settings->setDefault("fallback_font_shadow_alpha", "128");
+
+       std::stringstream fontsize;
+       fontsize << TTF_DEFAULT_FONT_SIZE;
+
+       settings->setDefault("font_size", fontsize.str());
+       settings->setDefault("mono_font_size", fontsize.str());
+       settings->setDefault("fallback_font_size", fontsize.str());
 #else
        settings->setDefault("freetype", "false");
-       settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "fontlucida.png"));
-       settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "fontdejavusansmono.png"));
+       settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "lucida_sans"));
+       settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "mono_dejavu_sans"));
+
+       std::stringstream fontsize;
+       fontsize << DEFAULT_FONT_SIZE;
+
+       settings->setDefault("font_size", fontsize.str());
+       settings->setDefault("mono_font_size", fontsize.str());
 #endif
 
        // Server stuff
@@ -241,6 +274,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");
@@ -257,14 +292,17 @@ void set_default_settings(Settings *settings)
        settings->setDefault("movement_gravity", "9.81");
 
        //liquid stuff
-       settings->setDefault("liquid_loop_max", "10000");
+       settings->setDefault("liquid_loop_max", "100000");
+       settings->setDefault("liquid_queue_purge_time", "0");
        settings->setDefault("liquid_update", "1.0");
 
        //mapgen stuff
        settings->setDefault("mg_name", "v6");
        settings->setDefault("water_level", "1");
        settings->setDefault("chunksize", "5");
-       settings->setDefault("mg_flags", "");
+       settings->setDefault("mg_flags", "dungeons");
+       settings->setDefault("mgv6_spflags", "jungles, snowbiomes");
+       settings->setDefault("enable_floating_dungeons", "true");
 
        // IPv6
        settings->setDefault("enable_ipv6", "true");
@@ -289,7 +327,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_particles", "false");
        settings->setDefault("video_driver", "ogles1");
        settings->setDefault("touchtarget", "true");
-       settings->setDefault("TMPFolder","/sdcard/Minetest/tmp/");
+       settings->setDefault("TMPFolder","/sdcard/" PROJECT_NAME_C "/tmp/");
        settings->setDefault("touchscreen_threshold","20");
        settings->setDefault("smooth_lighting", "false");
        settings->setDefault("max_simultaneous_block_sends_per_client", "3");
@@ -305,28 +343,14 @@ void set_default_settings(Settings *settings)
        float x_inches = ((double) porting::getDisplaySize().X /
                        (160 * porting::getDisplayDensity()));
        if (x_inches  < 3.5) {
-               settings->setDefault("gui_scaling", "0.6");
+               settings->setDefault("hud_scaling", "0.6");
        }
        else if (x_inches < 4.5) {
-               settings->setDefault("gui_scaling", "0.7");
+               settings->setDefault("hud_scaling", "0.7");
        }
        settings->setDefault("curl_verify_cert","false");
-#endif
-}
-
-void late_init_default_settings(Settings* settings)
-{
-#ifndef SERVER
-       std::stringstream fontsize;
-       fontsize << floor(
-                       DEFAULT_FONT_SIZE *
-                       porting::getDisplayDensity() *
-                       settings->getFloat("gui_scaling")
-                       );
-
-       settings->setDefault("font_size", fontsize.str());
-       settings->setDefault("mono_font_size", fontsize.str());
-       settings->setDefault("fallback_font_size", fontsize.str());
+#else
+       settings->setDefault("screen_dpi", "72");
 #endif
 }
 
@@ -338,4 +362,3 @@ void override_default_settings(Settings *settings, Settings *from)
                settings->setDefault(name, from->get(name));
        }
 }
-