1
0
Fork 0
Commit graph

8937 commits

Author SHA1 Message Date
Erik Hofman
4b8fde057b Sync. with JSBSim CVS 2010-09-19 11:16:29 +02:00
Anders Gidenstam
cf4d0fb0e3 Restored src/AIModel/AIShip.hxx to unix line endings. The last step of
rebasing merge-request #6 for inclusion.
2010-09-17 22:03:00 +02:00
Vivian Meazza
474789269b Bugfix - untie property.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:44:58 +02:00
Vivian Meazza
00f26994b2 Add <name> tag so that AIWingman or other suitable AI Object can be attached.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:44:58 +02:00
Vivian Meazza
1dc3ecf016 Make AI Objects of type Wingman, Escort, and GroundVehicle able to be stationed or formated to any AI Object type which can be named - Carrier, Ship, Tanker, Wingman etc.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:44:58 +02:00
Vivian Meazza
f08012d14f Remove debugging statement.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:44:58 +02:00
Vivian Meazza
b22960ffff Associate submodels with parent AI Objects.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:17:56 +02:00
Vivian Meazza
2758f07df0 Use AIBase method setParentNode() vice the local method.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:17:56 +02:00
Vivian Meazza
afbc360eed Add callsign for consitency.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:06:35 +02:00
Vivian Meazza
c7e864cee9 Move methods "setParentNode()" etc. to make them available to all AI Objects.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:06:35 +02:00
Vivian Meazza
b4fbde72b2 Enable Ballistic objects to be slaved to any AI Object.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:06:35 +02:00
Torsten Dreyer
a5017f218f Fix mean nasal bug when calling setprop("foo")
Reported on the forum from Thorsten Renk and analyzed by
Hooray, fixes this issue:
var x="/test/X";
var y="/test/Y";

setprop(x,100); # sets x=100
setprop(y); # sets x=0

setprop(x,100);
setprop(200); # sets x=200

by checking for at least 2 parameters for setprop
2010-09-13 22:15:50 +02:00
Torsten Dreyer
31a807563b Fix static initialization order trouble on OSX 2010-09-13 21:21:10 +02:00
Erik Hofman
f75656ea59 Allow for scenery de-saturation 2010-09-12 11:06:14 +02:00
Frederic Bouvier
b140544344 Fix MSVC 100 project files updated by hand 2010-09-11 23:31:01 +02:00
Frederic Bouvier
121190e73a Merge branch 'next' of git://gitorious.org/fg/flightgear into next 2010-09-11 22:14:07 +02:00
Torsten Dreyer
f3af5ae5dc Be a bit more descriptive on "PT_vs_hpt: ran out of layers"
Please enter the commit message for your changes. Lines starting
2010-09-11 21:33:17 +02:00
Torsten Dreyer
814daa3365 Environment bugfix: don't write unchanged cloud coverages
Only write out changes of the cloud layer to avoid regeneration
of the cloud layers if nothing has changed
2010-09-11 21:23:11 +02:00
Torsten Dreyer
04d0b339a8 Environment overhaul: add terrainsampler to the vc projects 2010-09-11 21:05:06 +02:00
Torsten Dreyer
1a3eddbbcd Keep MSVC happy with the Environment updates 2010-09-11 20:32:37 +02:00
Torsten Dreyer
5c6fe95259 Environment controller overhaul
This is the initial commit for a reworked environment controller.
The main intention is to decouple the individual modules like
metar fetch, metar properties, environment interpolation etc.
to make it easier for other weather module developers to modify
environment settings.
As a side effect, the dialogs for weather-scenario, weather-conditions,
clouds and precipitations have been merged into a single dialog
2010-09-11 16:11:35 +02:00
Frederic Bouvier
04f09258c4 Merge branch 'next' of git://gitorious.org/fg/flightgear into next 2010-09-09 19:54:44 +02:00
Csaba Halasz
fdbfd6fd0b Merge commit 'refs/merge-requests/1552' of git@gitorious.org:fg/flightgear into next
Conflicts:

	src/MultiPlayer/multiplaymgr.cxx
2010-09-09 00:48:17 +02:00
James Turner
7227973e2f Don't expect an 'Aircraft' sub-directory within each aircraft-dir. 2010-09-08 11:01:26 +01:00
James Turner
e8b0bb872a Register the aircraft resource provider. 2010-09-06 22:57:48 +01:00
James Turner
18a5a2a144 Fix one more place to use path resolution
(and hence work with multiple aircraft dirs)
Thanks to Jentron for the catch.
2010-09-06 16:10:58 +01:00
James Turner
8330449c5f Pass current-dir into XMLSound
(and update to revised SGSoundSample ctor)
2010-09-06 09:28:28 +01:00
James Turner
a7a2cb393a Use the new Simgear ResourceManager to resolve paths. 2010-09-06 09:13:10 +01:00
James Turner
8a97ed354d Fix submodel code to work with multiple aircraft dirs. 2010-09-06 09:12:25 +01:00
Frederic Bouvier
4175619392 Merge branch 'next' of git://gitorious.org/fg/flightgear into next 2010-09-05 16:59:26 +02:00
Torsten Dreyer
1e43675f61 Expose some OSG DisplaySettings to the property tree 2010-09-05 11:56:38 +02:00
Durk Talsma
aba57077fd Issue a warning when finding duplicate tail numbers. Note that this is far from a fatal error, but does interfere with the startup heuristics data collection mechanism. 2010-09-03 12:32:55 +02:00
Durk Talsma
8112ff5842 Merge branch 'next' of git@gitorious.org:fg/flightgear into next 2010-09-03 10:57:27 +02:00
Durk Talsma
558582b58d * A few new features to allow database management and traffic pattern developement:
--prop:/sim/traffic-manager/dumpdata=true: dumps the currently loaded datafile to the console for inspection.
  --prop:/sim/traffic-manager/datafile=/path/to/somefile.xml: Skips autoscanning and reads traffic only from the specified xml file.
  --prop:/sim/traffic-manager/datafile=/path/to/somefile.conf: Slips autoscanning and reads traffic from a plain text file, as described on the forum/wiki

* Removed the use of pointers for heuristics calculations, as urged by Frederic Bouvier
* Fixed domain error in proportion calculation during loading, resulting in random skipping of aircraft, as reported by Jorg van der Venne.
2010-09-03 10:47:05 +02:00
Anders Gidenstam
a9062080b0 Restored line endings in src/MultiPlayer/multiplaymgr.cxx.
Please check that the line endings are not messed up before mergeing.
2010-09-02 20:07:34 +02:00
Anders Gidenstam
95a7e177d7 Restored line endings in src/AIModel/AIMultiplayer.cxx.
Please check that the line endings are not messed up before mergeing.
2010-09-02 19:46:44 +02:00
Vivian Meazza
2cdc9f6461 Merge branch 'next' of D:\Git_New\flightgear into next 2010-09-02 09:27:18 +01:00
Vivian Meazza
9018d65c52 Add contrail as a standard property
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-02 09:25:53 +01:00
Vivian Meazza
bc12f0be21 Walk the AImodels property tree only once at init, rather than at update. Should have a beneficial effect on frame rate, but in practice makes no discernible improvement. It is cleaner code though.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-02 09:24:45 +01:00
Frederic Bouvier
a2ffbba23e Merge branch 'next' of git://gitorious.org/fg/flightgear into next 2010-09-01 19:24:44 +02:00
Csaba Halasz
d8165470c3 Merge commit 'refs/merge-requests/6' of git@gitorious.org:fg/flightgear into next 2010-08-31 22:39:34 +02:00
Durk Talsma
800352e26f - Whoops, missed committing this tiny but fatal-if-not-included change. 2010-08-31 16:57:07 +02:00
Durk Talsma
eb45d524a8 Provide an initial heuristic for airports for which we haven't collected any usage data yet. 2010-08-31 13:21:30 +02:00
Durk Talsma
f2bca353ad Merge branch 'next' of git@gitorious.org:fg/flightgear into next 2010-08-30 21:15:17 +02:00
Durk Talsma
b090d3dabc Enable the collection of AI aircraft position statistics. This will allow for a dramatic speedup of the establishment of AI traffic after program initialization. 2010-08-30 21:13:16 +02:00
Vivian Meazza
792cb2701f Add tanker property to list of standard properties
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-30 17:16:30 +01:00
Vivian Meazza
118036cdda Make the parameter isTanker controllable
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-30 17:15:34 +01:00
Vivian Meazza
8ca420ec53 Merge branch 'next' of D:\Git_New\flightgear into next 2010-08-30 09:49:42 +01:00
Frederic Bouvier
e168260a4f Merge branch 'next' of git://gitorious.org/fg/flightgear into next 2010-08-29 20:09:29 +02:00
Frederic Bouvier
0bce31ae9a Merge branch 'master' of git://gitorious.org/fg/flightgear into next 2010-08-29 20:09:07 +02:00