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
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
Frederic Bouvier
b1938ce785
Remove duplicated technique
2012-04-27 09:19:16 +02:00
Frederic Bouvier
72be8cdcf7
Merge commit 'refs/merge-requests/99' of git://gitorious.org/fg/fgdata into thorsten/haze_1.3
2012-04-27 08:29:03 +02:00
Frederic Bouvier
ef9f0d222d
Remove incomplete and unused shaders
2012-04-26 20:49:01 +02:00
Flightgear Development
2b972341b3
Terrain Haze v1.3
2012-04-26 17:22:58 +03:00
James Turner
9e0cedf568
Location-on-ground - show the airport name, since we have it.
2012-04-26 11:00:15 +01:00
James Turner
4c047c235f
Change geo.nas to use native helpers for bucket path/index
2012-04-26 00:01:47 +01:00
James Turner
13c145a6d9
Use new Nasal parking data to populate a combo box for parking positions.
2012-04-25 16:10:28 +01:00
James Turner
a1411ae7fd
Update route-manager dialog for revised Nasal API.
2012-04-25 15:56:35 +01:00
Curtis L. Olson
aee3cb64e6
Fixed type in property name.
2012-04-25 09:54:35 -05:00
Vivian Meazza
068e965d20
remove alpha channel
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-04-25 11:05:54 +01:00
Stuart Buchanan
acab21c7cb
Retire old materials.xml and materials-dds.xml, and add setting
...
to preferences.xml
2012-04-24 22:54:02 +01:00
Stuart Buchanan
fef7170857
Manual merge of the following commits from data/materials-dds.xml
...
532c93cfa06c3be2d5b47cbffe33a89c04433b8a
c32204a079ea204ff10c2961e75e5cea9ae98afc
d66d417dea5dc0cf06222627ba3ccf9de6506630
2012-04-24 22:47:04 +01:00
Stuart Buchanan
15dc296a0a
Manual merge from data/materials.xml of
...
532c93cfa06c3be2d5b47cbffe33a89c04433b8a
c32204a079ea204ff10c2961e75e5cea9ae98afc
d66d417dea5dc0cf06222627ba3ccf9de6506630
into the new Materials definitions.
2012-04-24 22:33:32 +01:00
Stuart Buchanan
f718148d68
Correction to README.
2012-04-24 21:59:33 +01:00
Stuart Buchanan
98e7a194e8
Random buildings - initial commit of data portion. Requires
...
simgear change to have any effect.
2012-04-24 21:55:37 +01:00
ThorstenB
ed0d58cd75
#705 : add sanity checks to fuel tank update
...
Just ignore incomplete tanks (without essential properties like "level_lbs")
and avoid Nasal run-time errors.
2012-04-22 15:19:20 +02:00
ThorstenB
870dccf632
Restructure language resources.
...
Separate options and menu translations.
Use subdirectories with individual resources for each language.
2012-04-21 20:28:24 +02:00
ThorstenB
8506c104dd
Separate the keyboard hint from menu labels.
...
Use new "key" property for menu items.
2012-04-21 20:28:24 +02:00
Vivian Meazza
268845798b
Merge branch 'master' into work
2012-04-20 14:50:27 +01:00
ThorstenB
79afe756e9
Improve German language resource.
2012-04-19 21:28:51 +02:00
Frederic Bouvier
661f9ec383
Restore current syntax
2012-04-18 22:54:15 +02:00
Frederic Bouvier
d62e7ed6cc
Filtering requires GLSL 1.2
2012-04-18 22:34:03 +02:00
Frederic Bouvier
c06889b3c5
Revert "Remove ambient component of additional lights"
...
This reverts commit de454d1391ffc1d208dc783715524ef8eef4055f.
2012-04-18 20:19:47 +02:00
ThorstenB
9ffbf7ac3c
Move another string to the language resource.
...
"Usage" should be translatable...
2012-04-18 16:02:56 +02:00
ThorstenB
278a7db2bf
Add missing name tags to menu items.
...
Also enable rendering buffer option for Rembrandt only.
2012-04-18 16:00:38 +02:00