Vivian Meazza
ffbd4d5481
Merge branch 'master' of D:\Git_New\fgdata
2012-09-11 00:12:33 +01:00
Vivian Meazza
29e5d4dd26
Merge branch 'master' of gitorious.org:fg/fgdata into work
2012-09-11 00:11:50 +01:00
Vivian Meazza
3020d6a54c
Merge branch 'work' of D:\Git_New\fgdata
2012-09-11 00:08:56 +01:00
BARANGER Emmanuel
f9fcaedf45
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-09-10 22:25:19 +02:00
Vivian Meazza
475cd381e4
Merge branch 'master' of D:\Git_New\fgdata
2012-09-10 00:10:53 +01:00
Emilian Huminiuc
2c058f9c1f
New effect: Effects/model-combined-transparent
...
Switch c172p and concorde glass effects to the new effect.
Docs/model-combined.eff/: Updated transparent effect template.
From now on Effects/model-combined should not be inherited from directly.
Use either Effects/model-combined-deferred
or Effects/model-combined-transparent
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-09-09 22:28:45 +03:00
Vivian Meazza
127106bce6
Merge branch 'master' of D:\Git_New\fgdata
2012-09-09 15:25:16 +01:00
Emilian Huminiuc
cebf6f4d9c
buildings.eff: adapt technique numbering to previous effect changes
...
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-09-09 15:01:26 +03:00
Emilian Huminiuc
023c6bc97a
c172p: adapt local effects to the change in model-combined and model-combined-deferred
...
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-09-09 14:39:26 +03:00
Emilian Huminiuc
835ba95ddb
adapt effect template to previous changes
...
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-09-09 14:22:51 +03:00
Emilian Huminiuc
efe52f4bf9
ubershader: fix reflection under Rembrandt
...
model-combined & model-combined-deferred effects: improve Rembrandt behaviour, and provide better effects for transparent
surfaces under Rembrandt.
This change breaks current effects using normalmaps when inheriting from model-combined-deferred under
Rembrandt.
Aircraft developers please change the technique numbers in the "normalmap include" part of your effects file from
<technique n="8"> to <technique n="7"> (again, only if inheriting from model-combined-deferred, and using normalmaps)
Effects inheriting from model-combined do not neeed any adaptation.
Sorry for the nuisance caused by this change.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-09-09 13:54:07 +03:00
Vivian Meazza
6ee201be15
Merge branch 'master' of D:\Git_New\fgdata
2012-09-08 23:41:26 +01:00
BARANGER Emmanuel
a46ee5ae37
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-09-07 05:22:17 +02:00
Vivian Meazza
4af60bba09
Merge branch 'master' of gitorious.org:fg/fgdata into work
2012-09-06 21:33:56 +01:00
Vivian Meazza
2197dd07fc
Merge branch 'master' of D:\Git_New\fgdata
2012-09-06 21:11:42 +01:00
Vivian Meazza
805251eea3
Merge branch 'work' of D:\Git_New\fgdata
2012-09-06 21:00:08 +01:00
Alexis
0d7c7a2e8a
Merge branch 'work'
2012-09-06 17:23:46 +02:00
Thomas Geymayer
a23464f809
Update docs for rate parameter of property-interpolate
2012-09-06 14:14:08 +02:00
Alexis
9137a4c402
Merge branch 'work'
2012-09-06 13:39:52 +02:00
Martin Spott
6b8f449747
Make a distinction between tidal areas and 'regular' terrain,
...
still in need of improvement, but less ugly than before.
2012-09-06 13:01:57 +02:00
BARANGER Emmanuel
51e23a6c1a
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-09-06 03:43:25 +02:00
Thomas Geymayer
d5cdf29342
Fix c172p-canvas crashing fgrun and update description
2012-09-05 23:18:24 +02:00
BARANGER Emmanuel
6d69d18e1f
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-09-05 16:15:33 +02:00
Thomas Geymayer
220702e8b1
Canvas: Add a canvas demonstration using the c172p
...
- Add new type of c172p (c172p-canvas) demonstrating the usage of
the Canvas system.
2012-09-04 23:23:40 +02:00
Thomas Geymayer
a4af6530e1
Canvas: Fix cubic/scubic typo.
2012-09-04 22:54:53 +02:00
syd
9955e9a1b2
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-09-03 16:39:42 -06:00
Vivian Meazza
61fac9c400
Merge branch 'master' of gitorious.org:fg/fgdata into work
2012-09-03 22:32:43 +01:00
Stuart Buchanan
d836ea78f1
Menu bar changes to expose Joystick Configuration dialog, and minor
...
typo in button config fix.
2012-09-03 22:22:09 +01:00
Frederic Bouvier
54c043bdc3
Fix urban shader and issue #836
2012-09-03 11:19:22 +02:00
Vivian Meazza
ac23bb18e6
Merge branch 'master' of gitorious.org:fg/fgdata
2012-09-02 10:16:03 +01:00
BARANGER Emmanuel
1f44549cd2
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-09-02 04:32:21 +02:00
Vivian Meazza
00560086ad
Merge branch 'master' of gitorious.org:fg/fgdata
2012-09-02 00:21:18 +01:00
Thomas Geymayer
16890bb5b8
Canvas: Experimental backward support for FlightGear 2.8
2012-09-01 22:37:25 +02:00
Vivian Meazza
f7dcf8a80a
Merge branch 'master' of gitorious.org:fg/fgdata
2012-09-01 09:20:49 +01:00
Vivian Meazza
e37df70959
Merge branch 'master' of gitorious.org:fg/fgdata
2012-08-30 08:50:18 +01:00
BARANGER Emmanuel
c02f27f7dd
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-08-29 13:23:47 +02:00
Vivian Meazza
5ddd5b7b72
Merge branch 'master' of gitorious.org:fg/fgdata
2012-08-29 11:12:35 +01:00
Vivian Meazza
55ab8e2db6
Merge branch 'master' of D:\Git_New\fgdata
2012-08-29 11:10:30 +01:00
Vivian Meazza
b34144491d
Merge branch 'work' of D:\Git_New\fgdata
2012-08-28 23:15:35 +01:00
Vivian Meazza
1cd7c39db8
Merge branch 'master' of D:\Git_New\fgdata
2012-08-28 22:50:49 +01:00
Vivian Meazza
79cab246a0
Merge branch 'master' of gitorious.org:fg/fgdata into work
2012-08-28 22:50:23 +01:00
Vivian Meazza
4282b87efe
Merge branch 'work' of D:\Git_New\fgdata
2012-08-28 22:48:17 +01:00
Vivian Meazza
c8a749a73e
Merge branch 'master' of D:\Git_New\fgdata
2012-08-28 22:48:04 +01:00
Vivian Meazza
4b414f9c49
Merge branch 'master' of gitorious.org:fg/fgdata into work
2012-08-28 22:46:42 +01:00
BARANGER Emmanuel
40edbadb13
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-08-28 23:18:42 +02:00
Vivian Meazza
7dec0768ab
Merge branch 'master' of D:\Git_New\fgdata
2012-08-28 18:13:05 +01:00
Vivian Meazza
1d9aad0fee
Merge branch 'work' of D:\Git_New\fgdata
2012-08-28 09:29:24 +01:00
Vivian Meazza
c665f91262
Merge branch 'master' of D:\Git_New\fgdata
2012-08-28 08:55:19 +01:00
Vivian Meazza
2770af3733
Merge branch 'master' of gitorious.org:fg/fgdata into work
2012-08-28 08:54:43 +01:00
Vivian Meazza
4121cd704a
Merge branch 'master' of D:\Git_New\fgdata
2012-08-28 08:51:32 +01:00
