From cb77f1df66fb1e531f9a2531bb2fc239e0e5f63e Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 7 Feb 2016 16:28:23 +0100 Subject: [PATCH 1/4] Added: CMake file for bin2c --HG-- branch : develop --- code/CMakeModules/nel.cmake | 1 + code/tool/CMakeLists.txt | 1 + code/tool/bin2c/CMakeLists.txt | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 code/tool/CMakeLists.txt create mode 100644 code/tool/bin2c/CMakeLists.txt diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake index 59fbb3916..aeac7277d 100644 --- a/code/CMakeModules/nel.cmake +++ b/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) diff --git a/code/tool/CMakeLists.txt b/code/tool/CMakeLists.txt new file mode 100644 index 000000000..5198e56c9 --- /dev/null +++ b/code/tool/CMakeLists.txt @@ -0,0 +1 @@ +ADD_SUBDIRECTORY(bin2c) diff --git a/code/tool/bin2c/CMakeLists.txt b/code/tool/bin2c/CMakeLists.txt new file mode 100644 index 000000000..adf2787d8 --- /dev/null +++ b/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) From 34eb27eadb6db0e589e9ab02307fdad8032e5c0a Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 8 Feb 2016 14:35:11 +0100 Subject: [PATCH 2/4] Changed: Translate "No files..." in MP3 player --HG-- branch : develop --- code/ryzom/client/data/gamedev/interfaces_v3/compass.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/compass.xml b/code/ryzom/client/data/gamedev/interfaces_v3/compass.xml index 003c90f00..d04d7fba0 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/compass.xml +++ b/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" /> From 47933826b0a15d21e876ba58fa1f0bb113e8bf85 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 8 Feb 2016 14:35:40 +0100 Subject: [PATCH 3/4] Changed: Increase scrollbars width in configuration --HG-- branch : develop --- .../client/data/gamedev/interfaces_v3/game_config.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml index 0995c64c9..ad562304b 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml +++ b/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" /> Date: Mon, 8 Feb 2016 14:35:55 +0100 Subject: [PATCH 4/4] Changed: Increase maximum size of font in chat --HG-- branch : develop --- code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml index ad562304b..38e63cb24 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml @@ -3441,7 +3441,7 @@ widget="sbint" link="UI:SAVE:CHAT:FONT_SIZE" min="9" - max="14" + max="20" realtime="true" />