1
0
Fork 0
Commit graph

7878 commits

Author SHA1 Message Date
Durk Talsma
14b3661bfb Merge branch 'master' of git@gitorious.org:fg/fgdata 2010-08-30 21:12:09 +02:00
Durk Talsma
8769740bfc Added a new property related to a new AI feature that collects and saves AI traffic statistcs across sessions, in order to allow more efficient initialization. 2010-08-30 21:08:35 +02:00
Vivian Meazza
024108615c Merge branch 'master' into Work
Conflicts:
	Aircraft/b29/b29-wingman.xml

Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-30 11:06:34 +01:00
Vivian Meazza
311e44c78c Merge branch 'master' of \New Git\fgdata 2010-08-29 21:29:37 +01:00
Vivian Meazza
7b1387d521 Add impacts
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-29 20:45:03 +01:00
Gijs de Rooy
9436399968 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-29 14:07:21 +02:00
BARANGER Emmanuel
826ef36665 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-29 11:49:22 +02:00
Erik Hofman
17c368f5d7 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-29 11:07:58 +02:00
Vivian Meazza
479f28600e Merge commit 'refs/merge-requests/37' of git://gitorious.org/fg/fgdata into integration 2010-08-28 22:42:07 +01:00
Vivian Meazza
bd57ee2339 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-28 22:18:15 +01:00
Vivian Meazza
461141d8ad Merge branch 'integration' 2010-08-28 22:14:58 +01:00
gral@who.net
ab8fce4f33 Missing files 2010-08-28 21:36:21 +02:00
gral@who.net
631af0b2d4 File clean up, .rgb to .png 2010-08-28 21:35:25 +02:00
gral@who.net
a66014bb2e File clean up, some renaming, third 2010-08-28 20:59:31 +02:00
gral@who.net
044edae050 File clean up, some renaming, second 2010-08-28 20:51:13 +02:00
gral@who.net
9c9395e7de File clean up, some renaming 2010-08-28 20:50:50 +02:00
gral@who.net
76948fe70e Remove unused fuselage rgb files 2010-08-28 20:42:06 +02:00
Torsten Dreyer
0870fd8f81 Merge branch 'master' of gitorious.org:fg/fgdata 2010-08-28 20:39:47 +02:00
Torsten Dreyer
45dd7055e5 Implementation of weather interpolation using property-rules 2010-08-28 20:31:44 +02:00
gral@who.net
a9ee249cda c172p: Separate folder for effects in models 2010-08-28 17:40:50 +02:00
gral@who.net
7bf4dc5795 Reactivate blue for forest.frag 2010-08-28 00:54:06 +02:00
gral@who.net
71a7c8cf72 Removed different colorstrips, flickering between forest/herbtundra 2010-08-28 00:38:20 +02:00
gral@who.net
269a999c4d Adding season colour in forest/herbtundra/glacier effects 2010-08-28 00:13:52 +02:00
Gijs de Rooy
eaeb1b6925 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-27 21:48:57 +02:00
Gijs de Rooy
e9460a7c46 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-26 10:57:10 +02:00
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