1
0
Fork 0
Commit graph

10321 commits

Author SHA1 Message Date
Tim Moore
9c98258ab0 Merge branch 'releases/2.2.0' into next
Conflicts:
	CMakeModules/FindSvnClient.cmake
	src/FDM/JSBSim/JSBSim.cxx
2011-02-15 13:26:24 +01:00
Tim Moore
c5366cceb6 accomodate changes to osgDB::DatabasePager interface
The change was introduced in OSG SVN revision 12080. Note: that
revision has a bug that causes fgfs to crash. The bug is fixed in
revision 12170.
2011-02-15 12:42:53 +01:00
Torsten Dreyer
96a902a2eb Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next 2011-02-14 22:15:37 +01:00
Torsten Dreyer
df370549c3 Warning fixes for MSVC 2011-02-14 22:11:56 +01:00
Torsten Dreyer
5ec361ae06 Fix wrong throttle-position on init (trim) 2011-02-14 21:01:48 +01:00
Torsten Dreyer
a1acd92a1c gcc warning fixes 2011-02-14 20:58:54 +01:00
Torsten Dreyer
eb68d1a927 Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next 2011-02-14 20:54:09 +01:00
Torsten Dreyer
ddd04d91ca TankProperties: don't allow negative values 2011-02-14 20:45:59 +01:00
Torsten Dreyer
fff48bdd6a Refactor controls.cxx: use simgear functions
- use TiedPropertyList
- use SG_CLAMP_RANGE
2011-02-14 20:44:20 +01:00
Torsten Dreyer
03aac3de8b Refactor ridgelift: use simgear::TiedPropertyList 2011-02-14 20:26:39 +01:00
ThorstenB
7bc9749d91 Support scenery reloading (needs simgear update).
TileMgr subsystem reinit: remove all scenery tiles from scenegraph and
clear cache (simgear update required).
"normal" sim resets: no TileMgr reset is needed (avoid reloading scenery).
2011-02-13 19:26:55 +01:00
ThorstenB
4a351fdd8b Update tile loader options whenever its config properties change
New listener for tile-loader properties.
2011-02-13 19:26:44 +01:00
ThorstenB
45f526aca5 Minor output format issue. 2011-02-13 19:26:32 +01:00
ThorstenB
526cd9fa6e Avoid crash and/or long delay on shutdown in METAR loader.
Catching loader thread on subsystem destruction is too late, since it
depends on other subsystems (which are destroyed earlier).
=> Need to stop & join thread during subsystem shutdown.
Also changed loader sleep logic - to avoid excessive delays (up to
30 seconds) on shutdown.
(Issues mostly happened when running offline with realwx enabled.)
2011-02-13 18:44:56 +01:00
ThorstenB
ae320ca46c Avoid crash and/or long delay on shutdown in METAR loader.
Catching loader thread on subsystem destruction is too late, since it
depends on other subsystems (which are destroyed earlier).
=> Need to stop & join thread during subsystem shutdown.
Also changed loader sleep logic - to avoid excessive delays (up to
30 seconds) on shutdown.
(Issues mostly happened when running offline with realwx enabled.)
2011-02-13 16:54:08 +01:00
Torsten Dreyer
c7cccd8758 TankProperty: a bugfix and a new properties
- Fix initial number of TankProperty instances (thanks to Csaba)
- Add new property for unusable fuel and compute "empty" state
2011-02-12 21:36:58 +01:00
ThorstenB
a4ebec667d Ivan Ngeow: Fixed compile for FreeBSD platforms. 2011-02-11 18:54:54 +01:00
ThorstenB
8ca9f26e1b Ivan Ngeow: Fixed compile for FreeBSD platforms. 2011-02-11 18:53:35 +01:00
Torsten Dreyer
94d870d930 Support more than eight tanks
I was naive enough to think that no aircraft ever uses more
than eight tanks. Csabe proved me wrong and came up with a
fix - Thanks.
2011-02-08 21:23:02 +01:00
Torsten Dreyer
07190fb953 Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next 2011-02-06 22:28:40 +01:00
Torsten Dreyer
fcf1709df6 Fix the tank properties if no content was defined in fg 2011-02-06 22:08:46 +01:00
Torsten Dreyer
e3fe296eaa Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next 2011-02-06 20:33:05 +01:00
Torsten Dreyer
292b0214fb Repair windows vc90 build broken by TankProperties commit 2011-02-06 20:04:12 +01:00
Torsten Dreyer
717ffe584f Unified handling of (fuel-)tank properties
Ensure consistent properties for all fuel tanks
2011-02-06 17:33:31 +01:00
ThorstenB
591ef4ab01 Fixed incomplete merge of JSBSim.cxx
Commit 287cc74965 wasn't merged to release/2.2.0
properly by Commit b649f97b19.
2011-02-06 16:46:36 +01:00
Torsten Dreyer
49dda9bfb6 Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next 2011-02-06 15:44:30 +01:00
Torsten Dreyer
d1b35578c8 Move tiedpropertylist from flightgear to simgear 2011-02-06 15:44:09 +01:00
ThorstenB
ac71778319 Bertrand Coconnier: updated fix for #204 and #222: JSBSim reset
Use shared property pointers instead of path strings, adapt method
names to JSBSim style, catch all property ties, proper error handling
when tieing failed.
2011-02-06 15:34:32 +01:00
ThorstenB
6b6d7059de Improved fix for #204 and #222: JSBSim::unbind() needs to untie _all_ its properties
Extends and partially reverts commit 287cc74965
Previous fix did not consider properties outside the /fdm/jsbsim branch.
FGPropertyManager now keeps track of all its tied properties - and provides
a method to cleanly untie them again.
2011-02-06 15:34:16 +01:00
ThorstenB
68728c9449 Betrand Coconnier: fix bugs #47,#184: roll/pitch/speed via command-line
Specifying initial roll, pitch and speed should be working again.
2011-02-06 15:33:49 +01:00
ThorstenB
b649f97b19 Fix for bug #204 and #222 by Bertrand Coconnier; NaNs (bug #222) were basically generated because the method JSBSim::unbind() was not implemented in JSBSim.cxx. 2011-02-06 15:33:27 +01:00
ThorstenB
0d233c0dfc Bertrand Coconnier: updated fix for #204 and #222: JSBSim reset
Use shared property pointers instead of path strings, adapt method
names to JSBSim style, catch all property ties, proper error handling
when tieing failed.
2011-02-06 15:16:58 +01:00
ThorstenB
ad8d46ba64 Improved fix for #204 and #222: JSBSim::unbind() needs to untie _all_ its properties
Extends and partially reverts commit 287cc74965
Previous fix did not consider properties outside the /fdm/jsbsim branch.
FGPropertyManager now keeps track of all its tied properties - and provides
a method to cleanly untie them again.
2011-02-05 17:49:26 +01:00
ThorstenB
edfc06119a Not reported by cppcheck: fix another memory leak :)
Extends/changes commit 687be04678
to fix a related second leak (with "model").
2011-02-04 19:38:22 +01:00
ThorstenB
133cfbfa7f Fixed several compiler warnings
uninitialized or unused variables, init sequence, ...
2011-02-02 22:05:54 +01:00
Torsten Dreyer
0d5d7cf6f5 Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next 2011-02-02 18:14:20 +01:00
ThorstenB
07fe929288 Fixed helicopter view.
Corrected the new panning check: panning rotates around the y-axis,
so the x- or z-axis need an offset != 0 (not x-/y-axis).
2011-02-01 19:23:05 +01:00
Torsten Dreyer
1dfe80dd86 Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next 2011-02-01 12:46:04 +01:00
Frederic Bouvier
6bb8e69b92 Initialize class member in AIFlightPlan 2011-01-30 21:20:50 +01:00
Frederic Bouvier
a853af5b0e Reported by cppcheck: fix an incorrect usage of iterators 2011-01-30 21:17:20 +01:00
Frederic Bouvier
687be04678 Reported by cppcheck: fix a memory leak 2011-01-30 21:17:19 +01:00
Frederic Bouvier
95a5326c4e Merge branch 'next' of git://gitorious.org/fg/flightgear into next 2011-01-30 21:16:57 +01:00
Frederic Bouvier
257e3390c9 Detect joystick disconnection 2011-01-30 21:14:32 +01:00
ThorstenB
67978f92e5 Proposed fix for #251: Waypoint handling
Do not consider destination/runway waypoints as done, when these
are far away - even if the course is off by > 90 degrees.
2011-01-30 18:18:41 +01:00
ThorstenB
f68f300bb3 Proposed fix for #251: Waypoint handling
Do not consider destination/runway waypoints as done, when these
are far away - even if the course is off by > 90 degrees.
2011-01-30 18:05:53 +01:00
ThorstenB
91d001ff4e Fix viewer issue with Tower and Chase View.
When looking _at_ a model with an x,y offset of 0,
then the view heading has no effect. So, force heading offset property
to 0 to keep other property consumers from running incorrect calculations.
=> Trying to rotate the heading offset in Tower/Chase view no longer
rotates the blue sky around the aircraft, though the viewer itself
isn't rotating anything.
2011-01-30 17:35:07 +01:00
ThorstenB
32b69f823a Betrand Coconnier: fix bugs #47,#184: roll/pitch/speed via command-line
Specifying initial roll, pitch and speed should be working again.
2011-01-30 16:05:28 +01:00
Erik Hofman
287cc74965 Fix for bug #204 and #222 by Bertrand Coconnier; NaNs (bug #222) were basically generated because the method JSBSim::unbind() was not implemented in JSBSim.cxx. 2011-01-30 11:04:37 +01:00
James Turner
2ea7f87ae1 Andreas Gaeb: make input (joystick) re-init work. 2011-01-29 16:05:02 +00:00
Frederic Bouvier
86bb7f39f9 Ignore a generated file 2011-01-28 20:15:43 +01:00