Refining character selection screen with new textures Fix#14

code/ryzom/client/client_default.cfg

@@ -1,9 +1,9 @@
 //////////////////////////
-//////////////////////////
 /// CLIENT CONFIG FILE ///
 //////////////////////////
 //////////////////////////
 
+//////////////////////////
 
 // If you set this variable to 1, your client.cfg will be overwritten when you quit the client.
 // You will loose all the comments and identation in this file.
@@ -15,12 +15,12 @@ SaveConfig = 1;
 
 Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1"  & "Direct3D" or "2"
                  // "Auto" will choose the best suited driver depending on hardware
-FullScreen = 1;
+FullScreen = 0;
-Width      = 1024;
+Width      = 0;
-Height     = 768;
+Height     = 0;
 PositionX  = 0;
 PositionY  = 0;
-Frequency  = 60;
+Frequency  = 0;
 Depth      = 32;
 Sleep      = -1;
 ProcessPriority        = 0;        // -2 = idle, -1 = below normal, 0 = normal, 1 = above normal, 2 = high, 3 = real time
@@ -62,7 +62,7 @@ ConditionsTermsURL = "khaganat.net/wikhan/fr:charte";
 ////////////////
 
 // the language to use as in ISO 639-2
-LanguageCode = "en";		// english
+LanguageCode = "fr";                // english
 
 XMLInputFile = "input_config_v3.xml";
 
@@ -86,9 +86,15 @@ XMLOutGameInterfaceFiles = {
         "out_v2_keys.xml",
 };
 
-TexturesInterface     = "texture_interfaces_v3";
+ TexturesInterface    = {
-TexturesInterfaceDXTC = "texture_interfaces_dxtc";
+        "interface_game_khaganat"
-
+ };
+ TexturesLoginInterface    = {
+         "interface_login_khaganat"
+ };
+ TexturesOutGameInterface    = {
+         "interface_outgame_khaganat"
+ };
 
 // The ligo primitive class file
 LigoPrimitiveClass = "world_editor_classes.xml";
@@ -224,7 +230,7 @@ FXAA_ps3	= 1;
 
 AnisotropicFilter        = 0;
 
-Bloom = 0;
+Bloom = 1;
 Bloom_ps0        = 0;
 Bloom_ps1        = 1;
 Bloom_ps2        = 1;
@@ -284,7 +290,7 @@ DivideTextureSizeBy2= 0;	// Divide texture size
 DisableVtxProgram   = 0;        // Disable Hardware Vertex Program.
 DisableVtxAGP       = 0;        // Disable Hardware Vertex AGP.
 DisableTextureShdr  = 0;        // Disable Hardware Texture Shader.
-HDEntityTexture     = 0;
+HDEntityTexture     = 1;
 HDTextureInstalled  = 1;
 WaitVBL             = 0;        // 0 or 1 to wait Vertical Sync.
 
@@ -343,7 +349,8 @@ SoundGameMusicVolume_max = 1.0;
 SoundGameMusicVolume_step = 0.001;
 
 // MISC
-PreDataPath = { "user", "patch", "data", "examples" };
+PreDataPath = { "user", "data", "patch", "examples", };
+DataPath = { "data" };
 NeedComputeVS = 0;
 
 NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" };
@@ -554,7 +561,7 @@ ScenarioSavePath = "./my_scenarios/";
 // note : we add a dot in the name to be sure that there cannot be a conflict with character keyset name
 BuiltInKeySets =
 {
-	"",	   // default ryzom keyboard layout
+        "",           // default khanat keyboard layout
         "bi.zqsd", // european keyboard fps displacement style (NB : don't change this layout name, ryzom will automatically select it if keyboard is french or belgian)
         "bi.wasd",  // english keyboard fps displacement style (NB : don't change this layout name, ryzom will automatically select it if keyboard is not french nor belgian)
         "bi.wow_alike" // 'world of warcraft' like keyboard style. (NB : not available for ring)
@@ -576,9 +583,9 @@ HelpPages =
         "ru=http://www.khaganat.net/forum/index.php/board,31.0.html"
 };
 
-WebIgMainDomain      = "app.khaganat.net";
+WebIgMainDomain      = "app.lirria.khaganat.net";
 WebIgTrustedDomains  = {
-    "api.khaganat.net", "app.khaganat.net", "lirria.khaganat.net"
+    "api.lirria.khaganat.net", "app.lirria.khaganat.net", "lirria.khaganat.net"
 };
 //PatchletUrl          = "";
 

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

@@ -2,65 +2,31 @@
 
 <root id="interface" x="0" y="0" w="800" h="600" active="true" />
 
-
 <lua file="bg_downloader.lua" />
 
 <proc id="bg_downloader_active">
 	<action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:BG_DOWNLOADER|value=1" />
-	
 </proc>
 
 <proc id="bg_downloader_deactive">
 	<action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:BG_DOWNLOADER|value=0" />
 </proc>
 
-
 <!-- Window for the background downloader -->
-<group type="container" id="bg_downloader" title="uiBGD_WindowTitle" global_color="false" line_at_bottom="false"
+<group type="container" id="bg_downloader" title="uiBGD_WindowTitle" global_color="false" line_at_bottom="false"movable="true" opened="true" openable="false" pop_min_w="410" pop_min_h="100" pop_max_w="410" pop_max_h="100" h="100" w="410" active="false" savable="true" header_color="UI:SAVE:WIN:COLORS:OPT" on_deactive="proc" on_deactive_params="bg_downloader_deactive" on_active="proc" on_active_params="bg_downloader_active">
-	movable="true" opened="true" openable="false"	
+
-	pop_min_w="410" pop_min_h="100" pop_max_w="410" pop_max_h="100"	
+	<group id="header_closed" x="0" y="0" child_resize_w="true" h="16" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color">
-	h="100"
-	w="410"
-	active="false"	
-	savable="true"
-	header_color="UI:SAVE:WIN:COLORS:OPT"
-	on_deactive="proc"	on_deactive_params="bg_downloader_deactive"
-	on_active="proc" on_active_params="bg_downloader_active"
->	
-	<group id="header_closed" x="0" y="0" child_resize_w="true" h="16" posref="TL TL" 
-	 group_onclick_r="active_menu"
-	 group_params_r="menu=ui:interface:base_menu_with_color"	
-	>
 	</group>
 
-	<group id="header_opened" x="0" y="0" w="800" h="16" posref="TL TL" 
+	<group id="header_opened" x="0" y="0" w="800" h="16" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color">
-	 group_onclick_r="active_menu"
-	 group_params_r="menu=ui:interface:base_menu_with_color"
-	>		
 	</group>
+
 	<group id="content" x="0" y="0" sizeref="wh" w="0" h="0" posref="TL TL" >
-		<view type="text" id="text"	active="true" y="-12" posref="TM TM"	hardtext="" fontsize="10" color="255 255 255 255"
+		<view type="text" id="text"	active="true" y="-12" posref="TM TM"	hardtext="" fontsize="10" color="255 255 255 255" auto_clamp="true" global_color="false" />
-		 auto_clamp="true"
+		<view type="text" id="ellipsis"	active="true" y="0" posref="BR BL"	posparent="text" hardtext="" fontsize="13" color="255 255 255 255" global_color="false" />
-		 global_color="false"
+		<view type="bitmap" id="bm" active="false" y="1" x="-1" texture="W_answer_16_valid.tga" posparent="text" posref="ML MR" global_color="false" />
-		/>
+		<view type="bar" id="progress" parent="" active="true" posparent="text" posref="BM TM" y="-2" global_color="false" />
-		<view type="text" id="ellipsis"	active="true" y="0" posref="BR BL"	posparent="text" hardtext="" fontsize="13" color="255 255 255 255"
+		<group type="combo_box" id="prio" sizeref="w" w="32" x="0" y="-8" child_resize_h="true" child_resize_hmargin="6" linked_to_db="false" posref="BM TM" posparent="progress" on_change="lua:bgdownloader:onChangePriority()" on_change_params="" tooltip="uiBGD_PriorityTooltip" global_color="false">
-		 global_color="false"
-		/>
-
-		<view type="bitmap" id="bm" active="false" y="1" x="-1" texture="W_answer_16_valid.tga" posparent="text" posref="ML MR"
-		 global_color="false"
-		/>
-		<view type="bar" id="progress" parent="" active="true" posparent="text" posref="BM TM" y="-2"
-		 global_color="false"
-		/>	
-
-		<group type="combo_box" id="prio" sizeref="w" w="32" x="0" y="-8" child_resize_h="true" child_resize_hmargin="6" linked_to_db="false" 
-		 posref="BM TM"
-		 posparent="progress"
-		 on_change="lua:bgdownloader:onChangePriority()" on_change_params=""
-		 tooltip="uiBGD_PriorityTooltip"
-		 global_color="false"
-		>		
 			<instance template="combo_box_def1" tooltip="uiBGD_PriorityTooltip"/>
 			<combo_text name="uiBGD_Paused" />
 			<combo_text name="uiBGD_LowPriority" />

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

@@ -352,7 +352,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
 
 
 <!-- ******************** -->
-<!-- * CHECKING PROGESS * -->
+<!-- * CHECKING PROGRESS * -->
 <!-- ******************** -->
 
 

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

@@ -80,7 +80,6 @@
 
 </proc>
 
-
 <proc id="charsel_disable_buttons">
 	<action handler="set" params="target_property=ui:outgame:charsel:but_slot0:active|value=0"/>
 	<action handler="set" params="target_property=ui:outgame:charsel:but_slot1:active|value=0"/>
@@ -99,7 +98,6 @@
 	<action handler="set" params="target_property=ui:outgame:charsel:quit_but:active|value=0"/>
 </proc>
 
-
 <proc id="charsel_enable_buttons">
 	<action handler="set" params="target_property=ui:outgame:charsel:but_slot0:active|value=1"/>
 	<action handler="set" params="target_property=ui:outgame:charsel:but_slot1:active|value=1"/>
@@ -118,18 +116,19 @@
 	<action handler="set" params="target_property=ui:outgame:charsel:quit_but:active|value=1"/>
 </proc>
 
-
 <proc id="restart_sel_select_fx">
 	<action handler="anim_start" params="anim=anim_sel_select_fx" />
 </proc>
 
-
 <!-- Init Slots -->
+
+<!-- Proc to check if slot is empty or full-->
 <proc id="proc_charsel_initslot">
 	<action handler="proc" cond="not(isCharSelSlotEmpty(@0))" params="proc_charsel_initslot_full|@0" />
 	<action handler="proc" cond="isCharSelSlotEmpty(@0)" params="proc_charsel_initslot_empty|@0" />
 </proc>
 
+<!-- Proc for used/full character slot-->
 <proc id="proc_charsel_initslot_full">
 	<action handler="set_db_from_slot" params="dblink=UI:TEMP:CHARSLOT@0|slot=@0" />
 
@@ -147,13 +146,14 @@
 	<action handler="get_slot" cond="not(isCharSelSlotEmpty(@0))" params="prop=name|target=ui:outgame:charsel:but_slot@0:uc_hardtext|slot=@0" />
 </proc>
 
+<!-- Proc for empty character slot-->
 <proc id="proc_charsel_initslot_empty">
 	<action handler="set" params="target_property=ui:outgame:charsel:slot@0:active|value=0" />
 	<action handler="set" params="target_property=ui:outgame:charsel:empty_slot@0:active|value=1" />
 	<action handler="set" params="target_property=ui:outgame:charsel:but_slot@0:hardtext|value='uiCharSel_EmptySlot'" />
 </proc>
 
-
+<!-- Proc to get proper specific anim per race-->
 <proc id="select_specie_anim">
 	<action handler="set" params="target_property=ui:outgame:charsel:char3d:char:anim|value=5" />
 	<!--
@@ -164,7 +164,6 @@
 	-->
 </proc>
 
-
 <!-- When we click on a slot -->
 <proc id="proc_charsel_clickslot">
 	<action handler="set" params="dblink=UI:TEMP:CHARSELSLOT|value=-1" />
@@ -202,7 +201,6 @@
 	<action handler="lua:game:openEditorMenu()" />
 </proc>
 
-
 <proc id="proc_charsel_edit_scenario">
 	<action handler="set" params="dblink=UI:TEMP:EDIT_SCENARIO|value=1" />
 	<action handler="anim_start" params="anim=anim_charsel_outro_play" />
@@ -224,9 +222,6 @@
 	<action handler="anim_start" params="anim=anim_charsel_delout" />
 </proc>
 
-
-
-
 <proc id="proc_charsel_play2">
 	<action handler="proc" params="charsel_disable_buttons" />
 	<action handler="launch_game" params="slot=@UI:TEMP:CHARSELSLOT|edit_mode=@UI:TEMP:EDIT_SCENARIO" />
@@ -235,6 +230,7 @@
 <proc id="proc_charsel_create_new">
 	<action handler="anim_start" params="anim=anim_charsel_outro_new" />
 </proc>
+
 <proc id="proc_charsel_create_new2">
 	<action handler="proc" params="charsel_disable_buttons" />
 	<action handler="set" params="dblink=UI:CURRENT_SCREEN|value=%screen_appear" />
@@ -243,26 +239,23 @@
 <proc id="proc_charsel_create_ran">
 	<action handler="anim_start" params="anim=anim_charsel_outro_ran" />
 </proc>
+
 <proc id="proc_charsel_create_ran2">
 	<action handler="proc" params="charsel_disable_buttons" />
 	<action handler="set" params="dblink=UI:CURRENT_SCREEN|value=%screen_appear" />
 </proc>
 
-
-
 <!-- When we click on the exit button -->
 <proc id="proc_quit" >
 	<action handler="play_sound" params="name=charsel_quit_click" />
 	<action handler="quit_ryzom" />
 </proc>
 
-
 <!-- Relance la rotation du sigle empty -->
 <proc id="restart_empty_anim">
 	<action handler="anim_start" params="anim=anim_empty" />
 </proc>
 
-
 <!-- ***************** -->
 <!-- *   TEMPLATES   * -->
 <!-- ***************** -->
@@ -291,7 +284,6 @@
 
 </template>
 
-
 <template name="empty_slot_view" posparent="parent" posref="TL TL" id="" dblink="" x="0" y="-3" >
 
 	<scene3d id="#id" posparent="#posparent" w="200" h="150" x="#x" y="#y" posref="#posref" curcam="cam" curcs="env" render_layer="-2" user_interaction="false"
@@ -309,34 +301,22 @@
 
 </template>
 
-
-
 <!-- ******************** -->
 <!-- * DELETE CHARACTER * -->
 <!-- ******************** -->
 
-<group type="modal" id="charsel_delchar_confirm" posref="MM MM" w="300" h="180" 
+<group type="modal" id="charsel_delchar_confirm" posref="MM MM" w="300" h="180" mouse_pos="false" escapable="false" exit_click_out="false" display="false">
-					mouse_pos="false" escapable="false" exit_click_out="false" display="false">
-					
 
 	<instance template="outgame_popup" id="back" posref="TL TL" />
 
+	<view type="text" id="text" posref="TM TM" x="0" y="-60" color="255 255 255 255" global_color="false" line_maxw="284" fontsize="17" shadow="true" hardtext="uiCharSel_DelChar" multi_line="true" multi_line_space="0"/>
 
-	<view type="text" id="text" posref="TM TM" x="0" y="-60" color="255 255 255 255" global_color="false" line_maxw="284"
+	<ctrl style="valid_txt_button" id="submit" posref="BR BR" x="-8" y="8" hardtext="uiCP_Delete_yes" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_delchar_confirm_ok" />
-		fontsize="17" shadow="true" hardtext="uiCharSel_DelChar" multi_line="true" multi_line_space="0"/>
 
-	<ctrl style="valid_txt_button" id="submit" posref="BR BR" x="-8" y="8" hardtext="uiCP_Delete_yes"
+	<ctrl style="valid_txt_button" id="cancel" posref="TR BR" posparent="submit" x="0" y="4" hardtext="uiCP_Delete_no" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_delchar_confirm_cancel" />
-					onover="play_sound" params_over="name=specie_but_over"
-					onclick_l="proc" params_l="proc_charsel_delchar_confirm_ok" />
-
-	<ctrl style="valid_txt_button" id="cancel" posref="TR BR" posparent="submit" x="0" y="4" hardtext="uiCP_Delete_no"
-					onover="play_sound" params_over="name=specie_but_over"
-					onclick_l="proc" params_l="proc_charsel_delchar_confirm_cancel" />
 
 </group>
 
-
-
 <!-- ********* -->
 <!-- * INFOS * -->
 <!-- ********* -->
@@ -364,13 +344,9 @@
 <group type="modal" id="charsel_infos1" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1"
 					mouse_pos="false" escapable="false" exit_click_out="true" display="false">
 
-	<view type="text" id="text" posref="TM TM" x="0" y="0" color="255 255 255 255" global_color="false" line_maxw="780"
+	<view type="text" id="text" posref="TM TM" x="0" y="0" color="255 255 255 255" global_color="false" line_maxw="780" fontsize="17" shadow="true" hardtext="uiCharSel_Infos1" multi_line="true" multi_line_space="0"/>
-		fontsize="17" shadow="true" hardtext="uiCharSel_Infos1" multi_line="true" multi_line_space="0"/>
 
-
+	<ctrl style="valid_txt_button" id="quit_but" posref="BM BM" y="0" hardtext="uiInfos_Close" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_infos"/>
-	<ctrl style="valid_txt_button" id="quit_but" posref="BM BM" y="0" hardtext="uiInfos_Close"
-					onover="play_sound" params_over="name=specie_but_over"
-					onclick_l="proc" params_l="proc_charsel_infos"/>
 
 </group>
 
@@ -420,7 +396,6 @@
 	<action handler="anim_start" params="anim=anim_charsel_delout" />
 </proc>
 
-
 <proc id="charsel_init_buttons">
 	<action handler="add_link" params="id=play_edit_session_del_init|expr=and(not(isCharSelSlotInRingSession(@UI:TEMP:CHARSELSLOT)), not(isCharSelSlotEmpty(@UI:TEMP:CHARSELSLOT))))|target=ui:outgame:charsel:play_but:active,ui:outgame:charsel:edit_session_but:active,ui:outgame:charsel:del_but:active" />
 	<action handler="add_link" params="id=create_new_but_init|expr=isCharSelSlotEmpty(@UI:TEMP:CHARSELSLOT)|target=ui:outgame:charsel:create_new_but:active" />
@@ -431,26 +406,22 @@
 	<action handler="remove_link" params="id=resume_session_but_init" />
 </proc>
 
-
 <!-- ***************** -->
 <!-- *  MAIN WINDOW  * -->
 <!-- ***************** -->
 
-<group id="charsel" w="1024" h="768" posref="MM MM"
+<group id="charsel" w="1024" h="768" posref="MM MM" on_active="proc" on_active_params="proc_charsel_active" >
-								on_active="proc" on_active_params="proc_charsel_active" >
 
 	<!-- TEMP BACK -->
 	<view type="bitmap" id="bg" posref="TL TL" x="0" y="0" render_layer="-3" scale="true" w="1024" h="768" texture="blank.tga"
 		color="0 0 0 255" global_color="false" />
 
-	
 	<!--***************-->
 	<!-- MAIN 3D SCENE -->
 	<!--***************-->
 
-	
 	<!-- Vue Globale -->
-	<scene3d id="char3d" x="2" y="2" w="1020" h="560" posref="BL BL" curcam="cam" curcs="env" render_layer="-2"
+	<scene3d id="char3d" x="2" y="2" w="1024" h="768" posref="BL BL" curcam="cam" curcs="env" render_layer="-2"
 						user_interaction="true" rotz_factor="0.017"
 						roty_factor="0.005" roty_limit_min="-20" roty_limit_max="15"
 						dist_factor="0.005" dist_limit_min="3.0" dist_limit_max="3.8"
@@ -495,7 +466,6 @@
 		<shape id="empty" name="empty.shape" pos="0.0 26.5 2.5" rot="0.0 0.0 0.0" />
 	</scene3d>
 
-	
 	<!--***********-->
 	<!-- MAIN MENU -->
 	<!--***********-->
@@ -514,7 +484,6 @@
 	<instance template="empty_slot_view" id="empty_slot3" posref="TL TL" x="617" y="-65"/>
 	<instance template="empty_slot_view" id="empty_slot4" posref="TL TL" x="822" y="-95"/>
 
-
 	<!-- Button of each character slot (always present even if empty slot) -->
 
 	<ctrl style="menu_button" id="but_slot0" posref="TL TL" x="2" y="-95"
@@ -543,35 +512,25 @@
 	<!-- BOTTOM BUTTON -->
 	<!--***************-->
 
-<!--
+<!-- Button to show informations about character
-	<ctrl type="button" id="display_infos" button_type="toggle_button" posref="BL BL" x="248" y="48"  
+	<ctrl type="button" id="display_infos" button_type="toggle_button" posref="BL BL" x="248" y="48" tx_normal="infos.tga" tx_pushed="infos.tga" tx_over="infos.tga" color="255 255 255 255" col_pushed="255 255 255 255" col_over="0 0 0 0" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_infos"/>
-				tx_normal="infos.tga" tx_pushed="infos.tga" tx_over="infos.tga"
-				color="255 255 255 255" col_pushed="255 255 255 255" col_over="0 0 0 0"
-				onover="play_sound" params_over="name=specie_but_over"
-				onclick_l="proc" params_l="proc_charsel_infos"/>
-	-->
-<!--
-	<ctrl style="valid_txt_button" id="infos_but" posref="BL BL" x="248" y="48" hardtext="uiCP_Infos"
-					onover="play_sound" params_over="name=specie_but_over"
-					onclick_l="proc" params_l="proc_charsel_infos"/>
 
+	<ctrl style="valid_txt_button" id="infos_but" posref="BL BL" x="248" y="48" hardtext="uiCP_Infos" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_infos"/>
 
+	<ctrl style="valid_txt_button" id="play_but" posref="BR BM" x="-112" y="76" hardtext="uiCharSel_Play" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_play"/>
+
+-->
 
-	<ctrl style="valid_txt_button" id="play_but" posref="BR BM" x="-112" y="76" hardtext="uiCharSel_Play"
-					onover="play_sound" params_over="name=specie_but_over"
-					onclick_l="proc" params_l="proc_charsel_play"/>
-	-->
 	<!-- Buttons to play with the character + delete it / Button to create a character if slot empty -->
-	<group id="buttonsgroup" render_layer="3" posref="TR TR" x="-90" y="-300" w="160" h="320" >
+	<group id="buttonsgroup" render_layer="3" posref="TR TR" x="-90" y="-250" w="160" h="320" >
 	  <view type="bitmap" id="bg" posref="TL TL" x="0" y="0" render_layer="3" scale="true" w="160" h="320"
 		color="0 0 0 0" global_color="false" />
 
-	  
 	  	<!-- TITLE -->
 
 		<group id="title" posref="MT MT">
-		<view type="text" id="title2" posref="TM TM" global_color="false" render_layer="3" fontsize="20" shadow="false" y="-10" hardtext="uiCP_selection"/>
+			<view type="text" id="title2" posref="TM TM" global_color="false" render_layer="3" fontsize="20" shadow="false" y="-15" hardtext="uiCP_selection"/>
-		<view type="text" id="title1" posref="TM TM" global_color="false" render_layer="3" fontsize="20" shadow="false" y="-35" hardtext="uiCP_title1"/>
+			<view type="text" id="title1" posref="TM TM" global_color="false" render_layer="3" fontsize="20" shadow="false" y="-40" hardtext="uiCP_title1"/>
 
 		</group>
 
@@ -604,40 +563,30 @@
 		<ctrl style="valid_txt_button" id="quit_but" posref="BM BM" render_layer="3" y="10" hardtext="uiCharSel_Quit"
 						onover="play_sound" params_over="name=specie_but_over"
 						onclick_l="proc" params_l="proc_quit"/>
+
 		<!-- QUIT BUTTON CROSS BOTTOM RIGHT
 		<ctrl type="button" id="quit_but" button_type="push_button" posref="TR TR" x="0" y="0"
 					tx_normal="quit.tga" tx_pushed="quit.tga" tx_over="quit.tga"
 					color="255 255 255 255" col_pushed="255 255 255 255" col_over="0 0 0 0"
 					onover="play_sound" params_over="name=specie_but_over"
 		onclick_l="proc" params_l="proc_quit"/> -->
-	
 	</group>
-      <!--
 
-      	<group id="bgd_progress" posref="BM BM" w="430" h="75" x="85" y="65" active="true">		
+	<!-- <group id="bgd_progress" posref="BM BM" w="430" h="75" x="85" y="65" active="true">
 		<instance template="outgame_black_back" id="border"/>
 		<view type="text" id="text"	active="true" y="-10" posref="TM TM"	hardtext="" fontsize="13" color="255 255 255 255"/>
 		<view type="bitmap" id="bm" active="false" y="1" x="-1" texture="W_answer_16_valid.tga" posparent="text" posref="ML MR"/>
 		<view type="text" id="ellipsis"	active="true" y="0" posref="BR BL"	posparent="text" hardtext="" fontsize="13" color="255 255 255 255"/>
 		<view type="bar" id="progress" active="true" posparent="text" x="-8" posref="BM TM" y="-4"/>
 
-		<group type="combo_box" id="prio" sizeref="w" w="64" x="0" y="-8" child_resize_h="true" child_resize_hmargin="6" linked_to_db="false" 
+		<group type="combo_box" id="prio" sizeref="w" w="64" x="0" y="-8" child_resize_h="true" child_resize_hmargin="6" linked_to_db="false" posparent="progress" posref="BM TM" on_change="lua:bgdownloader:onChangePriority()" on_change_params=""  tooltip="uiBGD_PriorityTooltip" global_color="false">
-		 posparent="progress"
+
-		 posref="BM TM"		 
-		 on_change="lua:bgdownloader:onChangePriority()" on_change_params=""
-		 tooltip="uiBGD_PriorityTooltip"
-		 global_color="false"
-		>		
 			<instance template="combo_box_def1" tooltip="uiBGD_PriorityTooltip"/>
 			<combo_text name="uiBGD_Paused" />
 			<combo_text name="uiBGD_LowPriority" />
 			<combo_text name="uiBGD_NormalPriority" />
 		</group>
-	</group>
+	</group>-->
-      -->
-      
-      
-
 
 	<!--*************-->
 	<!-- SKIN BANNER -->
@@ -646,19 +595,16 @@
 	<view type="bitmap" id="skin_banner" posref="BL BL" x="0" y="0" render_layer="-1" texture="blank.tga"
 		color="255 255 255 255" global_color="false" />
 
-
 	<!-- MODAL BLACK SCREEN -->
 	<view type="bitmap" id="infos_screen" x="-3" y="-3" w="815" h="762" posref="TR TR" render_layer="1" texture="blank.tga" color="0 0 0 160"
 		scale="true" global_color="false" />
 	<link expr="eq(@UI:TEMP:INFOS, 1)" target="infos_screen:active" />
 
-
 	<!-- SKIN -->
 
 	<view type="bitmap" id="skin" posref="TL TL" x="0" y="0" render_layer="2" texture="outgame_skin.tga"
 		color="255 255 255 255" global_color="false" />
 
-	
 	<!-- SKIN MENU SELECTION 1 -->
 	<view type="bitmap" id="select_menu" posref="BL BL" x="-3" y="-3" render_layer="4" scale="true" texture="blank.tga"
 		color="0 0 0 0" w="212" h="160" />
@@ -669,12 +615,11 @@
 						ambient="0 0 0" sun_ambient="0 0 0" sun_diffuse="0 0 0" sun_specular="0 0 0" sun_direction="-1.0 1.0 -1.0" >
 
 		<camera id="cam" fov="70" pos="0 -3 0" target="0.0 0.0 0.0" roll="0" />
-		<fx id="select_fx" pos="2.0 0.0 1.5" name="sfx_interface_selectioncadre.ps" rot="0.0 0.0 0.0" />
+		<fx id="select_fx" pos="2.0 0.0 1.5" name="sfx_interface_selectioncadre_kha.ps" rot="0.0 0.0 0.0" />
 
 
 	</scene3d>
 
-	
 	<!-- BLACK SCREEN FADE -->
 	<view type="bitmap" id="black_screen" posref="TL TL" x="0" y="0" render_layer="4" texture="blank.tga"
 		color="0 0 0 255" sizeref="wh" scale="true" global_color="false" />
@@ -692,7 +637,6 @@
 						onclick_l="leave_modal" />
 	</group>
 
-	
 	<!-- PATCH INFORMATIONS TODO CHECK ITS DISPLAY
 	<group id="webstart" posref="BR BR" x="-50" y="45" w="100" h="40" active="true" >
 		<group id="content" x="0" y="0" w="100" h="60" posref="MM MM" >
@@ -751,18 +695,13 @@
 	</group>
 </template>
 -->
-<group type="modal" id="r2ed_editor_new_sceneario_warning" w="300" h="200" 
+<group type="modal" id="r2ed_editor_new_sceneario_warning" w="300" h="200"  posref="MM MM" render_layer="1"
- posref="MM MM" render_layer="1"
+ mouse_pos="false" escapable="false" exit_click_out="true"  display="false" >
- mouse_pos="false" escapable="false" exit_click_out="true" 
- display="false"
->
-
 	<instance template="outgame_popup" id="back" posref="TL TL" />
 
 	<view type="text" id="text" posref="TM TM" x="0" y="-60" color="255 255 255 255" global_color="false" line_maxw="284"
 		fontsize="17" shadow="true" hardtext="uiR2EDNewScenarioWarning" multi_line="true" multi_line_space="0"/>
 
-	
 	<ctrl style="valid_txt_button" id="submit" posref="BM BM" x="0" y="8" hardtext="uittOK"
 					onover="play_sound" params_over="name=specie_but_over"
 					onclick_l="proc" params_l="proc_charsel_new_scenario" />
@@ -773,7 +712,6 @@
 
 </group>
 
-
 <options name="menu_back">
 
 	<param name="tx_tl"			value="CM_TL.tga" />
@@ -788,27 +726,13 @@
 
 </options>
 
-
+<group type="menu" id="r2ed_editor_menu" options="menu_back" text_y="-2" color="255 255 255 255" fontsize="16" shadow="true" shadow_color="0 0 0 255" shadow_color_over="0 0 0 255" color_over="0 0 0 255" color_grayed="255 255 255 128" shadow_color_grayed="0 0 0 255" highlight_over="255 255 255 128" mouse_pos="false">
-<group type="menu" id="r2ed_editor_menu"
-	options="menu_back"  
-	text_y="-2"
-	color="255 255 255 255"
-	fontsize="16"
-	shadow="true"
-	shadow_color="0 0 0 255"
-	shadow_color_over="0 0 0 255"
-	color_over="0 0 0 255"
-	color_grayed="255 255 255 128"
-	shadow_color_grayed="0 0 0 255"
-	highlight_over="255 255 255 128"
-	mouse_pos="false">
 
 	<action id="new_scenario" name="uiR2EDNewScenario" handler="proc" params="proc_charsel_new_scenario_warning" />
 	<action id="new_scenario" name="uiR2EDEditScenario" handler="proc" params="proc_charsel_edit_scenario"/>
 
 </group>
 
-
 <!-- This link is used to display the right screen among the outgame screens -->
 <link expr="eq(@UI:CURRENT_SCREEN, %screen_select)" target="charsel:active" />
 
@@ -892,7 +816,6 @@
 
 </anim>
 
-
 <proc id="proc_browse_faq" >
 	<!--
 	NB : do not leave the window here, this way the user can refer to the message in the help message box
@@ -901,21 +824,12 @@
 	<action handler="browse_faq" params=""/>
 </proc>
 
-
-
 <proc id="proc_message_box_with_help_ok" >
 	<action handler="leave_modal" />	    <!-- must leave modal first if another modal is to be displayed after this one -->
 	<action handler="" params=""/>
 </proc>
 
-
+<group type="modal" id="message_box_with_help" exit_click_out="false" posparent="charsel:char3d" posref="MM MM" w="250" child_resize_h="true" child_resize_hmargin="100"  on_enter="proc" on_enter_params="proc_message_box_with_help_ok" on_deactive="proc" on_deactive_params="proc_message_box_with_help_ok" escapable="true" mouse_pos="false" display="false" >
-<group type="modal" id="message_box_with_help" exit_click_out="false" posparent="charsel:char3d" posref="MM MM" w="250" child_resize_h="true" child_resize_hmargin="100" 
- on_enter="proc" on_enter_params="proc_message_box_with_help_ok" 
- on_deactive = "proc" on_deactive_params="proc_message_box_with_help_ok"
- escapable="true" 
- mouse_pos="false"
- display="false"
->
 	<instance template="outgame_popup" id="back" posref="TL TL" />
 
 	<view type="text" id="text" posref="TL TL" line_maxw="234" x="8" y="-56" w="0" h="0" color="255 255 255 255" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/>
@@ -930,8 +844,4 @@
 					onclick_l="proc" params_l="proc_browse_faq"/>
 </group>
 
-
-
-
 </interface_config>
-