Merge with develop

--HG--
branch : compatibility-develop

azure-pipelines.yml

@@ -0,0 +1,34 @@
+jobs:
+  - job: ubuntu16
+    pool:
+      vmImage: 'Ubuntu-16.04'
+    steps:
+    - script: |
+        sudo apt-get update
+        sudo apt-get install -y software-properties-common
+        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+        sudo apt-get update
+        sudo apt-get install cmake build-essential -y
+        sudo apt-get install gcc-8 g++-8 -y
+        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60
+        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 60
+        sudo apt-get install libmysqlclient-dev -y
+        sudo apt-get install bison autoconf automake -y
+        sudo apt-get install libpng12-dev libjpeg62-dev -y
+        sudo apt-get install liblua5.1-dev libluabind-dev libcpptest-dev -y
+        sudo apt-get install libogg-dev libvorbis-dev libopenal-dev -y
+        sudo apt-get install libgif-dev libfreetype6-dev -y
+        sudo apt-get install libxml2-dev -y
+        sudo apt-get install libcurl4-openssl-dev -y
+      displayName: 'Dependencies'
+    - script: |
+        mkdir build
+        cmake --version
+        cd build
+        cmake -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=ON -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TOOLS=OFF ../code
+        cat CMakeCache.txt
+      displayName: 'CMake'
+    - script: |
+        cd build
+        make -j`nproc`
+      displayName: 'Make'

code/nel/tools/3d/build_interface/main.cpp

@@ -214,7 +214,7 @@ int main(int argc, char **argv)
 	args.addArg("x", "extract", "", "Extract all interface elements from <output_filename> to <input_path>.");
 	args.addAdditionalArg("output_filename", "PNG or TGA file to generate", true);
 	args.addAdditionalArg("input_path", "Path that containts interfaces elements", false);
-	args.addArg("b", "border", "", "Duplicate icon border to allow bilinear filtering");
+	args.addArg("", "no-border", "", "Disable border duplication. Enabled by default");
 
 	if (!args.parse(argc, argv)) return 1;
 
@@ -229,10 +229,10 @@ int main(int argc, char **argv)
 	}
 
 	//
-	uint borderSize = 0;
+	uint borderSize = 1;
-	if (args.haveArg("b"))
+	if (args.haveLongArg("no-border"))
 	{
-		borderSize = 1;
+		borderSize = 0;
 	}
 
 	// extract all interface elements

code/ryzom/client/client_default.cfg

@@ -319,6 +319,11 @@ InterfaceScale_min  = 0.8;
 InterfaceScale_max  = 2.0;
 InterfaceScale_step = 0.05;
 
+// Enable biliner filtering for UI textures
+// Texture atlas needs to be generated with border duplication
+// or there will be visible texture bleeding
+BilinearUI          = 1;
+
 // Default values for map
 MaxMapScale			= 2.0;
 R2EDMaxMapScale		= 8.0;

code/ryzom/client/src/client_cfg.cpp

@@ -304,7 +304,7 @@ CClientConfig::CClientConfig()
 	InterfaceScale_min	= 0.8f;
 	InterfaceScale_max	= 2.0f;
 	InterfaceScale_step	= 0.05;
-	BilinearUI			= false;
+	BilinearUI			= true;
 
 	VREnable			= false;
 	VRDisplayDevice		= "Auto";