Emilian Huminiuc
cc770cecb7
restore transition.frag that got broken
...
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-08-20 13:42:16 +03:00
Vivian Meazza
b3922c08c1
Merge branch 'master' of D:\Git_New\fgdata
2012-08-19 21:55:51 +01:00
Emilian Huminiuc
7d883b3db1
ubershader: reenable ambient-correction under Rembrandt
...
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-08-19 23:40:32 +03:00
Vivian Meazza
4ba488cfcc
Merge branch 'master' of D:\Git_New\fgdata
2012-08-18 23:30:42 +01:00
Vivian Meazza
ab0aa62f47
Merge branch 'work' of D:\Git_New\fgdata
2012-08-18 23:04:02 +01:00
ThorstenB
5609a7b66a
Remove fixed browser-app default from preferences.
...
Bad idea since it overwrites the platform-dependent default provided by
fgfs itself.
2012-08-18 12:42:06 +02:00
BARANGER Emmanuel
cd28697664
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-08-18 03:02:25 +02:00
Vivian Meazza
e04f4cb5f5
Merge branch 'master' of D:\Git_New\fgdata
2012-08-18 00:12:22 +01:00
Vivian Meazza
90b66912d3
Merge branch 'work' of D:\Git_New\fgdata
2012-08-18 00:04:29 +01:00
Vivian Meazza
21bfab6534
Merge branch 'master' of D:\Git_New\fgdata
2012-08-17 23:24:33 +01:00
Vivian Meazza
30fc6186d4
Merge branch 'master' of gitorious.org:fg/fgdata into work
2012-08-17 23:20:55 +01:00
Anders Gidenstam
6745cc6573
Updated Wildfire: Added a model for dropped retardant.
2012-08-17 23:18:21 +01:00
Anders Gidenstam
368fcc7976
Updated Wildfire: Added a model for dropped retardant.
2012-08-18 00:08:16 +02:00
BARANGER Emmanuel
41ef884c17
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-08-17 14:32:51 +02:00
Vivian Meazza
3fa2f7dc55
Merge branch 'master' of D:\Git_New\fgdata
2012-08-16 22:46:08 +01:00
Vivian Meazza
7a56532396
Merge branch 'master' of D:\Git_New\fgdata
2012-08-16 22:25:41 +01:00
BARANGER Emmanuel
9fb9503e2a
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-08-16 18:06:56 +02:00
Vivian Meazza
e028f04283
Merge branch 'master' of D:\Git_New\fgdata
2012-08-15 22:06:44 +01:00
Vivian Meazza
e4bff35a7e
Merge branch 'work' of D:\Git_New\fgdata
2012-08-15 21:52:53 +01:00
Vivian Meazza
6271064b5d
Merge branch 'work' of D:\Git_New\fgdata
2012-08-15 21:40:17 +01:00
BARANGER Emmanuel
2d3fe74c46
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-08-15 13:16:49 +02:00
Vivian Meazza
604bf54f93
Merge branch 'master' of D:\Git_New\fgdata
2012-08-15 10:55:18 +01:00
Vivian Meazza
9a22ac8dec
Merge branch 'master' of D:\Git_New\fgdata
2012-08-15 10:25:43 +01:00
Vivian Meazza
d09a45837f
Merge branch 'master' of D:\Git_New\fgdata
...
Conflicts:
Shaders/transition.frag
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-08-14 00:06:15 +01:00
Vivian Meazza
d5cd845cc9
Merge branch 'master' of gitorious.org:fg/fgdata into work
2012-08-13 23:58:37 +01:00
Emilian Huminiuc
00c352f235
Hopefuly fix yet another weird behaviour on ATI gpus (take two)
...
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-08-13 23:58:12 +01:00
Vivian Meazza
c80abcda73
Tidy up
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-08-13 23:51:08 +01:00
Vivian Meazza
043286ac21
Merge branch 'work' of D:\Git_New\fgdata
...
Conflicts:
Aircraft/Hurricane/Models/panel-hotspots-deprecated.xml
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-08-13 23:48:46 +01:00
Emilian Huminiuc
ab50ada852
Hopefuly fix yet another weird behaviour on ATI gpus (take two)
...
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-08-14 01:23:21 +03:00
Vivian Meazza
c47c3bcffd
Deprecate panel-hotspots
...
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-08-13 23:06:49 +01:00
Stuart Buchanan
06e15f33d0
Check in final 2.8.0 manuals, built thanks to Martin SPOTT.
2012-08-13 20:47:58 +01:00
Emilian Huminiuc
56d84d24da
Hopefuly fix yet another weird behaviour on ATI gpus
...
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-08-13 16:50:03 +03:00
BARANGER Emmanuel
8ebefa9202
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-08-13 05:15:04 +02:00
Thomas Geymayer
20c6d48ee7
Canvas: Basic GUI API and API cleanup
2012-08-12 23:25:47 +02:00
BARANGER Emmanuel
eda3232dc4
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-08-12 03:42:50 +02:00
Gijs de Rooy
b950ff1e6e
Fix automated METAR snow line.
2012-08-11 19:56:29 +02:00
Vivian Meazza
586b288464
Merge branch 'master' of D:\Git_New\fgdata
2012-08-10 23:51:28 +01:00
Stuart Buchanan
8d32e19c63
Fix for isue 834 - fuel and payload gui broken for jsb aircraft
2012-08-10 22:25:20 +01:00
Vivian Meazza
ec1175807e
Merge branch 'master' of D:\Git_New\fgdata
2012-08-10 09:15:15 +01:00
Stuart Buchanan
4ec24853a8
Create an Environment Settings dialog for non-weather environment settings
...
such as snow level, dust, wetness, and texture set.
Also add a parameter to control whether the snow level moves with METAR,
and retire /environment/mysnow-level-m.
2012-08-09 22:52:51 +01:00
Stuart Buchanan
c71e0b92f1
Add warning text for random buildings, which require lots of memory.
2012-08-09 21:48:27 +01:00
Stuart Buchanan
e4fd2bda32
Merge branch 'master' of git://gitorious.org/fg/fgdata
2012-08-09 21:42:12 +01:00
Stuart Buchanan
0a40f0be0f
Updated Weather dialog
...
- Bug fix so manual configuration works properly
- Interpret METAR directly to set default wind settings for Local Weather mode.
2012-08-09 21:38:36 +01:00
Thomas Geymayer
a129877eb8
Canvas: Add function to API for getting canvas path
2012-08-09 22:08:44 +02:00
Thomas Geymayer
c785b1bd1c
Canvas: Extend Image element and adapt for latest core changes.
2012-08-09 18:18:07 +02:00
Vivian Meazza
497660cbeb
Merge branch 'master' of D:\Git_New\fgdata
2012-08-08 14:10:50 +01:00
Frederic Bouvier
c20b4b1fbb
No code change - Improve readability by reindenting files
2012-08-08 09:03:00 +02:00
Stuart Buchanan
89928f8350
Add missing weather configuration dialog from Unified Weather commit.
2012-08-07 23:14:43 +01:00
Stuart Buchanan
ed068bef82
Unification of Weather UI.
2012-08-07 21:27:29 +01:00
Thorsten Renk
9be134b34d
Procedural Texturing
2012-08-07 09:01:14 +02:00
