From b8bcecbed4059d2d8f598b7851dd740ab154b404 Mon Sep 17 00:00:00 2001 From: Silarn Date: Sat, 28 Sep 2019 00:41:47 -0500 Subject: [PATCH 1/5] Update Appveyor to official VS 2019 image --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d33e234..5abb106 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ version: 1.0.{build} skip_branch_with_pr: true -image: Visual Studio 2019 Preview +image: Visual Studio 2019 environment: WEBHOOK_URL: secure: gOKbXaZM9ImtMD5XrYITvdyZUW/az082G9OIN1EC1Vbg57wBaeLhi49uGjxPw5GVujHku6kxN6ab89zhbS5GVeluR76GM83IbKV4Sh7udXzoYZZdg6YudtYHzdhCgUeiedpswbuczTq9ceIkkfSEWZuh/lMAAVVwvcGsJAnoPFw= From 059dc8b9d2a722fed4ff4d482102839490cc0a08 Mon Sep 17 00:00:00 2001 From: LostDragonist Date: Sun, 6 Oct 2019 17:20:53 -0500 Subject: [PATCH 2/5] Report plugin as active even if failed This is required for the plugin to report notifications. This behavior was changed in the main MO program at some point. --- src/proxy/proxypython.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/proxy/proxypython.cpp b/src/proxy/proxypython.cpp index 57c4511..7eb074e 100644 --- a/src/proxy/proxypython.cpp +++ b/src/proxy/proxypython.cpp @@ -201,7 +201,7 @@ VersionInfo ProxyPython::version() const bool ProxyPython::isActive() const { - return m_LoadFailure == FAIL_NONE; + return m_LoadFailure == FAIL_NOTINIT; } QList ProxyPython::settings() const From 52dd7454be96f8bb8ac81dad56b86efe638fc68d Mon Sep 17 00:00:00 2001 From: LostDragonist Date: Sun, 6 Oct 2019 17:22:09 -0500 Subject: [PATCH 3/5] Update version --- src/proxy/proxypython.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/proxy/proxypython.cpp b/src/proxy/proxypython.cpp index 7eb074e..2c931c6 100644 --- a/src/proxy/proxypython.cpp +++ b/src/proxy/proxypython.cpp @@ -196,7 +196,7 @@ QString ProxyPython::description() const VersionInfo ProxyPython::version() const { - return VersionInfo(2, 0, 1, VersionInfo::RELEASE_FINAL); + return VersionInfo(2, 1, 0, VersionInfo::RELEASE_FINAL); } bool ProxyPython::isActive() const From b2ae43a0e51c2932025b097b9c91f71bbc598889 Mon Sep 17 00:00:00 2001 From: Silarn Date: Sat, 19 Oct 2019 02:28:01 -0500 Subject: [PATCH 4/5] Add lightPluginsAreSupported to the wrapped game plugin functions --- src/runner/gamefeatureswrappers.cpp | 6 ++++++ src/runner/gamefeatureswrappers.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/runner/gamefeatureswrappers.cpp b/src/runner/gamefeatureswrappers.cpp index b69c43b..5642e56 100644 --- a/src/runner/gamefeatureswrappers.cpp +++ b/src/runner/gamefeatureswrappers.cpp @@ -79,6 +79,11 @@ void GamePluginsWrapper::getLoadOrder(QStringList &loadOrder) return basicWrapperFunctionImplementation(this, "getLoadOrder", loadOrder); } +bool GamePluginsWrapper::lightPluginsAreSupported() +{ + return basicWrapperFunctionImplementation(this, "lightPluginsAreSupported"); +} + /// end GamePlugins Wrapper ///////////////////////////// /// LocalSavegames Wrapper @@ -261,6 +266,7 @@ void registerGameFeaturesPythonConverters() .def("writePluginLists", bpy::pure_virtual(&GamePlugins::writePluginLists)) .def("readPluginLists", bpy::pure_virtual(&GamePlugins::readPluginLists)) .def("getLoadOrder", bpy::pure_virtual(&GamePlugins::getLoadOrder)) + .def("lightPluginsAreSupported", bpy::pure_virtual(&GamePlugins::lightPluginsAreSupported)) ; bpy::class_("LocalSavegames") diff --git a/src/runner/gamefeatureswrappers.h b/src/runner/gamefeatureswrappers.h index b8b04ed..05191ef 100644 --- a/src/runner/gamefeatureswrappers.h +++ b/src/runner/gamefeatureswrappers.h @@ -48,6 +48,7 @@ public: virtual void writePluginLists(const MOBase::IPluginList *pluginList) override; virtual void readPluginLists(MOBase::IPluginList *pluginList) override; virtual void getLoadOrder(QStringList &loadOrder) override; + virtual bool lightPluginsAreSupported() override; }; class LocalSavegamesWrapper : public LocalSavegames, public boost::python::wrapper From b0ef81214adcdcc009dbdd393f48d0252678b4ce Mon Sep 17 00:00:00 2001 From: Silarn Date: Tue, 29 Oct 2019 01:35:15 -0500 Subject: [PATCH 5/5] Fix cmakelists and use zip --- CMakeLists.txt | 10 +++++----- src/runner/pythonrunner.cpp | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 53f499a..b2e4c5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,12 +12,12 @@ SET(DEPENDENCIES_DIR CACHE PATH "") LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake) # need to install python -IF(EXISTS "${PYTHON_ROOT}/PCbuild/python27.dll") - INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.dll DESTINATION bin) - INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.pdb DESTINATION pdb) +IF(EXISTS "${PYTHON_ROOT}/PCbuild/python37.dll") + INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python37.dll DESTINATION bin) + INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python37.pdb DESTINATION pdb) ELSEIF(EXISTS "${PYTHON_ROOT}/PCbuild/amd64/python27.dll") - INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python27.dll DESTINATION bin) - INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python27.pdb DESTINATION pdb) + INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python37.dll DESTINATION bin) + INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python37.pdb DESTINATION pdb) ENDIF() diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index 5c8d91f..3762f96 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -1401,6 +1401,7 @@ bool handled_exec_file(bpy::str filename, bpy::object globals = bpy::object(), b void PythonRunner::initPath() { static QStringList paths = { + QCoreApplication::applicationDirPath() + "/pythoncore.zip", QCoreApplication::applicationDirPath() + "/pythoncore", m_MOInfo->pluginDataPath() };