Skip to content

Commit ad12a14

Browse files
authored
Merge pull request #216 from TwinFan/Next
v2.51
2 parents dba5f74 + bfc945e commit ad12a14

File tree

19 files changed

+79
-40
lines changed

19 files changed

+79
-40
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
cmake_minimum_required(VERSION 3.16)
44
project(LiveTraffic
5-
VERSION 2.41
5+
VERSION 2.51
66
DESCRIPTION "LiveTraffic X-Plane plugin")
77

88
################################################################################

Include/Constants.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
//
3030
// MARK: Version Information (CHANGE VERSION HERE)
3131
//
32-
constexpr float VERSION_NR = 2.50f;
32+
constexpr float VERSION_NR = 2.51f;
3333
constexpr bool VERSION_BETA = false;
3434
extern float verXPlaneOrg; // version on X-Plane.org
3535
extern int verDateXPlaneOrg; // and its date

Include/DataRefs.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ enum dataRefsLT {
364364
DR_CFG_LND_LIGHTS_TAXI,
365365
DR_CFG_HIDE_BELOW_AGL,
366366
DR_CFG_HIDE_TAXIING,
367+
DR_CFG_HIDE_PARKING,
367368
DR_CFG_HIDE_NEARBY_GND,
368369
DR_CFG_HIDE_NEARBY_AIR,
369370
DR_CFG_COPY_OBJ_FILES,
@@ -638,6 +639,7 @@ class DataRefs
638639
int bLndLightsTaxi = false; // keep landing lights on while taxiing? (to be able to see the a/c as there is no taxi light functionality)
639640
int hideBelowAGL = 0; // if positive: a/c visible only above this height AGL
640641
int hideTaxiing = 0; // hide a/c while taxiing?
642+
int hideParking = 0; ///< hide a/c parking at a startup-position (gate, ramp)?
641643
int hideNearbyGnd = 0; // [m] hide a/c if closer than this to user's aircraft on the ground
642644
int hideNearbyAir = 0; // [m] hide a/c if closer than this to user's aircraft in the air
643645
int cpyObjFiles = 1; ///< copy `.obj` files for replacing dataRefs and textures
@@ -833,10 +835,11 @@ class DataRefs
833835
inline bool GetLndLightsTaxi() const { return bLndLightsTaxi != 0; }
834836
inline int GetHideBelowAGL() const { return hideBelowAGL; }
835837
inline bool GetHideTaxiing() const { return hideTaxiing != 0; }
838+
inline bool GetHideParking() const { return hideParking != 0; }
836839
inline int GetHideNearby(bool bGnd) const ///< return "hide nearby" config
837840
{ return bGnd ? hideNearbyGnd : hideNearbyAir; }
838841
inline bool IsAutoHidingActive() const ///< any auto-hiding activated?
839-
{ return hideBelowAGL > 0 || hideTaxiing != 0 ||
842+
{ return hideBelowAGL > 0 || hideTaxiing != 0 || hideParking != 0 ||
840843
hideNearbyGnd > 0 || hideNearbyAir > 0; }
841844
bool ShallCpyObjFiles () const { return cpyObjFiles != 0; }
842845
int GetRemoteSupport () const { return remoteSupport; }

Lib/XPMP2/XPMP2.framework/Versions/2.1/Resources/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>BuildMachineOSBuild</key>
6-
<string>20D74</string>
6+
<string>20D91</string>
77
<key>CFBundleDevelopmentRegion</key>
88
<string>en</string>
99
<key>CFBundleExecutable</key>
0 Bytes
Binary file not shown.

Lib/XPMP2/lin-bionic/libXPMP2.a

0 Bytes
Binary file not shown.

Lib/XPMP2/lin/libXPMP2.a

0 Bytes
Binary file not shown.

Lib/XPMP2/win/XPMP2.lib

0 Bytes
Binary file not shown.

Lib/XPMP2/win/XPMP2.lib.debug

0 Bytes
Binary file not shown.

LiveTraffic.aps

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)