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 |
|
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
|
be13f1f3ac
|
Merge branch 'fred/effects-doc' into next
|
2010-03-30 12:22:52 +02:00 |
|
fredb
|
5522dca8ee
|
Synchronize doc
|
2010-03-30 12:22:37 +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 |
|