various improvements to clients

.gitignore

@@ -166,7 +166,9 @@ code/build_mac
 code/build_linux32
 code/build_linux64
 code/build_windows32
+code/build_windows64
 code/build_server
+code/build_nel_tools
 
 # Linux nel compile
 code/nel/build/nel-config
@@ -243,6 +245,7 @@ code/ryzom/tools/server/ryzom_ams/old
 
 #tools and external dir's
 external
+external_vc14
 external_stlport
 nel_tools*
 ryzom_tools*

code/CMakeLists.txt

@@ -66,6 +66,7 @@ SET(AUTHOR "Winch Gate and The Ryzom Core Community")
 SET(RYZOM_VERSION_MAJOR 2)
 SET(RYZOM_VERSION_MINOR 9)
 SET(RYZOM_VERSION_PATCH 0)
+SET(REVISION 0)
 
 #-----------------------------------------------------------------------------
 # Redirect output files

code/nel/include/nel/3d/skeleton_model.h

@@ -87,7 +87,7 @@ public:
 	/** The list of CBone, created from the CSkeletonShape.
 	 * They are odered in depth-first order.
 	 */
-	std::vector<CBone>			Bones;
+	std::vector<const CBone>			Bones;
 
 public:
 	/// \name IAnimatable Interface (registering only IAnimatable sons (bones)).

code/ryzom/client/client_default.cfg

@@ -1,9 +1,9 @@
 //////////////////////////
-//////////////////////////
 /// CLIENT CONFIG FILE ///
 //////////////////////////
 //////////////////////////
 
+//////////////////////////
 
 // If you set this variable to 1, your client.cfg will be overwritten when you quit the client. 
 // You will loose all the comments and identation in this file.
@@ -15,12 +15,12 @@ SaveConfig = 1;
 
 Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1"  & "Direct3D" or "2"
                  // "Auto" will choose the best suited driver depending on hardware
-FullScreen = 1;
+FullScreen = 0;
-Width      = 1024;
+Width      = 0;
-Height     = 768;
+Height     = 0;
 PositionX  = 0;
 PositionY  = 0;
-Frequency  = 60;
+Frequency  = 0;
 Depth      = 32;
 Sleep      = -1;
 ProcessPriority        = 0;        // -2 = idle, -1 = below normal, 0 = normal, 1 = above normal, 2 = high, 3 = real time
@@ -86,9 +86,15 @@ XMLOutGameInterfaceFiles = {
         "out_v2_keys.xml",
 };
 
-TexturesInterface     = "texture_interfaces_v3";
+ TexturesInterface    = {
-TexturesInterfaceDXTC = "texture_interfaces_dxtc";
+        "interface_game_khaganat"
-
+ };
+ TexturesLoginInterface    = {
+         "interface_login_khaganat"
+ };
+ TexturesOutGameInterface    = {
+         "interface_outgame_khaganat"
+ };
 
 // The ligo primitive class file
 LigoPrimitiveClass = "world_editor_classes.xml";
@@ -224,7 +230,7 @@ FXAA_ps3	= 1;
 
 AnisotropicFilter        = 0;
 
-Bloom = 0;
+Bloom = 1;
 Bloom_ps0        = 0;
 Bloom_ps1        = 1;
 Bloom_ps2        = 1;
@@ -284,7 +290,7 @@ DivideTextureSizeBy2= 0;	// Divide texture size
 DisableVtxProgram   = 0;        // Disable Hardware Vertex Program.
 DisableVtxAGP       = 0;        // Disable Hardware Vertex AGP.
 DisableTextureShdr  = 0;        // Disable Hardware Texture Shader.
-HDEntityTexture     = 0;
+HDEntityTexture     = 1;
 HDTextureInstalled  = 1;
 WaitVBL             = 0;        // 0 or 1 to wait Vertical Sync.
 
@@ -343,7 +349,8 @@ SoundGameMusicVolume_max = 1.0;
 SoundGameMusicVolume_step = 0.001;
 
 // MISC
-PreDataPath = { "user", "patch", "data", "examples" };
+PreDataPath = { "user", "data", "patch", "examples", };
+DataPath = { "data" };
 NeedComputeVS = 0;
 
 NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" };

code/ryzom/client/macosx/Info.plist

@@ -43,7 +43,7 @@
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.role-playing-games</string>
 	<key>LSFileQuarantineEnabled</key>
-	<true/>
+	<false/>
 	<key>LSMinimumSystemVersion</key>
 	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
 	<key>LSRequiresCarbon</key>

code/ryzom/client/macosx/upgd_nl.sh

@@ -8,7 +8,7 @@ fi
 
 # determine directory where all files reside
 CONTENTSPATH=$(dirname "$ROOTPATH")
-MACOSPATH=$(dirname "$RYZOM_CLIENT")
+MACOSPATH=$(dirname "$KHANAT_CLIENT")
 SIGNPATH=$CONTENTSPATH/_CodeSignature
 
 # all files of original Bundle are in the same directory
@@ -24,21 +24,21 @@ cp -p "$ROOTPATH/Info.plist" "$CONTENTSPATH"
 cp -p "$ROOTPATH/CodeResources" "$SIGNPATH"
 
 # executable flag for all executables
-chmod +x "$ROOTPATH/Ryzom"
+chmod +x "$ROOTPATH/Khanat"
 chmod +x "$ROOTPATH/CrashReport"
-chmod +x "$ROOTPATH/RyzomClientPatcher"
+chmod +x "$ROOTPATH/KhanatClientPatcher"
-chmod +x "$ROOTPATH/RyzomConfiguration"
+chmod +x "$ROOTPATH/KhanatConfiguration"
 
 # remove previous executables
-rm -f "$MACOSPATH/Ryzom"
+rm -f "$MACOSPATH/Khanat"
 rm -f "$MACOSPATH/CrashReport"
-rm -f "$MACOSPATH/RyzomClientPatcher"
+rm -f "$MACOSPATH/KhanatClientPatcher"
-rm -f "$MACOSPATH/RyzomConfiguration"
+rm -f "$MACOSPATH/KhanatConfiguration"
 
 # copy all binaries in MacOS directory
-cp -p "$ROOTPATH/Ryzom" "$MACOSPATH"
+cp -p "$ROOTPATH/Khanat" "$MACOSPATH"
 cp -p "$ROOTPATH/CrashReport" "$MACOSPATH"
-cp -p "$ROOTPATH/RyzomClientPatcher" "$MACOSPATH"
+cp -p "$ROOTPATH/KhanatClientPatcher" "$MACOSPATH"
-cp -p "$ROOTPATH/RyzomConfiguration" "$MACOSPATH"
+cp -p "$ROOTPATH/KhanatConfiguration" "$MACOSPATH"
 
 exit 0

code/ryzom/client/src/login_patch.cpp

@@ -919,7 +919,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
 		//use bat if windows if not use sh
 #ifdef NL_OS_WINDOWS
 		contentPrefix += "@echo off\n";
-		contentPrefix += "set RYZOM_CLIENT=\"%1\"\n";
+		contentPrefix += "set KHANAT_CLIENT=\"%1\"\n";
 		contentPrefix += "set UNPACKPATH=\"%2\"\n";
 		contentPrefix += "set ROOTPATH=\"%3\"\n";
 		contentPrefix += "set STARTUPPATH=\"%4\"\n";
@@ -930,7 +930,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
 		contentPrefix += "set SHARDID=%7\n";
 #else
 		contentPrefix += "#!/bin/sh\n";
-		contentPrefix += "export RYZOM_CLIENT=$1\n";
+		contentPrefix += "export KHANAT_CLIENT=$1\n";
 		contentPrefix += "export UNPACKPATH=$2\n";
 		contentPrefix += "export ROOTPATH=$3\n";
 		contentPrefix += "export STARTUPPATH=$4\n";
@@ -960,7 +960,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
 		if (wantRyzomRestart)
 		{
 			// client shouldn't be in memory anymore else it couldn't be overwritten
-			contentSuffix += toString("start \"\" /D \"%%STARTUPPATH%%\" \"%%RYZOM_CLIENT%%\" %s %%LOGIN%% %%PASSWORD%% %%SHARDID%%\n", additionalParams.c_str());
+			contentSuffix += toString("start \"\" /D \"%%STARTUPPATH%%\" \"%%KHANAT_CLIENT%%\" %s %%LOGIN%% %%PASSWORD%% %%SHARDID%%\n", additionalParams.c_str());
 		}
 #else
 		if (wantRyzomRestart)
@@ -973,7 +973,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
 		contentSuffix += "if [ -e \"$UPGRADE_FILE\" ]; then chmod +x \"$UPGRADE_FILE\" && \"$UPGRADE_FILE\"; fi\n\n";
 
 		// be sure file is executable
-		contentSuffix += "chmod +x \"$RYZOM_CLIENT\"\n\n";
+		contentSuffix += "chmod +x \"$KHANAT_CLIENT\"\n\n";
 
 		if (wantRyzomRestart)
 		{
@@ -981,7 +981,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
 			contentSuffix += "cd \"$STARTUPPATH\"\n\n";
 
 			// launch new client
-			contentSuffix += toString("\"$RYZOM_CLIENT\" %s $LOGIN $PASSWORD $SHARDID\n", additionalParams.c_str());
+			contentSuffix += toString("\"$KHANAT_CLIENT\" %s $LOGIN $PASSWORD $SHARDID\n", additionalParams.c_str());
 		}
 #endif
 

code/ryzom/client/unix/upgd_nl.sh

@@ -7,9 +7,9 @@ then
 fi
 
 # executable flag for all executables
-chmod +x "$ROOTPATH/ryzom_client"
+chmod +x "$ROOTPATH/khanat_client"
 chmod +x "$ROOTPATH/crash_report"
-chmod +x "$ROOTPATH/ryzom_client_patcher"
+chmod +x "$ROOTPATH/khanat_client_patcher"
-chmod +x "$ROOTPATH/ryzom_configuration_qt"
+chmod +x "$ROOTPATH/khanat_configuration_qt"
 
 exit 0

code/ryzom/common/data_common/msg.xml

@@ -173,7 +173,7 @@
           sendto="EGS"
           format="u8"
           description="the client select a new slot to defend (or none)" />
-    <leaf name="FLYING_HP_DELTA"
+    <leaf name="FLYING_ChaScore1_DELTA"
           description="add a flying text to an entity (u32 entity, u32 rgba, s16 delta)" />
     <leaf name="FLYING_TEXT_ISE"
           description="add a flying text to an entity (u32 entity, u32 rgba, u8 effect, s32 param)" />