Vivian Meazza
816e1de738
Merge branch 'master' of \New Git\fgdata
2010-08-14 15:22:33 +01:00
Erik Hofman
1c16c8f246
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-14 14:41:51 +02:00
BARANGER Emmanuel
39203d00cb
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-14 14:32:19 +02:00
Erik Hofman
e61aeb5fa4
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-14 13:38:23 +02:00
Tim Moore
cc5502c509
Merge branch 'topic/shaderopt'
2010-08-14 00:13:53 +02:00
Tim Moore
d27174028e
shader optimizations
...
Use two-pass rendering for some shaders to reduce the cost of expensive shaders.
Implement some material animations using a shader uniform.
Eliminate use of gl_FrontFacing. It's too buggy on ATI/ Macintosh.
2010-08-14 00:13:16 +02:00
Tim Moore
43ab6827a3
eliminate constantColor from varying values
2010-08-14 00:13:15 +02:00
Frederic Bouvier
a2d80789b7
Merge commit 'refs/merge-requests/19' of git://gitorious.org/fg/fgdata into gral/joystick
2010-08-13 22:18:35 +02:00
Frederic Bouvier
9759006b05
Merge commit 'refs/merge-requests/17' of git://gitorious.org/fg/fgdata into gral/joystick
2010-08-13 22:18:08 +02:00
gral@who.net
7f01899e61
Fixed a typo in <mac> definition for CH Pro Yoke USB
2010-08-13 15:04:11 +02:00
gral@who.net
2815e36789
Added low-res textures for forest (high-res already changed)
2010-08-13 11:02:21 +02:00
gral@who.net
6f2edea51f
Making Joystick Extreme 3d Pro avaiable for OSX
2010-08-13 10:41:40 +02:00
Stuart Buchanan
1d64f047e5
Minor update to CH fighterstick to handle stepless flaps
2010-08-10 22:57:15 +01:00
BARANGER Emmanuel
b69d1fb74b
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-08 21:01:34 +02:00
Erik Hofman
4feb05c2e6
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-08 11:06:32 +02:00
BARANGER Emmanuel
8fd3e6805f
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-07 21:38:10 +02:00
Alexis Bory
0e408b8cd9
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-07 14:32:50 +02:00
Vivian Meazza
9e805bbd9a
Merge branch 'master' of \New Git\fgdata
2010-08-07 11:17:06 +01:00
Vivian Meazza
c1e565403b
Adjust contrail parameters, add missing file
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-07 11:13:26 +01:00
Vivian Meazza
f5503ff22f
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-06 22:04:35 +01:00
Vivian Meazza
6208b9f511
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-06 14:40:03 +01:00
Vivian Meazza
8aa66f9788
Make persistent contrail models generic
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-06 14:31:31 +01:00
Vivian Meazza
f7655062d7
Merge branch 'Work' of \New Git\fgdata into work
2010-08-05 22:46:53 +01:00
Vivian Meazza
016ef0da9c
Merge branch 'master' of git://gitorious.org/fg/fgdata into Work
2010-08-05 17:03:36 +01:00
Vivian Meazza
bf6b525c34
Add new submodel parameters
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-05 16:41:43 +01:00
Vivian Meazza
4ae6709663
Add new submodel parameters
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-05 16:13:03 +01:00
Vivian Meazza
4b17bb5cfd
Merge branch 'master' of \New Git\fgdata
2010-08-05 13:31:31 +01:00
Vivian Meazza
2742085d69
Contrail calculator. Based on an approximation to the "Appleman Chart"
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-05 09:07:51 +01:00
Vivian Meazza
1af4845036
Merge branch 'master' of \New Git\fgdata
...
Conflicts:
Aircraft/737-300/Models/737-300.xml
2010-08-05 08:54:30 +01:00
Vivian Meazza
be53f07e7a
Add script to calculate contrail temperature based on an approximation to the "Appleman Chart"
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-04 23:22:38 +01:00
BARANGER Emmanuel
a2dd320f75
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-04 19:35:16 +02:00
Vivian Meazza
c200834cb3
Merge branch 'master' of git://gitorious.org/fg/fgdata into Work
2010-08-04 11:11:16 +01:00
BARANGER Emmanuel
c2186fed62
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-04 12:04:00 +02:00
Erik Hofman
7da6e080bd
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-04 10:17:57 +02:00
Anders Gidenstam
9c4c33bf12
Disable OSG multi-threading mode selection in preferences.xml as enabling multi-threading mode currently breaks the screenshot function.
2010-08-03 19:45:19 +02:00
Frederic Bouvier
1e9a6c4cdf
Change edge_bias asked by Thorsten ( http://www.flightgear.org/forums/viewtopic.php?f=5&t=7358&p=89159#p89204 )
2010-08-03 19:20:20 +02:00
Vivian Meazza
f5a584fce5
Merge branch 'integration'
2010-08-03 10:03:51 +01:00
Vivian Meazza
bd334a1eff
Merge commit 'refs/merge-requests/10' of git://gitorious.org/fg/fgdata into integration
2010-08-03 09:26:59 +01:00
Erik Hofman
6686a72564
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-03 09:24:25 +02:00
Frederic Bouvier
4dd0ef9a08
Local weather v0.81 by Thorsten Renk
2010-08-03 08:18:14 +02:00
Vivian Meazza
c2450d1ccc
Merge branch 'master' into Work
2010-08-02 23:47:33 +01:00
Dave Perry
8f7c946f38
Merge branch 'master' of gitorious.org:fg/fgdata
2010-08-02 15:40:15 -06:00
Vivian Meazza
723378d8c6
Merge commit 'refs/merge-requests/10' of git://gitorious.org/fg/fgdata into integration
2010-08-02 21:22:56 +01:00
Stuart Buchanan
7950958645
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-02 19:12:07 +01:00
Erik Hofman
2851711b0c
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-02 10:38:04 +02:00
Vivian Meazza
bea32aeccd
Merge branch 'Work' of \New Git\fgdata into work
2010-08-01 22:59:00 +01:00
Vivian Meazza
b4f226c092
Add persistent contrail Shaders/contrail.frag Shaders/contrail.vert
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-01 22:54:35 +01:00
Vivian Meazza
8086d9bf8d
Merge branch 'master' of gitorious.org:fg/fgdata into Work
2010-08-01 22:45:43 +01:00
Vivian Meazza
81cc66e6f9
Merge branch 'master' into work
2010-08-01 22:41:59 +01:00
Anders Gidenstam
82d72bf976
Updated WalkView: Improved documentation.
2010-08-01 23:21:46 +02:00
