Alexis Bory
963b1394d2
Merge branch 'work'
2012-02-26 16:55:33 +01:00
Emilian Huminiuc
60bdf0f80f
add actual files
...
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-02-25 23:11:40 +02:00
Emilian Huminiuc
b8494f9a33
countryside.mask convert to .dds. Flip png version to keep correct orientation
...
ammend materials files
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-02-25 23:10:00 +02:00
Gijs de Rooy
84edd4b8f0
Fix mibs panel command.
2012-02-25 18:46:47 +01:00
ThorstenB
1d222c06a8
#683 Nasal error with mibs/video assistant
2012-02-25 15:43:20 +01:00
Emilian Huminiuc
65a01ba8cd
fix texture orientation
...
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-02-25 00:23:46 +02:00
Stuart Buchanan
9c901780ac
Split out common materials and settings from materials files, create file structure
...
to support more materials definitions in future. Also make a couple of fixes:
- Runway effect now works for both dds and non-dds
- PNG definitions for pa_shoulder and pc_shoulder
- Defined Industrial area (previously this was common with Urban)
2012-02-24 21:17:44 +00:00
BARANGER Emmanuel
99b1e58ea9
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-02-24 21:56:26 +01:00
Emilian Huminiuc
35193f0633
Make runway effect use png textures by default. Add runway png normalmap. Provide runway-dds.eff
...
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-02-23 23:56:28 +02:00
Torsten Dreyer
874a693e96
Simplify Phytagoras in the wave shader(s)
...
pow() is expensive and abs() is redundand.
pow(abs(x),2) equals x*x
2012-02-23 20:25:28 +01:00
Torsten Dreyer
6cc0f6c27c
Environment: use linear interpolation for wind
...
Interpolation over time for wind used to be an exponential (low-pass)
filter and is now a noise-spike (linear) filter, This should slow
down wharp9 waves.
2012-02-23 20:23:37 +01:00
BARANGER Emmanuel
93bc82a072
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-02-22 19:37:27 +01:00
BARANGER Emmanuel
719cac82c7
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-02-19 13:27:01 +01:00
ThorstenB
44a57bd311
Add gitignore file.
2012-02-18 14:26:17 +01:00
Gijs de Rooy
6c83dc3d8c
e-pilot: support for Windows and Linux, better button descriptions.
2012-02-18 10:02:51 +01:00
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
