Tim Moore
b7eb3bd0e1
Merge branch 'maint'
2010-02-21 22:21:46 +01:00
curt
cb2c800434
Add data/Scenery/Airports/ to the data distribution.
2010-02-21 22:21:32 +01:00
Tim Moore
72c9dc1193
Merge branch 'curt/make'
2010-02-17 18:05:23 +01:00
Tim Moore
224afcc7e4
Merge branch 'curt/make' into next
2010-02-17 07:46:38 +01:00
curt
7df30059de
Fix a couple "make dist" glitches.
2010-02-17 07:46:08 +01:00
Tim Moore
ee3acb9e9f
Merge branch 'jmt/bulk' into next
2010-02-17 07:44:36 +01:00
jmt
301f3c5bd6
Quiet: reduce log-level of various things from INFO to DEBUG or BULK, and tune the categories/level of some specific messages.
...
Part of original commit that only applys to master branch.
2010-02-17 07:44:26 +01:00
Tim Moore
351d1ddb5e
Merge branch 'jmt/gui' into next
2010-02-17 07:41:48 +01:00
jmt
4f99561f63
Quiet: reduce log-level of various things from INFO to DEBUG or BULK, and tune the categories/level of some specific messages.
...
Commit split by timoore in order to apply most of it to maint branch.
2010-02-17 07:41:23 +01:00
jmt
26361f2f5a
Bugfix: stop dialogs jumping around when re-layout occurs - make positions persistent.
2010-02-17 07:31:05 +01:00
Tim Moore
4a14f8c107
Merge branch 'jmt/navradio' into next
2010-02-17 07:29:44 +01:00
jmt
3fb898643e
Bugfix: don't crash on localizers with no associated runway (due to inconsistent nav.dat/apt.dat). Reported by Jacob Burbach.
2010-02-17 07:29:30 +01:00
Tim Moore
d2038cdabb
Merge branch 'ehofman/config' into next
2010-02-14 19:49:41 +01:00
ehofman
875a7c5d72
Updates from Geoff McLane
2010-02-14 19:48:04 +01:00
Tim Moore
68cbdcb84e
Merge branch 'vivian/mp' into next
2010-02-14 19:28:33 +01:00
V Meazza
3492c681cb
Change Log Message status from ALERT to DEBUG
...
Signed-off-by: V Meazza <vivian.meazza@lineone.net>
2010-02-14 19:25:12 +01:00
Tim Moore
f9bbf802e9
Merge branch 'jmt/gps' into next
2010-02-14 00:27:41 +01:00
jmt
5ed73d063c
Bugfix: ensure GPS WP1 Mag-bearing is normalised to [0..360]
2010-02-14 00:27:30 +01:00
Tim Moore
bf4b263071
Merge branch 'jmt/font' into next
2010-02-11 00:21:10 +01:00
jmt
73334cf61b
Bugfix #35 / denker #20F:
...
Guard against invalid font names in panel XML files, and make font name
comparisons case-insensitive so that 'helvetica', 'Helvetica' or 'HELVETICA'
work as expected.
2010-02-11 00:20:59 +01:00
Tim Moore
e9d7bf7aa9
Merge branch 'vivian/tachy' into next
2010-02-11 00:13:19 +01:00
Tim Moore
4027a92f88
Only draw tachymetric sight if appropriate inputs exist
...
This avoids triggering asserts for missing inputs.
2010-02-11 00:13:04 +01:00
Tim Moore
658715f90b
Merge branch 'vivian/tachy' into next
2010-02-10 16:30:31 +01:00
Meazza@.(none)
aa8bccf93e
Add Tachymetric Gunsight
...
Signed-off-by: <V Meazza>
2010-02-10 16:19:06 +01:00
Tim Moore
571f7301f2
Merge branch 'zan/stencil2' into next
2010-02-10 15:55:11 +01:00
V Meazza
00a9151b1a
Add Stencil Lighting
...
Signed-off-by: V Meazza <vivina.meazza@lineone.net>
2010-02-10 15:54:48 +01:00
V Meazza
e762551524
MSVC9 fix
...
Signed-off-by: V Meazza <vivina.meazza@lineone.net>
2010-02-10 15:54:48 +01:00
Tim Moore
986f9b7dd1
Merge branch 'ehofman/config' into next
2010-02-10 15:04:10 +01:00
ehofman
83a95fa656
Bail out if one of the required OpenScenegraph libraries was not found.
2010-02-10 15:03:58 +01:00
ehofman
d0f6f748ed
Improve handling of type DOUBLE in generic i/o protocol.
2010-02-10 15:02:49 +01:00
ehofman
6072e3d969
reorganize the code a bit to prevent an infinite loop in ascii mode
2010-02-10 15:02:42 +01:00
Tim Moore
fba05c527f
Merge branch 'torsten/track'
2010-02-10 00:45:28 +01:00
Tim Moore
988a6771aa
Merge branch 'durk/atcdcl-cond'
...
Conflicts:
src/ATC/trafficcontrol.cxx
src/Main/Makefile.am
2010-02-10 00:45:06 +01:00
Tim Moore
992b7ca8f4
Merge branch 'jmt/navradio'
2010-02-10 00:41:52 +01:00
Tim Moore
3e0489bd91
Merge branch 'torsten/auto'
2010-02-10 00:41:44 +01:00
Tim Moore
edd83dd7e8
Merge branch 'jmt/units-fix' into maint
2010-02-09 07:28:03 +01:00
durk
eccc7838b1
Revert previous commit.
2010-02-05 11:20:31 +01:00
durk
ce6e1dc07c
Update version number.
2010-02-05 11:20:26 +01:00
Tim Moore
446c2064a5
Merge branch 'fredb/winbuild'
2010-02-05 00:25:52 +01:00
fredb
8f3c855d00
Update version numbers
2010-02-05 00:25:18 +01:00
Tim Moore
f6b94765b0
Merge branch 'fredb/winbuild'
2010-02-04 22:45:21 +01:00
fredb
445b15aec0
Update Windows packages again (save Terrasync dir location and update install summary)
2010-02-03 07:45:01 +01:00
Tim Moore
729e28754a
Merge branch 'fredb/winbuild'
2010-01-31 18:16:51 +01:00
fredb
dd9e955303
Update Windows packages
2010-01-31 18:14:34 +01:00
Tim Moore
2d6bf222ac
Merge branch 'csaba/nan'
2010-01-31 18:01:33 +01:00
durk
e54798a8e2
A couple of last-minute patched / bugfixes to mitigate the probability of collisions between user controlled aircraft and AI traffic.
...
* AI aircraft distance to user proximity detection works again (lat/lon were inverted).
* The parking uses by the user aircraft is marked as such to prevent it being reused by an AI aicraft
* AI aircraft won't receive permission for pushback until the user aircraft is at a fair distance.
2010-01-31 17:52:43 +01:00
Csaba Halasz
1d8be86335
Fix crab angle and ground speed calculation in AILocalTraffic
2010-01-31 15:22:27 +01:00
jmt
49e477f6a7
Bugfix: ensure navradio nav-loc and has-gs properties clear to false when no valid station is tuned / radio is u/s.
2010-01-31 15:11:25 +01:00
Tim Moore
9197647220
Merge branch 'timoore/ptrfix'
2010-01-28 10:38:33 +01:00
Tim Moore
705c1520dd
Merge branch 'fredb/winbuild'
2010-01-28 10:38:28 +01:00
