Alexis Bory
b4667447c7
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-11-02 23:14:37 +01:00
Vivian Meazza
aa8d6cc0b7
Merge branch 'master' of gitorious.org:fg/fgdata into Work
2010-11-02 21:42:51 +00:00
Frederic Bouvier
7c608c2003
Restore QDM urban shader technique for quality level >= 4
2010-11-02 22:31:39 +01:00
Vivian Meazza
1416cf3bed
Merge branch 'master' of \New Git\fgdata
2010-11-02 21:28:27 +00:00
Frederic Bouvier
a653f4bcdb
Merge branch 'master' of gitorious.org:fg/fgdata
2010-11-02 21:44:34 +01:00
Frederic Bouvier
235395e573
Revert accidental change to joysticks.xml
2010-11-02 21:33:55 +01:00
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
ThorstenB
9a590d3e61
Added missing buttons to AI options dialog.
...
Renamed "ATC/AI" to "AI" since ATC options are no longer available.
2010-11-02 19:41:00 +01:00
Dave Perry
67b7161112
Merge branch 'master' of gitorious.org:fg/fgdata
2010-11-02 08:20:06 -06:00
Anders Gidenstam
5ecdf0f878
Updated WalkView: Added a makePolylinePath convenience function.
2010-11-01 22:46:23 +01:00
Anders Gidenstam
7b08e91f7b
Updated Walk View: Unified all "class"/"type" names to begin with a capital letter.
2010-11-01 21:33:24 +01:00
Anders Gidenstam
4c694b2bc2
Updated WalkView: Added a circular surface constraint.
2010-11-01 21:33:15 +01:00
Vivian Meazza
a36716725f
Merge branch 'master' of gitorious.org:fg/fgdata into Work
2010-11-01 17:58:47 +00:00
ThorstenB
5612cd36dd
Horse/cow (scenery) culling...
...
Removed since this caused severe scenery (un)loading issues with osg.
Scenery nodes with too many parents cause extreme delays when unloading tiles.
=> Need a better cow/horse-herd implementation! :)
2010-11-01 17:47:08 +01:00
ThorstenB
5889a5c4e4
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-11-01 16:49:34 +01:00
Anders Gidenstam
4692db87d6
Updated WalkView: Added a more general area constraint: linePlane.
2010-10-31 22:08:55 +01:00
Detlef Faber
e00d8d30ea
generic logos: add Logo of the day >:)
2010-10-31 16:36:20 +01:00
Anders Gidenstam
1ff1469fc1
Updated WalkView:
...
- Added a default key binding file.
- Improved the documentation.
2010-10-31 12:35:55 +01:00
Vivian Meazza
be61cc6e89
Merge branch 'master' of \New Git\fgdata
2010-10-31 09:46:14 +00:00
Anders Gidenstam
81e0e06a31
Input/Joysticks/Saitek/Pro-Flight-Quadrant.xml:
...
- Improved multi-mode axis control with the new per-engine axis handlers.
- Prepared all bindings for per-OS number selection
2010-10-30 16:42:07 +02:00
Anders Gidenstam
00cbdf38b7
Input/Joysticks/Saitek/Aviator.xml: Improved the joystick configuration.
...
- Prepared all bindings for per-OS number selection
- Use the new per-engine axis handlers.
- Added missing var keywords.
2010-10-30 13:31:15 +02:00
Anders Gidenstam
d373245285
Nasal/controls.nas: Added per-engine axis handlers.
2010-10-30 13:26:55 +02:00
BARANGER Emmanuel
6e0bcfa6ef
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-29 23:50:07 +02:00
Anders Gidenstam
357335521b
joysticks.xml: Manual revert of unintended changes from Alexis merge.
2010-10-29 20:43:09 +02:00
Anders Gidenstam
757ec0e6be
preferences.xml: Manual revert of unintended changes from Alexis merge.
2010-10-29 20:42:45 +02: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
ThorstenB
3fcbf63720
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-23 01:15:25 +02:00
Alexis Bory
1dd4b8defe
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-22 20:29:18 +02:00
ThorstenB
0ebe5b0f2e
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-20 20:46:39 +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
ThorstenB
d5c6300ee9
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-16 21:00:00 +02:00
ThorstenB
55ca38d45f
Merge branch 'master' of git://gitorious.org/fg/fgdata
...
Conflicts:
gui/dialogs/location-in-air.xml
2010-10-16 20:59:47 +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
