Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/skins/default/xui/en-us/floater_post_process.xml - Used Mine, because Shyotl's is the ancient one from "the before time" and because my last commit (worked on motionblur tab, then, too.)
This commit is contained in:
Lirusaito
2012-09-22 15:12:45 -04:00
parent d7da5153f3 9bb9292a41
commit 2581935b36
19 changed files with 233 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/skins/default/xui/en-us/floater_post_process.xml
View File

@@ -165,6 +165,25 @@
max_val="20" min_val="1" mouse_opaque="true"
name="posterize_layers" show_text="true" value="10" width="200" />
</panel>
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="384"
label="MotionBlur" left="1" mouse_opaque="false"
name="MotionBlurPanel" width="398">
<check_box follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="4" mouse_opaque="true" name="enable_motionblur" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="MotionBlurText" v_pad="0"
width="355">
Motionblur Strength
</text>
<slider bottom_delta="-19" can_edit_text="true"
decimal_digits="0" follows="left"
height="18" increment="1" initial_val="8" label="" left="14"
max_val="30" min_val="1" mouse_opaque="true"
name="blur_strength" show_text="true" value="0.7" width="200" />
</panel>
<!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Bloom" left="1" mouse_opaque="true"
name="BloomPanel" width="398">