fly/fgdata
1
0
Fork 0
Code Activity
4260 commits 7 branches 0 tags 4.4 GiB
Commit graph

4260 commits

This branch
This branch
All branches
Author SHA1 Message Date
Erik Hofman
e42dcefbae Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-10-01 13:24:24 +02:00
Csaba Halasz
125ff9dd38 Merge commit 'refs/merge-requests/50' of git://gitorious.org/fg/fgdata 2010-09-29 22:59:35 +02:00
Erik Hofman
6822980bef Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-29 15:58:29 +02:00
BARANGER Emmanuel
3adcf06add Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-29 02:57:27 +02:00
Csaba Halasz
55ad44b67e Merge commit 'refs/merge-requests/48' of git://gitorious.org/fg/fgdata 2010-09-29 01:31:03 +02:00
Torsten Dreyer
351114b999 Fix line endings 2010-09-28 08:58:02 +02:00
Stuart Buchanan
7ee83e19df Modify chat key handler, so excessive backspaces doesn't enable the autopilot. 2010-09-27 21:13:30 +01:00
BARANGER Emmanuel
9c3fd34f04 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-26 18:47:38 +02:00
Torsten Dreyer
5edf6cae9b reflect recent weather changes in startup.nas 2010-09-26 17:07:24 +02:00
Stuart Buchanan
5d2845a540 Minor change to urban shader to mak building sides vertical. 2010-09-25 22:28:56 +01:00
BARANGER Emmanuel
68b850a385 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-25 15:54:00 +02:00
Durk Talsma
29820a9584 Make GUI input for the transition effect persistent across sessions. 2010-09-25 15:30:53 +02:00
Erik Hofman
a5038b2c4d Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-25 15:23:12 +02:00
Torsten Dreyer
b12833b221 Merge branch 'master' of gitorious.org:fg/fgdata 2010-09-25 15:16:22 +02:00
Torsten Dreyer
d80e08992e add "local weather config" to the menubar 2010-09-25 15:12:34 +02:00
BARANGER Emmanuel
c8a376945b Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-25 08:36:25 +02:00
BARANGER Emmanuel
c7bf747b50 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-24 00:43:23 +02:00
Erik Hofman
168fead4ee Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-23 20:45:02 +02:00
Torsten Dreyer
284a283acb Some fixes for the GlobalWeather dialog 
- make aloft and boundary data editable in "Disabled" mode
- make aloft and boundary data not-editable in other modes
- fix live-update issues on many input fields
 2010-09-23 20:31:57 +02:00
Torsten Dreyer
b535d797a0 Cleanup of stereoscopic view options dialog 
Rename OSG Display Settings dialog to Stereoscopic View Options
and move the Menubar element from Debug to View
 2010-09-23 19:59:18 +02:00
BARANGER Emmanuel
8e58c5f9a3 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-23 18:46:41 +02:00
Frederic Bouvier
0b0012d158 Change effect name inside the file 2010-09-23 08:20:05 +02:00
willie
aa4a2db5e4 renamed "General" back to "File" commented out "Load/Save Flight" 
in response to feedback on dev list and IRC, "General" reverts to "File and "Load/Save Flight" is commented out as it doesnt work currently
 2010-09-23 00:17:27 +02:00
willie
41ad86528c revert changes to top-level menu 
Leave weather options alone
 2010-09-23 00:17:25 +02:00
willie
28d5294c14 Reinstate "Weather Scenario" - add "ATC in Range" 
Move "ATC in Range" to radios dialog

"Weather Scenario" was missing after recent changes so reinstated, "ATC in Range" added back, this time on the Radio Settings dialog.
It should probably be commented out until we are certain it is working properly.
 2010-09-23 00:16:25 +02:00
BARANGER Emmanuel
8da01a74e8 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-22 13:03:10 +02:00
Frederic Bouvier
2bc5c2177a Don't scale alpha when using reflection coefficient 2010-09-21 19:59:22 +02:00
Frederic Bouvier
52c646b2cc Better use of clamp 2010-09-21 09:21:44 +02:00
Frederic Bouvier
ee8d70b3bf Use specular factor of bumpspec map (alpha channel) to modulate reflection factor 2010-09-21 09:17:07 +02:00
Frederic Bouvier
d734e32bd5 Modified reflect effect to include bumpspec. Original effect untouched 2010-09-21 08:23:13 +02:00
BARANGER Emmanuel
7a0b19c312 Merge branch 'master' of git://gitorious.org/fg/fgdata 2010-09-21 00:24:20 +02: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
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
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