1
0
Fork 0
Commit graph

9469 commits

Author SHA1 Message Date
Durk Talsma
dee72d3434 * First test scenario to get user ATC interaction working. 2011-04-14 17:51:46 +02:00
Durk Talsma
c597f72158 Added some interface function to traffic manager related classes and added a traffic record that mimicks the users aircraft's traffic intentions. 2011-04-12 23:28:48 +02:00
Durk Talsma
493661a2dc Small step forward: Ensure that traffic information is appropriately updated. 2011-04-11 22:23:53 +02:00
Durk Talsma
416ba93a41 Merge branch 'next' into durk-atc 2011-04-11 20:51:16 +02:00
Erik Hofman
05a2eff317 One step ahead of JSBSim CVS. 2011-04-11 10:06:57 +02:00
Durk Talsma
819e6a04fa Some more work on AI/ATC interaction.
* Added an AIAircraft that is shadowing the user aircraft's behavior, in terms of AI / ATC interactions
* Set up a shadow AI FlightPlan that is used for tracking the user's aircraft.
2011-04-10 12:46:00 +02:00
Durk Talsma
e04d2f8ba9 Assigned an ATC controller to the user's Aircraft and change the comm1 radio frequency according to the frequency relevant to the current scenario. 2011-04-10 08:58:48 +02:00
Durk Talsma
3455079060 Added a simple dialog, just as proof-of-principle. 2011-04-06 19:48:54 +02:00
Durk Talsma
ff4004b261 Some further testing of the ATC Dialog infrastructure. 2011-04-05 18:13:11 +02:00
Durk Talsma
49677f512b Merge branch 'next' into durk-atc 2011-04-04 20:33:41 +02:00
ThorstenB
82f6d29f9f Improve OSG caching.
Ensure property tree is provided early to modellib.
To disable: --prop:sim/rendering/cache=0 (enabled by default)
(also requires simgear update)
2011-04-03 19:13:51 +02:00
Durk Talsma
52b0baace1 adding changed files for previous commit. 2011-04-03 17:58:16 +02:00
Durk Talsma
48bb176e87 Start of adding interaction between the user controlled aircraft and AI traffic, by means of ATC.
* Started transfering the ATC infrastructure to be driven by it's own subsystem
* Changed the bahavior of the "'" key so that it is no longer driven by ATCDCL, but it now triggered by the new subsystem based ATC module.
2011-04-03 17:39:35 +02:00
ThorstenB
93180eb004 On-demand loading of Nasal modules.
Load a module whenever its /nasal/foo/enabled flag is set,
even if it was disabled at start-up. Also expose a property if it was
successfully loaded.
2011-04-03 15:30:25 +02:00
ThorstenB
731e803223 Minor clean-up (fixed renamed subsystems) 2011-04-02 15:15:59 +02:00
ThorstenB
298f832d43 Support optional Nasal modules in fgdata/Nasal/MyModuleFoo
- Allow structuring generic Nasal sources into modules (i.e. support
  separate source folders for multiplayer/local weather/... sources)
- Option to enable/disable loading of generic Nasal modules (i.e we only
  need to load stuff that is really needed/enabled).
- Provide basic loading sequence: subfolders are strictly loaded _after_
  the base directory. So submodules can rely on .nas-scripts like math.nas,
  io.nas, debug.nas, ... to be already loaded - dropping the need for
  awkward listeners/timers to delay module initialization (loading order
  within Nasal/*.nas is still random)
2011-04-02 15:15:59 +02:00
ThorstenB
4141b80b0c fix #296: FDMshell+TankProperties not bound after sim reset
Well, when we need to unbind something temporarily, it's wise to really
bind it again...
2011-03-29 23:31:59 +02:00
ThorstenB
7ec9d036d6 Renaming / more consistent naming. 2011-03-28 00:30:23 +02:00
ThorstenB
dca2132087 New property reporting worst-case frame latency.
Shows maximum latency of any frame within the last second.
2011-03-28 00:16:27 +02:00
ThorstenB
d7798a7cc2 Slightly brighter blue color level for map widget
Almost couldn't see the new blue color on my screen.
Enjoy the blues... :)
2011-03-27 11:32:41 +02:00
Stuart Buchanan
23971c17aa Improve display of shipping in map widget. 2011-03-26 11:02:00 +00:00
ThorstenB
d051b800cc Minor replay issues
restore most recent frame
2011-03-24 23:41:12 +01:00
ThorstenB
3a90186341 Minor replay issues
When disabling replay: don't clear buffers and restore most recent frame
2011-03-24 23:30:09 +01:00
Curtis L. Olson
4920e896dd Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-03-24 14:32:50 -05:00
Curtis L. Olson
6a864eb57f Variant of innosetup config file for developer snapshot release. Uses separate
paths so it can install along side the official release and not overwrite or
conflict with any files.
2011-03-24 14:31:13 -05:00
ThorstenB
11320e6b00 Bertrand Coconnier: Fix instant replay with JSBSim aircraft (bug #294)
Avoid re-trim to be triggered by property listeners during instant
replay (when the FDM is suspended).
2011-03-23 23:52:36 +01:00
ThorstenB
38226af24e Improve timing statistics
Enable/disable and print statistics at run-time.
Configurable intervals and filters.
2011-03-23 23:09:02 +01:00
ThorstenB
b4c47b06d5 Drop unnecessary include dependency.
Make Csaba happy...
2011-03-23 22:50:56 +01:00
ThorstenB
189457f2af Minor namespace issue
using "using" in the .cxx now :)
2011-03-23 22:49:18 +01:00
ThorstenB
5ace4e9632 Fix reset during replay issue
Need to properly reset the replay manager's states on sim reset.
Also remove obsolete method.
2011-03-22 21:02:57 +01:00
Torsten Dreyer
0114fd962e Fix broken tank properties. More verbose generic protocol error messages 2011-03-22 18:00:55 +01:00
ThorstenB
991beb0b5e replay/FDM shell subsystem refactoring
Move final bits of replay code to where it belongs.
Use subsystem suspend/resume for FDM shell during instant replay.
2011-03-21 23:07:05 +01:00
ThorstenB
b6d70d2c71 Replay improvements
Clear replay buffers on sim reset.
Allow instant replay to be activated properly when sim is paused.
2011-03-20 15:03:47 +01:00
Erik Hofman
51a6302f48 Make sure Include/config.h gets found which is located in /src 2011-03-19 16:04:32 +01:00
ThorstenB
befc533398 More virtual destructors. 2011-03-19 15:02:17 +01:00
ThorstenB
4b74636d04 Avoid nuisance sound effects after sim-reset. 2011-03-19 14:51:39 +01:00
ThorstenB
badec14d27 Cut&paste voiceplayer into a separate module.
GPWS and TCAS are now completely separate - but use the same voice player.
2011-03-09 23:49:25 +01:00
ThorstenB
59f2328551 Used tied property list. 2011-03-09 23:10:55 +01:00
ThorstenB
b3d59ed563 Fixed an property tieing issue on sim reset.
Oops, my commit f6fde388a2 untied the
tank properties also on reset - should also re-tie them after the
reset then...
2011-03-09 23:02:19 +01:00
ThorstenB
18ada05d41 Fix navreceiver to make DME work with ILS signals.
Property "dme-in-range" should also work with ILS signals, which include
a DME. The nav database (dme_list) doesn't have separate entries for
"ILS-DME" (unlike for "VOR-DME"), so searching a DME by frequency didn't
work for ILS.
=> "instrumentation/nav[*]/dme-in-range" can now be used to enable/disable
cockpit DME displays.
2011-03-09 22:04:03 +01:00
ThorstenB
f6fde388a2 Untie all TiedPropertyLists before destruction.
Untieing needs to be done prior to the destruction of the object which
aggregated the TiedPropertyList. So the TiedPropertyLists destructor can't
untie the properties automatically (and it doesn't). So, do some manual
clean-up.
2011-03-07 19:38:48 +01:00
ThorstenB
4761a3cdcf Fix another (tiny) memory leak.
SGCloudField::addCloud does *not* keep a reference to SGNewCloud - so we
only need a temporary object. Also adapt to changed addCloud interface
to make things a little more obvious.
2011-03-07 19:38:48 +01:00
Csaba Halasz
ae8438333c Quick fix for ascii generic input line separator problem 2011-03-06 02:38:39 +01:00
Curtis L. Olson
12f694f06d Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-02-28 08:10:15 -06:00
Curtis L. Olson
7393b11d0a Variant of the iss script for packaging "developers snapshot" releases.
Paths and variables have been carefully selected so this install can
coexist with the release install.  The only thing shared is the "terrasync"
directory.
2011-02-28 08:08:08 -06:00
Torsten Dreyer
1050a35d92 prepare for subsystem_mgr.hxx no longer including props.hxx
subsystem_mgr.hxx will soon no longer include props.hxx since it
does not (need to) know about properties at all.
2011-02-27 12:53:47 +01:00
ThorstenB
61186fb6f9 Ooops. Forget the "other" OS...
... well, how did this happen? :)
2011-02-26 00:11:28 +01:00
ThorstenB
645ef8036a TCAS clean-up.
Change default voice samples.
2011-02-25 21:12:35 +01:00
ThorstenB
f6b9c5b908 Make AIplanes respond to TCAS RAs. 2011-02-25 21:12:35 +01:00
ThorstenB
27a0ff5442 Added tracker stage to TCAS.
Added relative/absolte altitude display mode to wxradar.
2011-02-25 21:12:35 +01:00