1
0
Fork 0
Commit graph

6452 commits

Author SHA1 Message Date
Vivian Meazza
b34144491d Merge branch 'work' of D:\Git_New\fgdata 2012-08-28 23:15:35 +01:00
Vivian Meazza
1cd7c39db8 Merge branch 'master' of D:\Git_New\fgdata 2012-08-28 22:50:49 +01:00
Vivian Meazza
79cab246a0 Merge branch 'master' of gitorious.org:fg/fgdata into work 2012-08-28 22:50:23 +01:00
Vivian Meazza
4282b87efe Merge branch 'work' of D:\Git_New\fgdata 2012-08-28 22:48:17 +01:00
Vivian Meazza
c8a749a73e Merge branch 'master' of D:\Git_New\fgdata 2012-08-28 22:48:04 +01:00
Vivian Meazza
4b414f9c49 Merge branch 'master' of gitorious.org:fg/fgdata into work 2012-08-28 22:46:42 +01:00
BARANGER Emmanuel
40edbadb13 Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-08-28 23:18:42 +02:00
Vivian Meazza
7dec0768ab Merge branch 'master' of D:\Git_New\fgdata 2012-08-28 18:13:05 +01:00
Vivian Meazza
1d9aad0fee Merge branch 'work' of D:\Git_New\fgdata 2012-08-28 09:29:24 +01:00
Vivian Meazza
c665f91262 Merge branch 'master' of D:\Git_New\fgdata 2012-08-28 08:55:19 +01:00
Vivian Meazza
2770af3733 Merge branch 'master' of gitorious.org:fg/fgdata into work 2012-08-28 08:54:43 +01:00
Vivian Meazza
4121cd704a Merge branch 'master' of D:\Git_New\fgdata 2012-08-28 08:51:32 +01:00
ThorstenB
bb17591cf0 Disable terrasync when libsvn support is missing.
External svn has too many disadvantages (does not support proper error
checking/status information etc)
2012-08-28 00:21:50 +02:00
Vivian Meazza
977653e969 Merge branch 'master' of D:\Git_New\fgdata 2012-08-27 21:54:08 +01:00
Vivian Meazza
7de350936e Merge branch 'master' of D:\Git_New\fgdata 2012-08-27 09:26:26 +01:00
Vivian Meazza
36a10e0670 Merge branch 'work' of D:\Git_New\fgdata 2012-08-27 09:17:09 +01:00
Stuart Buchanan
7a3d5dd0bf Updates to the Joystick Configuration dialog. 2012-08-26 21:48:53 +01:00
Alexis
8b46328515 Merge branch 'master' into work 2012-08-26 18:51:37 +02:00
BARANGER Emmanuel
c03795b4cb Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-08-26 00:55:24 +02:00
Stuart Buchanan
71ed79bddb Add translation for new Joystick Configuration menu. 2012-08-24 23:03:21 +01:00
Stuart Buchanan
4a70a703a8 Add Joystick Configuration dialog, allowing in-sim configuration of joysticks. 2012-08-24 22:53:21 +01:00
Anders Gidenstam
acd0091d9d Updated Wildfire: Added support for synchronized loading of event logs.
A fire log can now be loaded at startup time with, e.g.,
--prop:environment/wildfire/events-file=$HOME/.fgfs/Wildfire/small_fire.xml
(Note: Wildfire is only authorized to load logs from ~/.fgfs/Wildfire .)

Additionally, a time at which the fire starts to evolve (past the event log)
can be specified with, e.g.,
--prop:environment/wildfire/time-hack-gmt='2012:08:23:15:15'

Instances of FlightGear that are started with the same event log and time-hack
should arrive at similar wildfire states (prior to new events).
2012-08-23 23:27:44 +02:00
ThorstenB
f5bfd65f72 c172p: use directional gyro for heading indicator
Also use c172-specific instrumentation list.
2012-08-23 21:54:05 +02:00
Thomas Geymayer
52b89ed372 Canvas: Update API for core changes.
- Use only one node for colors and dash-array
 - Update some property names to better match SVG/CSS
2012-08-23 21:05:52 +02:00
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