1
0
Fork 0
Commit graph

6141 commits

Author SHA1 Message Date
BARANGER Emmanuel
a24021a33f Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-08-01 15:23:20 +02:00
Thomas Geymayer
9cd2d64f28 Update ground location dialog to use new parking hash 2012-07-31 23:22:27 +02:00
Stuart Buchanan
0e14a09698 Add rotation of trees, and fix issue 825 2012-07-31 21:44:38 +01:00
Emilian Huminiuc
e67d04ead9 Cleanup some implicit casts
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-31 21:40:15 +03:00
Vivian Meazza
be5629752b Merge branch 'master' of gitorious.org:fg/fgdata into work 2012-07-31 09:34:01 +01:00
Vivian Meazza
bd95e861f6 Merge branch 'work' of D:\Git_New\fgdata 2012-07-30 23:52:30 +01:00
Vivian Meazza
c62ec2d4ee Merge branch 'master' of D:\Git_New\fgdata 2012-07-29 23:32:29 +01:00
Stuart Buchanan
d2bc548162 Define weight limits, which are displayed on the Weight and Fuel Settings dialog. 2012-07-29 22:47:54 +01:00
Stuart Buchanan
f1adeec7cc Enhancements to the Fuel and Payload dialog
- Fraction of each tank capacity displayed, along with pounds and gallons
- Total fuel is now displayed
- CofG displayed if available even if /limits/ not defined (bug fix)
- Tanks of capacity 0 ignored (bug fix)
- Some layout improvements.

Addresses issue #778
2012-07-29 22:44:14 +01:00
Vivian Meazza
2799dbaa78 Merge branch 'master' of D:\Git_New\fgdata 2012-07-28 10:11:24 +01:00
Stuart Buchanan
642f4f73b7 Correct materials default 2012-07-26 22:00:41 +01:00
Vivian Meazza
755187505d Merge branch 'master' of D:\Git_New\fgdata 2012-07-26 16:02:48 +01:00
Vivian Meazza
75a5bb8c87 Merge branch 'work' of D:\Git_New\fgdata 2012-07-26 15:59:07 +01:00
Stuart Buchanan
0604e3975b Add an additional random rotation to trees so the quads are not
all oriented N/S and E/W, helping to disguise the limited set of
textures used.
2012-07-24 22:12:11 +01:00
Alexis Bory
05365279c1 Merge branch 'work' 2012-07-23 23:03:44 +02:00
syd
fc2f407011 Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-07-23 10:39:09 -06:00
Frederic Bouvier
d9d6255107 Fix 'Phong distortion' artifact on specular lighting and disappearing emission (due to undefined pow(0,0) called) in Rembrandt - forgotten shaders 2012-07-22 19:53:27 +02:00
Frederic Bouvier
e911e6b5f8 Add quality selection to lights 2012-07-22 10:08:04 +02:00
Alexis Bory
57ec6e7599 Merge branch 'work' 2012-07-21 18:02:57 +02:00
Alexis Bory
0a5280f13e Merge branch 'work' 2012-07-21 15:31:00 +02:00
Vivian Meazza
24e7e5fb68 Whoops!
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-07-21 09:34:00 +01:00
Vivian Meazza
d8a76e4512 Merge branch 'work' of D:\Git_New\fgdata 2012-07-21 00:16:51 +01:00
Alexis Bory
84f1701373 Merge branch 'work' 2012-07-20 15:46:56 +02:00
Gijs de Rooy
e7cfd1b169 Get rid of absolute paths in Instruments-3d/ 2012-07-20 14:01:15 +02:00
BARANGER Emmanuel
5ed691f42b Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-07-20 02:04:58 +02:00
Stuart Buchanan
ba6f14c435 Regional materials update:
- Re-factor common properties (including condition statements) into separate files.
Note that using "index=0" attributes these can be over-ridden.
- Add caribbean regional textures and building definitions
- Add missing low-resolution rainforest-hawaii.png
2012-07-19 22:16:24 +01:00
Stuart Buchanan
2ddf719a82 Add debug options to reload materials and the scenery. 2012-07-19 22:07:19 +01:00
Stuart Buchanan
e91620a456 Remove building density slider. Values > 1.0 have massive memory
impacts and can result in FG paging to disk continually and hanging
some systems, with no obvious cause or fix (particularly with auto-save).

For the moment we simply remove the slider, allowing power users to
modify the density in preferences.xml.

Once the memory consumption of buildings has been addressed we should
be able to put the slide back in.
2012-07-19 21:36:06 +01:00
Emilian Huminiuc
05e3eb80f4 Make the other sunlight shaders recognize water matId.
Remove duplicate fogFunc line in runway.frag
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-19 22:08:35 +03:00
Vivian Meazza
57bf72f11c Merge branch 'master' of D:\Git_New\fgdata 2012-07-19 09:46:52 +01:00
Vivian Meazza
6bceb5695a Revert "Bugfix"
This reverts commit 62a39ccea745faf722e2c50ef257d17b66015fc1.

Conflicts:

	gui/dialogs/AIcarrier.xml
2012-07-19 09:45:39 +01:00
Vivian Meazza
9e451e3205 Merge branch 'work' of D:\Git_New\fgdata 2012-07-19 00:08:26 +01:00
syd
adbf90b3d7 Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-07-18 14:22:49 -06:00
ThorstenB
2b846cbddb c172p: kma20 audio panel 2012-07-18 21:26:33 +02:00
ThorstenB
fc73069ff5 c172p: use local Nasal vars, typify properties 2012-07-18 21:23:50 +02:00
ThorstenB
5ca9667f03 #808: setting to enable millibars in European ATIS messages
Documents existing switch, keeps current default.
2012-07-18 21:06:12 +02:00
ThorstenB
7fab23dfcc Remove obsolete AI preferences.
Old ATCDCL preferences are no longer references anywhere.
2012-07-18 21:06:04 +02:00
ThorstenB
5f0585efbf Bump fgdata version to 2.9.0 2012-07-17 18:43:38 +02:00
ThorstenB
4cbcf93190 Set mode for data files to "non-executable". 2012-07-17 18:32:53 +02:00
ThorstenB
6a0d91212a Remove mixed DOS/UNIX line feeds
which confused text editors.
2012-07-17 18:26:53 +02:00
ThorstenB
834b4e05c4 sa7k: Updated Spanish language resource. 2012-07-17 18:25:50 +02:00
BARANGER Emmanuel
9464a5c93e Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-07-16 19:47:54 +02:00
Emilian Huminiuc
e7dcbcf494 Small fixes and tweaks. Fix ugly black faces paralel to view direction on random buildings.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-16 14:17:16 +03:00
Vivian Meazza
35ead19a90 Merge branch 'master' of D:\Git_New\fgdata 2012-07-15 23:23:23 +01:00
BARANGER Emmanuel
fbe8231ed5 Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-07-15 22:48:30 +02:00
Alexis Bory
65ea86587b Merge branch 'work' 2012-07-15 22:33:39 +02:00
ThorstenB
f59848667c --metar option needs METAR argument 2012-07-15 16:00:49 +02:00
ThorstenB
8b68ce8981 Document command-line options. 2012-07-15 11:16:03 +02:00
ThorstenB
121790f337 Make restore-defaults option also apply to aircraft-specific data 2012-07-15 11:07:23 +02:00
Alexis Bory
d01d7730d6 Merge branch 'work' 2012-07-15 01:01:54 +02:00