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

diff --cc LICENSE.txt
Simple merge

diff --cc builtin/common/misc_helpers.lua
Simple merge

diff --cc builtin/mainmenu/dlg_contentstore.lua
Simple merge

diff --cc builtin/mainmenu/init.lua
Simple merge

diff --cc builtin/mainmenu/tab_about.lua
Simple merge

diff --cc builtin/settingtypes.txt
Simple merge

diff --cc doc/lua_api.txt
Simple merge

diff --cc src/client/client.cpp
index 5e31387ab02fc0be00b3d3fdebed552a106b94a3,d81ee434ed66535b2aa96dbca14ccd8f9cff9c87..7337229fbd71394b120940db04f97a7208689218
--- 1/src/client/client.cpp
--- 2/src/client/client.cpp
+++ b/src/client/client.cpp
@@@ -101,9 -100,9 +101,10 @@@ Client::Client
                MtEventManager *event,
                RenderingEngine *rendering_engine,
                bool ipv6,
-               GameUI *game_ui
+               GameUI *game_ui,
+               ELoginRegister allow_login_or_register
  ):
 +      m_mesh_update_thread(this),
        m_tsrc(tsrc),
        m_shsrc(shsrc),
        m_itemdef(itemdef),

diff --cc src/client/client.h
Simple merge

diff --cc src/client/clientmap.cpp
index 85b765709ebff6581ce8385b0df0758e984d4fed,38ba1daad2df308e0df0a8a6a09e2c259722c0cf..3a89b88038b638058d44935eb2334448d7cd1ac9
--- 1/src/client/clientmap.cpp
--- 2/src/client/clientmap.cpp
+++ b/src/client/clientmap.cpp
@@@ -219,13 -219,11 +219,11 @@@ void ClientMap::updateDrawList(
        // Number of blocks occlusion culled
        u32 blocks_occlusion_culled = 0;
  
-       // No occlusion culling when free_move is on and camera is
-       // inside ground
+       // No occlusion culling when free_move is on and camera is inside ground
        bool occlusion_culling_enabled = true;
-       if ((g_settings->getBool("free_move") && g_settings->getBool("noclip")) || g_settings->getBool("freecam")) {
 -      if (m_control.allow_noclip) {
++      if (m_control.allow_noclip || g_settings->getBool("freecam")) {
                MapNode n = getNode(cam_pos_nodes);
-               if (n.getContent() == CONTENT_IGNORE ||
-                               m_nodedef->get(n).solidness == 2)
+               if (n.getContent() == CONTENT_IGNORE || m_nodedef->get(n).solidness == 2)
                        occlusion_culling_enabled = false;
        }
  
@@@ -678,19 -676,17 +676,17 @@@ void ClientMap::renderPostFx(CameraMod
  
        MapNode n = getNode(floatToInt(m_camera_position, BS));
  
-       // - If the player is in a solid node, make everything black.
-       // - If the player is in liquid, draw a semi-transparent overlay.
-       // - Do not if player is in third person mode
        const ContentFeatures& features = m_nodedef->get(n);
        video::SColor post_effect_color = features.post_effect_color;
-       if(features.solidness == 2 && !((g_settings->getBool("noclip") || g_settings->getBool("freecam")) &&
-                       (m_client->checkLocalPrivilege("noclip") || g_settings->getBool("freecam"))) &&
-                       cam_mode == CAMERA_MODE_FIRST)
-       {
+ 
+       // If the camera is in a solid node, make everything black.
+       // (first person mode only)
+       if (features.solidness == 2 && cam_mode == CAMERA_MODE_FIRST &&
 -              !m_control.allow_noclip) {
++              !(m_control.allow_noclip || g_settings->getBool("freecam"))) {
                post_effect_color = video::SColor(255, 0, 0, 0);
        }
-       if (post_effect_color.getAlpha() != 0)
-       {
+ 
+       if (post_effect_color.getAlpha() != 0) {
                // Draw a full-screen rectangle
                video::IVideoDriver* driver = SceneManager->getVideoDriver();
                v2u32 ss = driver->getScreenSize();

diff --cc src/client/game.cpp
index e439d0e32da366d7a056fa93b977c8fd34591a68,44105463147eefa227ce2d27e3896a55bade3e90..888191f4a406ad39ddf7402e0474bea7783d0b64
--- 1/src/client/game.cpp
--- 2/src/client/game.cpp
+++ b/src/client/game.cpp
@@@ -3047,7 -3755,10 +3040,10 @@@ void Game::updateFrame(ProfilerGraph *g
        float direct_brightness;
        bool sunlight_seen;
  
-       if ((m_cache_enable_noclip && m_cache_enable_free_move) || g_settings->getBool("freecam")) {
+       // When in noclip mode force same sky brightness as above ground so you
+       // can see properly
 -      if (draw_control->allow_noclip && m_cache_enable_free_move &&
 -              client->checkPrivilege("fly")) {
++      if ((draw_control->allow_noclip && m_cache_enable_free_move &&
++              client->checkPrivilege("fly")) || g_settings->getBool("freecam")) {
                direct_brightness = time_brightness;
                sunlight_seen = true;
        } else {

diff --cc src/client/localplayer.cpp
index c4d9b98457d6c10574b5e7aec07e964c2db52d60,79fe2cb113da7a91774053896a2b9181c408ee48..aeccc5c7dc4de54531d0fdede13567ad1089865e
--- 1/src/client/localplayer.cpp
--- 2/src/client/localplayer.cpp
+++ b/src/client/localplayer.cpp
@@@ -718,20 -684,9 +708,19 @@@ v3s16 LocalPlayer::getLightPosition() c
        return floatToInt(m_position + v3f(0.0f, BS * 1.5f, 0.0f), BS);
  }
  
 +v3f LocalPlayer::getSendSpeed()
 +{
 +      v3f speed = getLegitSpeed();
 +
 +      if (m_client->modsLoaded())
 +              speed = m_client->getScript()->get_send_speed(speed);
 +
 +      return speed;
 +}
 +
  v3f LocalPlayer::getEyeOffset() const
  {
-       float eye_height = camera_barely_in_ceiling ? m_eye_height - 0.125f : m_eye_height;
-       return v3f(0.0f, BS * eye_height, 0.0f);
+       return v3f(0.0f, BS * m_eye_height, 0.0f);
  }
  
  ClientActiveObject *LocalPlayer::getParent() const

diff --cc src/client/localplayer.h
Simple merge

diff --cc src/defaultsettings.cpp
index 9224d99ed0d5cb24b531b7c1e1f53096787699fe,d350008146424078f54d9600d2f1ab35e6d15203..c3fe0203875a825559e964e88e41ca286991701b
--- 1/src/defaultsettings.cpp
--- 2/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@@ -61,72 -61,12 +61,72 @@@ void set_default_settings(
        settings->setDefault("curl_file_download_timeout", "300000");
        settings->setDefault("curl_verify_cert", "true");
        settings->setDefault("enable_remote_media_server", "true");
 -      settings->setDefault("enable_client_modding", "false");
 +      settings->setDefault("enable_client_modding", "true");
        settings->setDefault("max_out_chat_queue_size", "20");
        settings->setDefault("pause_on_lost_focus", "false");
-       settings->setDefault("enable_register_confirmation", "true");
+       settings->setDefault("enable_split_login_register", "true");
        settings->setDefault("chat_weblink_color", "#8888FF");
  
 +      // Cheat Menu
 +      settings->setDefault("cheat_menu_font", "FM_Standard");
 +      settings->setDefault("cheat_menu_bg_color", "(45, 45, 68)");
 +      settings->setDefault("cheat_menu_bg_color_alpha", "173");
 +      settings->setDefault("cheat_menu_active_bg_color", "(0, 0, 0)");
 +      settings->setDefault("cheat_menu_active_bg_color_alpha", "210");
 +      settings->setDefault("cheat_menu_font_color", "(255, 255, 255)");
 +      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", "35");
 +      settings->setDefault("cheat_menu_entry_width", "200");
 +
 +      // Cheats
 +      settings->setDefault("xray", "false");
 +      settings->setDefault("xray_nodes", "default:stone,mcl_core:stone");
 +      settings->setDefault("fullbright", "false");
 +      settings->setDefault("priv_bypass", "true");
 +      settings->setDefault("freecam", "false");
 +      settings->setDefault("prevent_natural_damage", "true");
 +      settings->setDefault("freecam", "false");
 +      settings->setDefault("no_hurt_cam", "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");
 +      settings->setDefault("instant_break", "false");
 +      settings->setDefault("no_night", "false");
 +      settings->setDefault("coords", "false");
 +      settings->setDefault("point_liquids", "false");
 +      settings->setDefault("spamclick", "false");
 +      settings->setDefault("no_force_rotate", "false");
 +      settings->setDefault("no_slow", "false");
 +      settings->setDefault("float_above_parent", "false");
 +      settings->setDefault("dont_point_nodes", "false");
 +      settings->setDefault("cheat_hud", "true");
 +      settings->setDefault("node_esp_nodes", "");
 +      settings->setDefault("jetpack", "false");
 +      settings->setDefault("autohit", "false");
 +      settings->setDefault("antislip", "false");
 +      settings->setDefault("enable_entity_esp", "false");
 +      settings->setDefault("enable_entity_tracers", "false");
 +      settings->setDefault("enable_player_esp", "false");
 +      settings->setDefault("enable_player_tracers", "false");
 +      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("tool_range", "2");
 +      settings->setDefault("scaffold", "false");
 +      settings->setDefault("killaura", "false");
 +      settings->setDefault("airjump", "false");
 +      settings->setDefault("spider", "false");
 +
        // Keymap
        settings->setDefault("remote_port", "30000");
        settings->setDefault("keymap_forward", "KEY_KEY_W");

diff --cc src/gui/CMakeLists.txt
Simple merge

diff --cc src/network/clientpackethandler.cpp
Simple merge

diff --cc src/script/lua_api/l_item.cpp
Simple merge

diff --cc src/script/lua_api/l_mainmenu.cpp
Simple merge

diff --cc src/script/lua_api/l_util.cpp
Simple merge

diff --cc src/serverenvironment.cpp
Simple merge