From 57257d057f194f137726aad818054f8b7cd5a45e Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sun, 31 Dec 2017 23:48:51 +0000
Subject: [PATCH 1/3] Remove unintended jump cooldown (Fixes #4250)

---
 apps/openmw/mwmechanics/character.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index d9e2cc292..fa261bbc3 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1797,7 +1797,7 @@ void CharacterController::update(float duration)
             vec.y() *= factor;
             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.
             float z = cls.getJump(mPtr);

From c920f95d1ec24806ed1547d85ce304bc4f7c876d Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sun, 31 Dec 2017 23:49:43 +0000
Subject: [PATCH 2/3] Don't incorrectly discard root node transformation (Fixes
 #4272)

---
 components/nifosg/nifloader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index a3b81338e..6e04c6405 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -268,7 +268,7 @@ namespace NifOsg
                 osg::ref_ptr<SceneUtil::Skeleton> skel = new SceneUtil::Skeleton;
 
                 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->setName(root->getName());
@@ -440,7 +440,7 @@ namespace NifOsg
                 // 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
                 // 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;
                     dataVariance = osg::Object::STATIC;

From 73678996344d6a4ea6773fc239bb305a86adcec0 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Mon, 1 Jan 2018 19:47:36 +0100
Subject: [PATCH 3/3] update openmw.appdata.xml to fix
 https://lintian.debian.org/tags/appstream-metadata-legacy-format.html

---
 files/openmw.appdata.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/files/openmw.appdata.xml b/files/openmw.appdata.xml
index 1c16cb9a4..932c82ad7 100644
--- a/files/openmw.appdata.xml
+++ b/files/openmw.appdata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2015 Alexandre Moine <nobrakal@gmail.com> -->
-<application>
- <id type="desktop">openmw.desktop</id>
+<!--
+Copyright 2015 Alexandre Moine <nobrakal@gmail.com>
+Copyright 2017 Bret Curtis <psi29a@gmail.com>
+-->
+<component>
+ <id>org.openmw.desktop</id>
  <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>
  <summary>Unofficial open source engine re-implementation of the game Morrowind</summary>
  <description>
@@ -32,8 +35,7 @@
    <caption>Vivec seen from Ebonheart on OpenMW</caption>
   </screenshot>
  </screenshots>
-<updatecontact>nobrakal@gmail.com</updatecontact>
  <url type="homepage">https://openmw.org</url>
  <url type="bugtracker">https://bugs.openmw.org/</url>
  <url type="faq">https://openmw.org/faq/</url>
-</application>
+</component>