Durk Talsma
63708fb0df
Merge branch 'next' into durk-atc
2011-06-01 22:11:17 +02:00
ThorstenB
ba7d8b8155
Ensure window position is 0,0 for multi-display setups with fullscreen mode
...
Fix an issue introduced by commit 863551a932
for multi-display setups.
Some code clean-up.
2011-06-01 21:31:48 +02:00
ThorstenB
aeb4bc3672
Fix Linux build (automake)
...
CMake guys: please don't forget automake (yet)! ;-)
2011-06-01 21:01:50 +02:00
Durk Talsma
f9a5f921a4
Merge branch 'next' into durk-atc
...
Resolving merge conflicts indicated below.
Conflicts:
src/ATC/CMakeLists.txt
src/ATC/Makefile.am
src/Main/fg_init.cxx
2011-06-01 20:46:34 +02:00
Frederic Bouvier
bff1f29fe8
Fix Linux build
2011-06-01 20:28:31 +02:00
Frederic Bouvier
f1a3cedb2f
Fix win32 build
2011-06-01 20:25:53 +02:00
Curtis L. Olson
08ff6e2e2e
Merge branch 'next' of gitorious.org:fg/flightgear into next
2011-06-01 12:04:59 -05:00
James Turner
2b967608a0
Expose FGPositioned data via property tree, and make comm-stations a real FGPositioned subclass.
2011-06-01 17:45:22 +01:00
Curtis L. Olson
1d8dd81f90
Merge branch 'next' of gitorious.org:fg/flightgear into next
2011-06-01 11:19:19 -05:00
Torsten Dreyer
e4eeccb879
Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next
2011-06-01 07:34:13 +02:00
James Turner
2bdaebb7d9
Make basic route-manager commands be real SGCommands
2011-06-01 00:04:25 +01:00
Torsten Dreyer
e61d37a7a3
Remove some unused code
2011-05-31 20:58:22 +02:00
Torsten Dreyer
3a11f8ae28
remove inclusion of useless stdio.h
2011-05-31 20:39:32 +02:00
Durk Talsma
de1564d83e
Merge branch 'next' into durk-atc
2011-05-31 20:38:42 +02:00
Torsten Dreyer
088b3bc791
Merge branch 'next' of 10.101.2.62:~/FlightGear/fg-osg/FlightGear into next
2011-05-31 15:30:30 +02:00
Torsten Dreyer
61f2b98e8f
Compute gravitational acceleration
...
Compute gravitational acceleration based on the formula of
Somigliana corrected for altitude and provide the value
in property /environment/gravitational-acceleration-mps2
2011-05-31 15:28:32 +02:00
Torsten Dreyer
170df65081
Don't declare static functions in header file
2011-05-31 10:35:42 +02:00
Torsten Dreyer
2add898d90
Remove 'using namespace std' directive
2011-05-31 10:12:07 +02:00
Curtis L. Olson
6dc891de34
Merge branch 'next' of gitorious.org:fg/flightgear into next
2011-05-30 13:08:59 -05:00
ThorstenB
863551a932
fix #142 : initial window position
...
Be (at least a bit) smarter with initial x/y position
Also some minor type/comment issues.
2011-05-29 18:46:11 +02:00
ThorstenB
3c8a80d968
Deterministic loading sequence for Nasal scripts
...
Avoid loading Nasal scripts in (random) file system order
2011-05-29 18:44:15 +02:00
Frederic Bouvier
11bb6ef146
Fix linux build - auto_ptr<> needs <memory>
2011-05-29 09:34:56 +02:00
James Turner
9c983359aa
Move all MP code in src/MultiPlayer.
...
Allow the subsystem to be (re-)inited at runtime.
2011-05-29 00:04:30 +01:00
ThorstenB
0d0b5c616c
Bertrand Coconnier: bug fix for #184 , JSBSim: command line arguments
...
1. The atmospheric properties of FG are not yet initialized when
JSBSim is initialized.
-> patch is quite basic and there may exist smarter ways to initialize
properly the environment before the FDM.
2. The Euler angles were initialized after the velocities.
3. The glide slope and rate of climb were ignored. Fixes all FDMs (YASim,
UIUC, JSBSim, etc.)
4. Some properties were instructed to re-use their previous value while
they should not.
5. Some bugs existed in JSBSim trim code. -> This bug has already been
fixed in JSBSim but the corresponding patch has not yet been applied to FG.
2011-05-29 00:05:33 +02:00
Vivian Meazza
e3f34b6679
Merge branch 'next' of D:\Git_New\flightgear into next
2011-05-28 22:53:50 +01:00
ThorstenB
b4d90150c5
issue #127 : make screen shots work with OSG multi-threading
...
Make sure actual snap shot is executed in graphics context.
(patch requires simgear+fgdata update!)
2011-05-28 23:27:46 +02:00
James Turner
a32ef9f391
Fix yet another subtle resize problem I introduced, which upset PUI. This code is terribly fragile - yuck. Thanks to papillion 81 for tracking down the issue,
2011-05-28 21:20:06 +01:00
Frederic Bouvier
051fba87d3
"Straighten" VC90 fgpanel project and add it to the solution
2011-05-28 18:24:58 +02:00
ThorstenB
be1117f782
fixed #308 : "Reload input" did not respect joysticks.xml
...
Predefined joystick information must be maintained on "reload input".
2011-05-28 11:16:03 +02:00
Curtis L. Olson
cbec277ed4
Merge branch 'next' of gitorious.org:fg/flightgear into next
2011-05-27 15:14:42 -05:00
Torsten Dreyer
4357d69377
Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next
2011-05-27 21:16:06 +02:00
Torsten Dreyer
a336a96304
Provide a vc90 project file for fgpanel
2011-05-27 21:15:49 +02:00
Torsten Dreyer
60b6dcdae3
Merge branch 'fgpanel' of 10.101.2.62:~/FlightGear/fg-osg/FlightGear into next
2011-05-27 20:56:09 +02:00
Torsten Dreyer
5527fedc80
let fgpanel compile under vc90
2011-05-27 20:53:16 +02:00
Torsten Dreyer
b3ab82d883
Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next
2011-05-27 20:47:24 +02:00
Vivian Meazza
8c4c223db5
Merge branch 'next' of D:\Git_New\flightgear into next
2011-05-27 09:52:29 +01:00
James Turner
4bfa9cac85
Used the simgear strutils helper, fixing a corner-case ThorstenB spotted.
2011-05-26 20:18:27 +01:00
Torsten Dreyer
efb8099a39
Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next
2011-05-26 09:51:36 +02:00
James Turner
1b4e5e1b91
Unfortunately, the view code relies on resize being called each frame ... bah. Fixes startup aspect ratio for the moment.
2011-05-25 12:18:07 +01:00
James Turner
436abe1e62
Factor timeofday command into the TimeManager
2011-05-25 12:13:25 +01:00
James Turner
5bae2e3d37
Merge branch 'refs/heads/topics/loadfp' into next
2011-05-25 11:51:33 +01:00
James Turner
fe1bedad32
Make --flight-plan option delegate to the route-manager loadRoute code, and hence support XML flight-plans.
2011-05-25 08:21:45 +01:00
James Turner
c09c0e6941
First attempt at support for loading airport XML files via a command
2011-05-25 00:03:51 +01:00
James Turner
0ec9a9492f
Minor cleanup of resize() handler, while tracing down an OS-X Windowing issue.
2011-05-24 23:56:44 +01:00
Vivian Meazza
950769117b
Merge branch 'next' of D:\Git_New\flightgear into next
2011-05-24 22:40:23 +01:00
Vivian Meazza
a6cc487b74
Add the capability of switching slaved objects at runtime.
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-05-24 19:45:08 +02:00
ThorstenB
bdeeab8453
#323 : Bad init sequence could segfault
...
Oops, early window event callbacks could trigger issues on some systems.
Fixes an issue caused by my commit 473d1447c3
2011-05-22 22:56:51 +02:00
ThorstenB
dd9d82d941
Some minor splash screen status improvements.
2011-05-22 18:32:15 +02:00
ThorstenB
51bb633e55
Bugfix for #106 : main view port aspect-ratio broken when 2D panels are moved
...
Seems the hack was necessary for the pre-OSG display only. Or the feature
is broken since OSG port altogether. But it caused issues for 3D and 2D
cockpits when /sim/virtual-cockpit wasn't enabled. => Removing for now.
2011-05-22 18:32:15 +02:00
James Turner
b357dd7ac3
Remove remaining use of fabsf() from the code, avoid an OSG header issue on OS-X.
2011-05-22 16:30:18 +01:00