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-07-13 22:37:34 +01:00
commit 6d2ec991d0
8 changed files with 143 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Aircraft/Generic/DualControl/Instruments/KR87/kr87.nas
View file

@ -3,7 +3,7 @@
## Nasal for dual control of a KR-87 ADF radio over the multiplayer
## network.
##
## Copyright (C) 2007 - 2010 Anders Gidenstam (anders(at)gidenstam.org)
## Copyright (C) 2007 - 2011 Anders Gidenstam (anders(at)gidenstam.org)
## This file is licensed under the GPL license version 2 or later.
##
###############################################################################
@ -116,21 +116,21 @@ var kr87 = [master_kr87.new(0), master_kr87.new(1)];
###########################################################################
# n - ADF#
swap = func(n) {
var swap = func(n) {
kr87[n].swap();
}
###########################################################################
# n - ADF#
# d - adjustment
adjust_frequency = func(n, d) {
var adjust_frequency = func(n, d) {
kr87[n].adjust_frequency(d);
}
###########################################################################
# n - ADF#
# p - pressed
toggle_BFO = func(n) {
var toggle_BFO = func(n) {
kr87[n].toggle_BFO();
}

10
Aircraft/Generic/DualControl/Instruments/KX165/kx165tso.nas
View file

@ -3,7 +3,7 @@
## Nasal for dual control of a KX165 NavComm radio over the multiplayer
## network.
##
## Copyright (C) 2007 - 2010 Anders Gidenstam (anders(at)gidenstam.org)
## Copyright (C) 2007 - 2011 Anders Gidenstam (anders(at)gidenstam.org)
## This file is licensed under the GPL license version 2 or later.
##
###############################################################################
@ -150,13 +150,13 @@ var make_slave_to = func(n, airoot) {
###########################################################################
# n - NavComm#
swap_nav = func(n) {
var swap_nav = func(n) {
kx165tso[n].swap_nav();
}
###########################################################################
# n - NavComm#
swap_comm = func(n, b) {
var swap_comm = func(n, b) {
kx165tso[n].comm_base.getNode(swap_btn, 1).setValue(b);
if (b) kx165tso[n].swap_comm();
}
@ -164,14 +164,14 @@ swap_comm = func(n, b) {
###########################################################################
# n - NavComm#
# d - adjustment
adjust_nav_frequency = func(n, d) {
var adjust_nav_frequency = func(n, d) {
kx165tso[n].adjust_nav_frequency(d);
}
###########################################################################
# n - NavComm#
# d - adjustment
adjust_comm_frequency = func(n, d) {
var adjust_comm_frequency = func(n, d) {
kx165tso[n].adjust_comm_frequency(d);
}

2
Aircraft/c172p/Models/Yoke/yoke.ac
View file

@ -1,6 +1,6 @@
AC3Db
MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
MATERIAL "Material.001" rgb 0.115736 0.115725 0.115725 amb 0.201226 0.201226 0.201226 emis 0 0 0 spec 0.300744 0.300744 0.300744 shi 17 trans 0
MATERIAL "Material.001" rgb 1 1 1 amb 0.201226 0.201226 0.201226 emis 0 0 0 spec 0.75491 0.75491 0.75491 shi 50 trans 0
MATERIAL "Material" rgb 0.102286 0.102286 0.102286 amb 0.5 0.5 0.5 emis 0 0 0 spec 0.249708 0.249708 0.249708 shi 32 trans 0
OBJECT world
kids 2

2
Nasal/gui.nas
View file

@ -1223,7 +1223,7 @@ var common_aircraft_keys = {
{ name: "g/G", desc: "gear up/down" },
{ name: "h", desc: "cycle HUD (head up display)" },
{ name: "H", desc: "cycle HUD brightness" },
{ name: "i/Shift-i", desc: "normal/alternative HUD" },
#{ name: "i/Shift-i", desc: "normal/alternative HUD" },
#{ name: "j", desc: "decrease spoilers" },
#{ name: "k", desc: "increase spoilers" },
{ name: "l", desc: "toggle tail-wheel lock" },

205
gui/dialogs/about.xml
View file

@ -18,7 +18,7 @@
<PropertyList>
<name>about</name>
<modal>true</modal>
<modal>false</modal>
<layout>vbox</layout>
<resizable>false</resizable>
<default-padding>3</default-padding>
@ -52,107 +52,154 @@
</group>
<hrule/>
<group>
<layout>vbox</layout>
<halign>left</halign>
<text>
<halign>left</halign>
<label>MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM</label>
<format>This is FlightGear Flight Simulator V%s</format>
<property>/sim/version/flightgear</property>
</text>
<default-padding>5</default-padding>
<group>
<layout>hbox</layout>
<empty>
<stretch>true</stretch>
</empty>
<text>
<label>FlightGear Flight Simulator VX.X.X</label>
</text>
<text>
<halign>left</halign>
<label>FlightGear is free and open source software, licensed</label>
</text>
<empty>
<stretch>true</stretch>
</empty>
</group>
<text>
<halign>left</halign>
<label>under the GNU General Public License Version 2.</label>
</text>
<text>
<halign>left</halign>
<label>Get new versions, add-ons, forum, wiki and more</label>
</text>
<text>
<halign>left</halign>
<label>from the web-site at http://www.flightgear.org/ for free.</label>
</text>
<text>
<halign>left</halign>
<label>Have a nice flight!</label>
<label>(c) 1996-2011, the FlightGear Contributors</label>
</text>
<group>
<layout>vbox</layout>
<border>10</border>
<halign>center</halign>
<default-padding>2</default-padding>
<text>
<halign>left</halign>
<label>FlightGear is free and open source software, licensed</label>
</text>
<text>
<halign>left</halign>
<label>under the GNU General Public License Version 2.</label>
</text>
<text>
<halign>left</halign>
<label>Get new versions, add-ons, forum, wiki and more</label>
</text>
<text>
<halign>left</halign>
<label>from the web-site at http://www.flightgear.org/ for free.</label>
</text>
<text>
<halign>left</halign>
<label>Have a nice flight!</label>
</text>
</group>
<empty>
<stretch>true</stretch>
</empty>
<text>
<halign>left</halign>
<label>Version information</label>
</text>
<text>
<halign>left</halign>
<label>MMMMMMMMMM</label>
<format>FlightGear Version: %s</format>
<property>/sim/version/flightgear</property>
</text>
<text>
<halign>left</halign>
<label>MMMMMMMMMM</label>
<format>SimGear Version: %s</format>
<property>/sim/version/simgear</property>
</text>
<text>
<halign>left</halign>
<label>MMMMMMMMMMMMMMMMMM</label>
<format>OpenSceneGraph Version: %s</format>
<property>/sim/version/openscenegraph</property>
<halign>center</halign>
<label>Version Information</label>
</text>
<group>
<layout>vbox</layout>
<border>10</border>
<halign>center</halign>
<default-padding>2</default-padding>
<text>
<halign>left</halign>
<label>MMMMMMMMMM</label>
<format>FlightGear Version: %s</format>
<property>/sim/version/flightgear</property>
</text>
<text>
<halign>left</halign>
<label>MMMMMMMMMM</label>
<format>SimGear Version: %s</format>
<property>/sim/version/simgear</property>
</text>
<text>
<halign>left</halign>
<label>MMMMMMMMMMMMMMMMMM</label>
<format>Build Id: %s</format>
<property>/sim/version/build-id</property>
</text>
<text>
<halign>left</halign>
<label>MMMMMMMMMMMMMMMMMM</label>
<format>OpenSceneGraph Version: %s</format>
<property>/sim/version/openscenegraph</property>
</text>
<text>
<halign>left</halign>
<label>MMMMMMMMMMMMMMMMMM</label>
<format>Build Id: %s</format>
<property>/sim/version/build-id</property>
</text>
<text>
<halign>left</halign>
<label>MMMMMM</label>
<format>Build Number: %d</format>
<property>/sim/version/build-number</property>
</text>
<text>
<halign>left</halign>
<label>MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM</label>
<format>Revision: %s</format>
<property>/sim/version/revision</property>
</text>
</group>
</group>
<hrule/>
<group>
<layout>hbox</layout>
<halign>fill</halign>
<text>
<halign>left</halign>
<label>MMMMMM</label>
<format>Build Number: %d</format>
<property>/sim/version/build-number</property>
</text>
<empty><stretch>true</stretch></empty>
<text>
<halign>left</halign>
<label>MMMMMM</label>
<format>Revision: %s</format>
<property>/sim/version/revision</property>
</text>
<hrule/>
<text>
<label>(c) 1996-2011, the FlightGear contributors</label>
</text>
<button>
<legend>Close</legend>
<equal>true</equal>
<default>true</default>
<key>Esc</key>
<binding>
<command>dialog-close</command>
</binding>
</button>
<empty><stretch>true</stretch></empty>
</group>
<nasal>
<open><![CDATA[
# Replace version in Nasal, as using the <format> code upsets layout
var ver = cmdarg().getNode("group[1]/group/text/label");
ver.setValue("FlightGear Flight Simulator V" ~ getprop("/sim/version/flightgear"));
]]></open>
<close><![CDATA[
]]></close>
</nasal>
</PropertyList>

2
gui/dialogs/static-lod.xml
View file

@ -9,7 +9,7 @@
<empty><stretch>1</stretch></empty>
<text>
<label>Static Scenery Level Of Detail</label>
<label>Adjust Level Of Detail Ranges</label>
</text>
<empty><stretch>1</stretch></empty>

2
gui/dialogs/view.xml
View file

@ -30,7 +30,7 @@
<hrule/>
<text>
<label>Choose Active Views</label>
<label>Select Active Views</label>
</text>
<nasal>

5
keyboard.xml
View file

@ -669,6 +669,7 @@ top down before the key bindings are parsed.
</binding>
</key>
<!-- no longer used
<key n="73">
<name>I</name>
<desc>Switch to and toggle alternative HUD types</desc>
@ -676,7 +677,7 @@ top down before the key bindings are parsed.
<command>nasal</command>
<script>aircraft.HUD.cycle_type()</script>
</binding>
</key>
</key> -->
<key n="77">
<name>M</name>
@ -891,6 +892,7 @@ top down before the key bindings are parsed.
</binding>
</key>
<!-- no longer used
<key n="105">
<name>i</name>
<desc>Normal HUD</desc>
@ -899,6 +901,7 @@ top down before the key bindings are parsed.
<script>aircraft.HUD.normal_type()</script>
</binding>
</key>
-->
<key n="106">
<name>j</name>