Merge branch 'curt/release-stuff' into next

diff --git a/NEWS b/NEWS
index 0876a8d1d8cb5be112be1e9c40a381cce5eee48c..6590aeb49a452549b3c8f5a4be04394d96356715 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,80 @@
-Version 1.99.5
-* October 30, 2008 (source code snapshot release)
+Version 2.0.0 - February 25, 2010
+
+  FlightGear 2.0.0. reflects the maturation of the OpenSceneGraph port
+  that started with the previous 1.9.0 release. In addition to many
+  internal code improvements, FlightGear 2.0.0. marks the introduction
+  of many new exciting improvements in the graphics and sound system,
+  as well as improved usability of key features, and improved behavior
+  of exsisting features. Highlights of this new version include:
+  Dramatic new 3D clouds, dramatic lighting conditions, improved
+  support for custom scenery, and many many new and detailed aircraft
+  models.
+
+  Sound 
+  * Complete overhaul of the sound code
+  * doppler effects
+  * distance attenuation
+  * 3D positional sound sources
+  * assignment of sound sources to external objects (i.e. AI controlled
+    aircraft)
+  * User selection of the sound device
+
+  Visual Effects
+  * Use of Shaders for dynamic textures
+  * Use of Effects files
+  * Improved 3D clouds
+  * Color changes based on humidity and other weather effects allow for very
+    dramatic lighting conditions
+  * Dynamic water textures
+  * Text animation based on OSGText
+
+  Usability
+  * Allow screenshots in more common file formats
+  * User selectable sound device
+  * More intuitive selection of the weather settings through the GUI and/or
+    commandline
+
+  Infrastructure
+  * Airport geometry data can be read from the scenery, allowing for more
+    flexible regeneration of terrain tiles
+
+  Internals
+  * Improved efficiency of the property tree
+  * A more efficient ground cache
+  * Many improvements to the route management code
+  * Removed many compiler warnings
+  * More realistic atmosphere model
+
+  Behavior
+  * More realistic ILS behavior
+  * Autopilot improvements
+  * A generic autobrake function
+  * Winds over mountainous areas cause up- and downdrafts that can be used
+    for gliding
+  * More realistic behavior of the route manager
+  * Wild fires, which can be extinguished by firefighter aircraft operating
+    across the multplayer server
+  * Navaid frequencies and radials can be transmitted to Atlas
+
+  Utilities
+  * A python script to visualize Yasim configuration files in Blender
+
+  AI
+  * Allow traffic departing and arriving at the same airport
+  * Add Ground Vehicles - including automobiles, trucks, articulated trucks,
+    trains (including high speed trains)
+  * ATC interactions between AI aircraft and ground controllers
+  * Performance characteristics of AI aircraft can be specified in a
+    performance database
+  * Push-back vehicles are available for a selected number of aircraft
+  * Add escorts for AI carrier - frigates, guided missile cruiser, amphibious
+    warfare ships now make up the Vinson Battle Group
+  * Improved radar functionality - now detects AI escorts etc.
+  * AI objects are now solid (i.e. users can collide with them)
+  * Some preliminary support for SID/STAR procedures for AI aircraft
+
+Version 1.9.0
+* December 20, 2008 (source code snapshot release)
 
 
 New in 0.9.10

diff --git a/configure.ac b/configure.ac
index 9cda1ee5a0df79187ebeeb53fbb1a63873a310f8..df8ba3dcb4b4647d7633865b493a8e28a75724fc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -512,7 +512,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for SimGear 1.9.0 or newer])
+AC_MSG_CHECKING([for SimGear 2.0.0 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -521,8 +521,8 @@ AC_TRY_RUN([
 #define STRINGIFY(X) XSTRINGIFY(X)
 #define XSTRINGIFY(X) #X
 
-#define MIN_MAJOR 1
-#define MIN_MINOR 9
+#define MIN_MAJOR 2
+#define MIN_MINOR 0
 #define MIN_MICRO 0
 
 int main() {