1
0
Fork 0
Commit graph

4357 commits

Author SHA1 Message Date
Vivian Meazza
da2998811a Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-03 10:14:25 +01:00
Durk Talsma
c95c9ee19e Some new traffic manager options for advanced users and traffic pattern developers / maintainers. 2010-09-03 10:43:26 +02:00
Vivian Meazza
cf23ab2734 Merge commit 'refs/merge-requests/42' of git://gitorious.org/fg/fgdata into integration 2010-09-03 09:35:20 +01:00
Erik Hofman
ff1d943c17 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-03 10:17:46 +02:00
gral@who.net
cf0f7c298c Fix: bringing back constantColor in crop shaders 2010-09-03 09:37:52 +02:00
willie
861f8f4ea2 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-02 23:29:31 +01:00
BARANGER Emmanuel
851908f88a Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-02 23:36:48 +02:00
willie
cf1d916e93 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-02 21:11:39 +01:00
Stuart Buchanan
19ee2ba9ed Merge commit 'refs/merge-requests/38' of git://gitorious.org/fg/fgdata 2010-09-02 19:21:56 +01:00
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
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