diff --git a/Aircraft/c172p/c172p-set.xml b/Aircraft/c172p/c172p-set.xml index 36c7867cd..395efd1eb 100644 --- a/Aircraft/c172p/c172p-set.xml +++ b/Aircraft/c172p/c172p-set.xml @@ -157,7 +157,7 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net - + true diff --git a/Effects/model-default.eff b/Effects/model-default.eff index a332b8245..23f7eb1d5 100644 --- a/Effects/model-default.eff +++ b/Effects/model-default.eff @@ -35,6 +35,9 @@ + + /sim/rendering/rembrandt + /sim/rendering/shaders/generic @@ -192,6 +195,11 @@ + + + /sim/rendering/rembrandt + + true diff --git a/Input/Joysticks/Saitek/Cyborg-X.xml b/Input/Joysticks/Saitek/Cyborg-X.xml new file mode 100644 index 000000000..25abfeaad --- /dev/null +++ b/Input/Joysticks/Saitek/Cyborg-X.xml @@ -0,0 +1,559 @@ + + + + + + + +Saitek Cyborg X +Cyborg X +F.L.Y 5 +FLY 5 +FLY5 +Saitek FLY5 +Saitek F.L.Y. 5 +Saitek FLY 5 + + + + + Aileron + + property-scale + /controls/flight/aileron + 2 + + + + + Elevator + + property-scale + /controls/flight/elevator + -1.0 + 2 + + + + + + 3 + 2 + 2 + + Throttle + + nasal + + + + + + + 2 + 3 + 3 + + Rudder + + property-scale + /controls/flight/rudder + 2 + + + + + + View Direction; Aileron Trim; + + 5 + 5 + 5 + + + true + + nasal + + + + + true + + nasal + + + + + + + View Elevation; Elevator Trim; + + 6 + 6 + 6 + + + true + + nasal + + + + + true + + nasal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Textures/Globe/00README.txt b/Textures/Globe/00README.txt new file mode 100644 index 000000000..4a24f4acf --- /dev/null +++ b/Textures/Globe/00README.txt @@ -0,0 +1,21 @@ + Image Use Policy + +Most materials published on the Earth Observatory, including images, +are freely available for re-publication or re-use, including commercial +purposes, with the following exceptions: + + * where copyright is indicated, you must obtain the copyright + holder’s permission; we usually provide links to the organization + that holds the copyright, + * images from the SeaWiFS sensor older than five years are in the + public domain and can be re-used or re-published for any purpose. + Images less than five years old can be re-used only for + educational or scientific purposes; any commercial use of such + images must be coordinated with GeoEye. + +We ask that NASA’s Earth Observatory be given credit for its original +materials; the only mandatory credit is NASA. + +Source: + + http://earthobservatory.nasa.gov/ImageUse/ diff --git a/Textures/Globe/world.topo.bathy.200407.3x4096x2048.png b/Textures/Globe/world.topo.bathy.200407.3x4096x2048.png new file mode 100644 index 000000000..f1a682769 Binary files /dev/null and b/Textures/Globe/world.topo.bathy.200407.3x4096x2048.png differ diff --git a/preferences.xml b/preferences.xml index 1f50279c9..6344e8db2 100644 --- a/preferences.xml +++ b/preferences.xml @@ -64,6 +64,7 @@ Started September 2000 by David Megginson, david@megginson.com summer + false false 5 8