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
Hal V. Engel
80f5e4e094
p51d-jsbsim Clean up *.ac files
...
Make materials consistant.
Fix lighting animations in various places
Add animations for SCR-522C
2010-12-25 16:48:09 -08:00
Ryan Miller
b0e04def6e
Merge branch 'master' of git://mapserver.flightgear.org/fgdata
2010-12-25 10:06:09 -08:00
Torsten Dreyer
88b75e629b
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-25 17:43:42 +01:00
Csaba Halasz
9d7adf32d1
Merge commit 'refs/merge-requests/65' of git://gitorious.org/fg/fgdata (MiG-15bis update)
2010-12-25 17:00:21 +01:00
Torsten Dreyer
97865312d2
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-25 16:41:01 +01:00
Victor Slavutinsky
33b364fd2e
1) Pilot visible trough multiplayer
2010-12-25 18:40:10 +03:00
Victor Slavutinsky
1d41380470
1) Cool engine effect
2010-12-25 04:46:24 +03:00
Vivian Meazza
464f14c1d2
Merge branch 'master' of \New Git\fgdata
2010-12-24 23:57:41 +00:00
Hal V. Engel
459654cca8
p51d-jsbsim Cockpit detail
...
Add manual bomb salvo controls
Add frames to left cockpit
Enhance SCR-522C control unit
Add missing texture for gun circuit protectors cover
2010-12-24 14:42:07 -08:00
Stuart Buchanan
f4bab21d95
Remove duplicate menu from last commit.
2010-12-24 22:38:14 +00:00
Stuart Buchanan
c573322f35
Minor menu changes. Renaming AI menu items to remove the "AI" prefix, and replace "Options" with "Controls" where appropriate. e.g.
...
AI Tanker Options -> Tanker Controls
2010-12-24 22:29:08 +00:00
Stuart Buchanan
9ad6bdae28
Fuel selector texture.
2010-12-24 19:18:27 +00:00
Stuart Buchanan
95dbe61a72
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-24 18:46:40 +00:00
Stuart Buchanan
2c178fe750
Fuel selector for c172p.
2010-12-24 18:42:29 +00:00
BARANGER Emmanuel
bf3a66a64c
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-24 17:32:47 +01:00
Hal V. Engel
95b30a6b7d
p51d-jsbsim Add VHF control unit.
2010-12-23 13:52:54 -08:00
Csaba Halasz
b11997c4bf
Merge commit 'refs/merge-requests/63' of git://gitorious.org/fg/fgdata (MiG-15bis update)
2010-12-23 14:44:53 +01:00
