Torsten Dreyer
ac9475f1e5
Merge branch 'master' of gitorious.org:fg/fgdata
2010-11-10 20:56:23 +01:00
Vivian Meazza
2b825164ae
Merge commit 'refs/merge-requests/36' of git://gitorious.org/fg/fgdata into integration
2010-11-09 09:25:52 +00:00
Vivian Meazza
ad1a8893c0
Merge branch 'master' of git://gitorious.org/fg/fgdata into integration
2010-11-09 09:05:53 +00:00
BARANGER Emmanuel
10e708eb18
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-11-09 02:10:47 +01:00
Vivian Meazza
a4cbf745b3
Merge branch 'Work' of \New Git\fgdata
2010-11-08 21:55:18 +00:00
Torsten Dreyer
9ff0bf8a73
FSWeekend insight: make stereo-settings archivable
2010-11-08 11:25:13 +01:00
BARANGER Emmanuel
1c4b91d63e
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-11-07 23:41:59 +01:00
BARANGER Emmanuel
b4d8f82233
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-11-07 13:59:58 +01:00
Vivian Meazza
e3737631c4
Merge branch 'Work' of \New Git\fgdata
2010-11-06 23:53:13 +00:00
Frederic Bouvier
aacc28708a
Merge branch 'master' of gitorious.org:fg/fgdata
2010-11-06 11:28:22 +01:00
Vivian Meazza
a37cd35a23
Merge branch 'Work' of \New Git\fgdata
2010-11-06 00:09:07 +00:00
BARANGER Emmanuel
3bd37ee181
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-11-05 23:08:50 +01:00
Jon Stockill
e76af4553c
Add joystick config to disable known hdd protection accelerometers
2010-11-05 13:26:00 +00:00
Anders Gidenstam
3cea00ac1f
Updated WalkView: Fixed a sign error.
2010-11-05 10:02:11 +01:00
Dave Perry
ce630d2468
Merge branch 'master' of gitorious.org:fg/fgdata
2010-11-04 19:19:57 -06:00
BARANGER Emmanuel
e0f05ae957
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-11-05 00:43:55 +01:00
Csaba Halasz
c9a82d9222
Merge commit 'refs/merge-requests/55' of git://gitorious.org/fg/fgdata
...
Added new aircraft PZL M18B Dromader.
2010-11-05 00:20:43 +01:00
Vivian Meazza
0482c34a2c
Merge branch 'master' of gitorious.org:fg/fgdata into Work
2010-11-04 18:23:30 +00:00
BARANGER Emmanuel
ea88c38384
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-11-04 18:52:30 +01:00
BARANGER Emmanuel
0a3b6128ce
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-11-04 10:28:59 +01:00
Dave Perry
5767e5ee8a
Merge branch 'master' of gitorious.org:fg/fgdata
2010-11-03 17:53:23 -06:00
Martin Spott
1fa95adf25
Merge branch 'master' of gitorious.org:fg/fgdata
2010-11-03 21:49:53 +01:00
Anders Gidenstam
03e25d91cd
Updated WalkView: Added a "class" for conditional constraints.
2010-11-03 20:36:10 +01:00
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
