Skip to content
Snippets Groups Projects
Commit ee94d171 authored by James Cook's avatar James Cook
Browse files

merge

parents 123ef91f e6ce8d1a
No related branches found
No related tags found
No related merge requests found
...@@ -452,28 +452,38 @@ Maximum animation length is [MAX_LENGTH] seconds. ...@@ -452,28 +452,38 @@ Maximum animation length is [MAX_LENGTH] seconds.
width="200" /> width="200" />
<button <button
follows="top|right" follows="top|right"
height="28" height="23"
image_selected="button_anim_play_selected.tga" image_overlay="Play_Over"
image_unselected="button_anim_play.tga" image_unselected="SegmentedBtn_Left_Off"
image_selected="SegmentedBtn_Left_On_Selected"
image_disabled_selected="SegmentedBtn_Left_Selected_Disabled"
image_disabled="SegmentedBtn_Left_Disabled"
image_pressed="SegmentedBtn_Left_Press"
image_pressed_selected="SegmentedBtn_Left_Selected_Press"
layout="topleft" layout="topleft"
left="10" left="10"
name="play_btn" name="play_btn"
tool_tip="Play/pause your animation" tool_tip="Play/pause your animation"
top_pad="0" top_pad="0"
width="28" /> width="23" />
<button <button
follows="top|right" follows="top|right"
height="28" height="23"
image_selected="button_anim_stop_selected.tga" image_overlay="StopReload_Over"
image_unselected="button_anim_stop.tga" image_unselected="SegmentedBtn_Right_Off"
image_selected="SegmentedBtn_Right_On_Selected"
image_disabled_selected="SegmentedBtn_Right_Selected_Disabled"
image_disabled="SegmentedBtn_Right_Disabled"
image_pressed="SegmentedBtn_Right_Press"
image_pressed_selected="SegmentedBtn_Right_Selected_Press"
layout="topleft" layout="topleft"
left_pad="4"
name="stop_btn" name="stop_btn"
tool_tip="Stop animation playback" tool_tip="Stop animation playback"
top_delta="0" top_delta="0"
width="28" /> left_delta="23"
width="23" />
<slider <slider
left_pad="0" left_pad="10"
follows="top|right" follows="top|right"
height="23" height="23"
width="200" width="200"
......
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
image_name="Inv_Texture" image_name="Inv_Texture"
mouse_opaque="true" mouse_opaque="true"
name="icon_texture" name="icon_texture"
tool_top="Textures" tool_tip="Textures"
left_pad="2" /> left_pad="2" />
<button <button
......
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater <floater
legacy_header_height="18" legacy_header_height="18"
border="true" border="false"
can_close="false" can_close="false"
can_minimize="false" can_minimize="false"
height="100" height="100"
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
image_color="ButtonImageColor" image_color="ButtonImageColor"
image_color_disabled="ButtonImageColor" image_color_disabled="ButtonImageColor"
flash_color="ButtonFlashBgColor" flash_color="ButtonFlashBgColor"
font="SansSerifSmall"
hover_glow_amount="0.15" hover_glow_amount="0.15"
halign="center" halign="center"
scale_image="true"> scale_image="true">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment