]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/defaultsettings.cpp
Redo light.cpp.
[dragonfireclient.git] / src / defaultsettings.cpp
index b660912f939708bed7a5f32d02696f687e91fb4e..52f4cfec8995beae38a163e676cd4279580d9590 100644 (file)
@@ -33,21 +33,25 @@ void set_default_settings(Settings *settings)
        // Client stuff
        settings->setDefault("remote_port", "30000");
        settings->setDefault("keymap_forward", "KEY_KEY_W");
+       settings->setDefault("keymap_autorun", "");
        settings->setDefault("keymap_backward", "KEY_KEY_S");
        settings->setDefault("keymap_left", "KEY_KEY_A");
        settings->setDefault("keymap_right", "KEY_KEY_D");
        settings->setDefault("keymap_jump", "KEY_SPACE");
        settings->setDefault("keymap_sneak", "KEY_LSHIFT");
        settings->setDefault("keymap_drop", "KEY_KEY_Q");
+       settings->setDefault("keymap_zoom", "KEY_KEY_Z");
        settings->setDefault("keymap_inventory", "KEY_KEY_I");
        settings->setDefault("keymap_special1", "KEY_KEY_E");
        settings->setDefault("keymap_chat", "KEY_KEY_T");
        settings->setDefault("keymap_cmd", "/");
+       settings->setDefault("keymap_minimap", "KEY_F9");
        settings->setDefault("keymap_console", "KEY_F10");
        settings->setDefault("keymap_rangeselect", "KEY_KEY_R");
        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", "");
        settings->setDefault("keymap_screenshot", "KEY_F12");
        settings->setDefault("keymap_toggle_hud", "KEY_F1");
        settings->setDefault("keymap_toggle_chat", "KEY_F2");
@@ -56,7 +60,7 @@ void set_default_settings(Settings *settings)
 #if DEBUG
                        "KEY_F4");
 #else
-                       "none");
+                       "");
 #endif
        settings->setDefault("keymap_toggle_debug", "KEY_F5");
        settings->setDefault("keymap_toggle_profiler", "KEY_F6");
@@ -71,6 +75,7 @@ void set_default_settings(Settings *settings)
        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_print_debug_stacks", "KEY_KEY_P");
@@ -86,12 +91,10 @@ void set_default_settings(Settings *settings)
        settings->setDefault("show_debug", "true");
        #endif
 
-       settings->setDefault("wanted_fps", "30");
        settings->setDefault("fps_max", "60");
        settings->setDefault("pause_fps_max", "20");
-       // A bit more than the server will send around the player, to make fog blend well
-       settings->setDefault("viewing_range_nodes_max", "240");
-       settings->setDefault("viewing_range_nodes_min", "35");
+       settings->setDefault("viewing_range", "100");
+       settings->setDefault("map_generation_limit", "31000");
        settings->setDefault("screenW", "800");
        settings->setDefault("screenH", "600");
        settings->setDefault("fullscreen", "false");
@@ -101,66 +104,94 @@ void set_default_settings(Settings *settings)
        settings->setDefault("address", "");
        settings->setDefault("random_input", "false");
        settings->setDefault("client_unload_unused_data_timeout", "600");
+       settings->setDefault("client_mapblock_limit", "5000");
        settings->setDefault("enable_fog", "true");
+       settings->setDefault("fog_start", "0.4");
        settings->setDefault("fov", "72");
        settings->setDefault("view_bobbing", "true");
-       settings->setDefault("new_style_water", "false");
-       settings->setDefault("new_style_leaves", "true");
+       settings->setDefault("leaves_style", "fancy");
        settings->setDefault("connected_glass", "false");
        settings->setDefault("smooth_lighting", "true");
+       settings->setDefault("display_gamma", "2.2");
        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("enable_joysticks", "false");
+       settings->setDefault("repeat_joystick_button_time", "0.17");
+       settings->setDefault("joystick_frustum_sensitivity", "170");
+       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");
        settings->setDefault("screenshot_path", ".");
+       settings->setDefault("screenshot_format", "png");
+       settings->setDefault("screenshot_quality", "0");
        settings->setDefault("view_bobbing_amount", "1.0");
        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)");
        settings->setDefault("console_alpha", "200");
        settings->setDefault("selectionbox_color", "(0,0,0)");
-       settings->setDefault("enable_node_highlighting", "false");
+       settings->setDefault("selectionbox_width", "2");
+       settings->setDefault("inventory_items_animations", "false");
+       settings->setDefault("node_highlighting", "box");
        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");
        settings->setDefault("desynchronize_mapblock_texture_animation", "true");
-       settings->setDefault("selectionbox_width","2");
-       settings->setDefault("hud_hotbar_max_width","1.0");
+       settings->setDefault("hud_hotbar_max_width", "1.0");
        settings->setDefault("enable_local_map_saving", "false");
+       settings->setDefault("show_entity_selectionbox", "true");
 
        settings->setDefault("mip_map", "false");
        settings->setDefault("anisotropic_filter", "false");
        settings->setDefault("bilinear_filter", "false");
        settings->setDefault("trilinear_filter", "false");
-       settings->setDefault("preload_item_visuals", "false");
+       settings->setDefault("texture_clean_transparent", "false");
+       settings->setDefault("texture_min_size", "64");
+       settings->setDefault("tone_mapping", "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");
-       settings->setDefault("enable_mesh_cache", "true");
+       settings->setDefault("enable_mesh_cache", "false");
+       settings->setDefault("enable_vbo", "true");
+
+       settings->setDefault("enable_minimap", "true");
+       settings->setDefault("minimap_shape_round", "true");
+       settings->setDefault("minimap_double_scan_height", "true");
+
+       settings->setDefault("send_pre_v25_init", "false");
 
        settings->setDefault("curl_timeout", "5000");
        settings->setDefault("curl_parallel_limit", "8");
@@ -177,11 +208,13 @@ void set_default_settings(Settings *settings)
        settings->setDefault("server_name", "");
        settings->setDefault("server_description", "");
 
+       settings->setDefault("disable_escape_sequences", "false");
+
 #if USE_FREETYPE
        settings->setDefault("freetype", "true");
        settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "liberationsans.ttf"));
        settings->setDefault("font_shadow", "1");
-       settings->setDefault("font_shadow_alpha", "128");
+       settings->setDefault("font_shadow_alpha", "127");
        settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "liberationmono.ttf"));
        settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "DroidSansFallbackFull.ttf"));
 
@@ -233,33 +266,46 @@ void set_default_settings(Settings *settings)
        settings->setDefault("deprecated_lua_api_handling", "log");
 #endif
 
+       settings->setDefault("kick_msg_shutdown", "Server shutting down.");
+       settings->setDefault("kick_msg_crash", "This server has experienced an internal error. You will now be disconnected.");
+       settings->setDefault("ask_reconnect_on_crash", "false");
+
        settings->setDefault("profiler_print_interval", "0");
        settings->setDefault("enable_mapgen_debug_info", "false");
        settings->setDefault("active_object_send_range_blocks", "3");
-       settings->setDefault("active_block_range", "2");
+       settings->setDefault("active_block_range", "3");
        //settings->setDefault("max_simultaneous_block_sends_per_client", "1");
        // This causes frametime jitter on client side, or does it?
        settings->setDefault("max_simultaneous_block_sends_per_client", "10");
        settings->setDefault("max_simultaneous_block_sends_server_total", "40");
        settings->setDefault("max_block_send_distance", "9");
        settings->setDefault("max_block_generate_distance", "7");
+       settings->setDefault("block_send_optimize_distance", "4");
        settings->setDefault("max_clearobjects_extra_loaded_blocks", "4096");
        settings->setDefault("time_send_interval", "5");
        settings->setDefault("time_speed", "72");
-       settings->setDefault("year_days", "30");
        settings->setDefault("server_unload_unused_data_timeout", "29");
-       settings->setDefault("max_objects_per_block", "49");
+       settings->setDefault("max_objects_per_block", "64");
        settings->setDefault("server_map_save_interval", "5.3");
+       settings->setDefault("chat_message_max_size", "500");
+       settings->setDefault("chat_message_limit_per_10sec", "8.0");
+       settings->setDefault("chat_message_limit_trigger_kick", "50");
        settings->setDefault("sqlite_synchronous", "2");
        settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
        settings->setDefault("dedicated_server_step", "0.1");
+       settings->setDefault("active_block_mgmt_interval", "2.0");
+       settings->setDefault("abm_interval", "1.0");
+       settings->setDefault("nodetimer_interval", "1.0");
        settings->setDefault("ignore_world_load_errors", "false");
        settings->setDefault("remote_media", "");
-       settings->setDefault("debug_log_level", "2");
+       settings->setDefault("debug_log_level", "action");
        settings->setDefault("emergequeue_limit_total", "256");
        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", "");
+       settings->setDefault("secure.http_mods", "");
 
        // physics stuff
        settings->setDefault("movement_acceleration_default", "3");
@@ -281,10 +327,10 @@ void set_default_settings(Settings *settings)
        settings->setDefault("liquid_update", "1.0");
 
        //mapgen stuff
-       settings->setDefault("mg_name", "v6");
+       settings->setDefault("mg_name", "v7");
        settings->setDefault("water_level", "1");
        settings->setDefault("chunksize", "5");
-       settings->setDefault("mg_flags", "");
+       settings->setDefault("mg_flags", "dungeons");
 
        // IPv6
        settings->setDefault("enable_ipv6", "true");
@@ -306,29 +352,37 @@ void set_default_settings(Settings *settings)
        settings->setDefault("screenH", "0");
        settings->setDefault("enable_shaders", "false");
        settings->setDefault("fullscreen", "true");
-       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");
        settings->setDefault("emergequeue_limit_diskonly", "8");
        settings->setDefault("emergequeue_limit_generate", "8");
-       settings->setDefault("preload_item_visuals", "false");
-
-       settings->setDefault("viewing_range_nodes_max", "50");
-       settings->setDefault("viewing_range_nodes_min", "20");
+       settings->setDefault("max_block_generate_distance", "3");
+       settings->setDefault("enable_3d_clouds", "false");
+       settings->setDefault("fps_max", "30");
+       settings->setDefault("pause_fps_max", "10");
+       settings->setDefault("max_objects_per_block", "20");
+       settings->setDefault("sqlite_synchronous", "1");
+       settings->setDefault("gui_scaling", "1.1");
+       settings->setDefault("server_map_save_interval", "15");
+       settings->setDefault("client_mapblock_limit", "500");
+       settings->setDefault("active_block_range", "1");
+       settings->setDefault("chunksize", "3");
+
+       settings->setDefault("viewing_range", "25");
        settings->setDefault("inventory_image_hack", "false");
 
        //check for device with small screen
        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");
 #else
@@ -344,4 +398,3 @@ void override_default_settings(Settings *settings, Settings *from)
                settings->setDefault(name, from->get(name));
        }
 }
-