1
0
Fork 0
Commit graph

137 commits

Author SHA1 Message Date
mfranz
dfd3fc3212 - update hud paths
- check for negative index
2006-06-08 17:18:03 +00:00
mfranz
d39e681ef5 set HUD properties explicitly; the commands weren't very flexible and will
die
2006-06-07 17:58:55 +00:00
mfranz
c93bda7b22 terrain-follow -> agl-hold (to match generic AP and AP dialog) 2006-04-08 16:21:47 +00:00
mfranz
7e81d93f28 use wrappers for brakes/parking brake
(js files are to be converted)
2006-03-01 17:04:20 +00:00
mfranz
efc1577118 '+': change description & function name (repeate last ATC/instructor msg) 2006-02-24 11:06:06 +00:00
mfranz
dc74e71157 use more sophisticated screen.atc_repeat() function to let ATC repeat
his/her last message
2006-02-11 12:07:06 +00:00
mfranz
6859951713 baby, one more time! 2006-02-10 19:08:10 +00:00
mfranz
e21dbdbef1 - move "Toggle FDM data logging" from Shift-F10 to Shift-F9
- let Shift-F10 cycle through GUI styles; F10 is already about GUI stuff
  (enable/disable menu), so this is the most obvious key
2005-07-13 11:14:07 +00:00
mfranz
c20d609bfb now that the <repeatable> property actually works, we have to set it
where it is desirable (it defaults to false); the <key>'s <repeatable>
setting is also used for the <mod-shift> branch, so we have to set it
as soon as one branch needs it.
2005-06-27 07:16:09 +00:00
mfranz
beb96181c5 - no <desc> in <bindings>; they are either at <key> level, or at
<mod-up>, <mod-shift>, ...
- remove doubles; cosmetics
2005-06-23 14:01:58 +00:00
mfranz
17166921c0 - rename controls.stepFlaps() to controls.flapsDown(), because:
- to support "old-style" gear/flap control (operation as long as button
  pressed/lever pushed -> b29/hurricane), let bindings not only report
  up/down, but up (-1), stop (0), down (1).
- let controls.flapsDown() ignore "stop" so as to remain compatible with
  prior behavior
- adapt all joysticks/aircraft (sigh)
- some minor cosmetics in joystick configs, such as indentation fixes
2005-06-22 13:08:01 +00:00
mfranz
7cc31829a3 add one level of indirection for gear down/up and use that in all bindings,
so that aircraft with special requirements (hurricane) can simply redefine
controls.gearDown() without breaking all joystick setups
2005-06-16 07:36:54 +00:00
mfranz
1b035acb09 - remove W ("3dfx fullscreen-toggle")
- move m/M ("increase/decrease warp) to w/W
- make m/M "mixture richer/leaner"
2005-04-20 12:12:58 +00:00
ehofman
6e94786ea5 Melchior FRANZ:
Implement simple help system with global and aircraft specific dialogs:

The gui.nas changes have been discussed with Andy. All ac have a help dialog,
but some are empty. (This wouldn't have been necessary, as the system falls
back to the "Common Aircraft Keys" if an aircraft has no help defined, but an
empty dialog is less confusing and encourages to be filled with interesting
information.  :-)   I scanned all aircraft files for interesting performance
data and added some to the dialogs (stall speed, etc.) The Concorde and the
p51d have (over?)complete dialogs and can serve as examples. The format is
documented in $FG_ROOT/Nasa/gui.nas.

There is also a couple of other, minor fixes.

The following files have ugly MSDOS line endings:

  $FG_ROOT/Aircraft/Hunter/hunter{-2tanks,}-set.xml
  $FG_ROOT/Aircraft/A380/A380-set.xml


The Concorde-jsbsim.nas file is a useless copy of the real */nas file, which is
in Nasal/. I'was debugging the Concorde and wondered why changes to this file
had no effect ...
(Fixed Concorde in the help-ac.diff patch: don't use "interpol" keyword as
variable.)
2005-04-19 13:38:44 +00:00
curt
c65e978ce4 Change corresponding to change in replay system code. 2005-01-05 05:46:59 +00:00
ehofman
1571689ab2 Remove carrier specific keyboard bindings, they are now located in Input/Keyboard/carrier-bindings.xml 2004-12-27 13:16:35 +00:00
ehofman
297200aeca Mathias Fröhlich:
Attached is a patch against the data directory which establishes the
keybindings I use for the carrier operations.
The map.pdf must be regenerated.
2004-11-26 10:26:18 +00:00
ehofman
f6dc47513b Fix a typo. 2004-09-25 11:20:36 +00:00
david
adcdeab287 Remove fragile alias references in bindings and replace with property
references.
2004-06-24 14:45:48 +00:00
ehofman
ed6f6640af Lee Elliot:
I'd like to suggest that the spoiler settings are set in the same way as the
flaps are now done i.e. via Nasal, so that specific spoiler settings can also
be defined in the aircraft set file.

It was only when I was about to change the keyboard bindings for the slats
control that I remembered that there wasn't already a mapping for them in
keyboard.xml.  I've _not_ added a mapping for slats as this is a bit of a hot
topic atm but as I had already added a Nasal func for the slats in
controls.nas I've left that in there.  It's a trivial bit of code but I don't
know if leaving it in there is a good idea as it's code that shouldn't ever
be called until there's a corresponding keyboard mapping.
2004-06-01 08:13:12 +00:00
andy
eb5124840b Keybindings for the HUD, which used to be hardcoded in input.cxx.
Note that they're still very inflexible; I just mapped C++ functions
to new commands.
2004-04-05 19:39:47 +00:00
andy
15401619e5 There used to be a hard-coded F6 binding in input.cxx. Replace it
with a tiny bit of Nasal.
2004-04-05 18:55:33 +00:00
jimw
88d1598ab9 Fix virtual cockpit toggle binding ("c"). Switches between 2D/3D mode on the
fly.
2004-03-24 16:07:09 +00:00
david
8d4a441472 Bind Ctrl-I to the instrument-settings dialog, analogous to Ctrl-R for
the radio-settings dialog.
2004-03-23 21:41:57 +00:00
david
ef91f5bde2 Bind Ctrl-R to the radios dialog. 2004-03-11 14:37:39 +00:00
curt
76a08b6467 Autopilot overhaul. 2004-01-31 19:55:13 +00:00
curt
f7c276944e Attempt #1 to sort out confusion between left / right / parking brake
controls in the cockpit vs. which wheels they apply to.  FlightGear now
sets /controls/gear/brake-left, /controls/gear/brake-right, and
/controls/gear/brake-parking.  It should be up to the FDM to sort out
which wheels under which circumstances are affected by these controls
and ultimately what happens to the physical motion of the aircraft.
2004-01-12 17:49:33 +00:00
andy
b2909de010 New Nasal code, with lots of input binding handlers in controls.nas.
Move the "tip popup" code from view.nas to a new gui.nas module, and
  make it generically useful.
Wire up flap steppings for the 747 as an example of per-aircraft
  flaps.
Realtime-based property slewing, to eliminate dependence of trim and
  view direction rates on frame rate.
2003-12-22 20:05:18 +00:00
andy
3677b96fad Bugfix to globals.fgcommand().
New Node.setValues() method which sets whole property trees from Nasal
data.

A view.nas module, which takes over handling of the X/x zoom keys.  It
clamps the FOV to a dynamically calculated maximum corresponding to
typical human visual accuity, and pops up a pretty dialog informing
you of the new FOV.
2003-12-08 02:09:19 +00:00
daveluff
34cefacfb1 Remove the old reset zoom keybinding 2003-10-15 17:46:02 +00:00
daveluff
1e96eb5af8 Add Ctrl-X sets initial field of view in a similar manner to Ctrl-V with the view number 2003-10-14 21:03:10 +00:00
jimw
be86e39e20 John Stockhill: While messing around with an aeromatic generated Lancaster model I
discovered that there are a few inconsistencies in keyboard.xml. It allows
you to reduce the magneto setting on 4 engines, but will only increase it
on 2, which tends to result in a somewhat circular path from the end of
the runway :-)
2003-09-30 19:56:39 +00:00
jimw
51ae619886 Removed duplicate and unused bindings 2003-09-24 00:00:23 +00:00
curt
9498fb2a8f Norman Vine:
Allow keyboard modification of the visibility distance.
2003-08-05 16:38:44 +00:00
curt
81533a4faa Modified the replay system to work without enabling the master or clock freeze. 2003-07-18 14:13:57 +00:00
ehofman
0fd9f17296 Make sure the sixth view is accessible, and remove the damping factor from the helicopter view 2003-07-18 08:56:14 +00:00
curt
517c882cdf bind the instant replay command to the 'r' key. 2003-07-18 02:39:57 +00:00
curt
6d8ab6caaf Add support for exiting properly from the fledgling replay system. 2003-07-17 18:18:10 +00:00
ehofman
4d9241223a Melchior FRANZ:
This is my local keyboard.xml file.
There are some definitions in there that I would like to see
in the official keyboard.xml file. I suggested some of them
already almost exactly one year ago, but the suggestion was
dismissed with the argument, that the keyboard settings
should/would be redone very soon, anyway ...   :->

* shift escape ... reset FDM
  (Note: this doesn't work on IRIX)
* ctrl w       ... turn on wing leveler
* g            ... gear up
* shift g      ... gear down
* control b    ... toggle speedbrake (emh)


1. The p51d cries for a "Reset" key. Yeah, I admit that I've
   crashed some dozens of these beauties already, and yes, I
   am ashamed. Having to turn the menu on every time was too
   bothersome. Shift-ESC is still free and resetting is closely
   related to quitting. So this seems natural. (And don't ask
   why the command is called "old-reinit-dialog".)

2. Finally add a shortcut for the wing-leveler. Natural
   choice: Ctrl-W, which is still free and fits well with the
   other autopilot shortcuts Ctrl-[ANH].

3. Separate gear up and down into two different shortcuts.
   It really doesn't make sense as a toggle property. I'd
   even say, that this is the most important prerequisite
   for becoming a serious flight simulator.  ... Never
   land on your belly again, because you were actually
   retracting the landing gear on approach, having forgotten
   to retract it on lift-off.

Erik Hofman:
I've added Ctrl+B as the default binding for speedbrake support but this binding is overrruled by the p51d model to switch engine boost level.
2003-06-29 17:35:39 +00:00
mselig
4dd8d9bfcc Adds spoiler function with j/k keys for close/open spoilers. Sets the property /controls/flight/spoilers. 2003-06-08 22:39:24 +00:00
jimw
61bb6fd71c fixed keyboard binding so that changing view direction doesn't change pitch
offset.
2003-05-12 16:40:01 +00:00
ehofman
759d86d947 Updates to refelect the controls update of FlightGear. It could be there are a few unupdated controls left. To simplify the transisition there is a file called README.properties in the docs-mini directory of FlightGear that explains the new controls layout. 2003-04-01 12:41:12 +00:00
jimw
84923d5b79 Bound keys for view scrolling as suggested by Martin Spott. "v" scrolls
forward as it always has (not using the cycle-view command).  shift+"V" scrolls
in reverse through the views.  Ctrl-V returns to view 0 (cockpit).
Both forward and reverse scrolls wrap.
2003-02-14 02:35:42 +00:00
curt
de1c84c8c0 Jim Wilson:
There are a number of little changes.  Tested with current cvs as of 20:30EST
04Feb.  Actually been running since the beginning of January with these
patches.  All changes work without crashing with the current base package cvs,
but there are some visual problems with the views (other than pilot view)
without changes to the base package.

As soon as you can build test and commit I can add in those base package
updates that will make it all work nicely.  I will also go through all the 3D
Aircraft configs to make sure the change in the "pitch-offset" for cockpit
views (see below) are made to maintain current behavior.

Here are the files (changes listed below):
http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz
http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:46:48 +00:00
david
a8ab993ef2 Use an XML-configured exit dialog. 2003-01-24 03:20:11 +00:00
david
3598213c25 Removed test entry. 2003-01-19 22:00:59 +00:00
david
462927b726 Switch to new, unified autopilot dialog, bound to the menu and to F11. 2003-01-18 22:04:50 +00:00
david
a5dcab7a5a Added a couple of simple demo dialogs, and bound the wind dialog to Ctrl-D. 2002-12-22 20:22:11 +00:00
dluff
67a6d1758d Bind ' key (n=39) to the pop-up ATC dialog box 2002-12-17 17:24:05 +00:00
david
3a1c4e6a0f Bound Ctrl-C to make clickable hotspots on the panel visible. 2002-11-17 00:02:08 +00:00
david
1acc765781 Bind Ctrl-D to display a sample dialog (named "hello") from gui.xml. 2002-11-07 16:30:39 +00:00
david
03a0ad18eb Finished setting up configurable default viewing properties, and
implement them for the C172P 3D model.  Look near the top of
preferences.xml for an example.  The recognized properties are as
follow, with vanilla defaults in parentheses:

  /sim/view/config/default-field-of-view-deg (30)
  /sim/view/config/default-pitch-deg (0)
  /sim/view/config/front-direction-deg (0)
  /sim/view/config/front-left-direction-deg (45)
  /sim/view/config/left-direction-deg (90)
  /sim/view/config/back-left-direction-deg (135)
  /sim/view/config/back-direction-deg (180)
  /sim/view/config/back-right-direction-deg (225)
  /sim/view/config/right-direction-deg (270)
  /sim/view/config/front-right-direction-deg (315)

These are particularly useful for the view from inside a 3D aircraft
model.
2002-11-02 21:41:53 +00:00
david
83fa3930f8 Bound '+' to zoom in (like 'x').
Bound '-' to zoom out (like 'X').
Bound '=' to return to default zoom.
2002-10-29 22:06:53 +00:00
david
1a8383b3dc Added user-definable positions for front, left, back, etc. rather than
always forcing to the same angle.  These changes should migrate into
the joystick config files and the aircraft *-set.xml files eventually.
2002-09-14 16:22:39 +00:00
jimw
018f8fc54e Don't need to reload panel anymore either 2002-09-06 03:28:24 +00:00
jimw
b1a02baa86 Changed the binding for "c" to simply turn 3d cockpit off or back on 2002-09-06 03:17:11 +00:00
david
bec6adc612 Bind 'l' (lower-case L) to toggle the tailwheel lock, for taildraggers
with a lockable tailwheel (like the DC-3).
2002-05-23 17:34:59 +00:00
jimw
693b963bfb Added flag "allow-toggle-cockpit" so that 3d/2d toggle is not attempted for
aircraft that do not have 3d cockpit configured.  Toggling is done with the
"c" key.  Note also that for now, since the 3d models don't have a "small"
panel defined, the "s" key is disabled if "allow-toggle-cockpit" is true.
2002-04-21 15:06:22 +00:00
j4strngs
9893da939c Added keyboard binding to toggle between 2/3D cockpit 2002-04-19 23:47:16 +00:00
jimw
6839f957fe fixed paths for goal-heading-offset 2002-04-18 15:29:38 +00:00
curt
f468d9362d Jim Wilson:
These are the updates for the View manager properties.  Removed the last of
items (within the viewer/viewmgr) hard coded to view number.  Added support
for per view configuration of ground level nearplane value.  Tower views look
very nice with little or no z-buffer problem in the models.  Pilot offset
dialog can be used to move eye in all views.
2002-04-18 14:52:32 +00:00
david
a231c3c1ef Rebound 'B' to toggle /controls/parking-brake. 2002-04-11 14:40:27 +00:00
david
ea264c688c Add explicit types for all non-string properties. This will help a
lot, since otherwise a property that is never set or tied by
FlightGear itself will always be kept as a string and converted on
each access.  That's why fgGetBool and friends could take up a lot of
processor time sometimes.
2002-04-09 10:45:47 +00:00
david
32a2ef488d Explicitly set write-all to false for saving the flight, so that only
archivable properties are written.
2002-03-09 11:18:07 +00:00
david
1b79d0b252 Have 'p' toggle /sim/pause/clock as well as /sim/pause/master. In the
future, /sim/pause/master should control /sim/pause/clock as well, but
this will at least give the expected behaviour for 0.7.9.
2002-02-13 21:40:43 +00:00
curt
862c40aefa Renamed /sim/freeze to /sim/freeze/master 2002-01-20 02:54:31 +00:00
david
3d2240a20e Added temporary bindings ctrl-O to tilt view down, and ctrl-P to tilt
view up.
2002-01-19 22:38:05 +00:00
david
c7583bf8b3 Reorder some out-of-place bindings (purely cosmetic). 2002-01-19 17:33:16 +00:00
david
2c2238c296 Added keybindings for selecting a current engine, for changing magneto
position, and for engaging the starter.  Here's how it works:

1. To select an engine, use '!' (shift-1) for engine 1, '@' (shift-2)
   for engine 2, '#' (shift-3) for engine 3, '$' (shift-4) for engine
   4, or '~' to select all engines.  These bindings set the bool
   properties /sim/input/selected/engine[0],
   /sim/input/selected/engine[1], etc.

2. To decrease the magneto for the selected engine(s), use '{'.

3. To increase the magneto for the selected engine(s), use '}'.

4. To engage the starter for the selected engine(s), use SPACE.

Eventually, I'll extend this so that the throttle uses the selected
engine as well, and will perhaps even support engine selection in the
joystick bindings.  Right now, only engine 1 (engines[0]) is selected
by default.
2001-12-18 12:37:21 +00:00
david
b2de0f0e92 Make ctrl-U work with JSBSim again by setting /sim/startup/onground
property to false (to disable JSBSim's ground-trimming routine).
2001-12-13 20:27:00 +00:00
curt
c14bfda33c Set minimum speed up to a value of 1 so we can't have 0 or <0 speed up (which
doesn't make sense.)
2001-10-27 16:27:56 +00:00
curt
c25b322e28 - bound g to /controls/gear-down 2001-07-23 19:11:21 +00:00
curt
e07c32992f - bound ^R to /sim/temp/winding-ccw
- bound W to /sim/temp/full-screen
- bound Shift-F10 to /sim/temp/fdm-data-logging
2001-07-16 03:20:50 +00:00
j4strngs
769d991462 JW mini panel
Modified Files:
 	keyboard.xml preferences.xml
 	Aircraft/c172/Panels/c172-panel-trans-mini.xml
2001-07-03 23:38:15 +00:00
j4strngs
66abd80c3b Jim Wilsons transparent mini-panel
Modified Files:
 	FlightGear/keyboard.xml FlightGear/preferences.xml
 Added Files:
 	FlightGear/Aircraft/c172/Panels/c172-panel-mini.xml
 	FlightGear/Aircraft/c172/Panels/c172-panel-trans-mini.xml
 	FlightGear/Aircraft/c172/Panels/Textures/panel-mini-bg.rgb
 	FlightGear/Aircraft/c172/Panels/Textures/panel-trans-mini-bg.rgb
2001-07-03 21:03:42 +00:00
curt
e7ef251807 ** Properties Renamed
- /autopilot/locks/nav1 => /autopilot/locks/nav[0]
- /autopilot/settings/altitude += "-ft"
- /autopilot/settings/climb-rate += "-fpm"
- /autopilot/settings/heading-bug += "-deg"
- /consumables/fuel/tank1/level => /consumables/fuel/tank[0]/level-gal_us
- /consumables/fuel/tank2/level => /consumables/fuel/tank[1]/level-gal_us
- /engines/engine0/cht => /engines/engine[0]/cht-degf
- /engines/engine0/egt => /engines/engine[0]/egt-degf
- /engines/engine0/fuel-flow => /engines/engine[0]/fuel-flow-gph
- /engines/engine0/mp => /engines/engine[0]/mp-osi
- /engines/engine0/rpm => /engines/engine[0]/rpm
- /environment/clouds/altitude += "-ft"
- /environment/magnetic-dip += "-deg"
- /environment/magnetic-varation += "-deg"
- /environment/visibility += "-m"
- /environment/wind-down += "-fps"
- /environment/wind-east += "-fps"
- /environment/wind-north += "-fps"
- /orientation/heading += "-deg"
- /orientation/heading-magnetic += "-deg"
- /orientation/pitch += "-deg"
- /orientation/roll += "-deg"
- /position/altitude += "-ft"
- /position/altitude-agl += "-ft"
- /position/latitude += "-deg"
- /position/longitude += "-deg"
- /radios/adf/frequencies/selected += "-khz"
- /radios/adf/frequencies/standby += "-khz"
- /radios/adf/rotation += "-deg"
- /radios/nav1/* => /radios/nav[0]/*
- /radios/nav2/* => /radios/nav[1]/*
- /radios/nav[*]/dme/distance += "-nm"
- /radios/nav[*]/frequencies/selected += "-mhz"
- /radios/nav[*]/frequencies/standby += "-mhz"
- /radios/nav[*]/radials/actual += "-deg"
- /radios/nav[*]/radials/selected += "-deg"
- /sim/view/goal-offset += "-deg"
- /sim/view/offset += "-deg"
- /steam/adf += "-deg"
- /steam/airspeed += "-kt"
- /steam/altitude += "-ft"
- /steam/gyro-compass += "-deg"
- /steam/gyro-compass-error += "-deg"
- /steam/mag-compass += "-deg"
- /steam/vertical-speed += "-fpm"
- /velocities/airspeed += "-kt"
- /velocities/side-slip += "-rad"
- /velocities/speed-down += "-fps"
- /velocities/speed-east += "-fps"
- /velocities/speed-north += "-fps"
- /velocities/uBody += "-fps"
- /velocities/vBody += "-fps"
- /velocities/wBody += "-fps"
- /velocities/vertical-speed += "-fps"
2001-07-02 21:05:14 +00:00
curt
87f6b4bccd - added ESC to quit FlightGear
- added ^T to toggle terrain-follow
- added M and m to decrease and increase warp
- added p to pause and unpause the sim
- added T and t to decrease and increase warp delta
- added X and x to increase and decrease field of view
- added Z and z to decrease and increase visibility
- added F2 to force a tile-cache update
- added F4 to force a lighting update
- added F9 to toggle textured rendering
2001-06-26 21:01:46 +00:00
curt
f30c007209 - added new binding B (shift-b) to toggle parking brake on and off 2001-06-20 19:15:49 +00:00
curt
d3c4db2f58 Synced Thanks file with source.
Fixed elevator direction in keyboard.xml
Fixed a typo in materials.
2001-06-15 15:38:23 +00:00
curt
931f4bf184 Added ctrl-g binding for autopilot glide slope hold. 2001-06-13 20:37:15 +00:00
curt
f14a6cb82e - bound Shift-F1 to load and Shift-F2 to save
- bound Shift-F3 to panel-load
- bound Shift-F4, Shift-F5, Shift-F6, and Shift-F7 to scroll panel
2001-06-05 20:14:56 +00:00
curt
d880b8f90b - fixed bug with ',' and '.' for differential braking (release
binding wasn't encoded properly)
2001-06-04 20:08:43 +00:00
curt
39148a77ca ** joysticks.xml
- new external file for joystick configuration
- designed for a basic three-axis, three-button joystick; others will
  require some work

** keyboard.xml
- changed back to using index ('n' attribute) to represent key code
- switched to nesting for modifiers, so that they can all appear in
  the same declaration
- bound 'b' to brake, but modified so that the brake is released
  as soon as the button is

** preferences.xml
- start mixture at 1.0 (full rich), which is most appropriate for
  take-off and landing
- commented out old joystick bindings
- added reference to external joysticks.xml file
2001-06-04 19:48:08 +00:00
curt
90bb81107a Updates to match recent simgear/flightgear code changes. 2001-06-01 17:02:31 +00:00
curt
1da87b306c Updated to match code changes. 2001-05-29 21:28:13 +00:00
curt
d6e6319c6d Restore old keyboard defaults. 2001-05-29 20:14:01 +00:00
curt
498eb04332 Initial revision. 2001-05-23 22:00:34 +00:00