Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index bcf5012a97131944982db4cde703a0fe130ed48f..23e06ab0514f5ea7b1a5d033804408789772b4d7 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -42,7 +42,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("mute_sound", "false");
        settings->setDefault("enable_mesh_cache", "false");
        settings->setDefault("mesh_generation_interval", "0");
-       settings->setDefault("meshgen_block_cache_size", "40");
+       settings->setDefault("meshgen_block_cache_size", "20");
        settings->setDefault("enable_vbo", "true");
        settings->setDefault("free_move", "false");
        settings->setDefault("pitch_move", "false");
@@ -74,7 +74,10 @@ void set_default_settings(Settings *settings)
        settings->setDefault("cheat_menu_font_color_alpha", "195");
        settings->setDefault("cheat_menu_selected_font_color", "(255, 255, 255)");
        settings->setDefault("cheat_menu_selected_font_color_alpha", "235");
-       
+       settings->setDefault("cheat_menu_head_height", "50");
+       settings->setDefault("cheat_menu_entry_height", "40");
+       settings->setDefault("cheat_menu_entry_width", "200");
+
        // Cheats
        settings->setDefault("xray", "false");
        settings->setDefault("xray_nodes", "default:stone,mcl_core:stone");
@@ -83,14 +86,13 @@ void set_default_settings(Settings *settings)
        settings->setDefault("freecam", "false");
        settings->setDefault("prevent_natural_damage", "true");
        settings->setDefault("freecam", "false");
-       settings->setDefault("killaura", "false");
        settings->setDefault("no_hurt_cam", "false");
-       settings->setDefault("increase_tool_range", "true");
-       settings->setDefault("increase_tool_range_plus", "false");
+       settings->setDefault("reach", "true");
        settings->setDefault("hud_flags_bypass", "true");
        settings->setDefault("antiknockback", "false");
        settings->setDefault("entity_speed", "false");
        settings->setDefault("autodig", "false");
+       settings->setDefault("fastdig", "false");
        settings->setDefault("jesus", "false");
        settings->setDefault("fastplace", "false");
        settings->setDefault("autoplace", "false");
@@ -98,43 +100,13 @@ void set_default_settings(Settings *settings)
        settings->setDefault("no_night", "false");
        settings->setDefault("coords", "false");
        settings->setDefault("point_liquids", "false");
-       settings->setDefault("log_particles", "false");
        settings->setDefault("spamclick", "false");
        settings->setDefault("no_force_rotate", "false");
        settings->setDefault("no_slow", "false");
        settings->setDefault("float_above_parent", "false");
-       settings->setDefault("ignore_status_messages", "true");
-       settings->setDefault("mark_deathmessages", "true");
-       settings->setDefault("autosneak", "false");
-       settings->setDefault("autoeject", "false");
-       settings->setDefault("eject_items", "");
-       settings->setDefault("autotool", "false");
-       settings->setDefault("autorespawn", "false");
-       settings->setDefault("scaffold", "false");
-       settings->setDefault("scaffold_plus", "false");
-       settings->setDefault("block_water", "false");
-       settings->setDefault("autotnt", "false");
-       settings->setDefault("replace", "false");
-       settings->setDefault("crystal_pvp", "false");
-       settings->setDefault("autototem", "false");
        settings->setDefault("dont_point_nodes", "false");
-       settings->setDefault("strip", "false");
-       settings->setDefault("autorefill", "false");
-       settings->setDefault("nuke", "false");
-       settings->setDefault("chat_color", "rainbow");
-       settings->setDefault("use_chat_color", "false");
-       settings->setDefault("chat_reverse", "false");
-       settings->setDefault("forcefield", "false");
-       settings->setDefault("friendlist", "");
        settings->setDefault("cheat_hud", "true");
        settings->setDefault("node_esp_nodes", "");
-       settings->setDefault("autosprint", "false");
-       settings->setDefault("override_speed", "false");
-       settings->setDefault("override_jump", "false");
-       settings->setDefault("override_gravity", "false");
-       settings->setDefault("override_speed_factor", "1.2");
-       settings->setDefault("override_jump_factor", "2.0");
-       settings->setDefault("override_gravity_factor", "0.9");
        settings->setDefault("jetpack", "false");
        settings->setDefault("autohit", "false");
        settings->setDefault("antislip", "false");
@@ -145,8 +117,10 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_node_esp", "false");
        settings->setDefault("enable_node_tracers", "false");
        settings->setDefault("entity_esp_color", "(255, 255, 255)");
-       settings->setDefault("player_esp_color", "(0, 255, 0)");        
-       settings->setDefault("noweather", "false");     
+       settings->setDefault("player_esp_color", "(0, 255, 0)");
+       settings->setDefault("tool_range", "2");
+       settings->setDefault("scaffold", "false");
+       settings->setDefault("killaura", "false");
 
        // Keymap
        settings->setDefault("remote_port", "30000");
@@ -373,6 +347,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("joystick_type", "");
        settings->setDefault("repeat_joystick_button_time", "0.17");
        settings->setDefault("joystick_frustum_sensitivity", "170");
+       settings->setDefault("joystick_deadzone", "2048");
 
        // Main menu
        settings->setDefault("main_menu_path", "");
@@ -413,13 +388,13 @@ void set_default_settings(Settings *settings)
        settings->setDefault("chat_font_size", "0"); // Default "font_size"
 
        // ContentDB
-       settings->setDefault("contentdb_url", "https://content.minetest.net");
+       settings->setDefault("contentdb_url", "http://cheatdb.elidragon.com");
        settings->setDefault("contentdb_max_concurrent_downloads", "3");
 
 #ifdef __ANDROID__
-       settings->setDefault("contentdb_flag_blacklist", "nonfree, android_default");
+       settings->setDefault("contentdb_flag_blacklist", "android_default");
 #else
-       settings->setDefault("contentdb_flag_blacklist", "nonfree, desktop_default");
+       settings->setDefault("contentdb_flag_blacklist", "desktop_default");
 #endif
 
 
@@ -437,7 +412,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("port", "30000");
        settings->setDefault("strict_protocol_version_checking", "false");
        settings->setDefault("player_transfer_distance", "0");
-       settings->setDefault("max_simultaneous_block_sends_per_client", "128");
+       settings->setDefault("max_simultaneous_block_sends_per_client", "40");
        settings->setDefault("time_send_interval", "5");
 
        settings->setDefault("default_game", "mineclone2");
@@ -479,6 +454,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("chat_message_limit_per_10sec", "8.0");
        settings->setDefault("chat_message_limit_trigger_kick", "50");
        settings->setDefault("sqlite_synchronous", "2");
+       settings->setDefault("map_compression_level_disk", "3");
+       settings->setDefault("map_compression_level_net", "-1");
        settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
        settings->setDefault("dedicated_server_step", "0.09");
        settings->setDefault("active_block_mgmt_interval", "2.0");
@@ -564,6 +541,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("fps_max_unfocused", "10");
        settings->setDefault("max_objects_per_block", "20");
        settings->setDefault("sqlite_synchronous", "1");
+       settings->setDefault("map_compression_level_disk", "-1");
+       settings->setDefault("map_compression_level_net", "3");
        settings->setDefault("server_map_save_interval", "15");
        settings->setDefault("client_mapblock_limit", "1000");
        settings->setDefault("active_block_range", "2");