Tim Moore
8b03f25e6c
Merge branch 'torsten/auto' into next
2010-02-25 23:21:55 +01:00
torsten
90e313a8dd
New feature: added <logic> "filters"
...
"logic filters" use well known conditions to drive output properties. Example for bax = baz & (foo | bar).
<logic>
<name>my first logic element</name>
<input>
<or>
<property>foo</property>
<property>bar</property>
</or>
<property>baz</property>
</input>
<output>bax</output>
</logic>
2010-02-25 23:21:41 +01:00
Tim Moore
4ae8c90f76
Merge branch 'jmt/font'
2010-02-25 12:06:08 +01:00
Tim Moore
62dfad273c
Merge branch 'jmt/bulk'
2010-02-25 12:05:07 +01:00
Tim Moore
d61d14aa91
Merge branch 'jmt/gui'
2010-02-25 12:04:58 +01:00
Tim Moore
51846e5129
Merge branch 'jmt/gpswidget' into next
2010-02-23 08:53:58 +01:00
jmt
f0e72608a7
waypointList: stop using GNU extension / C99 features.
2010-02-23 08:53:46 +01:00
Tim Moore
da8be3ae7b
Merge branch 'jmt/gpswidget' into next
2010-02-22 09:37:05 +01:00
Tim Moore
247219d1f1
remove trailing slash / empty line from Makefile.am
2010-02-22 09:36:10 +01:00
Tim Moore
de79ec4421
Merge branch 'jmt/gpswidget' into next
2010-02-21 22:26:29 +01:00
jmt
4468d785b5
GPS / route-manager: add new custom widget to display the waypoints list.
...
Supports various new editing features, including dragging to re-order, and
+/- keys to adjust the target altitude for a waypoint. Also displays some
additional information, and will display *even* more once I land airways/
SID/STAR support.
2010-02-21 22:26:14 +01:00
Tim Moore
439700aecd
Merge branch 'durk/traffic' into next
2010-02-21 22:25:56 +01:00
durk
0c522bee02
AI aircraft will need to switch frequencies before being able to request
...
push-back clearance.
2010-02-21 22:25:46 +01:00
Tim Moore
e653ed4598
Merge branch 'jmt/track-bug' into next
2010-02-21 22:24:53 +01:00
jmt
7523f05047
bug #80 , exception flying west from NZAA (Auckland, NZ). The underlying
...
issue is numerical problems in _wgs84_inverse, triggered by the traffic-manager
testing enormous distances geodetically.
Changes
- refactor AISchedule::update, so the aircraft approximate position
calculation is simpler.
- refactor AIAircraft to no longer use exceptions as a return value mechanism
- change AISchedule::update to use cartesian math for in-visible-range check
2010-02-21 22:24:42 +01:00
Tim Moore
ff800ecfd0
Merge branch 'maint' into next
2010-02-21 22:21:53 +01:00
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