fly/fgdata
1
0
Fork 0
Code Activity

Merge commit 'refs/merge-requests/39' of git://gitorious.org/fg/fgdata into gral/dialog

Browse source
This commit is contained in:
Frederic Bouvier 2010-09-01 19:29:59 +02:00
commit 8d1f1ee073
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Effects/forest.eff
View file

@ -49,7 +49,7 @@
<technique n="9">
<predicate>
<and>
<property>/sim/rendering/crop-shader</property>
<property>/sim/rendering/transition-shader</property>
<property>/sim/rendering/shader-effects</property>
<or>
<less-equal>

2
Effects/glacier.eff
View file

@ -49,7 +49,7 @@
<technique n="9">
<predicate>
<and>
<property>/sim/rendering/crop-shader</property>
<property>/sim/rendering/transition-shader</property>
<property>/sim/rendering/shader-effects</property>
<or>
<less-equal>

2
Effects/herbtundra.eff
View file

@ -49,7 +49,7 @@
<technique n="9">
<predicate>
<and>
<property>/sim/rendering/crop-shader</property>
<property>/sim/rendering/transition-shader</property>
<property>/sim/rendering/shader-effects</property>
<or>
<less-equal>

9
gui/dialogs/rendering.xml
View file

@ -270,6 +270,15 @@
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Transition effects</label>
<property>/sim/rendering/transition-shader</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>