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
ThorstenB
f82caf49a3
Fix #109 : Seg faults caused by wxradar with ARC display mode (aerostar700)
...
Fixes an ugly issue with OSG overwriting memory/stack. wxradar triggered
the issue in display mode "ARC" - since it configured a display mask (12
vertices) but all vertices were immediately removed again ("_vertices->clear()").
Issue is fixed, mask now working - however the mask wasn't even properly
aligned for the display (probably never worked since OSG port). The display
mask is only really required for weather display - so disabling for now.
2011-05-22 11:02:15 +02:00
Curtis L. Olson
df796a4899
Merge branch 'next' of gitorious.org:fg/flightgear into next
2011-05-21 11:15:06 -05:00
Vivian Meazza
2268041799
Merge branch 'next' of D:\Git_New\flightgear into next
2011-05-21 17:10:47 +01:00
Vivian Meazza
455b7fe61e
Add the capability of switching slaved objects at runtime.
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-05-21 17:08:36 +01:00
ThorstenB
2a9f87e42c
Fixed blocked splash-screen on sim reset
...
Fixes Commit 9a3fb418e4
2011-05-21 17:12:37 +02:00
Curtis L. Olson
da1d180a99
Merge branch 'next' of gitorious.org:fg/flightgear into next
2011-05-21 10:05:47 -05:00
ThorstenB
849b1d1567
Require SG2.3.0 now for automake builds.
2011-05-21 16:32:21 +02:00
Curtis L. Olson
8b17f2b20a
Merge branch 'next' of gitorious.org:fg/flightgear into next
2011-05-21 09:06:20 -05:00
James Turner
69c483af8d
Bump 'next' version to 2.3.0 - should have been done when 2.2.0 was branches, ooops.
2011-05-21 14:06:58 +01:00
ThorstenB
9a3fb418e4
Fixed #321 : --enable-clock-freeze freezed the splash screen
...
Splash screen effect must use system time - not freezable sim time
2011-05-21 14:54:38 +02:00
James Turner
59fe23dcb3
Change occurrences of fabsf to fabs - part of tracking down an osg/Math issue on Mac with XCode4
2011-05-21 13:41:43 +01:00
ThorstenB
87647b40cb
Fix win-compile for new pause command.
2011-05-21 14:07:03 +02:00
ThorstenB
53a954d631
New "pause" fgcommand.
...
Original property-rules in keyboard.xml toggled master and clock freeze
independently - which caused issues when only one property was true. New
command toggles both properties consistently.
2011-05-21 13:27:09 +02:00
ThorstenB
473d1447c3
Minor renderer clean-up & performance bits.
...
Use non-static methods so we can use member variables.
2011-05-21 13:24:23 +02:00
ThorstenB
2088a61f2f
Revert "make clearcolor black, so that space is dark instead of gray."
...
This reverts commit b36b33f716
.
See #316 : Caused issues with sky becoming black in dense fog.
Also: when the fog issue is solved, we could configure the constant
(black) clear color once only (during init), no need to do it in every
loop. Also, entire "if (skyblend) { ... } else {..}" was redundant,
since "if" and "else" clauses were all identical - and the "clearColor"
variables were unused. => Once the fog issue is solved, we can easily
improve the clearColor configuration here.
2011-05-21 09:16:21 +02:00
ThorstenB
9f13c49d29
issue #316 : panning not working when center-on-aircraft enabled
...
Panning feature looked broken to some users since auto-center is enabled
by default which blocks panning. center-on-aircraft is now disabled
automatically when view is panned.
2011-05-20 19:48:05 +02:00
James Turner
56e3195b65
Change OS-X SDK/version for building RubyCocoa launcher with XCode 4. May revert if I can find a way to use the 10.5 SDK officially.
2011-05-20 00:07:36 +01:00
Curtis L. Olson
800ac5a188
Merge branch 'next' of gitorious.org:fg/flightgear into next
2011-05-16 09:05:52 -05:00
ThorstenB
9bd00a62fa
Continuous replay: use correct replay duration
...
(LinuxTag live hacking...)
2011-05-14 10:19:51 +02:00
ThorstenB
6c3cd27a57
Looped replay feature
...
New option for continuously repeated replay
(LinuxTag FlightGear demo mode :) )
2011-05-14 09:17:51 +02:00
Torsten Dreyer
13db36f679
Replace round by simgear::SGMiscd::roundToInt()
...
to make it compile again under MSVC (sigh)
2011-05-08 20:34:35 +02:00
Curtis L. Olson
e174561c67
Merge branch 'next' of gitorious.org:fg/flightgear into next
2011-05-08 09:22:17 -05:00
Torsten Dreyer
209a93c4ea
Expose JSBSim turbulence models
2011-05-08 15:50:33 +02:00
Durk Talsma
6ee1d7411b
Simple FlightPlan generation and execution for the user aircraft: This will allow ATC guided taxiing to the runway.
2011-05-07 10:03:27 +02:00