Frederic Bouvier
|
7d82264b79
|
Revert "Urban shader using Quadtree Displacement Mapping"
This reverts commit 3cd68ac922d5768e5403065e1654478c1fbe0c7f.
|
2010-11-02 21:31:31 +01:00 |
|
Frederic Bouvier
|
7e816deb44
|
Revert "Small fix to the urban shader"
This reverts commit 41027306053caabfa9dc8bf999fad3740e91cdb2.
|
2010-11-02 21:31:00 +01:00 |
|
BARANGER Emmanuel
|
2e81b85cbd
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-29 12:36:28 +02:00 |
|
James Turner
|
3126b63fb3
|
Merge branch 'topics/dehud'
|
2010-10-29 00:58:16 +01:00 |
|
James Turner
|
c7560f61b4
|
Switch over to v2 HUD by default, v1 HUD is no longer used.
|
2010-10-29 00:56:42 +01:00 |
|
James Turner
|
3b1b2fd879
|
Remove v1 HUD files, and update v2 default HUD to include better GPS/AP information.
|
2010-10-29 00:23:16 +01:00 |
|
Alexis Bory
|
3c18fc1e1c
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-28 21:29:37 +02:00 |
|
Csaba Halasz
|
61bdb1a7bd
|
Merge commit 'refs/merge-requests/53' of git://gitorious.org/fg/fgdata
|
2010-10-27 20:42:07 +02:00 |
|
Frederic Bouvier
|
77174294ce
|
Small fix to the urban shader
|
2010-10-27 09:17:10 +02:00 |
|
Frederic Bouvier
|
758f691a1c
|
Local Weather version 0.9 by Thorsten Renk
|
2010-10-26 21:42:36 +02:00 |
|
Frederic Bouvier
|
a3813bda8d
|
Urban shader using Quadtree Displacement Mapping
|
2010-10-25 22:37:05 +02:00 |
|
James Turner
|
ab320e4c73
|
Merge branch 'topidcs/dehud'
|
2010-10-25 15:06:13 +01:00 |
|
James Turner
|
76d339c0ac
|
Update mirage2000 HUD to new syntax
|
2010-10-24 06:56:05 +01:00 |
|
Vivian Meazza
|
179e935625
|
Merge branch 'master' of gitorious.org:fg/fgdata into Work
|
2010-10-23 23:49:01 +01:00 |
|
Alexis Bory
|
6b2e83b0a3
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-23 15:04:22 +02:00 |
|
Alexis Bory
|
1dd4b8defe
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-22 20:29:18 +02:00 |
|
James Turner
|
e6b959b9c8
|
Updated route-manager dialog, for revised C++ parts.
|
2010-10-20 11:20:05 +01:00 |
|
BARANGER Emmanuel
|
e4ad550e1b
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-17 02:03:38 +02:00 |
|
Csaba Halasz
|
c2b502c9ad
|
Merge commit 'refs/merge-requests/52' of git://gitorious.org/fg/fgdata
|
2010-10-17 00:45:59 +02:00 |
|
BARANGER Emmanuel
|
81f756781b
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-17 00:02:00 +02:00 |
|
James Turner
|
0425ec0589
|
Torsten Brehm: catch NaNs in pilot list gui, and report only once per call-sign.
|
2010-10-16 17:31:19 +01:00 |
|
Torsten Dreyer
|
e7e8ac84f2
|
don't use printlog before nasal-dir-initialized
Thanks, Anders.
|
2010-10-13 20:46:31 +02:00 |
|
BARANGER Emmanuel
|
b780ade69e
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-13 14:20:04 +02:00 |
|
Frederic Bouvier
|
755a6a4d1a
|
Remove reference to inexistant texture
|
2010-10-13 08:14:20 +02:00 |
|
Vivian Meazza
|
37e42d60b0
|
Add model cockpit view dialog.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
|
2010-10-12 23:17:35 +01:00 |
|
Vivian Meazza
|
3d1d107341
|
Merge branch 'Work' of \New Git\fgdata
|
2010-10-12 21:46:19 +01:00 |
|
Vivian Meazza
|
39affdc8cd
|
Merge branch 'master' of \New Git\fgdata
|
2010-10-12 20:45:56 +01:00 |
|
Vivian Meazza
|
b020b3e0d1
|
Add Formation Selector
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
|
2010-10-12 20:42:05 +01:00 |
|
Vivian Meazza
|
996a5a94ee
|
Add generic formation selector script.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
|
2010-10-12 20:37:10 +01:00 |
|
Vivian Meazza
|
1b309deda4
|
Add generic formations.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
|
2010-10-12 20:35:47 +01:00 |
|
Vivian Meazza
|
df6864ac07
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-12 20:09:40 +01:00 |
|
BARANGER Emmanuel
|
af46387432
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-12 18:41:56 +02:00 |
|
Torsten Dreyer
|
5626289e94
|
Merge branch 'master' of gitorious.org:fg/fgdata
|
2010-10-12 18:17:45 +02:00 |
|
BARANGER Emmanuel
|
72efbaaf8d
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-12 17:22:48 +02:00 |
|
Torsten Dreyer
|
7d67ebc031
|
correct _all_ paths of the farmhouse in materials.xml
|
2010-10-12 15:31:46 +02:00 |
|
Torsten Dreyer
|
c6b2df2a6c
|
use printlog for "init contrail" and downgrade to debug
|
2010-10-11 21:29:01 +02:00 |
|
Torsten Dreyer
|
6ba8808039
|
Use printlog for "*** NEW LOCATION ***" and downgrade to info
|
2010-10-11 21:23:57 +02:00 |
|
Torsten Dreyer
|
90633fd213
|
fix wrong path for farmhouse[123].ac in materials.xml
|
2010-10-11 20:04:18 +02:00 |
|
BARANGER Emmanuel
|
919ae04429
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-11 19:18:31 +02:00 |
|
James Turner
|
87688ddf6a
|
Thorsten Brehm: fix position-in-air dialog when a parking position was previously specified.
|
2010-10-11 10:52:21 +01:00 |
|
BARANGER Emmanuel
|
ee549e6524
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-10 21:37:11 +02:00 |
|
BARANGER Emmanuel
|
a0deec5728
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-10 13:18:10 +02:00 |
|
Vivian Meazza
|
4789b0ddcd
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-10 11:09:54 +01:00 |
|
Alexis Bory
|
1de747b211
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
Conflicts:
AI/Aircraft/A-10/Models/A-10.xml
preferences.xml
|
2010-10-10 00:38:53 +02:00 |
|
Alexis Bory
|
41d8443428
|
- local
|
2010-10-10 00:14:08 +02:00 |
|
Alexis Bory
|
baa716b932
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-09 21:51:41 +02:00 |
|
Anders Gidenstam
|
66746acbab
|
Updated mp_broadcast.nas: Added missing var keywords.
|
2010-10-09 21:17:10 +02:00 |
|
BARANGER Emmanuel
|
57b436d199
|
Merge branch 'master' of git://gitorious.org/fg/fgdata
|
2010-10-08 01:42:31 +02:00 |
|
Torsten Dreyer
|
dd9839781f
|
Merge branch 'master' of gitorious.org:fg/fgdata
|
2010-10-07 18:01:05 +02:00 |
|
Torsten Dreyer
|
50287bdee7
|
Remove clouds dialog from multikey
The dialog is gone, use Global-Weather instead.
|
2010-10-07 18:00:32 +02:00 |
|