fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of git://gitorious.org/fg/fgdata

Browse source
This commit is contained in:
Vivian Meazza 2011-01-06 20:44:39 +00:00
commit bfb3dde2fe
2 changed files with 52 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gui/dialogs/display.xml
View file

@ -4,6 +4,7 @@
<name>display</name> <name>display</name>
<modal>false</modal> <modal>false</modal>
<layout>vbox</layout> <layout>vbox</layout>
<padding>20</padding>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
@ -62,7 +63,7 @@
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Show 2D Panel</label> <label>Show 2D panel</label>
<property>/sim/panel/visibility</property> <property>/sim/panel/visibility</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
@ -71,12 +72,43 @@
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Autohide Menubar</label> <label>Autohide menubar</label>
<property>/sim/menubar/autovisibility/enabled</property> <property>/sim/menubar/autovisibility/enabled</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</checkbox> </checkbox>
<group>
<layout>hbox</layout>
<checkbox>
<label>Autohide cursor in</label>
<property>/sim/mouse/hide-cursor</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<input>
<live>true</live>
<pref-width>40</pref-width>
<pref-height>10</pref-height>
<enable>
<property>/sim/mouse/hide-cursor</property>
</enable>
<property>/sim/mouse/cursor-timeout-sec</property>
<binding>
<command>dialog-apply</command>
</binding>
</input>
<text>
<label>sec.</label>
</text>
</group>
</group> </group>
<hrule/> <hrule/>

24
materials.xml
View file

@ -1736,11 +1736,23 @@ Shared parameters for various materials.
</condition> </condition>
<name>BuiltUpCover</name> <name>BuiltUpCover</name>
<name>Urban</name> <name>Urban</name>
<texture>Terrain/city1.png</texture> <effect>Effects/urban</effect>
<texture>Terrain/city2.png</texture> <texture-set>
<texture>Terrain/city3.png</texture> <texture>Terrain/city1.png</texture>
<xsize>1024</xsize> <texture n="2">Terrain/city1-relief-light.png</texture>
<ysize>1024</ysize> </texture-set>
<texture-set>
<texture>Terrain/city2.png</texture>
<texture n="2">Terrain/city2-relief-light.png</texture>
</texture-set>
<!--
<texture-set>
<texture>Terrain/city3.png</texture>
<texture n="2">Terrain/city3-relief-light.png</texture>
</texture-set>
-->
<xsize>1000</xsize>
<ysize>1000</ysize>
<light-coverage>100000.0</light-coverage> <light-coverage>100000.0</light-coverage>
<emissive> <emissive>
<r>0.05</r> <r>0.05</r>
@ -1802,7 +1814,7 @@ Shared parameters for various materials.
</object-group> </object-group>
<wood-coverage>250000.0</wood-coverage> <wood-coverage>250000.0</wood-coverage>
<wood-size>5000.0</wood-size> <wood-size>5000.0</wood-size>
<tree-density>5000.0</tree-density> <tree-density>2000.0</tree-density>
<tree-texture>Textures/Trees/mixed-winter.png</tree-texture> <tree-texture>Textures/Trees/mixed-winter.png</tree-texture>
<tree-varieties>8</tree-varieties> <tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/> <tree-range-m alias="/params/forest/tree-range-m"/>