aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-26 16:56:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Changes from last patch

Browse source
This commit is contained in:
kervala 2011-03-09 14:23:57 +01:00
parent 6abf79f20e
commit 5272fdb1ec
13 changed files with 124 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
code/ryzom/client/client_default.cfg
View file

@ -239,14 +239,14 @@ SkinNbMaxPoly_ps1 = 70000;
SkinNbMaxPoly_ps2 = 100000; SkinNbMaxPoly_ps2 = 100000;
SkinNbMaxPoly_ps3 = 200000; SkinNbMaxPoly_ps3 = 200000;
NbMaxSkeletonNotCLod = 50; NbMaxSkeletonNotCLod = 125;
NbMaxSkeletonNotCLod_min = 5; NbMaxSkeletonNotCLod_min = 5;
NbMaxSkeletonNotCLod_max = 100; NbMaxSkeletonNotCLod_max = 255;
NbMaxSkeletonNotCLod_step = 5; NbMaxSkeletonNotCLod_step = 5;
NbMaxSkeletonNotCLod_ps0 = 10; NbMaxSkeletonNotCLod_ps0 = 10;
NbMaxSkeletonNotCLod_ps1 = 25; NbMaxSkeletonNotCLod_ps1 = 50;
NbMaxSkeletonNotCLod_ps2 = 50; NbMaxSkeletonNotCLod_ps2 = 125;
NbMaxSkeletonNotCLod_ps3 = 100; NbMaxSkeletonNotCLod_ps3 = 255;
CharacterFarClip = 200.0; CharacterFarClip = 200.0;
CharacterFarClip_min = 50.0; CharacterFarClip_min = 50.0;

BIN
code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.tga
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4 MiB

After

Width:  |  Height:  |  Size: 4 MiB

7
code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.txt
View file

@ -660,7 +660,8 @@ small_task_generic.tga 0.984375000000 0.515625000000 1.000000000000 0.5312500000
small_task_guild.tga 0.984375000000 0.531250000000 1.000000000000 0.546875000000 small_task_guild.tga 0.984375000000 0.531250000000 1.000000000000 0.546875000000
small_task_rite.tga 0.984375000000 0.546875000000 1.000000000000 0.562500000000 small_task_rite.tga 0.984375000000 0.546875000000 1.000000000000 0.562500000000
W_leader.tga 0.984375000000 0.562500000000 0.997070312500 0.574218750000 W_leader.tga 0.984375000000 0.562500000000 0.997070312500 0.574218750000
tb_mode.tga 0.984375000000 0.574218750000 0.996093750000 0.585937500000 w_major.tga 0.984375000000 0.574218750000 0.996093750000 0.585937500000
w_major.tga 0.984375000000 0.585937500000 0.996093750000 0.597656250000 tb_mode.tga 0.984375000000 0.585937500000 0.996093750000 0.597656250000
ge_acc_baniere_em.ps 0.000000000000 0.000000000000 0.000000000000 0.000000000000 profile.tga 0.984375000000 0.597656250000 0.996093750000 0.609375000000
ge_acc_baniere_em - Copie.ps 0.000000000000 0.000000000000 0.000000000000 0.000000000000 ge_acc_baniere_em - Copie.ps 0.000000000000 0.000000000000 0.000000000000 0.000000000000
ge_acc_baniere_em.ps 0.000000000000 0.000000000000 0.000000000000 0.000000000000

13
code/ryzom/client/data/gamedev/interfaces_v3/config.xml
View file

@ -2748,8 +2748,11 @@ This MUST follow the Enum MISSION_DESC::TIconId
<!-- * MISC * --> <!-- * MISC * -->
<!-- ****************************** --> <!-- ****************************** -->
<variable entry="UI:SAVE:SHOW_CLOCK" <variable entry="UI:SAVE:SHOW_CLOCK"
type="bool" type="bool"
value="false" /> value="false" />
<variable entry="UI:SAVE:SHOW_RETICLE"
type="bool"
value="true" />
<variable entry="UI:VARIABLES:MISSION_SELECTED_PREV_SESSION" <variable entry="UI:VARIABLES:MISSION_SELECTED_PREV_SESSION"
type="sint32" type="sint32"
value="-1" /> value="-1" />
@ -2960,12 +2963,18 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:SAVE:CHAT:COLORS:TELL" <variable entry="UI:SAVE:CHAT:COLORS:TELL"
type="rgba" type="rgba"
value="170 170 170 255" /> value="170 170 170 255" />
<variable entry="UI:SAVE:CHAT:COLORS:DYN"
type="rgba"
value="162 255 173 255" />
<variable entry="UI:SAVE:CHAT:ENTER_DONT_QUIT_CB" <variable entry="UI:SAVE:CHAT:ENTER_DONT_QUIT_CB"
type="bool" type="bool"
value="false" /> value="false" />
<variable entry="UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB" <variable entry="UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB"
type="bool" type="bool"
value="false" /> value="false" />
<variable entry="UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
type="bool"
value="false" />
<!-- ***************************** --> <!-- ***************************** -->
<!-- * SYSTEM INFO COLORS * --> <!-- * SYSTEM INFO COLORS * -->
<!-- ***************************** --> <!-- ***************************** -->

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

@ -1349,6 +1349,14 @@
posparent="cao" posparent="cao"
x="0" x="0"
y="-12" /> y="-12" />
<instance template="tgcw_checkbox"
id="show_reticle"
text="uiShowReticle"
tooltip="uittShowReticle"
posref="BL TL"
posparent="show_clock"
x="0"
y="-12" />
</group> </group>
<ctrl style="skin_scroll" <ctrl style="skin_scroll"
id="sb_hud" id="sb_hud"
@ -1393,6 +1401,7 @@
<combo_text name="uigcFrancais" /> <combo_text name="uigcFrancais" />
<combo_text name="uigcDeutch" /> <combo_text name="uigcDeutch" />
<combo_text name="uigcRussian" /> <combo_text name="uigcRussian" />
<combo_text name="uigcSpanish" />
</group> </group>
<link expr="@UI:TEMP:LANGUAGE" <link expr="@UI:TEMP:LANGUAGE"
action="game_config_change_language" /> action="game_config_change_language" />
@ -1605,14 +1614,23 @@
posparent="cc_univ" posparent="cc_univ"
x="0" x="0"
y="-4" /> y="-4" />
<instance template="tgcw_color"
id="cc_dyn"
text="uiDynColor"
title="uiCCDDyn"
tooltip="uittChooseDynColor"
posref="BL TL"
posparent="cc_shout"
x="0"
y="-4" />
<instance template="tgcw_checkbox" <instance template="tgcw_checkbox"
id="enter_dontquit_cb" id="enter_dontquit_cb"
text="uiEnterDontQuitCB" text="uiEnterDontQuitCB"
tooltip="uittChatEnter" tooltip="uittChatEnter"
posparent="cc_univ" posparent="cc_dyn"
posref="BL TL" posref="BL TL"
x="0" x="0"
y="-25" /> y="-8" />
<instance template="tgcw_checkbox" <instance template="tgcw_checkbox"
id="show_times_in_chat_cb" id="show_times_in_chat_cb"
text="uiShowTimesInChatCB" text="uiShowTimesInChatCB"
@ -1621,17 +1639,27 @@
posref="BL TL" posref="BL TL"
x="0" x="0"
y="-8" /> y="-8" />
<instance template="tgcw_checkbox"
id="show_dyn_channel_name_in_chat_cb"
text="uiShowDynChannelNameInChatCB"
tooltip="uittShowDynChannelNameInChat"
posparent="show_times_in_chat_cb"
posref="BL TL"
x="0"
y="-8" />
<instance template="tgcw_scrollbarint" <instance template="tgcw_scrollbarint"
id="font_size" id="font_size"
text="uiFontSize" text="uiFontSize"
posref="BL TL" posref="BL TL"
posparent="show_times_in_chat_cb" posparent="show_dyn_channel_name_in_chat_cb"
x="0" x="0"
y="-8" /> y="-8" />
<link expr="@UI:SAVE:CHAT:ENTER_DONT_QUIT_CB" <link expr="@UI:SAVE:CHAT:ENTER_DONT_QUIT_CB"
target="enter_dontquit_cb:c:pushed" /> target="enter_dontquit_cb:c:pushed" />
<link expr="@UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB" <link expr="@UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB"
target="show_times_in_chat_cb:c:pushed" /> target="show_times_in_chat_cb:c:pushed" />
<link expr="@UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
target="show_dyn_channel_name_in_chat_cb:c:pushed" />
</group> </group>
<ctrl style="skin_scroll" <ctrl style="skin_scroll"
id="sb_chat_colors" id="sb_chat_colors"
@ -2707,35 +2735,35 @@
posref="TL TL" posref="TL TL"
x="0" x="0"
y="-20" /> y="-20" />
<instance template="tgcw_color" id="cc_tribe" text="uiLMTribeColor" title="uiCCDLMTribeColor" tooltip="uittChooseLMTribeColor" posref="BL TL" posparent="cc_misc" x="0" y="-16" /> <instance template="tgcw_color" id="cc_tribe" text="uiLMTribeColor" title="uiCCDLMTribe" tooltip="uittChooseLMTribeColor" posref="BL TL" posparent="cc_misc" x="0" y="-16" />
<instance template="tgcw_color" id="cc_bandit" text="uiLMBanditColor" title="uiCCDLMBanditColor" tooltip="uittChooseLMBanditColor" posref="BL TL" posparent="cc_tribe" x="0" y="-4" /> <instance template="tgcw_color" id="cc_bandit" text="uiLMBanditColor" title="uiCCDLMBandit" tooltip="uittChooseLMBanditColor" posref="BL TL" posparent="cc_tribe" x="0" y="-4" />
<instance template="tgcw_color" id="cc_citizen" text="uiLMCitizenColor" title="uiCCDLMCitizenColor" tooltip="uittChooseLMCitizenColor" posref="BL TL" posparent="cc_bandit" x="0" y="-4" /> <instance template="tgcw_color" id="cc_citizen" text="uiLMCitizenColor" title="uiCCDLMCitizen" tooltip="uittChooseLMCitizenColor" posref="BL TL" posparent="cc_bandit" x="0" y="-4" />
<instance template="tgcw_color" id="cc_fauna" text="uiLMFaunaColor" title="uiCCDLMFaunaColor" tooltip="uittChooseLMFaunaColor" posref="BL TL" posparent="cc_citizen" x="0" y="-16" /> <instance template="tgcw_color" id="cc_fauna" text="uiLMFaunaColor" title="uiCCDLMFauna" tooltip="uittChooseLMFaunaColor" posref="BL TL" posparent="cc_citizen" x="0" y="-16" />
<instance template="tgcw_color" id="cc_faunaexcel" text="uiLMFaunaExcelColor" title="uiCCDLMFaunaExcelColor" tooltip="uittChooseLMFaunaExcelColor" posref="BL TL" posparent="cc_fauna" x="0" y="-4" /> <instance template="tgcw_color" id="cc_faunaexcel" text="uiLMFaunaExcelColor" title="uiCCDLMFaunaExcel" tooltip="uittChooseLMFaunaExcelColor" posref="BL TL" posparent="cc_fauna" x="0" y="-4" />
<instance template="tgcw_color" id="cc_faunasup" text="uiLMFaunaSupColor" title="uiCCDLMFaunaSupColor" tooltip="uittChooseLMFaunaSupColor" posref="BL TL" posparent="cc_faunaexcel" x="0" y="-4" /> <instance template="tgcw_color" id="cc_faunasup" text="uiLMFaunaSupColor" title="uiCCDLMFaunaSup" tooltip="uittChooseLMFaunaSupColor" posref="BL TL" posparent="cc_faunaexcel" x="0" y="-4" />
<instance template="tgcw_color" id="cc_forage" text="uiLMForageColor" title="uiCCDLMForageColor" tooltip="uittChooseLMForageColor" posref="BL TL" posparent="cc_faunasup" x="0" y="-16" /> <instance template="tgcw_color" id="cc_forage" text="uiLMForageColor" title="uiCCDLMForage" tooltip="uittChooseLMForageColor" posref="BL TL" posparent="cc_faunasup" x="0" y="-16" />
<instance template="tgcw_color" id="cc_forageexcel" text="uiLMForageExcelColor" title="uiCCDLMForageExcelColor" tooltip="uittChooseLMForageExcelColor" posref="BL TL" posparent="cc_forage" x="0" y="-4" /> <instance template="tgcw_color" id="cc_forageexcel" text="uiLMForageExcelColor" title="uiCCDLMForageExcel" tooltip="uittChooseLMForageExcelColor" posref="BL TL" posparent="cc_forage" x="0" y="-4" />
<instance template="tgcw_color" id="cc_foragesup" text="uiLMForageSupColor" title="uiCCDLMForageSupColor" tooltip="uittChooseLMForageSupColor" posref="BL TL" posparent="cc_forageexcel" x="0" y="-4" /> <instance template="tgcw_color" id="cc_foragesup" text="uiLMForageSupColor" title="uiCCDLMForageSup" tooltip="uittChooseLMForageSupColor" posref="BL TL" posparent="cc_forageexcel" x="0" y="-4" />
<instance template="tgcw_color" id="cc_sap" text="uiLMSapColor" title="uiCCDLMSapColor" tooltip="uittChooseLMSapColor" posref="BL TL" posparent="cc_foragesup" x="16" y="-4" /> <instance template="tgcw_color" id="cc_sap" text="uiLMSapColor" title="uiCCDLMSap" tooltip="uittChooseLMSapColor" posref="BL TL" posparent="cc_foragesup" x="16" y="-4" />
<instance template="tgcw_color" id="cc_amber" text="uiLMAmberColor" title="uiCCDLMAmberColor" tooltip="uittChooseLMAmberColor" posref="BL TL" posparent="cc_sap" x="0" y="-4" /> <instance template="tgcw_color" id="cc_amber" text="uiLMAmberColor" title="uiCCDLMAmber" tooltip="uittChooseLMAmberColor" posref="BL TL" posparent="cc_sap" x="0" y="-4" />
<instance template="tgcw_color" id="cc_node" text="uiLMNodeColor" title="uiCCDLMNodeColor" tooltip="uittChooseLMNodeColor" posref="BL TL" posparent="cc_amber" x="0" y="-4" /> <instance template="tgcw_color" id="cc_node" text="uiLMNodeColor" title="uiCCDLMNode" tooltip="uittChooseLMNodeColor" posref="BL TL" posparent="cc_amber" x="0" y="-4" />
<instance template="tgcw_color" id="cc_fiber" text="uiLMFiberColor" title="uiCCDLMFiberColor" tooltip="uittChooseLMFiberColor" posref="BL TL" posparent="cc_node" x="0" y="-4" /> <instance template="tgcw_color" id="cc_fiber" text="uiLMFiberColor" title="uiCCDLMFiber" tooltip="uittChooseLMFiberColor" posref="BL TL" posparent="cc_node" x="0" y="-4" />
<instance template="tgcw_color" id="cc_bark" text="uiLMBarkColor" title="uiCCDLMBarkColor" tooltip="uittChooseLMBarkColor" posref="BL TL" posparent="cc_fiber" x="0" y="-4" /> <instance template="tgcw_color" id="cc_bark" text="uiLMBarkColor" title="uiCCDLMBark" tooltip="uittChooseLMBarkColor" posref="BL TL" posparent="cc_fiber" x="0" y="-4" />
<instance template="tgcw_color" id="cc_seed" text="uiLMSeedColor" title="uiCCDLMSeedColor" tooltip="uittChooseLMSeedColor" posref="BL TL" posparent="cc_bark" x="0" y="-4" /> <instance template="tgcw_color" id="cc_seed" text="uiLMSeedColor" title="uiCCDLMSeed" tooltip="uittChooseLMSeedColor" posref="BL TL" posparent="cc_bark" x="0" y="-4" />
<instance template="tgcw_color" id="cc_shell" text="uiLMShellColor" title="uiCCDLMShellColor" tooltip="uittChooseLMShellColor" posref="BL TL" posparent="cc_seed" x="0" y="-4" /> <instance template="tgcw_color" id="cc_shell" text="uiLMShellColor" title="uiCCDLMShell" tooltip="uittChooseLMShellColor" posref="BL TL" posparent="cc_seed" x="0" y="-4" />
<instance template="tgcw_color" id="cc_resin" text="uiLMResinColor" title="uiCCDLMResinColor" tooltip="uittChooseLMResinColor" posref="BL TL" posparent="cc_shell" x="0" y="-4" /> <instance template="tgcw_color" id="cc_resin" text="uiLMResinColor" title="uiCCDLMResin" tooltip="uittChooseLMResinColor" posref="BL TL" posparent="cc_shell" x="0" y="-4" />
<instance template="tgcw_color" id="cc_wood" text="uiLMWoodColor" title="uiCCDLMWoodColor" tooltip="uittChooseLMWoodColor" posref="BL TL" posparent="cc_resin" x="0" y="-4" /> <instance template="tgcw_color" id="cc_wood" text="uiLMWoodColor" title="uiCCDLMWood" tooltip="uittChooseLMWoodColor" posref="BL TL" posparent="cc_resin" x="0" y="-4" />
<instance template="tgcw_color" id="cc_oil" text="uiLMOilColor" title="uiCCDLMOilColor" tooltip="uittChooseLMOilColor" posref="BL TL" posparent="cc_wood" x="0" y="-4" /> <instance template="tgcw_color" id="cc_oil" text="uiLMOilColor" title="uiCCDLMOil" tooltip="uittChooseLMOilColor" posref="BL TL" posparent="cc_wood" x="0" y="-4" />
<instance template="tgcw_color" id="cc_mission" text="uiLMMissionColor" title="uiCCDLMMissionColor" tooltip="uittChooseLMMissionColor" posref="BL TL" posparent="cc_oil" x="-16" y="-16" /> <instance template="tgcw_color" id="cc_mission" text="uiLMMissionColor" title="uiCCDLMMission" tooltip="uittChooseLMMissionColor" posref="BL TL" posparent="cc_oil" x="-16" y="-16" />
<instance template="tgcw_color" id="cc_food" text="uiLMFoodColor" title="uiCCDLMFoodColor" tooltip="uittChooseLMFoodColor" posref="BL TL" posparent="cc_mission" x="16" y="-4" /> <instance template="tgcw_color" id="cc_food" text="uiLMFoodColor" title="uiCCDLMFood" tooltip="uittChooseLMFoodColor" posref="BL TL" posparent="cc_mission" x="16" y="-4" />
<instance template="tgcw_color" id="cc_construction" text="uiLMConstructionColor" title="uiCCDLMConstructionColor" tooltip="uittChooseLMConstructionColor" posref="BL TL" posparent="cc_food" x="0" y="-4" /> <instance template="tgcw_color" id="cc_construction" text="uiLMConstructionColor" title="uiCCDLMConstruction" tooltip="uittChooseLMConstructionColor" posref="BL TL" posparent="cc_food" x="0" y="-4" />
<instance template="tgcw_color" id="cc_goo" text="uiLMGooColor" title="uiCCDLMGooColor" tooltip="uittChooseLMGooColor" posref="BL TL" posparent="cc_construction" x="0" y="-4" /> <instance template="tgcw_color" id="cc_goo" text="uiLMGooColor" title="uiCCDLMGoo" tooltip="uittChooseLMGooColor" posref="BL TL" posparent="cc_construction" x="0" y="-4" />
<instance template="tgcw_color" id="cc_insect" text="uiLMInsectColor" title="uiCCDLMInsectColor" tooltip="uittChooseLMInsectColor" posref="BL TL" posparent="cc_goo" x="0" y="-4" /> <instance template="tgcw_color" id="cc_insect" text="uiLMInsectColor" title="uiCCDLMInsect" tooltip="uittChooseLMInsectColor" posref="BL TL" posparent="cc_goo" x="0" y="-4" />
<instance template="tgcw_color" id="cc_kitin" text="uiLMKitinColor" title="uiCCDLMKitinColor" tooltip="uittChooseLMKitinColor" posref="BL TL" posparent="cc_insect" x="0" y="-4" /> <instance template="tgcw_color" id="cc_kitin" text="uiLMKitinColor" title="uiCCDLMKitin" tooltip="uittChooseLMKitinColor" posref="BL TL" posparent="cc_insect" x="0" y="-4" />
<instance template="tgcw_color" id="cc_nocive" text="uiLMNociveColor" title="uiCCDLMNociveColor" tooltip="uittChooseLMNociveColor" posref="BL TL" posparent="cc_kitin" x="0" y="-4" /> <instance template="tgcw_color" id="cc_nocive" text="uiLMNociveColor" title="uiCCDLMNocive" tooltip="uittChooseLMNociveColor" posref="BL TL" posparent="cc_kitin" x="0" y="-4" />
<instance template="tgcw_color" id="cc_preservative" text="uiLMPreservativeColor" title="uiCCDLMPreservativeColor" tooltip="uittChooseLMPreservativeColor" posref="BL TL" posparent="cc_nocive" x="0" y="-4" /> <instance template="tgcw_color" id="cc_preservative" text="uiLMPreservativeColor" title="uiCCDLMPreservative" tooltip="uittChooseLMPreservativeColor" posref="BL TL" posparent="cc_nocive" x="0" y="-4" />
<instance template="tgcw_color" id="cc_passage" text="uiLMPassageColor" title="uiCCDLMPassageColor" tooltip="uittChooseLMPassageColor" posref="BL TL" posparent="cc_preservative" x="-16" y="-16" /> <instance template="tgcw_color" id="cc_passage" text="uiLMPassageColor" title="uiCCDLMPassage" tooltip="uittChooseLMPassageColor" posref="BL TL" posparent="cc_preservative" x="-16" y="-16" />
<instance template="tgcw_color" id="cc_teleporter" text="uiLMTeleporterColor" title="uiCCDLMTeleporterColor" tooltip="uittChooseLMTeleporterColor" posref="BL TL" posparent="cc_passage" x="0" y="-4" /> <instance template="tgcw_color" id="cc_teleporter" text="uiLMTeleporterColor" title="uiCCDLMTeleporter" tooltip="uittChooseLMTeleporterColor" posref="BL TL" posparent="cc_passage" x="0" y="-4" />
</group> </group>
<ctrl style="skin_scroll" <ctrl style="skin_scroll"
@ -2977,6 +3005,11 @@
widget="boolbut" widget="boolbut"
link="UI:SAVE:SHOW_CLOCK" link="UI:SAVE:SHOW_CLOCK"
realtime="true" /> realtime="true" />
<param ui="hud:show_reticle:c"
type="db"
widget="boolbut"
link="UI:SAVE:SHOW_RETICLE"
realtime="true" />
<param ui="alpha_colors:col_day:c" <param ui="alpha_colors:col_day:c"
type="db" type="db"
widget="colbut" widget="colbut"
@ -3062,6 +3095,11 @@
widget="colbut" widget="colbut"
link="UI:SAVE:CHAT:COLORS:SHOUT" link="UI:SAVE:CHAT:COLORS:SHOUT"
realtime="true" /> realtime="true" />
<param ui="chat_colors:cc_dyn:c"
type="db"
widget="colbut"
link="UI:SAVE:CHAT:COLORS:DYN"
realtime="true" />
<!-- <!--
<param ui="chat_colors:cc_shout:c" type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:SHOUT" realtime="true" /> <param ui="chat_colors:cc_shout:c" type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:SHOUT" realtime="true" />
<param ui="chat_colors:cc_civi:c" type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:CIVILIZATION" realtime="true" /> <param ui="chat_colors:cc_civi:c" type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:CIVILIZATION" realtime="true" />
@ -3077,6 +3115,11 @@
widget="boolbut" widget="boolbut"
link="UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB" link="UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB"
realtime="true" /> realtime="true" />
<param ui="chat_colors:show_dyn_channel_name_in_chat_cb:c"
type="db"
widget="boolbut"
link="UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
realtime="true" />
<param ui="chat_colors:font_size:c" <param ui="chat_colors:font_size:c"
type="db" type="db"
widget="sbint" widget="sbint"

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

@ -715,7 +715,7 @@
<group id="guild" <group id="guild"
posref="TL TL" posref="TL TL"
sizeref="w" sizeref="w"
h="12" h="14"
y="-52"> y="-52">
<view type="text" <view type="text"
id="guild_title" id="guild_title"

23
code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
View file

@ -1742,10 +1742,25 @@
h="0" h="0"
tooltip="uittFriendsOnline" tooltip="uittFriendsOnline"
tooltip_parent="win" /> tooltip_parent="win" />
<ctrl type="button"
id="profile_button"
button_type="push_button"
posref="MR MR"
x="-36"
tx_normal="profile.tga"
tx_pushed="profile.tga"
tx_over="profile.tga"
global_color_normal="false"
global_color_over="false"
global_color_pushed="false"
onclick_l="open_title_help"
params_l="from=contact"
tooltip="uittContactInfo"
tooltip_parent="win" />
<view type="bitmap" <view type="bitmap"
id="blocked" id="blocked"
posref="MR MR" posref="MR MR"
x="-34" x="-50"
y="-2" y="-2"
texture="w_answer_16_cancel.tga" texture="w_answer_16_cancel.tga"
global_color="false" global_color="false"
@ -3082,8 +3097,7 @@
pop_min_w="216" pop_min_w="216"
pop_min_h="96" pop_min_h="96"
pop_max_w="2000" pop_max_w="2000"
pop_max_h="1600" pop_max_h="1600" >
active_savable="false">
<group id="header_closed" <group id="header_closed"
x="0" x="0"
y="0" y="0"
@ -3117,7 +3131,6 @@
sizeref="w" sizeref="w"
w="-10" w="-10"
onenter="chat_box_entry" onenter="chat_box_entry"
reset_focus_on_hide="true"
backup_father_container_pos="true" /> backup_father_container_pos="true" />
<view type="text" <view type="text"
id="cant_write_ebw" id="cant_write_ebw"
@ -3143,7 +3156,7 @@
</group> </group>
</template> </template>
<!-- those proc have the index in db of the dyn_chat, in parameter @0 --> <!-- those proc have the index in db of the dyn_chat, in parameter @0 -->
<proc id="dynamic_chat_proc_deactive"> <proc id="dynamic_chat_proc_close">
<!-- The window is closed by the user, change the associated DB flag --> <!-- The window is closed by the user, change the associated DB flag -->
<action handler="set" <action handler="set"
params="dblink=UI:SAVE:ISDETACHED:DYNAMIC_CHAT@0|value=0" /> params="dblink=UI:SAVE:ISDETACHED:DYNAMIC_CHAT@0|value=0" />

3
code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml
View file

@ -50,7 +50,8 @@
squarify="true" squarify="true"
onclick_l="put_bag_item_to_exchange" onclick_l="put_bag_item_to_exchange"
onclick_r="open_help_auto" lmargin="4" rmargin="4" tmargin="4" bmargin="4" column_max="16" onclick_r="open_help_auto" lmargin="4" rmargin="4" tmargin="4" bmargin="4" column_max="16"
auto_grayed="true" > auto_grayed="true"
maxitem="%max_bag_invslot" >
</group> </group>
</group> </group>

3
code/ryzom/client/data/gamedev/interfaces_v3/taskbar.xml
View file

@ -912,7 +912,7 @@
click_when_pushed="true" onclick_l="show_hide" params_l="#win_name" /> click_when_pushed="true" onclick_l="show_hide" params_l="#win_name" />
<view type="text" id="text" posparent="but" posref="MR ML" x="4" y="-3" fontsize="11" global_color="false" color="#color" shadow="true" hardtext="#text" /> <view type="text" id="text" posparent="but" posref="MR ML" x="4" y="-3" fontsize="11" global_color="false" color="#color" shadow="true" hardtext="#text" />
<view type="text" id="key" posref="MR MR" x="-8" y="-4" fontsize="8" global_color="false" color="#color" shadow="true" hardtext="uiNotAssigned" /> <view type="text" id="key" posref="MR MR" x="-8" y="-2" fontsize="8" global_color="false" color="#color" shadow="true" hardtext="uiNotAssigned" />
<link expr="@#pushflag" target="but:pushed" /> <link expr="@#pushflag" target="but:pushed" />
@ -1208,6 +1208,7 @@
<param value="communication:contact_list|contact_list" /> <param value="communication:contact_list|contact_list" />
<param value="communication:mailbox|mailbox" /> <param value="communication:mailbox|mailbox" />
<param value="communication:fame|fame" /> <param value="communication:fame|fame" />
<param value="communication:webig|webig" />
<param value="options:game_config|game_config" /> <param value="options:game_config|game_config" />
<param value="options:keys|keys" /> <param value="options:keys|keys" />

9
code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
View file

@ -6203,8 +6203,7 @@
fontsize="10" /> fontsize="10" />
<instance template="text_tt" <instance template="text_tt"
tooltip="uittInventoryWeight" tooltip="uittInventoryWeight"
posparent="weight_txt" posparent="weight_txt" />
tooltip_parent="win" />
<link expr="identity(getItemsWeight('#inv_branch',0,#inv_branch_nb),@#inv_branch)" <link expr="identity(getItemsWeight('#inv_branch',0,#inv_branch_nb),@#inv_branch)"
target="weight_txt:hardtext" /> target="weight_txt:hardtext" />
<view type="bar" <view type="bar"
@ -6221,8 +6220,7 @@
w="0" w="0"
h="0" h="0"
on_tooltip="get_tt_bulk" on_tooltip="get_tt_bulk"
on_tooltip_params="dbbranch=#inv_branch|dbmax=#inv_bulk_max" on_tooltip_params="dbbranch=#inv_branch|dbmax=#inv_bulk_max" />
tooltip_parent="win" />
<link expr="identity(getItemsBulk('#inv_branch',0,#inv_branch_nb),@#inv_branch)" <link expr="identity(getItemsBulk('#inv_branch',0,#inv_branch_nb),@#inv_branch)"
target="encombrement:value" /> target="encombrement:value" />
</group> </group>
@ -6238,8 +6236,7 @@
id="slots_tt" id="slots_tt"
posparent="slots_nb" posparent="slots_nb"
sizeref="wh" sizeref="wh"
tooltip="uittInvSlots" tooltip="uittInvSlots" />
tooltip_parent="win" />
<link expr="identity(getInvSlotCounts('#inv_branch'),@#inv_branch)" <link expr="identity(getInvSlotCounts('#inv_branch'),@#inv_branch)"
target="slots_nb:hardtext" /> target="slots_nb:hardtext" />
<!-- uses identity(x,@branch) to add an observer on branch --> <!-- uses identity(x,@branch) to add an observer on branch -->

2
code/ryzom/client/src/string_manager_client.cpp
View file

@ -1115,7 +1115,7 @@ bool CStringManagerClient::checkWordFileDates(vector<CFileCheck> &fileChecks, co
{ {
// get the correct path name of the ref file // get the correct path name of the ref file
std::string referenceFile= lookupReferenceFile(fileNames[i]); std::string referenceFile= lookupReferenceFile(fileNames[i]);
fileChecks[i].ReferenceDate= CPath::exists(referenceFile)?CFile::getFileModificationDate(referenceFile):0; fileChecks[i].ReferenceDate= referenceFile.empty()?0:CFile::getFileModificationDate(referenceFile);
// get then one of the working File (NB: 0 is a valid reponse for Final Client: no working file) // get then one of the working File (NB: 0 is a valid reponse for Final Client: no working file)
string workingFile("./translation/work/"+CFile::getFilename(fileNames[i])); string workingFile("./translation/work/"+CFile::getFilename(fileNames[i]));

1
code/ryzom/common/data_leveldesign/leveldesign/DFN/game_elem/_item/item_type.typ
View file

@ -70,6 +70,7 @@
<DEFINITION Label="Stable Service" Value="SERVICE_STABLE"/> <DEFINITION Label="Stable Service" Value="SERVICE_STABLE"/>
<DEFINITION Label="Light helmet" Value="LIGHT_HELMET"/> <DEFINITION Label="Light helmet" Value="LIGHT_HELMET"/>
<DEFINITION Label="ToolMaker" Value="ToolMaker"/> <DEFINITION Label="ToolMaker" Value="ToolMaker"/>
<DEFINITION Label="Job element" Value="JOB_ELEMENT"/>
<DEFINITION Label="Generic" Value="GENERIC"/> <DEFINITION Label="Generic" Value="GENERIC"/>
<LOG>Tue Sep 02 10:51:46 2003 (saffray) Type Predef = <LOG>Tue Sep 02 10:51:46 2003 (saffray) Type Predef =
Fri Jun 18 11:04:28 2004 (fleury) Type Predef = Fri Jun 18 11:04:28 2004 (fleury) Type Predef =

2
code/ryzom/common/src/game_share/entity_types.h
View file

@ -147,7 +147,7 @@ const TCoord THRESHOLD_VPA = MAX_THRESHOLD;
// Visual property B // Visual property B
const TPropIndex PROPERTY_VPB = 10; const TPropIndex PROPERTY_VPB = 10;
const TCoord THRESHOLD_VPB = 20000; const TCoord THRESHOLD_VPB = MAX_THRESHOLD;
// Visual property C // Visual property C
const TPropIndex PROPERTY_VPC = 11; const TPropIndex PROPERTY_VPC = 11;