Updateds for v0.9.10-pre3

diff --git a/Makefile.am b/Makefile.am
index 370b5e1b48ec697eb4c699f7639aedce34a4cd85..c179077d6c196997b3cbe31b5ca4efe6be677418 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,16 +6,18 @@ SUBDIRS = \
         utils
 
 EXTRA_DIST = \
-       Thanks \
        acinclude.m4 \
        autogen.sh \
        FlightGear.dsp \
-       FlightGear.dsw
+       FlightGear.dsw \
+       projects \
+       Thanks
 
 dist-hook:
        (cd $(top_srcdir); $(HOME)/Projects/FlightGear/admin/am2dsp.pl)
        (cd $(top_srcdir); tar --exclude docs-mini/CVS --exclude hints/CVS \
                -cf - docs-mini ) | (cd $(distdir); tar xvf -)
+       rm -rf `find $(distdir)/projects -name CVS`
 
 
 ##########################################################################
@@ -40,8 +42,10 @@ fgfs-base-tar:
        --exclude='*.xcf' \
        --exclude='*/c172/Instruments.high' \
        --exclude='*/Textures/Unused' \
-       --exclude='*/Textures.high/*.save' \
+       --exclude='*/Textures/*.orig' \
        --exclude='*/Textures.high/*.new' \
+       --exclude='*/Textures.high/*.orig' \
+       --exclude='*/Textures.high/*.save' \
        --exclude='*/Docs/source' \
         --exclude='*/Models/MNUAV' \
         --exclude='*/Models/Airspace' \
@@ -50,19 +54,21 @@ fgfs-base-tar:
                 data/Aircraft/Instruments \
                 data/Aircraft/Instruments-3d \
                 data/Aircraft/UIUC \
-                data/Aircraft/737 \
+                data/Aircraft/737-300 \
                 data/Aircraft/A-10 \
+                data/Aircraft/bf109 \
                 data/Aircraft/bo105 \
                 data/Aircraft/c172 \
                 data/Aircraft/c172p \
                 data/Aircraft/c310 \
                 data/Aircraft/c310u3a \
-                data/Aircraft/Citation \
+                data/Aircraft/Citation-Bravo \
                 data/Aircraft/f16 \
                 data/Aircraft/j3cub \
                 data/Aircraft/Hunter \
                 data/Aircraft/p51d \
                 data/Aircraft/pa28-161 \
+                data/Aircraft/Rascal \
                 data/Aircraft/T38 \
                 data/Aircraft/ufo \
                 data/Aircraft/wrightFlyer1903 \
@@ -78,6 +84,7 @@ fgfs-base-tar:
                data/gui \
                data/Huds \
                data/Input \
+               data/joysticks.xml \
                data/keyboard.xml \
                data/Lighting \
                data/materials.dtd \
@@ -89,7 +96,8 @@ fgfs-base-tar:
                data/preferences.xml \
                data/Protocol \
                data/README \
-               data/Scenery \
+               data/Scenery/Objects \
+               data/Scenery/Terrain \
                data/Sounds \
                data/T* \
                data/version \

diff --git a/NEWS b/NEWS
index eff920587b72e021117c469ceb784366acbb54cf..17fa194a1912dc44605308425b029ee323f1a0d9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-New in 0.9.10-pre2
-* March 23, 2006
+New in 0.9.10-pre3
+* March 27, 2006
 
 * Many improvements to the multi-player mode.  Other airplanes are now
   updated smoothly.  There is a really nifty google maps based moving
@@ -10,6 +10,7 @@ New in 0.9.10-pre2
   local festival server to be converted to spoken speech output.
 * Added a detailed model of the Honeywell MK VIII EGPWS ground
   proximity warning system.
+* Complete overhaul/redo of terrain textures based on USGS satellite imagery.
 * Added background ATC chatter.
 * Updated/improved rain cone rendering.
 
@@ -59,10 +60,11 @@ New in 0.9.10-pre2
 * Better use of exceptions in places.
 * Fix the 2d compass texture handling.
 * Many tweaks and improvements to our keyboard input handling system.
+* Added a first attempt at MS-VC8 project files.
 
 * Updated aircraft:
   - A4/A3F (cleanups and updates, functional drag chute)
-  - A-10 (fdm tuning, munitions, drop tanks)
+  - A-10 (3d cockpit, fdm tuning, munitions, drop tanks)
   - AN-225 (fdm tuning)
   - B1900D
   - BO105 Eurocopter (new livry/logo options.)

diff --git a/configure.ac b/configure.ac
index 78413b158a098b4430c840665a723abc59b333d7..31daed80dcde35ae5f77234824b55f9bece06730 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.52)
 dnl Initialize the automake stuff
 dnl set the $host variable based on local machine/os
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(FlightGear, 0.9.10-pre2)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.10-pre3)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET

diff --git a/docs-mini/FlightGear-FAQ.html b/docs-mini/FlightGear-FAQ.html
index 65d6ac1b8c12cb519cd340b599221c06afc2392a..d6b9c2d944537d8321517ceb8d249d167466e6c2 100644 (file)
--- a/docs-mini/FlightGear-FAQ.html
+++ b/docs-mini/FlightGear-FAQ.html
@@ -333,10 +333,7 @@
           <p>While we are working toward building our own 3D models, we have
           been given permission by several people to convert their models (which
           where originally intended for use with <i>Microsoft Flight
-          Simulator</i>) to use with FlightGear.  See Wolfram's Hangar
-          (<a href="http://home.t-online.de/home/Wolfram.Kuss/">http://home.t-online.de/home/Wolfram.Kuss/</a>)
-          for a list of what we currently have available as well as
-          information on how to convert models yourself.</p>
+          Simulator</i>) to use with FlightGear.</p>
         </div>
       
         <b>
@@ -703,9 +700,7 @@
     </b>
         <div class="indent">
           <p>You can import the 3D model and textures, but the flight dynamics
-          (the .AIR file) must be completely redone for FlightGear.  See
-          <a href="http://home.t-online.de/home/Wolfram.Kuss/">http://home.t-online.de/home/Wolfram.Kuss/</a>
-          for help importing .MDL files and textures.</p>
+          (the .AIR file) must be completely redone for FlightGear.  </p>
           <p>If you wish to import a model made with gmax, you will need to
           convert it to .MDL format using <i>Microsoft's MakeMDL SDK</i> which
           is available at

diff --git a/scripts/perl/web/mkindex.pl b/scripts/perl/web/mkindex.pl
index 6b243871f1063b3ac97d93576cbcde454a46ad26..9636f0eac08ebdbfb3de16c2c3a65dd5433ac5b5 100755 (executable)
--- a/scripts/perl/web/mkindex.pl
+++ b/scripts/perl/web/mkindex.pl
@@ -35,10 +35,10 @@ $ldir = "Large";
 $sdir = "Small";
 $mdir = "Movies";
 
-$columns = 3;
+$columns = 2;
 
-$swidth = 170;
-$sheight = 128;
+$swidth = 320;
+$sheight = 240;
 
 $lwidth = 1024;
 $lheight = 768;
@@ -213,14 +213,15 @@ while ( <MASTER> ) {
            $linkname = `basename $i .png`;
         }
        chop($linkname);
-       # print OUT "<TD WIDTH=220 HEIGHT=160>\n";
-       print OUT "<TD WIDTH=$swidth HEIGHT=$sheight>\n";
 
        $thumbinfo = `identify $sdir/$i`;
        ($name, $type, $geom, $junk) = split(/\s+/, $thumbinfo, 4);
        ($twidth, $theight) = split(/x/, $geom);
        $theight =~ s/\+.*$//;
 
+       # print OUT "<TD WIDTH=220 HEIGHT=160>\n";
+       print OUT "<TD WIDTH=$twidth HEIGHT=$sheight>\n";
+
        print OUT "<A HREF=\"$link/$linkname.html\">";
        print OUT "<IMG WIDTH=$twidth HEIGHT=$theight SRC=\"$sdir/$i\" ALT=\"$linkname\">";
        print OUT "</A><BR>\n";