Merge with develop

--HG--
branch : compatibility-develop

code/CMakeModules/nel.cmake

@@ -258,6 +258,7 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
   OPTION(WITH_NELNS               "Build NeL Network Services."                   OFF)
   OPTION(WITH_RYZOM               "Build Ryzom Core."                             ON )
   OPTION(WITH_SNOWBALLS           "Build Snowballs."                              OFF)
+  OPTION(WITH_TOOLS               "Build Tools"                                   OFF)
 ENDMACRO(NL_SETUP_DEFAULT_OPTIONS)
 
 MACRO(NL_SETUP_NEL_DEFAULT_OPTIONS)

code/ryzom/client/data/gamedev/interfaces_v3/compass.xml

@@ -265,7 +265,7 @@
             fontsize="10"
             line_maxw="182"
             shadow="true"
-            hardtext="No File..." />
+            hardtext="uiNoFiles" />
     </group>
   </group>
   <tree node="mp3_player" />

code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml

@@ -183,7 +183,7 @@
             posref="BL BL"
             scale="true"
             y="4"
-            w="110"
+            w="130"
             h="2"
             texture="W_line_hor2.tga" />
       <view type="text"
@@ -202,7 +202,7 @@
             posref="MM MM"
             x="0"
             y="-1"
-            w="110"
+            w="130"
             h="8"
             vertical="false"
             align="L"
@@ -246,7 +246,7 @@
             posref="BL BL"
             scale="true"
             y="4"
-            w="110"
+            w="130"
             h="2"
             texture="W_line_hor2.tga" />
       <view type="text"
@@ -265,7 +265,7 @@
             posref="MM MM"
             x="0"
             y="-1"
-            w="110"
+            w="130"
             h="8"
             vertical="false"
             align="L"
@@ -3441,7 +3441,7 @@
                widget="sbint"
                link="UI:SAVE:CHAT:FONT_SIZE"
                min="9"
-               max="14"
+               max="20"
                realtime="true" />
         <param ui="entity_colors:cc_user:c"
                type="db"

code/tool/CMakeLists.txt

@@ -0,0 +1 @@
+ADD_SUBDIRECTORY(bin2c)

code/tool/bin2c/CMakeLists.txt

@@ -0,0 +1,8 @@
+FILE(GLOB SRC *.cpp *.h)
+
+ADD_EXECUTABLE(bin2c ${SRC})
+
+NL_DEFAULT_PROPS(bin2c "Tools: bin2c")
+NL_ADD_RUNTIME_FLAGS(bin2c)
+
+INSTALL(TARGETS bin2c RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools)