syd
465ff76b27
Merge commit 'refs/merge-requests/147' of git://gitorious.org/fg/fgdata into merge-requests/147
2012-05-08 13:04:40 -06:00
Flightgear Development
4a735b4b47
Regional textures 1.0
2012-05-07 20:04:16 +01:00
Vivian Meazza
bf2c6cb859
Merge branch 'master' of gitorious.org:fg/fgdata into work
2012-05-07 19:13:01 +01:00
Vivian Meazza
f0d21c1f60
Optimisation and tidying
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-07 19:11:34 +01:00
BARANGER Emmanuel
7b20bf2d04
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-05-07 18:55:44 +02:00
Vivian Meazza
15af3ae0a9
Merge branch 'master' of gitorious.org:fg/fgdata into work
2012-05-07 17:47:43 +01:00
Vivian Meazza
0a8f9d71c3
Tidy up
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-07 17:22:15 +01:00
James Turner
a26adb39af
Remove an un-guarded member access in a debug dump.
2012-05-07 16:39:56 +01:00
Vivian Meazza
505ce42582
Bring grey texture into line with blue
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-07 16:39:29 +01:00
Vivian Meazza
249f0642e2
Merge branch 'master' of gitorious.org:fg/fgdata into work
2012-05-07 12:47:37 +01:00
Vivian Meazza
b6fd097920
Opotimize in line with water shaders
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-07 12:46:25 +01:00
Emilian Huminiuc
e29735f3d4
fix buildings-lightmap missalignment
...
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-05-07 14:22:05 +03:00
James Turner
5013d7ae45
Update route-manager dialog for new Nasal API.
2012-05-07 00:41:57 +01:00
Emilian Huminiuc
22352ec485
Switch building.eff to the ubershader.
...
Tweak building lightmap to work with ubershader.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-05-07 02:05:02 +03:00
Emilian Huminiuc
50b63efab3
Merge commit 'refs/merge-requests/148' of git://gitorious.org/fg/fgdata into merge-req
2012-05-07 00:48:00 +03:00
Tuomas Kuosmanen
976713e308
Changes: one new building and matching lightmap,
...
also resize buildings and lightmap images to 2048 pixels accross.
2012-05-07 00:12:15 +03:00
BARANGER Emmanuel
8fbfd015eb
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-05-06 18:34:31 +02:00
Gijs de Rooy
09b52158bc
Complete/update Dutch menu translation.
2012-05-06 14:44:12 +02:00
ThorstenB
ec26692360
Remove menu labels from menubar.xml
...
to avoid confusion, since labels are read from the language resource now.
2012-05-06 10:08:51 +02:00
ThorstenB
234f741f98
Set matching XML file character encoding.
...
Default FG text file encoding is UTF-8. Files encoded in others character
sets must explicitly set the encoding - otherwise text decoding (and XML
parsing) may fail.
2012-05-06 10:04:01 +02:00
BARANGER Emmanuel
05dc6fd814
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-05-05 23:50:19 +02:00
Vivian Meazza
0235f95ed5
Merge branch 'master' of gitorious.org:fg/fgdata into work
2012-05-05 20:07:43 +01:00
Vivian Meazza
0b320224b1
Merge branch 'work' of D:\Git_New\fgdata into water-test
2012-05-05 20:04:18 +01:00
Vivian Meazza
9657518663
Optimise water shaders after ideas and suggestions by Thorsten Renk
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-05 19:59:22 +01:00
Alexis Bory
890b1d1edb
Merge branch 'master' of git://mapserver.flightgear.org/fgdata
2012-05-05 15:33:48 +02:00
Christian Schmitt
1261833a5b
3D taxiway signs textures for the case
2012-05-05 13:40:33 +02:00
Frederic Bouvier
3fc1a36201
Fix a shader problem. It seems a bad idea to set gl_FragData in a conditional block. It seems better to assign a value unconditionally even if there is no buffer attached.
2012-05-05 00:10:56 +02:00
Stuart Buchanan
ddf9445a8e
Update documentation for materials.xml and random buildings.
2012-05-04 21:14:23 +01:00
Frederic Bouvier
7e1ed19307
Put encode_gbuffer in a separate shader to please ATI and/or Mac OSX that doesn't like to have gl_FragData and gl_FragColor in the same program, even if one is never called
2012-05-04 09:34:00 +02:00
ThorstenB
5057b49ed9
#669 : fix fly-by-view when aircraft skips position
...
Reposition when view position is too far away, i.e. due to replay,
relocation etc.
2012-05-03 00:00:56 +02:00
Emilian Huminiuc
f26472f614
Remove useless include_fog.vert from some of the effects.
...
Fis c/p error in ubershader-deferred.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-05-03 00:01:59 +03:00
ThorstenB
70f5448a4e
set correct file mode
...
More non-executable data files.
2012-05-02 22:37:48 +02:00
Emilian Huminiuc
ce08a30a58
Add missing uniform to model-combined technique 5. This should fix the lighting issues with the sky-dome shaders active and landmass
...
slider at 4.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-05-02 13:22:43 +03:00
BARANGER Emmanuel
5d65bbd16c
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-05-02 02:35:05 +02:00
Stuart Buchanan
9dbebd3c2d
Emissive lighting on random buildings.
2012-05-01 22:36:24 +01:00
Stuart Buchanan
de70c6404e
Emissive lighting for random buildings. Part 1.
2012-05-01 22:35:10 +01:00
BARANGER Emmanuel
4182174502
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-05-01 21:40:34 +02:00
Emilian Huminiuc
5fbc5bddf6
Ubershader: some spring cleaning, readability
...
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-05-01 15:03:18 +03:00
ThorstenB
337aeb7fe4
Return 'ATC Services in Range' dialog to service
2012-05-01 11:12:44 +02:00
ThorstenB
d51a79ba5b
Improve MP dialog and add option to configure AI traffic
2012-05-01 11:10:37 +02:00
Frederic Bouvier
6775ecdfd2
Display the depth buffer when stored in a color texture
2012-05-01 09:34:14 +02:00
Frederic Bouvier
6be18a5c99
Add the ability to record depth in color buffer. This should solve depth buffer resolution problem for older NVidia cards.
2012-05-01 08:47:38 +02:00
ThorstenB
4b1d51a801
Improve scenario dialog
...
Support optional name for scenarios.
Add explicit scenario enable/disable switch.
2012-04-30 19:22:00 +02:00
BARANGER Emmanuel
9c7051d2ce
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-04-30 01:09:49 +02:00
Frederic Bouvier
76a11c2d48
Fix bug #750 : allow cards or drivers not supporting dynamic indexing in fragment shaders to have simple shadows
2012-04-29 13:35:30 +02:00
Stuart Buchanan
5909285100
Building effect for random buildings.
2012-04-28 23:03:11 +01:00
Alexis Bory
7b2f605f32
Merge branch 'work'
2012-04-28 23:04:04 +02:00
BARANGER Emmanuel
60d70e1ee4
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-04-28 21:42:30 +02:00
Stuart Buchanan
f80affa66b
Reduce the maximum value of the building-density slider. At density 5, ~95% of the building placements are too close to another building.
2012-04-28 20:03:55 +01:00
Stuart Buchanan
3b995d5a48
Reduce building density to offset improved placement algorithm.
2012-04-28 20:01:54 +01:00
