Frederic Bouvier
69c3a7e2f6
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-30 15:48:21 +01:00
Anders Gidenstam
1181987bca
Nasal/IOrules: Allow the wildfire simulation to save its state.
2010-12-30 15:00:50 +01:00
Vivian Meazza
3f5a262ea1
Merge branch 'Work' of \New Git\fgdata
2010-12-30 10:34:32 +00:00
BARANGER Emmanuel
05a1597cf4
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-30 10:57:35 +01:00
Durk Talsma
657945bc86
A few xml fixes, and other assorted cleanups, as reported by fg-check.
2010-12-30 09:27:58 +01:00
Durk Talsma
fc3ae7f41b
Merge commit 'refs/merge-requests/69' of git://gitorious.org/fg/fgdata into integration
2010-12-30 08:42:49 +01:00
Dave Luff
91d3a893d9
Remove some depreciated ATC cruft
2010-12-29 21:32:17 +00:00
Dave Luff
de253c6924
Re-enable ATC frequency search dialog
...
The dialog was removed due to being not working, but is now fixed
and can hence be re-enabled again.
2010-12-29 21:32:17 +00:00
Stuart Buchanan
24cfaf6e44
Update map dialog:-
...
- Close button
- Remove inactive buttons (Obstacles, Airways)
- Minor layout improvements
2010-12-29 20:18:48 +00:00
Hal V. Engel
afc751f3ac
p51d-jsbsim recommit A-14A.xml
2010-12-29 12:14:27 -08:00
Hal V. Engel
64459464e5
Merge branch 'master' of gitorious.org:~hvengel/fg/hvengels-fgdata-p51d-jsbsim
2010-12-29 11:41:53 -08:00
Hal V. Engel
5168cde2d7
p51d-jsbsim Improve A-14A model and animation of recognition light key.
2010-12-29 11:24:25 -08:00
Stuart Buchanan
bcfbf16205
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-29 18:00:58 +00:00
Stuart Buchanan
936f6b6eba
V2.2.0 of the FG Manual (getstart.pdf) and the FG Short Reference.
2010-12-29 18:00:13 +00:00
Vivian Meazza
9f8563f1ee
Merge branch 'Work' of \New Git\fgdata
2010-12-29 17:23:32 +00:00
BARANGER Emmanuel
ee22530698
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-29 10:55:20 +01:00
Hal V. Engel
0c67688205
p51d-jsbsim Animations and hot spots.
...
Add all hot spots to right side electrical panel. Some systems not implemented yet.
Position lights working.
Signal lights working.
Add more range animations.
Added light animations to pilot.
Restructured pilot xml files.
Added xml files for SCR-522C, A14A and AN/APS-13
2010-12-28 19:50:47 -08:00
Ryan Miller
2d00d51107
Merge commit '9fd7e88'
2010-12-28 18:55:43 -08:00
BARANGER Emmanuel
b659c2cb45
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-29 01:22:37 +01:00
Stuart Buchanan
1b32e87a8f
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-28 19:56:39 +00:00
Stuart Buchanan
16b7ffba05
Consistent Close and title bars for Fuel & Payload, Wildfire and Route Manager dialogs.
2010-12-28 19:51:34 +00:00
BARANGER Emmanuel
9e354344af
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-28 15:29:36 +01:00
Vivian Meazza
6081655338
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-28 12:38:14 +00:00
Vivian Meazza
2822e2fb97
Merge branch 'integration'
2010-12-28 12:35:00 +00:00
Vivian Meazza
d431fa7f29
Merge commit 'refs/merge-requests/68' of git://gitorious.org/fg/fgdata into integration
2010-12-28 12:31:22 +00:00
Ryan Miller
f3dc094a25
Merge commit 'bcaebff'
2010-12-27 17:54:21 -08:00
Dave Luff
641a6d061e
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-27 21:19:16 +00:00
Dave Luff
982a6b7861
Remove a dialog that only pertained to the depreciated AI system.
...
This dialog only set the traffic level for the now removed random-traffic AI
system. Pointed out by Gijs - thanks!
2010-12-27 21:17:39 +00:00
Dave Luff
946e7f933b
Remove some left over cruft from the depreciated ATC/AI system
2010-12-27 21:06:29 +00:00
Gijs de Rooy
2b58f46608
Add wireframe to rendering dialog
2010-12-27 21:44:43 +01:00
Ryan Miller
d4df88d3b9
Fixed missing Cub model in KRHV towing demo, deleted mysterious 757 folder in head
2010-12-27 12:41:00 -08:00
Stuart Buchanan
3d7d00ead9
Minor changes various dialogs to make generally consistent:
...
- Title bar with cancel button in top left hand side.
- horizontal line dividing main dialog from bottom buttons
- Minor layout and Nasal fixes.
2010-12-27 20:19:31 +00:00
BARANGER Emmanuel
371b58a6b7
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-27 19:35:18 +01:00
BARANGER Emmanuel
55bcf8cae6
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-27 12:48:15 +01:00
Vivian Meazza
312aea4be8
Merge branch 'integration'
2010-12-27 09:36:01 +00:00
Vivian Meazza
c136affb6e
Merge commit 'refs/merge-requests/67' of git://gitorious.org/fg/fgdata into integration
2010-12-27 09:31:28 +00:00
Vivian Meazza
15239c2d36
Merge commit 'refs/merge-requests/67' of git://gitorious.org/fg/fgdata
2010-12-27 09:27:11 +00:00
Vivian Meazza
c31d770292
Merge branch 'master' of git://gitorious.org/fg/fgdata into Work
2010-12-27 00:27:42 +00:00
Stuart Buchanan
eac038d4ad
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-26 19:22:11 +00:00
Stuart Buchanan
5fa918de60
Re-instate Common Aircraft Keys, incorrectly removed by commit 33c1445.
2010-12-26 19:20:41 +00:00
Ryan Miller
b4b23aea6d
Latest B757-200 from unstable aircraft branch
2010-12-26 10:51:44 -08:00
Ryan Miller
e43a06d110
Merge branch 'master' of git://mapserver.flightgear.org/fgdata
2010-12-26 10:50:45 -08:00
Gijs de Rooy
72f0ea1fea
Issue 181: add object-name to all rendering options. Rename snow level to snow line. Snow dependant on crop, landmass or urban shaders.
2010-12-26 19:26:05 +01:00
Hal V. Engel
932652205a
p51d-jsbsim Update SCR-52C.xml
2010-12-26 09:40:19 -08:00
Tim Moore
2504a4d9fb
Merge remote branch 'gitorious/master'
2010-12-26 18:24:51 +01:00
Tim Moore
ddcd76c677
Issue 181: add object-name to binding of snow level slider
...
The dialog-apply binding was setting all the properties in the
rendering dialog, including ones that are tested in technique
predicates. This was causing effects to be reinitialized.
2010-12-26 18:21:26 +01:00
Stuart Buchanan
6e42756aec
Make capitalization consistent.
2010-12-26 12:33:16 +00:00
Vivian Meazza
8f44cd18a0
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-26 10:56:20 +00:00
Vivian Meazza
6ba3ba1f0b
Merge branch 'integration'
2010-12-26 10:37:52 +00:00
Vivian Meazza
0471eedf87
Merge commit 'refs/merge-requests/66' of git://gitorious.org/fg/fgdata into integration
2010-12-26 10:23:52 +00:00