kahrl

/*
	coresettings.inc
	to be used e.g. as follows:
		#define CORE_SETTING(name, default, type, getter) settings->setDefault(#name, default)
		#include "coresettings.inc"
		#undef CORE_SETTING
	or:
		struct CoreSettings {
			#define CORE_SETTING(name, default, type, getter) type name
			#include "coresettings.inc"

kahrl

diff --git a/src/guiTable.cpp b/src/guiTable.cpp
index 845c901..153d001 100644
--- a/src/guiTable.cpp
+++ b/src/guiTable.cpp
@@ -862,6 +862,14 @@ bool GUITable::OnEvent(const SEvent &event)
 		// Update tooltip
 		setToolTipText(cell ? m_strings[cell->tooltip_index].c_str() : L"");
 
+		// Fix for #1567/#1806:
+		// IGUIScrollBar passes double click events to its parent,

kahrl

diff --git a/builtin/mainmenu/tab_multiplayer.lua b/builtin/mainmenu/tab_multiplayer.lua
index c3a7d92..b235eae 100644
--- a/builtin/mainmenu/tab_multiplayer.lua
+++ b/builtin/mainmenu/tab_multiplayer.lua
@@ -24,8 +24,10 @@ local function get_formspec(tabview, name, tabdata)
 		"label[1,-0.25;".. fgettext("Favorites:") .. "]"..
 		"label[1,4.25;".. fgettext("Address/Port") .. "]"..
 		"label[9,2.75;".. fgettext("Name/Password") .. "]" ..
-		"field[1.25,5.25;5.5,0.5;te_address;;" ..core.setting_get("address") .."]" ..
-		"field[6.75,5.25;2.25,0.5;te_port;;" ..core.setting_get("remote_port") .."]" ..

kahrl

~/minetest $ mytools/struct_vs_class.sh 
WARNING: These classes or structs have more than one definition:
TC
End of list.
src/mg_decoration.h:26: forward declaration of NoiseParams
src/mg_ore.h:26: forward declaration of NoiseParams
src/rollback.h:32: forward declaration of ActionRow
src/rollback.h:33: forward declaration of Entity
src/server.h:52: forward declaration of RollbackAction
src/wieldmesh.h:26: forward declaration of ItemStack

kahrl

kahrl

* e702f3f - (HEAD, master) Revert "Revert "Update german translation"" (50 seconds ago) <Kahrl>
* c490ed9 - Update po files (2 minutes ago) <Kahrl>
* aad0756 - Revert "Update Russian translation" (3 minutes ago) <Kahrl>
* 60e1891 - Revert "Update po files" (3 minutes ago) <Kahrl>
* 4304f11 - Revert "Update german translation" (4 minutes ago) <Kahrl>
* b5e11e0 - (upstream/master) Fix misleading error when exiting the client from the main menu (19 minutes ago) <Craig Robbins>

kahrl

14:26:13: ACTION[ServerThread]: singleplayer places node default:lava_source at (154,9,142)
Map::transformLiquids(): 24 iterations in 61486ns (2561.92ns/iteration)
Map::transformLiquids(): 24 iterations in 230251ns (9593.79ns/iteration)
Map::transformLiquids(): 40 iterations in 202556ns (5063.9ns/iteration)
Map::transformLiquids(): 40 iterations in 193461ns (4836.52ns/iteration)
Map::transformLiquids(): 60 iterations in 228515ns (3808.58ns/iteration)
Map::transformLiquids(): 60 iterations in 429035ns (7150.58ns/iteration)
Map::transformLiquids(): 76 iterations in 495960ns (6525.79ns/iteration)
Map::transformLiquids(): 68 iterations in 456807ns (6717.75ns/iteration)
Map::transformLiquids(): 84 iterations in 456052ns (5429.19ns/iteration)

kahrl

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index 4e8feb0..25f7074 100644
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -119,7 +119,7 @@ u8 MapNode::getFaceDir(INodeDefManager *nodemgr) const
 {
        const ContentFeatures &f = nodemgr->get(*this);
        if(f.param_type_2 == CPT2_FACEDIR)
-               return getParam2() & 0x1F;
+               return (getParam2() & 0x1F) % 24;

kahrl

diff --git a/src/util/numeric.cpp b/src/util/numeric.cpp
index 6173515..7a223df 100644
--- a/src/util/numeric.cpp
+++ b/src/util/numeric.cpp
@@ -220,7 +220,8 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
 	
 	// If block is (nearly) touching the camera, don't
 	// bother validating further (that is, render it anyway)
-	if(d < block_max_radius)
+	// The 1.1 factor here fixes issue #2032.

kahrl

diff --git a/src/constants.h b/src/constants.h
index 2da4a34..92f3c8e 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -97,9 +97,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 /*
  *    GUI related things
  */
-#define LEGACY_SCALING                                     (2./3.)
-#define TTF_DEFAULT_FONT_SIZE              (12.0 / LEGACY_SCALING)