fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of gitorious.org:fg/fgdata

Browse source
This commit is contained in:
Vivian Meazza 2011-01-03 10:33:59 +00:00
commit 22dd475ede
4 changed files with 3488 additions and 3431 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6858
ATC/default.vce
View file

File diff suppressed because it is too large Load diff

BIN
ATC/default.wav
View file

Binary file not shown.

29
Input/Joysticks/Saitek/Pro-Flight-Yoke.xml
View file

@ -211,6 +211,35 @@
</binding> </binding>
</mod-up> </mod-up>
</button> </button>
<button n="18"> <!-- Labled as T5 -->
<desc>Retract Spoilers</desc>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>controls.stepSpoilers(-1)</script>
</binding>
<mod-up>
<binding>
<command>nasal</command>
<script>controls.stepSpoilers(0)</script>
</binding>
</mod-up>
</button>
<button n="19"> <!-- Labled as T6 -->
<desc>Deploy Spoilers</desc>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>controls.stepSpoilers(1)</script>
</binding>
<mod-up>
<binding>
<command>nasal</command>
<script>controls.stepSpoilers(0)</script>
</binding>
</mod-up>
</button>
<button n="20"> <button n="20">
<desc>thrust reverse</desc> <desc>thrust reverse</desc>
<repeatable type="bool">false</repeatable> <repeatable type="bool">false</repeatable>

32
gui/dialogs/rendering.xml
View file

@ -235,23 +235,49 @@
</binding> </binding>
</checkbox> </checkbox>
<!--
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<halign>right</halign> <halign>right</halign>
<text> <text>
<label>Cloud density</label> <label>Cloud density</label>
<enable>
<and>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
</enable>
</text> </text>
<slider> <slider>
<name>cloud-density</name>
<enable>
<and>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
</enable>
<min>0</min> <min>0</min>
<max>1.0</max> <max>1.0</max>
<property>/sim/rendering/clouds3d-density</property> <property>/sim/rendering/clouds3d-density</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>cloud-density</object-name>
</binding>
<binding>
<command>property-toggle</command>
<property>/sim/rendering/clouds3d-enable</property>
</binding>
<binding>
<command>property-toggle</command>
<property>/sim/rendering/clouds3d-enable</property>
</binding> </binding>
</slider> </slider>
<text> <text>
<enable>
<and>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
</enable>
<label>12345678</label> <label>12345678</label>
<format>%.2f</format> <format>%.2f</format>
<live>true</live> <live>true</live>
@ -259,8 +285,6 @@
</text> </text>
</group> </group>
-->
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<halign>right</halign> <halign>right</halign>