Alexis Bory
af30e27a8e
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-08 19:06:24 +02:00
Vivian Meazza
9db93b9d25
Merge branch 'Work' of \New Git\fgdata
2010-09-08 14:04:47 +01:00
willie
fe231637fb
minor tidy-up
2010-09-08 00:17:42 +01:00
willie
fe7cfe3b3a
removed "housekeeping" files
2010-09-08 00:15:38 +01:00
willie
d70fc6660e
reinstated "Scenario"
...
other small tidy-ups
2010-09-08 00:12:24 +01:00
willie
11f7f2bb5c
Merge branch 'master' of git://gitorious.org/fg/fgdata into new-menu
2010-09-07 22:16:18 +01:00
willie
7a8e8af600
minor typo clean up
2010-09-07 20:07:53 +01:00
willie
821fae4a03
further changes to the menu structure
...
split AI carrier options to its own menu
moved "advanced" menu items to Debug
removed several redundant items
rationalised the placement of some items
started adding keyboard shortcuts
TODO: reinstate AI Scenario menu item (position to be conmfirmed)
get feedback
add more : keyboard shortcuts
2010-09-07 19:59:00 +01:00
Vivian Meazza
b3ba047d5b
Merge branch 'master' of git://gitorious.org/fg/fgdata into integration
2010-09-07 16:43:59 +01:00
willie
e78c042724
first trivial changes to menubar.xml for testing
2010-09-07 12:12:32 +01:00
willie
9bcfc7c579
initial commit for new branch "new menu"
...
added spreadsheet to display current and proposed menu structures
2010-09-07 11:20:33 +01:00
BARANGER Emmanuel
1b6125518f
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-06 18:40:21 +02:00
willie
b028690b71
Merge branch 'master' of git://gitorious.org/fg/fgdata
...
Conflicts:
Aircraft/victor/victor-set.xml
2010-09-06 14:31:32 +01:00
Alexis Bory
76db496d5b
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-06 13:33:54 +02:00
James Turner
8deb3be499
Document --fg-aircraft in the command-line help.
2010-09-06 09:53:28 +01:00
Vivian Meazza
fd981e1baf
Merge commit 'refs/merge-requests/43' of git://gitorious.org/fg/fgdata into integration
2010-09-05 23:40:45 +01:00
gral@who.net
1560cc692f
less cyan
2010-09-06 00:33:58 +02:00
Vivian Meazza
17a8f09fcd
Merge commit 'refs/merge-requests/43' of git://gitorious.org/fg/fgdata into integration
2010-09-05 23:11:32 +01:00
gral@who.net
4ffd132241
reverted change in landmass,frag by accident
2010-09-05 23:59:43 +02:00
Stuart Buchanan
ffa99435fe
Add missing file from previous commit.
2010-09-05 22:42:51 +01:00
Stuart Buchanan
416bb4a559
Fix prop on c172p
2010-09-05 22:37:21 +01:00
gral@who.net
7361ef722a
new water
2010-09-05 22:45:43 +02:00
gral@who.net
713f5943bb
better reflection
2010-09-05 22:11:29 +02:00
willie
7ec18662e8
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-05 20:47:00 +01:00
gral@who.net
def7bab9e6
tangens for statto
2010-09-05 21:34:59 +02:00
willie
fae23f9a9c
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-05 12:42:54 +01:00
Torsten Dreyer
8d0273a7d4
Merge branch 'master' of gitorious.org:fg/fgdata
2010-09-05 11:58:34 +02:00
Torsten Dreyer
d3c9100a92
Add a dialog for OSG DisplaySettings
...
This allows run-time changes to the DisplaySettings.
Probably most interesting are the stereo view modes.
2010-09-05 11:54:59 +02:00
BARANGER Emmanuel
974c8c7a84
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-05 11:40:10 +02:00
willie
729d08a493
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-04 17:57:35 +01:00
willie
802cc7bbbe
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-04 14:44:39 +01:00
gral@who.net
26e94e0e06
turning reflection into sun or light direction
2010-09-04 15:25:58 +02:00
Alexis Bory
dca7bde4b0
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-04 11:30:49 +02:00
Vivian Meazza
91ab9b540d
Merge branch 'master' of gitorious.org:fg/fgdata into Work
2010-09-03 23:51:47 +01:00
Anders Gidenstam
c3617a9cd6
Updated Wildfire:
...
- Removed the reference to null.ac in wildfire.xml.
- Rearranged the animation order in the 3d model xml files.
- Fixed materials in the AC3D files.
- Separated 3d model handling from the cellular automaton.
2010-09-04 00:39:51 +02:00
Vivian Meazza
135822ac2a
Merge branch 'master' into Work
2010-09-03 23:06:30 +01:00
gral@who.net
c6f83b3afd
adding files
2010-09-03 23:52:04 +02:00
gral@who.net
db50149497
New water effect, first steps
2010-09-03 23:51:43 +02:00
Alexis Bory
8233354f93
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-03 19:11:57 +02:00
willie
335ac00cad
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-03 16:52:04 +01:00
Vivian Meazza
da2998811a
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-03 10:14:25 +01:00
Durk Talsma
c95c9ee19e
Some new traffic manager options for advanced users and traffic pattern developers / maintainers.
2010-09-03 10:43:26 +02:00
Vivian Meazza
cf23ab2734
Merge commit 'refs/merge-requests/42' of git://gitorious.org/fg/fgdata into integration
2010-09-03 09:35:20 +01:00
Erik Hofman
ff1d943c17
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-03 10:17:46 +02:00
gral@who.net
cf0f7c298c
Fix: bringing back constantColor in crop shaders
2010-09-03 09:37:52 +02:00
willie
861f8f4ea2
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-02 23:29:31 +01:00
BARANGER Emmanuel
851908f88a
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-02 23:36:48 +02:00
willie
cf1d916e93
Merge branch 'master' of git://gitorious.org/fg/fgdata
2010-09-02 21:11:39 +01:00
Stuart Buchanan
19ee2ba9ed
Merge commit 'refs/merge-requests/38' of git://gitorious.org/fg/fgdata
2010-09-02 19:21:56 +01:00
willie
2571d8e9aa
Merge branch 'master' of git://gitorious.org/fg/fgdata
...
Conflicts:
Aircraft/victor/victor-set.xml
2010-09-02 19:00:08 +01:00
