1
0
Fork 0

Merge branch 'next' of ssh://git.code.sf.net/p/flightgear/fgdata into next

This commit is contained in:
Erik Hofman 2016-07-19 10:46:30 +02:00
commit 321386d62b
10 changed files with 6178 additions and 1934 deletions

View file

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<PropertyList include="73C-main.xml">
<texture-path>Textures/UkraineIntl</texture-path>
</PropertyList>

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 KiB

View file

@ -0,0 +1,8 @@
<?xml version="1.0"?>
<PropertyList include="738-main.xml">
<texture-path>Textures/UkraineIntl</texture-path>
</PropertyList>

Binary file not shown.

After

Width:  |  Height:  |  Size: 231 KiB

View file

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<PropertyList include="ERJ195-main.xml">
<texture-path>Textures/UkraineIntl</texture-path>
</PropertyList>

View file

@ -15,15 +15,4 @@
</less-than>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>Gear_Closed</object-name>
<condition>
<more-than>
<property>velocities/true-airspeed-kt</property>
<value>150</value>
</more-than>
</condition>
</animation>
</PropertyList>

View file

@ -1,5 +1,5 @@
AC3Db
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0.100 0.100 0.100 spec 0.500 0.500 0.500 shi 50 trans 0
MATERIAL "ac3dmat1" rgb 0.9000 0.9000 0.9000 amb 1.0000 1.0000 1.0000 emis 0 0 0 spec 0.5 0.5 0.5 shi 50 trans 0.0000
OBJECT world
kids 2
OBJECT poly

Binary file not shown.

After

Width:  |  Height:  |  Size: 122 KiB

File diff suppressed because it is too large Load diff

View file

@ -537,5 +537,11 @@ _setlistener("/sim/signals/nasal-dir-initialized", func {
# Call-back to ensure we see our own messages.
setlistener("/sim/multiplay/chat", chat_listener);
});
if (getprop("/sim/presets/avoided-mp-runway")) {
_setlistener("/sim/sceneryloaded", func {
gui.popupTip("Multi-player enabled, start moved to runway hold short position.");
});
}
});