Merge master into develop and other changes for X-Plane 12 compatibility#310
Merge master into develop and other changes for X-Plane 12 compatibility#310NPrincen wants to merge 16 commits into
Conversation
[Build] CameraCallbacks.cpp is missing in CMakeLists.txt
Co-authored-by: Christopher Teubert <christopher.a.teubert@nasa.gov>
Making the Python 3 package pip-installable
NPrincen
changed the title
|
Unfortunately our policy says that merging to |
|
Sorry, but I think you misunderstood the merge. I was asking for the 7 commits that are in master that are not in develop to be merged into develop. Right now, master has changes that are not in develop. I think you can do this without doing the paperwork for a formal release. Also, I went and marked this Merge Request as Draft right now. I am working to make XPlaneConnect X-Plane 12 compatible. It doesn't work because of a few issues. There are errors being generated that need to be fixed. getTERR seems to be throwing an error with the previous plugin. I would like to update to the latest 4.01 SDK and see if that fixes it. So, I am not ready for you to merge changes to develop yet because I am still working on it. Maybe you want me to split this into two Merges? One for the port of master changes to develop and the other for the X-Plane 12 changes. Thank You, |
|
Fair enough. I did indeed misunderstand. As long as the diff isn't too big, I'm fine with accepting 1 PR for both. |
Update the SDK to the latest X-Plane SDK 4.0.1. Keep the old 32 bit libraries from X-Plane SDK 2.1.3.
Changed xplm_Phase_Objects to xplm_Phase_Modern3D to be compatible with XPLM302 and newer.
Deleted call to XPLMCommandKeyStroke because it has been deprecated. Replace later.
Added definitions for all XPLM200 through XPLM400 to be compatible with the 4.01 SDK and X-Plane 12.
Added definitions for all XPLM200 through XPLM400 to be compatible with the 4.01 SDK and X-Plane 12.
Added definitions for all XPLM200 through XPLM400 to be compatible with the 4.01 SDK and X-Plane 12.
Added definitions for all XPLM200 through XPLM400 to be compatible with the 4.01 SDK and X-Plane 12.
|
Hi OP just want to confirm - does your fork fully work with Xplane 12? I am trying to create a project for xplane 12 with python so if so I will just use your fork since your changes haven’t been merged. Thanks! |
6 participants
Repository master is 7 commits ahead of develop. Merge the recent changes to master into develop, so it has all the latest changes.
Introduced a corrected version of "Updated DataRefs for Xplane 12 #288" to fix Issue #286.