Tim Moore
|
6989f4fb35
|
Merge branch 'zan/stencil2'
|
2010-05-06 11:12:53 +02:00 |
|
Tim Moore
|
75c508b82c
|
Merge branch 'vivian/cullsetting'
|
2010-05-06 11:11:51 +02:00 |
|
Tim Moore
|
054b1bb46c
|
Merge branch 'mathias/math'
|
2010-05-06 11:06:37 +02:00 |
|
Tim Moore
|
6f5f39b1e7
|
Merge branch 'fredb/msvc-cleanup'
|
2010-05-06 11:06:24 +02:00 |
|
Tim Moore
|
ca9078f2bc
|
Merge branch 'ehofman/atc'
|
2010-05-06 11:06:11 +02:00 |
|
Tim Moore
|
2a9bf393c3
|
Merge branch 'durk/ai-atc'
|
2010-05-06 11:05:59 +02:00 |
|
Tim Moore
|
3872fce782
|
Merge branch 'torsten/proplist'
|
2010-05-06 11:05:41 +02:00 |
|
Tim Moore
|
e7d58a2023
|
Merge branch 'torsten/local-weather'
|
2010-05-06 11:05:24 +02:00 |
|
Tim Moore
|
26e04d9072
|
Merge branch 'jmt/acinclude'
|
2010-05-06 11:04:42 +02:00 |
|
Tim Moore
|
7f09aa4775
|
Merge branch 'fred/effects-doc'
|
2010-05-06 11:04:27 +02:00 |
|
Tim Moore
|
ff9cf6f8a1
|
Merge branch 'ehofman/sound-reinit'
|
2010-05-06 11:04:16 +02:00 |
|
Tim Moore
|
5889a7148b
|
Merge branch 'ehofman/atc-sound'
|
2010-05-06 11:04:10 +02:00 |
|
Tim Moore
|
78d9cacead
|
Merge branch 'jmt/runway-fix'
|
2010-05-06 11:03:23 +02:00 |
|
Tim Moore
|
28ec7db69d
|
Merge branch 'jmt/view'
|
2010-05-06 11:03:18 +02:00 |
|
Tim Moore
|
103114fd66
|
Merge branch 'syd/ias-limit'
|
2010-05-06 11:01:07 +02:00 |
|
Tim Moore
|
8338e169f4
|
Merge branch 'torsten/commands'
|
2010-05-06 11:01:03 +02:00 |
|
Tim Moore
|
59606f38bf
|
Merge branch 'curt/replay'
|
2010-05-06 11:00:32 +02:00 |
|
Tim Moore
|
ca2afa9e51
|
Merge branch 'ehofman/normal'
|
2010-05-06 11:00:01 +02:00 |
|
Tim Moore
|
d0be86810e
|
Merge branch 'aperry/terrasync'
|
2010-05-06 10:59:21 +02:00 |
|
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 |
|