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-05-18 14:31:14 +02:00
commit 719e6f6e85
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/ryzom/client/src/commands.cpp
View file

@ -5806,3 +5806,10 @@ NLMISC_COMMAND(playedTime, "Display character played time", "")
CInterfaceManager::getInstance()->displaySystemInfo(msg, "AROUND"); CInterfaceManager::getInstance()->displaySystemInfo(msg, "AROUND");
return true; return true;
} }
NLMISC_COMMAND(version, "Display client version", "")
{
ucstring msg = getDebugVersion();
CInterfaceManager::getInstance()->displaySystemInfo(msg, "AROUND");
return true;
}

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

@ -31,6 +31,8 @@ CMainWindow::CMainWindow():QMainWindow(), m_statusLabel(NULL)
{ {
setupUi(this); setupUi(this);
setWindowFlags(windowFlags() & ~Qt::WindowMaximizeButtonHint);
// downloader // downloader
m_downloader = new CDownloader(this); m_downloader = new CDownloader(this);