Frederic Bouvier
9dc13921cd
Merge commit 'refs/merge-requests/36' of git://gitorious.org/fg/fgdata into gral/glacier
2010-08-25 23:16:43 +02:00
gral@who.net
2041f6a577
Revert change in materials.xml
2010-08-25 23:15:13 +02:00
gral@who.net
197200149c
Better herbtundra colour and transition
2010-08-25 22:50:57 +02:00
BARANGER Emmanuel
cf871fc077
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-25 22:33:23 +02:00
gral@who.net
f5ba5006fd
Better transitions
2010-08-25 20:56:19 +02:00
Frederic Bouvier
c41a732339
Merge commit 'refs/merge-requests/30' of git://gitorious.org/fg/fgdata into gral/glacier
2010-08-25 20:47:56 +02:00
gral@who.net
5fb6550b8e
Changes for better terrain, but not so good forest
2010-08-25 20:08:23 +02:00
gral@who.net
d135816375
Getting the relief back for forest
2010-08-25 17:20:54 +02:00
BARANGER Emmanuel
74699cbe3a
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-25 02:41:19 +02:00
Gijs de Rooy
0bd3acc38a
Fix external entity error, created by Torsten
2010-08-24 18:03:49 +02:00
gral@who.net
8e645e61f5
Added relief code to new effects and shaders
2010-08-24 14:53:42 +02:00
BARANGER Emmanuel
45d5df38d4
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-24 00:38:37 +02:00
Torsten Dreyer
3f977e2f42
Let preferences.xml use the new environment files
2010-08-23 21:52:26 +02:00
Torsten Dreyer
6ed5d507f4
Naming of generic autopilot stage and environment reorganization
...
Fix a duplicate stage name of the generic autopilot (Altitude Hode Stage 2)
Move environment relevant files from into FGDATA/Environment
2010-08-23 21:46:09 +02:00
gral@who.net
0ff2d597f5
Adding the files ...
2010-08-23 12:16:07 +02:00
gral@who.net
64c5757f6d
Working on transitions, adding herbtundra
2010-08-23 12:15:09 +02:00
Gijs de Rooy
a7199e0cca
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-23 10:42:47 +02:00
Frederic Bouvier
e1726953c1
Fix a shader problem reported by Tat
2010-08-23 08:53:18 +02:00
Vivian Meazza
ac4b6b628b
Merge branch 'integration'
2010-08-22 22:37:16 +01:00
gral@who.net
0549474369
Adding glacier.eff
2010-08-22 23:09:49 +02:00
gral@who.net
10f97d1718
New combination of snow and glacier/permanent snow
2010-08-22 23:05:46 +02:00
Gijs de Rooy
ec73ac03c6
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-22 21:17:49 +02:00
gral@who.net
1286a77977
Added vegetation level to the forest shader, at least for rock/forest in the
2010-08-21 22:47:56 +02:00
Frederic Bouvier
bead8c3486
Merge commit 'refs/merge-requests/28' of git://gitorious.org/fg/fgdata into gral/snow
2010-08-21 17:24:41 +02:00
gral@who.net
187517fdb0
Added snow and snow-level also to cropgrass.eff
2010-08-21 16:59:07 +02:00
gral@who.net
1ee6d35136
Shader Crop: Adding snow and snowlevel adjustement, clean up
2010-08-21 16:51:13 +02:00
Frederic Bouvier
0b2c9c74dd
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-21 14:44:56 +02:00
gral@who.net
07c6ffedc0
Adding snow and snowlevel adjustement
2010-08-21 14:27:25 +02:00
gral@who.net
5a39f0738c
As always, I forgot to add the files
2010-08-21 13:10:19 +02:00
gral@who.net
2cccee4886
New forest efffect with rock
2010-08-21 12:54:26 +02:00
BARANGER Emmanuel
bbbf977c42
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-20 16:16:38 +02:00
BARANGER Emmanuel
1692827e35
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-19 14:21:10 +02:00
Gijs de Rooy
d2399ade67
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-18 22:55:18 +02:00
Stuart Buchanan
79542414f7
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-18 20:42:29 +01:00
Torsten Dreyer
8ea0582d25
Merge commit 'refs/merge-requests/22' of git://gitorious.org/fg/fgdata into integration
2010-08-18 18:00:10 +02:00
BARANGER Emmanuel
f07c8918c1
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-18 14:21:23 +02:00
Anders Gidenstam
507fd1313c
Merge commit 'refs/merge-requests/15' of git://gitorious.org/fg/fgdata
2010-08-18 08:45:01 +02:00
git@gitorious.org:~gijs/fg/gijss-fgdata.git
c1d421dbfe
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-08-17 13:28:09 +02:00
Anders Gidenstam
049d98ad8e
Updated WalkView:
...
- Added support for additional manager objects, e.g.
for animating a 3d model or move a JSBSim pointmass.
- Improved the documentation.
- Some bugs removed.
2010-08-16 23:12:26 +02:00
James Turner
8fd716f2ca
Extend IORules system to permit aircraft dirs.
2010-08-16 11:08:24 +01:00
Frederic Bouvier
18549b4b69
Merge commit 'refs/merge-requests/21' of git://gitorious.org/fg/fgdata into gral/cropgrass
2010-08-15 17:56:50 +02:00
gral@who.net
50b2a58f89
File name change in crop.eff
2010-08-15 16:32:48 +02:00
gral@who.net
1a9bf761fe
Added cropgrass effect and associated textures
2010-08-15 16:30:11 +02:00
James Turner
83c9e8b157
Change Nasal to use relative not absolute data paths
...
(requires current FG git)
2010-08-15 11:27:15 +01:00
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
