1
0
Fork 0
Commit graph

9738 commits

Author SHA1 Message Date
Torsten Dreyer
f52cf4e3b8 Merge commit 'refs/merge-requests/11' of git://gitorious.org/fg/flightgear into vivian 2011-06-08 20:12:53 +02:00
Torsten Dreyer
b7656b5275 Change SimGear library order for fgadmin 2011-06-08 16:02:07 +02:00
Torsten Dreyer
c618097e83 Make fgadmin compile under linux
missing string.h for str(n)cmp
2011-06-08 16:01:23 +02:00
ThorstenB
db7112c20b Remove stray space
Thanks to Vivian - make MSVC9 happy again.
2011-06-06 19:53:21 +02:00
Vivian Meazza
8b6779aa96 Bugfix: set life timer to 0 on instantiation and when ballistic object dies.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-06-06 09:32:00 +01:00
Vivian Meazza
b475393b1f Merge branch 'next' of D:\Git_New\flightgear into next 2011-06-06 09:16:39 +01:00
Vivian Meazza
87082859d8 Merge branch 'next' of D:\Git_New\flightgear into next 2011-06-05 22:25:10 +01:00
Torsten Dreyer
2d0d434ffa cmake: check for SimGear 2.3.0 2011-06-05 21:38:44 +02:00
Torsten Dreyer
3d36577a20 Make cmake for fgpanel work under linux 2011-06-05 21:08:44 +02:00
Torsten Dreyer
7ebc68b3c7 Fix a data type mismatch 2011-06-05 17:10:04 +02:00
Torsten Dreyer
abc97adf2b Initial commit to add fgpanel to cmake build system
Most likely only works on OSX, other OSes will follow later
2011-06-05 17:04:41 +02:00
Mathias Froehlich
d21924770f Avoid crashing in hla initialization failure. 2011-06-05 13:45:40 +02:00
Erik Hofman
afca14c372 add a sanity check for the overcast property 2011-06-05 10:26:55 +02:00
Erik Hofman
8f3cdc9404 Add a /rendering/scene/overcast option to color the skydome gray in case of overcast 2011-06-05 10:20:16 +02:00
Durk Talsma
808c4c635d Merge branch 'next' into durk-atc 2011-06-05 10:06:35 +02:00
Torsten Dreyer
a2ddcb8050 Merge branch 'next' of git://gitorious.org/fg/flightgear into next 2011-06-04 21:30:46 +02:00
Torsten Dreyer
8d67103214 fgpanel: fix compile for OSX 2011-06-04 21:27:04 +02:00
ThorstenB
bc9ffe96c2 Minor error message formatting. 2011-06-04 17:55:37 +02:00
ThorstenB
a2c768c7cd Fix crash when display/screen number invalid
getScreenResolution shouldn't be called before the safety check.
Fixes commit ba7d8b8155
2011-06-04 17:55:12 +02:00
Torsten Dreyer
c9bb9f6044 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-06-04 15:58:54 +02:00
Torsten Dreyer
0774ca000a Anticipating v2.4.0 - bump fgdata version to 2.3.0 2011-06-04 15:53:38 +02:00
Erik Hofman
8b72e13d2f As torten explains: it is probably not a good idea to ti /environment/relative-humidity since the FGEnvironment ties to this property too 2011-06-04 15:39:45 +02:00
Erik Hofman
c346bcee77 Add the /rendering/scene/scattering property to allow the weather system to contoll the amount of light scattering (or absorption) of the fog 2011-06-04 13:11:56 +02:00
Torsten Dreyer
f28ddb0b5a Fix bug#333 2D clouds sometimes not visible with material shaders are disabled
Only draw 3d clouds if enabled and shader-effects are true.
Remove the property-tie for 3dclouds-enabled and use a change listener
instead which also listens for changes of the shader-effects property.
2011-06-03 22:05:43 +02:00
Durk Talsma
2f3faf4b8a Compilation error fixes following merge with next. 2011-06-03 10:02:18 +02:00
Durk Talsma
348ff2ec23 Merge branch 'next' into durk-atc
Merge with next.
Conflicts:
	src/Airports/dynamics.cxx
	src/Airports/dynamics.hxx
2011-06-03 09:31:04 +02:00
James Turner
d5f81f0eac Push some of the ATIS logic into AirportDynamics, in preparation for ATIS being owned by the airport 2011-06-02 23:28:40 +01:00
James Turner
b0985c6b02 Fix for bug 331, cmake was missing mkfifo() check. Thanks to Olaf Flebbe for the catch! 2011-06-02 23:01:17 +01:00
ThorstenB
370645e593 Olaf Flebbe: #332, Improve Nasal's "systime" method
Use gettimeofday for determine time, rather than time() and gettimeofday()
2011-06-02 23:53:42 +02:00
James Turner
5572c53a7e Minor tweaks to positioned find commands. 2011-06-02 00:33:47 +01:00
James Turner
fc7e9740c3 Improvements to exposing FGPositioned via commands - support frequency searches. 2011-06-01 23:55:04 +01:00
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