From eb81ab5b244924053786ac0d006aa797f41841d6 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Wed, 15 Mar 2017 17:07:25 +0400 Subject: [PATCH 1/4] Disables weapon and spells cycling in GUI mode (bugs #2409, #2483, #2645) --- apps/openmw/mwgui/windowmanagerimp.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp index b01070c5f..16d1a9c6d 100644 --- a/apps/openmw/mwgui/windowmanagerimp.cpp +++ b/apps/openmw/mwgui/windowmanagerimp.cpp @@ -1955,12 +1955,14 @@ namespace MWGui void WindowManager::cycleSpell(bool next) { - mSpellWindow->cycle(next); + if (!isGuiMode()) + mSpellWindow->cycle(next); } void WindowManager::cycleWeapon(bool next) { - mInventoryWindow->cycle(next); + if (!isGuiMode()) + mInventoryWindow->cycle(next); } void WindowManager::setConsoleSelectedObject(const MWWorld::Ptr &object) From 3d58ba7301d85fb119a914590c8d9d7d581a7895 Mon Sep 17 00:00:00 2001 From: scrawl Date: Wed, 15 Mar 2017 17:50:13 +0100 Subject: [PATCH 2/4] Fix boolean test --- components/sceneutil/optimizer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/sceneutil/optimizer.cpp b/components/sceneutil/optimizer.cpp index b5cee6966..e7d5b3a40 100644 --- a/components/sceneutil/optimizer.cpp +++ b/components/sceneutil/optimizer.cpp @@ -1057,7 +1057,7 @@ void Optimizer::MergeGeometryVisitor::checkAllowedToMerge() { osg::StateSet* stateSet = *it; osg::StateSet::RenderBinMode mode = stateSet->getRenderBinMode(); - if (override && (!mode & osg::StateSet::PROTECTED_RENDERBIN_DETAILS)) + if (override && !(mode & osg::StateSet::PROTECTED_RENDERBIN_DETAILS)) continue; if (mode & osg::StateSet::USE_RENDERBIN_DETAILS) renderingHint = stateSet->getRenderingHint(); From a070551af3fdd44e92c9554027959f4a00e1fbdb Mon Sep 17 00:00:00 2001 From: scrawl Date: Wed, 15 Mar 2017 17:51:00 +0100 Subject: [PATCH 3/4] Attempt to fix naming conflict on windows --- components/terrain/quadtreeworld.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp index d65b1d5ed..f2a80d673 100644 --- a/components/terrain/quadtreeworld.cpp +++ b/components/terrain/quadtreeworld.cpp @@ -37,7 +37,7 @@ namespace return targetlevel; } - float distance(const osg::BoundingBox& box, const osg::Vec3f& v) + float distanceToBox(const osg::BoundingBox& box, const osg::Vec3f& v) { if (box.contains(v)) return 0; @@ -79,7 +79,7 @@ public: virtual bool isSufficientDetail(QuadTreeNode* node, const osg::Vec3f& eyePoint) { - float dist = distance(node->getBoundingBox(), eyePoint); + float dist = distanceToBox(node->getBoundingBox(), eyePoint); int nativeLodLevel = Log2(static_cast(node->getSize()/mMinSize)); int lodLevel = Log2(static_cast(dist/(8192*mMinSize))); From f151eccc23157f46a978143b51f76f8626a130d4 Mon Sep 17 00:00:00 2001 From: scrawl Date: Wed, 15 Mar 2017 18:51:52 +0100 Subject: [PATCH 4/4] Update AUTHORS.md --- AUTHORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.md b/AUTHORS.md index caaccc158..a37975d24 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -22,6 +22,7 @@ Programmers Alexander Nadeau (wareya) Alexander Olofsson (Ace) Allofich + Andrei Kortunov (akortunov) AnyOldName3 Aussiemon Austin Salgat (Salgat)