1
0
Fork 0
Commit graph

5934 commits

Author SHA1 Message Date
BARANGER Emmanuel
ae71559092 Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-02-17 01:32:10 +01:00
Martin Spott
37d8bb2627 Latest fixes 2012-02-16 14:42:38 +01:00
Emilian Huminiuc
fa0e47f919 SHADERS: fix c/p fail in bumpspec.frag. Thanks Chris Forbes for reporting.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-02-16 12:37:02 +02:00
Vivian Meazza
56d05521c1 Merge branch 'Work' of D:\Git_New\fgdata 2012-02-15 21:38:06 +00:00
BARANGER Emmanuel
ac8daf42ee Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-02-15 20:00:14 +01:00
Gijs de Rooy
d8877f51d7 InterLink Elite controller by e-pilot 2012-02-15 11:28:54 +01:00
Vivian Meazza
8abd87060b Merge branch 'master' of D:\Git_New\fgdata 2012-02-14 18:29:39 +00:00
Emilian Huminiuc
55c54bb25b SHADERS: fix "unified" fog function. This should fix issue #650
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-02-14 18:52:38 +02:00
Emilian Huminiuc
4df2af2cef SHADERS:fix "unified" fog function.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-02-14 18:39:58 +02:00
BARANGER Emmanuel
c56989d0e6 Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-02-13 23:58:39 +01:00
BARANGER Emmanuel
45c56e51bc Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-02-13 00:44:05 +01:00
Torsten Dreyer
f62c9fe77d Documentation for property-interpolate 2012-02-12 19:57:44 +01:00
Emilian Huminiuc
eb6672f313 Add missing include_fog.[vert/frag] to the forest, glacier, and herbtundra effects.
adapt forest.[vert/frag] shader to the common fog.
Thanks Stuart for reporting it.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-02-12 17:57:00 +02:00
Vivian Meazza
56b46153c1 Merge branch 'master' of D:\Git_New\fgdata 2012-02-11 20:22:46 +00:00
Frederic Bouvier
6261badedb Finetune #623 2012-02-11 10:47:39 +01:00
Stuart Buchanan
e5bb4d520a Allow tree textures to fall back to Textures/Trees if not found under Textures.high/Trees, consistent with other textures in materials.xml. 2012-02-10 22:59:29 +00:00
Stuart Buchanan
8973169b1c Allow tree textures to fall back to Textures/Trees if not found under Textures.high/Trees, consistent with other textures in materials.xml. 2012-02-10 22:50:34 +00:00
Stuart Buchanan
171e3cf136 Improved tree textures:
- Made alpha all-or-nothing.
- Shifted colour-balance slightly from blue to yellow.
2012-02-10 22:14:28 +00:00
Anders Gidenstam
7026d9391b Input/Joysticks/Saitek/Aviator.xml: Added one more name. 2012-02-10 20:33:07 +01:00
BARANGER Emmanuel
9652d9a9db Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-02-10 19:21:40 +01:00
Stuart Buchanan
f65c50f14a README documentation for materials.xml. 2012-02-08 22:56:50 +00:00
Stuart Buchanan
de4cf84955 Retire tree-density and wood-size from materials.xml. They have now been superseded by object masks. 2012-02-07 20:56:20 +00:00
Vivian Meazza
6918a999cf Merge branch 'Work' of D:\Git_New\fgdata 2012-02-07 20:27:20 +00:00
ThorstenB
f8e4c2165d #643 rendering options dialog, "sky dome scattering" vs "shader quality"
"Shader quality" slider does not influence/enable/disable the "sky dome
scattering" effect, so the GUI checkboxes should also be independent.
2012-02-06 23:24:05 +01:00
Frederic Bouvier
bbfb599885 Merge branch 'master' of gitorious.org:fg/fgdata 2012-02-06 00:37:11 +01:00
Frederic Bouvier
4df297522c #623: don't modify depth buffer at grazing angles in the urban shader 2012-02-06 00:35:52 +01:00
Stuart Buchanan
207b6edf60 Random object and vegetation masks, and vegetation density control. 2012-02-05 23:08:08 +00:00
BARANGER Emmanuel
b5a3ebf8a3 Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-02-05 19:04:41 +01:00
Gijs de Rooy
b3a3f73a69 Qware joystick: limit field of view. 2012-01-29 21:44:25 +01:00
Gijs de Rooy
b5a5b958d2 Another name for the X52 pro. 2012-01-29 21:43:41 +01:00
Gijs de Rooy
bda95799ee New joystick: Qware USB joystick. 2012-01-29 15:38:35 +01:00
BARANGER Emmanuel
e0b4f8a756 Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-01-24 20:44:31 +01:00
Stuart Buchanan
4981aeb6f3 Remove redundant menu enable/disable for local_weather_tiles menu item. 2012-01-22 20:04:40 +00:00
Torsten Dreyer
d63d9c98e7 Local/Global Weather Menu cleanup
- use just a single "Weather" menu item
- add buttons to switch between global and local weather dialogs
- Rename Global Weather to Basic Weather
- Rename Local Weather to Advanced Weather
2012-01-22 18:29:11 +01:00
ThorstenB
1d3df86609 #493: fix incorrect egt gauge scaling
Thanks to "lens".
2012-01-22 16:30:07 +01:00
ThorstenB
06f910c0f6 #611: write-message-log nasal error
Also fix issues when disconnecting/reconnecting MP at run-time.
2012-01-22 12:42:57 +01:00
Vivian Meazza
ccbe7f52e8 Merge branch 'Work' of D:\Git_New\fgdata 2012-01-21 10:57:52 +00:00
Vivian Meazza
8819b01807 Merge branch 'master' of gitorious.org:fg/fgdata into Work 2012-01-21 10:28:56 +00:00
Torsten Dreyer
352bbd3cfa missing properties and a terminator
- define missing property-definitions for the skydome shader
- introduce a property rule for terminator-relative-position-m
  for local weather
2012-01-20 19:23:02 +01:00
Torsten Dreyer
22aeda4a04 cleanup water shader properties, interpolate sea-surface wind 2012-01-20 12:47:11 +01:00
BARANGER Emmanuel
fc09782f93 Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-01-20 00:51:12 +01:00
Gijs de Rooy
3200e957f8 Hide load and save options from help menu, as they are broken/disabled. 2012-01-19 22:02:09 +01:00
BARANGER Emmanuel
8ae83fb73e Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-01-19 03:01:28 +01:00
Torsten Dreyer
edbff6bd34 Refactor weather-utility.nas
A bug in weather-utility.nas caused constant computation
of wave parameters due to the fact that the wind speed
was ignored.

That code was ugly anyway, so it has been replaced by
property rules which don't create work for the nasal
garbage collector.

All required properties for the wave shader are now in
interpolator.xml, the snow-line computation lives in
metarinterpolator.xml
2012-01-19 00:05:48 +01:00
Stuart Buchanan
fa933eda6e Updated shaders and effects for 3D clouds using single Drawable per cloud rather than per sprite. 2012-01-17 22:19:53 +00:00
BARANGER Emmanuel
4126b3f592 Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-01-17 22:04:52 +01:00
BARANGER Emmanuel
2a42f5d65d Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-01-17 15:49:52 +01:00
Torsten Dreyer
2e48d8c50e bump version number to 2.7.0 2012-01-17 08:36:09 +01:00
Torsten Dreyer
bb103d5a4e bump version number to 2.6.0 2012-01-17 07:47:22 +01:00
Vivian Meazza
54328d0cf6 Merge branch 'master' of gitorious.org:fg/fgdata into Work 2012-01-16 23:59:42 +00:00