Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-02-08 14:37:34 +01:00
commit 3a0576a740
5 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/CMakeModules/nel.cmake
View file

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

2
code/ryzom/client/data/gamedev/interfaces_v3/compass.xml
View file

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

10
code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
View file

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

1
code/tool/CMakeLists.txt Normal file
View file

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

8
code/tool/bin2c/CMakeLists.txt Normal file
View file

@ -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)