Torsten Dreyer
90633fd213
fix wrong path for farmhouse[123].ac in materials.xml
2010-10-11 20:04:18 +02:00
BARANGER Emmanuel
919ae04429
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-11 19:18:31 +02:00
James Turner
87688ddf6a
Thorsten Brehm: fix position-in-air dialog when a parking position was previously specified.
2010-10-11 10:52:21 +01:00
BARANGER Emmanuel
ee549e6524
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-10 21:37:11 +02:00
ThorstenB
80eb4f44ca
Fixed "Position aircraft in air" in dialog.
...
Setting a parking position (e.g. by default via command-line) caused
"Position aircraft in air" to not work as expected. The "parkpos" property
must be reset, otherwise heading/glidepath/azimuth do not have any effect
when repositioning.
2010-10-10 14:05:42 +02:00
Alexis Bory
1de85e1458
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-10 13:21:14 +02:00
BARANGER Emmanuel
a0deec5728
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-10 13:18:10 +02:00
Vivian Meazza
4789b0ddcd
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-10 11:09:54 +01:00
Alexis Bory
1de747b211
Merge branch 'master' of git://gitorious.org/fg/fgdata
...
Conflicts:
AI/Aircraft/A-10/Models/A-10.xml
preferences.xml
2010-10-10 00:38:53 +02:00
Alexis Bory
41d8443428
- local
2010-10-10 00:14:08 +02:00
Alexis Bory
baa716b932
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-09 21:51:41 +02:00
Anders Gidenstam
66746acbab
Updated mp_broadcast.nas: Added missing var keywords.
2010-10-09 21:17:10 +02:00
BARANGER Emmanuel
57b436d199
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-08 01:42:31 +02:00
Torsten Dreyer
dd9839781f
Merge branch 'master' of gitorious.org:fg/fgdata
2010-10-07 18:01:05 +02:00
Torsten Dreyer
50287bdee7
Remove clouds dialog from multikey
...
The dialog is gone, use Global-Weather instead.
2010-10-07 18:00:32 +02:00
Torsten Dreyer
0fcc99d9a3
startup.nas: just check for a valid METAR
...
and don't care if it's from realwx or static input. There is still
a timing issue, probably we should wait for a valid METAR
if realwx is enabled.
2010-10-07 17:59:38 +02:00
Torsten Dreyer
287f0f2dcf
Realwx: speed up startup interpolation
...
-correct the order of the realwx and interpolation property rules
-speed up the interpolation of sea-level-pressure
2010-10-07 17:57:59 +02:00
Torsten Dreyer
083c9e9de6
weather-dialog: show, if METAR is valid
...
add a checkbox tied to the metar-valid property
2010-10-07 17:56:24 +02:00
BARANGER Emmanuel
8b69109324
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-05 23:45:17 +02:00
Stuart Buchanan
d57d97e5eb
Correct VSI display animation.
2010-10-05 21:51:42 +01:00
BARANGER Emmanuel
3481f55876
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-05 19:22:27 +02:00
Torsten Dreyer
bc54f3c40a
Merge branch 'master' of gitorious.org:fg/fgdata
2010-10-05 16:39:46 +02:00
Torsten Dreyer
d6f3b7a375
Fix the display dialog
...
- Make the 2d-panel option visible
- Add the menubar-autohide function
2010-10-05 16:35:39 +02:00
BARANGER Emmanuel
2dd5679527
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-05 00:52:43 +02:00
BARANGER Emmanuel
944c65fb22
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-04 16:01:35 +02:00
Anders Gidenstam
af740cd918
Updated WalkView: Added missing var keywords.
2010-10-03 19:25:46 +02:00
Anders Gidenstam
ee5eceb3da
Updated mp_broadcast.nas: Added missing var keyword.
2010-10-03 19:25:36 +02:00
BARANGER Emmanuel
6671adde94
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-03 19:19:01 +02:00
Vivian Meazza
b0aa86ab64
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-03 09:35:04 +01:00
Frederic Bouvier
21ae0c8c69
To spare few GPU cycle
2010-10-03 09:15:33 +02:00
Frederic Bouvier
6e559ab4eb
Restore old shader for quality level below 2
2010-10-03 08:57:33 +02:00
Frederic Bouvier
e4da5245e8
Merge commit 'refs/merge-requests/28' of git://gitorious.org/fg/fgdata into gral/water2
2010-10-03 08:48:20 +02:00
BARANGER Emmanuel
03069e4b96
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-03 02:52:59 +02:00
Vivian Meazza
b141b0bfa5
Merge branch 'master' of git://gitorious.org/fg/fgdata into integration
2010-10-02 23:51:18 +01:00
Frederic Bouvier
56e77e393d
Merge branch 'master' of gitorious.org:fg/fgdata
2010-10-02 10:49:53 +02:00
Csaba Halasz
088640b5a2
Merge commit 'refs/merge-requests/30' of git://gitorious.org/fg/fgdata
2010-10-02 02:54:24 +02:00
Vivian Meazza
281f0f1e04
Merge branch 'master' of git://gitorious.org/fg/fgdata into integration
2010-10-01 17:07:40 +01:00
Vivian Meazza
e4ada99911
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-01 17:01:08 +01:00
Vivian Meazza
f411434f8c
Merge branch 'Work' of \New Git\fgdata
2010-10-01 16:38:18 +01:00
Vivian Meazza
8a25cadc8a
Add AIFormation.
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-10-01 16:36:32 +01:00
Vivian Meazza
c4576fc818
Merge branch 'master' of git://gitorious.org/fg/fgdata into Work
2010-10-01 15:26:17 +01:00
Erik Hofman
e42dcefbae
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-01 13:24:24 +02:00
BARANGER Emmanuel
50e9e7dcac
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-30 08:23:36 +02:00
gral@who.net
43a69d8371
Small clean up
2010-09-30 01:46:52 +02:00
gral@who.net
d10a9b8eff
Adding files
2010-09-30 01:29:41 +02:00
gral@who.net
3cdf9da27a
Next version of water shader, some clean up
2010-09-30 01:29:16 +02:00
Csaba Halasz
125ff9dd38
Merge commit 'refs/merge-requests/50' of git://gitorious.org/fg/fgdata
2010-09-29 22:59:35 +02:00
Erik Hofman
6822980bef
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-29 15:58:29 +02:00
BARANGER Emmanuel
3adcf06add
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-29 02:57:27 +02:00
Csaba Halasz
55ad44b67e
Merge commit 'refs/merge-requests/48' of git://gitorious.org/fg/fgdata
2010-09-29 01:31:03 +02:00