From: Elias Fleckenstein Date: Tue, 7 Jun 2022 01:19:05 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/minetest/minetest X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=b11c0a6721cd884d78b38b63797dfdb933004e03;p=dragonfireclient.git Merge branch 'master' of https://github.com/minetest/minetest --- b11c0a6721cd884d78b38b63797dfdb933004e03 diff --cc src/client/client.cpp index 5e31387ab,d81ee434e..7337229fb --- a/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/clientmap.cpp index 85b765709,38ba1daad..3a89b8803 --- a/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 e439d0e32,441054631..888191f4a --- a/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 c4d9b9845,79fe2cb11..aeccc5c7d --- a/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/defaultsettings.cpp index 9224d99ed,d35000814..c3fe02038 --- a/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");