Merge branch 'main/atys-live' into feature/atys-core-merge

ryzom · Aug 28, 2024 · da20dcb · da20dcb
2 parents 7b96d6d + 08f0831
commit da20dcb
Show file tree

Hide file tree

Showing 260 changed files with 12,698 additions and 5,942 deletions.
diff --git a/.gitignore b/.gitignore
@@ -90,7 +90,6 @@ ylwrap
 *.mk
 
 # Visual Studio garbage
-.vscode/
 *.opensdf
 UpgradeLog*.XML
 _UpgradeReport_Files

diff --git a/nel/include/nel/gui/group_container.h b/nel/include/nel/gui/group_container.h
@@ -238,8 +238,10 @@ namespace NLGUI
 		std::string		getTitle () const;
 		void			setTitle (const std::string &title);
 		std::string		getTitleOpened () const;
+	    CViewText*		getTitleOpenedViewText() { return _TitleOpened; };
 		void			setTitleOpened (const std::string &title);
 		std::string		getTitleClosed () const;
+	    CViewText*		getTitleClosedViewText() { return _TitleClosed; };
 		void			setTitleClosed (const std::string &title);
 		std::string		getTitleColorAsString() const;
 		void			setTitleColorAsString(const std::string &col);

diff --git a/nel/include/nel/gui/group_editbox.h b/nel/include/nel/gui/group_editbox.h
@@ -194,6 +194,7 @@ namespace NLGUI
 			REFLECT_LUA_METHOD("setFocusOnText", luaSetFocusOnText);
 			REFLECT_LUA_METHOD("cancelFocusOnText", luaCancelFocusOnText);
 			REFLECT_STRING("input_string", getInputString, setInputString);
+			REFLECT_STRING("prompt", getPrompt, setPrompt);
 #ifdef RYZOM_LUA_UCSTRING
 			REFLECT_UCSTRING("uc_input_string", getInputStringAsUtf16, setInputStringAsUtf16); // Compatibility
 #endif

diff --git a/nel/src/3d/u_instance.cpp b/nel/src/3d/u_instance.cpp
@@ -42,7 +42,8 @@ namespace NL3D
 void UInstance::getShapeAABBox(NLMISC::CAABBox &bbox) const
 {
 	CTransformShape	*object = getObjectPtr();
-	object->getAABBox(bbox);
+	if (object)
+		object->getAABBox(bbox);
 }
 
 // ***************************************************************************
@@ -108,7 +109,7 @@ void		UInstance::selectTextureSet(uint id)
 void		UInstance::enableAsyncTextureMode(bool enable)
 {
 	CTransformShape	*object = getObjectPtr();
-	if(object->isMeshBaseInstance())
+	if(object && object->isMeshBaseInstance())
 	{
 		CMeshBaseInstance *mbi  = static_cast<CMeshBaseInstance *>(object);
 		mbi->enableAsyncTextureMode(enable) ;
@@ -118,7 +119,7 @@ void		UInstance::enableAsyncTextureMode(bool enable)
 bool		UInstance::getAsyncTextureMode() const
 {
 	CTransformShape	*object = getObjectPtr();
-	if(object->isMeshBaseInstance())
+	if(object && object->isMeshBaseInstance())
 	{
 		CMeshBaseInstance *mbi  = static_cast<CMeshBaseInstance *>(object);
 		return mbi->getAsyncTextureMode() ;
@@ -130,7 +131,7 @@ bool		UInstance::getAsyncTextureMode() const
 void		UInstance::startAsyncTextureLoading()
 {
 	CTransformShape	*object = getObjectPtr();
-	if(object->isMeshBaseInstance())
+	if(object && object->isMeshBaseInstance())
 	{
 		CMeshBaseInstance *mbi  = static_cast<CMeshBaseInstance *>(object);
 		mbi->startAsyncTextureLoading(getPos());
@@ -140,7 +141,7 @@ void		UInstance::startAsyncTextureLoading()
 bool		UInstance::isAsyncTextureReady()
 {
 	CTransformShape	*object = getObjectPtr();
-	if(object->isMeshBaseInstance())
+	if(object && object->isMeshBaseInstance())
 	{
 		CMeshBaseInstance *mbi  = static_cast<CMeshBaseInstance *>(object);
 		return mbi->isAsyncTextureReady();
@@ -152,7 +153,7 @@ bool		UInstance::isAsyncTextureReady()
 void		UInstance::setAsyncTextureDistance(float dist)
 {
 	CTransformShape	*object = getObjectPtr();
-	if(object->isMeshBaseInstance())
+	if(object && object->isMeshBaseInstance())
 	{
 		CMeshBaseInstance *mbi  = static_cast<CMeshBaseInstance *>(object);
 		mbi->setAsyncTextureDistance(dist);
@@ -162,7 +163,7 @@ void		UInstance::setAsyncTextureDistance(float dist)
 float		UInstance::getAsyncTextureDistance() const
 {
 	CTransformShape	*object = getObjectPtr();
-	if(object->isMeshBaseInstance())
+	if(object && object->isMeshBaseInstance())
 	{
 		CMeshBaseInstance *mbi  = static_cast<CMeshBaseInstance *>(object);
 		return mbi->getAsyncTextureDistance();
@@ -174,7 +175,7 @@ float		UInstance::getAsyncTextureDistance() const
 void		UInstance::setAsyncTextureDirty(bool flag)
 {
 	CTransformShape	*object = getObjectPtr();
-	if(object->isMeshBaseInstance())
+	if(object && object->isMeshBaseInstance())
 	{
 		CMeshBaseInstance *mbi  = static_cast<CMeshBaseInstance *>(object);
 		mbi->setAsyncTextureDirty(flag);
@@ -184,7 +185,7 @@ void		UInstance::setAsyncTextureDirty(bool flag)
 bool		UInstance::isAsyncTextureDirty() const
 {
 	CTransformShape	*object = getObjectPtr();
-	if(object->isMeshBaseInstance())
+	if(object && object->isMeshBaseInstance())
 	{
 		CMeshBaseInstance *mbi  = static_cast<CMeshBaseInstance *>(object);
 		return mbi->isAsyncTextureDirty();

diff --git a/nel/src/gui/group_container.cpp b/nel/src/gui/group_container.cpp
@@ -3970,11 +3970,11 @@ namespace NLGUI
 		setTitleClosed(title);
 	}
 
-	// ***************************************************************************
-	std::string		CGroupContainer::getTitleOpened () const
-	{
-		return _TitleTextOpened;
-	}
+    // ***************************************************************************
+    std::string CGroupContainer::getTitleOpened() const
+    {
+	    return _TitleTextOpened;
+    }
 
 	// ***************************************************************************
 	void			CGroupContainer::setTitleOpened (const std::string &title)

diff --git a/nel/src/gui/group_editbox.cpp b/nel/src/gui/group_editbox.cpp
@@ -1308,13 +1308,13 @@ namespace NLGUI
 			{
 				makeTopWindow();
 				// for french, deutsch and russian, be aware of unicode
-				std::string command = CUtfStringView(_InputString.substr(1)).toUtf8();
-				ICommand::expand(command);
+				//std::string command = CUtfStringView(_InputString.substr(1)).toUtf8();
+				//ICommand::expand(command);
 				// then back to u32string
-				_InputString = CUtfStringView('/' + command).toUtf32();
-				_InputString = _InputString;
-				_CursorPos = (sint32)_InputString.length();
-				_CursorAtPreviousLineEnd = false;
+				//_InputString = CUtfStringView('/' + command).toUtf32();
+				//_InputString = _InputString;
+				//_CursorPos = (sint32)_InputString.length();
+				//_CursorAtPreviousLineEnd = false;
 				triggerOnChangeAH();
 				return true;
 			}

diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
@@ -3521,8 +3521,14 @@ namespace NLGUI
 			else if (form.Entries[i].ComboBox)
 			{
 				CDBGroupComboBox *cb = form.Entries[i].ComboBox;
-				entryData = form.Entries[i].SelectValues[cb->getSelection()];
-				addEntry = true;
+				if (cb)
+				{
+					if (form.Entries[i].SelectValues.size() > 0)
+					{
+						entryData = form.Entries[i].SelectValues[cb->getSelection()];
+						addEntry = true;
+					}
+				}
 			}
 			else if (form.Entries[i].SelectBox)
 			{

diff --git a/nel/src/gui/lua_manager.cpp b/nel/src/gui/lua_manager.cpp
@@ -75,19 +75,15 @@ namespace NLGUI
 		}
 		catch( const ELuaError &e )
 		{
-			std::string ryzom_version = RYZOM_VERSION;
-			if (!FINAL_VERSION || ryzom_version.find("Omega") == std::string::npos) // Omega version are the one used on live servers
+			nlwarning("--- LUA ERROR ---");
+			nlwarning(e.luaWhat().c_str());
+			std::vector<std::string> res;
+			NLMISC::explode(luaScript, std::string("\n"), res);
+			for(uint k = 0; k < res.size(); ++k)
 			{
-				nlwarning("--- LUA ERROR ---");
-				nlwarning(e.luaWhat().c_str());
-				std::vector<std::string> res;
-				NLMISC::explode(luaScript, std::string("\n"), res);
-				for(uint k = 0; k < res.size(); ++k)
-				{
-					nlwarning("%.05u %s", k, res[k].c_str());
-				}
-				nlwarning("--- ********* ---");
+				nlwarning("%.05u %s", k, res[k].c_str());
 			}
+			nlwarning("--- ********* ---");
 			return false;
 		}
 

diff --git a/nel/src/misc/path.cpp b/nel/src/misc/path.cpp
@@ -1107,9 +1107,6 @@ void CFileContainer::addSearchPath (const string &path, bool recurse, bool alter
 				progressCallBack->pushCropedValues ((float)f/(float)filesToProcess.size(), (float)(f+1)/(float)filesToProcess.size());
 			}
 
-			string filename = CFile::getFilename (filesToProcess[f]);
-			string filepath = CFile::getPath (filesToProcess[f]);
-//			insertFileInMap (filename, filepath, false, CFile::getExtension(filename));
 			addSearchFile (filesToProcess[f], false, "", progressCallBack);
 
 			// Progress bar
@@ -1168,6 +1165,12 @@ void CFileContainer::addSearchFile (const string &file, bool remap, const string
 		return;
 	}
 
+	string filename = CFile::getFilename (newFile);
+	string filepath = CFile::getPath (newFile);
+	map<string, string>::iterator itss = _RemappedFiles.find(filename);
+	if (itss != _RemappedFiles.end())
+		newFile = filepath+"/"+itss->second;
+
 	std::string fileExtension = CFile::getExtension(newFile);
 
 	// check if it s a big file
@@ -1195,7 +1198,7 @@ void CFileContainer::addSearchFile (const string &file, bool remap, const string
 	}
 
 	string filenamewoext = CFile::getFilenameWithoutExtension (newFile);
-	string filename, ext;
+	string ext;
 
 	if (virtual_ext.empty())
 	{

diff --git a/ryzom/client/client_default.cfg b/ryzom/client/client_default.cfg
@@ -308,6 +308,9 @@ HDEntityTexture     = 1;
 HDTextureInstalled  = 1;
 WaitVBL             = 0;	// 0 or 1 to wait Vertical Sync.
 
+EnableEventsBnp     = 1;
+EnableOccsBnp       = 0;
+
 //////////////////
 // GAME OPTIONS //
 //////////////////

diff --git a/ryzom/client/data/gamedev/html/help/interf_action_book_de.html b/ryzom/client/data/gamedev/html/help/interf_action_book_de.html
@@ -8,9 +8,9 @@
 
 
 <table width="100%" border="0" cellspacing="4" cellpadding="0">
-  <tr> 
-    <td align="center"> 
-      <h1><a href="ah:context_help&target=ui:interface:phrase_book&text=uiPhraseBookTitle">Aktionsentwicklungsfenster</a></h1>
+  <tr>
+    <td align="center">
+      <h1><a href="ah:context_help&target=ui:interface:phrase_book&text=uiMK_Actions">Levels</a></h1>
     </td>
   </tr>
 </table>
@@ -36,8 +36,8 @@ <h4>Aktionen</h4>
 Du musst eine <a href="ah:context_help&target=ui:interface:phrase_book:content:content:sbtree:tree_list:0&itext=Select">Fähigkeit auswählen</a> um Dir die Aktionen, die zu dieser Fähigkeit gehören, anzeigen zu lassen. <BR>
 Die noch nicht erlernten Aktionen sind ausgegraut. <BR>
 Die Aktionen, die Du noch nicht lernen kannst, da bestimmte Vorraussetzungen noch nicht erfüllt sind (z.B.: Du hast den benötigten Fähigkeitslevel noch nicht erreicht) werden rot angezeigt. <BR>
-Die Aktionen sind in zwei Gruppen aufgeteilt: 
-<a href="ah:context_help&target=ui:interface:phrase_book:content:tab_group:action_select:tab0&text=uitabPhraseActions">Aktionen</a>, and 
+Die Aktionen sind in zwei Gruppen aufgeteilt:
+<a href="ah:context_help&target=ui:interface:phrase_book:content:tab_group:action_select:tab0&text=uitabPhraseActions">Aktionen</a>, and
 <a href="ah:context_help&target=ui:interface:phrase_book:content:tab_group:action_select:tab1&text=uitabPhraseUpgrades">Aktions-Verbesserungen</a>.<BR>
 Du kannst Aktionen von hier aus per Drag'n'Drop in die Aktionsleiste ziehen, bei Aktions-Verbesserungen geht dies nicht, da sie keine eigenständige Aktion verkörpern und somit nicht ausgeführt werden können.<BR>
 </P>

diff --git a/ryzom/client/data/gamedev/html/help/interf_action_book_en.html b/ryzom/client/data/gamedev/html/help/interf_action_book_en.html
@@ -8,9 +8,9 @@
 
 
 <table width="100%" border="0" cellspacing="4" cellpadding="0">
-  <tr> 
-    <td align="center"> 
-      <h1><a href="ah:context_help&target=ui:interface:phrase_book&text=uiPhraseBookTitle">Action Progression</a></h1>
+  <tr>
+    <td align="center">
+      <h1><a href="ah:context_help&target=ui:interface:phrase_book&text=uiMK_Actions">Levels</a></h1>
     </td>
   </tr>
 </table>
@@ -22,22 +22,22 @@ <h1><a href="ah:context_help&target=ui:interface:phrase_book&text=uiPhraseBookTi
 <br><h4>Skill Tree</h4>
 The <a href="ah:context_help&target=ui:interface:phrase_book:content:content:sbtree&text=uiSkillTree">Skill Tree</a> allows you to see the state of your skills.
 <BR>It displays the current level of the skill and its max level (eg: Craft: 1/20</a>).
-<BR>The bar indicates the progression in the current skill level. 
+<BR>The bar indicates the progression in the current skill level.
 <BR>The color of the skill indicates either:
 <BR>- transparent: skill not trained
 <BR>- orange: skill currently trained
 <BR>- green: skill completed
 
 <BR><BR>When you complete a skill, a new part of the tree is opened, which you can see by clicking on "+".
-<BR>The whole skill tree is not displayed. Only completed skills, currently trained skills, 
+<BR>The whole skill tree is not displayed. Only completed skills, currently trained skills,
 and the untrained skills that relies directly on a trained skill are displayed.
 <br><h4>Actions</h4>
 The Actions part shows the actions you can learn or the actions you have learnt at each skill level.
 <BR>You have to <a href="ah:context_help&target=ui:interface:phrase_book:content:content:sbtree:tree_list:0&itext=Select">select a skill</a> to see the actions related to this skill.
 <BR>The actions you have not learned are grayed out.
 <BR>The actions you cannot learn because you do not meet the requirements (e.g. you don't have the required skill level) displayed are in red.
-<br><br>The actions are separated in two groups: 
-<a href="ah:context_help&target=ui:interface:phrase_book:content:tab_group:action_select:tab0&text=uitabPhraseActions">Actions</a>, and 
+<br><br>The actions are separated in two groups:
+<a href="ah:context_help&target=ui:interface:phrase_book:content:tab_group:action_select:tab0&text=uitabPhraseActions">Actions</a>, and
 <a href="ah:context_help&target=ui:interface:phrase_book:content:tab_group:action_select:tab1&text=uitabPhraseUpgrades">Upgrades</a>.
 <BR><br>You can drag and drop an Action to your action bar, but you cannot drag an Action Upgrade because they are either characteristic upgrades, or action upgrades
 which are not castable directly.

diff --git a/ryzom/client/data/gamedev/html/help/interf_action_book_fr.html b/ryzom/client/data/gamedev/html/help/interf_action_book_fr.html
@@ -8,9 +8,9 @@
 
 
 <table width="100%" border="0" cellspacing="4" cellpadding="0">
-  <tr> 
-    <td align="center"> 
-      <h1><a href="ah:context_help&target=ui:interface:phrase_book&text=uiPhraseBookTitle">Progession des Actions</a></h1>
+  <tr>
+    <td align="center">
+      <h1><a href="ah:context_help&target=ui:interface:phrase_book&text=uiMK_Actions">Niveaux</a></h1>
     </td>
   </tr>
 </table>
@@ -30,15 +30,15 @@ <h4>Arbre de Compétences</h4>
 	- vert : compétence terminée <BR>
 <BR>
 Lorsque vous terminez une compétence, vous avez accès à de nouvelles compétences. Vous pouvez explorer l'arbre de compétences en cliquant sur "+". <BR>
-L'arbre de compétences n'est pas affiché dans son ensemble. Il n'y a que les compétences terminées ou en cours d'entraînement d'affichées. 
+L'arbre de compétences n'est pas affiché dans son ensemble. Il n'y a que les compétences terminées ou en cours d'entraînement d'affichées.
 Les compétences non entraînées en rapport direct avec une compétence entraînée sont également affichées. <BR>
 <h4>Actions</h4>
 La partie Actions indique les actions que vous pouvez apprendre ou avez appris à chaque niveau de compétence. <BR>
 Vous devez <a href="ah:context_help&target=ui:interface:phrase_book:content:content:sbtree:tree_list:0&itext=Select">sélectionner une compétence</a> pour connaître les actions liées à cette compétence. <BR>
 Les actions que vous ne connaissez pas sont grisées. <BR>
 Les actions que vous n'avez pas apprises car les prérequis ne sont pas remplis (ex. : vous n'avez pas atteint le niveau de compétence requis) sont en rouge. <BR>
-Les actions se distinguent en deux groupes : 
-<a href="ah:context_help&target=ui:interface:phrase_book:content:tab_group:action_select:tab0&text=uitabPhraseActions">Actions</a>, et 
+Les actions se distinguent en deux groupes :
+<a href="ah:context_help&target=ui:interface:phrase_book:content:tab_group:action_select:tab0&text=uitabPhraseActions">Actions</a>, et
 <a href="ah:context_help&target=ui:interface:phrase_book:content:tab_group:action_select:tab1&text=uitabPhraseUpgrades">Actions Suprêmes</a>.<BR>
 Vous pouvez glisser-déposer une Action dans votre barre actions mais vous ne pouvez pas glisser une Action Suprême car il peut s'agir d'une mise à jour de caractéristiques ou d'actions
 qui ne sont pas utilisables en tant que sorts.<BR>

diff --git a/ryzom/client/data/gamedev/interfaces_v3/actions.xml b/ryzom/client/data/gamedev/interfaces_v3/actions.xml
@@ -417,6 +417,7 @@
 	<action name="camera_down"			hardtext="uiCameraDown" />
 	<action name="camera_foreward"			hardtext="uiMoveForward" />
 	<action name="camera_backward"			hardtext="uiMoveBackward" />
+	<action name="toggle_free_look"			hardtext="uiToggleFreeLook" />
 </action_category>
 
 <action_category name="windows" hardtext="uiWindows" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">

diff --git a/ryzom/client/data/gamedev/interfaces_v3/appzone.lua b/ryzom/client/data/gamedev/interfaces_v3/appzone.lua
@@ -190,3 +190,6 @@ function AppZone:handle(cmd)
     self:launchApp(cmd)
   end
 end
+
+-- VERSION --
+RYZOM_APPZONE_VERSION = 324