1
0
Fork 0
Commit graph

4046 commits

Author SHA1 Message Date
BARANGER Emmanuel
b69d1fb74b Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-08 21:01:34 +02:00
Erik Hofman
4feb05c2e6 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-08 11:06:32 +02:00
BARANGER Emmanuel
8fd3e6805f Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-07 21:38:10 +02:00
Alexis Bory
0e408b8cd9 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-07 14:32:50 +02:00
Vivian Meazza
9e805bbd9a Merge branch 'master' of \New Git\fgdata 2010-08-07 11:17:06 +01:00
Vivian Meazza
c1e565403b Adjust contrail parameters, add missing file
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-07 11:13:26 +01:00
Vivian Meazza
f5503ff22f Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-06 22:04:35 +01:00
Vivian Meazza
6208b9f511 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-06 14:40:03 +01:00
Vivian Meazza
8aa66f9788 Make persistent contrail models generic
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-06 14:31:31 +01:00
Vivian Meazza
f7655062d7 Merge branch 'Work' of \New Git\fgdata into work 2010-08-05 22:46:53 +01:00
Vivian Meazza
016ef0da9c Merge branch 'master' of git://gitorious.org/fg/fgdata into Work 2010-08-05 17:03:36 +01:00
Vivian Meazza
bf6b525c34 Add new submodel parameters
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-05 16:41:43 +01:00
Vivian Meazza
4ae6709663 Add new submodel parameters
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-05 16:13:03 +01:00
Vivian Meazza
4b17bb5cfd Merge branch 'master' of \New Git\fgdata 2010-08-05 13:31:31 +01:00
Vivian Meazza
2742085d69 Contrail calculator. Based on an approximation to the "Appleman Chart"
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-05 09:07:51 +01:00
Vivian Meazza
1af4845036 Merge branch 'master' of \New Git\fgdata
Conflicts:
	Aircraft/737-300/Models/737-300.xml
2010-08-05 08:54:30 +01:00
Vivian Meazza
be53f07e7a Add script to calculate contrail temperature based on an approximation to the "Appleman Chart"
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-04 23:22:38 +01:00
BARANGER Emmanuel
a2dd320f75 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-04 19:35:16 +02:00
Vivian Meazza
c200834cb3 Merge branch 'master' of git://gitorious.org/fg/fgdata into Work 2010-08-04 11:11:16 +01:00
BARANGER Emmanuel
c2186fed62 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-04 12:04:00 +02:00
Erik Hofman
7da6e080bd Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-04 10:17:57 +02:00
Anders Gidenstam
9c4c33bf12 Disable OSG multi-threading mode selection in preferences.xml as enabling multi-threading mode currently breaks the screenshot function. 2010-08-03 19:45:19 +02:00
Frederic Bouvier
1e9a6c4cdf Change edge_bias asked by Thorsten ( http://www.flightgear.org/forums/viewtopic.php?f=5&t=7358&p=89159#p89204 ) 2010-08-03 19:20:20 +02:00
Vivian Meazza
f5a584fce5 Merge branch 'integration' 2010-08-03 10:03:51 +01:00
Vivian Meazza
bd334a1eff Merge commit 'refs/merge-requests/10' of git://gitorious.org/fg/fgdata into integration 2010-08-03 09:26:59 +01:00
Erik Hofman
6686a72564 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-03 09:24:25 +02:00
Frederic Bouvier
4dd0ef9a08 Local weather v0.81 by Thorsten Renk 2010-08-03 08:18:14 +02:00
Vivian Meazza
c2450d1ccc Merge branch 'master' into Work 2010-08-02 23:47:33 +01:00
Dave Perry
8f7c946f38 Merge branch 'master' of gitorious.org:fg/fgdata 2010-08-02 15:40:15 -06:00
Vivian Meazza
723378d8c6 Merge commit 'refs/merge-requests/10' of git://gitorious.org/fg/fgdata into integration 2010-08-02 21:22:56 +01:00
Stuart Buchanan
7950958645 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-02 19:12:07 +01:00
Erik Hofman
2851711b0c Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-02 10:38:04 +02:00
Vivian Meazza
bea32aeccd Merge branch 'Work' of \New Git\fgdata into work 2010-08-01 22:59:00 +01:00
Vivian Meazza
b4f226c092 Add persistent contrail Shaders/contrail.frag Shaders/contrail.vert
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-01 22:54:35 +01:00
Vivian Meazza
8086d9bf8d Merge branch 'master' of gitorious.org:fg/fgdata into Work 2010-08-01 22:45:43 +01:00
Vivian Meazza
81cc66e6f9 Merge branch 'master' into work 2010-08-01 22:41:59 +01:00
Anders Gidenstam
82d72bf976 Updated WalkView: Improved documentation. 2010-08-01 23:21:46 +02:00
Vivian Meazza
0a370419c7 Merge branch 'master' into Work 2010-08-01 20:04:44 +01:00
Vivian Meazza
dc9860b534 Change render-bin name
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-01 20:01:28 +01:00
BARANGER Emmanuel
4de06af26b Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-01 19:03:46 +02:00
Vivian Meazza
f491537853 Merge branch 'Work' of \New Git\fgdata into work 2010-08-01 15:52:36 +01:00
Vivian Meazza
ca6cc04b80 Merge branch 'master' into Work 2010-08-01 15:41:38 +01:00
BARANGER Emmanuel
2ea71b137b Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-08-01 01:38:42 +02:00
Vivian Meazza
1c6a6bf1cc Merge branch 'master' into work 2010-07-31 21:37:07 +01:00
Vivian Meazza
0de7eebc72 Merge branch 'master' of \New Git\fgdata 2010-07-31 21:35:44 +01:00
Vivian Meazza
0e2aeaf421 Add persistent contrails
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-07-31 21:34:35 +01:00
Frederic Bouvier
1f3d6ac034 Merge commit 'refs/merge-requests/15' of git://gitorious.org/fg/fgdata into gral/forest 2010-07-31 18:34:35 +02:00
gral@who.net
700e8c1ef2 Removing roads in the new forest textures and changed all values in materials.xml from <a>1</a> to <a>1.0</a>. 2010-07-31 16:19:46 +02:00
Dave Perry
3e0031eabd Merge branch 'master' of gitorious.org:fg/fgdata 2010-07-31 07:18:47 -06:00
Dave Perry
8c4f78ccc6 Moved all .nas files to Nasal/, Consolidated redundant lines in -set.xml and
model.xml files using base.xml and base-model.xml files. General clean-up to
make edits and updates easier.
2010-07-30 20:11:47 -06:00