llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.
This commit is contained in:
@@ -38,10 +38,10 @@
|
||||
<text name="ShadersPrefText4">Ultra</text>
|
||||
<text name="QualityText2">Higher Quality</text>
|
||||
<!-- Are these icons really necessary?
|
||||
<icon bottom="-89" height="14" image_name="rounded_square.tga" left="173" name="LowDivet" width="2"/>
|
||||
<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="MidDivet" width="2"/>
|
||||
<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="HighDivet" width="2"/>
|
||||
<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="UltraDivet" width="2"/>
|
||||
<icon bottom="-89" height="14" image_name="Rounded_Square" left="173" name="LowDivet" width="2"/>
|
||||
<icon bottom="-89" height="14" image_name="Rounded_Square" left_delta="44" name="MidDivet" width="2"/>
|
||||
<icon bottom="-89" height="14" image_name="Rounded_Square" left_delta="44" name="HighDivet" width="2"/>
|
||||
<icon bottom="-89" height="14" image_name="Rounded_Square" left_delta="44" name="UltraDivet" width="2"/>
|
||||
-->
|
||||
|
||||
<check_box label="Benutzerdefiniert" name="CustomSettings"/>
|
||||
|
||||
@@ -16,5 +16,5 @@
|
||||
</scroll_list>
|
||||
</layout_panel>
|
||||
</layout_stack>
|
||||
<button name="header" label="" image="rounded_square.tga" left="0" bottom="-20" width="100" height="20" follows="left|right|top" toggle="true"/>
|
||||
<button name="header" label="" image="Rounded_Square" left="0" bottom="-20" width="100" height="20" follows="left|right|top" toggle="true"/>
|
||||
</panel>
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
<text bottom_delta="0" height="12" left_delta="47" name="ShadersPrefText4">Ultra</text>
|
||||
<text bottom_delta="16" height="12" left_delta="23" name="QualityText2">Higher Quality</text>
|
||||
<!-- Are these icons really necessary?
|
||||
<icon bottom="-89" height="14" image_name="rounded_square.tga" left="173" name="LowDivet" width="2"/>
|
||||
<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="MidDivet" width="2"/>
|
||||
<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="HighDivet" width="2"/>
|
||||
<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="UltraDivet" width="2"/>
|
||||
<icon bottom="-89" height="14" image_name="Rounded_Square" left="173" name="LowDivet" width="2"/>
|
||||
<icon bottom="-89" height="14" image_name="Rounded_Square" left_delta="44" name="MidDivet" width="2"/>
|
||||
<icon bottom="-89" height="14" image_name="Rounded_Square" left_delta="44" name="HighDivet" width="2"/>
|
||||
<icon bottom="-89" height="14" image_name="Rounded_Square" left_delta="44" name="UltraDivet" width="2"/>
|
||||
-->
|
||||
<slider bottom_delta="0" control_name="RenderQualityPerformance" increment="1" initial_val="0" left="165" max_val="3" min_val="0" name="QualityPerformanceSelection" show_text="false" width="150" />
|
||||
<check_box bottom_delta="-10" control_name="RenderCustomSettings" label="Custom" left="410" name="CustomSettings"/>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<layout_stack name="stack2" orientation="vertical" left="0" bottom="0" height="768" width="724" follows="left|right|top|bottom">
|
||||
<layout_panel name="panel3" min_height="10" height="200" width="724"/>
|
||||
<layout_panel name="panel4" min_height="250" height="250" width="724" auto_resize="false">
|
||||
<icon image_name="rounded_square.tga" color="LoginProgressBoxCenterColor" left="0" bottom="0" width="724" height="250" follows="left|right|bottom|top"/>
|
||||
<icon image_name="Rounded_Square" color="LoginProgressBoxCenterColor" left="0" bottom="0" width="724" height="250" follows="left|right|bottom|top"/>
|
||||
<text name="title_text" halign="center" font="SansSerif" left="0" bottom="-70" width="724" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
|
||||
<text name="progress_text" halign="center" font="SansSerif" left="0" bottom="-95" width="724" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
|
||||
<progress_bar name="login_progress_bar" color="255,255,255,245" height="16" bottom="135" left="45" right="-45" follows="left|right|top" />
|
||||
|
||||
Reference in New Issue
Block a user