Merge with develop

--HG--
branch : compatibility-develop

code/ryzom/client/data/gamedev/interfaces_v3/interaction.lua

@@ -226,8 +226,8 @@ function game:updateTargetConsiderUI()
 	local wgImpossible  = targetWindow:find("impossible")
 	local wgSlotRing    = targetWindow:find("slot_ring")
 	local wgToolTip     = targetWindow:find("target_tooltip")
-	local wgPvPTag     = targetWindow:find("pvp_tags")
-	local wgHeader     = targetWindow:find("header_opened")
+	local wgPvPTag      = targetWindow:find("pvp_tags")
+	local wgHeader      = targetWindow:find("header_opened")
 
 	wgTargetSlotForce.active = true
 	wgImpossible.active = true
@@ -342,7 +342,6 @@ function game:updateTargetConsiderUI()
 	if impossible then
 		wgToolTip.tooltip = concatUCString(wgToolTip.tooltip, ucstring("\n"), i18n.get("uittConsiderUnknownLevel"))
 	end
-
 end
 
 ----------------------

code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini

@@ -20,9 +20,9 @@ display_url="http://app.ryzom.com/app_releasenotes/index.php?lang=$LANG"
 data_download_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_data.7z?r=&ts=$TIMESTAMP"
 data_download_filename=ryzom_live_data.7z
 data_compressed_size=1500000000
-data_uncompressed_size=10000000000
-client_download_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_client_$ARCH.zip?r=&ts=$TIMESTAMP"
-client_download_filename=ryzom_live_client_$ARCH.zip
+data_uncompressed_size=7000000000
+client_download_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_client_$ARCH.7z?r=&ts=$TIMESTAMP"
+client_download_filename=ryzom_live_client_$ARCH.7z
 client_filename_windows=ryzom_client_r.exe
 client_filename_osx=Ryzom.app/Contents/MacOS/Ryzom
 client_filename_linux=ryzom_client

code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp

@@ -43,8 +43,10 @@ CMainWindow::CMainWindow():QMainWindow()
 	connect(actionProfiles, SIGNAL(triggered()), SLOT(onProfiles()));
 
 	// remove debug options
+#ifndef _DEBUG
 	actionSettings->setVisible(false);
 	actionUninstall->setVisible(false);
+#endif
 
 	connect(actionSettings, SIGNAL(triggered()), SLOT(onSettings()));
 	connect(actionUninstall, SIGNAL(triggered()), SLOT(onUninstall()));

code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp

@@ -1193,16 +1193,18 @@ void COperationDialog::deleteComponentsDownloadedFiles()
 	QDir dir(path);
 
 	QStringList filter;
+	filter << "*.log";
 	filter << "*.7z";
 	filter << "*.bnp";
 	filter << "*.zip";
 	filter << "*.part";
+	filter << "ryzom_installer_uninstalling_old_client";
 
 	QStringList files = dir.entryList(filter, QDir::Files);
 
 	foreach(const QString &file, files)
 	{
-		if (!QFile::remove(file))
+		if (!QFile::remove(dir.filePath(file)))
 		{
 			qDebug() << "Unable to delete" << file;
 		}