krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Merge pull request #364 from OpenMW/master

Browse source 
Add OpenMW commits up to 1 Jan 2017
This commit is contained in:
David Cernat 2018-01-02 07:50:37 +02:00 committed by GitHub
commit 65d978a3cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwmechanics/character.cpp
View file

@ -1915,7 +1915,7 @@ void CharacterController::update(float duration)
vec.y() *= factor; vec.y() *= factor;
vec.z() = 0.0f; vec.z() = 0.0f;
} }
else if(vec.z() > 0.0f && mJumpState == JumpState_None) else if(vec.z() > 0.0f && mJumpState != JumpState_InAir)
{ {
// Started a jump. // Started a jump.
float z = cls.getJump(mPtr); float z = cls.getJump(mPtr);

4
components/nifosg/nifloader.cpp
View file

@ -268,7 +268,7 @@ namespace NifOsg
osg::ref_ptr<SceneUtil::Skeleton> skel = new SceneUtil::Skeleton; osg::ref_ptr<SceneUtil::Skeleton> skel = new SceneUtil::Skeleton;
osg::Group* root = created->asGroup(); osg::Group* root = created->asGroup();
if (root && root->getDataVariance() == osg::Object::STATIC) if (root && root->getDataVariance() == osg::Object::STATIC && !root->asTransform())
{ {
skel->setStateSet(root->getStateSet()); skel->setStateSet(root->getStateSet());
skel->setName(root->getName()); skel->setName(root->getName());
@ -440,7 +440,7 @@ namespace NifOsg
// The Root node can be created as a Group if no transformation is required. // The Root node can be created as a Group if no transformation is required.
// This takes advantage of the fact root nodes can't have additional controllers // This takes advantage of the fact root nodes can't have additional controllers
// loaded from an external .kf file (original engine just throws "can't find node" errors if you try). // loaded from an external .kf file (original engine just throws "can't find node" errors if you try).
if (!nifNode->parent && nifNode->controller.empty()) if (!nifNode->parent && nifNode->controller.empty() && nifNode->trafo.isIdentity())
{ {
node = new osg::Group; node = new osg::Group;
dataVariance = osg::Object::STATIC; dataVariance = osg::Object::STATIC;

14
files/openmw.appdata.xml
View file

@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2015 Alexandre Moine <nobrakal@gmail.com> --> <!--
<application> Copyright 2015 Alexandre Moine <nobrakal@gmail.com>
<id type="desktop">openmw.desktop</id> Copyright 2017 Bret Curtis <psi29a@gmail.com>
-->
<component>
<id>org.openmw.desktop</id>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license> GPL-3.0 and MIT and zlib</project_license> <project_license> GPL-3.0 and MIT</project_license>
<name>OpenMW</name> <name>OpenMW</name>
<summary>Unofficial open source engine re-implementation of the game Morrowind</summary> <summary>Unofficial open source engine re-implementation of the game Morrowind</summary>
<description> <description>
@ -32,8 +35,7 @@
<caption>Vivec seen from Ebonheart on OpenMW</caption> <caption>Vivec seen from Ebonheart on OpenMW</caption>
</screenshot> </screenshot>
</screenshots> </screenshots>
<updatecontact>nobrakal@gmail.com</updatecontact>
<url type="homepage">https://openmw.org</url> <url type="homepage">https://openmw.org</url>
<url type="bugtracker">https://bugs.openmw.org/</url> <url type="bugtracker">https://bugs.openmw.org/</url>
<url type="faq">https://openmw.org/faq/</url> <url type="faq">https://openmw.org/faq/</url>
</application> </component>