Erik Hofman
d6e6f85452
don't forget to update the Makefile
2010-07-16 12:31:59 +02:00
Erik Hofman
0b86f8f63c
Sync with JSBSim CVS
2010-07-16 11:05:59 +02:00
Erik Hofman
7053b45c8c
Sync with JSBSim CVS
2010-07-16 08:00:21 +02:00
James Turner
93c6d15e19
Merge branch 'topics/bug141' into next
2010-07-13 20:50:17 +01:00
Torsten Dreyer
e0d30cc412
Compute /position/altitude-agl-ft in MagicCarpet FDM
...
Add the same computation of /position/altitude-agl-ft for
the magic carpet fdm as it is used in the ufo fdm. This
property is used in the environment controller to interpolate
between the individual weather-condition layers.
2010-07-13 21:11:49 +02:00
James Turner
c32da90e5c
Ensure sim/signals/fdm-initialized is only fired on a rising edge; add sim/fdm-initialized as the state value.
2010-07-13 13:47:24 +01:00
Durk Talsma
5c5c52cb9c
Merge branch 'next' of git@gitorious.org:fg/flightgear into next
2010-07-09 07:42:44 +02:00
James Turner
c47d4f2f30
Fix bug 141, by ensuring certain subsystems are assigned to the 'post FDM' group (which is new)
2010-07-08 23:24:39 +01:00
Durk Talsma
74549784b4
Whoops, forgot to add this file.
2010-07-04 21:00:36 +02:00
Durk Talsma
b78bf2e9e6
Make sure that takeoff distance calculations are done in the correct frame of reference. Additionally, add some experimental lead-in distance clipping code (although the latter needs more sophistication, because it leads to a considerable increase of spinning around waypoints when on ground.
2010-07-04 20:57:25 +02:00
James Turner
07d055b4de
One more juggle to appease the linker gods.
2010-07-02 10:00:05 +01:00
James Turner
cfe9aaac4c
Juggle fgfs link order to keep GNU ld happy.
2010-07-02 09:06:57 +01:00
James Turner
37054a4960
Include of aircraft.hxx that slipped under the radar, oops.
2010-07-02 01:03:10 +01:00
James Turner
061699daa7
And removal of the actual files.
2010-07-01 23:15:58 +01:00
James Turner
88e65f7662
aircraft.[cxx|hxx] is gone.
2010-07-01 22:56:22 +01:00
James Turner
18d42ec1af
Rename reInit() method to 'resetSimulator', and document that it's hooked up to the 'reset' command.
2010-07-01 22:50:11 +01:00
James Turner
d279c394d7
Clean fg_init.hxx
2010-07-01 22:43:28 +01:00
James Turner
01e0156b5d
Remove current_aircraft global, fgAIRCRAFT struct, and dead code for reading aircraft dirs.
2010-07-01 22:33:51 +01:00
James Turner
3f26d2b14b
Trivial cleanup commit, to test continuous integration server.
2010-07-01 19:51:05 +01:00
James Turner
fec7cb977c
Clarify warnings from fgUntie, and fix one source of such warnings, in FGInterface.
2010-07-01 02:04:16 +01:00
Torsten Dreyer
c3b9676e22
One more try to fix the Windows build
2010-06-29 17:42:04 +02:00
Torsten Dreyer
598d46529f
Fix three bugs in the new autopilot code
...
- Respect the global inverted flag in the get_output() method
- Check the clock state before processing the static R/S inputs
- Emit debug output only on a state change
2010-06-28 18:20:30 +02:00
Torsten Dreyer
bed15f5315
One more fix for a working windows build.
2010-06-28 13:53:17 +02:00
James Turner
14be21ea5c
Add license / copyright info to newly added files.
2010-06-27 20:34:00 +01:00
Torsten Dreyer
f6ea868804
Fix build on Windows
...
Add missing includes.
Thanks to Alan Teeder
2010-06-27 15:02:59 +02:00
Durk Talsma
3c60bf6511
Make sure also not to try running AI_mgr when compiling fgfs with --disable-atcdcl. FlightGear can now actually run without segfaulting when compiled this way.
2010-06-27 10:08:26 +02:00
Torsten Dreyer
4466729987
fix assertion in sunsolver.cxx with --timeofday=xx
2010-06-26 21:58:45 +02:00
Torsten Dreyer
2e6d7e111a
gcc warning fixes
2010-06-26 21:24:46 +02:00
Torsten Dreyer
f7d0a7bd39
config.h-msvc* restoration
...
As sugested by Frederic, remove the .in files and their reference in
configure.ac, and remove the target files from .gitignore
2010-06-26 20:52:29 +02:00
Torsten Dreyer
e1b9d3d759
Don't crash if built with --disable-atcdcl
2010-06-26 20:24:34 +02:00
James Turner
c04d97b259
LFSGlass was accidently ommitted from the cur_fdm_state removal process.
2010-06-26 18:44:58 +01:00
James Turner
180e524a0e
Fix automake build after mainloop changes - especially, JSBSim includes.
2010-06-26 18:37:51 +01:00
James Turner
a0588272dc
Merge branch 'topics/mainloop' into next
2010-06-26 15:30:00 +01:00
James Turner
4a948f5955
Remove uses of the global FDM interface in the cockpit/HUD code.
2010-06-26 14:21:16 +01:00
James Turner
f9ec605ffb
Fix ordering of aircraft-model updates against flight model.
2010-06-26 10:31:22 +01:00
James Turner
4be1661305
Automake updates.
2010-06-26 10:31:22 +01:00
James Turner
85be9be1e0
Initial work on FDM shell, and removal of cur_fdm_state
2010-06-26 10:31:22 +01:00
James Turner
4756cd4882
Wrap SGEphemeris in a subsytem/property interface, and remove from mainloop.
2010-06-26 10:31:21 +01:00
James Turner
3fbf3aa080
Make FGAircraftModel more subsystem-alike, move update to fgMainLoop.
2010-06-26 10:31:21 +01:00
Erik Hofman
de3afcce99
gcc issues 'format not a string literal and no format arguments' when running -Werror, trick gcc into thinking everything is alright.
2010-06-26 09:36:48 +02:00
Torsten Dreyer
610777ac53
Move the flipflop implementations into the correct namespace
2010-06-25 21:17:13 +02:00
Torsten Dreyer
0a50c16052
Some more src docs for the A/P implementation.
2010-06-25 21:09:37 +02:00
Torsten Dreyer
47c956b516
Some code documentation added to the A/P flip flop implementation
2010-06-25 11:06:00 +02:00
Torsten Dreyer
d558b52cb6
New autopilot subsystem implementation.
...
Split the former single-file-implementation in xmlauto.?xx into multiple
files and use some OO techniques. Started with documentation to be used
with doxygen.
2010-06-24 17:09:33 +02:00
Mathias Froehlich
721ae71cd7
Use simgear abstraction instead of directly osg for the AIBase class.
2010-06-16 07:00:18 +02:00
Tim Moore
0f8312150d
Log OpenGL vendor and version string
2010-06-15 23:58:55 +02:00
Mathias Froehlich
f433f4d973
Default the screen and display number to a value >= 0
2010-06-14 22:05:15 +02:00
Tim Moore
b692a165fb
Remove osgGA/MatrixManipulator include
...
From AndersG; the file is gone from recent OSG.
2010-06-06 23:31:47 +02:00
Torsten Dreyer
6993cd0153
Ignore generated files config.h-msvcXX
2010-06-02 11:49:22 +02:00
Torsten Dreyer
c89b18ddbd
Ignore generated files
...
add generated files to gitignore that has also been in cvsignore
remove generated config.h-msvc* from source control
2010-06-02 11:27:16 +02:00
Torsten Dreyer
8c15899837
Merge branch 'next' of gitorious.org:fg/flightgear into next
2010-06-01 22:10:00 +02:00
Torsten Dreyer
253b14a1cb
Code cleanup, inherit JK, D and T from RS and a bugfix for the logic element
...
- reuse code
- undeclared inputs default to false where applicable
- remove unused tInput
- JK, D and T FF now inherit from RS with dominant R input, so they all
have a R and a S input to preset the output
- fix the nonfunctional <inverted> element of the logic element
2010-06-01 22:08:42 +02:00
Tim Moore
473cea7f17
remove references to osgGA::MatrixManipulator
...
This class has been removed in current OSG sources.
2010-05-31 07:06:55 +02:00
Mathias Froehlich
917524160b
Fix some uninitialized value warnings.
2010-05-29 17:25:02 +02:00
Mathias Froehlich
721566a6e7
Fix some more unitialized value warnings.
2010-05-29 17:17:49 +02:00
Mathias Froehlich
1114c49165
Fix an uninitialized value valgrind warning.
2010-05-29 16:32:38 +02:00
Mathias Froehlich
a565e90c4f
Fix an uninitialized value valgrind warning.
2010-05-29 16:31:58 +02:00
Mathias Froehlich
9626805a09
Fix an uninitialized value valgrind warning.
2010-05-29 16:31:05 +02:00
James Turner
be30c2d53b
Merge branch 'topics/removeab' into next
2010-05-29 10:37:20 +01:00
James Turner
ad19acf1c6
Remove C++ autobrake code - this can all be done easier in XML now!
2010-05-29 10:36:23 +01:00
Torsten Dreyer
54c964aed5
Respect different behaviour of RS and SR flip flops
...
No more invalid states here.
According to IEC 61131, RS flip flop have dominant reset and SR have
dominant set. This is now implemented.
2010-05-27 22:22:01 +02:00
James Turner
321bbeb2e8
Allow 'property' as well as 'prop' to be used in XMLauto <enable> blocks.
2010-05-27 15:20:37 +01:00
James Turner
1d0e9d268a
Support <expression> in autopilot inputs, as well as property and value.
2010-05-26 19:30:33 +01:00
Stuart Buchanan
1a29f4499a
Export the AI object callsign on ballistic impact.
2010-05-24 21:16:46 +01:00
Torsten Dreyer
386aefe693
Merge branch 'next' of gitorious.org:fg/flightgear into next
2010-05-24 12:01:30 +02:00
Torsten Dreyer
9e35d18f2e
Add RS, JK, D and T flip flops as components
...
Flip flops are useful items for data latches and can be used to implement
pushbuttons, glideslope locks etc.
Check http://en.wikipedia.org/wiki/Flip-flop_(electronics)
and http://wiki.flightgear.org/index.php/Autopilot_Configuration_Reference
for details
2010-05-24 11:57:55 +02:00
Jeff Taylor
09f3ee6351
Fix fgviewer segfault
...
fgviewer crashes when reading weird channel options (which it doesn't use).
Here is a patch which fixes this by adding a pointer check.
2010-05-23 20:13:09 +02:00
Torsten Dreyer
a060fe3acf
Stuart Buchanan:
...
A small patch to allow the user to ignore specific
MP aircraft on a per-MP instance basis by setting
"controls/invisible". This
property name was chosen for consistency with the existing property
for AIBallistic objects.
2010-05-20 21:25:37 +02:00
James Turner
38687c9e06
Avoid a crash with out-of-sync airport runway usage and runway definitions.
2010-05-19 23:25:39 +01:00
James Turner
4f89bf7c48
Merge commit 'official/next' into next
2010-05-11 21:08:11 +01:00
James Turner
db60ab08fa
Bug 131, crash with invalid ICAO in the ATCDCL code, replaced an assert with a guard.
2010-05-11 21:06:56 +01:00
Durk Talsma
c64f195523
Just a tiny (cosmetic) change to get some hands on experience with git.
2010-05-11 21:15:23 +02:00
James Turner
45fbd8008d
Support ICAO identifiers with more than four characters, in the AirportsList.
2010-05-09 11:11:52 +01:00
James Turner
8ee27f283e
Add .gitignore files for automake/configure artefacts.
2010-05-06 13:18:55 +01:00
Tim Moore
11a371b313
Merge branch 'mathias/math' into next
2010-05-05 17:02:37 +02:00
frohlich
1797f4cb3e
Use methods from SGMath when possible.
...
Modified Files:
src/Airports/apt_loader.cxx src/Navaids/positioned.cxx
src/Navaids/positioned.hxx
2010-05-05 17:02:27 +02:00
Tim Moore
8f056da618
Merge branch 'jmt/gps'
...
Conflicts:
src/Instrumentation/gps.cxx
src/Instrumentation/navradio.cxx
2010-05-05 16:55:25 +02:00
Tim Moore
50415490e6
Merge branch 'ehofman/atc' into next
2010-05-05 12:03:24 +02:00
ehofman
78ab0dbe59
tie ATIS to the listener position and orientation
2010-05-05 12:03:17 +02:00
Tim Moore
664bb77d95
Merge branch 'jmt/gps' into next
2010-05-05 12:02:16 +02:00
jmt
1222e9b094
Fix a crash if startup fails before the navradio is inited.
2010-05-05 12:02:07 +02:00
Tim Moore
e800461f8a
Merge branch 'durk/ai-atc' into next
2010-05-05 12:00:55 +02:00
fredb
1df4cd3f8c
setState doesn't return a value
2010-05-05 12:00:47 +02:00
Tim Moore
362eb3b670
Merge branch 'durk/ai-atc' into next
2010-05-05 11:59:47 +02:00
durk
e004e43553
Expanded ATC communication between AI aircraft and Airport ground control.
2010-05-05 11:59:37 +02:00
Tim Moore
d35b8db13f
Merge branch 'durk/traffic'
2010-04-25 23:07:16 +02:00
Tim Moore
f5c871c8b3
Merge branch 'ehofman/generic'
2010-04-25 23:06:36 +02:00
Tim Moore
6f9987aae7
Merge branch 'vivian/tachy'
2010-04-25 23:05:36 +02:00
Tim Moore
2bd897df8e
Merge branch 'jmt/navradio'
2010-04-25 23:04:51 +02:00
Tim Moore
eca715f687
Merge branch 'jmt/track-bug'
2010-04-25 23:04:24 +02:00
Tim Moore
7563ece882
Merge branch 'vivian/mp'
2010-04-25 23:03:48 +02:00
Tim Moore
c4e6431aa4
Merge branch 'ehofman/particle'
2010-04-25 23:03:35 +02:00
Tim Moore
0d45920098
Merge branch 'jmt/gps' into next
2010-04-25 18:31:19 +02:00
jmt
3419b28919
MapWidget: fix a crash on uninitialized.
2010-04-25 09:00:41 +02:00
Tim Moore
4fae1160d4
Merge branch 'torsten/proplist' into next
2010-04-19 12:22:48 +02:00
Tim Moore
3e4a592282
Move using declaration out of header file
2010-04-19 12:22:30 +02:00
Tim Moore
0f9f092412
Merge branch 'torsten/proplist' into next
2010-04-19 10:20:13 +02:00
torsten
a464d1b2b2
use simgear::PropertyList instead of std::vector<SGPropertyNode_ptr>
2010-04-19 10:20:03 +02:00
Tim Moore
98e6b8212a
Merge branch 'torsten/auto'
2010-04-19 10:19:42 +02:00
Tim Moore
6e11c83c0a
Merge branch 'torsten/local-weather' into next
2010-04-19 10:08:58 +02:00
torsten
d356f73785
Support for the local weather system from Thorsten Renk
2010-04-19 10:08:41 +02:00
Tim Moore
8b57675aef
Merge branch 'torsten/metar'
2010-04-19 10:07:46 +02:00
Tim Moore
0447581255
Merge branch 'jmt/gps' into next
2010-04-19 09:56:39 +02:00
torsten
0750d8a6d4
gps warning fix (xxx will be initialized after yyy)
2010-04-19 09:56:32 +02:00
Tim Moore
323fb790e7
Merge branch 'jmt/gps' into next
2010-04-19 09:52:43 +02:00
jmt
8ffa65a821
Route-file saving.
2010-04-19 09:52:32 +02:00
jmt
3270a610f8
Support loading plain-text routes, and stop aggressively using the cruise altitude when loading waypoints.
2010-04-19 09:52:17 +02:00
Tim Moore
98cbcb5a2e
Merge branch 'ehofman/atc-sound' into next
2010-04-19 09:51:02 +02:00
fredb
09f8ab61cf
Initialise v1 to avoid a segfault on exit
2010-04-19 09:50:49 +02:00
Tim Moore
fcb255d19e
Merge branch 'ehofman/sound-reinit' into next
2010-04-12 10:02:01 +02:00
ehofman
5d0d6998d2
Don't forget to resume the sound system after reinit
2010-04-12 10:01:51 +02:00
ehofman
2b83ed9cbe
allow reinitializing the sound system by setting /sim/sound/working to false at runtime.
2010-04-12 10:01:28 +02:00
Tim Moore
97a2515443
Merge branch 'ehofman/atc-sound' into next
2010-04-12 09:49:43 +02:00
ehofman
e115201066
Delay loading of the voice file since the sound manager might not be initialized (at all).
2010-04-12 09:49:32 +02:00
Tim Moore
fb361f7463
Merge branch 'jmt/runway-fix' into next
2010-04-12 09:28:32 +02:00
jmt
40b2c3b9f7
Candidate fix for bug #118 , crash with custom (scenery) airport data.
2010-04-12 09:28:00 +02:00
Tim Moore
33aead9a21
Merge branch 'jmt/view' into next
2010-04-03 22:34:15 +02:00
jmt
bc7c3ad4c6
bug99 - Fix case where damping is enabled, but factor is 0.
2010-04-03 22:34:07 +02:00
jmt
a33745e888
Bug #99 - change viewer damping calculation, to work correctly regardless of set/recalc/update ordering per frame.
2010-04-03 22:34:00 +02:00
Tim Moore
cf6cdd0b78
Merge branch 'timoore/getpath-rebase'
2010-03-30 11:49:14 +02:00
Tim Moore
ebdeb3eed3
Merge branch 'jmt/gps' into next
...
Conflicts:
src/Instrumentation/navradio.cxx
2010-03-28 15:32:59 +02:00
fredb
1c7278b474
Initialise member variable
2010-03-28 15:26:43 +02:00
jmt
597df694e3
GPS/route-manager - notify listeners when current waypoint is changed.
2010-03-28 15:26:25 +02:00
jmt
e4c4a3a412
MapWidget for the GUI, initial commit.
2010-03-28 15:25:47 +02:00
jmt
ee8437431a
Expose a flag indicating if the GPS is driving the AP (to give clearer user feedback when that is the case)
2010-03-28 15:21:05 +02:00
Tim Moore
1aff92ce49
Merge to get true base of James' recent gps changes
2010-03-28 15:20:09 +02:00
Tim Moore
39def8132a
Merge branch 'jmt/gpswidget'
2010-03-28 15:15:58 +02:00
Tim Moore
2229af9f78
Merge branch 'ehofman/particle' into next
2010-03-28 00:35:35 +01:00
ehofman
e78c56af7d
Allow particles to be frozen on pause.
2010-03-28 00:35:28 +01:00
Tim Moore
70ebde4488
Merge branch 'jmt/gps' into next
...
Conflicts:
src/Instrumentation/gps.cxx
2010-03-28 00:34:51 +01:00
jmt
4e24fbbb91
GPS: enable switching to OBS/DTO mode with no valid scratch - use active waypoint.
2010-03-28 00:33:44 +01:00
jmt
40e383451b
GPS: add NS and EW velocity computation, which some real-world devices display.
2010-03-28 00:33:29 +01:00
jmt
4265b2e241
GPS: make slaved-to-gps read course from the GPS *when active*, via a listener.
2010-03-28 00:33:13 +01:00
jmt
0be2e03d7e
GPS: fix bugs where GPS overwrites NAV1 course, including --nav1 command line
2010-03-28 00:32:34 +01:00
Tim Moore
37d3cf7fbb
Merge branch 'syd/ias-limit' into next
2010-03-27 19:06:53 +01:00
jmt
5695395dd5
Add Mach/TAS computation to the airspeed indicator.
2010-03-27 19:06:42 +01:00
Tim Moore
dba4a69e2c
Merge branch 'torsten/commands' into next
2010-03-27 15:45:44 +01:00
torsten
5df9f6a951
Code cleanup: reuse duplicate code.
2010-03-27 15:45:25 +01:00
Tim Moore
5a16a28893
Merge branch 'torsten/metar' into next
2010-03-27 14:19:15 +01:00
torsten
26a72a9ee2
Bugfix:
...
- METAR changes caused strong aircraft movements if the station temperature or field elevation changed. Temperature and dewpoint are now also slowly interpolated to reach the new value.
- Probably unnoticed bug: calculation of the interpolation speed was wrong.
- some minor code-cleanup
2010-03-27 14:19:05 +01:00
Tim Moore
b587400846
Merge branch 'curt/replay' into next
2010-03-27 13:48:30 +01:00
curt
b9b6a3a54c
Stomp out a long standing bug in the replay system. Originally we didn't
...
collect flight data while the replay was running, but along the way someone
(who shall remain nameless) tweaked a property name and didn't update the
name in the replay system. This led to a problem where the replay system
continued to collect replayed data into the buffer while it replayed it,
leading to an infinite loop. And then due to the tiered recording rate
system, you would never see the highly detailed final minute of your flight.
This is now fixed!
2010-03-27 13:47:52 +01:00
Tim Moore
f71c094da2
Merge branch 'torsten/auto' into next
2010-03-20 18:46:27 +01:00
torsten
c55874d70e
Fix broken anti windup if the proportional gain runs into the nonlinear area and gets clipped.
...
Also fix the wrong debug message.
2010-03-20 18:46:19 +01:00
Tim Moore
7cde2e800b
Merge branch 'syd/ias-limit' into next
2010-03-20 18:45:52 +01:00
jmt
432da86c7b
Read airspeed-indicator overspeed limit values from instrument configuration, as Syd intended.
2010-03-20 18:45:43 +01:00
Tim Moore
ca346ebc9c
Merge branch 'torsten/js64' into next
2010-03-16 15:13:32 +01:00
torsten
32f8d1a110
Compile again for MSVC
2010-03-16 15:13:24 +01:00
Tim Moore
a357aad365
Merge branch 'syd/ias-limit' into next
2010-03-16 15:12:46 +01:00
jmt
b1855b34c6
Syd Adams: only define overspeed-indicator properties when enabled.
2010-03-16 15:12:38 +01:00
jmt
65ad38ccae
Airspeed indicator: add default values for overspeed, and rename the
...
enable property to 'has-overspeed-indicator'.
2010-03-16 15:12:26 +01:00
Tim Moore
3973637606
Merge branch 'torsten/auto' into next
2010-03-11 09:01:42 +01:00
torsten
f4f784a514
Added anti windup for the pi-simple-controller
2010-03-11 09:01:25 +01:00
Tim Moore
c1e1e2f541
Merge branch 'torsten/js64' into next
2010-03-11 09:01:02 +01:00
torsten
91f0059c89
David Fries:
...
64bit fixes
2010-03-11 08:59:52 +01:00
Tim Moore
dd7a5dd32d
Merge branch 'syd/ias-limit' into next
2010-03-11 08:58:45 +01:00
jmt
45a446dfaf
Syd Adams:
...
add ias-limit (brarber-pole) computation to airpseed-indicator
expose selected DME frequency on the DME instrument
2010-03-11 08:58:23 +01:00
Tim Moore
7ee645aa20
Merge branch 'timoore/getpath-rebase' into next
2010-03-09 11:25:18 +01:00
Tim Moore
7ff80d11a0
changes for SGPropertyNode::getPath return type
...
It's now a std::string.
2010-03-09 11:24:45 +01:00
Tim Moore
fa7d9ed549
Merge branch 'jmt/gps'
2010-03-09 11:20:04 +01:00
Tim Moore
2a0fcea8a5
Merge branch 'vivian/tachy' into next
2010-03-09 10:39:30 +01:00
torsten
cb81aa9f65
one more gcc warning fix: xxx will be initialized after yyy
2010-03-09 10:39:02 +01:00
Tim Moore
cfd243bd95
Merge branch 'torsten/auto' into next
2010-03-09 10:38:43 +01:00
torsten
881d49858d
Just a tiny change adds a <reference> input to FGDigitalFilters. This is nice to have to calculate differences of signals using gain-filters.
...
Old calculation was
output = input * gain
and is now
output = (input-reference) * gain
Note: the PI(D) controller use (reference-input) which effectively reverses the sign. Our notation was picked for backwards compatibility to not break the myriads of <filter> elements currently existing.
All the rest is some code cleanup.
2010-03-09 10:38:32 +01:00
Tim Moore
63434ceef8
Merge branch 'timoore/fire-fix' into next
2010-03-05 18:17:39 +01:00
Tim Moore
b88fa3e1bf
add back wildfire multiplayer property
...
This was deleted by accident when I moved property types to their own
namespace.
2010-03-05 18:17:19 +01:00
Tim Moore
37d0cfd6be
Merge branch 'vivian/tachy' into next
2010-02-26 08:47:41 +01:00
V Meazza
f112fc4638
Revised bugfix for tachymetric gunsight
2010-02-26 08:46:15 +01:00
Tim Moore
0b6579d6fb
Merge branch 'jmt/gpswidget' into next
2010-02-25 23:34:04 +01:00
jmt
8e12b0b679
Make automake happier.
2010-02-25 23:33:43 +01:00
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
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
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
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
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
Tim Moore
7b95bb5aa3
Merge branch 'ehofman/mingw'
2010-01-28 10:38:10 +01:00
Tim Moore
2c3a68ce3e
Merge branch 'ehofman/light'
2010-01-28 10:37:58 +01:00
Tim Moore
6044d929d4
eliminate some SGPropertyNode_ptr variables in classes
...
These were temporary variables that were being deleted explicitly, leading to
various corruption.
2010-01-26 17:19:17 +01:00
Tim Moore
5aea857dd6
initialize track variable in constructors
2010-01-26 11:06:37 +01:00
fredb
00e9ad3055
MINGW patch from Benot Laniel
2010-01-25 17:12:04 +01:00
ehofman
38cd172e82
slightly tweak the ambient color a bit.
2010-01-25 15:22:00 +01:00
fredb
c8ea82ed9d
Update version number
2010-01-25 15:08:10 +01:00
fredb
d367d40f9d
Update FlightGear version
2010-01-25 15:07:52 +01:00
torsten
ac90d8ff8a
bugfix
...
Patrice Poly:
After investigation, it appears that the probes are reversed due to a
little mistake when someone changed how the probe calculations are made.
probe 0 is under the plane. probe 4 should be downwind, probes 1,2 and 3 should be upwind.
2010-01-25 15:06:53 +01:00
Tim Moore
29260852af
Merge branch 'durk/version'
2010-01-25 14:21:53 +01:00
durk
a023700ebe
Update base package version check.
2010-01-21 06:30:35 +01:00
fredb
bf534e1ff9
Update MSVC 9 projects
2010-01-21 06:26:48 +01:00
durk
546d3e265d
And this time, fix it more properly. :-)
2010-01-21 06:25:31 +01:00
durk
16dd34839f
Replacement code for ATCDCL functions are in ATC/atcutils.[ch]xx. Thanks to Alex Buzin for reporting.
2010-01-21 06:25:19 +01:00
Tim Moore
13ec36af42
Merge branch 'jmt/gps'
2010-01-17 10:52:48 +01:00
torsten
33ee43dec0
eliminate gcc warning, unused member depth.
2010-01-17 00:12:23 +01:00
ehofman
8da2f1a31b
Use SGPropertyNode_ptr wherever possible
2010-01-17 00:03:06 +01:00
Tim Moore
c1bb4aec97
Merge branch 'vivian/trainz'
2010-01-17 00:02:51 +01:00
jmt
10d4799058
GPS: improve reliability (at the expense of some in-development features) for pending release.
...
- default to an invalid altitude in routes, instead of cruise altitude (temporarily)
- only set an altitude on the autopilot, if valid
- only add departure airport/runway to the route, if not airborne
2010-01-16 16:00:15 +01:00
jmt
21f1fcd17a
GPS:
...
- relaxed overflight sequencing threshold
- default to linear CDI deviation in the configuration
2010-01-16 16:00:15 +01:00
jmt
2239eb2660
GPS: guard against empty command strings in the route-manager.
2010-01-16 16:00:15 +01:00
Tim Moore
cf9a520a9f
Merge branch 'curt/navradio'
...
Conflicts:
src/Instrumentation/navradio.cxx
2010-01-13 07:37:44 +01:00
Tim Moore
ffb6b95782
Merge branches 'torsten/warn-atc' and 'tortsen/warn-morse'
2010-01-13 07:33:05 +01:00
Tim Moore
98d8a98ef2
Merge branch 'ehofman/sound'
2010-01-13 07:30:52 +01:00
Tim Moore
a89a28c4e6
Merge branch 'ehofman/version'
2010-01-12 09:16:02 +01:00
Tim Moore
3836abcf4b
Merge branches 'jmt/spatial', 'jmt/ref_ptr', 'jmt/navradio' and 'jmt/gps'
2010-01-12 00:09:19 +01:00
Tim Moore
6b90dc2621
Merge branch 'csaba/tower'
2010-01-12 00:07:28 +01:00
Tim Moore
b61f8fba33
Merge branch 'jmt/navaid'
2010-01-11 23:55:17 +01:00