fly/fgdata
1
0
Fork 0
Code Activity
4138 commits 7 branches 0 tags 4.4 GiB
Commit graph

4138 commits

This branch
This branch
All branches
Author SHA1 Message Date
willie
2571d8e9aa Merge branch 'master' of git://gitorious.org/fg/fgdata 
Conflicts:
	Aircraft/victor/victor-set.xml
 2010-09-02 19:00:08 +01:00
BARANGER Emmanuel
33d02170a0 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-02 12:11:46 +02:00
BARANGER Emmanuel
6837a30398 - a small script of Melchior that can be improved (Start from a seaport with a seaplane). 2010-09-02 12:10:29 +02:00
Vivian Meazza
12a7226ce6 Merge branch 'master' of gitorious.org:fg/fgdata into Work 2010-09-02 00:05:22 +01:00
Torsten Dreyer
fb51043768 Merge branch 'master' of gitorious.org:fg/fgdata 2010-09-01 22:56:42 +02:00
Torsten Dreyer
e66aacf417 Some minor changes preparing for the weather update 
- Use aloft altitudes to match common forecast maps
- Simplify the metar interpolator rules
 2010-09-01 22:55:43 +02:00
Vivian Meazza
8754b5f38b Merge branch 'Work' of \New Git\fgdata 2010-09-01 21:16:58 +01:00
Vivian Meazza
7ebfb3de37 Merge branch 'master' into Work 2010-09-01 21:04:01 +01:00
Vivian Meazza
f2ca47bffb Merge branch 'master' of \New Git\fgdata 2010-09-01 20:55:12 +01:00
Vivian Meazza
30c490dbb6 Merge branch 'master' of gitorious.org:fg/fgdata 2010-09-01 20:41:59 +01:00
Vivian Meazza
c64d101139 Change render bin to 10 (default transparent bin) 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2010-09-01 20:26:01 +01:00
BARANGER Emmanuel
2454e968bf Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-01 21:01:21 +02:00
Frederic Bouvier
39c4e7a615 Merge commit 'refs/merge-requests/40' of git://gitorious.org/fg/fgdata into gral/inherit-crop 2010-09-01 19:34:04 +02:00
Vivian Meazza
ec1a3bba1e Merge commit 'refs/merge-requests/40' of git://gitorious.org/fg/fgdata into integration 2010-09-01 18:32:58 +01:00
Frederic Bouvier
8d1f1ee073 Merge commit 'refs/merge-requests/39' of git://gitorious.org/fg/fgdata into gral/dialog 2010-09-01 19:29:59 +02:00
Vivian Meazza
ad3a9ea644 Merge commit 'refs/merge-requests/41' of git://gitorious.org/fg/fgdata into integration 2010-09-01 16:49:47 +01:00
gral@who.net
f08cd1f12d Forest pixel shader edit, reduce bias mix (was: bright forest) 2010-09-01 14:58:55 +02:00
gral@who.net
24ea4dcd0a Change in effect cropgrass, it inherits from crop now 2010-08-31 14:30:18 +02:00
gral@who.net
b92252c0a3 New checkbox transition shaders to separate rock/transition shader work from crop shaders 2010-08-31 10:29:51 +02:00
Vivian Meazza
313ee1f401 Merge branch 'master' into Work 2010-08-30 20:45:02 +01:00
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
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
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
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
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