Merged develop.

code/nel/src/gui/group_editbox.cpp

@@ -1320,6 +1320,16 @@ namespace NLGUI
 				}
 			}
 
+			// if click, and not frozen, then get the focus
+			if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouseleftup && !_Frozen)
+			{
+				_SelectingText = false;
+				if (_SelectCursorPos == _CursorPos)
+					_CurrSelection = NULL;
+				
+				return true;
+			}
+
 			if (!isIn(eventDesc.getX(), eventDesc.getY()))
 				return false;
 
@@ -1329,6 +1339,7 @@ namespace NLGUI
 				_SelectingText = true;
 				stopParentBlink();
 				CWidgetManager::getInstance()->setCaptureKeyboard (this);
+				CWidgetManager::getInstance()->setCapturePointerLeft (this);
 				// set the right cursor position
 				uint newCurPos;
 				bool cursorAtPreviousLineEnd;
@@ -1356,16 +1367,6 @@ namespace NLGUI
 				return true;
 			}
 
-			// if click, and not frozen, then get the focus
-			if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouseleftup && !_Frozen)
-			{
-				_SelectingText = false;
-				if (_SelectCursorPos == _CursorPos)
-					_CurrSelection = NULL;
-				
-				return true;
-			}
-
 			if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouserightdown)
 			{
 				CWidgetManager::getInstance()->setCapturePointerRight(this);

code/nel/src/gui/widget_manager.cpp

@@ -2312,7 +2312,9 @@ namespace NLGUI
 				getCapturePointerLeft() != getCapturePointerRight() )
 				handled|= getCapturePointerRight()->handleEvent(evnt);
 
-			if( _CapturedView != NULL )
+			if( _CapturedView != NULL &&
+				_CapturedView != getCapturePointerLeft() &&
+				_CapturedView != getCapturePointerRight() )
 				_CapturedView->handleEvent( evnt );
 
 			CInterfaceGroup *ptr = getWindowUnder (eventDesc.getX(), eventDesc.getY());
@@ -2537,6 +2539,12 @@ namespace NLGUI
 			{
 				if ( getCapturePointerLeft() != NULL)
 				{
+					if( !handled )
+					{
+						CCtrlBase *c = getCapturePointerLeft();
+						c->handleEvent( evnt );
+					}
+
 					setCapturePointerLeft(NULL);
 					handled = true;
 				}

code/nel/tools/build_gamedata/b1_client_dev.py

@@ -52,6 +52,10 @@ if not os.path.isfile(ClientDevDirectory + "/client.cfg"):
 	cfg.write("PreDataPath          = {\n")
 	cfg.write("\t\"" + InstallDirectory + "\", \"user\", \"patch\", \"data\", \"examples\" \n")
 	cfg.write("};\n")
+	cfg.write("PatchWanted          = 0;\n")
+	cfg.write("DisplayLuaDebugInfo  = 1;\n")
+	cfg.write("AllowDebugLua        = 1;\n")
+	cfg.write("FullScreen           = 0;\n")
 	printLog(log, "")
 
 printLog(log, ">>> Install data <<<")

code/nel/tools/build_gamedata/characters_dev.bat

@@ -0,0 +1,11 @@
+title Ryzom Core: 1_export.py (CHARACTERS)
+1_export.py -ipj common/characters common/characters_maps_hr
+title Ryzom Core: 2_build.py (CHARACTERS)
+2_build.py -ipj common/characters common/characters_maps_hr
+title Ryzom Core: 3_install.py (CHARACTERS)
+3_install.py -ipj common/characters common/characters_maps_hr
+title Ryzom Core: b1_client_dev.py (CHARACTERS)
+b1_client_dev.py
+title Ryzom Core: b2_shard_data.py (CHARACTERS)
+b2_shard_data.py
+title Ryzom Core: Ready (CHARACTERS)

code/nel/tools/build_gamedata/panoply_dev.bat

@@ -0,0 +1,11 @@
+title Ryzom Core: 1_export.py (PANOPLY)
+1_export.py -ipj common/characters_maps_hr
+title Ryzom Core: 2_build.py (PANOPLY)
+2_build.py -ipj common/characters_maps_hr
+title Ryzom Core: 3_install.py (PANOPLY)
+3_install.py -ipj common/characters_maps_hr
+title Ryzom Core: b1_client_dev.py (PANOPLY)
+b1_client_dev.py
+title Ryzom Core: b2_shard_data.py (PANOPLY)
+b2_shard_data.py
+title Ryzom Core: Ready (PANOPLY)

code/ryzom/client/src/progress.cpp

@@ -225,7 +225,7 @@ void CProgress::internalProgress (float value)
 
 		if (!stereoHMD || StereoDisplay->wantInterface2D())
 		{
-			nldebug("Draw progress 2D");
+			// nldebug("Draw progress 2D");
 
 			// Font factor
 			float fontFactor = 1;

code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp

@@ -237,24 +237,12 @@ void SItemSpecialEffects::serial(class NLMISC::IStream &f)
 //--------------------------------------------------------------
 //						init()  
 //--------------------------------------------------------------
-void CStaticItem::init()
+void CStaticItem::init(bool doDelete)
 {
 	Family			= ITEMFAMILY::UNDEFINED;
 	Type			= ITEM_TYPE::UNDEFINED;
 	
-	Armor			= NULL;
+	clearPtrs(doDelete);
-	MeleeWeapon		= NULL;
-	RangeWeapon		= NULL;
-	Ammo			= NULL;
-	Shield			= NULL;
-	TamingTool		= NULL;
-	Mp				= NULL;
-	GuildOption		= NULL;
-	Cosmetics		= NULL;
-	ItemServiceData	= NULL;
-	ConsumableItem	= NULL;
-	XpCatalyser		= NULL;
-	CommandTicket	= NULL;
 
 	Skill			= SKILLS::unknown;
 	MinSkill		= 0;
@@ -287,16 +275,54 @@ void CStaticItem::init()
 	RequiredCharacQualityFactor = 0.0f;
 	RequiredCharacQualityOffset = 0;
 
-	ItemSpecialEffects = NULL;
 } // init //
 
 
+// ***************************************************************************
+void CStaticItem::clearPtrs(bool doDelete)
+{
+	if (doDelete)
+	{
+		delete Armor;
+		delete MeleeWeapon;
+		delete RangeWeapon;
+		delete Ammo;
+		delete Shield;
+		delete TamingTool;
+		delete Mp;
+		delete GuildOption;
+		delete Cosmetics;
+		delete ItemServiceData;
+		delete ConsumableItem;
+		delete XpCatalyser;
+		delete CommandTicket;
+		delete ItemSpecialEffects;
+	}
+
+	Armor			= NULL;
+	MeleeWeapon		= NULL;
+	RangeWeapon		= NULL;
+	Ammo			= NULL;
+	Shield			= NULL;
+	TamingTool		= NULL;
+	Mp				= NULL;
+	GuildOption		= NULL;
+	Cosmetics		= NULL;
+	ItemServiceData	= NULL;
+	ConsumableItem	= NULL;
+	XpCatalyser		= NULL;
+	CommandTicket	= NULL;
+	ItemSpecialEffects = NULL;
+}
+
 
 //--------------------------------------------------------------
 // copy constructor
 //--------------------------------------------------------------
 CStaticItem::CStaticItem( const CStaticItem& itm )
 {
+	clearPtrs(false);
+
 	*this = itm;
 	if(itm.Armor)
 	{
@@ -1443,6 +1469,9 @@ void CStaticItem::readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm> &form,
 	if (form == NULL)
 		return;
 
+	// Clear pointers to previous data
+	clearPtrs(true);
+
 	// Get the root node, always exist
     UFormElm &root = form->getRootNode ();
 
@@ -1993,37 +2022,6 @@ float CStaticItem::getBaseWeight() const
 }
 #endif
 
-// ***************************************************************************
-void CStaticItem::clearPtrs(bool doDelete)
-{
-	if(doDelete)
-	{
-		if (Ammo != NULL )	delete Ammo;
-		if (Armor != NULL )	delete Armor;
-		if (MeleeWeapon != NULL )	delete MeleeWeapon;
-		if (RangeWeapon != NULL )	delete RangeWeapon;
-		if (Cosmetics != NULL )	delete Cosmetics;
-		if (Mp != NULL )	delete Mp;
-		if (GuildOption != NULL )	delete GuildOption;
-		if (Shield != NULL )	delete Shield;
-		if (TamingTool != NULL)	delete TamingTool;
-		if (ItemServiceData != NULL)	delete ItemServiceData;
-		if (CommandTicket != NULL)	delete CommandTicket;
-	}
-
-	Ammo = NULL;
-	Armor = NULL;
-	MeleeWeapon = NULL;
-	RangeWeapon = NULL;
-	Cosmetics = NULL;
-	Mp = NULL;
-	GuildOption = NULL;
-	Shield = NULL;
-	TamingTool = NULL;
-	ItemServiceData = NULL;
-	CommandTicket = NULL;
-}
-
 
 uint32 CStaticItem::getMaxStackSize() const
 {

code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h

@@ -812,13 +812,13 @@ public:
 public:
 
 	/// Constructor
-	CStaticItem() { init(); }
+	CStaticItem() { init(false); }
 
 	/// copy constructor
 	CStaticItem( const CStaticItem& itm );
 
 	/// init method
-	void init();
+	void init(bool doDelete = true);
 
 	/// destructor
 	virtual ~CStaticItem();