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
Erik Hofman
83fb08c47e
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-07-29 12:35:17 +02:00
Vivian Meazza
c63d23395c
Merge branch 'master' of \New Git\fgdata
2010-07-29 09:21:24 +01:00
Vivian Meazza
fb136738d4
Add TACAN channel for USS San Antonio
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-07-28 21:01:44 +01:00
Vivian Meazza
00fb990997
Merge commit 'refs/merge-requests/6' of git://gitorious.org/fg/fgdata into integration
2010-07-28 15:36:08 +01:00
Vivian Meazza
316f26510e
Merge commit 'refs/merge-requests/14' of git://gitorious.org/fg/fgdata into integration
2010-07-28 11:13:51 +01:00
Vivian Meazza
10ad764810
Merge commit 'refs/merge-requests/13' of git://gitorious.org/fg/fgdata into integration
2010-07-28 10:13:55 +01:00
Vivian Meazza
71657a055c
Merge commit 'refs/merge-requests/7' of git://gitorious.org/fg/fgdata into integration
2010-07-27 22:07:27 +01:00
Erik Hofman
82af5dd259
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-07-25 10:29:58 +02:00
Stuart Buchanan
2d40be8ff5
Merge commit 'refs/merge-requests/9' of git://gitorious.org/fg/fgdata
2010-07-24 22:45:30 +01:00
Stuart Buchanan
6455c13033
Merge commit 'refs/merge-requests/11' of git://gitorious.org/fg/fgdata
2010-07-24 20:42:57 +01:00
Martin Spott
4d66f75b52
Fix material name typo
2010-07-23 00:58:41 +02:00
Erik Hofman
f9b235393a
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-07-22 09:21:05 +02:00
BARANGER Emmanuel
9770bd05a2
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-07-19 02:04:30 +02:00
Erik Hofman
3c49777016
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-07-16 20:21:26 +02:00
Vivian Meazza
05643e8882
Merge branch 'Work' of \New Git\fgdata into work
2010-07-15 09:38:12 +01:00
Vivian Meazza
b1e7f776ef
Merge branch 'master' into work
2010-07-15 09:34:24 +01:00
Vivian Meazza
79301c5d88
Merge branch 'master' into Work
2010-07-15 09:20:06 +01:00
Vivian Meazza
cb344cd725
Merge branch 'master' of gitorious.org:fg/fgdata into Work
2010-07-14 23:48:02 +01:00
Erik Hofman
d26d5b8847
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-07-13 20:38:49 +02:00
BARANGER Emmanuel
33a24357c7
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-07-12 17:50:03 +02:00
Erik Hofman
8d68de5c31
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-07-11 11:25:16 +02:00
BARANGER Emmanuel
4234d3e244
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-07-09 20:18:36 +02:00
Anders Gidenstam
229ee23103
Limit the rate a participant can send wildfire ignite events at.
2010-07-09 15:05:51 +02:00
Anders Gidenstam
4711f719ce
Make the mp_broadcast BroadcastChannel honour the ignore list.
2010-07-09 13:39:44 +02:00
Vivian Meazza
0e62f717db
Merge branch 'master' into work
2010-07-08 23:35:40 +01:00
Vivian Meazza
158111afc2
Merge branch 'master' into Work
2010-07-08 23:08:18 +01:00
Dave Perry
1ebf8ce938
Merge branch 'master' of gitorious.org:fg/fgdata
2010-07-05 11:54:43 -06:00
Vivian Meazza
74df9856d7
Update
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-07-05 13:25:53 +01:00
Heiko Schulz aka HHS
2fd440f551
Comit- maybe wrong, still learning ;-
...
Signed-off-by: Heiko Schulz aka HHS <Heiko.H.Schulz@gmx.net>
2010-07-04 14:03:38 +02:00
Heiko Schulz aka HHS
4286cac83a
Add some lousy CubeMaps and CubeCrosses
...
Signed-off-by: Heiko Schulz aka HHS <Heiko.H.Schulz@gmx.net>
2010-07-04 14:01:00 +02:00
Heiko Schulz aka HHS
be85a87598
First comit of new CubeMaps for the reflectionshader
...
They are not perfect as the Equipement is not good enough, but though they works quite good!
RealLife-images, Images made in FGFS and Custom-Gimp-made.
Signed-off-by: Heiko Schulz aka HHS <Heiko.H.Schulz@gmx.net>
2010-07-04 12:45:04 +02:00
