James Turner
670d790fb2
Add version fields to the About dialog.
2010-11-14 23:59:08 +00:00
Dave Luff
a2ffefc698
Merge branch 'master' of gitorious.org:fg/fgdata
2010-11-14 21:16:19 +00:00
Dave Luff
b8da4fddd5
Cleanup: replace some non-printable junk characters with spaces
2010-11-14 20:56:37 +00:00
Vivian Meazza
a2a50d1d72
Merge branch 'Work' of \New Git\fgdata
2010-11-14 17:16:13 +00:00
Vivian Meazza
8054ad1b19
Merge branch 'master' of gitorious.org:fg/fgdata into Work
2010-11-14 10:01:46 +00:00
BARANGER Emmanuel
ac1f9cadb2
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-11-14 11:00:28 +01:00
Vivian Meazza
4a8a71660e
Merge branch 'master' of \New Git\fgdata
2010-11-14 09:59:52 +00:00
ThorstenB
adbf344559
MP pilot list: fixed window behaviour and "--fg-aircraft" support.
...
Use new "model-installed" property instead of searching directories
directly - which didn't work with new "--fg-aircraft" dirs.
Also, pilot list now keeps its position. Avoid jumping to top-right
corner when updating.
2010-11-13 17:38:37 +01:00
BARANGER Emmanuel
8c838ca3fa
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-11-13 12:07:55 +01:00
Vivian Meazza
6b2e55467e
Merge branch 'Work' of \New Git\fgdata
2010-11-12 22:39:35 +00:00
Martin Spott
a7d18ed158
Merge branch 'master' of gitorious.org:fg/fgdata
2010-11-12 22:18:06 +01:00
BARANGER Emmanuel
a3f838c414
- New input file by _obook
2010-11-12 20:07:43 +01:00
BARANGER Emmanuel
c1fcc59716
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-11-12 01:12:24 +01:00
Detlef Faber
3c44422413
fix typo
2010-11-11 20:29:24 +01:00
BARANGER Emmanuel
36bce14200
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-11-11 01:54:53 +01:00
Vivian Meazza
e6ca5627d3
Merge branch 'Work' of \New Git\fgdata
2010-11-10 23:11:11 +00:00
Torsten Dreyer
b4e885e7fd
Obsolete startup.nas
...
logic from startup.nas is now handled during the initialization
sequence of the idle-loop.
2010-11-10 22:24:51 +01:00
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