1
0
Fork 0
Commit graph

6101 commits

Author SHA1 Message Date
Emilian Huminiuc
f412338f41 refresh object masks
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-08 20:38:00 +03:00
Vivian Meazza
f480cd234a Merge branch 'master' of D:\Git_New\fgdata 2012-07-08 14:40:12 +01:00
ThorstenB
3265ad8ae5 Synchronize language resources
Run script to identify missing/obsolete items:
de/options.xml is missing 192 translation(s).
de/menu.xml is missing 20 translation(s).

es/options.xml is missing 12 translation(s).
es/menu.xml is missing 78 translation(s).

fr/options.xml is missing 0 translation(s).
fr/menu.xml is missing 0 translation(s).

it/options.xml is missing 212 translation(s).
it/menu.xml is missing 78 translation(s).

nl/options.xml is missing 54 translation(s).
nl/menu.xml is missing 1 translation(s).

pl/options.xml is missing 81 translation(s).
pl/menu.xml is missing 76 translation(s).

pt/options.xml is missing 212 translation(s).
pt/menu.xml is missing 86 translation(s).
2012-07-08 15:33:03 +02:00
Emilian Huminiuc
9d49f9643f Make water-inland.eff Rembrandt compatible.
Fix a longstanding ati bug in transition.frag
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-08 15:58:42 +03:00
Emilian Huminiuc
31c99fbd4d Add object set for the new object masks.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-08 04:48:50 +03:00
Vivian Meazza
ac8be514bb Merge branch 'master' of D:\Git_New\fgdata 2012-07-07 22:31:19 +01:00
Emilian Huminiuc
786ab23d7c cleanup and optimization of dds terrain textures
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-07 23:43:53 +03:00
Alexis Bory
78a45dbd25 Merge branch 'work' 2012-07-07 19:23:48 +02:00
ThorstenB
ce36295c4a #544: slider to control AI sound volume missing
(not a bugfix really, but just too trivial).
2012-07-07 17:26:05 +02:00
Alexis Bory
717fff74ce Merge branch 'work' 2012-07-07 15:47:16 +02:00
Stuart Buchanan
680362337c Add control of season to GUI to be set in-sim. 2012-07-06 20:11:51 +01:00
Stuart Buchanan
3c96ce8a30 Fix material definitsion
- Correct object mask for winter DryCropPasture material
- Add object mask for Rice.
2012-07-06 20:10:36 +01:00
Emilian Huminiuc
43635e6932 c172p: tweak Rembrandt landing and taxi lights
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-06 00:06:52 +03:00
Stuart Buchanan
4202e41149 Make regional textures the default. 2012-07-05 21:02:00 +01:00
Stuart Buchanan
9809918b7e Improved Rembrandt landing and taxi lights. 2012-07-05 20:44:29 +01:00
ThorstenB
e6ec1218ba Fix ai-traffic GUI checkbox
Setting was lost on sim-reset and restart
/sim/ai-traffic props are entirely obsolete (to be removed after 2.8)
2012-07-05 19:37:43 +02:00
Vivian Meazza
b8ff27f964 Merge branch 'master' of D:\Git_New\fgdata 2012-07-04 20:58:32 +01:00
Vivian Meazza
e84ff39ee8 Remove debug messages
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-07-04 20:57:18 +01:00
Vivian Meazza
85d64deb04 Bugfix
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-07-04 20:57:14 +01:00
Vivian Meazza
7a10e8f579 Merge branch 'work' of D:\Git_New\fgdata 2012-07-04 20:55:31 +01:00
Vivian Meazza
0a741c7a3b Remove debug messages
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-07-04 20:49:06 +01:00
Vivian Meazza
aa613b3c12 Bugfix
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-07-04 20:44:25 +01:00
Alexis Bory
2a505cd29e Merge branch 'work' 2012-07-03 21:50:37 +02:00
Stuart Buchanan
ab21e069f7 Correct atmospheric scattering for trees, where we were applying ambient lighting twice, making them too dark, and not using an alpha test.
Also fix the tropical trees, where only half the texture was defined.
2012-07-02 23:27:44 +01:00
Emilian Huminiuc
8174ea8593 More transition.frag cleanups
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-02 23:34:00 +03:00
Emilian Huminiuc
a31dfa779e Cleanup a bit the transition shaders
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-02 23:17:17 +03:00
Alexis Bory
7eb2e158cd Merge branch 'work' 2012-07-01 23:23:59 +02:00
Emilian Huminiuc
a76a84d287 fix runway shader normals in Rembrandt.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-01 23:20:02 +03:00
Alexis Bory
b83bb95cf9 Pilots: Added another fighter pilot, tweaked the first one's face. 2012-07-01 19:06:01 +02:00
ThorstenB
1f6f19c93f heading indicator scrollwheel adjustment
Unlike with the standard 3d VOR/ADF/... instruments, the scroll-wheel
didn't work with the HI - resulting in inconsistent, (b)ugly panel
controls ;-).
2012-07-01 16:02:24 +02:00
ThorstenB
7d099bff28 Put power up/down messages into context 2012-07-01 16:02:23 +02:00
ThorstenB
9856fdd452 #748: keyboard bindings in control.nas must not rely on autopilot
Throttle/aileron/elevator keyboard bindings did not work on aircraft
without autopilots (= without A/P properties). Rearrange logic to make
basic axis/throttle control the default (i.e. when prop values are "nil").
2012-07-01 00:24:23 +02:00
Stuart Buchanan
9d8868245e Limit change of building density to 0.1, to match display. 2012-06-30 22:15:07 +01:00
Stuart Buchanan
c7377a5732 Make building density display consistent with vegetation density.
No-one needs two decimal places :)
2012-06-30 21:43:59 +01:00
Stuart Buchanan
2f123b7100 Make random buildings compatible with the atmospheric scattering shader.
Also remove redundant test parameters from the tree effect.
2012-06-30 20:37:08 +01:00
Stuart Buchanan
83e96a30c2 Add user-friendly names for the axes and buttons. 2012-06-30 20:36:29 +01:00
ThorstenB
0a5fde86b0 c172p: fix rudder animation 2012-06-30 20:04:08 +02:00
Emilian Huminiuc
876e3e11db fix transition.eff copy paste failure, and enable the slider selectively under Rembrandt.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-30 14:55:52 +03:00
Stuart Buchanan
145a759fb8 Add support for atmospheric scattering to the random vegetation shader. 2012-06-30 00:38:14 +01:00
Emilian Huminiuc
b466346a53 make sure crop and landmass based effects turn off under Rembrandt
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-29 18:57:03 +03:00
Emilian Huminiuc
8fa569e77f make transition effect Rembrandt compatible.
Note: this is the transition effect used by the materials-dds.xml
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-28 23:43:08 +03:00
Emilian Huminiuc
c001b6d679 transition.frag: fix shading
ubershader.frag: fix ambient
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-28 14:37:45 +03:00
Emilian Huminiuc
4587dc8bc5 gui.nas: make sure enabling Rembrandt disables the skydome-scattering shaders
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-28 01:37:31 +03:00
Frederic Bouvier
59e0f41283 Get rid of TexGen magic and do the projective texturing for shadow mapping ourself 2012-06-27 21:04:51 +02:00
ThorstenB
746954cbf2 Bump version to 2.8.0
since branch is already frozen for 2.8 and is prepared for building the
first release candidate.
For details on versions see http://wiki.flightgear.org/Release_plan
2012-06-26 23:23:10 +02:00
James Turner
f07f4e60d2 Default values for new 2D panel visibility options
These correspond to the implicit values in earlier releases - i.e that 2D panels are hidden if the heading offset is non-zero, or the current view is not view 0.
2012-06-26 11:21:52 +01:00
Frederic Bouvier
82e86c6ebc Adjust legal filtering values 2012-06-26 09:12:23 +02:00
Frederic Bouvier
4e241640b6 Add a bloom strength property and a slider in the Rembrandt dialog 2012-06-26 09:02:21 +02:00
Frederic Bouvier
ecbcdbbd02 Water shader has a Rembrandt version now 2012-06-26 08:49:11 +02:00
Emilian Huminiuc
f6b74fc128 Add material ID to provide increased specular effect in Rembrandt for water and ubershader.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-26 02:18:00 +03:00