BARANGER Emmanuel
169ff10cf8
Merge branch 'master' of git://gitorious.org/fg/fgdata
2011-06-13 18:17:47 +02:00
Vivian Meazza
8feb7329df
Merge branch 'master' of gitorious.org:fg/fgdata into Work
2011-06-13 17:00:31 +01:00
Martin Spott
b933b7490b
Fix forgotten move of NaturalCrop type.
2011-06-13 16:05:22 +02:00
Martin Spott
eebadd1561
John Holden: Add naturalcrop terrain textures for a distinct material
...
class.
2011-06-13 15:54:42 +02:00
Martin Spott
96b3335b53
John Holden: Add golfcourse terrain textures for a distinct material
...
class.
2011-06-13 15:23:46 +02:00
Vivian Meazza
5bbbe98c4a
Merge branch 'master' of gitorious.org:fg/fgdata into Work
2011-06-13 11:34:48 +01:00
ThorstenB
c45d7d5665
Revert "Adapting to new screen-shot command"
...
This reverts commit 1b7918f45099275a6c0bb340f3b525b65c9dae9d.
2011-06-13 00:59:34 +02:00
ThorstenB
3e3ecb49e2
Revert "issue #127 : make screen shots work with OSG multi-threading"
...
This reverts commit 5106935b92ad31be69d4ef82ebb34305a658948e.
2011-06-13 00:58:26 +02:00
ThorstenB
b8eecab9cf
Introduce "PRESERVE" flag to protect properties on sim reset.
...
Protect values of some specific properties on sim-reset.
2011-06-12 20:40:11 +02:00
ThorstenB
f84ce36d90
Fixed issue with "unnamed view".
...
Do not show "unnamed views" (views have no name when they belong to
another aircraft).
2011-06-12 15:31:57 +02:00
Vivian Meazza
56c7259d93
Merge branch 'master' of gitorious.org:fg/fgdata into Work
2011-06-10 22:41:04 +01:00
Gijs de Rooy
bef7c3b04b
Add intensity-factor to lightmap shader
2011-06-10 18:51:30 +02:00
Vivian Meazza
bd67875475
Add Day/Night Mask and T/R/REM Lock.
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-06-10 13:36:57 +01:00
Vivian Meazza
cc53219cb9
Add radio type TR1133. This was the standard RAF VHF radio during WWII and after. Under a UK contract, Bendix produced a re-engineered version, the SCR-522. The two radios were functionally identical, and shared a common cockpit control box.
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-06-09 20:32:40 +01:00
Torsten Dreyer
cc37e63561
Fix bug#123: 3d cloud flicker on Mac
2011-06-08 17:08:33 +02:00
ThorstenB
92b3358f83
Moved/re-ordered local weather dialogs
...
as discussed with Thorsten Renk.
Suggestions on better namings for menu items still welcome.
2011-06-06 20:06:52 +02:00
ThorstenB
7db6c6f876
Jetway menu entry.
...
(probably caused by conflicting revert).
2011-06-05 23:38:05 +02:00
ThorstenB
7c8558274a
Turn atc-chatter.nas into a separate submodule.
...
Moved atc-chatter.nas into subdirectory (file unmodified).
Load atc-chatter.nas on demand only.
2011-06-05 23:22:12 +02:00
BARANGER Emmanuel
24776b439b
Merge branch 'master' of git://gitorious.org/fg/fgdata
2011-06-05 22:52:04 +02:00
Durk Talsma
210516d969
Merge branch 'master' of git@gitorious.org:fg/fgdata
2011-06-05 22:20:39 +02:00
Durk Talsma
d97172dbc4
Removal (hopefully temporarily) of the animated jetway code.
...
Motivation for removal: The current implementation is problematic due to hardcoded elevations, and shows some problems when the code is disabled. Additionally, the preferred sequence for committing material to ${FG_ROOT}/data/Models is to commit them to the scenemodels database, from where they are synced with fgdata/GIT.
2011-06-05 22:10:38 +02:00
ThorstenB
c3f8c1478a
tutorial submodule, part #2 : adapt script/GUI to load module on demand
...
tutorial.nas is now loaded (only) when "Start Tutorial" button is pressed.
2011-06-05 21:37:58 +02:00
ThorstenB
f3ff41d3d4
tutorial submodule, part #1 : move existing sources into subdirectory
...
(non-functional, moved original scripts only)
2011-06-05 21:36:24 +02:00
BARANGER Emmanuel
79d2f8fe65
Merge branch 'master' of git://gitorious.org/fg/fgdata
2011-06-05 18:54:40 +02:00
Torsten Dreyer
59579aae9c
Environment: create on (disabled) terrainsampler-instance
...
Only existing instances of the terrain-sampler can be
enabled at runtime, so create at lease one of them.
2011-06-05 14:50:40 +02:00
Martin Spott
803cb56c12
Merge branch 'master' of git.gitorious.org:fg/fgdata
2011-06-04 17:36:32 +02:00
BARANGER Emmanuel
49dc3c0090
Merge branch 'master' of git://gitorious.org/fg/fgdata
2011-06-04 16:06:00 +02:00
Torsten Dreyer
2ba43c2cdf
Anticipating v2.4.0 - bump fgdata version to 2.3.0
2011-06-04 15:54:52 +02:00
ThorstenB
910cda3fce
Tutorials: improve timing when repeating messages
...
Don't confuse user by repeating messages when he just fulfilled the
tutorial's step exit condition.
2011-06-04 14:14:49 +02:00
BARANGER Emmanuel
e80490ff30
Merge branch 'master' of git://gitorious.org/fg/fgdata
2011-06-03 22:54:07 +02:00
ThorstenB
f2d2b8e8b1
issue #281 : tutorial's view direction messed-up/unusable by outside views
...
When user switched to a different view mode (e.g. chase/helicopter/tower
view) before or during a tutorial, everything went wrong...
Need to control (save/restore/switch) the view number (view mode) during
tutorials. Also adds an option to explicitly change view mode during
a tutorial, i.e. tutorials can switch to tower view, chase view, ... now.
2011-06-03 00:39:05 +02:00
BARANGER Emmanuel
957305f41b
Merge branch 'master' of git://gitorious.org/fg/fgdata
2011-06-02 21:36:27 +02:00
Durk Talsma
4715768478
Merge branch 'master' of git@gitorious.org:fg/fgdata
2011-06-02 19:22:23 +02:00
Durk Talsma
684e2a9912
Merge commit 'refs/merge-requests/92' of git://gitorious.org/fg/fgdata into merge-requests/92
2011-06-02 19:17:43 +02:00
ThorstenB
f082300e20
Tutorial improvements
...
Make tutorial dialog a proper window, clean-up menu.
Show welcome message to new user when tutorial available.
Repeat current tutorial message, when no user progress.
2011-06-02 19:11:05 +02:00
BARANGER Emmanuel
39717d5a56
Merge branch 'master' of git://gitorious.org/fg/fgdata
2011-06-02 15:10:11 +02:00
Durk Talsma
ecfc088a4f
Merge commit 'refs/merge-requests/95' of git://gitorious.org/fg/fgdata into merge-requests/95
2011-06-02 09:26:11 +02:00
ThorstenB
9077868e27
Adapting to new screen-shot command
...
Success/error report is now automatically displayed by a listener.
Thanks Gijs!
2011-06-01 23:47:18 +02:00
Vivian Meazza
5c10b7204b
Merge branch 'integration' into Work
2011-06-01 21:03:17 +01:00
Detlef Faber
7943e3c4b2
Merge branch 'master' of git://gitorious.org/fg/fgdata
2011-05-31 21:10:58 +02:00
Ryan Miller
8dcbb39e0f
Remove incorrect jetway editor export message
2011-05-30 17:13:19 -07:00
Alexis Bory
b0a80edcc2
Merge branch 'master' of git://mapserver.flightgear.org/fgdata
2011-05-30 20:02:57 +02:00
Alexis Bory
35ee33d7f6
Thanks Torsten Dreyer, fix a few instance of the US mil standard altimeter so the drums
...
settle at the full digit and not 25% off.
2011-05-30 20:00:58 +02:00
Torsten Dreyer
bef8f1fc6e
Fix bug #280 . Allow setting of weather-scenario at runtime
...
Add a listener to /environment/weather-scenario to allow setting
the scenario at runtime. Need some cleanup of the global weather
dialog to remove duplicate code.
2011-05-30 17:21:31 +02:00
BARANGER Emmanuel
e1b82c3a3a
Merge branch 'master' of git://gitorious.org/fg/fgdata
2011-05-29 22:19:39 +02:00
Alexis Bory
9a5cee138f
Merge branch 'master' of git://mapserver.flightgear.org/fgdata
2011-05-29 15:56:04 +02:00
Detlef Faber
c0563bbd66
Merge branch 'master' of git://gitorious.org/fg/fgdata
2011-05-29 09:52:58 +02:00
BARANGER Emmanuel
563d50aafa
Merge branch 'master' of git://gitorious.org/fg/fgdata
2011-05-29 01:01:19 +02:00
ThorstenB
b34be9cf92
issue #127 : make screen shots work with OSG multi-threading
...
Use listener to report success/error messages for screen shots
(depends on simgear+fgdata update!)
2011-05-28 23:22:34 +02:00
ThorstenB
ac46479d0a
Adjust balloon position on sim-reset
...
It's annoying when balloons appear exactly at the current a/c position
on sim reset, since the a/c gets knocked over etc.
(Balloon scenario still won't work properly after a sim-reset, so another
fix is required...).
2011-05-27 22:10:52 +02:00