Skip to content

Commit 3821530

Browse files
authored
Merge pull request #272 from TwinFan/Next
v4.0.0
2 parents 696b9e6 + 16a059e commit 3821530

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+3054
-3316
lines changed

.gitmodules

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
[submodule "Lib/XPMP2"]
22
path = Lib/XPMP2
33
url = https://github.com/TwinFan/XPMP2
4-
branch = master
4+
branch = master
5+
[submodule "Lib/parson"]
6+
path = Lib/parson
7+
url = https://github.com/kgabis/parson
8+
[submodule "Lib/metaf"]
9+
path = Lib/metaf
10+
url = https://github.com/TwinFan/metaf
2.05 KB
Binary file not shown.
915 Bytes
Binary file not shown.

AviationWeather/METAR.sjson/data

281 Bytes
Binary file not shown.
297 Bytes
Binary file not shown.

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ else()
2121
endif()
2222

2323
project(LiveTraffic
24-
VERSION 3.6.0
24+
VERSION 4.0.0
2525
DESCRIPTION "LiveTraffic X-Plane plugin")
26+
set(VERSION_BETA 0)
2627

2728
# Building a Beta version can be demanded via ENV variable 'version_beta' being set to 1
28-
set(VERSION_BETA 0)
2929
if(DEFINED ENV{version_beta})
3030
if ($ENV{version_beta} GREATER 0)
3131
set(VERSION_BETA 1)
@@ -141,6 +141,7 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/Lib/ImGui")
141141
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/Lib/ImGui/misc/cpp")
142142
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/Lib/ImgWindow")
143143
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/Lib/Font")
144+
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/Lib/metaf/include")
144145

145146
################################################################################
146147
# Source groups
@@ -184,6 +185,7 @@ set(Header_Files
184185
Lib/ImgWindow/SystemGL.h
185186
Lib/Font/IconsFontAwesome5.h
186187
Lib/Font/fa-solid-900.inc
188+
Lib/metaf/include/metaf.hpp
187189
Lib/XPMP2/inc/XPCAircraft.h
188190
Lib/XPMP2/inc/XPMPMultiplayer.h
189191
Lib/XPMP2/lib/fmod/logo/FMOD_Logo.h

Data/RealTraffic/RTAPI_example.py

Lines changed: 0 additions & 169 deletions
This file was deleted.
-949 KB
Binary file not shown.
-51.1 KB
Binary file not shown.
-668 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)