1
0
Fork 0
Commit graph

4383 commits

Author SHA1 Message Date
Vivian Meazza
4dbadd7a96 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-20 09:21:32 +01:00
BARANGER Emmanuel
e7fe6239dc Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-20 09:03:38 +02:00
BARANGER Emmanuel
6c956c8755 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-19 15:17:12 +02:00
Vivian Meazza
d13a73f7fd Restore "time" menu item
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-19 11:07:40 +01:00
Vivian Meazza
22d703ad76 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-19 10:19:55 +01:00
Vivian Meazza
f6261f9328 Merge branch 'integration' into Work
Conflicts:
	gui/menubar.xml

Merge Willies and Torsten's menu

Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-18 14:28:14 +01:00
Vivian Meazza
93cc40eafa Remove file
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-18 14:23:24 +01:00
Vivian Meazza
7f16d2877b Merge Willie's menu with Torsten's
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-18 13:24:58 +01:00
Vivian Meazza
aca89b4c69 Merge branch 'integration'
Conflicts:
	gui/menubar.xml

Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-18 13:09:47 +01:00
Vivian Meazza
9fe2172791 Merge commit 'refs/merge-requests/44' of git://gitorious.org/fg/fgdata into integration 2010-09-18 11:55:45 +01:00
Erik Hofman
60fcdd8940 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-14 21:27:13 +02:00
Torsten Dreyer
72468a8686 weather: faster response time for visibility change 2010-09-12 23:06:55 +02:00
Torsten Dreyer
d54f3dbbb8 Merge branch 'master' of gitorious.org:fg/fgdata 2010-09-12 23:05:30 +02:00
Torsten Dreyer
d02cff21cf weather-dialog: handle incoming METAR
metar/data is a tied property, it does not trigger
a listener - metar/valid does.
2010-09-12 23:04:49 +02:00
Detlef Faber
4f63e1e466 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-12 21:37:07 +02:00
Detlef Faber
eaf9a96117 modified Logo System,2 new Logos 2010-09-12 21:33:20 +02:00
Alexis Bory
88445b7e40 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-12 20:29:24 +02:00
Torsten Dreyer
a93bc69add Merge commit 'refs/merge-requests/43' of git://gitorious.org/fg/fgdata into integration 2010-09-12 20:21:47 +02:00
Vivian Meazza
4f9de0b148 Merge branch 'master' of \New Git\fgdata 2010-09-12 09:53:51 +01:00
Torsten Dreyer
17497f3eef Merge branch 'master' of gitorious.org:fg/fgdata 2010-09-11 23:32:55 +02:00
Torsten Dreyer
9bdc9ec4e1 Environment: handle metar-updates-environment
And some minor fixes
2010-09-11 23:32:20 +02:00
BARANGER Emmanuel
1bf61bdbd6 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-11 22:33:59 +02:00
Vivian Meazza
2a4f2a1b02 Merge branch 'master' of gitorious.org:fg/fgdata into Work 2010-09-11 21:14:08 +01:00
Vivian Meazza
df12527209 Merge branch 'master' of \New Git\fgdata 2010-09-11 21:02:29 +01:00
Torsten Dreyer
277575a51e Merge branch 'master' of gitorious.org:fg/fgdata 2010-09-11 22:00:35 +02:00
Vivian Meazza
4c63215780 Add "valid" filter to prevent expired MP tankers from being appended to the tanker list.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-11 20:48:03 +01:00
Torsten Dreyer
4587957bf9 Environment: remove obsolete files 2010-09-11 21:36:19 +02:00
Torsten Dreyer
66f3f67f37 GlobalWeather dialog: cosmetic changes and a bug fix
- Don't refer to the obsolete Weather Conditions and Clouds dialogs
- Nasal based rebuild of the cloud layers are no longer required this way
2010-09-11 21:27:09 +02:00
BARANGER Emmanuel
869a3c68fa Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-11 17:48:15 +02:00
Torsten Dreyer
c6072c9c76 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:15:49 +02:00
Frederic Bouvier
a875bcbbb4 Add forgotten files 2010-09-10 21:49:16 +02:00
Gijs de Rooy
d6f1f1574a Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-10 21:29:55 +02:00
Erik Hofman
bd51740a3f Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-10 16:09:25 +02:00
Frederic Bouvier
a0803ad074 Local Weather v0.85 by Thorsten Renk 2010-09-10 08:52:21 +02:00
willie
408bc4973a some changes made after feedback on IRC
TODO: sort out right-align for keyboard shortcuts
2010-09-09 23:34:23 +01:00
Detlef Faber
2dc2b53a32 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-08 21:25:12 +02:00
Alexis Bory
af30e27a8e Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-08 19:06:24 +02:00
Vivian Meazza
9db93b9d25 Merge branch 'Work' of \New Git\fgdata 2010-09-08 14:04:47 +01:00
willie
fe231637fb minor tidy-up 2010-09-08 00:17:42 +01:00
willie
fe7cfe3b3a removed "housekeeping" files 2010-09-08 00:15:38 +01:00
willie
d70fc6660e reinstated "Scenario"
other small tidy-ups
2010-09-08 00:12:24 +01:00
willie
11f7f2bb5c Merge branch 'master' of git://gitorious.org/fg/fgdata into new-menu 2010-09-07 22:16:18 +01:00
willie
7a8e8af600 minor typo clean up 2010-09-07 20:07:53 +01:00
willie
821fae4a03 further changes to the menu structure
split AI carrier options to its own menu
moved "advanced" menu items to Debug
removed several redundant items
rationalised the placement of some items
started adding keyboard shortcuts

TODO:   reinstate AI Scenario menu item (position to be conmfirmed)
        get feedback
        add more : keyboard shortcuts
2010-09-07 19:59:00 +01:00
Vivian Meazza
b3ba047d5b Merge branch 'master' of git://gitorious.org/fg/fgdata into integration 2010-09-07 16:43:59 +01:00
willie
e78c042724 first trivial changes to menubar.xml for testing 2010-09-07 12:12:32 +01:00
willie
9bcfc7c579 initial commit for new branch "new menu"
added spreadsheet to display current and proposed menu structures
2010-09-07 11:20:33 +01:00
BARANGER Emmanuel
1b6125518f Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-06 18:40:21 +02:00
willie
b028690b71 Merge branch 'master' of git://gitorious.org/fg/fgdata
Conflicts:
	Aircraft/victor/victor-set.xml
2010-09-06 14:31:32 +01:00
Alexis Bory
76db496d5b Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-06 13:33:54 +02:00