Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-09-20 21:59:11 +02:00
commit ce3cb3efa4
4 changed files with 42 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/ryzom/client/data/gamedev/interfaces_v3/interaction.lua
View file

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

6
code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini
View file

@ -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_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_data.7z?r=&ts=$TIMESTAMP"
data_download_filename=ryzom_live_data.7z data_download_filename=ryzom_live_data.7z
data_compressed_size=1500000000 data_compressed_size=1500000000
data_uncompressed_size=10000000000 data_uncompressed_size=7000000000
client_download_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_client_$ARCH.zip?r=&ts=$TIMESTAMP" client_download_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_client_$ARCH.7z?r=&ts=$TIMESTAMP"
client_download_filename=ryzom_live_client_$ARCH.zip client_download_filename=ryzom_live_client_$ARCH.7z
client_filename_windows=ryzom_client_r.exe client_filename_windows=ryzom_client_r.exe
client_filename_osx=Ryzom.app/Contents/MacOS/Ryzom client_filename_osx=Ryzom.app/Contents/MacOS/Ryzom
client_filename_linux=ryzom_client client_filename_linux=ryzom_client

2
code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp
View file

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

4
code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
View file

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