fly/fgdata
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
Erik Hofman 2022-05-15 10:41:47 +02:00
commit 141aad7901
6 changed files with 4967 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Input/Keyboard/multikey.xml
View file

@ -875,24 +875,24 @@
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script> <script>
setprop("/autopilot/settings/target-pitch-degree", arg[0]); setprop("/autopilot/settings/target-pitch-deg", arg[0]);
setprop("/autopilot/locks/altitude", "pitch-hold"); setprop("/autopilot/locks/altitude", "pitch-hold");
</script> </script>
</binding> </binding>
</key> </key>
</key> </key>
<key n="111"> <key n="102">
<name>o</name> <name>f</name>
<desc>AoA hold</desc> <desc>FPA hold</desc>
<key n="901"> <key n="901">
<name>%f</name> <name>%f</name>
<desc>AoA angle = %.1f degree</desc> <desc>FPA = %.1f degree</desc>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script> <script>
setprop("/autopilot/settings/target-aoa-degree", arg[0]); setprop("/autopilot/settings/target-fpa-deg", arg[0]);
setprop("/autopilot/locks/altitude", "aoa-hold"); setprop("/autopilot/locks/altitude", "fpa-hold");
</script> </script>
</binding> </binding>
</key> </key>

15
Nasal/multiplayer.nas
View file

@ -625,13 +625,18 @@ var model = {
}; };
var mp_mode_changed = func(n) { var mp_mode_changed = func(n) {
var is_online = n.getBoolValue(); var is_online = getprop("/sim/multiplay/online");
foreach (var menuitem;["mp-chat","mp-chat-menu","mp-list","mp-carrier"]) var is_replaying = getprop("/sim/replay/replay-state");
# Always activate multiplayer items if we are replaying, in case the
# recording contains MP info.
#
foreach (var menuitem; ["mp-chat","mp-chat-menu","mp-list","mp-carrier"])
{ {
gui.menuEnable(menuitem, is_online); gui.menuEnable(menuitem, is_online or is_replaying);
} }
if (is_online) { if (is_online or is_replaying) {
if (getprop("/sim/multiplay/write-message-log") and (log_file == nil)) { if (getprop("/sim/multiplay/write-message-log") and (log_file == nil)) {
var t = props.globals.getNode("/sim/time/real"); var t = props.globals.getNode("/sim/time/real");
if (t == nil) if (t == nil)
@ -684,6 +689,8 @@ var mp_mode_changed = func(n) {
model.init(); model.init();
setlistener("/sim/multiplay/online", mp_mode_changed, 1, 1); setlistener("/sim/multiplay/online", mp_mode_changed, 1, 1);
setlistener("/sim/replay/replay-state", mp_mode_changed, 1, 1);
# Call-back to ensure we see our own messages. # Call-back to ensure we see our own messages.
setlistener("/sim/multiplay/chat", chat_listener); setlistener("/sim/multiplay/chat", chat_listener);

5
Translations/locale.xml
View file

@ -108,5 +108,10 @@
<xliff type="string">Translations/pt/FlightGear-nonQt.xlf</xliff> <xliff type="string">Translations/pt/FlightGear-nonQt.xlf</xliff>
</locale> </locale>
<locale>
<lang type="string">tr</lang>
<lang type="string">tr_TR</lang>
<xliff type="string">Translations/tr/FlightGear-nonQt.xlf</xliff>
</locale>
</PropertyList> </PropertyList>

2884
Translations/tr/FlightGear-Qt.xlf Normal file
View file

File diff suppressed because it is too large Load diff

2059
Translations/tr/FlightGear-nonQt.xlf Normal file
View file

File diff suppressed because it is too large Load diff

2
gui/dialogs/lag-adjust.xml
View file

@ -121,7 +121,7 @@
<slider> <slider>
<row>2</row> <row>2</row>
<col>2</col> <col>2</col>
<name>Range</name> <name>range</name>
<min>1</min> <min>1</min>
<max>15</max> <max>15</max>
<step>0.1</step> <step>0.1</step>