From 5272fdb1ec9eaaa85a663d5bf61b2a61b94c8549 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 9 Mar 2011 14:23:57 +0100 Subject: [PATCH] Changed: Changes from last patch --- code/ryzom/client/client_default.cfg | 10 +- .../new_texture_interfaces_dxtc.tga | Bin 4194322 -> 4194322 bytes .../new_texture_interfaces_dxtc.txt | 7 +- .../data/gamedev/interfaces_v3/config.xml | 13 ++- .../gamedev/interfaces_v3/game_config.xml | 107 ++++++++++++------ .../gamedev/interfaces_v3/info_player.xml | 2 +- .../gamedev/interfaces_v3/interaction.xml | 23 +++- .../gamedev/interfaces_v3/player_trade.xml | 3 +- .../data/gamedev/interfaces_v3/taskbar.xml | 3 +- .../data/gamedev/interfaces_v3/widgets.xml | 9 +- .../client/src/string_manager_client.cpp | 2 +- .../DFN/game_elem/_item/item_type.typ | 1 + .../common/src/game_share/entity_types.h | 2 +- 13 files changed, 124 insertions(+), 58 deletions(-) diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg index ce6540915..ca6534931 100644 --- a/code/ryzom/client/client_default.cfg +++ b/code/ryzom/client/client_default.cfg @@ -239,14 +239,14 @@ SkinNbMaxPoly_ps1 = 70000; SkinNbMaxPoly_ps2 = 100000; SkinNbMaxPoly_ps3 = 200000; -NbMaxSkeletonNotCLod = 50; +NbMaxSkeletonNotCLod = 125; NbMaxSkeletonNotCLod_min = 5; -NbMaxSkeletonNotCLod_max = 100; +NbMaxSkeletonNotCLod_max = 255; NbMaxSkeletonNotCLod_step = 5; NbMaxSkeletonNotCLod_ps0 = 10; -NbMaxSkeletonNotCLod_ps1 = 25; -NbMaxSkeletonNotCLod_ps2 = 50; -NbMaxSkeletonNotCLod_ps3 = 100; +NbMaxSkeletonNotCLod_ps1 = 50; +NbMaxSkeletonNotCLod_ps2 = 125; +NbMaxSkeletonNotCLod_ps3 = 255; CharacterFarClip = 200.0; CharacterFarClip_min = 50.0; diff --git a/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.tga b/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.tga index 14ab1b5851fb146225e07b742f81abfc8452110b..026fada234b5ef5fa55c2e33ddd992431b66b08e 100644 GIT binary patch delta 1132 zcmbV~OHUI~6vxxj78J@9Wm@m8(D8wfYMFw7))$lDf`to+F4!sGKob|njUzdUaRt-O z-I%l{F1j&=1asV&`Tp{~TpqrdKj|+}?YuJ7+UtQPL z@Yr^{-K|tA`l_4J59J`0h65N`6<z6_tycA1&gFgmoq2En^lDdwYV*xx1lKmii)epwPVyg?H80FD z;~#3k|JMx8Zi(ViUrUi*%hA7wZBa_8`lh^(lQpqxsCq#zqil*#B+D#+X<3oWAEjio z%4ST<21`rJHp{G*UAg30VU&)JjO2c_qN7wVdaNV67d_F@B1a~sU0E_bYYo#|S|rua zhRAqU4AVtzjH@4QF{h2~!^RhF80xzrb2_7@jUn|dB^_-veZ!W{j`ci*`9IPb_AK4i zRv(_FM%3P5;-Q*&7r(b-VO3~`n?N1P|7hzrC;;u3M0NE26xt3-yFCTt>0%n-B0HDZpKCl-k7#0?@x+$3%h Ow~0H%T{NA=y~IzGri<*1xe$&NfzK)f~hjL%|9T9Yia*tKd*v4CMiF zvX|ur5sctaYQ+>PkBivBQE187p^b~1RK&ID?_Lwo;RDb2?&Z0ctJi9gI@HLb2<@RL z^-zp@DNcK7AN5g!l9VEw(zKrr&_U{_3=PmA9a4#&~94JW7Tu zW_fHuG;DqA&7>Eo5zaTl-CN7y7n@?y4b&88H^izPC`W&PDMwkh#RpWs{`O85S^oH^ z-b)$2vh~+>Sz?(s71x{F(r2lu$(mysx0rD0avR@{EXJR zmmBgKHVzIihldh zP3Ya;!5ez$)xgyiRkHY}<+PK!bxl?{lXgDhF1N!`nekpYdS-kqD^D`M1BYP + type="bool" + value="false" /> + @@ -2960,12 +2963,18 @@ This MUST follow the Enum MISSION_DESC::TIconId + + 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 f15f3adc9..927dacb28 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml @@ -1349,6 +1349,14 @@ posparent="cao" x="0" y="-12" /> + + @@ -1605,14 +1614,23 @@ posparent="cc_univ" x="0" y="-4" /> + + y="-8" /> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml b/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml index 9fd4466f7..2f24561d7 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml @@ -50,7 +50,8 @@ squarify="true" onclick_l="put_bag_item_to_exchange" 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" > diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/taskbar.xml b/code/ryzom/client/data/gamedev/interfaces_v3/taskbar.xml index 107afffb9..a828dc08b 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/taskbar.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/taskbar.xml @@ -912,7 +912,7 @@ click_when_pushed="true" onclick_l="show_hide" params_l="#win_name" /> - + @@ -1208,6 +1208,7 @@ + diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml index 83d5b336e..3ba062282 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml @@ -6203,8 +6203,7 @@ fontsize="10" /> + posparent="weight_txt" /> + on_tooltip_params="dbbranch=#inv_branch|dbmax=#inv_bulk_max" /> @@ -6238,8 +6236,7 @@ id="slots_tt" posparent="slots_nb" sizeref="wh" - tooltip="uittInvSlots" - tooltip_parent="win" /> + tooltip="uittInvSlots" /> diff --git a/code/ryzom/client/src/string_manager_client.cpp b/code/ryzom/client/src/string_manager_client.cpp index 90df72bec..b9429a831 100644 --- a/code/ryzom/client/src/string_manager_client.cpp +++ b/code/ryzom/client/src/string_manager_client.cpp @@ -1115,7 +1115,7 @@ bool CStringManagerClient::checkWordFileDates(vector &fileChecks, co { // get the correct path name of the ref file 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) string workingFile("./translation/work/"+CFile::getFilename(fileNames[i])); diff --git a/code/ryzom/common/data_leveldesign/leveldesign/DFN/game_elem/_item/item_type.typ b/code/ryzom/common/data_leveldesign/leveldesign/DFN/game_elem/_item/item_type.typ index 5057bb741..804c3e4ea 100644 --- a/code/ryzom/common/data_leveldesign/leveldesign/DFN/game_elem/_item/item_type.typ +++ b/code/ryzom/common/data_leveldesign/leveldesign/DFN/game_elem/_item/item_type.typ @@ -70,6 +70,7 @@ + Tue Sep 02 10:51:46 2003 (saffray) Type Predef = Fri Jun 18 11:04:28 2004 (fleury) Type Predef = diff --git a/code/ryzom/common/src/game_share/entity_types.h b/code/ryzom/common/src/game_share/entity_types.h index c856425e6..3841f9a17 100644 --- a/code/ryzom/common/src/game_share/entity_types.h +++ b/code/ryzom/common/src/game_share/entity_types.h @@ -147,7 +147,7 @@ const TCoord THRESHOLD_VPA = MAX_THRESHOLD; // Visual property B const TPropIndex PROPERTY_VPB = 10; -const TCoord THRESHOLD_VPB = 20000; +const TCoord THRESHOLD_VPB = MAX_THRESHOLD; // Visual property C const TPropIndex PROPERTY_VPC = 11;