1
0
Fork 0
Commit graph

5265 commits

Author SHA1 Message Date
Vivian Meazza
34f6c6258e Add Direct Draw Textures for Symbols
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-22 22:57:46 +01:00
Alexis Bory
0a112f2bc7 Merge branch 'f-14b-xiii' 2011-09-22 23:15:15 +02:00
Melchior FRANZ
4cdc3a64aa warthog: don't attach listener again on "Reload Input"; fix overlay path 2011-09-22 18:14:43 +02:00
Gijs de Rooy
321f9f6bbd Issue #203: fix white light cones. Still no fix for night-lighting though. 2011-09-22 16:53:47 +02:00
Vivian Meazza
fd954315d0 Add grey sea texture
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-22 15:41:47 +01:00
Vivian Meazza
818c8307f3 Merge branch 'master' of D:\Git_New\fgdata 2011-09-22 15:38:04 +01:00
Vivian Meazza
fbf219a56f Update colours to reflect Global Weather
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-22 15:33:16 +01:00
Vivian Meazza
ee01294e6e Update effect to use modified shader
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-22 15:31:42 +01:00
Vivian Meazza
4dcef39a40 Update effect to use modified shader
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-22 14:41:08 +01:00
Vivian Meazza
980c1d7926 Update shader to react to global weather conditions 2011-09-22 14:37:32 +01:00
Vivian Meazza
9808ca5616 Merge branch 'master' of gitorious.org:fg/fgdata into work 2011-09-21 23:59:10 +01:00
Vivian Meazza
795b5053a0 Move Lake from water-inland effect to water effect
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-21 23:53:59 +01:00
BARANGER Emmanuel
eca0b60401 Merge branch 'master' of git://gitorious.org/fg/fgdata 2011-09-20 23:54:52 +02:00
BARANGER Emmanuel
798fd6f0d9 Merge branch 'master' of git://gitorious.org/fg/fgdata 2011-09-20 01:45:28 +02:00
James Turner
ded0a18b5e Zoom controls on the map dialg. 2011-09-18 13:00:18 +01:00
ThorstenB
9195b36005 #441: overlay dialog must be reinitialized after reloading GUI 2011-09-18 12:36:40 +02:00
Durk Talsma
fa7c100289 Two sample settings for starting up flightgear in combination with the --parkpos=AVAILABLE option. 2011-09-17 17:17:29 +02:00
Durk Talsma
05ae9ac31a Merge branch 'master' of gitorious.org:fg/fgdata 2011-09-16 20:14:11 +02:00
Melchior FRANZ
8fd08c7e03 warthog: add missing file 2011-09-15 21:38:47 +02:00
Melchior FRANZ
76b1d549a5 warthog: move js config files into Warthog dir; add more overlays 2011-09-15 21:26:08 +02:00
Durk Talsma
4f899c3657 Merge branch 'master' of gitorious.org:fg/fgdata 2011-09-12 19:52:03 +02:00
Stuart Buchanan
975e7d6c54 Update to the 3DClouds README file covering recent changes. 2011-09-11 22:24:41 +01:00
Durk Talsma
fc66e0bd90 Merge branch 'master' of gitorious.org:fg/fgdata 2011-09-11 21:53:39 +02:00
Melchior FRANZ
1a4fa0b16f warthog: fix trimming; more bindings (similar to cougar) 2011-09-11 20:25:22 +02:00
Alexis Bory
e05b1f057d Merge branch 'f-14b-xiii' 2011-09-11 19:41:37 +02:00
BARANGER Emmanuel
6cd71b1243 Merge branch 'master' of git://gitorious.org/fg/fgdata 2011-09-11 18:08:25 +02:00
Melchior FRANZ
a6c2cfa172 warthog: add first aircraft specific overlay file
These files take complexity out of the main joystick file, while
not adding much code. They also update the description (<desc>)
used by the Help->Joystick information dialog. All <nasal> code
is executed in the joystick's namespace, so variables and funtions
of the main file (popup()) can be accessed.
2011-09-11 14:33:11 +02:00
Erik Hofman
976532e170 Merge branch 'master' of git://gitorious.org/fg/fgdata 2011-09-11 11:09:24 +02:00
BARANGER Emmanuel
5249b7152e Merge branch 'master' of git://gitorious.org/fg/fgdata 2011-09-11 01:58:42 +02:00
Melchior FRANZ
587993138c warthog: simplify overlay handling, more bindings 2011-09-10 22:40:27 +02:00
Melchior FRANZ
820323e854 warthog: add js overlay support
This allows to have generic axis/button definitions with aircraft
specific or aircraft class specific modification overlays. These
are also found in $FG_HOME, where they override global files. This
mechanism is desirable, because the Warthog is an A-10 replica, and
it should be possible to have an automatically loaded (1:1 mapped)
A-10 joystick config when flying the A-10, while using generic layouts
otherwise, or a specific helicopter overlay for helicopters etc.

Overlay files look exactly like joystick config files, except they
have no <name> and only specify actually differing elements. Axes
with <number> *need* a property index (e.g. <axis n="2">), which
usually corresponds to the <unix> value (i.e. n'th axis def in file).
Overlay files can contain a <nasal> block which is executed on
load. The files are to be named {$FG_ROOT,$FG_HOME}/Input/Joysticks/\
ThrustMaster/Warthog/{Joystick,Throttle}/{generic,helicopter,<aircraft>}\
.xml.
2011-09-10 13:33:21 +02:00
Melchior FRANZ
ea0c72494d first draft of Thrustmaster HOTAS Warthog js config (WIP) 2011-09-09 20:02:01 +02:00
Mathias Froehlich
558c321f94 Fix problem with the A320 family not starting up correctly. 2011-09-08 19:34:15 +02:00
BARANGER Emmanuel
7922658b22 Merge branch 'master' of git://gitorious.org/fg/fgdata 2011-09-08 02:07:44 +02:00
Vivian Meazza
e4db63a4ff Move Transport to an urban context.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-06 23:14:25 +01:00
Anders Gidenstam
b027d3c4e8 materials-dds.xml: Fixed missing condition element. 2011-09-06 21:14:03 +02:00
Vivian Meazza
ccddda4ffd Merge branch 'work' of D:\Git_New\fgdata 2011-09-05 16:55:44 +01:00
Vivian Meazza
faa28f8a08 Tenth tranche of .dds textures.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-05 16:53:06 +01:00
Vivian Meazza
c06d1a7710 Add new effects in support of .dds textures
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-05 16:05:59 +01:00
Vivian Meazza
062594ff05 Add new shaders in support of .dds textures
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-05 16:02:06 +01:00
Vivian Meazza
bcf2a72fd6 Sixth tranche of .dss textures.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-05 14:21:44 +01:00
Vivian Meazza
fe12f5b70a Merge branch 'work' of D:\Git_New\fgdata 2011-09-05 14:04:35 +01:00
Vivian Meazza
5c422acadc Fourth tranche of .dds textures
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-05 13:58:46 +01:00
Vivian Meazza
6ea6052241 Merge branch 'master' of gitorious.org:fg/fgdata into work 2011-09-05 13:45:52 +01:00
Vivian Meazza
e2af689cf7 Third tranche of dds textures.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-05 13:42:05 +01:00
BARANGER Emmanuel
c2f1ac2eee Merge branch 'master' of git://gitorious.org/fg/fgdata 2011-09-05 14:37:27 +02:00
Vivian Meazza
e4e3fb4671 Merge branch 'work' of D:\Git_New\fgdata 2011-09-05 13:25:20 +01:00
Vivian Meazza
e0b94b2737 Second tranche of dds textures
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-05 13:22:49 +01:00
Vivian Meazza
b5ed1ec60a First tranche of dds textures
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-09-05 12:49:29 +01:00
Vivian Meazza
2501e4e95f Merge branch 'master' of D:\Git_New\fgdata 2011-09-05 12:30:34 +01:00