Merge branch 'develop' into ryzomclassic-develop

nel/src/pacs/move_container.cpp

@@ -419,13 +419,13 @@ void CMoveContainer::updateCells (CMovePrimitive *primitive, uint8 worldImage)
 	// Check BB width not too large
 	if (wI->getBBXMax() - wI->getBBXMin() > _CellWidth)
 	{
-		nlwarning ("Primitives have moved more than a cell.");
+		nlwarning ("Primitives have moved more than a cell, width: %f.", (float)(wI->getBBXMax() - wI->getBBXMin()));
 	}
 
 	// Check BB height not too large
 	if (wI->getBBYMax() - wI->getBBYMin() > _CellHeight)
 	{
-		nlwarning ("Primitives have moved more than a cell.");
+		nlwarning ("Primitives have moved more than a cell, height: %f.", (float)(wI->getBBYMax() - wI->getBBYMin()));
 	}
 #endif
 #endif

nel/src/sound/driver/xaudio2/source_xaudio2.cpp

@@ -480,7 +480,7 @@ void CSourceXAudio2::setLooping(bool l)
 					_SourceVoice->GetState(&voice_state);
 					if (voice_state.BuffersQueued)
 					{
-						nlwarning(NLSOUND_XAUDIO2_PREFIX "Not playing but buffer already queued while switching loop mode!?! Flush and requeue");
+						// nlwarning(NLSOUND_XAUDIO2_PREFIX "Not playing but buffer already queued while switching loop mode!?! Flush and requeue");
 						if (FAILED(_SourceVoice->FlushSourceBuffers())) 
 							nlwarning(NLSOUND_XAUDIO2_PREFIX "FAILED FlushSourceBuffers");
 						// queue buffer with correct looping parameters

nel/tools/build_gamedata/processes/shape/2_build.py

@@ -74,6 +74,13 @@ else:
 	printLog(log, ">>> Copy Shape <<<")
 	copyFilesExtNoTreeIfNeeded(log, shapeDirectory, ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory, ".shape")
 
+printLog(log, ">>> Copy non-ShadowSkin non-CLodTex Shape <<<")
+shapeDirectory = ExportBuildDirectory + "/" + ShapeNotOptimizedExportDirectory
+mkPath(log, shapeDirectory)
+mkPath(log, ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory)
+copyFilesExtNoTreeIfNeeded(log, shapeDirectory, ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory, ".shape")
+shapeDirectory = ExportBuildDirectory + "/" + ShapeClodtexBuildDirectory
+
 # copy lightmap_not_optimized to lightmap
 printLog(log, ">>> Optimize lightmaps <<<")
 loPathLightmapsOriginal = ExportBuildDirectory + "/" + ShapeLightmapNotOptimizedExportDirectory