Tim Moore
|
ed36a06509
|
Merge branch 'torsten/js64'
|
2010-05-06 10:58:58 +02: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
|
dee0b6459e
|
Merge branch 'fredb/msvc-cleanup' into next
|
2010-05-05 16:56:52 +02:00 |
|
fredb
|
84d2f842eb
|
Cleanup MSVC projects, and update readme file
|
2010-05-05 16:56:39 +02:00 |
|
fredb
|
e169de829d
|
Cleanup MSVC projects, and update readme file
|
2010-05-05 16:56:26 +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
|
0f00caa406
|
Merge branch 'ehofman/config'
|
2010-04-25 23:03:29 +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
|
a09a27db95
|
Merge branch 'jmt/acinclude' into next
|
2010-04-19 09:56:10 +02:00 |
|
jmt
|
05abb5ed7a
|
Add pkg-config macros to acinclude.m4, so configure script is generated correctly even if pkg-config is not installed / is installed in a strange location.
|
2010-04-19 09:56:00 +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
|
5f16cadfa5
|
Merge branch 'fred/effects-doc' into next
|
2010-04-12 10:03:08 +02:00 |
|
fredb
|
30e8b6b4fb
|
Synchronize doc
|
2010-04-12 10:03:00 +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 |
|