Various 0.9.3 updates.

diff --git a/FlightGear.dsp b/FlightGear.dsp
index 68f9f05b3c6afe91473b890c8e8e7ce0b5b28906..25840f4f9b81edd11eef109804a8f45c431dfe2e 100644 (file)
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -6654,6 +6654,96 @@ SOURCE=.\src\FDM\YASim\RigidBody.hpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\FDM\YASim\Rotor.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_YASim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_YASim"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\YASim\Rotor.hpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_YASim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_YASim"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\YASim\Rotorblade.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_YASim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_YASim"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\YASim\Rotorblade.hpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_YASim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_YASim"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\YASim\Rotorpart.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_YASim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_YASim"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\YASim\Rotorpart.hpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_YASim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_YASim"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\FDM\YASim\SimpleJet.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r

diff --git a/NEWS b/NEWS
index 9833947e3484b7bfc03a3a12f0a45718a54ac52e..5967b0ab23f82bd977688ff3f64e734d8740a876 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 New in 0.9.3
-* October 15, 2003
+* October 22, 2003
 
 * Added a flight "replay" system.
 * Many updates to the ATC and AI aircraft subsystem. (David Luff)
@@ -18,6 +18,12 @@ New in 0.9.3
 * Many buildings and bridges added in the San Francisco area.
 * Updated airport and navaid database, many new taxiways, many
   corrected runways, many new airports (especially outside the USA.)
+* Updates to the man page.
+* Better Win32 packaging (more standardized installer, plus a launcher
+  which allows selection of starting location and starting aircraft.)
+* Added an initial cut at modeling helicopters.
+* Support multiple inside the cockpit views.
+* Updated FlightGear Flight School tutorial.
 
 * Use the field elevation for GS when no specific altitude listed in
   FAA/DAFIF data
@@ -35,7 +41,8 @@ New in 0.9.3
 * JSBSim updates including a new turbine engine model that supports
   things like starting and stopping procedures and thrust reversing.
 * UIUCsim updates (compiler warning and namespace conflict fixes.)
-* YASim updates (fix drag from shutdown engine.)
+* YASim updates (fix drag from shutdown engine, helicopter support,
+  better in airr startup support.)
 * Support for "clock" instruments that operate independently of
   computer system time.
 * Annunciators shouldn't work if electrical system not serviceable.
@@ -50,13 +57,15 @@ New in 0.9.3
 * Updated aircraft: 747, A320, T-38, A-10, B-52, F-104, Fokker 50,
   Fokker 100, Piper Cub, P-51, UFO, YF-23, Ornithopter, A-4, C172,
   and F-16
-* New Aircraft: J-22, Paraglider, SGS-126 Sailplane, ASW 20, and AN-225.
+* New Aircraft: J-22, Paraglider, SGS-126 Sailplane, ASW 20, and
+  AN-225 aircraft; Bell 206 JetRanger, CH-47 Chinook, and Ecureuil
+  AS-350 helicoptors.
 * Updated cloud textures.
 
 * Removed dependency on Metakit.  The airport and runway databases are now
   stored in a simple flat file ascii database.
 
-* FreeBSD, Solaris, MSVC, Irix, cygwin, and mingwin fixes.
+* FreeBSD, Solaris, MSVC, Irix, Mac OSX, cygwin, and mingwin fixes.
 
 
 New in 0.9.2

diff --git a/Thanks b/Thanks
index 1f04748c78c820a68e3ee279fb85c81f014cb3ab..c227431b0b89171d3ccc8036b83df6c142f3286c 100644 (file)
--- a/Thanks
+++ b/Thanks
@@ -23,6 +23,12 @@ Michele America <nomimarketing@mail.telepac.pt>
   Contributed to the HUD code.
 
 
+Andrei Barbu <a_barbu2@yahoo.com>
+  Completely overhauled the look and feel of our web site to bring us
+  into the current century.  Also did some nice reorganization to make
+  information more accessible.
+
+
 Michael Basler <pmb@knUUt.de>
   Author of the Getting Started guide.
 

diff --git a/configure.ac b/configure.ac
index 360401f04f57b552987710f2bccfc6f9e907cc40..490ddecf8e85fb622fdcc9757363ca0a40b02e90 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ dnl Require at least automake 2.52
 AC_PREREQ(2.52)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(FlightGear, 0.9.3-pre1)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.3)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET

diff --git a/scripts/perl/web/mkindex.pl b/scripts/perl/web/mkindex.pl
index 496980a377e5a7774cb5fc6c9b7d5efc9aef18f6..0b1cb28fcf539a2496a47b03a4ba80dc223b8bf4 100755 (executable)
--- a/scripts/perl/web/mkindex.pl
+++ b/scripts/perl/web/mkindex.pl
@@ -4,6 +4,12 @@
 # adapted from a script by Bob Hain, 11/30/99
 #
 
+#
+# default values
+#
+
+$outfile = "new.index.html";
+
 
 #
 # process arguments
@@ -14,6 +20,9 @@ while ( $arg = shift @ARGV ) {
     if ( $arg eq "--large" ) {
        $use_large = 1;
     }
+    if ( $arg eq "--outfile" ) {
+        $outfile = shift @ARGV;
+    }
 }
 
 
@@ -28,7 +37,7 @@ $mdir = "Movies";
 
 $columns = 3;
 
-$swidth = 170;
+$wwidth = 170;
 $sheight = 128;
 
 $lwidth = 1024;
@@ -148,8 +157,6 @@ mkdir $link, 0755;
 # Assemble index.html
 #
 
-$outfile = "index.html";
-
 $dir = `pwd`;
 chop($dir);
 $title = `basename $dir`;
@@ -278,8 +285,9 @@ while ( <MASTER> ) {
        print OUT "<TD WIDTH=$swidth HEIGHT=$sheight>\n";
 
        $thumbinfo = `identify $mdir/$linkname.jpg`;
-       ($name, $geom, $junk) = split(/\s+/, $thumbinfo, 3);
+       ($name, $type, $geom, $junk) = split(/\s+/, $thumbinfo, 4);
        ($twidth, $theight) = split(/x/, $geom);
+        print "movie thumb geom = $geom  $twidth  $theight\n";
 
        print OUT "<A HREF=\"$mdir/$i\">";
        print OUT "<IMG WIDTH=$twidth HEIGHT=$theight SRC=\"$mdir/$linkname.jpg\" ALT=\"$linkname\">";
@@ -298,8 +306,8 @@ while ( <MASTER> ) {
            print OUT "</FONT>\n";
        } else {
            if ( $twidth < $swidth ) {
-               print OUT "<BR>\n";
-           }
+               print OUT "<BR>\n";
+            }
            print OUT "<FONT SIZE=-1 id=\"fgfs\">\n";
            print OUT "$linkname\n";
            print OUT "</FONT>\n";

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 76e389489ab1c6acd0b5515ff9b30b4ec6ab51ae..9f2b701d24300d58d1cc73463411146aee1ef403 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -1549,7 +1549,7 @@ bool fgMainInit( int argc, char **argv ) {
     fgInitFGRoot(argc, argv);
 
     // Check for the correct base package version
-    static char required_version[] = "0.9.3-pre1";
+    static char required_version[] = "0.9.3";
     string base_version = fgBasePackageVersion();
     if ( !(base_version == required_version) ) {
         // tell the operator how to use this application

diff --git a/src/Network/native_ctrls.cxx b/src/Network/native_ctrls.cxx
index c7537598f7700718d3061e889f80783b1afbbe0c..cae87ff4801aa268828863c0fe36db34d9836fb5 100644 (file)
--- a/src/Network/native_ctrls.cxx
+++ b/src/Network/native_ctrls.cxx
@@ -372,7 +372,9 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes,
     }
     for ( i = 0; i < FGNetCtrls::FG_MAX_WHEELS; ++i ) {
         node = fgGetNode( "/controls/gear/wheel", i );
-        node->getChild( "brake" )->setDoubleValue( net->brake[i] );
+        if ( node != NULL ) {
+            node->getChild( "brake" )->setDoubleValue( net->brake[i] );
+        }
     }
 
     node = fgGetNode( "/controls/gear", true );

diff --git a/src/Network/net_ctrls.hxx b/src/Network/net_ctrls.hxx
index 54baaf0b0899ae325a6db7e360fca57c0cae4507..d44b9362f05fc33d794bcd3b0635cf68065c3fdd 100644 (file)
--- a/src/Network/net_ctrls.hxx
+++ b/src/Network/net_ctrls.hxx
@@ -30,7 +30,7 @@
 # error This library requires C++
 #endif                                   
 
-const int FG_NET_CTRLS_VERSION = 16;
+const int FG_NET_CTRLS_VERSION = 17;
 
 
 // Define a structure containing the control parameters
@@ -43,8 +43,8 @@ public:
 
     enum {
         FG_MAX_ENGINES = 4,
-        FG_MAX_WHEELS = 3,
-        FG_MAX_TANKS = 4
+        FG_MAX_WHEELS = 16,
+        FG_MAX_TANKS = 6
     };
 
     // Aero controls