FlightGear - Flight Simulator

Update of /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Systems
In directory baron:/tmp/cvs-serv21610/Systems

Modified Files:
	lightning-controls.nas 
Log Message:
AJ MacLEOD: "adds rudder trim control"


Index: lightning-controls.nas
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Systems/lightning-controls.nas,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -r1.11 -r1.12
*** lightning-controls.nas	1 Aug 2007 18:51:32 -0000	1.11
--- lightning-controls.nas	1 Aug 2007 23:02:01 -0000	1.12
***************
*** 193,198 ****
  	var lever = getprop("controls/switches/autothrottle");
  	var power = getprop("systems/electrical/outputs/autothrottle");
  
! 	if ( power > 100 and lever ) {
  		setprop("autopilot/settings/target-speed-kt", 180);
  		setprop("autopilot/locks/speed","speed-with-throttle");
--- 193,199 ----
  	var lever = getprop("controls/switches/autothrottle");
  	var power = getprop("systems/electrical/outputs/autothrottle");
+ 	var airspeed = getprop("velocities/airspeed-kt");
  
! 	if ( power > 100 and lever and airspeed > 162 and airspeed < 275) {
  		setprop("autopilot/settings/target-speed-kt", 180);
  		setprop("autopilot/locks/speed","speed-with-throttle");
***************
*** 499,500 ****
--- 500,507 ----
  } # End Func
  
+ # ========================= Rudder Trim  =====================================
+ controls.rudderTrim = func(direction){
+ 	var volts = getprop("systems/electrical/outputs/control_pos_indicator");
+ 	setprop("sim/model/lightning/controls/flight/rudder-trim", direction);
+ 	controls.slewProp("controls/flight/rudder-trim", direction * 0.6 * (volts/28));
+ } # end

Update of /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Models
In directory baron:/tmp/cvs-serv21610/Models

Modified Files:
	cockpit-levers.rgb throttles.ac throttles.xml trim.xml 
Log Message:
AJ MacLEOD: "adds rudder trim control"


Index: cockpit-levers.rgb
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Models/cockpit-levers.rgb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -r1.2 -r1.3
Binary files /tmp/cvssmMJAu and /tmp/cvsqMw1sN differ

Index: throttles.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Models/throttles.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -r1.4 -r1.5
*** throttles.ac	1 Aug 2007 18:51:32 -0000	1.4
--- throttles.ac	1 Aug 2007 23:02:01 -0000	1.5
***************
*** 7,11 ****
  MATERIAL "ac3dmat0" rgb 0.02 0.02 0.02  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.051 0.051 0.051  shi 27  trans 0
  OBJECT world
! kids 2
  OBJECT group
  name "throttles"
--- 7,11 ----
  MATERIAL "ac3dmat0" rgb 0.02 0.02 0.02  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.051 0.051 0.051  shi 27  trans 0
  OBJECT world
! kids 3
  OBJECT group
[...1611 lines suppressed...]
+ 35 0.399358 0.708657
+ SURF 0x10
+ mat 1
+ refs 3
+ 19 0.409032 0.72516
+ 35 0.399358 0.708657
+ 36 0.412392 0.706394
+ SURF 0x10
+ mat 1
+ refs 3
+ 19 0.409032 0.72516
+ 36 0.412392 0.706394
+ 37 0.423855 0.712911
+ SURF 0x10
+ mat 1
+ refs 3
+ 19 0.409032 0.72516
+ 37 0.423855 0.712911
+ 29 0.428382 0.72516
+ kids 0

Index: throttles.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Models/throttles.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -r1.3 -r1.4
*** throttles.xml	1 Aug 2007 18:51:32 -0000	1.3
--- throttles.xml	1 Aug 2007 23:02:01 -0000	1.4
***************
*** 158,161 ****
--- 158,219 ----
  	</animation>
  
+ 	<!-- Rudder Trim -->	
+ 	<animation>
+ 		<type>rotate</type>
+ 		<object-name>rudder_trim_bar</object-name>
+ 		<property>sim/model/lightning/controls/flight/rudder-trim</property>
+ 		<factor>30</factor>
+ 		<center>
+ 			<x-m>3.53147</x-m>
+ 			<y-m>-0.328154</y-m>
+ 			<z-m>0.547087</z-m>
+ 		</center>
+ 		<axis>
+ 			<x>-1</x>
+ 			<y>0</y>
+ 			<z>0</z>
+ 		</axis>
+ 	</animation>
+ 	<animation>
+ 		<type>pick</type>
+ 		<object-name>rudder_trim_left</object-name>
+ 		<visible>false</visible>
+ 		<action>
+ 			<button>0</button>
+ 			<repeatable>true</repeatable>
+ 			<binding>
+ 				<command>nasal</command>
+ 				<script>controls.rudderTrim(-1)</script>
+ 			</binding>
+ 			<mod-up>
+ 				<binding>
+ 					<command>property-assign</command>
+ 					<property>sim/model/lightning/controls/flight/rudder-trim</property>
+ 					<value type="int">0</value>
+ 				</binding>
+ 			</mod-up>
+ 		</action>
+ 	</animation>
+ 	<animation>
+ 		<type>pick</type>
+ 		<object-name>rudder_trim_right</object-name>
+ 		<visible>false</visible>
+ 		<action>
+ 			<button>0</button>
+ 			<repeatable>true</repeatable>
+ 			<binding>
+ 				<command>nasal</command>
+ 				<script>controls.rudderTrim(1)</script>
+ 			</binding>
+ 			<mod-up>
+ 				<binding>
+ 					<command>property-assign</command>
+ 					<property>sim/model/lightning/controls/flight/rudder-trim</property>
+ 					<value type="int">0</value>
+ 				</binding>
+ 			</mod-up>
+ 		</action>
+ 	</animation>
+ 	
  	<!-- disable shadows -->
  	<animation>
***************
*** 163,166 ****
--- 221,225 ----
  		<object-name>throttles</object-name>
  		<object-name>auto-throttle</object-name>
+ 		<object-name>rudder_trim</object-name>
  	</animation>
  			

Index: trim.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Models/trim.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -r1.4 -r1.5
*** trim.xml	29 Dec 2006 18:06:07 -0000	1.4
--- trim.xml	1 Aug 2007 23:02:01 -0000	1.5
***************
*** 25,29 ****
  		<object-name>trim-rud</object-name>
  		<property>controls/flight/rudder-trim</property>
! 		<factor>50</factor>
  		<center>
  			<x-m>0.00627251</x-m>
--- 25,29 ----
  		<object-name>trim-rud</object-name>
  		<property>controls/flight/rudder-trim</property>
! 		<factor>-50</factor>
  		<center>
  			<x-m>0.00627251</x-m>

Update of /var/cvs/FlightGear-0.9/data/Nasal
In directory baron:/tmp/cvs-serv18182

Modified Files:
	view.nas 
Log Message:
don't reset viewPosition on view.resetView(). This would break
"seat adjustment" view MMB-dragging.


Index: view.nas
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Nasal/view.nas,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -r1.18 -r1.19
*** view.nas	1 Aug 2007 21:10:04 -0000	1.18
--- view.nas	1 Aug 2007 21:28:58 -0000	1.19
***************
*** 78,82 ****
          return flyby.setpos(1);
  
-     resetViewPos();
      resetViewDir();
      resetFOV();
--- 78,81 ----

Update of /var/cvs/FlightGear-0.9/data/Nasal
In directory baron:/tmp/cvs-serv17463/Nasal

Modified Files:
	view.nas 
Log Message:
Fix mouse MMB+LMB: this reset to view[0] parameters independent of the
current view, so it was only usable in cockpit view, and messed up every
other view.


Index: view.nas
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Nasal/view.nas,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -r1.17 -r1.18
*** view.nas	16 Jul 2007 14:42:48 -0000	1.17
--- view.nas	1 Aug 2007 21:10:04 -0000	1.18
***************
*** 49,64 ****
  # Handler.  Reset FOV to default.
  #
! resetFOV = func {
      setprop("/sim/current-view/field-of-view",
              getprop("/sim/current-view/config/default-field-of-view-deg"));
  }
  
! ##
! # Handler.  Reset view to default.
! #
! resetView = func {
!     if (getprop("/sim/current-view/view-number") == 6)
!         return flyby.setpos(1);
  
      setprop("/sim/current-view/goal-heading-offset-deg",
              getprop("/sim/current-view/config/heading-offset-deg"));
--- 49,66 ----
  # Handler.  Reset FOV to default.
  #
! var resetFOV = func {
      setprop("/sim/current-view/field-of-view",
              getprop("/sim/current-view/config/default-field-of-view-deg"));
  }
  
! var resetViewPos = func {
!     var n = getprop("/sim/current-view/view-number");
!     var v = views[n].getNode("config");
!     setprop("/sim/current-view/x-offset-m", v.getNode("x-offset-m", 1).getValue() or 0);
!     setprop("/sim/current-view/y-offset-m", v.getNode("y-offset-m", 1).getValue() or 0);
!     setprop("/sim/current-view/z-offset-m", v.getNode("z-offset-m", 1).getValue() or 0);
! }
  
+ var resetViewDir = func {
      setprop("/sim/current-view/goal-heading-offset-deg",
              getprop("/sim/current-view/config/heading-offset-deg"));
***************
*** 67,70 ****
--- 69,83 ----
      setprop("/sim/current-view/goal-roll-offset-deg",
              getprop("/sim/current-view/config/roll-offset-deg"));
+ }
+ 
+ ##
+ # Handler.  Reset view to default.
+ #
+ resetView = func {
+     if (getprop("/sim/current-view/view-number") == 6)
+         return flyby.setpos(1);
+ 
+     resetViewPos();
+     resetViewDir();
      resetFOV();
  }

Update of /var/cvs/FlightGear-0.9/data
In directory baron:/tmp/cvs-serv17463

Modified Files:
	mice.xml 
Log Message:
Fix mouse MMB+LMB: this reset to view[0] parameters independent of the
current view, so it was only usable in cockpit view, and messed up every
other view.


Index: mice.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/mice.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -r1.19 -r1.20
*** mice.xml	9 Feb 2007 13:31:04 -0000	1.19
--- mice.xml	1 Aug 2007 21:10:04 -0000	1.20
***************
*** 168,179 ****
     <button n="0">
      <binding>
!      <command>property-assign</command>
!      <property>/sim/current-view/heading-offset-deg</property>
!      <property>/sim/view/config/front-direction-deg</property>
!     </binding>
!     <binding>
!      <command>property-assign</command>
!      <property>/sim/current-view/goal-pitch-offset-deg</property>
!      <property>/sim/view/config/pitch-offset-deg</property>
      </binding>
      <binding>
--- 168,176 ----
     <button n="0">
      <binding>
!      <command>nasal</command>
!      <script>
!          view.resetViewDir();
!          view.resetFOV();
!      </script>
      </binding>
      <binding>
***************
*** 181,203 ****
        <property>/devices/status/mice/mouse[0]/button[1]</property>
       </condition>
!      <command>property-assign</command>
!      <property>/sim/current-view/x-offset-m</property>
!      <property>/sim/view/config/x-offset-m</property>
!     </binding>
!     <binding>
!      <condition>
!       <property>/devices/status/mice/mouse[0]/button[1]</property>
!      </condition>
!      <command>property-assign</command>
!      <property>/sim/current-view/y-offset-m</property>
!      <property>/sim/view/config/y-offset-m</property>
!     </binding>
!     <binding>
!      <condition>
!       <property>/devices/status/mice/mouse[0]/button[1]</property>
!      </condition>
!      <command>property-assign</command>
!      <property>/sim/current-view/z-offset-m</property>
!      <property>/sim/view/config/z-offset-m</property>
      </binding>
     </button>
--- 178,185 ----
        <property>/devices/status/mice/mouse[0]/button[1]</property>
       </condition>
!      <command>nasal</command>
!      <script>
!          view.resetViewPos();
!      </script>
      </binding>
     </button>

Update of /var/cvs/FlightGear-0.9/data/gui/dialogs
In directory baron:/tmp/cvs-serv12594

Modified Files:
	chat.xml chat_full.xml 
Log Message:
- simplification: use gui.dialog_update() command instead of
  fgcommand("dialog-update", props.Node.new({}));
- remove lots of trailing spaces


Index: chat.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/gui/dialogs/chat.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -r1.2 -r1.3
*** chat.xml	1 Aug 2007 19:37:52 -0000	1.2
--- chat.xml	1 Aug 2007 20:06:16 -0000	1.3
***************
*** 8,20 ****
    <group>
      <layout>hbox</layout>
!    
      <input>
       <name>compose</name>
!      <pref-width>500</pref-width>  
       <stretch>true</stretch>
       <halign>fill</halign>
       <length>50</length>
       <property>/sim/multiplay/chat-compose</property>
!     </input>   
  
      <button>
--- 8,20 ----
    <group>
      <layout>hbox</layout>
! 
      <input>
       <name>compose</name>
!      <pref-width>500</pref-width>
       <stretch>true</stretch>
       <halign>fill</halign>
       <length>50</length>
       <property>/sim/multiplay/chat-compose</property>
!     </input>
  
      <button>
***************
*** 33,39 ****
              setprop("/sim/multiplay/chat", lchat);
              setprop("/sim/multiplay/chat-compose", "");
!             fgcommand("dialog-update", props.Node.new({"object-name": "compose",
!                                                        "dialog-name": "chat"}));
!            }
          </script>
        </binding>
--- 33,38 ----
              setprop("/sim/multiplay/chat", lchat);
              setprop("/sim/multiplay/chat-compose", "");
!             gui.dialog_update("chat", "compose");
!           }
          </script>
        </binding>
***************
*** 66,70 ****
        </binding>
      </button>
!     
      <empty><stretch>true</stretch></empty>
    </group>
--- 65,69 ----
        </binding>
      </button>
! 
      <empty><stretch>true</stretch></empty>
    </group>

Index: chat_full.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/gui/dialogs/chat_full.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -r1.3 -r1.4
*** chat_full.xml	1 Aug 2007 19:37:52 -0000	1.3
--- chat_full.xml	1 Aug 2007 20:06:16 -0000	1.4
***************
*** 29,41 ****
    <group>
      <layout>hbox</layout>
!    
      <input>
!      <name>compose</name>   
       <stretch>true</stretch>
       <halign>fill</halign>
       <length>50</length>
!      <pref-width>500</pref-width>  
       <property>/sim/multiplay/chat-compose</property>
!     </input>   
  
      <button>
--- 29,41 ----
    <group>
      <layout>hbox</layout>
! 
      <input>
!      <name>compose</name>
       <stretch>true</stretch>
       <halign>fill</halign>
       <length>50</length>
!      <pref-width>500</pref-width>
       <property>/sim/multiplay/chat-compose</property>
!     </input>
  
      <button>
***************
*** 54,60 ****
              setprop("/sim/multiplay/chat", lchat);
              setprop("/sim/multiplay/chat-compose", "");
!             fgcommand("dialog-update", props.Node.new({"object-name": "compose",
!                                                        "dialog-name": "chat-full"}));
!           }          
          </script>
        </binding>
--- 54,59 ----
              setprop("/sim/multiplay/chat", lchat);
              setprop("/sim/multiplay/chat-compose", "");
!             gui.dialog_update("chat-full", "compose");
!           }
          </script>
        </binding>
***************
*** 62,66 ****
    </group>
  
- 
    <text>
      <label></label>
--- 61,64 ----
***************
*** 79,83 ****
        </binding>
      </button>
!     
      <button>
        <legend>Less ^</legend>
--- 77,81 ----
        </binding>
      </button>
! 
      <button>
        <legend>Less ^</legend>
***************
*** 91,96 ****
        </binding>
      </button>
-     
-     
  
      <empty><stretch>true</stretch></empty>
--- 89,92 ----

Update of /var/cvs/FlightGear-0.9/data/Nasal
In directory baron:/tmp/cvs-serv9881/Nasal

Modified Files:
	multiplayer.nas 
Log Message:
- we prefer hyphens in property names to underscores
- save /sim/multiplayer/chat-display to autosave.xml
- remove trailing spaces


Index: multiplayer.nas
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Nasal/multiplayer.nas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -r1.1 -r1.2
*** multiplayer.nas	10 Oct 2006 05:23:38 -0000	1.1
--- multiplayer.nas	1 Aug 2007 19:37:51 -0000	1.2
***************
*** 12,24 ****
  
  check_messages = func
! {  
  
    var mp = props.globals.getNode("/ai/models").getChildren("multiplayer");
!   
    foreach (i; mp)
    {
      var lmsg           = getprop(i.getPath() ~ "/sim/multiplay/chat");
      var lcallsign      = getprop(i.getPath() ~ "/callsign");
!     
      if ((lmsg != nil) and (lmsg != "") and (lcallsign != nil) and (lcallsign != ""))
      {
--- 12,24 ----
  
  check_messages = func
! {
  
    var mp = props.globals.getNode("/ai/models").getChildren("multiplayer");
! 
    foreach (i; mp)
    {
      var lmsg           = getprop(i.getPath() ~ "/sim/multiplay/chat");
      var lcallsign      = getprop(i.getPath() ~ "/callsign");
! 
      if ((lmsg != nil) and (lmsg != "") and (lcallsign != nil) and (lcallsign != ""))
      {
***************
*** 31,41 ****
          # Indicate we've seen this message.
          messages[lcallsign] = lmsg;
!         echo_message(lmsg, lcallsign);        
        }
      }
    }
!   
    # Check for new messages every couple of seconds.
!   settimer(check_messages, 3);  
  }
  
--- 31,41 ----
          # Indicate we've seen this message.
          messages[lcallsign] = lmsg;
!         echo_message(lmsg, lcallsign);
        }
      }
    }
! 
    # Check for new messages every couple of seconds.
!   settimer(check_messages, 3);
  }
  
***************
*** 46,51 ****
       msg = callsign ~ ": " ~ msg;
     }
!    
!    var ldisplay = getprop("/sim/multiplay/chat_display");
  
     if ((ldisplay != nil) and (ldisplay == "1"))
--- 46,51 ----
       msg = callsign ~ ": " ~ msg;
     }
! 
!    var ldisplay = getprop("/sim/multiplay/chat-display");
  
     if ((ldisplay != nil) and (ldisplay == "1"))
***************
*** 56,65 ****
  
     # Add the chat to the chat history.
!    var lchat = getprop("/sim/multiplay/chat_history");
  
     if (lchat == nil)
     {
!      setprop("/sim/multiplay/chat_history", msg);
!    } 
     else
     {
--- 56,65 ----
  
     # Add the chat to the chat history.
!    var lchat = getprop("/sim/multiplay/chat-history");
  
     if (lchat == nil)
     {
!      setprop("/sim/multiplay/chat-history", msg);
!    }
     else
     {
***************
*** 68,73 ****
         lchat = lchat ~ "\n";
       }
!      
!      setprop("/sim/multiplay/chat_history", lchat ~ msg);
     }
  }
--- 68,73 ----
         lchat = lchat ~ "\n";
       }
! 
!      setprop("/sim/multiplay/chat-history", lchat ~ msg);
     }
  }
***************
*** 80,84 ****
    # check for new messages
    check_messages();
!   
  }, 1);
  
--- 80,84 ----
    # check for new messages
    check_messages();
! 
  }, 1);

Update of /var/cvs/FlightGear-0.9/data/gui/dialogs
In directory baron:/tmp/cvs-serv9881/gui/dialogs

Modified Files:
	chat.xml chat_full.xml rendering.xml 
Log Message:
- we prefer hyphens in property names to underscores
- save /sim/multiplayer/chat-display to autosave.xml
- remove trailing spaces


Index: chat.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/gui/dialogs/chat.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -r1.1 -r1.2
*** chat.xml	10 Oct 2006 05:23:38 -0000	1.1
--- chat.xml	1 Aug 2007 19:37:52 -0000	1.2
***************
*** 15,19 ****
       <halign>fill</halign>
       <length>50</length>
!      <property>/sim/multiplay/chat_compose</property>
      </input>   
  
--- 15,19 ----
       <halign>fill</halign>
       <length>50</length>
!      <property>/sim/multiplay/chat-compose</property>
      </input>   
  
***************
*** 28,36 ****
          <command>nasal</command>
          <script>
!           var lchat = getprop("/sim/multiplay/chat_compose");
            if (lchat != "")
            {
              setprop("/sim/multiplay/chat", lchat);
!             setprop("/sim/multiplay/chat_compose", "");
              fgcommand("dialog-update", props.Node.new({"object-name": "compose",
                                                         "dialog-name": "chat"}));
--- 28,36 ----
          <command>nasal</command>
          <script>
!           var lchat = getprop("/sim/multiplay/chat-compose");
            if (lchat != "")
            {
              setprop("/sim/multiplay/chat", lchat);
!             setprop("/sim/multiplay/chat-compose", "");
              fgcommand("dialog-update", props.Node.new({"object-name": "compose",
                                                         "dialog-name": "chat"}));
***************
*** 60,64 ****
        <binding>
         <command>dialog-show</command>
!        <dialog-name>chat_full</dialog-name>
        </binding>
        <binding>
--- 60,64 ----
        <binding>
         <command>dialog-show</command>
!        <dialog-name>chat-full</dialog-name>
        </binding>
        <binding>

Index: chat_full.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/gui/dialogs/chat_full.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -r1.2 -r1.3
*** chat_full.xml	26 Mar 2007 15:25:27 -0000	1.2
--- chat_full.xml	1 Aug 2007 19:37:52 -0000	1.3
***************
*** 2,6 ****
  
  <PropertyList>
!   <name>chat_full</name>
    <modal>false</modal>
    <layout>vbox</layout>
--- 2,6 ----
  
  <PropertyList>
!   <name>chat-full</name>
    <modal>false</modal>
    <layout>vbox</layout>
***************
*** 20,24 ****
      <wrap>true</wrap>
      <editable>false</editable>
!     <property>/sim/multiplay/chat_history</property>
    </textbox>
  
--- 20,24 ----
      <wrap>true</wrap>
      <editable>false</editable>
!     <property>/sim/multiplay/chat-history</property>
    </textbox>
  
***************
*** 36,40 ****
       <length>50</length>
       <pref-width>500</pref-width>  
!      <property>/sim/multiplay/chat_compose</property>
      </input>   
  
--- 36,40 ----
       <length>50</length>
       <pref-width>500</pref-width>  
!      <property>/sim/multiplay/chat-compose</property>
      </input>   
  
***************
*** 49,59 ****
          <command>nasal</command>
          <script>
!           var lchat = getprop("/sim/multiplay/chat_compose");
            if (lchat != "")
            {
              setprop("/sim/multiplay/chat", lchat);
!             setprop("/sim/multiplay/chat_compose", "");
              fgcommand("dialog-update", props.Node.new({"object-name": "compose",
!                                                        "dialog-name": "chat_full"}));
            }          
          </script>
--- 49,59 ----
          <command>nasal</command>
          <script>
!           var lchat = getprop("/sim/multiplay/chat-compose");
            if (lchat != "")
            {
              setprop("/sim/multiplay/chat", lchat);
!             setprop("/sim/multiplay/chat-compose", "");
              fgcommand("dialog-update", props.Node.new({"object-name": "compose",
!                                                        "dialog-name": "chat-full"}));
            }          
          </script>

Index: rendering.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/gui/dialogs/rendering.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -r1.24 -r1.25
*** rendering.xml	26 Mar 2007 15:25:27 -0000	1.24
--- rendering.xml	1 Aug 2007 19:37:52 -0000	1.25
***************
*** 28,32 ****
        <halign>left</halign>
        <label>Show chat messages</label>
!       <property>/sim/multiplay/chat_display</property>
        <binding>
          <command>dialog-apply</command>
--- 28,32 ----
        <halign>left</halign>
        <label>Show chat messages</label>
!       <property>/sim/multiplay/chat-display</property>
        <binding>
          <command>dialog-apply</command>

Update of /var/cvs/FlightGear-0.9/data
In directory baron:/tmp/cvs-serv9881

Modified Files:
	preferences.xml 
Log Message:
- we prefer hyphens in property names to underscores
- save /sim/multiplayer/chat-display to autosave.xml
- remove trailing spaces


Index: preferences.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/preferences.xml,v
retrieving revision 1.244
retrieving revision 1.245
diff -C 2 -r1.244 -r1.245
*** preferences.xml	13 Jul 2007 14:29:52 -0000	1.244
--- preferences.xml	1 Aug 2007 19:37:51 -0000	1.245
***************
*** 465,468 ****
--- 465,469 ----
     <chat type="string">Hello</chat>
     <transmission-freq-hz type="string">118500000</transmission-freq-hz>
+    <chat-display type="bool" userarchive="y">true</chat-display>
    </multiplay>

Update of /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Systems
In directory baron:/tmp/cvs-serv8290/Systems

Modified Files:
	Lightning-autopilot.xml instrumentation-fine.nas 
	lightning-controls.nas lightning-electrical.nas 
Log Message:
AJ MacLEOD:

"Add an autothrottle control (for approach) and several other minor model
tweaks, reinstate ventral tank refit function"


Index: Lightning-autopilot.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Systems/Lightning-autopilot.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -r1.1 -r1.2
*** Lightning-autopilot.xml	19 Feb 2006 17:49:11 -0000	1.1
--- Lightning-autopilot.xml	1 Aug 2007 18:51:32 -0000	1.2
***************
*** 429,449 ****
  -->
  
! <!-- Simple Auto throttle -->
   <pid-controller>
      <name>Auto Throttle</name>
      <debug>false</debug>
      <enable>
!       <prop>/autopilot/locks/speed</prop>
        <value>speed-with-throttle</value>
      </enable>
      <input>
!       <prop>/velocities/airspeed-kt</prop>
      </input>
      <reference>
!       <prop>/autopilot/settings/target-speed-kt</prop>
      </reference>
      <output>
!       <prop>/controls/engines/engine[0]/throttle</prop>
!       <prop>/controls/engines/engine[1]/throttle</prop>
      </output>
      <config>
--- 429,466 ----
  -->
  
! <!-- Simple Auto throttle, Engine no1 -->
   <pid-controller>
      <name>Auto Throttle</name>
      <debug>false</debug>
      <enable>
!       <!--
!       <condition>
!         <and>
!           <equals>
!             <prop>autopilot/locks/speed</prop>
!             <value type="string">speed-with-throttle</value>
!           </equals>
!           <greater-than>
!             <prop>velocities/airspeed-kt</prop>
!             <value>162</value>
!           </greater-than>
!           <less-than>
!             <prop>velocities/airspeed-kt</prop>
!             <value>188</value>
!           </less-than>
!         </and>
!       </condition>
!       -->
!       <prop>autopilot/locks/speed</prop>
        <value>speed-with-throttle</value>
      </enable>
      <input>
!       <prop>velocities/airspeed-kt</prop>
      </input>
      <reference>
!       <prop>autopilot/settings/target-speed-kt</prop>
      </reference>
      <output>
!       <prop>controls/engines/engine[0]/throttle</prop>
      </output>
      <config>
***************
*** 456,461 ****
        <Ti>20.0</Ti>       <!-- integrator time -->
        <Td>0.00001</Td>    <!-- derivator time -->
!       <u_min>0.0</u_min>  <!-- minimum output clamp -->
!       <u_max>1.0</u_max>  <!-- maximum output clamp -->
      </config>
    </pid-controller>
--- 473,509 ----
        <Ti>20.0</Ti>       <!-- integrator time -->
        <Td>0.00001</Td>    <!-- derivator time -->
!       <u_min>0.1</u_min>  <!-- minimum output clamp -->
!       <u_max>0.85</u_max>  <!-- maximum output clamp -->
!     </config>
!   </pid-controller>
! 
! <!-- Simple Auto throttle, Engine no2 -->
!  <pid-controller>
!     <name>Auto Throttle2</name>
!     <debug>false</debug>
!     <enable>
!       <prop>autopilot/locks/speed</prop>
!       <value>speed-with-throttle</value>
!     </enable>
!     <input>
!       <prop>velocities/airspeed-kt</prop>
!     </input>
!     <reference>
!       <prop>autopilot/settings/target-speed-kt</prop>
!     </reference>
!     <output>
!       <prop>controls/engines/engine[1]/throttle</prop>
!     </output>
!     <config>
!       <Ts>0.02</Ts>
!       <Kp>0.02</Kp>        <!-- proportional gain -->
!       <beta>1.0</beta>    <!-- input value weighing factor -->
!       <alpha>0.1</alpha>  <!-- low pass filter weighing factor -->
!       <gamma>0.0</gamma>  <!-- input value weighing factor for -->
!                           <!-- unfiltered derivative error -->
!       <Ti>20.0</Ti>       <!-- integrator time -->
!       <Td>0.00001</Td>    <!-- derivator time -->
!       <u_min>0.58</u_min>  <!-- minimum output clamp -->
!       <u_max>0.85</u_max>  <!-- maximum output clamp -->
      </config>
    </pid-controller>

Index: instrumentation-fine.nas
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Systems/instrumentation-fine.nas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -r1.8 -r1.9
*** instrumentation-fine.nas	12 May 2007 20:37:54 -0000	1.8
--- instrumentation-fine.nas	1 Aug 2007 18:51:32 -0000	1.9
***************
*** 183,187 ****
  
  	### Initialise Seat stuff ###
! 	props.globals.getNode("sim/model/lightning/controls/seat", 0).setIntValue(0);
  
  	### Initialise Instrumentation stuff ###
--- 183,187 ----
  
  	### Initialise Seat stuff ###
! 	props.globals.getNode("sim/model/lightning/controls/seat", 1).setIntValue(0);
  
  	### Initialise Instrumentation stuff ###

Index: lightning-controls.nas
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Systems/lightning-controls.nas,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -r1.10 -r1.11
*** lightning-controls.nas	30 Jun 2007 22:07:03 -0000	1.10
--- lightning-controls.nas	1 Aug 2007 18:51:32 -0000	1.11
***************
*** 187,190 ****
--- 187,208 ----
  # ================================== Autopilot ==============================================
  
+ # Autothrottle Engage
+ 
+ autothrottleWatch = func{
+ 
+ 	var lever = getprop("controls/switches/autothrottle");
+ 	var power = getprop("systems/electrical/outputs/autothrottle");
+ 
+ 	if ( power > 100 and lever ) {
+ 		setprop("autopilot/settings/target-speed-kt", 180);
+ 		setprop("autopilot/locks/speed","speed-with-throttle");
+ 		return registerTimerControls(autothrottleWatch);
+ 	}
+ 	else { setprop("autopilot/locks/speed", " ");
+ 		setprop("controls/switches/autothrottle",0);
+ 	}
+ }
+ 
+ setlistener("controls/switches/autothrottle", autothrottleWatch);
  
  # Pitch Hold / Off
***************
*** 196,201 ****
  
  	if ( on != '1' ) {
! 		setprop("autopilot/locks/altitude[0]", "");
! 		setprop("autopilot/gui/alt-active[0]", "false");
  		#print("turning off")
  	}
--- 214,219 ----
  
  	if ( on != '1' ) {
! 		setprop("autopilot/locks/altitude[0]", 0);
! 		setprop("autopilot/gui/alt-active[0]", 0);
  		#print("turning off")
  	}
***************
*** 203,207 ****
  		setprop("autopilot/settings/target-pitch-deg[0]", aircraftpitch);
  		setprop("autopilot/locks/altitude[0]", "pitch-hold");
! 		setprop("autopilot/gui/alt-active[0]", "true");
  		#print("turning on")
  	}
--- 221,225 ----
  		setprop("autopilot/settings/target-pitch-deg[0]", aircraftpitch);
  		setprop("autopilot/locks/altitude[0]", "pitch-hold");
! 		setprop("autopilot/gui/alt-active[0]", 1);
  		#print("turning on")
  	}
***************
*** 443,446 ****
--- 461,472 ----
  } # End function
  
+ ventralRefit = func{
+ 
+ 	setprop('sim/model/lightning/controls/tank_jettisoned', 0);
+ 	setprop('sim/model/lightning/controls/tank_jettisoned_lever', 0);
+ 
+ } # end of function
+ 
+ 
  # ========================= Emergency U/C  =====================================
  

Index: lightning-electrical.nas
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Systems/lightning-electrical.nas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -r1.5 -r1.6
*** lightning-electrical.nas	4 Jul 2007 15:26:25 -0000	1.5
--- lightning-electrical.nas	1 Aug 2007 18:51:32 -0000	1.6
***************
*** 428,431 ****
--- 428,434 ----
  	else {setprop("systems/electrical/outputs/autopilot",0);}
  
+     # Autothrottle Servos (Don't require main AP to be switched on)
+     setprop("/systems/electrical/outputs/autothrottle", bus_volts);
+ 
      # Main AI and HSI - Automatic Failover to 28VDC on loss of AC
  	#if( bus_volts < 113 )

Update of /var/cvs/FlightGear-0.9/data/Aircraft/Lightning
In directory baron:/tmp/cvs-serv8290

Modified Files:
	lightning-set.xml 
Log Message:
AJ MacLEOD:

"Add an autothrottle control (for approach) and several other minor model
tweaks, reinstate ventral tank refit function"


Index: lightning-set.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/lightning-set.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -C 2 -r1.31 -r1.32
*** lightning-set.xml	23 Jul 2007 18:23:06 -0000	1.31
--- lightning-set.xml	1 Aug 2007 18:51:30 -0000	1.32
***************
*** 45,48 ****
--- 45,49 ----
  					<flight>
  						<chute_open>0</chute_open>
+ 						<autothrottle type="bool">0</autothrottle>
  					</flight>
  				</controls>
***************
*** 144,147 ****
--- 145,149 ----
  				<from-model type="bool">true</from-model>
  				<from-model-idx type="int">0</from-model-idx>
+ 				<ground-level-nearplane-m type="double">0.03</ground-level-nearplane-m>
  				<default-field-of-view-deg type="double">86.0</default-field-of-view-deg>
  				<pitch-offset-deg>0.0</pitch-offset-deg>
***************
*** 155,165 ****
  
  			<autopilot>
! 				<path>Aircraft/Lightning/Systems/Lightning-autopilot-jsbsim.xml</path>
  				<settings>
  					<target-pitch-deg type="float">10</target-pitch-deg>
  					<target-altitude-ft type="float">25000</target-altitude-ft>
  					<target-climb-rate-fps type="float">0</target-climb-rate-fps>
! 					<target-speed-kt type="float">350.0</target-speed-kt>
! 					<target-mach type="float">0.86</target-mach>
  				</settings>
  				<locks>
--- 157,166 ----
  
  			<autopilot>
! 				<path>Aircraft/Lightning/Systems/Lightning-autopilot.xml</path>
  				<settings>
  					<target-pitch-deg type="float">10</target-pitch-deg>
  					<target-altitude-ft type="float">25000</target-altitude-ft>
  					<target-climb-rate-fps type="float">0</target-climb-rate-fps>
! 					<target-speed-kt type="float">180.0</target-speed-kt>
  				</settings>
  				<locks>
***************
*** 167,170 ****
--- 168,172 ----
  					<rudder-control type="string">Initialised</rudder-control>
  					<auto-flap-control type="string">Manual</auto-flap-control>
+ 					<speed type="string">0</speed>
  				</locks>
  			</autopilot>
***************
*** 218,221 ****
--- 220,231 ----
  			</key>
  			<key>
+ 				<name>ctrl-b</name>
+ 				<desc>Toggle airbrakes</desc>
+ 			</key>
+ 			<key>
+ 				<name>ctrl-s</name>
+ 				<desc>Toggle autothrottle</desc>
+ 			</key>
+ 			<key>
  				<name>Ctrl-j</name>
  				<desc>Jettison ventral tank</desc>
***************
*** 320,323 ****
--- 330,344 ----
  			</key>
  
+ 			<!-- Autothrottle -->
+ 			<key n="19">
+ 				<name>ctrl-s</name>
+ 				<desc>toggle autothrottle</desc>
+ 				<binding>
+ 					<command>property-toggle</command>
+ 					<property>controls/switches/autothrottle</property>
+ 				</binding>
+ 			</key>
+ 
+ 			<!-- Radar View -->
  			<key n="32">
  				<name>SPACE</name>

Update of /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Models
In directory baron:/tmp/cvs-serv8290/Models

Modified Files:
	lightning-f1a.ac stbd_console.ac stick.ac throttle_panel.rgb 
	throttles.ac throttles.xml 
Added Files:
	leather_cream.rgb 
Log Message:
AJ MacLEOD:

"Add an autothrottle control (for approach) and several other minor model
tweaks, reinstate ventral tank refit function"


--- NEW FILE ---
>Ú>>

ÛÞߎâãÞàãßàÛÞÜÚÞÞÜނßáÞ ÛÜÝÛÞÝÝßßàÞàâßÞáÚÓØÛØÙÝØÝßâÞÞÙÜØلÞààß>à>â
ª­­nq>j>v
j}~zy}}|„•‘›vjfŠqqvqœŠey›™›jr•njjeje|}|›•~ej
>¾>Ä
³µ·²²¹Ä·²²®³’·¸µ²³³µ¼³¸¶·³¹³²³²³¸³ƒ¶¿º³±³À»°º¹³±³·¹³½>¶>¹
¹³»µ°¯°¯±·»µ·¼²±°º±±³¯±²·½¶À³±¯¬¯°¸¸±¿½³³¹³³²³º»À¼ºÂº¹Â¿ÀµµÀ¶¬³ž·¹³³¹¿ÀÀº°º¶¯Á½²¯°°³¹³¼À¼Å¿°¬º>±>¯
Index: lightning-f1a.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Models/lightning-f1a.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -r1.8 -r1.9
*** lightning-f1a.ac	2 Dec 2006 21:11:25 -0000	1.8
--- lightning-f1a.ac	1 Aug 2007 18:51:31 -0000	1.9
***************
*** 1,4 ****
  AC3Db
! MATERIAL "ac3dmat1" rgb 0 0 0  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10  trans 0
  MATERIAL "ac3dmat12" rgb 0.266667 0.266667 0.266667  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10  trans 0
  MATERIAL "ac3dmat1" rgb 0.172549 0.172549 0.172549  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10  trans 0
--- 1,4 ----
  AC3Db
! MATERIAL "ac3dmat0" rgb 0 0 0  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10  trans 0
  MATERIAL "ac3dmat12" rgb 0.266667 0.266667 0.266667  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10  trans 0
  MATERIAL "ac3dmat1" rgb 0.172549 0.172549 0.172549  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10  trans 0
***************
*** 16,20 ****
  MATERIAL "ac3dmat9" rgb 0.847 0.847 0.847  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10  trans 0
  MATERIAL "ac3dmat13" rgb 0.047 0.051 0.047  amb 0.02 0.027 0.027  emis 0 0 0  spec 0 0 0  shi 25  trans 0
! MATERIAL "ac3dmat4" rgb 0.149 0.161 0.153  amb 0 0 0  emis 0 0 0  spec 0.059 0.063 0.039  shi 2  trans 0
  MATERIAL "ac3dmat8" rgb 0.627 0.753 0.878  amb 0.2 0.2 0.302  emis 0 0 0  spec 0 0 0  shi 50  trans 0.831
  MATERIAL "ac3dmat14" rgb 0.8 0.8 0.8  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.804 0.804 0.804  shi 51  trans 0
--- 16,20 ----
  MATERIAL "ac3dmat9" rgb 0.847 0.847 0.847  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10  trans 0
  MATERIAL "ac3dmat13" rgb 0.047 0.051 0.047  amb 0.02 0.027 0.027  emis 0 0 0  spec 0 0 0  shi 25  trans 0
! MATERIAL "ac3dmat4" rgb 0.086 0.086 0.086  amb 0 0 0  emis 0 0 0  spec 0.059 0.063 0.039  shi 2  trans 0
  MATERIAL "ac3dmat8" rgb 0.627 0.753 0.878  amb 0.2 0.2 0.302  emis 0 0 0  spec 0 0 0  shi 50  trans 0.831
  MATERIAL "ac3dmat14" rgb 0.8 0.8 0.8  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.804 0.804 0.804  shi 51  trans 0
***************
*** 23,27 ****
  MATERIAL "ac3dmat4" rgb 0.349 0.141 0  amb 0 0 0  emis 0 0 0  spec 0 0 0  shi 8  trans 0
  MATERIAL "DefaultWhite" rgb 1 1 1  amb 0.306 0.306 0.306  emis 0 0 0  spec 0.804 0.804 0.804  shi 10  trans 0
! MATERIAL "ac3dmat14" rgb 0.608 0.612 0.612  amb 0.459 0.447 0.451  emis 0 0 0  spec 0 0 0  shi 65  trans 0
  OBJECT world
  kids 91
--- 23,27 ----
  MATERIAL "ac3dmat4" rgb 0.349 0.141 0  amb 0 0 0  emis 0 0 0  spec 0 0 0  shi 8  trans 0
  MATERIAL "DefaultWhite" rgb 1 1 1  amb 0.306 0.306 0.306  emis 0 0 0  spec 0.804 0.804 0.804  shi 10  trans 0
! MATERIAL "ac3dmat14" rgb 0.216 0.216 0.216  amb 0.267 0.275 0.286  emis 0 0 0  spec 0 0 0  shi 24  trans 0
  OBJECT world
  kids 91
***************
*** 37121,37125 ****
  numsurf 46
  SURF 0x10
! mat 16
  refs 22
  20 1 0
--- 37121,37125 ----
  numsurf 46
  SURF 0x10
! mat 0
  refs 22
  20 1 0
***************
*** 37300,37304 ****
  20 0 0
  SURF 0x10
! mat 16
  refs 22
  42 1 0
--- 37300,37304 ----
  20 0 0
  SURF 0x10
! mat 0
  refs 22
  42 1 0
***************
*** 59113,59117 ****
  44 0.342348 0.223924
  SURF 0x10
! mat 4
  refs 4
  44 0.342348 0.223924
--- 59113,59117 ----
  44 0.342348 0.223924
  SURF 0x10
! mat 0
  refs 4
  44 0.342348 0.223924
***************
*** 61013,61017 ****
  124 0.681524 0.245873
  SURF 0x30
! mat 4
  refs 4
  35 0.296498 0.223924
--- 61013,61017 ----
  124 0.681524 0.245873
  SURF 0x30
! mat 0
  refs 4
  35 0.296498 0.223924
***************
*** 61137,61141 ****
  499 0.0853722 0.0642639
  SURF 0x30
! mat 4
  refs 4
  168 0.246434 0.243759
--- 61137,61141 ----
  499 0.0853722 0.0642639
  SURF 0x30
! mat 0
  refs 4
  168 0.246434 0.243759
***************
*** 64283,64286 ****
--- 64283,64287 ----
  name "main_panel"
  loc -2.20796 -1.46797 -0.0338934
+ texture "brushed_alloy.rgb"
  crease 45.000000
  numvert 20
***************
*** 64309,64413 ****
  mat 3
  refs 3
! 3 40.631 66.8001
! 16 21.9174 13.8612
! 19 41.0254 49.1939
  SURF 0x0
  mat 3
  refs 3
! 16 21.9174 13.8612
! 3 40.631 66.8001
! 0 64.2284 65.5269
  SURF 0x20
  mat 3
  refs 4
! 11 64.2284 40.2619
! 3 62.1641 66.8001
! 19 41.0254 49.1939
! 18 44.2971 31.4674
  SURF 0x20
  mat 3
  refs 4
! 4 64.2284 31.4674
! 11 62.0508 66.8001
! 18 41.0254 55.0912
! 15 44.4763 31.4903
  SURF 0x20
  mat 3
  refs 4
! 9 8.50128 31.4674
! 7 6.32368 -3.86533
! 12 26.0757 -3.84243
! 17 29.5266 19.7585
  SURF 0x20
  mat 3
  refs 4
! 0 0.778628 31.4674
! 9 -1.28551 4.92919
! 17 18.6457 -3.86533
! 16 21.9174 13.8612
  SURF 0x20
  mat 3
  refs 4
! 5 2.78337 31.4674
! 4 4.06696 31.4674
! 15 25.9863 66.8001
! 14 23.9527 66.8001
  SURF 0x20
  mat 3
  refs 4
! 7 62.9448 31.4674
! 6 64.2284 31.4674
! 13 43.059 66.8001
! 12 41.0254 66.8001
  SURF 0x20
  mat 3
  refs 6
! 2 44.8063 66.8001
! 8 41.0758 49.1338
! 5 41.0254 31.4674
! 6 64.2284 31.4674
! 10 64.178 49.1338
! 1 60.4474 66.8001
  SURF 0x20
  mat 3
  refs 6
! 0 44.8063 66.8001
! 9 41.0758 49.1338
! 7 41.0254 31.4674
! 4 64.2284 31.4674
! 11 64.178 49.1338
! 3 60.4474 66.8001
  SURF 0x20
  mat 3
  refs 6
! 3 37.8496 30.1942
! 11 14.9559 13.1644
! 4 14.6466 -3.86533
! 5 14.6466 -3.86533
! 8 14.9559 13.801
! 2 37.8496 31.4674
  SURF 0x20
  mat 3
  refs 4
! 0 40.631 31.4674
! 3 40.631 66.8001
! 2 17.4279 66.8001
! 1 17.4279 31.4674
  SURF 0x20
  mat 3
  refs 4
! 7 41.0254 31.4674
! 6 64.2284 31.4674
! 5 64.2284 66.8001
! 4 41.0254 66.8001
  SURF 0x20
  mat 3
  refs 6
! 1 64.2284 66.8001
! 10 41.3346 49.1338
! 6 41.0254 31.4674
! 7 41.0254 31.4674
! 9 41.3346 48.4971
! 0 64.2284 65.5269
  kids 0
  OBJECT poly
--- 64310,64414 ----
  mat 3
  refs 3
! 3 3.33144 2.56882
! 16 -1.75388 1.15066
! 19 2.44878 1.15066
  SURF 0x0
  mat 3
  refs 3
! 16 -1.75388 1.15066
! 3 3.33144 2.56882
! 0 -2.63931 2.56882
  SURF 0x20
  mat 3
  refs 4
! 11 4.75551 0.431203
! 3 3.33144 2.56882
! 19 2.44878 1.15066
! 18 4.33393 -0.277181
  SURF 0x20
  mat 3
  refs 4
! 4 4.77474 -1.70641
! 11 4.75551 0.431203
! 18 4.33393 -0.277181
! 15 4.77474 -1.70503
  SURF 0x20
  mat 3
  refs 4
! 9 -4.06337 0.431203
! 7 -4.08261 -1.70641
! 12 -4.08261 -1.70503
! 17 -3.63902 -0.277181
  SURF 0x20
  mat 3
  refs 4
! 0 -2.63931 2.56882
! 9 -4.06337 0.431203
! 17 -3.63902 -0.277181
! 16 -1.75388 1.15066
  SURF 0x20
  mat 3
  refs 4
! 5 4.77474 -1.70641
! 4 4.77474 -1.70641
! 15 4.77474 -1.70503
! 14 4.77474 -1.70503
  SURF 0x20
  mat 3
  refs 4
! 7 -4.08261 -1.70641
! 6 -4.08261 -1.70641
! 13 -4.08261 -1.70503
! 12 -4.08261 -1.70503
  SURF 0x20
  mat 3
  refs 6
! 2 3.33144 2.72864
! 8 4.75551 0.511112
! 5 4.77474 -1.70641
! 6 -4.08261 -1.70641
! 10 -4.06337 0.511112
! 1 -2.63931 2.72864
  SURF 0x20
  mat 3
  refs 6
! 0 -2.63931 2.56882
! 9 -4.06337 0.431203
! 7 -4.08261 -1.70641
! 4 4.77474 -1.70641
! 11 4.75551 0.431203
! 3 3.33144 2.56882
  SURF 0x20
  mat 3
  refs 6
! 3 3.33144 2.56882
! 11 4.75551 0.431203
! 4 4.77474 -1.70641
! 5 4.77474 -1.70641
! 8 4.75551 0.511112
! 2 3.33144 2.72864
  SURF 0x20
  mat 3
  refs 4
! 0 -2.63931 2.56882
! 3 3.33144 2.56882
! 2 3.33144 2.72864
! 1 -2.63931 2.72864
  SURF 0x20
  mat 3
  refs 4
! 7 -4.08261 -1.70641
! 6 -4.08261 -1.70641
! 5 4.77474 -1.70641
! 4 4.77474 -1.70641
  SURF 0x20
  mat 3
  refs 6
! 1 -2.63931 2.72864
! 10 -4.06337 0.511112
! 6 -4.08261 -1.70641
! 7 -4.08261 -1.70641
! 9 -4.06337 0.431203
! 0 -2.63931 2.56882
  kids 0
  OBJECT poly
***************
*** 66849,66852 ****
--- 66850,66854 ----
  name "chute_pull_aux_panel"
  loc 0.316944 0.397311 0.120805
+ texture "brushed_alloy.rgb"
  crease 45.000000
  numvert 20
***************
*** 67072,67075 ****
--- 67074,67078 ----
  name "aux_panel_port"
  loc 0.367634 0.282968 -0.182247
+ texture "brushed_alloy.rgb"
  crease 45.000000
  numvert 22
***************
*** 67215,67218 ****
--- 67218,67222 ----
  name "aux_panel_stbd"
  loc 0.367634 0.282968 -0.182247
+ texture "brushed_alloy.rgb"
  crease 45.000000
  numvert 24
***************
*** 67738,67741 ****
--- 67742,67746 ----
  name "box"
  loc -4.22369 -0.430334 -0.0338934
+ texture "brushed_alloy.rgb"
  crease 45.000000
  numvert 24
***************
*** 67867,67870 ****
--- 67872,67876 ----
  name "centre_console"
  loc 0.026804 -0.269349 -0.0338934
+ texture "brushed_alloy.rgb"
  crease 45.000000
  numvert 24

Index: stbd_console.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Models/stbd_console.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -r1.3 -r1.4
*** stbd_console.ac	2 Dec 2006 21:11:27 -0000	1.3
--- stbd_console.ac	1 Aug 2007 18:51:31 -0000	1.4
***************
*** 2314,2317 ****
--- 2314,2318 ----
  name "shaft_cabin_air"
  loc 1.76352 0.268078 -0.246103
+ texture "slot_screw_med_button_head.rgb"
  crease 45.000000
  numvert 183
***************
*** 2503,3608 ****
  mat 4
  refs 3
[...42205 lines suppressed...]
  SURF 0x10
  mat 4
  refs 3
! 0 0.620351 0.25423
! 4 0.620817 0.263755
! 5 0.621362 0.262414
  SURF 0x10
  mat 4
  refs 3
! 78 0.628005 0.233001
! 74 0.628079 0.243535
! 73 0.627476 0.242194
  SURF 0x10
  mat 4
  refs 3
! 78 0.628005 0.233001
! 75 0.62862 0.242194
! 74 0.628079 0.243535
  kids 0
  OBJECT poly

Index: stick.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Models/stick.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -r1.1 -r1.2
*** stick.ac	19 Feb 2006 17:49:11 -0000	1.1
--- stick.ac	1 Aug 2007 18:51:31 -0000	1.2
***************
*** 1,5 ****
  AC3Db
! MATERIAL "ac3dmat1" rgb 1 1 1  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10  trans 0
! MATERIAL "ac3dmat2" rgb 0.631 0.49 0.247  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.341 0.263 0.098  shi 10  trans 0
  MATERIAL "ac3dmat0" rgb 0.059 0.059 0.051  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.188 0.188 0.188  shi 12  trans 0
  MATERIAL "ac3dmat2" rgb 0.192 0.192 0.192  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 23  trans 0
--- 1,4 ----
  AC3Db
! MATERIAL "ac3dmat1" rgb 0.498 0.49 0.49  amb 0.49 0.49 0.498  emis 0 0 0  spec 0.31 0.31 0.318  shi 10  trans 0
  MATERIAL "ac3dmat0" rgb 0.059 0.059 0.051  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.188 0.188 0.188  shi 12  trans 0
  MATERIAL "ac3dmat2" rgb 0.192 0.192 0.192  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 23  trans 0
[...18428 lines suppressed...]
  refs 4
! 29 9.65411 -10.7853
! 56 9.5436 -9.82529
! 57 9.32909 -9.71367
! 30 9.37881 -10.7612
  SURF 0x10
! mat 0
  refs 4
! 27 0.252276 30.6079
! 54 0.591286 31.5662
! 56 0.341103 31.5729
! 29 -0.0363056 30.6128
  SURF 0x10
! mat 0
  refs 4
! 28 0.39599 30.593
! 55 0.686241 31.4305
! 54 0.591286 31.5662
! 27 0.252276 30.6079
  kids 0

Index: throttle_panel.rgb
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Models/throttle_panel.rgb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -r1.2 -r1.3
Binary files /tmp/cvsmVy6JC and /tmp/cvsoPey37 differ

Index: throttles.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Models/throttles.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -r1.3 -r1.4
*** throttles.ac	28 Jul 2007 16:04:18 -0000	1.3
--- throttles.ac	1 Aug 2007 18:51:32 -0000	1.4
***************
*** 4,10 ****
  MATERIAL "ac3dmat4" rgb 1 0.466667 0  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10  trans 0
  MATERIAL "ac3dmat14" rgb 0.8 0.8 0.8  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10  trans 0
  MATERIAL "ac3dmat0" rgb 0.02 0.02 0.02  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.051 0.051 0.051  shi 27  trans 0
  OBJECT world
! kids 1
  OBJECT group
  name "throttles"
--- 4,11 ----
  MATERIAL "ac3dmat4" rgb 1 0.466667 0  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10  trans 0
  MATERIAL "ac3dmat14" rgb 0.8 0.8 0.8  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10  trans 0
[...10495 lines suppressed...]
! 28 0.569414 0.821499
! SURF 0x10
! mat 4
! refs 3
! 30 0.568807 0.822001
! 31 0.568612 0.827643
! 29 0.568988 0.828157
! SURF 0x10
! mat 4
! refs 3
! 32 0.568555 0.822502
! 31 0.568612 0.827643
! 30 0.568807 0.822001
! SURF 0x10
! mat 4
! refs 3
! 31 0.568612 0.827643
! 32 0.568555 0.822502
! 33 0.568555 0.82697
  kids 0

Index: throttles.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lightning/Models/throttles.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -r1.2 -r1.3
*** throttles.xml	20 Feb 2006 17:12:30 -0000	1.2
--- throttles.xml	1 Aug 2007 18:51:32 -0000	1.3
***************
*** 7,13 ****
  	<path>throttles.ac</path>
  
! <!-- Throttle Panel Hotspots -->
! <panel>
! 	<path>Aircraft/Lightning/Models/throttle_panel-hotspots.xml</path>
  		<top-left>
  			<x-m>3.465</x-m>
--- 7,13 ----
  	<path>throttles.ac</path>
  
! 	<!-- Throttle Panel Hotspots -->
! 	<panel>
! 		<path>Aircraft/Lightning/Models/throttle_panel-hotspots.xml</path>
  		<top-left>
  			<x-m>3.465</x-m>
***************
*** 24,32 ****
  			<y-m>-0.302559</y-m>
  			<z-m>0.559812</z-m>
!     </bottom-right>
!     
! </panel>
  
! <!-- Main Animation -->
  	<!-- Throttle No1 -->
  	<animation>
--- 24,31 ----
  			<y-m>-0.302559</y-m>
  			<z-m>0.559812</z-m>
! 		</bottom-right>
! 	</panel>
  
! 	<!-- Main Animation -->
  	<!-- Throttle No1 -->
  	<animation>
***************
*** 129,137 ****
  	</animation>
  
! 	<!-- disable shadows -->
  
  	<animation>
  		<type>noshadow</type>
  		<object-name>throttles</object-name>
  	</animation>
  			
--- 128,166 ----
  	</animation>
  
! 	<!-- Auto-throttle control -->	
! 	<animation>
! 		<type>rotate</type>
! 		<object-name>throttle_servo_knob</object-name>
! 		<property>controls/switches/autothrottle</property>
! 		<factor>90</factor>
! 		<center>
! 			<x-m>3.36733</x-m>
! 			<y-m>-0.281208</y-m>
! 			<z-m>0.431478</z-m>
! 		</center>
! 		<axis>
! 			<x>0</x>
! 			<y>1</y>
! 			<z>0</z>
! 		</axis>
! 	</animation>
! 	<animation>
! 		<type>pick</type>
! 		<object-name>throttle_servo_knob</object-name>
! 		<action>
! 			<button>0</button>
! 			<repeatable>false</repeatable>
! 			<binding>
! 				<command>property-toggle</command>
! 				<property>controls/switches/autothrottle</property>
! 			</binding>
! 		</action>
! 	</animation>
  
+ 	<!-- disable shadows -->
  	<animation>
  		<type>noshadow</type>
  		<object-name>throttles</object-name>
+ 		<object-name>auto-throttle</object-name>
  	</animation>

Update of /var/cvs/FlightGear-0.9/data/Aircraft/B-1B
In directory baron:/tmp/cvs-serv1601

Modified Files:
	B-1B-set.xml B-1B-yasim.xml readme-bone.txt 
Log Message:
Markus Zojer:

Sorry for the short interval, but I recognized not all files being
updated correctly.



Index: B-1B-set.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/B-1B-set.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -r1.2 -r1.3
*** B-1B-set.xml	31 Jul 2007 17:53:13 -0000	1.2
--- B-1B-set.xml	1 Aug 2007 16:22:48 -0000	1.3
***************
*** 174,178 ****
  	      <desc>toggle airbrakes</desc>
        </key>-->
!       
        <line>Good Luck!</line>
      </help>
--- 174,178 ----
  	      <desc>toggle airbrakes</desc>
        </key>-->
!       <line>Afterburner used for TakeOff/Climb</line>
        <line>Good Luck!</line>
      </help>
***************
*** 224,227 ****
--- 224,251 ----
        <elevator-incidence-deg type="double">0.0</elevator-incidence-deg>
      </flight>
+ 
+     <engines>
+ 	    <engine n="0">
+ 		    <throttle type="double">0.0</throttle>
+ 		    <cutoff>0</cutoff>
+ 		    <ignition>0</ignition>
+ 	    </engine>
+ 	    <engine n="1">
+ 		    <throttle type="double">0.0</throttle>
+ 		    <cutoff>0</cutoff>
+ 		    <ignition>0</ignition>
+ 	    </engine>
+ 	    <engine n="2">
+ 		    <throttle type="double">0.0</throttle>
+ 		    <cutoff>0</cutoff>
+ 		    <ignition>0</ignition>
+ 	    </engine>
+ 	    <engine n="3">
+ 		    <throttle type="double">0.0</throttle>
+ 		    <cutoff>0</cutoff>
+ 		    <ignition>0</ignition>
+ 	    </engine>
+         </engines>
+ 
      <engines>
  	    <engine n="0">
***************
*** 250,253 ****
--- 274,278 ----
  	    </engine>
          </engines>
+ 
    </controls>
    
***************
*** 255,276 ****
--- 280,321 ----
    <engines>
      <engine n="0">
+ 
+ 	    <engine-num type="int">0</engine-num>
+ 	    <running>true</running>
+ 
  	    <engine-num type="int">0</engine-num>
  	    <running>false</running>
  	    <rpm type="double">0</rpm>
+ 
      </engine>
      <engine n="1">
+ 
+ 	    <engine-num type="int">1</engine-num>
+ 	    <running>true</running>
+ 
  	    <engine-num type="int">1</engine-num>
  	    <running>false</running>
  	    <rpm type="double">0</rpm>
+ 
      </engine>
      <engine n="2">
+ 
+ 	    <engine-num type="int">2</engine-num>
+ 	    <running>true</running>
+ 
  	    <engine-num type="int">2</engine-num>
  	    <running>false</running>
  	    <rpm type="double">0</rpm>
+ 
      </engine>
      <engine n="3">
+ 
+ 	    <engine-num type="int">3</engine-num>
+ 	    <running>true</running>
+ 
  	    <engine-num type="int">3</engine-num>
  	    <running>false</running>
  	    <rpm type="double">0</rpm>
+ 
      </engine>
      

Index: B-1B-yasim.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/B-1B-yasim.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -r1.2 -r1.3
*** B-1B-yasim.xml	31 Jul 2007 17:53:13 -0000	1.2
--- B-1B-yasim.xml	1 Aug 2007 16:22:48 -0000	1.3
***************
*** 61,66 ****
  
  
!   <wing x="-26.2" y="5.0" z="-2.2" taper="0.25" incidence="1" twist="-2"
!         length="14.8" chord="6.1" sweep="55.0" dihedral="2.0">
      <stall aoa="20.0" width="4" peak="1.4"/>
      <flap0 start="0.6" end="0.90" lift="1.5" drag="1.1"/>
--- 61,66 ----
  
  
!   <wing x="-26.2" y="5.0" z="-2.2" taper="0.25" incidence="0" twist="-2"
!         length="14.8" chord="6.1" sweep="55.0" dihedral="0.0">
      <stall aoa="20.0" width="4" peak="1.4"/>
      <flap0 start="0.6" end="0.90" lift="1.5" drag="1.1"/>
***************
*** 83,88 ****
    <!-- blended wing body -->
    
!   <mstab x="-24.0" y="2.0" z="-2.2" taper="0.4" incidence="1"
! 	 length="3.0" chord="15.0" sweep="-15.0" dihedral="1.0">
  	  <stall aoa="18.0" width="4" peak="1.5"/>
  	  
--- 83,88 ----
    <!-- blended wing body -->
    
!   <mstab x="-24.0" y="2.0" z="-2.2" taper="0.4" incidence="1.4"
! 	 length="3.0" chord="15.0" sweep="-20.0" dihedral="-1.0">
  	  <stall aoa="18.0" width="4" peak="1.5"/>
  	  
***************
*** 99,103 ****
  <!-- Elevator -->
    <hstab x="-39.0" y="0.3" z="3.1" taper="0.38"  incidence="0"
!          length="7.0" chord="5.0" sweep="15.0" dihedral="0.0">
      <stall aoa="20.0" width="5" peak="1.5"/>
      <flap0 start="0.0" end="1" lift="1.7" drag="1.5"/>
--- 99,103 ----
  <!-- Elevator -->
    <hstab x="-39.0" y="0.3" z="3.1" taper="0.38"  incidence="0"
!          length="7.0" chord="5.0" sweep="25.0" dihedral="0.0">
      <stall aoa="20.0" width="5" peak="1.5"/>
      <flap0 start="0.0" end="1" lift="1.7" drag="1.5"/>
***************
*** 116,120 ****
  
    <vstab x="-38.0" y="0" z="2.6" taper="0.3" effectiveness="0.5"
! 	 length="6.4" chord="5.5" sweep="-20.0">
  	  <stall aoa="25.0" width="5" peak="1.5"/>
  	  
--- 116,120 ----
  
    <vstab x="-38.0" y="0" z="2.6" taper="0.3" effectiveness="0.5"
! 	 length="6.4" chord="5.5" sweep="-30.0">
  	  <stall aoa="25.0" width="5" peak="1.5"/>
  	  
***************
*** 130,134 ****
    
    <mstab x="-5.0" y="2.0" z="-0.5" taper="0.2" incidence="0"
! 	 length="0.9" chord="0.7" sweep="-28.0" dihedral="-30.0">
  	  <stall aoa="18.0" width="4" peak="1.5"/>
  	  
--- 130,134 ----
    
    <mstab x="-5.0" y="2.0" z="-0.5" taper="0.2" incidence="0"
! 	 length="0.9" chord="0.7" sweep="-45.0" dihedral="-30.0">
  	  <stall aoa="18.0" width="4" peak="1.5"/>
  	  
***************
*** 140,148 ****
    </mstab>
  
! <!-- engines are rated 14600lb each (4x) -->
  
! <!-- left wing engines original - tsfc=0.67, but recalculated to meet range/fuel load data (>6000nm/160000lb) -->
  
! <jet x="-30.3" y="4.2" z="-2.5" mass="3200" tsfc="0.6" thrust="14600" afterburner="30700">
  	<actionpt x="-35.6" y="4.2" z="-2.4"/>
  	<control-input axis="/controls/engines/engine[0]/throttle-lever" control="THROTTLE"/>
--- 140,149 ----
    </mstab>
  
! <!-- engines are rated 14600lb or 17390lb each (4x) and 30780 with afterburner 
!      colported tsfc 0.562 dry and 2.46  with afterburner, but dry tsfc looks suspicious -->
  
! <!-- left wing engines original  -->
  
! <jet x="-30.3" y="4.2" z="-2.5" mass="4400" tsfc="0.6" thrust="14600" afterburner="30780">
  	<actionpt x="-35.6" y="4.2" z="-2.4"/>
  	<control-input axis="/controls/engines/engine[0]/throttle-lever" control="THROTTLE"/>
***************
*** 150,154 ****
  </jet>
  
! <jet x="-30.3" y="3.2" z="-2.5" mass="3200" tsfc="0.6" thrust="14600" afterburner="30700">
  	<actionpt x="-35.6" y="3.2" z="-2.4"/>
  	<control-input axis="/controls/engines/engine[1]/throttle-lever" control="THROTTLE"/>
--- 151,155 ----
  </jet>
  
! <jet x="-30.3" y="3.2" z="-2.5" mass="4400" tsfc="0.6" thrust="14600" afterburner="30780">
  	<actionpt x="-35.6" y="3.2" z="-2.4"/>
  	<control-input axis="/controls/engines/engine[1]/throttle-lever" control="THROTTLE"/>
***************
*** 158,162 ****
  <!-- right wing engines -->
  
! <jet x="-30.3" y="-3.2" z="-2.5" mass="3200" tsfc="0.6" thrust="14600" afterburner="30700">
  	<actionpt x="-35.6" y="-3.2" z="-2.4"/>
  	<control-input axis="/controls/engines/engine[2]/throttle-lever" control="THROTTLE"/>
--- 159,163 ----
  <!-- right wing engines -->
  
! <jet x="-30.3" y="-3.2" z="-2.5" mass="4400" tsfc="0.6" thrust="14600" afterburner="30780">
  	<actionpt x="-35.6" y="-3.2" z="-2.4"/>
  	<control-input axis="/controls/engines/engine[2]/throttle-lever" control="THROTTLE"/>
***************
*** 164,168 ****
  </jet>
  
! <jet x="-30.3" y="-4.2" z="-2.5" mass="3200" tsfc="0.6" thrust="14600" afterburner="30700">
  	<actionpt x="-35.6" y="-4.2" z="-2.4"/>
  	<control-input axis="/controls/engines/engine[3]/throttle-lever" control="THROTTLE"/>
--- 165,169 ----
  </jet>
  
! <jet x="-30.3" y="-4.2" z="-2.5" mass="4400" tsfc="0.6" thrust="14600" afterburner="30780">
  	<actionpt x="-35.6" y="-4.2" z="-2.4"/>
  	<control-input axis="/controls/engines/engine[3]/throttle-lever" control="THROTTLE"/>

Index: readme-bone.txt
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/readme-bone.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -r1.2 -r1.3
*** readme-bone.txt	31 Jul 2007 17:53:13 -0000	1.2
--- readme-bone.txt	1 Aug 2007 16:22:48 -0000	1.3
***************
*** 1,5 ****
  Rockwell B-1B Lancer "The Bone"
  
! XXXXXX  Version Nr: 0002 27072007 XXXXXX
  
  
--- 1,7 ----
  Rockwell B-1B Lancer "The Bone"
  
! 
! XXXXXX  Version Nr: 0003 01082007 XXXXXX
! 
  
  
***************
*** 10,14 ****
  Takeoff:
  
! - swing wing to most forward position (15)
  - apply 1/2 flaps
  - apply full throttle
--- 12,16 ----
  Takeoff:
  
! - swing wing to most forward position (15) --> button D/d
  - apply 1/2 flaps
  - apply full throttle
***************
*** 18,23 ****
  Flight:
  
! - dependent on your altitude and speed choose 15/25/45/55 degrees wingweep
  - max speed at sea level is mach 1.3, because of structural damage to engine inlets
  - 15 degrees ws: used for takeoff/landing <320 knots
  - 25 degrees ws: used for slow flight/refuelling < 370 knots
--- 20,32 ----
  Flight:
  
! - dependent on your altitude and speed choose 15/25/45/55 degrees wingweep (d/D)
  - max speed at sea level is mach 1.3, because of structural damage to engine inlets
+ 
+ - 15 degrees ws: used for takeoff/landing <320 knots @ sealevel
+ - 25 degrees ws: used for slow flight/refuelling < 370 knots @sealevel
+ - 45 degrees ws: used for cruise at high altitude (mach 0.6 - 0.75)
+ - 55 degrees ws: used for high/low alt flight (above mach 0.7)
+ 
+ 
  - 15 degrees ws: used for takeoff/landing <320 knots
  - 25 degrees ws: used for slow flight/refuelling < 370 knots
***************
*** 26,29 ****
--- 35,39 ----
  
  
+ 
  Landing:
  
***************
*** 33,36 ****
--- 43,56 ----
  
  
+ 
+ XXXX TERRAIN AVOIDANCE SYSTEM XXXX
+ 
+ Available in OSG only
+ 
+ Master switch activates terrain avoidance system (ON/OFF), range switch (RNG) setting for short distance terrain recognition setting (2.5) used for low altitude flying (below 1000ft). Over 1000ft switch to the medium setting (5) that can clear whole mountain ridges. 
+ Once the terrain avoidance system gets active it automatically adds some space in ft to your current altitude and switches back to either terrain following mode (if active) or alt hold. 
+ The CLR PLN settings are important for low flying as it clears terrain below the aircraft. The settings are 0(off), 100ft, 300ft, 500ft and 1000ft. When used in combination with terrain follow (typical), then calculate 100ft security space to your agl altitude, otherwise the terrain avoidance system and you won't get much rest.
+ 
+ 
  XXXX TERRAIN AVOIDANCE SYSTEM XXXX
  
***************
*** 39,42 ****
--- 59,63 ----
  Master switch activates terrain avoidance system (ON/OFF), range switch (RNG) setting for short distance terrain recognition setting(2.5) used for low altitude flying (below 1000ft). Over 1000ft switch to the medium setting (5) that can clear whole mountain ridges. Once the terrain avoidance system gets active it automatically adds 1000ft to your current altitude and switches back to either terrain following mode (if active) or alt hold. The CLR PLN settings are important for low flying as it clears terrain below the aircraft. The settings are 0(off), 100ft, 300ft, 500ft and 1000ft. When used in combination with terrain follow (typical), then calculate 100ft security space to your agl altitude, otherwise the terrain avoidance system and you won't get much rest.
  
+ 
  XXXX FEATURES XXXX
  
***************
*** 52,67 ****
  
  
! XXXX PROGRESS >>>>
  
! FDM:	 	alpha - in use / needs tuning		70%complete
  3D model:	alpha - in use / more accurate		50%complete
  Textures:	alpha - in use / too few		30%complete
  Animations:	alpha - in use / more to come		60%complete
! Autopilot:	alpha - in use / needs tuning		80%complete
  3Dcockpit:	alpha - in use / needs completion	70%complete
  
  
- 
  Have Fun! Good Luck!
  
! Markus Zojer,  26/07/2007
\ No newline at end of file
--- 73,88 ----
  
  
! XXXX PROGRESS XXXX
  
! 
! FDM:	 	alpha - in use / needs tuning		75%complete
  3D model:	alpha - in use / more accurate		50%complete
  Textures:	alpha - in use / too few		30%complete
  Animations:	alpha - in use / more to come		60%complete
! Autopilot:	alpha - in use / needs finetuning	85%complete
  3Dcockpit:	alpha - in use / needs completion	70%complete
  
  
  Have Fun! Good Luck!
  
! Markus Zojer,  01/08/2007
\ No newline at end of file

Update of /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Submodels
In directory baron:/tmp/cvs-serv1601/Submodels

Added Files:
	sub_lancer.xml 
Log Message:
Markus Zojer:

Sorry for the short interval, but I recognized not all files being
updated correctly.



--- NEW FILE ---
<?xml version="1.0"?>

<!--  Submodels are objects which can be dropped or launched from the user aircraft.
      The trigger is a boolean property, which you define, which when "true" causes
      the submodel to be released/launched. 
      A submodel will create an AIBallistic object which will follow a ballistic path.
      By default one submodel will be released when the corresponding trigger is "true".
      The initial conditions (IC) define the object's starting point (relative to the
      user aircraft's "reported position"), and its initial speed and direction
      (relative to the user aircraft).  If you want to release many similar objects
      with similar IC, then you may use the <repeat>, <delay> and <count> properties
      to define this.  The allowed properties are:

      <name>         The name of the submodel.
      <model>        The path to the visual model.
      <trigger>      The property which will act as the trigger. 
      <speed>        Initial speed, in feet/sec, relative to user aircraft.
      <repeat>       Set "true" if you want multiple releases of this submodel.
      <delay>        Time, in seconds, between repeated releases.
      <count>        Number of submodels available for multiple release.
      <slaved>       Not used yet.
      <x-offset>     Submodel's initial fore/aft position relative to user aircraft.  
                     Fore is positive.
      <y-offset>     Submodel's initial left/right position relative to user aircraft.  
                     Right is positive.
      <z-offset>     Submodel's initial up/down position relative to user aircraft.  
                     Up is positive.
      <yaw-offset>   Submodel's initial azimuth, in degrees, relative to user aircraft's
                     nose.  Right is positive.
      <pitch-offset> Submodel's initial elevation, in degrees, relative to user aircraft's
                     pitch.  Up is positive.
      <eda>          Equivalent Drag Area in ft squared.  The object is assumed to have a 
                     mass of 0.03 slugs and a drag coefficient of 0.295, and sea-level air
                     density is assumed.  Adjust the EDA to give the model the ballistics you need.
                     The default value is 0.007.
      <life>         Life span in seconds.  Default is 900.0.
      <buoyancy>     In ft/sec/sec.  Works opposite acceleration of gravity.  For example, if
                     set to 32 the submodel will feel no gravity. If greater than 32 the object
                     will rise. Default is 0.
      <wind>         Set to true if you want the submodel to react to the wind.  Default is "false". 
-->  
 
<PropertyList>

  <submodel>
    <name>left gear smoke</name>
    <model>Aircraft/B-1B/Systems/puff.xml</model>
    <trigger>gear/gear/wow</trigger>
    <speed>0</speed>
    <repeat>true</repeat>
    <delay>0.2</delay>
    <count>-1</count>
    <x-offset>-92.0</x-offset>
    <y-offset>-8.0</y-offset>
    <z-offset>-10.0</z-offset>
    <life>2.0</life>
    <buoyancy>33</buoyancy>
    <aero-stabilise>false</aero-stabilise>
    <wind>true</wind>
  </submodel>

  <submodel>
    <name>right gear smoke</name>
    <model>Aircraft/B-1B/Systems/puff.xml</model>
    <trigger>gear/gear/wow</trigger>
    <speed>0</speed>
    <repeat>true</repeat>
    <delay>0.2</delay>
    <count>-1</count>
    <x-offset>-92.0</x-offset>
    <y-offset>8.0</y-offset>
    <z-offset>-10.0</z-offset>
    <life>2.0</life>
    <buoyancy>33</buoyancy>
    <aero-stabilise>false</aero-stabilise>
    <wind>true</wind>
  </submodel>
  
  <submodel>
	  <name>radar pulse d</name>
	  <model></model>
	  <trigger>controls/switches/terrain-avoid-rng-d</trigger>
	  <speed>30000</speed>
	  <repeat>true</repeat>
	  <delay>1.0</delay>
	  <count>-1</count>
	  <x-offset>0.0</x-offset>
	  <y-offset>0.0</y-offset>
	  <z-offset>0.0</z-offset>
	  <eda>0.001</eda>
	  <life>0.5</life>
	  <buoyancy>32</buoyancy>
	  <aero-stabilise>false</aero-stabilise>
	  <wind>false</wind>
	  <pitch-offset>-10</pitch-offset>
	  <impact>true</impact>
	  <impact-reports>sim/radar/teravd/contactd</impact-reports>
  </submodel>
  
  <submodel>
	  <name>radar pulse m</name>
	  <model></model>
	  <trigger>controls/switches/terrain-avoid-rng-m</trigger>
	  <speed>30000</speed>
	  <repeat>true</repeat>
	  <delay>2.0</delay>
	  <count>-1</count>
	  <x-offset>0.0</x-offset>
	  <y-offset>0.0</y-offset>
	  <z-offset>0.0</z-offset>
	  <eda>0.001</eda>
	  <life>1.0</life>
	  <buoyancy>32</buoyancy>
	  <aero-stabilise>false</aero-stabilise>
	  <wind>false</wind>
	  <pitch-offset>-0.5</pitch-offset>
	  <impact>true</impact>
	  <impact-reports>sim/radar/teravd/contactm</impact-reports>
  </submodel>
  
  <submodel>
	  <name>radar pulse mh</name>
	  <model></model>
	  <trigger>controls/switches/terrain-avoid-rng-mh</trigger>
	  <speed>34000</speed>
	  <repeat>true</repeat>
	  <delay>2.0</delay>
	  <count>-1</count>
	  <x-offset>0.0</x-offset>
	  <y-offset>0.0</y-offset>
	  <z-offset>0.0</z-offset>
	  <eda>0.001</eda>
	  <life>1.0</life>
	  <buoyancy>32</buoyancy>
	  <aero-stabilise>false</aero-stabilise>
	  <wind>false</wind>
	  <pitch-offset>2.0</pitch-offset>
	  <impact>true</impact>
	  <impact-reports>sim/radar/teravd/contacth</impact-reports>
  </submodel>
  
  <submodel>
	  <name>radar pulse s</name>
	  <model></model>
	  <trigger>controls/switches/terrain-avoid-rng-s</trigger>
	  <speed>30000</speed>
	  <repeat>true</repeat>
	  <delay>2.0</delay>
	  <count>-1</count>
	  <x-offset>0.0</x-offset>
	  <y-offset>0.0</y-offset>
	  <z-offset>0.0</z-offset>
	  <eda>0.001</eda>
	  <life>0.5</life>
	  <buoyancy>32</buoyancy>
	  <aero-stabilise>false</aero-stabilise>
	  <wind>false</wind>
	  <pitch-offset>-0.1</pitch-offset>
	  <impact>true</impact>
	  <impact-reports>sim/radar/teravd/contactm</impact-reports>
  </submodel>
  
  <submodel>
	  <name>radar pulse sh</name>
	  <model></model>
	  <trigger>controls/switches/terrain-avoid-rng-sh</trigger>
	  <speed>34000</speed>
	  <repeat>true</repeat>
	  <delay>2.0</delay>
	  <count>-1</count>
	  <x-offset>0.0</x-offset>
	  <y-offset>0.0</y-offset>
	  <z-offset>0.0</z-offset>
	  <eda>0.001</eda>
	  <life>0.5</life>
	  <buoyancy>32</buoyancy>
	  <aero-stabilise>false</aero-stabilise>
	  <wind>false</wind>
	  <pitch-offset>3.3</pitch-offset>
	  <impact>true</impact>
	  <impact-reports>sim/radar/teravd/contacth</impact-reports>
  </submodel>
  
  <submodel>
	  <name>radar pulse clr1</name>
	  <model></model>
	  <trigger>controls/switches/terrain-avoid-clrpln-1</trigger>
	  <speed>30000</speed>
	  <repeat>true</repeat>
	  <delay>1.0</delay>
	  <count>-1</count>
	  <x-offset>0.0</x-offset>
	  <y-offset>0.0</y-offset>
	  <z-offset>0.0</z-offset>
	  <eda>0.001</eda>
	  <life>0.30</life>
	  <buoyancy>32</buoyancy>
	  <aero-stabilise>false</aero-stabilise>
	  <wind>false</wind>
	  <pitch-offset>-0.57</pitch-offset>
	  <impact>true</impact>
	  <impact-reports>sim/radar/teravd/contactl</impact-reports>
  </submodel>
  
  
  <submodel>
	  <name>radar pulse clr3</name>
	  <model></model>
	  <trigger>controls/switches/terrain-avoid-clrpln-3</trigger>
	  <speed>30000</speed>
	  <repeat>true</repeat>
	  <delay>1.0</delay>
	  <count>-1</count>
	  <x-offset>0.0</x-offset>
	  <y-offset>0.0</y-offset>
	  <z-offset>0.0</z-offset>
	  <eda>0.001</eda>
	  <life>0.30</life>
	  <buoyancy>32</buoyancy>
	  <aero-stabilise>false</aero-stabilise>
	  <wind>false</wind>
	  <pitch-offset>-1.7</pitch-offset>
	  <impact>true</impact>
	  <impact-reports>sim/radar/teravd/contactl</impact-reports>
  </submodel>
  
  <submodel>
	  <name>radar pulse clr5</name>
	  <model></model>
	  <trigger>controls/switches/terrain-avoid-clrpln-5</trigger>
	  <speed>30000</speed>
	  <repeat>true</repeat>
	  <delay>1.0</delay>
	  <count>-1</count>
	  <x-offset>0.0</x-offset>
	  <y-offset>0.0</y-offset>
	  <z-offset>0.0</z-offset>
	  <eda>0.001</eda>
	  <life>0.43</life>
	  <buoyancy>32</buoyancy>
	  <aero-stabilise>false</aero-stabilise>
	  <wind>false</wind>
	  <pitch-offset>-1.9</pitch-offset>
	  <impact>true</impact>
	  <impact-reports>sim/radar/teravd/contactl</impact-reports>
  </submodel>
  
  <submodel>
	  <name>radar pulse clr9</name>
	  <model></model>
	  <trigger>controls/switches/terrain-avoid-clrpln-9</trigger>
	  <speed>30000</speed>
	  <repeat>true</repeat>
	  <delay>1.0</delay>
	  <count>-1</count>
	  <x-offset>0.0</x-offset>
	  <y-offset>0.0</y-offset>
	  <z-offset>0.0</z-offset>
	  <eda>0.001</eda>
	  <life>0.43</life>
	  <buoyancy>32</buoyancy>
	  <aero-stabilise>false</aero-stabilise>
	  <wind>false</wind>
	  <pitch-offset>-3.8</pitch-offset>
	  <impact>true</impact>
	  <impact-reports>sim/radar/teravd/contactl</impact-reports>
  </submodel>
  

</PropertyList>

Update of /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/Instruments-3d
In directory baron:/tmp/cvs-serv1601/Models/Instruments-3d

Modified Files:
	eng_ind.xml fuel_ind.xml fuelvalves.xml 
Log Message:
Markus Zojer:

Sorry for the short interval, but I recognized not all files being
updated correctly.



Index: eng_ind.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/Instruments-3d/eng_ind.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -r1.2 -r1.3
*** eng_ind.xml	31 Jul 2007 14:25:55 -0000	1.2
--- eng_ind.xml	1 Aug 2007 16:22:48 -0000	1.3
***************
*** 13,17 ****
  	 <type>textranslate</type>
  	 <object-name>ind1</object-name>
! 	 <property>/engines/engine[0]/prop-thrust</property>
  	 <interpolation>
  		 <entry>
--- 13,17 ----
  	 <type>textranslate</type>
  	 <object-name>ind1</object-name>
! 	 <property>engines/engine[0]/prop-thrust</property>
  	 <interpolation>
  		 <entry>
***************
*** 34,38 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.001</object-name>
! 	 <property>/engines/engine[1]/prop-thrust</property>
  	 <interpolation>
  		 <entry>
--- 34,38 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.001</object-name>
! 	 <property>engines/engine[1]/prop-thrust</property>
  	 <interpolation>
  		 <entry>
***************
*** 55,59 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.003</object-name>
! 	 <property>/engines/engine[2]/prop-thrust</property>
  	 <interpolation>
  		 <entry>
--- 55,59 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.003</object-name>
! 	 <property>engines/engine[2]/prop-thrust</property>
  	 <interpolation>
  		 <entry>
***************
*** 76,80 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.002</object-name>
! 	 <property>/engines/engine[3]/prop-thrust</property>
  	 <interpolation>
  		 <entry>
--- 76,80 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.002</object-name>
! 	 <property>engines/engine[3]/prop-thrust</property>
  	 <interpolation>
  		 <entry>
***************
*** 99,103 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.007</object-name>
! 	 <property>/sim/model/B-1B/n1[0]</property>
  	 <interpolation>
  		 <entry>
--- 99,103 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.007</object-name>
! 	 <property>sim/model/B-1B/n1[0]</property>
  	 <interpolation>
  		 <entry>
***************
*** 120,124 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.006</object-name>
! 	 <property>/sim/model/B-1B/n1[1]</property>
  	 <interpolation>
  		 <entry>
--- 120,124 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.006</object-name>
! 	 <property>sim/model/B-1B/n1[1]</property>
  	 <interpolation>
  		 <entry>
***************
*** 141,145 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.004</object-name>
! 	 <property>/sim/model/B-1B/n1[2]</property>
  	 <interpolation>
  		 <entry>
--- 141,145 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.004</object-name>
! 	 <property>sim/model/B-1B/n1[2]</property>
  	 <interpolation>
  		 <entry>
***************
*** 162,166 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.005</object-name>
! 	 <property>/sim/model/B-1B/n1[3]</property>
  	 <interpolation>
  		 <entry>
--- 162,166 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.005</object-name>
! 	 <property>sim/model/B-1B/n1[3]</property>
  	 <interpolation>
  		 <entry>
***************
*** 185,189 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.008</object-name>
! 	 <property>/engines/engine[0]/egt-degf</property>
  	 <interpolation>
  		 <entry>
--- 185,189 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.008</object-name>
! 	 <property>engines/engine[0]/egt-degf</property>
  	 <interpolation>
  		 <entry>
***************
*** 206,210 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.009</object-name>
! 	 <property>/engines/engine[1]/egt-degf</property>
  	 <interpolation>
  		 <entry>
--- 206,210 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.009</object-name>
! 	 <property>engines/engine[1]/egt-degf</property>
  	 <interpolation>
  		 <entry>
***************
*** 227,231 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.011</object-name>
! 	 <property>/engines/engine[2]/egt-degf</property>
  	 <interpolation>
  		 <entry>
--- 227,231 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.011</object-name>
! 	 <property>engines/engine[2]/egt-degf</property>
  	 <interpolation>
  		 <entry>
***************
*** 248,252 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.010</object-name>
! 	 <property>/engines/engine[3]/egt-degf</property>
  	 <interpolation>
  		 <entry>
--- 248,252 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.010</object-name>
! 	 <property>engines/engine[3]/egt-degf</property>
  	 <interpolation>
  		 <entry>
***************
*** 271,275 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.015</object-name>
! 	 <property>/engines/engine[0]/fuel-flow-gph</property>
  	 <interpolation>
  		 <entry>
--- 271,275 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.015</object-name>
! 	 <property>engines/engine[0]/fuel-flow-gph</property>
  	 <interpolation>
  		 <entry>
***************
*** 296,300 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.014</object-name>
! 	 <property>/engines/engine[1]/fuel-flow-gph</property>
  	 <interpolation>
  		 <entry>
--- 296,300 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.014</object-name>
! 	 <property>engines/engine[1]/fuel-flow-gph</property>
  	 <interpolation>
  		 <entry>
***************
*** 321,325 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.012</object-name>
! 	 <property>/engines/engine[2]/fuel-flow-gph</property>
  	 <interpolation>
  		 <entry>
--- 321,325 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.012</object-name>
! 	 <property>engines/engine[2]/fuel-flow-gph</property>
  	 <interpolation>
  		 <entry>
***************
*** 346,350 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.013</object-name>
! 	 <property>/engines/engine[3]/fuel-flow-gph</property>
  	 <interpolation>
  		 <entry>
--- 346,350 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.013</object-name>
! 	 <property>engines/engine[3]/fuel-flow-gph</property>
  	 <interpolation>
  		 <entry>
***************
*** 373,377 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.023</object-name>
! 	 <property>/engines/engine[0]/oilp-norm</property>
  	 <interpolation>
  		 <entry>
--- 373,377 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.023</object-name>
! 	 <property>engines/engine[0]/oilp-norm</property>
  	 <interpolation>
  		 <entry>
***************
*** 394,398 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.022</object-name>
! 	 <property>/engines/engine[1]/oilp-norm</property>
  	 <interpolation>
  		 <entry>
--- 394,398 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.022</object-name>
! 	 <property>engines/engine[1]/oilp-norm</property>
  	 <interpolation>
  		 <entry>
***************
*** 415,419 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.020</object-name>
! 	 <property>/engines/engine[2]/oilp-norm</property>
  	 <interpolation>
  		 <entry>
--- 415,419 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.020</object-name>
! 	 <property>engines/engine[2]/oilp-norm</property>
  	 <interpolation>
  		 <entry>
***************
*** 436,440 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.021</object-name>
! 	 <property>/engines/engine[3]/oilp-norm</property>
  	 <interpolation>
  		 <entry>
--- 436,440 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.021</object-name>
! 	 <property>engines/engine[3]/oilp-norm</property>
  	 <interpolation>
  		 <entry>
***************
*** 459,463 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.031</object-name>
! 	 <property>/engines/engine[0]/oilt-norm</property>
  	 <interpolation>
  		 <entry>
--- 459,463 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.031</object-name>
! 	 <property>engines/engine[0]/oilt-norm</property>
  	 <interpolation>
  		 <entry>
***************
*** 480,484 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.030</object-name>
! 	 <property>/engines/engine[1]/oilt-norm</property>
  	 <interpolation>
  		 <entry>
--- 480,484 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.030</object-name>
! 	 <property>engines/engine[1]/oilt-norm</property>
  	 <interpolation>
  		 <entry>
***************
*** 501,505 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.028</object-name>
! 	 <property>/engines/engine[2]/oilt-norm</property>
  	 <interpolation>
  		 <entry>
--- 501,505 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.028</object-name>
! 	 <property>engines/engine[2]/oilt-norm</property>
  	 <interpolation>
  		 <entry>
***************
*** 522,526 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.029</object-name>
! 	 <property>/engines/engine[3]/oilt-norm</property>
  	 <interpolation>
  		 <entry>
--- 522,526 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.029</object-name>
! 	 <property>engines/engine[3]/oilt-norm</property>
  	 <interpolation>
  		 <entry>
***************
*** 545,549 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.016</object-name>
! 	 <property>/sim/model/B-1B/n2[0]</property>
  	 <interpolation>
  		 <entry>
--- 545,549 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.016</object-name>
! 	 <property>sim/model/B-1B/n2[0]</property>
  	 <interpolation>
  		 <entry>
***************
*** 566,570 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.017</object-name>
! 	 <property>/sim/model/B-1B/n2[1]</property>
  	 <interpolation>
  		 <entry>
--- 566,570 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.017</object-name>
! 	 <property>sim/model/B-1B/n2[1]</property>
  	 <interpolation>
  		 <entry>
***************
*** 587,591 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.019</object-name>
! 	 <property>/sim/model/B-1B/n2[2]</property>
  	 <interpolation>
  		 <entry>
--- 587,591 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.019</object-name>
! 	 <property>sim/model/B-1B/n2[2]</property>
  	 <interpolation>
  		 <entry>
***************
*** 608,612 ****
  	 <type>textranslate</type>
  	 <object-name>ind1.018</object-name>
! 	 <property>/sim/model/B-1B/n2[3]</property>
  	 <interpolation>
  		 <entry>
--- 608,612 ----
  	 <type>textranslate</type>
  	 <object-name>ind1.018</object-name>
! 	 <property>sim/model/B-1B/n2[3]</property>
  	 <interpolation>
  		 <entry>

Index: fuel_ind.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/Instruments-3d/fuel_ind.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -r1.2 -r1.3
*** fuel_ind.xml	31 Jul 2007 14:25:56 -0000	1.2
--- fuel_ind.xml	1 Aug 2007 16:22:48 -0000	1.3
***************
*** 13,17 ****
  	 <type>textranslate</type>
  	 <object-name>fuel1</object-name>
! 	 <property>/consumables/fuel/tank[2]/level-lbs</property>
  	 <interpolation>
  		 <entry>
--- 13,17 ----
  	 <type>textranslate</type>
  	 <object-name>fuel1</object-name>
! 	 <property>consumables/fuel/tank[2]/level-lbs</property>
  	 <interpolation>
  		 <entry>
***************
*** 34,38 ****
  	 <type>textranslate</type>
  	 <object-name>fuel2</object-name>
! 	 <property>/consumables/fuel/tank[3]/level-lbs</property>
  	 <interpolation>
  		 <entry>
--- 34,38 ----
  	 <type>textranslate</type>
  	 <object-name>fuel2</object-name>
! 	 <property>consumables/fuel/tank[3]/level-lbs</property>
  	 <interpolation>
  		 <entry>
***************
*** 55,59 ****
  	 <type>textranslate</type>
  	 <object-name>fuel3</object-name>
! 	 <property>/consumables/fuel/tank[4]/level-lbs</property>
  	 <interpolation>
  		 <entry>
--- 55,59 ----
  	 <type>textranslate</type>
  	 <object-name>fuel3</object-name>
! 	 <property>consumables/fuel/tank[4]/level-lbs</property>
  	 <interpolation>
  		 <entry>
***************
*** 76,80 ****
  	 <type>textranslate</type>
  	 <object-name>fuel4</object-name>
! 	 <property>/consumables/fuel/tank[5]/level-lbs</property>
  	 <interpolation>
  		 <entry>
--- 76,80 ----
  	 <type>textranslate</type>
  	 <object-name>fuel4</object-name>
! 	 <property>consumables/fuel/tank[5]/level-lbs</property>
  	 <interpolation>
  		 <entry>
***************
*** 97,101 ****
  	 <type>textranslate</type>
  	 <object-name>fuell</object-name>
! 	 <property>/consumables/fuel/tank[0]/level-lbs</property>
  	 <interpolation>
  		 <entry>
--- 97,101 ----
  	 <type>textranslate</type>
  	 <object-name>fuell</object-name>
! 	 <property>consumables/fuel/tank[0]/level-lbs</property>
  	 <interpolation>
  		 <entry>
***************
*** 118,122 ****
  	 <type>textranslate</type>
  	 <object-name>fuelr</object-name>
! 	 <property>/consumables/fuel/tank[1]/level-lbs</property>
  	 <interpolation>
  		 <entry>
--- 118,122 ----
  	 <type>textranslate</type>
  	 <object-name>fuelr</object-name>
! 	 <property>consumables/fuel/tank[1]/level-lbs</property>
  	 <interpolation>
  		 <entry>
***************
*** 141,145 ****
  	 <type>textranslate</type>
  	 <object-name>fuelmainl</object-name>
! 	 <property>/consumables/fuel/tank[6]/level-lbs</property>
  	 <interpolation>
  		 <entry>
--- 141,145 ----
  	 <type>textranslate</type>
  	 <object-name>fuelmainl</object-name>
! 	 <property>consumables/fuel/tank[6]/level-lbs</property>
  	 <interpolation>
  		 <entry>
***************
*** 162,166 ****
  	 <type>textranslate</type>
  	 <object-name>fuelmainr</object-name>
! 	 <property>/consumables/fuel/tank[7]/level-lbs</property>
  	 <interpolation>
  		 <entry>
--- 162,166 ----
  	 <type>textranslate</type>
  	 <object-name>fuelmainr</object-name>
! 	 <property>consumables/fuel/tank[7]/level-lbs</property>
  	 <interpolation>
  		 <entry>

Index: fuelvalves.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/Instruments-3d/fuelvalves.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -r1.1 -r1.2
*** fuelvalves.xml	31 Jul 2007 14:25:56 -0000	1.1
--- fuelvalves.xml	1 Aug 2007 16:22:48 -0000	1.2
***************
*** 13,17 ****
  	 <type>rotate</type>
  	 <object-name>switch_1</object-name>
! 	 <property>/consumables/fuel/tank[2]/selected</property>
  	 <interpolation>
  		 <entry>
--- 13,17 ----
  	 <type>rotate</type>
  	 <object-name>switch_1</object-name>
! 	 <property>consumables/fuel/tank[2]/selected</property>
  	 <interpolation>
  		 <entry>
***************
*** 47,51 ****
  		 <binding>
  			 <command>property-toggle</command>
! 			 <property>/consumables/fuel/tank[2]/selected</property>
  		 </binding>
  	 </action>
--- 47,51 ----
  		 <binding>
  			 <command>property-toggle</command>
! 			 <property>consumables/fuel/tank[2]/selected</property>
  		 </binding>
  	 </action>
***************
*** 57,61 ****
  	<type>rotate</type>
  	<object-name>switch_3</object-name>
! 	<property>/consumables/fuel/tank[3]/selected</property>
  	<interpolation>
  		<entry>
--- 57,61 ----
  	<type>rotate</type>
  	<object-name>switch_3</object-name>
! 	<property>consumables/fuel/tank[3]/selected</property>
  	<interpolation>
  		<entry>
***************
*** 91,95 ****
  		<binding>
  			<command>property-toggle</command>
! 			<property>/consumables/fuel/tank[3]/selected</property>
  		</binding>
  	</action>
--- 91,95 ----
  		<binding>
  			<command>property-toggle</command>
! 			<property>consumables/fuel/tank[3]/selected</property>
  		</binding>
  	</action>
***************
*** 101,105 ****
  	<type>rotate</type>
  	<object-name>switch_wgl</object-name>
! 	<property>/consumables/fuel/tank[0]/selected</property>
  	<interpolation>
  		<entry>
--- 101,105 ----
  	<type>rotate</type>
  	<object-name>switch_wgl</object-name>
! 	<property>consumables/fuel/tank[0]/selected</property>
  	<interpolation>
  		<entry>
***************
*** 135,139 ****
  		<binding>
  			<command>property-toggle</command>
! 			<property>/consumables/fuel/tank[0]/selected</property>
  		</binding>
  	</action>
--- 135,139 ----
  		<binding>
  			<command>property-toggle</command>
! 			<property>consumables/fuel/tank[0]/selected</property>
  		</binding>
  	</action>
***************
*** 145,149 ****
  	<type>rotate</type>
  	<object-name>switch_wgr</object-name>
! 	<property>/consumables/fuel/tank[1]/selected</property>
  	<interpolation>
  		<entry>
--- 145,149 ----
  	<type>rotate</type>
  	<object-name>switch_wgr</object-name>
! 	<property>consumables/fuel/tank[1]/selected</property>
  	<interpolation>
  		<entry>
***************
*** 179,183 ****
  		<binding>
  			<command>property-toggle</command>
! 			<property>/consumables/fuel/tank[1]/selected</property>
  		</binding>
  	</action>
--- 179,183 ----
  		<binding>
  			<command>property-toggle</command>
! 			<property>consumables/fuel/tank[1]/selected</property>
  		</binding>
  	</action>
***************
*** 189,193 ****
  	<type>rotate</type>
  	<object-name>switch_2</object-name>
! 	<property>/consumables/fuel/tank[4]/selected</property>
  	<interpolation>
  		<entry>
--- 189,193 ----
  	<type>rotate</type>
  	<object-name>switch_2</object-name>
! 	<property>consumables/fuel/tank[4]/selected</property>
  	<interpolation>
  		<entry>
***************
*** 223,227 ****
  		<binding>
  			<command>property-toggle</command>
! 			<property>/consumables/fuel/tank[4]/selected</property>
  		</binding>
  	</action>
--- 223,227 ----
  		<binding>
  			<command>property-toggle</command>
! 			<property>consumables/fuel/tank[4]/selected</property>
  		</binding>
  	</action>
***************
*** 233,237 ****
  	<type>rotate</type>
  	<object-name>switch_4</object-name>
! 	<property>/consumables/fuel/tank[5]/selected</property>
  	<interpolation>
  		<entry>
--- 233,237 ----
  	<type>rotate</type>
  	<object-name>switch_4</object-name>
! 	<property>consumables/fuel/tank[5]/selected</property>
  	<interpolation>
  		<entry>
***************
*** 267,271 ****
  		<binding>
  			<command>property-toggle</command>
! 			<property>/consumables/fuel/tank[5]/selected</property>
  		</binding>
  	</action>
--- 267,271 ----
  		<binding>
  			<command>property-toggle</command>
! 			<property>consumables/fuel/tank[5]/selected</property>
  		</binding>
  	</action>
***************
*** 277,281 ****
  	<type>rotate</type>
  	<object-name>switch_lmain</object-name>
! 	<property>/consumables/fuel/tank[6]/selected</property>
  	<interpolation>
  		<entry>
--- 277,281 ----
  	<type>rotate</type>
  	<object-name>switch_lmain</object-name>
! 	<property>consumables/fuel/tank[6]/selected</property>
  	<interpolation>
  		<entry>
***************
*** 311,315 ****
  		<binding>
  			<command>property-toggle</command>
! 			<property>/consumables/fuel/tank[6]/selected</property>
  		</binding>
  	</action>
--- 311,315 ----
  		<binding>
  			<command>property-toggle</command>
! 			<property>consumables/fuel/tank[6]/selected</property>
  		</binding>
  	</action>
***************
*** 319,323 ****
  	<type>rotate</type>
  	<object-name>switch_rmain</object-name>
! 	<property>/consumables/fuel/tank[7]/selected</property>
  	<interpolation>
  		<entry>
--- 319,323 ----
  	<type>rotate</type>
  	<object-name>switch_rmain</object-name>
! 	<property>consumables/fuel/tank[7]/selected</property>
  	<interpolation>
  		<entry>
***************
*** 353,357 ****
  		<binding>
  			<command>property-toggle</command>
! 			<property>/consumables/fuel/tank[7]/selected</property>
  		</binding>
  	</action>
--- 353,357 ----
  		<binding>
  			<command>property-toggle</command>
! 			<property>consumables/fuel/tank[7]/selected</property>
  		</binding>
  	</action>

Update of /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Sounds
In directory baron:/tmp/cvs-serv1601/Sounds

Modified Files:
	b-1b-sound.xml 
Log Message:
Markus Zojer:

Sorry for the short interval, but I recognized not all files being
updated correctly.



Index: b-1b-sound.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Sounds/b-1b-sound.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -r1.3 -r1.4
*** b-1b-sound.xml	31 Jul 2007 17:53:13 -0000	1.3
--- b-1b-sound.xml	1 Aug 2007 16:22:48 -0000	1.4
***************
*** 48,55 ****
  			<property>/sim/current-view/internal</property>
  		</not>
! 		<equals>
  			<property>/controls/engines/engine[0]/cutoff</property>
  			<value>0</value>
! 		</equals>
  	        </and>
  	</condition>
--- 48,55 ----
  			<property>/sim/current-view/internal</property>
  		</not>
! 		<!--<equals>
  			<property>/controls/engines/engine[0]/cutoff</property>
  			<value>0</value>
! 		</equals>-->
  	        </and>
  	</condition>
***************
*** 68,79 ****
  	</orientation>
  	<pitch>
! 		<property>/engines/engine[0]/n1</property>
! 		<ofset>0.7</ofset>
  		<factor>.003</factor>
  	</pitch>
  	<volume>
! 		<property>/engines/engine[0]/n1</property>
! 		<offset>1.0</offset>
! 		<factor>-0.008</factor>
  		<max>0.6</max>
  	</volume>
--- 68,79 ----
  	</orientation>
  	<pitch>
! 		<property>/sim/model/B-1B/n1[0]</property>
! 		<offset>0.3</offset>
  		<factor>.003</factor>
  	</pitch>
  	<volume>
! 		<property>/sim/model/B-1B/n1[0]</property>
! 		<offset>0.0</offset>
! 		<factor>0.008</factor>
  		<max>0.6</max>
  	</volume>
***************
*** 143,147 ****
  	<pitch>
  		<property>/engines/engine[0]/n1</property>
! 		<ofset>0.7</ofset>
  		<factor>.00075</factor>
  	</pitch>
--- 143,147 ----
  	<pitch>
  		<property>/engines/engine[0]/n1</property>
! 		<offset>0.5</offset>
  		<factor>.00075</factor>
  	</pitch>
***************
*** 193,200 ****
  			  <property>/sim/current-view/internal</property>
  		  </not>
! 		  <equals>
  			  <property>/controls/engines/engine[1]/cutoff</property>
  			  <value>0</value>
! 			  </equals>
  	          </and>
  	  </condition>
--- 193,200 ----
  			  <property>/sim/current-view/internal</property>
  		  </not>
! 		  <!--  <equals>
  			  <property>/controls/engines/engine[1]/cutoff</property>
  			  <value>0</value>
! 			  </equals>-->
  	          </and>
  	  </condition>
***************
*** 213,224 ****
  	  </orientation>
  	  <pitch>
! 		  <property>/engines/engine[1]/n1</property>
! 		  <ofset>0.7</ofset>
  		  <factor>.003</factor>
  	  </pitch>
  	  <volume>
! 		  <property>/engines/engine[1]/n1</property>
! 		  <offset>1.0</offset>
! 		  <factor>-0.008</factor>
  		  <max>0.6</max>
  	  </volume>
--- 213,224 ----
  	  </orientation>
  	  <pitch>
! 		  <property>/sim/model/B-1B/n1[1]</property>
! 		  <offset>0.3</offset>
  		  <factor>.003</factor>
  	  </pitch>
  	  <volume>
! 		  <property>/sim/model/B-1B/n1[1]</property>
! 		  <offset>0.0</offset>
! 		  <factor>0.008</factor>
  		  <max>0.6</max>
  	  </volume>
***************
*** 288,292 ****
  	  <pitch>
  		  <property>/engines/engine[1]/n1</property>
! 		  <ofset>0.7</ofset>
  		  <factor>.00075</factor>
  	  </pitch>
--- 288,292 ----
  	  <pitch>
  		  <property>/engines/engine[1]/n1</property>
! 		  <offset>0.5</offset>
  		  <factor>.00075</factor>
  	  </pitch>
***************
*** 338,345 ****
  			  <property>/sim/current-view/internal</property>
  		  </not>
! 		  <equals>
  			  <property>/controls/engines/engine[2]/cutoff</property>
  			  <value>0</value>
! 			  </equals>
  	          </and>
  	  </condition>
--- 338,345 ----
  			  <property>/sim/current-view/internal</property>
  		  </not>
! 		  <!--<equals>
  			  <property>/controls/engines/engine[2]/cutoff</property>
  			  <value>0</value>
! 			  </equals>-->
  	          </and>
  	  </condition>
***************
*** 358,369 ****
  	  </orientation>
  	  <pitch>
! 		  <property>/engines/engine[2]/n1</property>
! 		  <ofset>0.7</ofset>
  		  <factor>.003</factor>
  	  </pitch>
  	  <volume>
! 		  <property>/engines/engine[2]/n1</property>
! 		  <offset>1.0</offset>
! 		  <factor>-0.008</factor>
  		  <max>0.6</max>
  	  </volume>
--- 358,369 ----
  	  </orientation>
  	  <pitch>
! 		  <property>/sim/model/B-1B/n1[2]</property>
! 		  <offset>0.3</offset>
  		  <factor>.003</factor>
  	  </pitch>
  	  <volume>
! 		  <property>/sim/model/B-1B/n1[2]</property>
! 		  <offset>0.0</offset>
! 		  <factor>0.008</factor>
  		  <max>0.6</max>
  	  </volume>
***************
*** 434,438 ****
  	  <pitch>
  		  <property>/engines/engine[2]/n1</property>
! 		  <ofset>0.7</ofset>
  		  <factor>.00075</factor>
  	  </pitch>
--- 434,438 ----
  	  <pitch>
  		  <property>/engines/engine[2]/n1</property>
! 		  <offset>0.5</offset>
  		  <factor>.00075</factor>
  	  </pitch>
***************
*** 485,492 ****
  			  <property>/sim/current-view/internal</property>
  		  </not>
! 		  <equals>
  			  <property>/controls/engines/engine[3]/cutoff</property>
  			  <value>0</value>
! 			  </equals>
  	          </and>
  	  </condition>
--- 485,492 ----
  			  <property>/sim/current-view/internal</property>
  		  </not>
! 		  <!--<equals>
  			  <property>/controls/engines/engine[3]/cutoff</property>
  			  <value>0</value>
! 			  </equals>-->
  	          </and>
  	  </condition>
***************
*** 505,516 ****
  	  </orientation>
  	  <pitch>
! 		  <property>/engines/engine[3]/n1</property>
! 		  <ofset>0.7</ofset>
  		  <factor>.003</factor>
  	  </pitch>
  	  <volume>
! 		  <property>/engines/engine[3]/n1</property>
! 		  <offset>1.0</offset>
! 		  <factor>-0.008</factor>
  		  <max>0.6</max>
  	  </volume>
--- 505,516 ----
  	  </orientation>
  	  <pitch>
! 		  <property>/sim/model/B-1B/n1[3]</property>
! 		  <offset>0.3</offset>
  		  <factor>.003</factor>
  	  </pitch>
  	  <volume>
! 		  <property>/sim/model/B-1B/n1[3]</property>
! 		  <offset>0.0</offset>
! 		  <factor>0.008</factor>
  		  <max>0.6</max>
  	  </volume>

Update of /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Nasal
In directory baron:/tmp/cvs-serv1601/Nasal

Modified Files:
	b1b.nas 
Log Message:
Markus Zojer:

Sorry for the short interval, but I recognized not all files being
updated correctly.



Index: b1b.nas
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Nasal/b1b.nas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -r1.2 -r1.3
*** b1b.nas	31 Jul 2007 17:53:13 -0000	1.2
--- b1b.nas	1 Aug 2007 16:22:48 -0000	1.3
***************
*** 7,23 ****
  #setprop("/engines/engine[1]/running", 0);
  setprop("sim/multiplay/chat_display", 1);
! setprop("sim/user/callsign", 'BONE');
  #setprop("/consumables/fuel/tank[4]/level-gal_us", 1000);
  #fuel_syst();
! 
! #static fuel distribution
! #setprop("/controls/fuel/tank[0]/fuel_selector", 1);
! #setprop("/controls/fuel/tank[0]/to_tank", 6);
! #setprop("/controls/fuel/tank[1]/fuel_selector", 1);
! #setprop("/controls/fuel/tank[1]/to_tank", 7);
! #setprop("/controls/fuel/tank[6]/fuel_selector", 1);
! #setprop("/controls/fuel/tank[6]/to_engine", 1);
! #setprop("/controls/fuel/tank[7]/fuel_selector", 1);
! #setprop("/controls/fuel/tank[7]/to_engine", 2);
  
  print ("B-1B warming up!");
--- 7,14 ----
  #setprop("/engines/engine[1]/running", 0);
  setprop("sim/multiplay/chat_display", 1);
! setprop("sim/user/callsign", 'B-ONE');
  #setprop("/consumables/fuel/tank[4]/level-gal_us", 1000);
  #fuel_syst();
! settimer(eng_state, 1);
  
  print ("B-1B warming up!");
***************
*** 108,120 ****
--- 99,117 ----
  if(rs == 1) {
     setprop("controls/switches/terrain-avoid-rng-m", 1);
+    setprop("controls/switches/terrain-avoid-rng-mh", 1);
     setprop("controls/switches/terrain-avoid-rng-s", 0);
+    setprop("controls/switches/terrain-avoid-rng-sh", 0);
  #   ter_avoid();
  } else {
     setprop("controls/switches/terrain-avoid-rng-m", 0);
+    setprop("controls/switches/terrain-avoid-rng-mh", 0);
     setprop("controls/switches/terrain-avoid-rng-s", 1);
+    setprop("controls/switches/terrain-avoid-rng-sh", 1);
  }
  } else {
     setprop("controls/switches/terrain-avoid-rng-m", 0);
+    setprop("controls/switches/terrain-avoid-rng-mh", 0);
     setprop("controls/switches/terrain-avoid-rng-s", 0);
+    setprop("controls/switches/terrain-avoid-rng-sh", 0);
  }
  }
***************
*** 129,135 ****
--- 126,134 ----
     setprop("controls/switches/terrain-avoid-rng-m", 1);
     setprop("controls/switches/terrain-avoid-rng-s", 0);
+    setprop("controls/switches/terrain-avoid-rng-sh", 0);
  } else {
     setprop("controls/switches/terrain-avoid-rng-m", 0);
     setprop("controls/switches/terrain-avoid-rng-s", 1);
+    setprop("controls/switches/terrain-avoid-rng-sh", 1);
  }
  }
***************
*** 142,145 ****
--- 141,146 ----
  
  var rcs = getprop("controls/switches/terrain-avoid-clrpln");
+    tas = getprop("controls/switches/terrain-avoid");
+    if(tas == 1) {
  if(rcs <= 0.1) {
  setprop("controls/switches/terrain-avoid-clrpln-1", 0);
***************
*** 169,194 ****
  
  }
  #
  ##### Terrain Avoidance Radar Pulse (inspired from vulcanb2)
  #
! #ter_avoid = func {
  
  settimer(func {
  
!   # Add listener for radar pulse impact
!   setlistener("sim/armament/weapons/impact", func {
!     var impact = cmdarg().getValue();
!     var solid = getprop(impact ~ "/material/solid");
      
      if (solid)
      {
!       var long = getprop(impact ~ "/impact/longitude-deg");
!       var lat = getprop(impact ~ "/impact/latitude-deg");
! #      terflw = getprop("controls/switches/terrain-follow");
! #      var malt = getprop(impact ~ "/impact/altitude-m");
! 
! # pitch clearance with alt mod
!       var pitch = getprop("/autopilot/settings/target-pitch-deg");
!       setprop("/autopilot/settings/target-pitch-deg", (pitch + 1));
        setprop("/autopilot/locks/altitude", "pitch-hold");
  
--- 170,227 ----
  
  }
+ }
  #
  ##### Terrain Avoidance Radar Pulse (inspired from vulcanb2)
  #
! settimer(func {
! 
!   # Add listener for radar pulse contacth
!   setlistener("sim/radar/teravd/contacth", func {
!     var contacth = cmdarg().getValue();
!     var solid = getprop(contacth ~ "/material/solid");
!     
!     if (solid)
!     {
!       var long = getprop(contacth ~ "/contacth/longitude-deg");
!       var lat = getprop(contacth ~ "/contacth/latitude-deg");
! 
! # pitch clearance with alt mod for impacth contact
!       var cpit = getprop("/orientation/pitch-deg");
! #      var pitch = getprop("/autopilot/settings/target-pitch-deg");
!       setprop("/autopilot/settings/target-pitch-deg", (cpit + 6));
!       setprop("/autopilot/locks/altitude", "pitch-hold");
! 
!       falt = getprop("/position/altitude-ft");
!       tagl = getprop("autopilot/settings/target-agl-ft");
!       if(tagl >= 1000) {
!           cl = tagl;
! } else {
!           cl = 1000;
! }
!       
!       nalt = falt + cl;
!       setprop("/autopilot/settings/target-altitude-ft", nalt);
!       setprop("controls/switches/terra-report", 1);
!       teravd_alt();
  
+     }
+   });
+ }, 0);
  settimer(func {
  
!   # Add listener for radar pulse contactm
!   setlistener("sim/radar/teravd/contactm", func {
!     var contactm = cmdarg().getValue();
!     var solid = getprop(contactm ~ "/material/solid");
      
      if (solid)
      {
!       var long = getprop(contactm ~ "/contactm/longitude-deg");
!       var lat = getprop(contactm ~ "/contactm/latitude-deg");
! 
! # pitch clearance with alt mod for impactm contact
!       var cpit = getprop("/orientation/pitch-deg");
! #      var pitch = getprop("/autopilot/settings/target-pitch-deg");
!       setprop("/autopilot/settings/target-pitch-deg", (cpit + 3));
        setprop("/autopilot/locks/altitude", "pitch-hold");
  
***************
*** 206,225 ****
        teravd_alt();
  
! # simple alt clearance
! #       falt = getprop("/position/altitude-ft");
! #       setprop("/autopilot/settings/target-altitude-ft", falt + 1000);
! #       setprop("/autopilot/locks/altitude", "altitude-hold");
! 
! # simle fpm clearance
! #       setprop("/autopilot/settings/vertical-speed-fpm", 3000);
! #       setprop("/autopilot/locks/altitude", "vertical-speed-hold");
  
        
! #      geo.put_model("Aircraft/vulcanb2/Models/crater.ac", lat, long);
      }
    });
  
  }, 0);
! #}
  
  # control alt while climb and trigger end of climb
--- 239,318 ----
        teravd_alt();
  
!     }
!   });
! }, 0);
! settimer(func {
! 
! # Add listener for radar pulse contactl
!   setlistener("sim/radar/teravd/contactl", func {
!     var contactl = cmdarg().getValue();
!     var solid = getprop(contactl ~ "/material/solid");
!     
!     if (solid)
!     {
!       var long = getprop(contactl ~ "/contactl/longitude-deg");
!       var lat = getprop(contactl ~ "/contactl/latitude-deg");
! 
! # pitch clearance with alt mod for impactl contact
!       var cpit = getprop("/orientation/pitch-deg");
! #      var pitch = getprop("/autopilot/settings/target-pitch-deg");
!       setprop("/autopilot/settings/target-pitch-deg", (cpit + 2));
!       setprop("/autopilot/locks/altitude", "pitch-hold");
! 
!       falt = getprop("/position/altitude-ft");
!       tagl = getprop("autopilot/settings/target-agl-ft");
!       if(tagl >= 100) {
!           cl = tagl / 2;
! } else {
!           cl = 100;
! }
!       
!       nalt = falt + cl;
!       setprop("/autopilot/settings/target-altitude-ft", nalt);
!       setprop("controls/switches/terra-report", 1);
!       teravd_alt();
! 
!     }
!   });
! 
! }, 0);
! 
! settimer(func {
! 
! # Add listener for radar pulse contactd which monitors climb behaviour
!   setlistener("sim/radar/teravd/contactd", func {
!     var contactd = cmdarg().getValue();
!     var solid = getprop(contactd ~ "/material/solid");
!     
!     if (solid)
!     {
! 
!       var long = getprop(contactd ~ "/contactd/longitude-deg");
!       var lat = getprop(contactd ~ "/contactd/latitude-deg");
! 
! # pitch clearance with alt mod for impactl contact
!       var cpit = getprop("/orientation/pitch-deg");
! #      var pitch = getprop("/autopilot/settings/target-pitch-deg");
! 
!       falt = getprop("/position/altitude-ft");
!       tagl = getprop("autopilot/settings/target-agl-ft");
! 
!       if(cpit >= 5) {
  
+       if(tagl >= 1000) {
+           cl = tagl;
+ } else {
+           cl = 1000;
+ }
        
!       nalt = falt + cl;
!       setprop("/autopilot/settings/target-altitude-ft", nalt);
! } else {
! }
      }
    });
  
  }, 0);
! 
  
  # control alt while climb and trigger end of climb
***************
*** 230,235 ****
  
  if(calt >= salt) {
! #       setprop("/autopilot/settings/target-altitude-ft", salt + 300);
!        setprop("/autopilot/settings/target-pitch-deg", (pitch - 1));
         if(pitch >= 5) {
           setprop("/autopilot/settings/target-pitch-deg", 5);
--- 323,329 ----
  
  if(calt >= salt) {
! 
!        setprop("controls/switches/terrain-avoid-rng-d", 0);
! #       setprop("/autopilot/settings/target-pitch-deg", (pitch - 1));
         if(pitch >= 5) {
           setprop("/autopilot/settings/target-pitch-deg", 5);
***************
*** 237,241 ****
         aglreinit();
  } else {
! settimer(teravd_alt, 1);
  }
  }
--- 331,339 ----
         aglreinit();
  } else {
!    if(pitch <= 1) {
!          setprop("/autopilot/settings/target-pitch-deg", 1.5);
!        }
!    setprop("controls/switches/terrain-avoid-rng-d", 1);
!    settimer(teravd_alt, 1);
  }
  }

Update of /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Submodels
In directory baron:/tmp/cvs-serv1522

Removed Files:
	smoke_puff.xml 
Log Message:
Removed depricated file.


--- smoke_puff.xml DELETED ---

Update of /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/Instruments-3d/hsi
In directory baron:/tmp/cvs-serv1485

Removed Files:
	backcard.rgb hsi.ac hsi.rgb hsi.xml hsibezel.rgb navpanel.ac 
	navpanel.rgb navpanel.xml 
Log Message:
Removed depricated files.


--- backcard.rgb DELETED ---

--- hsi.ac DELETED ---

--- hsi.rgb DELETED ---

--- hsi.xml DELETED ---

--- hsibezel.rgb DELETED ---

--- navpanel.ac DELETED ---

--- navpanel.rgb DELETED ---

--- navpanel.xml DELETED ---

Update of /var/cvs/FlightGear-0.9/FlightGear/src/AIModel
In directory baron:/tmp/cvs-serv17470

Modified Files:
	submodel.cxx 
Log Message:
Vivian MEAZZA: fix subsubmodels


Index: submodel.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/AIModel/submodel.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -r1.19 -r1.20
*** submodel.cxx	15 Jul 2007 14:08:32 -0000	1.19
--- submodel.cxx	1 Aug 2007 10:44:17 -0000	1.20
***************
*** 488,498 ****
          else if (IC.azimuth >= 360)
              IC.azimuth -= 360;
!     }
! 
!     // cout << "azimuth2 " << IC.azimuth<<endl;
  
!     IC.elevation = -atan(IC.total_speed_down / sqrt(IC.total_speed_north
              * IC.total_speed_north + IC.total_speed_east * IC.total_speed_east))
              * SG_RADIANS_TO_DEGREES;
  }
  
--- 488,497 ----
          else if (IC.azimuth >= 360)
              IC.azimuth -= 360;
!         // cout << "azimuth2 " << IC.azimuth<<endl;
  
!         IC.elevation = -atan(IC.total_speed_down / sqrt(IC.total_speed_north
              * IC.total_speed_north + IC.total_speed_east * IC.total_speed_east))
              * SG_RADIANS_TO_DEGREES;
+     }
  }

Update of /var/cvs/FlightGear-0.9/data
In directory baron:/tmp/cvs-serv13436

Modified Files:
	keyboard.xml 
Log Message:
use "var" keyword to make "local" variables really local


Index: keyboard.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/keyboard.xml,v
retrieving revision 1.98
retrieving revision 1.99
diff -C 2 -r1.98 -r1.99
*** keyboard.xml	19 Jul 2007 21:31:24 -0000	1.98
--- keyboard.xml	1 Aug 2007 08:20:21 -0000	1.99
***************
*** 46,50 ****
     <command>nasal</command>
     <script>
!      node = props.globals.getNode("/autopilot/locks/altitude", 1);
       if ( node.getValue() == "altitude-hold" ) {
         node.setValue( "" );
--- 46,50 ----
     <command>nasal</command>
     <script>
!      var node = props.globals.getNode("/autopilot/locks/altitude", 1);
       if ( node.getValue() == "altitude-hold" ) {
         node.setValue( "" );
***************
*** 80,84 ****
     <command>nasal</command>
     <script>
!      node = props.globals.getNode("/autopilot/locks/altitude", 1);
       if ( node.getValue() == "gs1-hold" ) {
         node.setValue( "" );
--- 80,84 ----
     <command>nasal</command>
     <script>
!      var node = props.globals.getNode("/autopilot/locks/altitude", 1);
       if ( node.getValue() == "gs1-hold" ) {
         node.setValue( "" );
***************
*** 96,100 ****
     <command>nasal</command>
     <script>
!      node = props.globals.getNode("/autopilot/locks/heading", 1);
       if ( node.getValue() == "dg-heading-hold" ) {
         node.setValue( "" );
--- 96,100 ----
     <command>nasal</command>
     <script>
!      var node = props.globals.getNode("/autopilot/locks/heading", 1);
       if ( node.getValue() == "dg-heading-hold" ) {
         node.setValue( "" );
***************
*** 132,136 ****
     <command>nasal</command>
     <script>
!      node = props.globals.getNode("/autopilot/locks/heading", 1);
       if ( node.getValue() == "nav1-hold" ) {
         node.setValue( "" );
--- 132,136 ----
     <command>nasal</command>
     <script>
!      var node = props.globals.getNode("/autopilot/locks/heading", 1);
       if ( node.getValue() == "nav1-hold" ) {
         node.setValue( "" );
***************
*** 148,157 ****
     <command>nasal</command>
     <script>
!      node = props.globals.getNode("/autopilot/locks/altitude", 1);
       if ( node.getValue() == "pitch-hold" ) {
         node.setValue( "" );
       } else {
         node.setValue( "pitch-hold" );
!        pitch = props.globals.getNode("/autopilot/settings/target-pitch-deg", 1);
         pitch.setValue( getprop("/orientation/pitch-deg") );
       }
--- 148,157 ----
     <command>nasal</command>
     <script>
!      var node = props.globals.getNode("/autopilot/locks/altitude", 1);
       if ( node.getValue() == "pitch-hold" ) {
         node.setValue( "" );
       } else {
         node.setValue( "pitch-hold" );
!        var pitch = props.globals.getNode("/autopilot/settings/target-pitch-deg", 1);
         pitch.setValue( getprop("/orientation/pitch-deg") );
       }
***************
*** 175,179 ****
     <command>nasal</command>
     <script>
!      node = props.globals.getNode("/autopilot/locks/speed", 1);
       if ( node.getValue() == "speed-with-throttle" ) {
         node.setValue( "" );
--- 175,179 ----
     <command>nasal</command>
     <script>
!      var node = props.globals.getNode("/autopilot/locks/speed", 1);
       if ( node.getValue() == "speed-with-throttle" ) {
         node.setValue( "" );
***************
*** 191,200 ****
     <command>nasal</command>
     <script>
!      node = props.globals.getNode("/autopilot/locks/altitude", 1);
       if ( node.getValue() == "agl-hold" ) {
         node.setValue( "" );
       } else {
         node.setValue( "agl-hold" );
!        agl = props.globals.getNode("/autopilot/settings/target-agl-ft", 1);
         agl.setValue( getprop("/position/altitude-agl-ft") );
       }
--- 191,200 ----
     <command>nasal</command>
     <script>
!      var node = props.globals.getNode("/autopilot/locks/altitude", 1);
       if ( node.getValue() == "agl-hold" ) {
         node.setValue( "" );
       } else {
         node.setValue( "agl-hold" );
!        var agl = props.globals.getNode("/autopilot/settings/target-agl-ft", 1);
         agl.setValue( getprop("/position/altitude-agl-ft") );
       }
***************
*** 234,238 ****
     <command>nasal</command>
     <script>
!      node = props.globals.getNode("/autopilot/locks/heading", 1);
       if ( node.getValue() == "wing-leveler" ) {
         node.setValue( "" );
--- 234,238 ----
     <command>nasal</command>
     <script>
!      var node = props.globals.getNode("/autopilot/locks/heading", 1);
       if ( node.getValue() == "wing-leveler" ) {
         node.setValue( "" );
***************
*** 1107,1112 ****
     <command>nasal</command>
     <script>
!     prop = "/autopilot/locks/heading";
!     curr = getprop(prop);
      if(curr == "true-heading-hold") { setprop(prop, ""); }
      else { setprop(prop, "true-heading-hold"); }
--- 1107,1112 ----
     <command>nasal</command>
     <script>
!     var prop = "/autopilot/locks/heading";
!     var curr = getprop(prop);
      if(curr == "true-heading-hold") { setprop(prop, ""); }
      else { setprop(prop, "true-heading-hold"); }