From 6e93a0d395dca75580c2427428eb242c65a8de42 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Thu, 28 Jan 2016 13:25:21 +0100
Subject: [PATCH 1/4] Fixed: Wrong return value for CCmdArgs::haveAdditionalArg

--HG--
branch : develop
---
 code/nel/src/misc/cmd_args.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/nel/src/misc/cmd_args.cpp b/code/nel/src/misc/cmd_args.cpp
index 13d08428b..11464b222 100644
--- a/code/nel/src/misc/cmd_args.cpp
+++ b/code/nel/src/misc/cmd_args.cpp
@@ -172,7 +172,7 @@ bool CCmdArgs::haveAdditionalArg(const std::string &name) const
 
 		// they don't have any short or long name, but need a name in help
 		if (arg.shortName.empty() && arg.longName.empty() && !arg.helpName.empty() && arg.helpName == name && arg.found)
-			return false;
+			return true;
 	}
 
 	return false;

From 0b4a2a39b39268f5940b6d727d6e04d403310ee4 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Thu, 28 Jan 2016 13:26:02 +0100
Subject: [PATCH 2/4] Fixed: Don't display D3D item in tree under Linux and OS
 X

--HG--
branch : develop
---
 .../tools/client/client_config_qt/client_config_dialog.cpp   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
index 895db9873..b7d2e095e 100644
--- a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
+++ b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
@@ -75,6 +75,10 @@ CClientConfigDialog::CClientConfigDialog( QWidget *parent ) :
 	item = treeWidget->topLevelItem( 3 )->child( 1 );
 	item->setData( 0, Qt::UserRole, 7 );
 
+#ifndef Q_OS_WIN
+	// Hide Direct3D page under Linux and OS X
+	item->setHidden(true);
+#endif
 
 	CategoryStackedWidget->addWidget( new CGeneralSettingsWidget( CategoryStackedWidget ) );
 	CategoryStackedWidget->addWidget( new CDisplaySettingsWidget( CategoryStackedWidget ) );
@@ -85,6 +89,7 @@ CClientConfigDialog::CClientConfigDialog( QWidget *parent ) :
 	CategoryStackedWidget->addWidget( new CSysInfoOpenGLWidget( CategoryStackedWidget ) );
 
 #ifdef Q_OS_WIN
+	// Add Direct3D widget only under Windows
 	CategoryStackedWidget->addWidget( new CSysInfoD3DWidget( CategoryStackedWidget ) );
 #endif
 

From 086401f5d1b09542f38e760716408f2971e482a5 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Thu, 28 Jan 2016 13:26:45 +0100
Subject: [PATCH 3/4] Fixed: ReleaseDebug configuration not used anymore

--HG--
branch : develop
---
 .../tools/client/client_config_qt/client_config_dialog.cpp      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
index b7d2e095e..06a1964a4 100644
--- a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
+++ b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
@@ -147,8 +147,6 @@ void CClientConfigDialog::onClickPlay()
 
 #ifdef Q_OS_WIN32
 	started = QProcess::startDetached( "ryzom_client_r.exe" );
-	if( !started )
-		QProcess::startDetached( "ryzom_client_rd.exe" );
 	if( !started )
 		QProcess::startDetached( "ryzom_client_d.exe" );
 #elif defined(Q_OS_MAC)

From 178c1acc3b1a56c529719c76cdb2d01579a1aac4 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Thu, 28 Jan 2016 13:27:08 +0100
Subject: [PATCH 4/4] Changed: OS X bundles have app extension

--HG--
branch : develop
---
 .../tools/client/client_config_qt/client_config_dialog.cpp      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
index 06a1964a4..bfa9bbc58 100644
--- a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
+++ b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
@@ -150,7 +150,7 @@ void CClientConfigDialog::onClickPlay()
 	if( !started )
 		QProcess::startDetached( "ryzom_client_d.exe" );
 #elif defined(Q_OS_MAC)
-	started = QProcess::startDetached( "./Ryzom" );
+	started = QProcess::startDetached( "./Ryzom.app" );
 #else
 	started = QProcess::startDetached( "./ryzom_client" );
 #endif