mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 17:49:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #57 from OpenMW/master

Browse source 
Add OpenMW commits up to 17 Sep
This commit is contained in:
David Cernat 2016-09-17 21:31:51 +03:00 committed by GitHub
commit 68f974d999
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS.md
View file

@ -123,6 +123,7 @@ Programmers
smbas
Stefan Galowicz (bogglez)
Stanislav Bobrov (Jiub)
stil-t
svaante
Sylvain Thesnieres (Garvek)
t6

7
apps/openmw/mwgui/bookpage.cpp
View file

@ -275,9 +275,12 @@ struct TypesetBookImpl::Typesetter : BookTypesetter
if (i->match (fontName, fontColour, fontColour, fontColour, 0))
return &*i;
StyleImpl & style = *mBook->mStyles.insert (mBook->mStyles.end (), StyleImpl ());
MyGUI::IFont* font = MyGUI::FontManager::getInstance().getByName(fontName);
if (!font)
throw std::runtime_error(std::string("can't find font ") + fontName);
style.mFont = MyGUI::FontManager::getInstance().getByName(fontName);
StyleImpl & style = *mBook->mStyles.insert (mBook->mStyles.end (), StyleImpl ());
style.mFont = font;
style.mHotColour = fontColour;
style.mActiveColour = fontColour;
style.mNormalColour = fontColour;

5
apps/openmw/mwgui/formatting.cpp
View file

@ -413,7 +413,10 @@ namespace MWGui
int TextElement::currentFontHeight() const
{
std::string fontName(mTextStyle.mFont == "Default" ? MyGUI::FontManager::getInstance().getDefaultFont() : mTextStyle.mFont);
return MyGUI::FontManager::getInstance().getByName(fontName)->getDefaultHeight();
MyGUI::IFont* font = MyGUI::FontManager::getInstance().getByName(fontName);
if (!font)
return 0;
return font->getDefaultHeight();
}
int TextElement::getHeight()

2
apps/wizard/unshield/unshieldworker.cpp
View file

@ -302,7 +302,7 @@ bool Wizard::UnshieldWorker::copyDirectory(const QString &source, const QString
bool Wizard::UnshieldWorker::installFile(const QString &fileName, const QString &path, Qt::MatchFlags flags, bool keepSource)
{
return installFiles(fileName, path, flags, true, keepSource);
return installFiles(fileName, path, flags, keepSource, true);
}
bool Wizard::UnshieldWorker::installFiles(const QString &fileName, const QString &path, Qt::MatchFlags flags, bool keepSource, bool single)

3
components/nifosg/userdata.hpp
View file

@ -38,8 +38,7 @@ namespace NifOsg
// Decomposing the original components from the 4x4 matrix isn't possible, which causes
// problems when a KeyframeController wants to change only one of these components. So
// we store the scale and rotation components separately here.
// Note for a cleaner solution it would be possible to write a custom Transform node,
// but then we have to fork osgAnimation :/
// Note for a cleaner solution it would be possible to write a custom Transform node
float mScale;
Nif::Matrix3 mRotationScale;
};