Alexis Bory
d17afa5bd4
Merge branch 'f-14b-xiii'
2010-12-20 22:41:24 +01:00
Alexis Bory
b13dbee9b1
Merge branch 'master' of git://mapserver.flightgear.org/fgdata
2010-12-20 22:38:09 +01:00
Tim Moore
564c69e10a
Issue 209: fix up inheritance of color mode uniform in material animation effect
...
The overriding of the color mode uniform in the default model effect
wasn't working. It's difficult to override the individual properties
of techniques, especially if their names aren't unique. So, I changed
the model-default effect to use a parameter for the color-mode
uniform; material-off.eff and material-diffuse.eff override that.
2010-12-20 09:39:06 +01:00
Vivian Meazza
48e2672647
Merge branch 'Work' of \New Git\fgdata
2010-12-19 23:54:39 +00:00
Frederic Bouvier
684c1b3041
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-19 23:35:35 +01:00
Anders Gidenstam
09dc9afe47
Updated DualControl: Moved everything to Aircraft/Generic/DualControl/.
...
- Updated all references to Aircraft/ZLT-NT/DualControl/ found.
2010-12-19 23:17:23 +01:00
Stuart Buchanan
edc9b64e6c
Remove out of date animation.
2010-12-19 21:10:32 +00:00
Frederic Bouvier
2180f50282
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-19 18:54:09 +01:00
Gijs de Rooy
f278ec0389
Joystick file for Genius F-31U VIBRATION USB
2010-12-19 18:41:14 +01:00
Frederic Bouvier
7df330e579
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-19 18:31:44 +01:00
Frederic Bouvier
b5d3a7e403
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-18 23:58:30 +01:00
BARANGER Emmanuel
e723acdf23
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-18 19:40:13 +01:00
Alexis Bory
66a31a56a5
Merge branch 'master' of git://mapserver.flightgear.org/fgdata
2010-12-18 17:19:58 +01:00
Alexis Bory
9d45fab8cc
Merge branch 'master' of git://mapserver.flightgear.org/fgdata
2010-12-18 17:10:37 +01:00
Frederic Bouvier
89741a9d8e
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-18 16:37:20 +01:00
Vivian Meazza
59ec1d24eb
Merge branch 'master' of \New Git\fgdata
2010-12-18 09:24:47 +00:00
Vivian Meazza
02f60e0794
Add open-circuit oxygen system.
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-12-18 09:16:04 +00:00
Hal V. Engel
3ac9bb015d
p51d-jsbsim More cockpit improvements
...
Added oxygen tube from A14A to near pilot seat
Added some screw heads in various places
Cleaned up some bad object names
2010-12-17 21:23:14 -08:00
Frederic Bouvier
5ca5f557ad
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-17 20:02:25 +01:00
Ryan Miller
abab00ba21
Merge branch 'master' of git://mapserver.flightgear.org/fgdata
2010-12-17 10:30:49 -08:00
Gijs de Rooy
05c912eccb
A380 update #1
2010-12-17 15:55:14 +01:00
BARANGER Emmanuel
7865a3a569
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-17 09:05:13 +01:00
Vivian Meazza
a36fab5726
Merge branch 'integration'
2010-12-16 23:56:58 +00:00
Vivian Meazza
3fd6ba3582
Merge commit 'refs/merge-requests/44' of git://gitorious.org/fg/fgdata into integration
2010-12-16 23:42:03 +00:00
Stuart Buchanan
9fd82c3068
Switch off repeatable flap changes - not applicable to most aircraft.
2010-12-16 22:05:57 +00:00
Stuart Buchanan
99cf4568af
Updated best glide speed from C172p PoH.
2010-12-16 22:03:22 +00:00
Stuart Buchanan
969dd00dca
Updated and higher resolution c172p ASI.
2010-12-16 21:55:10 +00:00
BARANGER Emmanuel
8ffbdd7fb5
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-16 18:24:51 +01:00
Hal V. Engel
5158b20a52
p51d-jsbsim cockpit enhancements
...
Added AN/APS-13 rear warning radar control unit.
Add induction air controls.
Added framing to right cockpit wall.
Improved the modeling of both cockpit walls.
Improved cockpit light animation.
2010-12-16 09:03:10 -08:00
Torsten Dreyer
b1e52b38e8
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-16 08:42:38 +01:00
Vivian Meazza
722cd18fb8
Merge branch 'master' of gitorious.org:fg/fgdata into Work
2010-12-15 22:22:29 +00:00
Vivian Meazza
1b1a86de51
Merge branch 'master' of \New Git\fgdata
2010-12-15 22:02:59 +00:00
Torsten Dreyer
be31842654
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-15 22:37:02 +01:00
Gijs de Rooy
d3b091b88e
A380 update from Scott
2010-12-15 22:32:46 +01:00
Ryan Miller
55c1f04b31
Merge branch 'master' of git://mapserver.flightgear.org/fgdata
2010-12-15 12:21:23 -08:00
Torsten Dreyer
01f143abc5
Enable fog/mist/haze by default, add a fog scenario
2010-12-15 18:32:42 +01:00
Gijs de Rooy
724afa3ffb
Merge commit 'refs/merge-requests/42' of git://gitorious.org/fg/fgdata into integration
2010-12-15 17:58:52 +01:00
Torsten Dreyer
0bc5cafdfb
metar fog/mist/haze: some final(?) tweaks
2010-12-15 17:01:05 +01:00
BARANGER Emmanuel
bec6a38948
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-15 15:00:31 +01:00
Gijs de Rooy
cec50787b6
Gray-out dependant options, uniform close button
2010-12-15 13:43:09 +01:00
Gijs de Rooy
1aa40ccb21
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-15 13:37:54 +01:00
Gijs de Rooy
26ceeac7f1
Gray-out shader-options when shaders are disabled
2010-12-15 13:35:54 +01:00
Frederic Bouvier
b7e141559e
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-15 08:49:43 +01:00
Hal V. Engel
eb59ab0ffd
p51d-jsbsim 3D cockpit improvements.
...
Add A-14A Ox regulator
Resize and reposition electrical switch panel
Add circuit breaker push to reset panel to electrical panel
Make adjustments to right cockpit wall
2010-12-14 16:20:41 -08:00
Vivian Meazza
f50d8bc3ad
Merge branch 'master' of \New Git\fgdata
2010-12-14 23:57:56 +00:00
Ryan Miller
8a854b963f
Merge branch 'master' of git://mapserver.flightgear.org/fgdata
2010-12-14 15:41:44 -08:00
Jon Stockill
6e8081d7fe
Remove large groups of buildings from random models
2010-12-14 23:15:51 +00:00
Frederic Bouvier
bc339a19e9
Merge branch 'master' of gitorious.org:fg/fgdata
2010-12-15 00:12:18 +01:00
Alexis Bory
afadec9e0e
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-14 21:37:29 +01:00
Alexis Bory
c88e84fdfd
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-12-14 21:33:27 +01:00