BARANGER Emmanuel
944c65fb22
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-04 16:01:35 +02:00
Anders Gidenstam
af740cd918
Updated WalkView: Added missing var keywords.
2010-10-03 19:25:46 +02:00
Anders Gidenstam
ee5eceb3da
Updated mp_broadcast.nas: Added missing var keyword.
2010-10-03 19:25:36 +02:00
BARANGER Emmanuel
6671adde94
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-03 19:19:01 +02:00
Vivian Meazza
b0aa86ab64
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-03 09:35:04 +01:00
Frederic Bouvier
21ae0c8c69
To spare few GPU cycle
2010-10-03 09:15:33 +02:00
Frederic Bouvier
6e559ab4eb
Restore old shader for quality level below 2
2010-10-03 08:57:33 +02:00
Frederic Bouvier
e4da5245e8
Merge commit 'refs/merge-requests/28' of git://gitorious.org/fg/fgdata into gral/water2
2010-10-03 08:48:20 +02:00
BARANGER Emmanuel
03069e4b96
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-03 02:52:59 +02:00
Vivian Meazza
b141b0bfa5
Merge branch 'master' of git://gitorious.org/fg/fgdata into integration
2010-10-02 23:51:18 +01:00
Frederic Bouvier
56e77e393d
Merge branch 'master' of gitorious.org:fg/fgdata
2010-10-02 10:49:53 +02:00
Csaba Halasz
088640b5a2
Merge commit 'refs/merge-requests/30' of git://gitorious.org/fg/fgdata
2010-10-02 02:54:24 +02:00
Vivian Meazza
281f0f1e04
Merge branch 'master' of git://gitorious.org/fg/fgdata into integration
2010-10-01 17:07:40 +01:00
Vivian Meazza
e4ada99911
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-01 17:01:08 +01:00
Vivian Meazza
f411434f8c
Merge branch 'Work' of \New Git\fgdata
2010-10-01 16:38:18 +01:00
Vivian Meazza
8a25cadc8a
Add AIFormation.
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-10-01 16:36:32 +01:00
Vivian Meazza
c4576fc818
Merge branch 'master' of git://gitorious.org/fg/fgdata into Work
2010-10-01 15:26:17 +01:00
Erik Hofman
e42dcefbae
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-10-01 13:24:24 +02:00
BARANGER Emmanuel
50e9e7dcac
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-30 08:23:36 +02:00
gral@who.net
43a69d8371
Small clean up
2010-09-30 01:46:52 +02:00
gral@who.net
d10a9b8eff
Adding files
2010-09-30 01:29:41 +02:00
gral@who.net
3cdf9da27a
Next version of water shader, some clean up
2010-09-30 01:29:16 +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
Frederic Bouvier
3e563df3a4
Remove reflection modulation by shininess factor (bump map alpha channel)
2010-09-26 08:41:50 +02:00
Vivian Meazza
41519f0b04
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-26 00:11:42 +01: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
Vivian Meazza
2fed0ebefb
Merge branch 'master' of \New Git\fgdata
2010-09-23 23:57:50 +01:00
Vivian Meazza
7f1eec80af
Add new dialog to control AIFormations
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-23 23:50:18 +01:00
BARANGER Emmanuel
c7bf747b50
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-24 00:43:23 +02:00
Vivian Meazza
fb7f48c716
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-23 19:56:49 +01: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
Vivian Meazza
fca586b5b7
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-23 18:22:27 +01: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
