fly/fgdata
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
syd 2011-12-07 20:41:51 -07:00
commit 65552ff537
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Nasal/gui.nas
View file

@ -1232,14 +1232,14 @@ var common_aircraft_keys = {
key: [
{ name: "Enter", desc: "move rudder right" },
{ name: "0/Insert", desc: "move rudder left" },
{ name: "1/End", desc: "decrease elevator trim" },
{ name: "2/Up", desc: "increase elevator or AP altitude" },
{ name: "1/End", desc: "elevator trim up" },
{ name: "2/Down", desc: "elevator up or increase AP altitude" },
{ name: "3/PgDn", desc: "decr. throttle or AP autothrottle" },
{ name: "4/Left", desc: "move aileron left or adj. AP hdg." },
{ name: "5/KP5", desc: "center aileron, elev., and rudder" },
{ name: "6/Right", desc: "move aileron right or adj. AP hdg." },
{ name: "7/Home", desc: "increase elevator trim" },
{ name: "8/Down", desc: "decrease elevator or AP altitude" },
{ name: "7/Home", desc: "elevator trim down" },
{ name: "8/Up", desc: "elevator down or decrease AP altitude" },
{ name: "9/PgUp", desc: "incr. throttle or AP autothrottle" },
{ name: "Space", desc: "PTT - Push To Talk (via VoIP)" },
{ name: "!/@/#/$", desc: "select engine 1/2/3/4" },

8
keyboard.xml
View file

@ -462,7 +462,7 @@ top down before the key bindings are parsed.
<key n="50">
<name>2</name>
<desc>Increase elevator or autopilot altitude</desc>
<desc>Elevator up or increase autopilot altitude</desc>
<repeatable type="bool">true</repeatable>
<binding>
<command>nasal</command>
@ -570,7 +570,7 @@ top down before the key bindings are parsed.
<key n="56">
<name>8</name>
<desc>Decrease elevator or autopilot altitude</desc>
<desc>Elevator down or decrease autopilot altitude</desc>
<repeatable type="bool">true</repeatable>
<binding>
<command>nasal</command>
@ -1277,7 +1277,7 @@ top down before the key bindings are parsed.
<key n="357">
<name>Up</name>
<desc>Increase elevator or autopilot altitude</desc>
<desc>Elevator down or decrease autopilot altitude</desc>
<repeatable type="bool">true</repeatable>
<binding>
<command>nasal</command>
@ -1324,7 +1324,7 @@ top down before the key bindings are parsed.
<key n="359">
<name>Down</name>
<desc>Decrease elevator or autopilot altitude</desc>
<desc>Elevator up or increase autopilot altitude</desc>
<repeatable type="bool">true</repeatable>
<binding>
<command>nasal</command>

2
materials-dds.xml
View file

@ -1280,6 +1280,7 @@ Shared parameters for various materials.
<name>ShrubCover</name>
<name>ShrubGrassCover</name>
<name>ScrubCover</name>
<name>Scrub</name>
<name>Sclerophyllous</name>
<name>Heath</name>
<texture>Terrain/shrub.dds</texture>
@ -2553,6 +2554,7 @@ Shared parameters for various materials.
<name>ShrubCover</name>
<name>ShrubGrassCover</name>
<name>ScrubCover</name>
<name>Scrub</name>
<name>Sclerophyllous</name>
<name>Heath</name>
<texture>Terrain.winter/shrub.png</texture>