From a82f36d61d4017b347f9137b74969a7a8110bf9e Mon Sep 17 00:00:00 2001
From: fHachenberg <fabian.hachenberg@gmx.de>
Date: Tue, 20 Sep 2016 14:01:02 +0200
Subject: [PATCH 001/125] Fixes issue #2065

Changes applied:

 *symbol files added
 *LabelWidget removed from SkillLevelWidget and replaced by IconButtonWidget
  Subsequently variables and method containing Label or Text renamed
  setSize method was rewritten
 *Unused property "m_label_name" removed from SkillLevelWidget
 *Substitution label->icon also introduced renamings in KartStatsWidget.
  For instance, setDisplayText is now named setDisplayIcons
---
 data/gui/mass.png                            | Bin 0 -> 21897 bytes
 data/gui/power.png                           | Bin 0 -> 23859 bytes
 data/gui/power.png.license.txt               |   3 +
 data/gui/speed.png                           | Bin 0 -> 30742 bytes
 src/guiengine/widgets/kart_stats_widget.cpp  |  25 +++---
 src/guiengine/widgets/kart_stats_widget.hpp  |  10 ++-
 src/guiengine/widgets/player_kart_widget.cpp |   2 +-
 src/guiengine/widgets/skill_level_widget.cpp |  86 ++++++++++---------
 src/guiengine/widgets/skill_level_widget.hpp |  23 ++---
 9 files changed, 81 insertions(+), 68 deletions(-)
 create mode 100644 data/gui/mass.png
 create mode 100644 data/gui/power.png
 create mode 100644 data/gui/power.png.license.txt
 create mode 100644 data/gui/speed.png

diff --git a/data/gui/mass.png b/data/gui/mass.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0c876830fc94a6fa01234bb228dd394fc52d370
GIT binary patch
literal 21897
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
Ij#Kpi0Km7LegFUf

literal 0
HcmV?d00001

diff --git a/data/gui/power.png b/data/gui/power.png
new file mode 100644
index 0000000000000000000000000000000000000000..0be43a276c78046004ee2473ea346334b82199bf
GIT binary patch
literal 23859
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

literal 0
HcmV?d00001

diff --git a/data/gui/power.png.license.txt b/data/gui/power.png.license.txt
new file mode 100644
index 000000000..c10721136
--- /dev/null
+++ b/data/gui/power.png.license.txt
@@ -0,0 +1,3 @@
+This file is based on https://commons.wikimedia.org/wiki/File:Pferdestaerke.svg#
+This file is licensed under the Creative Commons Attribution-Share Alike 3.0 Unported license.
+
diff --git a/data/gui/speed.png b/data/gui/speed.png
new file mode 100644
index 0000000000000000000000000000000000000000..50b9d61d1b4621385860b44ca0e54df62b2ccca2
GIT binary patch
literal 30742
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

literal 0
HcmV?d00001

diff --git a/src/guiengine/widgets/kart_stats_widget.cpp b/src/guiengine/widgets/kart_stats_widget.cpp
index de33d5a21..182d8cda6 100644
--- a/src/guiengine/widgets/kart_stats_widget.cpp
+++ b/src/guiengine/widgets/kart_stats_widget.cpp
@@ -23,6 +23,7 @@
 #include "karts/kart_properties_manager.hpp"
 #include "utils/log.hpp"
 #include "utils/string_utils.hpp"
+#include "io/file_manager.hpp"
 
 #include <IGUIEnvironment.h>
 #include <IGUIElement.h>
@@ -37,7 +38,7 @@ using namespace irr;
 
 KartStatsWidget::KartStatsWidget(core::recti area, const int player_id,
                                  std::string kart_group, bool multiplayer,
-                                 bool display_text) : Widget(WTYPE_DIV)
+                                 bool display_icons) : Widget(WTYPE_DIV)
 {
     m_title_font = !multiplayer;
     m_player_id = player_id;
@@ -66,15 +67,14 @@ KartStatsWidget::KartStatsWidget(core::recti area, const int player_id,
                        "kart '%s' nor any other kart.",
                        default_kart.c_str());
     }
-
-
+                                                                                                                                    
     for (int i = 0; i < SKILL_COUNT; ++i)
     {
         irr::core::recti skillArea(0, 0, 1, 1);
 
         SkillLevelWidget* skill_bar = NULL;
 
-        skill_bar = new SkillLevelWidget(skillArea, m_player_id, multiplayer, display_text);
+        skill_bar = new SkillLevelWidget(skillArea, m_player_id, multiplayer, display_icons);       
 
         m_skills.push_back(skill_bar);
         m_children.push_back(skill_bar);
@@ -86,16 +86,19 @@ KartStatsWidget::KartStatsWidget(core::recti area, const int player_id,
     // different masses or velocities.
     m_skills[SKILL_MASS]->setValue((int)
             ((props->getCombinedCharacteristic()->getMass() - 20) / 4));
-    m_skills[SKILL_MASS]->setLabel(_("WEIGHT"));
-    m_skills[SKILL_MASS]->m_properties[PROP_ID] = StringUtils::insertValues("@p%i_mass", m_player_id);
+    m_skills[SKILL_MASS]->setIcon(irr::core::stringc(
+            file_manager->getAsset(FileManager::GUI, "mass.png").c_str()));    
+    m_skills[SKILL_MASS]->m_properties[PROP_ID] = StringUtils::insertValues("@p%i_mass", m_player_id);    
 
     m_skills[SKILL_SPEED]->setValue((int)
             ((props->getCombinedCharacteristic()->getEngineMaxSpeed() - 15) * 6));
-    m_skills[SKILL_SPEED]->setLabel(_("SPEED"));
+    m_skills[SKILL_SPEED]->setIcon(irr::core::stringc(
+            file_manager->getAsset(FileManager::GUI, "speed.png").c_str()));    
     m_skills[SKILL_SPEED]->m_properties[PROP_ID] = StringUtils::insertValues("@p%i_speed", m_player_id);
 
-    m_skills[SKILL_POWER]->setValue((int) ((props->getAvgPower() - 30) / 20));
-    m_skills[SKILL_POWER]->setLabel(_("POWER"));
+    m_skills[SKILL_POWER]->setValue((int) ((props->getAvgPower() - 30) / 20));            
+    m_skills[SKILL_POWER]->setIcon(irr::core::stringc(
+            file_manager->getAsset(FileManager::GUI, "power.png").c_str()));    
     m_skills[SKILL_POWER]->m_properties[PROP_ID] = StringUtils::insertValues("@p%i_power", m_player_id);
 
     move(area.UpperLeftCorner.X, area.UpperLeftCorner.Y,
@@ -167,11 +170,11 @@ void KartStatsWidget::setSize(const int x, const int y, const int w, const int h
     m_skill_bar_y = y + h/2 - m_skill_bar_h/2;
 }   // setSize
 
-void KartStatsWidget::setDisplayText(bool display_text)
+void KartStatsWidget::setDisplayIcons(bool display_icons)
 {
     for (int i = 0; i < SKILL_COUNT; ++i)
     {
-        m_skills[i]->setDisplayText(display_text);
+        m_skills[i]->setDisplayIcon(display_icons);
     }
 }   // setDisplayText
 
diff --git a/src/guiengine/widgets/kart_stats_widget.hpp b/src/guiengine/widgets/kart_stats_widget.hpp
index e78aa4555..96d87fe5f 100644
--- a/src/guiengine/widgets/kart_stats_widget.hpp
+++ b/src/guiengine/widgets/kart_stats_widget.hpp
@@ -47,7 +47,9 @@ namespace GUIEngine
          * if/how much space must be added to the raw label's size for the widget to be large enough */
         virtual int getHeightNeededAroundLabel() const { return 4; }
 
-        /** widget coordinates */
+        /** widget coordinates 
+            These are not the actual coordinates of any of the skill bars
+            but only (badly named) intermediate values*/
         int m_skill_bar_x, m_skill_bar_y, m_skill_bar_h, m_skill_bar_w;
 
         int m_player_id;
@@ -69,7 +71,7 @@ namespace GUIEngine
 
         KartStatsWidget(core::recti area, const int player_id,
                         std::string kart_group, bool multiplayer,
-                        bool display_text);
+                        bool display_icons);
         virtual ~KartStatsWidget() {};
 
         // ------------------------------------------------------------------------
@@ -97,8 +99,8 @@ namespace GUIEngine
         /** Get the current values of the widget. */
         int getValue(Stats type);
 
-        /** If the labels should be displayed. */
-        void setDisplayText(bool display_text);
+        /** If the icons should be displayed. */
+        void setDisplayIcons(bool display_icons);
     };
 }
 
diff --git a/src/guiengine/widgets/player_kart_widget.cpp b/src/guiengine/widgets/player_kart_widget.cpp
index 2af1678a0..d0af7382e 100644
--- a/src/guiengine/widgets/player_kart_widget.cpp
+++ b/src/guiengine/widgets/player_kart_widget.cpp
@@ -279,7 +279,7 @@ void PlayerKartWidget::setPlayerID(const int newPlayerID)
     m_player_id = newPlayerID;
     if (!m_ready)
         m_player_ident_spinner->setID(m_player_id);
-    m_kart_stats->setDisplayText(m_player_id == 0);
+    m_kart_stats->setDisplayIcons(m_player_id == 0);
     // restore previous focus, but with new player ID
     if (focus != NULL) focus->setFocusForPlayer(m_player_id);
 
diff --git a/src/guiengine/widgets/skill_level_widget.cpp b/src/guiengine/widgets/skill_level_widget.cpp
index d3d8a602d..d422a0af2 100644
--- a/src/guiengine/widgets/skill_level_widget.cpp
+++ b/src/guiengine/widgets/skill_level_widget.cpp
@@ -26,6 +26,7 @@
 #include "utils/string_utils.hpp"
 
 #include "config/user_config.hpp"
+#include "icon_button_widget.hpp"
 
 #include <IGUIEnvironment.h>
 #include <IGUIElement.h>
@@ -38,12 +39,11 @@ using namespace irr;
 // -----------------------------------------------------------------------------
 
 SkillLevelWidget::SkillLevelWidget(core::recti area, const int player_id,
-                                   bool multiplayer, bool display_text,
-                                   const int value, const stringw& label)
+                                   bool multiplayer, bool display_icon,
+                                   const int value)
                                   : Widget(WTYPE_DIV)
 {
     m_player_id = player_id;
-    m_display_text = display_text;
 
     setSize(area.UpperLeftCorner.X, area.UpperLeftCorner.Y,
             area.getWidth(), area.getHeight()               );
@@ -60,19 +60,22 @@ SkillLevelWidget::SkillLevelWidget(core::recti area, const int player_id,
     m_bar->m_h = m_bar_h;
     m_bar->m_properties[PROP_ID] = StringUtils::insertValues("@p%i_skill_bar", m_player_id);
 
-    m_label = NULL;
+    m_iconbutton = NULL;
 
-    m_label = new LabelWidget(!multiplayer, true);
-    m_label->setText(label,false);
+    m_iconbutton = new IconButtonWidget(IconButtonWidget::SCALE_MODE_KEEP_TEXTURE_ASPECT_RATIO,
+                                        false, false, IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
 
-    m_label->m_x = m_label_x;
-    m_label->m_y = m_label_y;
-    m_label->m_w = m_label_w;
-    m_label->m_h = m_label_h;
-    m_label->m_properties[PROP_ID] = StringUtils::insertValues("@p%i_skill_label", m_player_id);
+    //m_iconbutton_* properties are calculated in setSize method
+    m_iconbutton->m_x = m_iconbutton_x;
+    m_iconbutton->m_y = m_iconbutton_y;
+    m_iconbutton->m_w = m_iconbutton_w;
+    m_iconbutton->m_h = m_iconbutton_h;
+    m_iconbutton->m_properties[PROP_ID] = StringUtils::insertValues("@p%i_skill_label", m_player_id);
 
     m_children.push_back(m_bar);
-    m_children.push_back(m_label);
+    m_children.push_back(m_iconbutton);
+    
+    m_display_icon = display_icon;
 }   // KartStatsWidget
 
 // -----------------------------------------------------------------------------
@@ -80,8 +83,8 @@ SkillLevelWidget::SkillLevelWidget(core::recti area, const int player_id,
 void SkillLevelWidget::add()
 {
     m_bar->add();
-    m_label->add();
-    m_label->setVisible(m_display_text);
+    m_iconbutton->add();
+    m_iconbutton->setVisible(m_display_icon);
 }
 
 // -----------------------------------------------------------------------------
@@ -99,12 +102,12 @@ void SkillLevelWidget::move(const int x, const int y, const int w, const int h)
                     m_bar_w,
                     m_bar_h );
     }
-    if (m_label != NULL)
+    if (m_iconbutton != NULL)
     {
-        m_label->move(m_label_x,
-                      m_label_y,
-                      m_label_w,
-                      m_label_h);
+        m_iconbutton->move( m_iconbutton_x,
+                            m_iconbutton_y,
+                            m_iconbutton_w,
+                            m_iconbutton_h);
     }
 }
 
@@ -116,32 +119,30 @@ void SkillLevelWidget::setSize(const int x, const int y, const int w, const int
     m_y = y;
     m_w = w;
     m_h = h;
+    
+    int iconbox_h = h; //within icon box, icon is drawn at 75% size
+    int iconbox_w = h; //assuming square icon
+    
+    m_iconbutton_h = iconbox_h * 3 / 4; 
+    m_iconbutton_w = iconbox_w * 3 / 4; 
 
     // -- sizes
-    if (m_display_text)
-        m_bar_w = (w / 2) * 3 / 4;
-    else
-        m_bar_w = w * 2 / 3;
-    m_bar_h = h;
-    m_label_w = w/2;
-    m_label_h = h;
+    m_bar_w = m_w - iconbox_w;  //leaving just enough space for icon + its margin  
+    m_bar_h = h;    
 
     // for shrinking effect
     if (h < 175)
     {
         const float factor = h / 175.0f;
         m_bar_h   = (int)(m_bar_h*factor);
-        m_label_h = (int)(m_label_h*factor);
+        // no scale effect for icon (becomes too small otherwise)
     }
+    
+    m_bar_x = x + iconbox_w;    
+    m_bar_y = y + h/2 - m_bar_h/2; //align to midpoint in y direction
 
-    if (m_display_text)
-        m_bar_x = x + w / 2;
-    else
-        m_bar_x = x + w / 6;
-    m_bar_y = y + m_h/2 - m_bar_h/2;
-
-    m_label_x = x;
-    m_label_y = y + m_h/2 - m_label_h/2;
+    m_iconbutton_x = x;
+    m_iconbutton_y = y + h/2 - m_iconbutton_h/2; //align to midpoint in y direction
 }   // setSize
 
 // -----------------------------------------------------------------------------
@@ -153,18 +154,19 @@ void SkillLevelWidget::setValue(const int value)
 
 // -----------------------------------------------------------------------------
 
-void SkillLevelWidget::setLabel(const irr::core::stringw& label)
+void SkillLevelWidget::setIcon(const irr::core::stringc& filepath)
 {
-    m_label->setText(label, false);
+    m_iconbutton->setImage(filepath.c_str());
 }
 
-void SkillLevelWidget::setDisplayText(bool display_text)
+// -----------------------------------------------------------------------------
+
+void SkillLevelWidget::setDisplayIcon(bool display_icon)
 {
-    if(m_display_text != display_text)
+    if(m_display_icon != display_icon)
     {
-        m_display_text = display_text;
-        m_label->setVisible(display_text);
+        m_display_icon = display_icon;
+        m_iconbutton->setVisible(display_icon);
         setSize(m_x, m_y, m_w, m_h);
     }
 }
-
diff --git a/src/guiengine/widgets/skill_level_widget.hpp b/src/guiengine/widgets/skill_level_widget.hpp
index 0fecf8598..00f93a7b7 100644
--- a/src/guiengine/widgets/skill_level_widget.hpp
+++ b/src/guiengine/widgets/skill_level_widget.hpp
@@ -26,7 +26,7 @@
 #include "utils/leak_check.hpp"
 #include "utils/ptr_vector.hpp"
 
-#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
 #include "guiengine/widgets/progress_bar_widget.hpp"
 
 
@@ -48,22 +48,22 @@ namespace GUIEngine
         
         /** widget coordinates */
         int m_bar_x, m_bar_y, m_bar_h, m_bar_w;
-        int m_label_x, m_label_y, m_label_h, m_label_w;
-
-        std::string m_label_name;
+        int m_iconbutton_x, m_iconbutton_y, m_iconbutton_h, m_iconbutton_w;
         
         int m_player_id;
-        bool m_display_text;
+        //shall icon be display left of the skill bar?
+        bool m_display_icon;
 
     public:
         
         LEAK_CHECK()
         
-        LabelWidget* m_label;
+        IconButtonWidget* m_iconbutton;
         ProgressBarWidget* m_bar;
 
-        SkillLevelWidget(core::recti area, const int player_id, bool multiplayer, bool display_text,
-                         const int value = 0, const irr::core::stringw& label = "default");
+        SkillLevelWidget(core::recti area, const int player_id,
+                         bool multiplayer, bool display_text,
+                         const int value = 0);
 
         virtual ~SkillLevelWidget() {};
 
@@ -89,15 +89,18 @@ namespace GUIEngine
 
         /** Change the label of the widget */
         void setLabel(const irr::core::stringw& label);
+        
+        /** Change the image for the icon. Expects an absolute file path*/
+        void setIcon(const irr::core::stringc& filepath);
 
         /** Get the current label of the widget. */
         const irr::core::stringw getLabel()
         {
-            return m_label->getText();
+            return m_iconbutton->getText();
         }
 
         /** If the label should be displayed. */
-        void setDisplayText(bool display_text);
+        void setDisplayIcon(bool display_icon);
     };
 }
 

From 1b75ed9b4cd2c2fade8894e3734896112849b59b Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 12 May 2017 17:11:46 +1000
Subject: [PATCH 002/125] First fix for the basket-ball in cannon - make the
 ball follow the cannon.

---
 src/items/flyable.cpp                 |  28 +++++-
 src/items/flyable.hpp                 |  18 +++-
 src/items/rubber_ball.cpp             |  21 +++-
 src/items/rubber_ball.hpp             |   1 +
 src/karts/abstract_kart_animation.cpp |  39 ++++---
 src/karts/cannon_animation.cpp        | 140 ++++++++++++++++++--------
 src/karts/cannon_animation.hpp        |  14 ++-
 src/tracks/check_cannon.cpp           |  61 ++++++++++-
 src/tracks/check_cannon.hpp           |  12 ++-
 src/tracks/check_cylinder.cpp         |   6 +-
 src/tracks/check_cylinder.hpp         |   2 +-
 src/tracks/check_goal.cpp             |   5 +-
 src/tracks/check_goal.hpp             |   2 +-
 src/tracks/check_lap.cpp              |   8 +-
 src/tracks/check_lap.hpp              |   2 +-
 src/tracks/check_line.cpp             |  38 +++----
 src/tracks/check_line.hpp             |  16 +--
 src/tracks/check_manager.cpp          |  31 ++++++
 src/tracks/check_manager.hpp          |   3 +
 src/tracks/check_sphere.cpp           |   4 +-
 src/tracks/check_sphere.hpp           |   2 +-
 src/tracks/check_structure.hpp        |   2 +-
 22 files changed, 347 insertions(+), 108 deletions(-)

diff --git a/src/items/flyable.cpp b/src/items/flyable.cpp
index e0b122844..e18b37f18 100644
--- a/src/items/flyable.cpp
+++ b/src/items/flyable.cpp
@@ -67,13 +67,14 @@ Flyable::Flyable(AbstractKart *kart, PowerupManager::PowerupType type,
     m_type                         = type;
     m_has_hit_something            = false;
     m_shape                        = NULL;
+    m_animation                    = NULL;
     m_mass                         = mass;
     m_adjust_up_velocity           = true;
     m_time_since_thrown            = 0;
     m_position_offset              = Vec3(0,0,0);
     m_owner_has_temporary_immunity = true;
     m_do_terrain_info              = true;
-    m_max_lifespan = -1;
+    m_max_lifespan                 = -1;
 
     // Add the graphical model
 #ifndef SERVER_ONLY
@@ -353,6 +354,24 @@ void Flyable::getLinearKartItemIntersection (const Vec3 &origin,
                  + ( target_y_speed);
 }   // getLinearKartItemIntersection
 
+//-----------------------------------------------------------------------------
+
+void Flyable::setAnimation(AbstractKartAnimation *animation)
+{
+    if (animation)
+    {
+        assert(m_animation == NULL);
+        Physics::getInstance()->removeBody(m_body);
+    }
+    else   // animation = NULL
+    {
+        assert(m_animation != NULL);
+        m_body->setWorldTransform(getTrans());
+        Physics::getInstance()->addBody(m_body);
+    }
+    m_animation = animation;
+}   // addAnimation
+
 //-----------------------------------------------------------------------------
 /** Updates this flyable. It calls Moveable::update. If this function returns
  *  true, the flyable will be deleted by the projectile manager.
@@ -361,6 +380,13 @@ void Flyable::getLinearKartItemIntersection (const Vec3 &origin,
  */
 bool Flyable::updateAndDelete(float dt)
 {
+    if (hasAnimation())
+    {
+        m_animation->update(dt);
+        Moveable::update(dt);
+        return false;
+    }   // if animation
+
     m_time_since_thrown += dt;
     if(m_max_lifespan > -1 && m_time_since_thrown > m_max_lifespan)
         hit(NULL);
diff --git a/src/items/flyable.hpp b/src/items/flyable.hpp
index 8daa0fdb5..3b46b7ae6 100644
--- a/src/items/flyable.hpp
+++ b/src/items/flyable.hpp
@@ -34,6 +34,7 @@ using namespace irr;
 #include "tracks/terrain_info.hpp"
 
 class AbstractKart;
+class AbstractKartAnimation;
 class HitEffect;
 class PhysicalObject;
 class XMLNode;
@@ -64,6 +65,11 @@ private:
      *  terrain yourself (e.g. order of operations is important)
      *  set this to false with a call do setDoTerrainInfo(). */
     bool              m_do_terrain_info;
+
+    /** If the flyable is in a cannon, this is the pointer to the cannon
+     *  animation. NULL otherwise. */
+    AbstractKartAnimation *m_animation;
+
 protected:
     /** Kart which shot this flyable. */
     AbstractKart*     m_owner;
@@ -162,11 +168,16 @@ public:
     static void  init        (const XMLNode &node, scene::IMesh *model,
                               PowerupManager::PowerupType type);
     virtual bool              updateAndDelete(float);
+    virtual void              setAnimation(AbstractKartAnimation *animation);
     virtual HitEffect*        getHitEffect() const;
     bool                      isOwnerImmunity(const AbstractKart *kart_hit) const;
     virtual bool              hit(AbstractKart* kart, PhysicalObject* obj=NULL);
     void                      explode(AbstractKart* kart, PhysicalObject* obj=NULL,
                                       bool secondary_hits=true);
+    unsigned int              getOwnerId();
+    // ------------------------------------------------------------------------
+    /** Returns if this flyable has an animation playing (e.g. cannon). */
+    bool hasAnimation() const { return m_animation != NULL;  }
     // ------------------------------------------------------------------------
     /** If true the up velocity of the flyable will be adjust so that the
      *  flyable stays at a height close to the average height.
@@ -194,15 +205,16 @@ public:
     void         reset       () { Moveable::reset();          }
     // ------------------------------------------------------------------------
     /** Returns the type of flyable. */
-    PowerupManager::PowerupType
-                  getType() const {return m_type;}
+    PowerupManager::PowerupType getType() const {return m_type;}
     // ------------------------------------------------------------------------
     /** Sets wether Flyable should update TerrainInfo as part of its update
      *  call, or if the inheriting object will update TerrainInfo itself
      *  (or perhaps not at all if it is not needed). */
     void setDoTerrainInfo(bool d) { m_do_terrain_info = d; }
     // ------------------------------------------------------------------------
-    unsigned int getOwnerId();
+    /** Returns the size (extend) of the mesh. */
+    const Vec3 &getExtend() const { return m_extend;  }
+    // ------------------------------------------------------------------------
 };   // Flyable
 
 #endif
diff --git a/src/items/rubber_ball.cpp b/src/items/rubber_ball.cpp
index 2f69e3c43..2b010ac4d 100644
--- a/src/items/rubber_ball.cpp
+++ b/src/items/rubber_ball.cpp
@@ -29,6 +29,7 @@
 #include "modes/linear_world.hpp"
 #include "physics/btKart.hpp"
 #include "physics/triangle_mesh.hpp"
+#include "tracks/check_manager.hpp"
 #include "tracks/drive_graph.hpp"
 #include "tracks/drive_node.hpp"
 #include "tracks/track.hpp"
@@ -103,7 +104,7 @@ RubberBall::RubberBall(AbstractKart *kart)
         DriveGraph::get()->getNode(getCurrentGraphNode())->getNormal();
     TerrainInfo::update(getXYZ(), -normal);
     initializeControlPoints(m_owner->getXYZ());
-
+    CheckManager::get()->addFlyableToCannons(this);
 }   // RubberBall
 
 // ----------------------------------------------------------------------------
@@ -114,6 +115,7 @@ RubberBall::~RubberBall()
     if(m_ping_sfx->getStatus()==SFXBase::SFX_PLAYING)
         m_ping_sfx->stop();
     m_ping_sfx->deleteSFX();
+    CheckManager::get()->removeFlyableFromCannons(this);
 }   // ~RubberBall
 
 // ----------------------------------------------------------------------------
@@ -145,6 +147,14 @@ void RubberBall::initializeControlPoints(const Vec3 &xyz)
     m_t_increase    = m_speed/m_length_cp_1_2;
 }   // initializeControlPoints
 
+// ----------------------------------------------------------------------------
+void RubberBall::setAnimation(AbstractKartAnimation *animation)
+{
+    if (!animation)
+        initializeControlPoints(getXYZ());
+    Flyable::setAnimation(animation);
+}   // setAnimation
+
 // ----------------------------------------------------------------------------
 /** Determines the first kart that is still in the race.
  */
@@ -310,6 +320,7 @@ bool RubberBall::updateAndDelete(float dt)
     // FIXME: what does the rubber ball do in case of battle mode??
     if(!world) return true;
 
+    
     if(m_delete_timer>0)
     {
         m_delete_timer -= dt;
@@ -323,6 +334,14 @@ bool RubberBall::updateAndDelete(float dt)
         }
     }
 
+    if (hasAnimation())
+    {
+        // Flyable will call update() of the animation to 
+        // update the ball's position.
+        m_previous_xyz = getXYZ();
+        return Flyable::updateAndDelete(dt);
+    }
+
     // Update the target in case that the first kart was overtaken (or has
     // finished the race).
     computeTarget();
diff --git a/src/items/rubber_ball.hpp b/src/items/rubber_ball.hpp
index 2d354136b..5575786e7 100644
--- a/src/items/rubber_ball.hpp
+++ b/src/items/rubber_ball.hpp
@@ -204,6 +204,7 @@ public:
     static  void init(const XMLNode &node, scene::IMesh *rubberball);
     virtual bool updateAndDelete(float dt);
     virtual bool hit(AbstractKart* kart, PhysicalObject* obj=NULL);
+    virtual void setAnimation(AbstractKartAnimation *animation);
     static float getTimeBetweenRubberBalls()    {return m_time_between_balls;}
     // ------------------------------------------------------------------------
     /** This object does not create an explosion, all affects on
diff --git a/src/karts/abstract_kart_animation.cpp b/src/karts/abstract_kart_animation.cpp
index 54cc9b09c..f78fdeeba 100644
--- a/src/karts/abstract_kart_animation.cpp
+++ b/src/karts/abstract_kart_animation.cpp
@@ -24,6 +24,11 @@
 #include "karts/skidding.hpp"
 #include "physics/physics.hpp"
 
+/** Constructor. Note that kart can be NULL in case that the animation is
+ *  used for a basket ball in a cannon animation.
+ *  \param kart Pointer to the kart that is animated, or NULL if the
+ *         the animation is meant for a basket ball etc.
+ */
 AbstractKartAnimation::AbstractKartAnimation(AbstractKart *kart,
                                              const std::string &name)
 {
@@ -37,7 +42,7 @@ AbstractKartAnimation::AbstractKartAnimation(AbstractKart *kart,
     // up animations) if this should happen. In debug mode this condition
     // is caught by setKartAnimation(), and useful error messages are
     // printed
-    if (kart->getKartAnimation())
+    if (kart && kart->getKartAnimation())
     {
         AbstractKartAnimation* ka = kart->getKartAnimation();
         kart->setKartAnimation(NULL);
@@ -46,21 +51,23 @@ AbstractKartAnimation::AbstractKartAnimation(AbstractKart *kart,
 #endif
     // Register this animation with the kart (which will free it
     // later).
-    kart->setKartAnimation(this);
-    Physics::getInstance()->removeKart(m_kart);
-    kart->getSkidding()->reset();
-    kart->getSlipstream()->reset();
-    if(kart->isSquashed())
+    if (kart)
     {
-        // A time of 0 reset the squashing
-        kart->setSquash(0.0f, 0.0f);
+        kart->setKartAnimation(this);
+        Physics::getInstance()->removeKart(m_kart);
+        kart->getSkidding()->reset();
+        kart->getSlipstream()->reset();
+        if (kart->isSquashed())
+        {
+            // A time of 0 reset the squashing
+            kart->setSquash(0.0f, 0.0f);
+        }
+
+        // Reset the wheels (and any other animation played for that kart)
+        // This avoid the effect that some wheels might be way below the kart
+        // which is very obvious in the rescue animation.
+        m_kart->getKartModel()->resetVisualWheelPosition();
     }
-
-    // Reset the wheels (and any other animation played for that kart)
-    // This avoid the effect that some wheels might be way below the kart
-    // which is very obvious in the rescue animation.
-    m_kart->getKartModel()->resetVisualWheelPosition();
-
 }   // AbstractKartAnimation
 
 // ----------------------------------------------------------------------------
@@ -70,7 +77,7 @@ AbstractKartAnimation::~AbstractKartAnimation()
     // is deleted (at the end of a race), which means that
     // world is in the process of being deleted. In this case
     // we can't call getPhysics() anymore.
-    if(m_timer < 0)
+    if(m_timer < 0 && m_kart)
     {
         m_kart->getBody()->setAngularVelocity(btVector3(0,0,0));
         Physics::getInstance()->addKart(m_kart);
@@ -91,7 +98,7 @@ void AbstractKartAnimation::update(float dt)
     m_timer -= dt;
     if(m_timer<0)
     {
-        m_kart->setKartAnimation(NULL);
+        if(m_kart) m_kart->setKartAnimation(NULL);
         delete this;
     }
 }   // update
diff --git a/src/karts/cannon_animation.cpp b/src/karts/cannon_animation.cpp
index cd3caced9..60ddbbb94 100644
--- a/src/karts/cannon_animation.cpp
+++ b/src/karts/cannon_animation.cpp
@@ -21,6 +21,7 @@
 #include "animations/animation_base.hpp"
 #include "animations/ipo.hpp"
 #include "animations/three_d_animation.hpp"
+#include "items/flyable.hpp"
 #include "karts/abstract_kart.hpp"
 #include "karts/kart_properties.hpp"
 #include "modes/world.hpp"
@@ -28,7 +29,8 @@
 #include "LinearMath/btTransform.h"
 
 /** The constructor for the cannon animation. 
- *  \param kart The kart to be animated.
+ *  \param kart The kart to be animated. Can also be NULL if a basket ball
+ *         etc is animated (e.g. cannon animation).
  *  \param ipo The IPO (blender interpolation curve) which the kart
  *         should follow.
  *  \param start_left, start_right: Left and right end points of the line
@@ -45,9 +47,41 @@ CannonAnimation::CannonAnimation(AbstractKart *kart, Ipo *ipo,
                                  float skid_rot)
                : AbstractKartAnimation(kart, "CannonAnimation")
 {
-    m_curve  = new AnimationBase(ipo);
-    m_timer  = ipo->getEndTime();
-    
+    m_flyable = NULL;
+    init(ipo, start_left, start_right, end_left, end_right, skid_rot);
+}   // CannonAnimation
+
+// ----------------------------------------------------------------------------
+/** Constructor for a flyable. It sets the kart data to NULL.
+ */
+CannonAnimation::CannonAnimation(Flyable *flyable, Ipo *ipo,
+                                 const Vec3 &start_left, const Vec3 &start_right,
+                                 const Vec3 &end_left, const Vec3 &end_right   )
+               : AbstractKartAnimation(NULL, "CannonAnimation")
+{
+    m_flyable = flyable;
+    init(ipo, start_left, start_right, end_left, end_right, /*skid_rot*/0);
+}   // CannonAnimation(Flyable*...)
+
+// ----------------------------------------------------------------------------
+/** Common initialisation for kart-based and flyable-based animations.
+ *  \param ipo The IPO (blender interpolation curve) which the kart
+ *         should follow.
+ *  \param start_left, start_right: Left and right end points of the line
+ *         that the kart just crossed.
+ *  \param end_left, end_right: Left and right end points of the line at
+ *         which the kart finishes.
+ *  \param skid_rot Visual rotation of the kart due to skidding (while this
+ *         value can be queried, the AbstractkartAnimation constructor
+ *         resets the value to 0, so it needs to be passed in.
+ */
+void CannonAnimation::init(Ipo *ipo, const Vec3 &start_left,
+    const Vec3 &start_right, const Vec3 &end_left,
+    const Vec3 &end_right, float skid_rot)
+{
+    m_curve = new AnimationBase(ipo);
+    m_timer = ipo->getEndTime();
+
     // First make sure that left and right points are indeed correct
     // -------------------------------------------------------------
     Vec3 my_start_left = start_left;
@@ -57,12 +91,17 @@ CannonAnimation::CannonAnimation(AbstractKart *kart, Ipo *ipo,
     // (the curve's origin must be in the middle of the line.
     m_curve->getAt(0, &p0);
     m_curve->getAt(0.1f, &p1);
-    Vec3 p2 = 0.5f*(p0 + p1) + m_kart->getNormal();
+    Vec3 p2;
+    if (m_kart)
+        p2 = 0.5f*(p0 + p1) + m_kart->getNormal();
+    else
+        p2 = 0.5f*(p0 + p1) + m_flyable->getNormal();
+
     if (start_left.sideofPlane(p0, p1, p2) < 0)
     {
         // Left and right start line needs to be swapped
         my_start_left = start_right;
-        my_start_right = start_left; 
+        my_start_right = start_left;
     }
 
     // First adjust start and end points to take on each side half the kart
@@ -70,8 +109,9 @@ CannonAnimation::CannonAnimation(AbstractKart *kart, Ipo *ipo,
     Vec3 direction = my_start_right - my_start_left;
     direction.normalize();
 
-    float kw = m_kart->getKartModel()->getWidth();
-    Vec3 adj_start_left  = my_start_left  + (0.5f*kw) * direction;
+    float kw = m_kart ? m_kart->getKartModel()->getWidth()
+                      : m_flyable->getExtend().getX();
+    Vec3 adj_start_left = my_start_left + (0.5f*kw) * direction;
     Vec3 adj_start_right = my_start_right - (0.5f*kw) * direction;
 
     // Store the length of the start and end line, which is used
@@ -99,16 +139,17 @@ CannonAnimation::CannonAnimation(AbstractKart *kart, Ipo *ipo,
     // This delta is rotated with the kart and added to the interpolated curve
     // position to get the actual kart position during the animation.
     Vec3 curve_xyz;
+    Vec3 xyz = m_kart ? m_kart->getXYZ() : m_flyable->getXYZ();
     m_curve->update(0, &curve_xyz);
-    m_delta = kart->getXYZ() - curve_xyz;
-    
+    m_delta = xyz - curve_xyz;
+
     // Compute on which fraction of the start line the kart is, to get the
     // second component of the kart position: distance along start line
     Vec3 v = adj_start_left - adj_start_right;
     float l = v.length();
     v /= l;
 
-    float f = v.dot(adj_start_left - kart->getXYZ());
+    float f = v.dot(adj_start_left - xyz);
     if (f <= 0)
         f = 0;
     else if (f >= l)
@@ -138,28 +179,36 @@ CannonAnimation::CannonAnimation(AbstractKart *kart, Ipo *ipo,
     Vec3 tangent;
     m_curve->getDerivativeAt(0, &tangent);
     // Get the current kart orientation
-    Vec3 forward = m_kart->getTrans().getBasis().getColumn(2);
+    const btTransform &trans = m_kart ? m_kart->getTrans()
+                                      : m_flyable->getBody()->getWorldTransform();
+    Vec3 forward = trans.getBasis().getColumn(2);
     Vec3 v1(tangent), v2(forward);
     v1.setY(0); v2.setY(0);
-    m_delta_heading = shortestArcQuatNormalize2(v1, v2) 
-                    * btQuaternion(Vec3(0,1,0), skid_rot);
+    m_delta_heading = shortestArcQuatNormalize2(v1, v2)
+        * btQuaternion(Vec3(0, 1, 0), skid_rot);
 
 
     // The previous call to m_curve->update will set the internal timer
     // of the curve to dt. Reset it to 0 to make sure the timer is in
     // synch with the timer of the CanonAnimation
     m_curve->reset();
-}   // CannonAnimation
+}   // init
 
 // ----------------------------------------------------------------------------
 CannonAnimation::~CannonAnimation()
 {
     delete m_curve;
-
-    btTransform pos = m_kart->getTrans();
-    m_kart->getBody()->setCenterOfMassTransform(pos);
-    Vec3 v(0, 0, m_kart->getKartProperties()->getEngineMaxSpeed());
-    m_kart->setVelocity(pos.getBasis()*v);
+    if (m_kart)
+    {
+        btTransform pos = m_kart->getTrans();
+        m_kart->getBody()->setCenterOfMassTransform(pos);
+        Vec3 v(0, 0, m_kart->getKartProperties()->getEngineMaxSpeed());
+        m_kart->setVelocity(pos.getBasis()*v);
+    }
+    else
+    {
+        m_flyable->setAnimation(NULL);
+    }
 }   // ~CannonAnimation
 
 // ----------------------------------------------------------------------------
@@ -184,7 +233,9 @@ void CannonAnimation::update(float dt)
     m_curve->getDerivativeAt(m_curve->getAnimationDuration() - m_timer,
                              &tangent);
     // Get the current kart orientation
-    Vec3 forward = m_kart->getTrans().getBasis().getColumn(2);
+    const btTransform &trans = m_kart ? m_kart->getTrans()
+                                      : m_flyable->getBody()->getWorldTransform();
+    Vec3 forward = trans.getBasis().getColumn(2);
     
     // Heading
     // -------
@@ -200,10 +251,14 @@ void CannonAnimation::update(float dt)
     // ------------------
     // While start and end line have to have the same 'up' vector, karts can 
     // sometimes be not parallel to them. So slowly adjust this over time
-    Vec3 up = m_kart->getTrans().getBasis().getColumn(1);
+    Vec3 up = trans.getBasis().getColumn(1);
     up.normalize();
-    Vec3 gravity = -m_kart->getBody()->getGravity();
-    gravity.normalize();
+    Vec3 gravity = m_kart ? -m_kart->getBody()->getGravity()
+                          : -m_flyable->getBody()->getGravity();
+    if (gravity.length2() > 0)
+        gravity.normalize();
+    else
+        gravity.setValue(0, -1, 0);
     // Adjust only 5% towards the real up vector. This will smoothly
     // adjust the kart while the kart is in the air
     Vec3 target_up_vector = (gravity*0.05f + up*0.95f).normalize();
@@ -220,27 +275,25 @@ void CannonAnimation::update(float dt)
 
     // The timer counts backwards, so the fraction goes from 1 to 0
     float f = m_timer / m_curve->getAnimationDuration();
-
-    btQuaternion zero(gravity, 0);
-    btQuaternion current_delta_heading = zero.slerp(m_delta_heading, f);
-
-    btQuaternion all_heading = m_kart->getRotation()*current_delta_heading*heading;
-
-    m_kart->setRotation(q_up * all_heading);
-
-
-    // Then compute the new location of the kart
-    // -----------------------------------------
     float f_current_width = m_start_line_length * f
                           + m_end_line_length   * (1.0f - f);
 
-    // Adjust the horizontal location based on steering
-    m_fraction_of_line += m_kart->getSteerPercent()*dt*2.0f;
-    btClamp(m_fraction_of_line, -1.0f, 1.0f);
+    // Then compute the new location of the kart
+    // -----------------------------------------
+    btQuaternion all_heading;
+    if (m_kart)
+    {
+        btQuaternion zero(gravity, 0);
+        btQuaternion current_delta_heading = zero.slerp(m_delta_heading, f);
+        all_heading = m_kart->getRotation()*current_delta_heading*heading;
+        m_kart->setRotation(q_up * all_heading);
 
-    // horiz_delta is in kart coordinates, the rotation by q will
-    // transform it to the global coordinate system
-    Vec3 horiz_delta = Vec3(0.5f*m_fraction_of_line  * f_current_width, 0, 0);
+        // Adjust the horizontal location based on steering
+        m_fraction_of_line += m_kart->getSteerPercent()*dt*2.0f;
+        btClamp(m_fraction_of_line, -1.0f, 1.0f);
+    }   // if m_kart
+    else
+        all_heading.setValue(0, 0, 0, 1);
 
     // Determine direction orthogonal to the curve for the sideway movement
     // of the kart.
@@ -251,5 +304,8 @@ void CannonAnimation::update(float dt)
 
     Vec3 curve_xyz;
     m_curve->update(dt, &curve_xyz);
-    m_kart->setXYZ(curve_xyz+rotated_delta);
+    if (m_kart)
+        m_kart->setXYZ(curve_xyz + rotated_delta);
+    else
+        m_flyable->setXYZ(curve_xyz + rotated_delta);
 }   // update
diff --git a/src/karts/cannon_animation.hpp b/src/karts/cannon_animation.hpp
index f36098d32..37853da81 100644
--- a/src/karts/cannon_animation.hpp
+++ b/src/karts/cannon_animation.hpp
@@ -26,6 +26,7 @@
 
 class AbstractKart;
 class AnimationBase;
+class Flyable;
 class Ipo;
 
 
@@ -46,6 +47,10 @@ protected:
     /** Stores the curve interpolation for the cannon. */
     AnimationBase *m_curve;
 
+    /** If this animation is used for a flyable (e.g. basket ball) instead
+     *  of a kart, m_flyable is defined and m_kart is NULL. */
+    Flyable *m_flyable;
+
     /** Length of the (adjusted, i.e. taking kart width into account)
      *  start line. */
     float m_start_line_length;
@@ -61,12 +66,19 @@ protected:
     /** The initial heading of the kart when crossing the line. This is
      *  used to smoothly orient the kart towards the normal of the cuve. */
     btQuaternion m_delta_heading;
+
+    void init(Ipo *ipo, const Vec3 &start_left, const Vec3 &start_right,
+              const Vec3 &end_left, const Vec3 &end_right, float skid_rot);
+
 public:
              CannonAnimation(AbstractKart *kart, Ipo *ipo,
                              const Vec3 &start_left, const Vec3 &start_right,
                              const Vec3 &end_left, const Vec3 &end_right,
                              float skid_rot);
-    virtual ~CannonAnimation();
+             CannonAnimation(Flyable *flyable, Ipo *ipo,
+                             const Vec3 &start_left, const Vec3 &start_right,
+                             const Vec3 &end_left, const Vec3 &end_right);
+             virtual ~CannonAnimation();
     virtual void  update(float dt);
 
 };   // CannonAnimation
diff --git a/src/tracks/check_cannon.cpp b/src/tracks/check_cannon.cpp
index 9daa715b9..1eb76c8dc 100644
--- a/src/tracks/check_cannon.cpp
+++ b/src/tracks/check_cannon.cpp
@@ -25,6 +25,7 @@
 #include "graphics/show_curve.hpp"
 #include "graphics/stk_tex_manager.hpp"
 #include "io/xml_node.hpp"
+#include "items/flyable.hpp"
 #include "karts/abstract_kart.hpp"
 #include "karts/cannon_animation.hpp"
 #include "karts/skidding.hpp"
@@ -88,9 +89,12 @@ CheckCannon::CheckCannon(const XMLNode &node,  unsigned int index)
                 : video::SColor(128, 128, 128, 128);
         }
         buffer->recalculateBoundingBox();
-        buffer->getMaterial().setTexture(0, STKTexManager::getInstance()->getUnicolorTexture(video::SColor(128, 255, 105, 180)));
-        buffer->getMaterial().setTexture(1, STKTexManager::getInstance()->getUnicolorTexture(video::SColor(0, 0, 0, 0)));
-        buffer->getMaterial().setTexture(2, STKTexManager::getInstance()->getUnicolorTexture(video::SColor(0, 0, 0, 0)));
+        buffer->getMaterial().setTexture(0, STKTexManager::getInstance()
+                            ->getUnicolorTexture(video::SColor(128, 255, 105, 180)));
+        buffer->getMaterial().setTexture(1, STKTexManager::getInstance()
+                            ->getUnicolorTexture(video::SColor(0, 0, 0, 0)));
+        buffer->getMaterial().setTexture(2, STKTexManager::getInstance()
+                            ->getUnicolorTexture(video::SColor(0, 0, 0, 0)));
         buffer->getMaterial().BackfaceCulling = false;
         //mesh->setBoundingBox(buffer->getBoundingBox());
         m_debug_target_node = irr_driver->addMesh(mesh, "checkdebug");
@@ -114,6 +118,8 @@ CheckCannon::~CheckCannon()
 }   // ~CheckCannon
 
 // ----------------------------------------------------------------------------
+/** Changes the colour of a check cannon depending on state.
+ */
 void CheckCannon::changeDebugColor(bool is_active)
 {
 #if defined(DEBUG) && !defined(SERVER_ONLY)
@@ -133,6 +139,55 @@ void CheckCannon::changeDebugColor(bool is_active)
 #endif
 }   // changeDebugColor
 
+// ----------------------------------------------------------------------------
+/** Adds a flyable to be tested for crossing a cannon checkline.
+ *  \param flyable The flyable to be tested.
+ */
+void CheckCannon::addFlyable(Flyable *flyable)
+{
+    m_all_flyables.push_back(flyable);
+    m_flyable_previous_position.push_back(flyable->getXYZ());
+}   // addFlyable
+
+// ----------------------------------------------------------------------------
+/** Removes a flyable from the tests if it crosses a checkline. Used when
+ *  the flyable is removed (e.g. explodes).
+ */
+void CheckCannon::removeFlyable(Flyable *flyable)
+{
+    std::vector<Flyable*>::iterator i = std::find(m_all_flyables.begin(),
+                                                  m_all_flyables.end(),
+                                                  flyable);
+    assert(i != m_all_flyables.end());
+    int index = i - m_all_flyables.begin();   // get the index
+    m_all_flyables.erase(i);
+    m_flyable_previous_position.erase(m_flyable_previous_position.begin() + index);
+}   // removeFlyable
+
+// ----------------------------------------------------------------------------
+/** Overriden to also check all flyables registered with the cannon.
+ */
+void CheckCannon::update(float dt)
+{
+    CheckLine::update(dt);
+    for (unsigned int i = 0; i < m_all_flyables.size(); i++)
+    {
+        setIgnoreHeight(true);
+        bool triggered = isTriggered(m_flyable_previous_position[i],
+                                     m_all_flyables[i]->getXYZ(),
+                                     /*kart index - ignore*/ -1     );
+        setIgnoreHeight(false);
+        m_flyable_previous_position[i] = m_all_flyables[i]->getXYZ();
+        if(!triggered) continue;
+
+        // Cross the checkline - add the cannon animation
+        CannonAnimation *animation =
+            new CannonAnimation(m_all_flyables[i], m_curve->clone(),
+                                getLeftPoint(), getRightPoint(),
+                                m_target_left, m_target_right);
+        m_all_flyables[i]->setAnimation(animation);
+    }   // for i in all flyables
+}   // update
 // ----------------------------------------------------------------------------
 /** Called when the check line is triggered. This function  creates a cannon
  *  animation object and attaches it to the kart.
diff --git a/src/tracks/check_cannon.hpp b/src/tracks/check_cannon.hpp
index 0708d944a..dec83aafc 100644
--- a/src/tracks/check_cannon.hpp
+++ b/src/tracks/check_cannon.hpp
@@ -21,8 +21,10 @@
 
 #include "animations/animation_base.hpp"
 #include "tracks/check_line.hpp"
+#include "utils/cpp2011.hpp"
 
 class CheckManager;
+class Flyable;
 class Ipo;
 class ShowCurve;
 class XMLNode;
@@ -51,12 +53,18 @@ private:
     /** Used to display debug information about checklines. */
     scene::IMeshSceneNode *m_debug_target_node;
 #endif
+    std::vector<Flyable*> m_all_flyables;
+    std::vector<Vec3>     m_flyable_previous_position;
 
 public:
              CheckCannon(const XMLNode &node, unsigned int index);
     virtual ~CheckCannon();
-    virtual void trigger(unsigned int kart_index);
-    virtual void changeDebugColor(bool is_active);
+    virtual void trigger(unsigned int kart_index) OVERRIDE;
+    virtual void changeDebugColor(bool is_active) OVERRIDE;
+    virtual void update(float dt) OVERRIDE;
+
+    void addFlyable(Flyable *flyable);
+    void removeFlyable(Flyable *flyable);
 };   // CheckLine
 
 #endif
diff --git a/src/tracks/check_cylinder.cpp b/src/tracks/check_cylinder.cpp
index 669d271ae..c3ad9f35a 100644
--- a/src/tracks/check_cylinder.cpp
+++ b/src/tracks/check_cylinder.cpp
@@ -46,16 +46,16 @@ CheckCylinder::CheckCylinder(const XMLNode &node, unsigned int index, TriggerIte
 }   // CheckCylinder
 
 // ----------------------------------------------------------------------------
-/** True if going from old_pos to new_pos enters or leaves this sphere. This
+/** True if going from old_pos to new_pos enters or leaves this cylinder. This
  *  function is called from update (of the checkline structure). It also
  *  updates the flag about which karts are inside
  *  \param old_pos  Position in previous frame.
  *  \param new_pos  Position in current frame.
- *  \param kart_id     Index of the kart, can be used to store kart specific
+ *  \param kart_id  Index of the kart, can be used to store kart specific
  *                  additional data.
  */
 bool CheckCylinder::isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
-                                unsigned int kart_id)
+                                int kart_id)
 {
     // TODO: this is the code for a sphere, rewrite for cylinder
     Vec3 old_pos_xz(old_pos.x(), 0.0f, old_pos.z());
diff --git a/src/tracks/check_cylinder.hpp b/src/tracks/check_cylinder.hpp
index 4af674561..6c6f9802a 100644
--- a/src/tracks/check_cylinder.hpp
+++ b/src/tracks/check_cylinder.hpp
@@ -52,7 +52,7 @@ public:
                      TriggerItemListener* listener);
     virtual     ~CheckCylinder() {};
     virtual bool isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
-                             unsigned int kart_id);
+                             int kart_id);
     // ------------------------------------------------------------------------
     /** Returns if kart indx is currently inside of the sphere. */
     bool isInside(int index) const            { return m_is_inside[index]; }
diff --git a/src/tracks/check_goal.cpp b/src/tracks/check_goal.cpp
index 496048f41..538f18916 100644
--- a/src/tracks/check_goal.cpp
+++ b/src/tracks/check_goal.cpp
@@ -55,7 +55,8 @@ void CheckGoal::update(float dt)
 
     if (world)
     {
-        if (isTriggered(m_previous_ball_position, world->getBallPosition(), -1))
+        if (isTriggered(m_previous_ball_position, world->getBallPosition(), 
+                        /*kart index - ignore*/-1)                         )
         {
             if (UserConfigParams::m_check_debug)
             {
@@ -86,7 +87,7 @@ void CheckGoal::trigger(unsigned int i)
 
 // ----------------------------------------------------------------------------
 bool CheckGoal::isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
-                            unsigned int kartIndex)
+                            int kart_index)
 {
     core::vector2df cross_point;
 
diff --git a/src/tracks/check_goal.hpp b/src/tracks/check_goal.hpp
index d1c36cb7c..a310ca60c 100644
--- a/src/tracks/check_goal.hpp
+++ b/src/tracks/check_goal.hpp
@@ -65,7 +65,7 @@ public:
     virtual void update(float dt) OVERRIDE;
     virtual void trigger(unsigned int kart_index) OVERRIDE;
     virtual bool isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
-                             unsigned int indx) OVERRIDE;
+                             int indx) OVERRIDE;
     virtual void reset(const Track &track) OVERRIDE;
 
     // ------------------------------------------------------------------------
diff --git a/src/tracks/check_lap.cpp b/src/tracks/check_lap.cpp
index ab2d4bb1c..ee0f8ce8a 100644
--- a/src/tracks/check_lap.cpp
+++ b/src/tracks/check_lap.cpp
@@ -53,13 +53,13 @@ void CheckLap::reset(const Track &track)
 // ----------------------------------------------------------------------------
 /** True if going from old_pos to new_pos crosses this checkline. This function
  *  is called from update (of the checkline structure).
- *  \param old_pos  Position in previous frame.
- *  \param new_pos  Position in current frame.
+ *  \param old_pos    Position in previous frame.
+ *  \param new_pos    Position in current frame.
  *  \param kart_index Index of the kart, can be used to store kart specific
- *                  additional data.
+ *                    additional data.
  */
 bool CheckLap::isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
-    unsigned int kart_index)
+                           int kart_index)
 {
     World* w = World::getWorld();
     LinearWorld* lin_world = dynamic_cast<LinearWorld*>(w);
diff --git a/src/tracks/check_lap.hpp b/src/tracks/check_lap.hpp
index b6d19a78a..d8b6f82f3 100644
--- a/src/tracks/check_lap.hpp
+++ b/src/tracks/check_lap.hpp
@@ -40,7 +40,7 @@ public:
                  CheckLap(const XMLNode &node, unsigned int index);
     virtual     ~CheckLap() {};
     virtual bool isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
-                             unsigned int indx);
+                             int indx);
     virtual void reset(const Track &track);
 };   // CheckLine
 
diff --git a/src/tracks/check_line.cpp b/src/tracks/check_line.cpp
index bc817dc53..197b586b0 100644
--- a/src/tracks/check_line.cpp
+++ b/src/tracks/check_line.cpp
@@ -40,6 +40,7 @@
 CheckLine::CheckLine(const XMLNode &node,  unsigned int index)
          : CheckStructure(node, index)
 {
+    m_ignore_height = false;
     // Note that when this is called the karts have not been allocated
     // in world, so we can't call world->getNumKarts()
     m_previous_sign.resize(race_manager->getNumberOfKarts());
@@ -169,13 +170,14 @@ void CheckLine::changeDebugColor(bool is_active)
 // ----------------------------------------------------------------------------
 /** True if going from old_pos to new_pos crosses this checkline. This function
  *  is called from update (of the checkline structure).
- *  \param old_pos  Position in previous frame.
- *  \param new_pos  Position in current frame.
- *  \param indx     Index of the kart, can be used to store kart specific
- *                  additional data.
+ *  \param old_pos   Position in previous frame.
+ *  \param new_pos   Position in current frame.
+ *  \param kart_indx Index of the kart, can be used to store kart specific
+ *                   additional data. If set to a negative number it will
+ *                   be ignored (used for e.g. soccer ball, and basket ball).
  */
 bool CheckLine::isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
-                            unsigned int kart_index)
+                            int kart_index)
 {
     World* w = World::getWorld();
     core::vector2df p=new_pos.toIrrVector2d();
@@ -184,7 +186,7 @@ bool CheckLine::isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
 
     bool previous_sign;
 
-    if (kart_index == UINT_MAX)
+    if (kart_index < 0)
     {
         core::vector2df p = old_pos.toIrrVector2d();
         previous_sign = (m_line.getPointOrientation(p) >= 0);
@@ -196,18 +198,20 @@ bool CheckLine::isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
 
     // If the sign has changed, i.e. the infinite line was crossed somewhere,
     // check if the finite line was actually crossed:
+    core::vector2df cross_point;
     if (sign != previous_sign &&
         m_line.intersectWith(core::line2df(old_pos.toIrrVector2d(),
                                            new_pos.toIrrVector2d()),
-                             m_cross_point) )
+                             cross_point) )
     {
         // Now check the minimum height: the kart position must be within a
         // reasonable distance in the Z axis - 'reasonable' for now to be
         // between -1 and 4 units (negative numbers are unlikely, but help
         // in case that the kart is 'somewhat' inside of the track, or the
         // checklines are a bit off in Z direction.
-        result = new_pos.getY()-m_min_height<m_over_min_height   &&
-                 new_pos.getY()-m_min_height>-m_under_min_height;
+        result = m_ignore_height || 
+                        (new_pos.getY()-m_min_height<m_over_min_height   &&
+                         new_pos.getY()-m_min_height>-m_under_min_height     );
         if(UserConfigParams::m_check_debug && !result)
         {
             if(World::getWorld()->getNumKarts()>0)
@@ -219,20 +223,20 @@ bool CheckLine::isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
                 Log::info("CheckLine", "Kart %d crosses line, but wrong height "
                           "(%f vs %f).",
                           kart_index, new_pos.getY(), m_min_height);
-
         }
     }
     else
         result = false;
 
-    if (kart_index != UINT_MAX)
-        m_previous_sign[kart_index] = sign;
-
-    if (result && kart_index != UINT_MAX)
+    if (kart_index >= 0)
     {
-        LinearWorld* lw = dynamic_cast<LinearWorld*>(w);
-        if (lw != NULL)
-            lw->setLastTriggeredCheckline(kart_index, m_index);
+        m_previous_sign[kart_index] = sign;
+        if (result)
+        {
+            LinearWorld* lw = dynamic_cast<LinearWorld*>(w);
+            if (lw != NULL)
+                lw->setLastTriggeredCheckline(kart_index, m_index);
+        }
     }
     return result;
 }   // isTriggered
diff --git a/src/tracks/check_line.hpp b/src/tracks/check_line.hpp
index 3b06e2ca8..8eee967af 100644
--- a/src/tracks/check_line.hpp
+++ b/src/tracks/check_line.hpp
@@ -46,7 +46,10 @@ private:
     /** The line that is tested for being crossed. */
     core::line2df   m_line;
 
-    core::vector2df m_cross_point;
+    /** True if this line should ignore the height test. This is required
+     *  e.g. for basketball cannons, since the ball can be too height to
+     *  otherwise trigger the cannon. */
+    bool            m_ignore_height;
 
     /** The minimum height of the checkline. */
     float           m_min_height;
@@ -79,17 +82,18 @@ public:
                  CheckLine(const XMLNode &node, unsigned int index);
     virtual     ~CheckLine();
     virtual bool isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
-                             unsigned int indx);
+                             int indx);
     virtual void reset(const Track &track);
     virtual void resetAfterKartMove(unsigned int kart_index);
     virtual void changeDebugColor(bool is_active);
+    // ------------------------------------------------------------------------
     /** Returns the actual line data for this checkpoint. */
     const core::line2df &getLine2D() const {return m_line;}
     // ------------------------------------------------------------------------
-    /** Returns the 2d point at which the line was crossed. Note that this
-     *  value is ONLY valid after isTriggered is called and inside of
-     *  trigger(). */
-    const core::vector2df &getCrossPoint() const { return m_cross_point; }
+    /** Sets if this check line should not do a height test for testing
+     *  if a line is crossed. Used for basket calls in cannon (the ball can
+     *  be too heigh to otherwise trigger he cannon). */
+    void setIgnoreHeight(bool b) { m_ignore_height = b;  }
 };   // CheckLine
 
 #endif
diff --git a/src/tracks/check_manager.cpp b/src/tracks/check_manager.cpp
index 502a84006..19c9a85c3 100644
--- a/src/tracks/check_manager.cpp
+++ b/src/tracks/check_manager.cpp
@@ -131,6 +131,37 @@ void CheckManager::resetAfterKartMove(AbstractKart *kart)
         (*i)->resetAfterKartMove(kart->getWorldKartId());
 }   // resetAfterKartMove
 
+// ----------------------------------------------------------------------------
+/** Adds a flyable object to be tested against cannons. This will allow
+ *  bowling- and rubber-balls to fly in a cannon.
+ *  \param flyable Pointer to the flyable to be added.
+ */
+void CheckManager::addFlyableToCannons(Flyable *flyable)
+{
+    for (unsigned int i = 0; i < m_all_checks.size(); i++)
+    {
+        CheckCannon *cc = dynamic_cast<CheckCannon*>(m_all_checks[i]);
+        if (cc)
+            cc->addFlyable(flyable);
+    }
+}   // addFlyable
+
+// ----------------------------------------------------------------------------
+/** Removes a flyable from all cannons. Used when this flyable is removed
+ *  (e.g. explodes).
+ *  \param flyable Pointer to the flyable to be removed.
+ */
+void CheckManager::removeFlyableFromCannons(Flyable *flyable)
+{
+    for (unsigned int i = 0; i < m_all_checks.size(); i++)
+    {
+        CheckCannon *cc = dynamic_cast<CheckCannon*>(m_all_checks[i]);
+        if (cc)
+            cc->removeFlyable(flyable);
+    }
+
+}   // addFlyable
+
 // ----------------------------------------------------------------------------
 /** Updates all animations. Called one per time step.
  *  \param dt Time since last call.
diff --git a/src/tracks/check_manager.hpp b/src/tracks/check_manager.hpp
index 93b97cdf8..88664c110 100644
--- a/src/tracks/check_manager.hpp
+++ b/src/tracks/check_manager.hpp
@@ -27,6 +27,7 @@
 
 class AbstractKart;
 class CheckStructure;
+class Flyable;
 class Track;
 class XMLNode;
 class Vec3;
@@ -46,6 +47,8 @@ private:
           ~CheckManager();
 public:
     void   add(CheckStructure* strct) { m_all_checks.push_back(strct); }
+    void   addFlyableToCannons(Flyable *flyable);
+    void   removeFlyableFromCannons(Flyable *flyable);
     void   load(const XMLNode &node);
     void   update(float dt);
     void   reset(const Track &track);
diff --git a/src/tracks/check_sphere.cpp b/src/tracks/check_sphere.cpp
index bd07fcf24..2ba2e32ad 100644
--- a/src/tracks/check_sphere.cpp
+++ b/src/tracks/check_sphere.cpp
@@ -53,11 +53,11 @@ CheckSphere::CheckSphere(const XMLNode &node, unsigned int index)
  *  updates the flag about which karts are inside
  *  \param old_pos  Position in previous frame.
  *  \param new_pos  Position in current frame.
- *  \param kart_id     Index of the kart, can be used to store kart specific
+ *  \param kart_id  Index of the kart, can be used to store kart specific
  *                  additional data.
  */
 bool CheckSphere::isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
-                              unsigned int kart_id)
+                              int kart_id)
 {
     float old_dist2   = (old_pos-m_center_point).length2();
     float new_dist2   = (new_pos-m_center_point).length2();
diff --git a/src/tracks/check_sphere.hpp b/src/tracks/check_sphere.hpp
index 4780ed681..b11e05fd9 100644
--- a/src/tracks/check_sphere.hpp
+++ b/src/tracks/check_sphere.hpp
@@ -48,7 +48,7 @@ public:
                  CheckSphere(const XMLNode &node, unsigned int index);
     virtual     ~CheckSphere() {};
     virtual bool isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
-                             unsigned int kart_id);
+                             int kart_id);
     // ------------------------------------------------------------------------
     /** Returns if kart indx is currently inside of the sphere. */
     bool isInside(int index) const            { return m_is_inside[index]; }
diff --git a/src/tracks/check_structure.hpp b/src/tracks/check_structure.hpp
index 921c7b3bc..bb7e29661 100644
--- a/src/tracks/check_structure.hpp
+++ b/src/tracks/check_structure.hpp
@@ -115,7 +115,7 @@ public:
      *                  additional data.
      */
     virtual bool isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
-                             unsigned int indx)=0;
+                             int indx)=0;
     virtual void trigger(unsigned int kart_index);
     virtual void reset(const Track &track);
 

From 490bef516eac6306d701d9cacca998795b9e0b94 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 12 May 2017 17:39:53 +1000
Subject: [PATCH 003/125] Fix crash: the ProjectileManager must be cleared
 before the CheckManager (since a rubber ball will emove itself from all
 cannon checklines, so a crash happens if the checklines are gone).

---
 src/modes/world.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index a88282077..19f36081b 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -436,6 +436,8 @@ World::~World()
 
     irr_driver->onUnloadWorld();
 
+    projectile_manager->cleanup();
+
     // In case that a race is aborted (e.g. track not found) track is 0.
     if(Track::getCurrentTrack())
         Track::getCurrentTrack()->cleanup();
@@ -486,8 +488,6 @@ World::~World()
 
     Camera::removeAllCameras();
 
-    projectile_manager->cleanup();
-
     // In case that the track is not found, Physics was not instantiated,
     // but kill handles this correctly.
     Physics::kill();

From bdbc7fd7281e983fbb061b2fb8d8adbdde65ca0d Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 12 May 2017 17:52:15 +1000
Subject: [PATCH 004/125] Reduce the height of a rubber ball in a cannon over
 time, so that it starts closer to the ground when released after the cannon.

---
 src/items/rubber_ball.cpp      | 3 +++
 src/karts/cannon_animation.cpp | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/items/rubber_ball.cpp b/src/items/rubber_ball.cpp
index 2b010ac4d..8dd90e353 100644
--- a/src/items/rubber_ball.cpp
+++ b/src/items/rubber_ball.cpp
@@ -151,7 +151,10 @@ void RubberBall::initializeControlPoints(const Vec3 &xyz)
 void RubberBall::setAnimation(AbstractKartAnimation *animation)
 {
     if (!animation)
+    {
         initializeControlPoints(getXYZ());
+        m_height_timer = 0;
+    }
     Flyable::setAnimation(animation);
 }   // setAnimation
 
diff --git a/src/karts/cannon_animation.cpp b/src/karts/cannon_animation.cpp
index 60ddbbb94..577d3bb9f 100644
--- a/src/karts/cannon_animation.cpp
+++ b/src/karts/cannon_animation.cpp
@@ -293,7 +293,15 @@ void CannonAnimation::update(float dt)
         btClamp(m_fraction_of_line, -1.0f, 1.0f);
     }   // if m_kart
     else
+    {
+        // If a rubber ball is in this cannon, reduce its height over
+        // time so that it starts closer to the ground when released
+        float height = m_delta.getY();
+        float radius = m_flyable->getExtend().getY();
+        height = (height - radius) * 0.95f + radius;
+        m_delta.setY(height);
         all_heading.setValue(0, 0, 0, 1);
+    }
 
     // Determine direction orthogonal to the curve for the sideway movement
     // of the kart.

From 91bad37939b906c8f08b2ee2f23558d89aff179e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 13 May 2017 21:38:59 +1000
Subject: [PATCH 005/125] Fixed incorrect position for a rubber ball in a
 cannon.

---
 src/karts/cannon_animation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/karts/cannon_animation.cpp b/src/karts/cannon_animation.cpp
index 577d3bb9f..68a31f073 100644
--- a/src/karts/cannon_animation.cpp
+++ b/src/karts/cannon_animation.cpp
@@ -258,7 +258,7 @@ void CannonAnimation::update(float dt)
     if (gravity.length2() > 0)
         gravity.normalize();
     else
-        gravity.setValue(0, -1, 0);
+        gravity.setValue(0, 1, 0);
     // Adjust only 5% towards the real up vector. This will smoothly
     // adjust the kart while the kart is in the air
     Vec3 target_up_vector = (gravity*0.05f + up*0.95f).normalize();

From 65c8cb7ae119363d592d2fa8f73604a592190e6d Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sun, 30 Jul 2017 23:03:40 +1000
Subject: [PATCH 006/125] Replaced arrays with std::vector (to get better error
 checking).

---
 src/input/gamepad_device.cpp | 23 ++++++++---------------
 src/input/gamepad_device.hpp |  9 +++++----
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/input/gamepad_device.cpp b/src/input/gamepad_device.cpp
index da1b546b7..090f005ee 100644
--- a/src/input/gamepad_device.cpp
+++ b/src/input/gamepad_device.cpp
@@ -33,7 +33,6 @@ GamePadDevice::GamePadDevice(const int irr_index, const std::string &name,
                              GamepadConfig *configuration)
 {
     m_type                  = DT_GAMEPAD;
-    m_prev_axis_directions  = NULL;
     m_configuration         = configuration;
     GamepadConfig *config = static_cast<GamepadConfig*>(m_configuration);
     if(m_configuration->getNumberOfButtons()<button_count)
@@ -44,9 +43,9 @@ GamePadDevice::GamePadDevice(const int irr_index, const std::string &name,
     {
         config->setNumberOfAxis(axis_count);
     }
-    m_prev_axis_directions  = new Input::AxisDirection[axis_count];
-    m_prev_axis_value       = new int[axis_count];
-    m_axis_ok               = new bool[axis_count];
+    m_prev_axis_directions.resize(axis_count);
+    m_prev_axis_value.resize(axis_count);
+    m_axis_ok.resize(axis_count);
     m_irr_index             = irr_index;
     m_name                  = name;
 
@@ -57,9 +56,9 @@ GamePadDevice::GamePadDevice(const int irr_index, const std::string &name,
         m_axis_ok[i] = false;
     }
 
-    m_buttonPressed = new bool[button_count];
+    m_button_pressed.resize(button_count);
     for(int n=0; n<button_count; n++)
-        m_buttonPressed[n] = false;
+        m_button_pressed[n] = false;
 }   // GamePadDevice
 
 // ----------------------------------------------------------------------------
@@ -67,12 +66,6 @@ GamePadDevice::GamePadDevice(const int irr_index, const std::string &name,
  */
 GamePadDevice::~GamePadDevice()
 {
-    delete[] m_buttonPressed;
-    delete[] m_prev_axis_directions;
-    delete[] m_prev_axis_value;
-    delete[] m_axis_ok;
-
-    // FIXME - any need to close devices?
 }   // ~GamePadDevice
 
 // ----------------------------------------------------------------------------
@@ -93,14 +86,14 @@ int GamePadDevice::getNumberOfButtons() const
 // ----------------------------------------------------------------------------
 bool GamePadDevice::isButtonPressed(const int i)
 {
-    return m_buttonPressed[i];
+    return m_button_pressed[i];
 }   // isButtonPressed
 
 // ----------------------------------------------------------------------------
 
 void GamePadDevice::setButtonPressed(const int i, bool isButtonPressed)
 {
-    m_buttonPressed[i] = isButtonPressed;
+    m_button_pressed[i] = isButtonPressed;
 }   // setButtonPressed
 
 // ----------------------------------------------------------------------------
@@ -182,7 +175,7 @@ bool GamePadDevice::processAndMapInput(Input::InputType type, const int id,
     }
 
     bool success = false;
-    if(m_prev_axis_directions == NULL) return false; // device not open
+    if(m_prev_axis_directions.size() == 0) return false; // device not open
 
     if (type == Input::IT_STICKMOTION)
     {
diff --git a/src/input/gamepad_device.hpp b/src/input/gamepad_device.hpp
index f39c09b59..7ceccbb70 100644
--- a/src/input/gamepad_device.hpp
+++ b/src/input/gamepad_device.hpp
@@ -22,6 +22,7 @@
 #include "input/input_device.hpp"
 #include "utils/cpp2011.hpp"
 
+#include <vector>
 class GamepadConfig;
 
 /**
@@ -31,9 +32,9 @@ class GamepadConfig;
 class GamePadDevice : public InputDevice
 {
     void resetAxisDirection(const int axis, Input::AxisDirection direction);
-    bool* m_buttonPressed;
+    std::vector<bool> m_button_pressed;
 
-    Input::AxisDirection *m_prev_axis_directions;
+    std::vector<Input::AxisDirection> m_prev_axis_directions;
 
     /** used to determine if an axis is valid; an axis is considered valid
       * when at least 2 different values are read from this axis (if an axis
@@ -43,10 +44,10 @@ class GamePadDevice : public InputDevice
       * on linux some hard disks may be reported as gamepads with
       * uninteresting axis values)
       */
-    int                  *m_prev_axis_value;
+    std::vector<int> m_prev_axis_value;
 
     /** \see m_prev_axis_value */
-    bool                 *m_axis_ok;
+    std::vector<bool> m_axis_ok;
 
     /** Irrlicht index of this gamepad. */
     int                   m_irr_index;

From e6a134c3479ccdbaf91bb36d46ffb64b6a3b52b9 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sun, 30 Jul 2017 23:05:27 +1000
Subject: [PATCH 007/125] Fix 2850 by increasing the number of axis for a
 gamepad to include D-pad.

---
 src/input/gamepad_device.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/input/gamepad_device.cpp b/src/input/gamepad_device.cpp
index 090f005ee..423c1894f 100644
--- a/src/input/gamepad_device.cpp
+++ b/src/input/gamepad_device.cpp
@@ -39,13 +39,21 @@ GamePadDevice::GamePadDevice(const int irr_index, const std::string &name,
     {
         config->setNumberOfButtons(button_count);
     }
-    if(m_configuration->getNumberOfAxes()<axis_count)
+
+    // HAT/POV buttons will be reported as additional axis with the values
+    // HAT_V_ID > HAT_H_ID. So increase the number of axis to be large
+    // enough to handle HAT_V/H_ID as axis number.
+    assert(Input::HAT_V_ID > Input::HAT_H_ID);
+    int adj_axis_count = axis_count > Input::HAT_V_ID ? axis_count 
+                                                      : Input::HAT_V_ID+1;
+
+    if(m_configuration->getNumberOfAxes()<adj_axis_count)
     {
-        config->setNumberOfAxis(axis_count);
+        config->setNumberOfAxis(adj_axis_count);
     }
-    m_prev_axis_directions.resize(axis_count);
-    m_prev_axis_value.resize(axis_count);
-    m_axis_ok.resize(axis_count);
+    m_prev_axis_directions.resize(adj_axis_count);
+    m_prev_axis_value.resize(adj_axis_count);
+    m_axis_ok.resize(adj_axis_count);
     m_irr_index             = irr_index;
     m_name                  = name;
 

From 85ee217d77ce6272aa44dbd7ac2fa27f7735d58a Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 1 Aug 2017 17:19:52 +1000
Subject: [PATCH 008/125] Converted tab to spaces.

---
 .../source/Irrlicht/CIrrDeviceWin32.cpp       | 3124 ++++++++---------
 1 file changed, 1562 insertions(+), 1562 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
index 9898aba8d..c17da02b2 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -39,327 +39,327 @@
 
 namespace irr
 {
-	namespace video
-	{
-		#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
-		IVideoDriver* createDirectX8Driver(const irr::SIrrlichtCreationParameters& params,
-			io::IFileSystem* io, HWND window);
-		#endif
+    namespace video
+    {
+        #ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
+        IVideoDriver* createDirectX8Driver(const irr::SIrrlichtCreationParameters& params,
+            io::IFileSystem* io, HWND window);
+        #endif
 
-		#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
-		IVideoDriver* createDirectX9Driver(const irr::SIrrlichtCreationParameters& params,
-			io::IFileSystem* io, HWND window);
-		#endif
+        #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
+        IVideoDriver* createDirectX9Driver(const irr::SIrrlichtCreationParameters& params,
+            io::IFileSystem* io, HWND window);
+        #endif
 
-		#ifdef _IRR_COMPILE_WITH_OPENGL_
-		IVideoDriver* createOpenGLDriver(const irr::SIrrlichtCreationParameters& params,
-			io::IFileSystem* io, CIrrDeviceWin32* device);
-		#endif
-	}
+        #ifdef _IRR_COMPILE_WITH_OPENGL_
+        IVideoDriver* createOpenGLDriver(const irr::SIrrlichtCreationParameters& params,
+            io::IFileSystem* io, CIrrDeviceWin32* device);
+        #endif
+    }
 } // end namespace irr
 
 namespace irr
 {
 struct SJoystickWin32Control
 {
-	CIrrDeviceWin32* Device;
+    CIrrDeviceWin32* Device;
 
 #if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_) && defined(_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_)
-	IDirectInput8* DirectInputDevice;
+    IDirectInput8* DirectInputDevice;
 #endif
 #if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
-	struct JoystickInfo
-	{
-		u32 Index;
+    struct JoystickInfo
+    {
+        u32 Index;
 #ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
-		core::stringc Name;
-		GUID guid;
-		LPDIRECTINPUTDEVICE8 lpdijoy;
-		DIDEVCAPS devcaps;
-		u8 axisValid[8];
+        core::stringc Name;
+        GUID guid;
+        LPDIRECTINPUTDEVICE8 lpdijoy;
+        DIDEVCAPS devcaps;
+        u8 axisValid[8];
 #else
-		JOYCAPS Caps;
+        JOYCAPS Caps;
 #endif
-	};
-	core::array<JoystickInfo> ActiveJoysticks;
+    };
+    core::array<JoystickInfo> ActiveJoysticks;
 #endif
 
-	SJoystickWin32Control(CIrrDeviceWin32* dev) : Device(dev)
-	{
+    SJoystickWin32Control(CIrrDeviceWin32* dev) : Device(dev)
+    {
 #if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_) && defined(_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_)
-		DirectInputDevice=0;
-		if (DI_OK != (DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION, IID_IDirectInput8, (void**)&DirectInputDevice, NULL)))
-		{
-			os::Printer::log("Could not create DirectInput8 Object", ELL_WARNING);
-			return;
-		}
+        DirectInputDevice=0;
+        if (DI_OK != (DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION, IID_IDirectInput8, (void**)&DirectInputDevice, NULL)))
+        {
+            os::Printer::log("Could not create DirectInput8 Object", ELL_WARNING);
+            return;
+        }
 #endif
-	}
-	~SJoystickWin32Control()
-	{
+    }
+    ~SJoystickWin32Control()
+    {
 #if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_) && defined(_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_)
-		for(u32 joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
-		{
-			LPDIRECTINPUTDEVICE8 dev = ActiveJoysticks[joystick].lpdijoy;
-			if (dev)
-			{
-				dev->Unacquire();
-			}
-			dev->Release();
-		}
+        for(u32 joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
+        {
+            LPDIRECTINPUTDEVICE8 dev = ActiveJoysticks[joystick].lpdijoy;
+            if (dev)
+            {
+                dev->Unacquire();
+            }
+            dev->Release();
+        }
 
-		if (DirectInputDevice)
-			DirectInputDevice->Release();
+        if (DirectInputDevice)
+            DirectInputDevice->Release();
 #endif
-	}
+    }
 
 #if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_) && defined(_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_)
-	static BOOL CALLBACK EnumJoysticks(LPCDIDEVICEINSTANCE lpddi, LPVOID cp)
-	{
-		SJoystickWin32Control* p=(SJoystickWin32Control*)cp;
-		p->directInputAddJoystick(lpddi);
-		return DIENUM_CONTINUE;
-	}
-	void directInputAddJoystick(LPCDIDEVICEINSTANCE lpddi)
-	{
-		//Get the GUID of the joystuck
-		const GUID guid = lpddi->guidInstance;
+    static BOOL CALLBACK EnumJoysticks(LPCDIDEVICEINSTANCE lpddi, LPVOID cp)
+    {
+        SJoystickWin32Control* p=(SJoystickWin32Control*)cp;
+        p->directInputAddJoystick(lpddi);
+        return DIENUM_CONTINUE;
+    }
+    void directInputAddJoystick(LPCDIDEVICEINSTANCE lpddi)
+    {
+        //Get the GUID of the joystuck
+        const GUID guid = lpddi->guidInstance;
 
-		JoystickInfo activeJoystick;
-		activeJoystick.Index=ActiveJoysticks.size();
-		activeJoystick.guid=guid;
-		activeJoystick.Name=lpddi->tszProductName;
-		if (FAILED(DirectInputDevice->CreateDevice(guid, &activeJoystick.lpdijoy, NULL)))
-		{
-			os::Printer::log("Could not create DirectInput device", ELL_WARNING);
-			return;
-		}
+        JoystickInfo activeJoystick;
+        activeJoystick.Index=ActiveJoysticks.size();
+        activeJoystick.guid=guid;
+        activeJoystick.Name=lpddi->tszProductName;
+        if (FAILED(DirectInputDevice->CreateDevice(guid, &activeJoystick.lpdijoy, NULL)))
+        {
+            os::Printer::log("Could not create DirectInput device", ELL_WARNING);
+            return;
+        }
 
-		activeJoystick.devcaps.dwSize=sizeof(activeJoystick.devcaps);
-		if (FAILED(activeJoystick.lpdijoy->GetCapabilities(&activeJoystick.devcaps)))
-		{
-			os::Printer::log("Could not create DirectInput device", ELL_WARNING);
-			return;
-		}
+        activeJoystick.devcaps.dwSize=sizeof(activeJoystick.devcaps);
+        if (FAILED(activeJoystick.lpdijoy->GetCapabilities(&activeJoystick.devcaps)))
+        {
+            os::Printer::log("Could not create DirectInput device", ELL_WARNING);
+            return;
+        }
 
-		if (FAILED(activeJoystick.lpdijoy->SetCooperativeLevel(Device->HWnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE)))
-		{
-			os::Printer::log("Could not set DirectInput device cooperative level", ELL_WARNING);
-			return;
-		}
+        if (FAILED(activeJoystick.lpdijoy->SetCooperativeLevel(Device->HWnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE)))
+        {
+            os::Printer::log("Could not set DirectInput device cooperative level", ELL_WARNING);
+            return;
+        }
 
-		if (FAILED(activeJoystick.lpdijoy->SetDataFormat(&c_dfDIJoystick2)))
-		{
-			os::Printer::log("Could not set DirectInput device data format", ELL_WARNING);
-			return;
-		}
+        if (FAILED(activeJoystick.lpdijoy->SetDataFormat(&c_dfDIJoystick2)))
+        {
+            os::Printer::log("Could not set DirectInput device data format", ELL_WARNING);
+            return;
+        }
 
-		if (FAILED(activeJoystick.lpdijoy->Acquire()))
-		{
-			os::Printer::log("Could not set DirectInput cooperative level", ELL_WARNING);
-			return;
-		}
+        if (FAILED(activeJoystick.lpdijoy->Acquire()))
+        {
+            os::Printer::log("Could not set DirectInput cooperative level", ELL_WARNING);
+            return;
+        }
 
-		DIJOYSTATE2 info;
-		if (FAILED(activeJoystick.lpdijoy->GetDeviceState(sizeof(info),&info)))
-		{
-			os::Printer::log("Could not read DirectInput device state", ELL_WARNING);
-			return;
-		}
+        DIJOYSTATE2 info;
+        if (FAILED(activeJoystick.lpdijoy->GetDeviceState(sizeof(info),&info)))
+        {
+            os::Printer::log("Could not read DirectInput device state", ELL_WARNING);
+            return;
+        }
 
-		ZeroMemory(activeJoystick.axisValid,sizeof(activeJoystick.axisValid));
-		activeJoystick.axisValid[0]= (info.lX!=0) ? 1 : 0;
-		activeJoystick.axisValid[1]= (info.lY!=0) ? 1 : 0;
-		activeJoystick.axisValid[2]= (info.lZ!=0) ? 1 : 0;
-		activeJoystick.axisValid[3]= (info.lRx!=0) ? 1 : 0;
-		activeJoystick.axisValid[4]= (info.lRy!=0) ? 1 : 0;
-		activeJoystick.axisValid[5]= (info.lRz!=0) ? 1 : 0;
+        ZeroMemory(activeJoystick.axisValid,sizeof(activeJoystick.axisValid));
+        activeJoystick.axisValid[0]= (info.lX!=0) ? 1 : 0;
+        activeJoystick.axisValid[1]= (info.lY!=0) ? 1 : 0;
+        activeJoystick.axisValid[2]= (info.lZ!=0) ? 1 : 0;
+        activeJoystick.axisValid[3]= (info.lRx!=0) ? 1 : 0;
+        activeJoystick.axisValid[4]= (info.lRy!=0) ? 1 : 0;
+        activeJoystick.axisValid[5]= (info.lRz!=0) ? 1 : 0;
 
-		int caxis=0;
-		for (u8 i=0; i<6; i++)
-		{
-			if (activeJoystick.axisValid[i])
-				caxis++;
-		}
+        int caxis=0;
+        for (u8 i=0; i<6; i++)
+        {
+            if (activeJoystick.axisValid[i])
+                caxis++;
+        }
 
-		for (u8 i=0; i<(activeJoystick.devcaps.dwAxes)-caxis; i++)
-		{
-			if (i+caxis < 8)
-				activeJoystick.axisValid[i+caxis]=1;
-		}
+        for (u8 i=0; i<(activeJoystick.devcaps.dwAxes)-caxis; i++)
+        {
+            if (i+caxis < 8)
+                activeJoystick.axisValid[i+caxis]=1;
+        }
 
-		ActiveJoysticks.push_back(activeJoystick);
-	}
+        ActiveJoysticks.push_back(activeJoystick);
+    }
 #endif
 
 void pollJoysticks()
 {
 #if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
 #ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
-	if(0 == ActiveJoysticks.size())
-		return;
+    if(0 == ActiveJoysticks.size())
+        return;
 
-	u32 joystick;
-	DIJOYSTATE2 info;
+    u32 joystick;
+    DIJOYSTATE2 info;
 
-	for(joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
-	{
-		// needs to be reset for each joystick
-		// request ALL values and POV as continuous if possible
+    for(joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
+    {
+        // needs to be reset for each joystick
+        // request ALL values and POV as continuous if possible
 
-		const DIDEVCAPS & caps = ActiveJoysticks[joystick].devcaps;
-		// if no POV is available don't ask for POV values
+        const DIDEVCAPS & caps = ActiveJoysticks[joystick].devcaps;
+        // if no POV is available don't ask for POV values
 
-		if (!FAILED(ActiveJoysticks[joystick].lpdijoy->GetDeviceState(sizeof(info),&info)))
-		{
-			SEvent event;
+        if (!FAILED(ActiveJoysticks[joystick].lpdijoy->GetDeviceState(sizeof(info),&info)))
+        {
+            SEvent event;
 
-			event.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
-			event.JoystickEvent.Joystick = (u8)joystick;
+            event.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
+            event.JoystickEvent.Joystick = (u8)joystick;
 
-			event.JoystickEvent.POV = (u16)info.rgdwPOV[0];
-			// set to undefined if no POV value was returned or the value
-			// is out of range
-			if ((caps.dwPOVs==0) || (event.JoystickEvent.POV > 35900))
-				event.JoystickEvent.POV = 65535;
+            event.JoystickEvent.POV = (u16)info.rgdwPOV[0];
+            // set to undefined if no POV value was returned or the value
+            // is out of range
+            if ((caps.dwPOVs==0) || (event.JoystickEvent.POV > 35900))
+                event.JoystickEvent.POV = 65535;
 
-			for(int axis = 0; axis < SEvent::SJoystickEvent::NUMBER_OF_AXES; ++axis)
-				event.JoystickEvent.Axis[axis] = 0;
+            for(int axis = 0; axis < SEvent::SJoystickEvent::NUMBER_OF_AXES; ++axis)
+                event.JoystickEvent.Axis[axis] = 0;
 
-			u16 dxAxis=0;
-			u16 irrAxis=0;
+            u16 dxAxis=0;
+            u16 irrAxis=0;
 
-			while (dxAxis < 6 && irrAxis <caps.dwAxes)
-			{
-				bool axisFound=0;
-				s32 axisValue=0;
+            while (dxAxis < 6 && irrAxis <caps.dwAxes)
+            {
+                bool axisFound=0;
+                s32 axisValue=0;
 
-				switch (dxAxis)
-				{
-				case 0:
-					axisValue=info.lX;
-					break;
-				case 1:
-					axisValue=info.lY;
-					break;
-				case 2:
-					axisValue=info.lZ;
-					break;
-				case 3:
-					axisValue=info.lRx;
-					break;
-				case 4:
-					axisValue=info.lRy;
-					break;
-				case 5:
-					axisValue=info.lRz;
-					break;
-				case 6:
-					axisValue=info.rglSlider[0];
-					break;
-				case 7:
-					axisValue=info.rglSlider[1];
-					break;
-				default:
-					break;
-				}
+                switch (dxAxis)
+                {
+                case 0:
+                    axisValue=info.lX;
+                    break;
+                case 1:
+                    axisValue=info.lY;
+                    break;
+                case 2:
+                    axisValue=info.lZ;
+                    break;
+                case 3:
+                    axisValue=info.lRx;
+                    break;
+                case 4:
+                    axisValue=info.lRy;
+                    break;
+                case 5:
+                    axisValue=info.lRz;
+                    break;
+                case 6:
+                    axisValue=info.rglSlider[0];
+                    break;
+                case 7:
+                    axisValue=info.rglSlider[1];
+                    break;
+                default:
+                    break;
+                }
 
-				if (ActiveJoysticks[joystick].axisValid[dxAxis]>0)
-					axisFound=1;
+                if (ActiveJoysticks[joystick].axisValid[dxAxis]>0)
+                    axisFound=1;
 
-				if (axisFound)
-				{
-					s32 val=axisValue - 32768;
+                if (axisFound)
+                {
+                    s32 val=axisValue - 32768;
 
-					if (val <-32767) val=-32767;
-					if (val > 32767) val=32767;
-					event.JoystickEvent.Axis[irrAxis]=(s16)(val);
-					irrAxis++;
-				}
+                    if (val <-32767) val=-32767;
+                    if (val > 32767) val=32767;
+                    event.JoystickEvent.Axis[irrAxis]=(s16)(val);
+                    irrAxis++;
+                }
 
-				dxAxis++;
-			}
+                dxAxis++;
+            }
 
-			u32 buttons=0;
-			BYTE* bytebuttons=info.rgbButtons;
-			for (u16 i=0; i<32; i++)
-			{
-				if (bytebuttons[i] >0)
-				{
-					buttons |= (1 << i);
-				}
-			}
-			event.JoystickEvent.ButtonStates = buttons;
+            u32 buttons=0;
+            BYTE* bytebuttons=info.rgbButtons;
+            for (u16 i=0; i<32; i++)
+            {
+                if (bytebuttons[i] >0)
+                {
+                    buttons |= (1 << i);
+                }
+            }
+            event.JoystickEvent.ButtonStates = buttons;
 
-			(void)Device->postEventFromUser(event);
-		}
-	}
+            (void)Device->postEventFromUser(event);
+        }
+    }
 #else
-	if (0 == ActiveJoysticks.size())
-		return;
+    if (0 == ActiveJoysticks.size())
+        return;
 
-	u32 joystick;
-	JOYINFOEX info;
+    u32 joystick;
+    JOYINFOEX info;
 
-	for(joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
-	{
-		// needs to be reset for each joystick
-		// request ALL values and POV as continuous if possible
-		info.dwSize = sizeof(info);
-		info.dwFlags = JOY_RETURNALL|JOY_RETURNPOVCTS;
-		const JOYCAPS & caps = ActiveJoysticks[joystick].Caps;
-		// if no POV is available don't ask for POV values
-		if (!(caps.wCaps & JOYCAPS_HASPOV))
-			info.dwFlags &= ~(JOY_RETURNPOV|JOY_RETURNPOVCTS);
-		if(JOYERR_NOERROR == joyGetPosEx(ActiveJoysticks[joystick].Index, &info))
-		{
-			SEvent event;
+    for(joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
+    {
+        // needs to be reset for each joystick
+        // request ALL values and POV as continuous if possible
+        info.dwSize = sizeof(info);
+        info.dwFlags = JOY_RETURNALL|JOY_RETURNPOVCTS;
+        const JOYCAPS & caps = ActiveJoysticks[joystick].Caps;
+        // if no POV is available don't ask for POV values
+        if (!(caps.wCaps & JOYCAPS_HASPOV))
+            info.dwFlags &= ~(JOY_RETURNPOV|JOY_RETURNPOVCTS);
+        if(JOYERR_NOERROR == joyGetPosEx(ActiveJoysticks[joystick].Index, &info))
+        {
+            SEvent event;
 
-			event.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
-			event.JoystickEvent.Joystick = (u8)joystick;
+            event.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
+            event.JoystickEvent.Joystick = (u8)joystick;
 
-			event.JoystickEvent.POV = (u16)info.dwPOV;
-			// set to undefined if no POV value was returned or the value
-			// is out of range
-			if (!(info.dwFlags & JOY_RETURNPOV) || (event.JoystickEvent.POV > 35900))
-				event.JoystickEvent.POV = 65535;
+            event.JoystickEvent.POV = (u16)info.dwPOV;
+            // set to undefined if no POV value was returned or the value
+            // is out of range
+            if (!(info.dwFlags & JOY_RETURNPOV) || (event.JoystickEvent.POV > 35900))
+                event.JoystickEvent.POV = 65535;
 
-			for(int axis = 0; axis < SEvent::SJoystickEvent::NUMBER_OF_AXES; ++axis)
-				event.JoystickEvent.Axis[axis] = 0;
+            for(int axis = 0; axis < SEvent::SJoystickEvent::NUMBER_OF_AXES; ++axis)
+                event.JoystickEvent.Axis[axis] = 0;
 
-			event.JoystickEvent.ButtonStates = info.dwButtons;
+            event.JoystickEvent.ButtonStates = info.dwButtons;
 
-			switch(caps.wNumAxes)
-			{
-			default:
-			case 6:
-				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_V] =
-					(s16)((65535 * (info.dwVpos - caps.wVmin)) / (caps.wVmax - caps.wVmin) - 32768);
+            switch(caps.wNumAxes)
+            {
+            default:
+            case 6:
+                event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_V] =
+                    (s16)((65535 * (info.dwVpos - caps.wVmin)) / (caps.wVmax - caps.wVmin) - 32768);
 
-			case 5:
-				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_U] =
-					(s16)((65535 * (info.dwUpos - caps.wUmin)) / (caps.wUmax - caps.wUmin) - 32768);
+            case 5:
+                event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_U] =
+                    (s16)((65535 * (info.dwUpos - caps.wUmin)) / (caps.wUmax - caps.wUmin) - 32768);
 
-			case 4:
-				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_R] =
-					(s16)((65535 * (info.dwRpos - caps.wRmin)) / (caps.wRmax - caps.wRmin) - 32768);
+            case 4:
+                event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_R] =
+                    (s16)((65535 * (info.dwRpos - caps.wRmin)) / (caps.wRmax - caps.wRmin) - 32768);
 
-			case 3:
-				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Z] =
-					(s16)((65535 * (info.dwZpos - caps.wZmin)) / (caps.wZmax - caps.wZmin) - 32768);
+            case 3:
+                event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Z] =
+                    (s16)((65535 * (info.dwZpos - caps.wZmin)) / (caps.wZmax - caps.wZmin) - 32768);
 
-			case 2:
-				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Y] =
-					(s16)((65535 * (info.dwYpos - caps.wYmin)) / (caps.wYmax - caps.wYmin) - 32768);
+            case 2:
+                event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Y] =
+                    (s16)((65535 * (info.dwYpos - caps.wYmin)) / (caps.wYmax - caps.wYmin) - 32768);
 
-			case 1:
-				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_X] =
-					(s16)((65535 * (info.dwXpos - caps.wXmin)) / (caps.wXmax - caps.wXmin) - 32768);
-			}
+            case 1:
+                event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_X] =
+                    (s16)((65535 * (info.dwXpos - caps.wXmin)) / (caps.wXmax - caps.wXmin) - 32768);
+            }
 
-			(void)Device->postEventFromUser(event);
-		}
-	}
+            (void)Device->postEventFromUser(event);
+        }
+    }
 #endif
 #endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
 }
@@ -427,74 +427,74 @@ bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo)
 {
 #if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
 #ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
-	if (!DirectInputDevice || (DirectInputDevice->EnumDevices(DI8DEVCLASS_GAMECTRL, SJoystickWin32Control::EnumJoysticks, this, DIEDFL_ATTACHEDONLY )))
-	{
-		os::Printer::log("Could not enum DirectInput8 controllers", ELL_WARNING);
-		return false;
-	}
+    if (!DirectInputDevice || (DirectInputDevice->EnumDevices(DI8DEVCLASS_GAMECTRL, SJoystickWin32Control::EnumJoysticks, this, DIEDFL_ATTACHEDONLY )))
+    {
+        os::Printer::log("Could not enum DirectInput8 controllers", ELL_WARNING);
+        return false;
+    }
 
-	for(u32 joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
-	{
-		JoystickInfo& activeJoystick = ActiveJoysticks[joystick];
-		SJoystickInfo info;
-		info.Axes=activeJoystick.devcaps.dwAxes;
-		info.Buttons=activeJoystick.devcaps.dwButtons;
-		info.Name=activeJoystick.Name;
-		info.PovHat = (activeJoystick.devcaps.dwPOVs  != 0)
-				? SJoystickInfo::POV_HAT_PRESENT : SJoystickInfo::POV_HAT_ABSENT;
-		joystickInfo.push_back(info);
-	}
-	return true;
+    for(u32 joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
+    {
+        JoystickInfo& activeJoystick = ActiveJoysticks[joystick];
+        SJoystickInfo info;
+        info.Axes=activeJoystick.devcaps.dwAxes;
+        info.Buttons=activeJoystick.devcaps.dwButtons;
+        info.Name=activeJoystick.Name;
+        info.PovHat = (activeJoystick.devcaps.dwPOVs  != 0)
+                ? SJoystickInfo::POV_HAT_PRESENT : SJoystickInfo::POV_HAT_ABSENT;
+        joystickInfo.push_back(info);
+    }
+    return true;
 #else
-	joystickInfo.clear();
-	ActiveJoysticks.clear();
+    joystickInfo.clear();
+    ActiveJoysticks.clear();
 
-	const u32 numberOfJoysticks = ::joyGetNumDevs();
-	JOYINFOEX info;
-	info.dwSize = sizeof(info);
-	info.dwFlags = JOY_RETURNALL;
+    const u32 numberOfJoysticks = ::joyGetNumDevs();
+    JOYINFOEX info;
+    info.dwSize = sizeof(info);
+    info.dwFlags = JOY_RETURNALL;
 
-	JoystickInfo activeJoystick;
-	SJoystickInfo returnInfo;
+    JoystickInfo activeJoystick;
+    SJoystickInfo returnInfo;
 
-	joystickInfo.reallocate(numberOfJoysticks);
-	ActiveJoysticks.reallocate(numberOfJoysticks);
+    joystickInfo.reallocate(numberOfJoysticks);
+    ActiveJoysticks.reallocate(numberOfJoysticks);
 
-	u32 joystick = 0;
-	for(; joystick < numberOfJoysticks; ++joystick)
-	{
-		if(JOYERR_NOERROR == joyGetPosEx(joystick, &info)
-			&&
-			JOYERR_NOERROR == joyGetDevCaps(joystick,
-											&activeJoystick.Caps,
-											sizeof(activeJoystick.Caps)))
-		{
-			activeJoystick.Index = joystick;
-			ActiveJoysticks.push_back(activeJoystick);
-			returnInfo.Joystick = (u8)joystick;
-			returnInfo.Axes = activeJoystick.Caps.wNumAxes;
-			returnInfo.Buttons = activeJoystick.Caps.wNumButtons;
-			setJoystickName(joystick, activeJoystick.Caps, &returnInfo);
-			returnInfo.PovHat = ((activeJoystick.Caps.wCaps & JOYCAPS_HASPOV) == JOYCAPS_HASPOV)
-								? SJoystickInfo::POV_HAT_PRESENT : SJoystickInfo::POV_HAT_ABSENT;
+    u32 joystick = 0;
+    for(; joystick < numberOfJoysticks; ++joystick)
+    {
+        if(JOYERR_NOERROR == joyGetPosEx(joystick, &info)
+            &&
+            JOYERR_NOERROR == joyGetDevCaps(joystick,
+                                            &activeJoystick.Caps,
+                                            sizeof(activeJoystick.Caps)))
+        {
+            activeJoystick.Index = joystick;
+            ActiveJoysticks.push_back(activeJoystick);
+            returnInfo.Joystick = (u8)joystick;
+            returnInfo.Axes = activeJoystick.Caps.wNumAxes;
+            returnInfo.Buttons = activeJoystick.Caps.wNumButtons;
+            setJoystickName(joystick, activeJoystick.Caps, &returnInfo);
+            returnInfo.PovHat = ((activeJoystick.Caps.wCaps & JOYCAPS_HASPOV) == JOYCAPS_HASPOV)
+                                ? SJoystickInfo::POV_HAT_PRESENT : SJoystickInfo::POV_HAT_ABSENT;
 
-			joystickInfo.push_back(returnInfo);
-		}
-	}
+            joystickInfo.push_back(returnInfo);
+        }
+    }
 
-	for(joystick = 0; joystick < joystickInfo.size(); ++joystick)
-	{
-		char logString[256];
-		(void)sprintf(logString, "Found joystick %d, %d axes, %d buttons '%s'",
-			joystick, joystickInfo[joystick].Axes,
-			joystickInfo[joystick].Buttons, joystickInfo[joystick].Name.c_str());
-		os::Printer::log(logString, ELL_INFORMATION);
-	}
+    for(joystick = 0; joystick < joystickInfo.size(); ++joystick)
+    {
+        char logString[256];
+        (void)sprintf(logString, "Found joystick %d, %d axes, %d buttons '%s'",
+            joystick, joystickInfo[joystick].Axes,
+            joystickInfo[joystick].Buttons, joystickInfo[joystick].Name.c_str());
+        os::Printer::log(logString, ELL_INFORMATION);
+    }
 
-	return true;
+    return true;
 #endif
 #else
-	return false;
+    return false;
 #endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
 }
 };
@@ -504,536 +504,536 @@ bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo)
 // Based on the table from http://www.science.co.il/Language/Locale-Codes.asp?s=decimal
 static unsigned int LocaleIdToCodepage(unsigned int lcid)
 {
-	switch ( lcid )
-	{
-		case 1098:  // Telugu
-		case 1095:  // Gujarati
-		case 1094:  // Punjabi
-		case 1103:  // Sanskrit
-		case 1111:  // Konkani
-		case 1114:  // Syriac
-		case 1099:  // Kannada
-		case 1102:  // Marathi
-		case 1125:  // Divehi
-		case 1067:  // Armenian
-		case 1081:  // Hindi
-		case 1079:  // Georgian
-		case 1097:  // Tamil
-			return 0;
-		case 1054:  // Thai
-			return 874;
-		case 1041:  // Japanese
-			return 932;
-		case 2052:  // Chinese (PRC)
-		case 4100:  // Chinese (Singapore)
-			return 936;
-		case 1042:  // Korean
-			return 949;
-		case 5124:  // Chinese (Macau S.A.R.)
-		case 3076:  // Chinese (Hong Kong S.A.R.)
-		case 1028:  // Chinese (Taiwan)
-			return 950;
-		case 1048:  // Romanian
-		case 1060:  // Slovenian
-		case 1038:  // Hungarian
-		case 1051:  // Slovak
-		case 1045:  // Polish
-		case 1052:  // Albanian
-		case 2074:  // Serbian (Latin)
-		case 1050:  // Croatian
-		case 1029:  // Czech
-			return 1250;
-		case 1104:  // Mongolian (Cyrillic)
-		case 1071:  // FYRO Macedonian
-		case 2115:  // Uzbek (Cyrillic)
-		case 1058:  // Ukrainian
-		case 2092:  // Azeri (Cyrillic)
-		case 1092:  // Tatar
-		case 1087:  // Kazakh
-		case 1059:  // Belarusian
-		case 1088:  // Kyrgyz (Cyrillic)
-		case 1026:  // Bulgarian
-		case 3098:  // Serbian (Cyrillic)
-		case 1049:  // Russian
-			return 1251;
-		case 8201:  // English (Jamaica)
-		case 3084:  // French (Canada)
-		case 1036:  // French (France)
-		case 5132:  // French (Luxembourg)
-		case 5129:  // English (New Zealand)
-		case 6153:  // English (Ireland)
-		case 1043:  // Dutch (Netherlands)
-		case 9225:  // English (Caribbean)
-		case 4108:  // French (Switzerland)
-		case 4105:  // English (Canada)
-		case 1110:  // Galician
-		case 10249:  // English (Belize)
-		case 3079:  // German (Austria)
-		case 6156:  // French (Monaco)
-		case 12297:  // English (Zimbabwe)
-		case 1069:  // Basque
-		case 2067:  // Dutch (Belgium)
-		case 2060:  // French (Belgium)
-		case 1035:  // Finnish
-		case 1080:  // Faroese
-		case 1031:  // German (Germany)
-		case 3081:  // English (Australia)
-		case 1033:  // English (United States)
-		case 2057:  // English (United Kingdom)
-		case 1027:  // Catalan
-		case 11273:  // English (Trinidad)
-		case 7177:  // English (South Africa)
-		case 1030:  // Danish
-		case 13321:  // English (Philippines)
-		case 15370:  // Spanish (Paraguay)
-		case 9226:  // Spanish (Colombia)
-		case 5130:  // Spanish (Costa Rica)
-		case 7178:  // Spanish (Dominican Republic)
-		case 12298:  // Spanish (Ecuador)
-		case 17418:  // Spanish (El Salvador)
-		case 4106:  // Spanish (Guatemala)
-		case 18442:  // Spanish (Honduras)
-		case 3082:  // Spanish (International Sort)
-		case 13322:  // Spanish (Chile)
-		case 19466:  // Spanish (Nicaragua)
-		case 2058:  // Spanish (Mexico)
-		case 10250:  // Spanish (Peru)
-		case 20490:  // Spanish (Puerto Rico)
-		case 1034:  // Spanish (Traditional Sort)
-		case 14346:  // Spanish (Uruguay)
-		case 8202:  // Spanish (Venezuela)
-		case 1089:  // Swahili
-		case 1053:  // Swedish
-		case 2077:  // Swedish (Finland)
-		case 5127:  // German (Liechtenstein)
-		case 1078:  // Afrikaans
-		case 6154:  // Spanish (Panama)
-		case 4103:  // German (Luxembourg)
-		case 16394:  // Spanish (Bolivia)
-		case 2055:  // German (Switzerland)
-		case 1039:  // Icelandic
-		case 1057:  // Indonesian
-		case 1040:  // Italian (Italy)
-		case 2064:  // Italian (Switzerland)
-		case 2068:  // Norwegian (Nynorsk)
-		case 11274:  // Spanish (Argentina)
-		case 1046:  // Portuguese (Brazil)
-		case 1044:  // Norwegian (Bokmal)
-		case 1086:  // Malay (Malaysia)
-		case 2110:  // Malay (Brunei Darussalam)
-		case 2070:  // Portuguese (Portugal)
-			return 1252;
-		case 1032:  // Greek
-			return 1253;
-		case 1091:  // Uzbek (Latin)
-		case 1068:  // Azeri (Latin)
-		case 1055:  // Turkish
-			return 1254;
-		case 1037:  // Hebrew
-			return 1255;
-		case 5121:  // Arabic (Algeria)
-		case 15361:  // Arabic (Bahrain)
-		case 9217:  // Arabic (Yemen)
-		case 3073:  // Arabic (Egypt)
-		case 2049:  // Arabic (Iraq)
-		case 11265:  // Arabic (Jordan)
-		case 13313:  // Arabic (Kuwait)
-		case 12289:  // Arabic (Lebanon)
-		case 4097:  // Arabic (Libya)
-		case 6145:  // Arabic (Morocco)
-		case 8193:  // Arabic (Oman)
-		case 16385:  // Arabic (Qatar)
-		case 1025:  // Arabic (Saudi Arabia)
-		case 10241:  // Arabic (Syria)
-		case 14337:  // Arabic (U.A.E.)
-		case 1065:  // Farsi
-		case 1056:  // Urdu
-		case 7169:  // Arabic (Tunisia)
-			return 1256;
-		case 1061:  // Estonian
-		case 1062:  // Latvian
-		case 1063:  // Lithuanian
-			return 1257;
-		case 1066:  // Vietnamese
-			return 1258;
-	}
-	return 65001;   // utf-8
+    switch ( lcid )
+    {
+        case 1098:  // Telugu
+        case 1095:  // Gujarati
+        case 1094:  // Punjabi
+        case 1103:  // Sanskrit
+        case 1111:  // Konkani
+        case 1114:  // Syriac
+        case 1099:  // Kannada
+        case 1102:  // Marathi
+        case 1125:  // Divehi
+        case 1067:  // Armenian
+        case 1081:  // Hindi
+        case 1079:  // Georgian
+        case 1097:  // Tamil
+            return 0;
+        case 1054:  // Thai
+            return 874;
+        case 1041:  // Japanese
+            return 932;
+        case 2052:  // Chinese (PRC)
+        case 4100:  // Chinese (Singapore)
+            return 936;
+        case 1042:  // Korean
+            return 949;
+        case 5124:  // Chinese (Macau S.A.R.)
+        case 3076:  // Chinese (Hong Kong S.A.R.)
+        case 1028:  // Chinese (Taiwan)
+            return 950;
+        case 1048:  // Romanian
+        case 1060:  // Slovenian
+        case 1038:  // Hungarian
+        case 1051:  // Slovak
+        case 1045:  // Polish
+        case 1052:  // Albanian
+        case 2074:  // Serbian (Latin)
+        case 1050:  // Croatian
+        case 1029:  // Czech
+            return 1250;
+        case 1104:  // Mongolian (Cyrillic)
+        case 1071:  // FYRO Macedonian
+        case 2115:  // Uzbek (Cyrillic)
+        case 1058:  // Ukrainian
+        case 2092:  // Azeri (Cyrillic)
+        case 1092:  // Tatar
+        case 1087:  // Kazakh
+        case 1059:  // Belarusian
+        case 1088:  // Kyrgyz (Cyrillic)
+        case 1026:  // Bulgarian
+        case 3098:  // Serbian (Cyrillic)
+        case 1049:  // Russian
+            return 1251;
+        case 8201:  // English (Jamaica)
+        case 3084:  // French (Canada)
+        case 1036:  // French (France)
+        case 5132:  // French (Luxembourg)
+        case 5129:  // English (New Zealand)
+        case 6153:  // English (Ireland)
+        case 1043:  // Dutch (Netherlands)
+        case 9225:  // English (Caribbean)
+        case 4108:  // French (Switzerland)
+        case 4105:  // English (Canada)
+        case 1110:  // Galician
+        case 10249:  // English (Belize)
+        case 3079:  // German (Austria)
+        case 6156:  // French (Monaco)
+        case 12297:  // English (Zimbabwe)
+        case 1069:  // Basque
+        case 2067:  // Dutch (Belgium)
+        case 2060:  // French (Belgium)
+        case 1035:  // Finnish
+        case 1080:  // Faroese
+        case 1031:  // German (Germany)
+        case 3081:  // English (Australia)
+        case 1033:  // English (United States)
+        case 2057:  // English (United Kingdom)
+        case 1027:  // Catalan
+        case 11273:  // English (Trinidad)
+        case 7177:  // English (South Africa)
+        case 1030:  // Danish
+        case 13321:  // English (Philippines)
+        case 15370:  // Spanish (Paraguay)
+        case 9226:  // Spanish (Colombia)
+        case 5130:  // Spanish (Costa Rica)
+        case 7178:  // Spanish (Dominican Republic)
+        case 12298:  // Spanish (Ecuador)
+        case 17418:  // Spanish (El Salvador)
+        case 4106:  // Spanish (Guatemala)
+        case 18442:  // Spanish (Honduras)
+        case 3082:  // Spanish (International Sort)
+        case 13322:  // Spanish (Chile)
+        case 19466:  // Spanish (Nicaragua)
+        case 2058:  // Spanish (Mexico)
+        case 10250:  // Spanish (Peru)
+        case 20490:  // Spanish (Puerto Rico)
+        case 1034:  // Spanish (Traditional Sort)
+        case 14346:  // Spanish (Uruguay)
+        case 8202:  // Spanish (Venezuela)
+        case 1089:  // Swahili
+        case 1053:  // Swedish
+        case 2077:  // Swedish (Finland)
+        case 5127:  // German (Liechtenstein)
+        case 1078:  // Afrikaans
+        case 6154:  // Spanish (Panama)
+        case 4103:  // German (Luxembourg)
+        case 16394:  // Spanish (Bolivia)
+        case 2055:  // German (Switzerland)
+        case 1039:  // Icelandic
+        case 1057:  // Indonesian
+        case 1040:  // Italian (Italy)
+        case 2064:  // Italian (Switzerland)
+        case 2068:  // Norwegian (Nynorsk)
+        case 11274:  // Spanish (Argentina)
+        case 1046:  // Portuguese (Brazil)
+        case 1044:  // Norwegian (Bokmal)
+        case 1086:  // Malay (Malaysia)
+        case 2110:  // Malay (Brunei Darussalam)
+        case 2070:  // Portuguese (Portugal)
+            return 1252;
+        case 1032:  // Greek
+            return 1253;
+        case 1091:  // Uzbek (Latin)
+        case 1068:  // Azeri (Latin)
+        case 1055:  // Turkish
+            return 1254;
+        case 1037:  // Hebrew
+            return 1255;
+        case 5121:  // Arabic (Algeria)
+        case 15361:  // Arabic (Bahrain)
+        case 9217:  // Arabic (Yemen)
+        case 3073:  // Arabic (Egypt)
+        case 2049:  // Arabic (Iraq)
+        case 11265:  // Arabic (Jordan)
+        case 13313:  // Arabic (Kuwait)
+        case 12289:  // Arabic (Lebanon)
+        case 4097:  // Arabic (Libya)
+        case 6145:  // Arabic (Morocco)
+        case 8193:  // Arabic (Oman)
+        case 16385:  // Arabic (Qatar)
+        case 1025:  // Arabic (Saudi Arabia)
+        case 10241:  // Arabic (Syria)
+        case 14337:  // Arabic (U.A.E.)
+        case 1065:  // Farsi
+        case 1056:  // Urdu
+        case 7169:  // Arabic (Tunisia)
+            return 1256;
+        case 1061:  // Estonian
+        case 1062:  // Latvian
+        case 1063:  // Lithuanian
+            return 1257;
+        case 1066:  // Vietnamese
+            return 1258;
+    }
+    return 65001;   // utf-8
 }
 
 namespace
 {
-	struct SEnvMapper
-	{
-		HWND hWnd;
-		irr::CIrrDeviceWin32* irrDev;
-	};
-	irr::core::list<SEnvMapper> EnvMap;
+    struct SEnvMapper
+    {
+        HWND hWnd;
+        irr::CIrrDeviceWin32* irrDev;
+    };
+    irr::core::list<SEnvMapper> EnvMap;
 
-	HKL KEYBOARD_INPUT_HKL=0;
-	unsigned int KEYBOARD_INPUT_CODEPAGE = 1252;
+    HKL KEYBOARD_INPUT_HKL=0;
+    unsigned int KEYBOARD_INPUT_CODEPAGE = 1252;
 }
 
 SEnvMapper* getEnvMapperFromHWnd(HWND hWnd)
 {
-	irr::core::list<SEnvMapper>::Iterator it = EnvMap.begin();
-	for (; it!= EnvMap.end(); ++it)
-		if ((*it).hWnd == hWnd)
-			return &(*it);
+    irr::core::list<SEnvMapper>::Iterator it = EnvMap.begin();
+    for (; it!= EnvMap.end(); ++it)
+        if ((*it).hWnd == hWnd)
+            return &(*it);
 
-	return 0;
+    return 0;
 }
 
 
 irr::CIrrDeviceWin32* getDeviceFromHWnd(HWND hWnd)
 {
-	irr::core::list<SEnvMapper>::Iterator it = EnvMap.begin();
-	for (; it!= EnvMap.end(); ++it)
-		if ((*it).hWnd == hWnd)
-			return (*it).irrDev;
+    irr::core::list<SEnvMapper>::Iterator it = EnvMap.begin();
+    for (; it!= EnvMap.end(); ++it)
+        if ((*it).hWnd == hWnd)
+            return (*it).irrDev;
 
-	return 0;
+    return 0;
 }
 
 
 namespace irr
 {
-	void updateICPos(void* hWnd, s32 x, s32 y, s32 height)
-	{
-		COMPOSITIONFORM cf;
-		HWND hwnd = (HWND)hWnd;
-		HIMC hIMC = ImmGetContext(hwnd);
+    void updateICPos(void* hWnd, s32 x, s32 y, s32 height)
+    {
+        COMPOSITIONFORM cf;
+        HWND hwnd = (HWND)hWnd;
+        HIMC hIMC = ImmGetContext(hwnd);
 
-		if(hIMC)
-		{
-			cf.dwStyle = CFS_POINT;
-			cf.ptCurrentPos.x = x;
-			cf.ptCurrentPos.y = y - height;
+        if(hIMC)
+        {
+            cf.dwStyle = CFS_POINT;
+            cf.ptCurrentPos.x = x;
+            cf.ptCurrentPos.y = y - height;
 
-			ImmSetCompositionWindow(hIMC, &cf);
+            ImmSetCompositionWindow(hIMC, &cf);
 
-			ImmReleaseContext(hwnd, hIMC);
-		}
-	}
+            ImmReleaseContext(hwnd, hIMC);
+        }
+    }
 } // end of namespace irr
 
 
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-	#ifndef WM_MOUSEWHEEL
-	#define WM_MOUSEWHEEL 0x020A
-	#endif
-	#ifndef WHEEL_DELTA
-	#define WHEEL_DELTA 120
-	#endif
+    #ifndef WM_MOUSEWHEEL
+    #define WM_MOUSEWHEEL 0x020A
+    #endif
+    #ifndef WHEEL_DELTA
+    #define WHEEL_DELTA 120
+    #endif
 
-	irr::CIrrDeviceWin32* dev = 0;
-	irr::SEvent event;
+    irr::CIrrDeviceWin32* dev = 0;
+    irr::SEvent event;
 
-	static irr::s32 ClickCount=0;
-	if (GetCapture() != hWnd && ClickCount > 0)
-		ClickCount = 0;
+    static irr::s32 ClickCount=0;
+    if (GetCapture() != hWnd && ClickCount > 0)
+        ClickCount = 0;
 
 
-	struct messageMap
-	{
-		irr::s32 group;
-		UINT winMessage;
-		irr::s32 irrMessage;
-	};
+    struct messageMap
+    {
+        irr::s32 group;
+        UINT winMessage;
+        irr::s32 irrMessage;
+    };
 
-	static messageMap mouseMap[] =
-	{
-		{0, WM_LBUTTONDOWN, irr::EMIE_LMOUSE_PRESSED_DOWN},
-		{1, WM_LBUTTONUP,   irr::EMIE_LMOUSE_LEFT_UP},
-		{0, WM_RBUTTONDOWN, irr::EMIE_RMOUSE_PRESSED_DOWN},
-		{1, WM_RBUTTONUP,   irr::EMIE_RMOUSE_LEFT_UP},
-		{0, WM_MBUTTONDOWN, irr::EMIE_MMOUSE_PRESSED_DOWN},
-		{1, WM_MBUTTONUP,   irr::EMIE_MMOUSE_LEFT_UP},
-		{2, WM_MOUSEMOVE,   irr::EMIE_MOUSE_MOVED},
-		{3, WM_MOUSEWHEEL,  irr::EMIE_MOUSE_WHEEL},
-		{-1, 0, 0}
-	};
+    static messageMap mouseMap[] =
+    {
+        {0, WM_LBUTTONDOWN, irr::EMIE_LMOUSE_PRESSED_DOWN},
+        {1, WM_LBUTTONUP,   irr::EMIE_LMOUSE_LEFT_UP},
+        {0, WM_RBUTTONDOWN, irr::EMIE_RMOUSE_PRESSED_DOWN},
+        {1, WM_RBUTTONUP,   irr::EMIE_RMOUSE_LEFT_UP},
+        {0, WM_MBUTTONDOWN, irr::EMIE_MMOUSE_PRESSED_DOWN},
+        {1, WM_MBUTTONUP,   irr::EMIE_MMOUSE_LEFT_UP},
+        {2, WM_MOUSEMOVE,   irr::EMIE_MOUSE_MOVED},
+        {3, WM_MOUSEWHEEL,  irr::EMIE_MOUSE_WHEEL},
+        {-1, 0, 0}
+    };
 
-	// handle grouped events
-	messageMap * m = mouseMap;
-	while ( m->group >=0 && m->winMessage != message )
-		m += 1;
+    // handle grouped events
+    messageMap * m = mouseMap;
+    while ( m->group >=0 && m->winMessage != message )
+        m += 1;
 
-	if ( m->group >= 0 )
-	{
-		if ( m->group == 0 )	// down
-		{
-			ClickCount++;
-			SetCapture(hWnd);
-		}
-		else
-		if ( m->group == 1 )	// up
-		{
-			ClickCount--;
-			if (ClickCount<1)
-			{
-				ClickCount=0;
-				ReleaseCapture();
-			}
-		}
+    if ( m->group >= 0 )
+    {
+        if ( m->group == 0 )   // down
+        {
+            ClickCount++;
+            SetCapture(hWnd);
+        }
+        else
+        if ( m->group == 1 )   // up
+        {
+            ClickCount--;
+            if (ClickCount<1)
+            {
+                ClickCount=0;
+                ReleaseCapture();
+            }
+        }
 
-		event.EventType = irr::EET_MOUSE_INPUT_EVENT;
-		event.MouseInput.Event = (irr::EMOUSE_INPUT_EVENT) m->irrMessage;
-		event.MouseInput.X = (short)LOWORD(lParam);
-		event.MouseInput.Y = (short)HIWORD(lParam);
-		event.MouseInput.Shift = ((LOWORD(wParam) & MK_SHIFT) != 0);
-		event.MouseInput.Control = ((LOWORD(wParam) & MK_CONTROL) != 0);
-		// left and right mouse buttons
-		event.MouseInput.ButtonStates = wParam & ( MK_LBUTTON | MK_RBUTTON);
-		// middle and extra buttons
-		if (wParam & MK_MBUTTON)
-			event.MouseInput.ButtonStates |= irr::EMBSM_MIDDLE;
+        event.EventType = irr::EET_MOUSE_INPUT_EVENT;
+        event.MouseInput.Event = (irr::EMOUSE_INPUT_EVENT) m->irrMessage;
+        event.MouseInput.X = (short)LOWORD(lParam);
+        event.MouseInput.Y = (short)HIWORD(lParam);
+        event.MouseInput.Shift = ((LOWORD(wParam) & MK_SHIFT) != 0);
+        event.MouseInput.Control = ((LOWORD(wParam) & MK_CONTROL) != 0);
+        // left and right mouse buttons
+        event.MouseInput.ButtonStates = wParam & ( MK_LBUTTON | MK_RBUTTON);
+        // middle and extra buttons
+        if (wParam & MK_MBUTTON)
+            event.MouseInput.ButtonStates |= irr::EMBSM_MIDDLE;
 #if(_WIN32_WINNT >= 0x0500)
-		if (wParam & MK_XBUTTON1)
-			event.MouseInput.ButtonStates |= irr::EMBSM_EXTRA1;
-		if (wParam & MK_XBUTTON2)
-			event.MouseInput.ButtonStates |= irr::EMBSM_EXTRA2;
+        if (wParam & MK_XBUTTON1)
+            event.MouseInput.ButtonStates |= irr::EMBSM_EXTRA1;
+        if (wParam & MK_XBUTTON2)
+            event.MouseInput.ButtonStates |= irr::EMBSM_EXTRA2;
 #endif
-		event.MouseInput.Wheel = 0.f;
+        event.MouseInput.Wheel = 0.f;
 
-		// wheel
-		if ( m->group == 3 )
-		{
-			POINT p; // fixed by jox
-			p.x = 0; p.y = 0;
-			ClientToScreen(hWnd, &p);
-			event.MouseInput.X -= p.x;
-			event.MouseInput.Y -= p.y;
-			event.MouseInput.Wheel = ((irr::f32)((short)HIWORD(wParam))) / (irr::f32)WHEEL_DELTA;
-		}
+        // wheel
+        if ( m->group == 3 )
+        {
+            POINT p; // fixed by jox
+            p.x = 0; p.y = 0;
+            ClientToScreen(hWnd, &p);
+            event.MouseInput.X -= p.x;
+            event.MouseInput.Y -= p.y;
+            event.MouseInput.Wheel = ((irr::f32)((short)HIWORD(wParam))) / (irr::f32)WHEEL_DELTA;
+        }
 
-		dev = getDeviceFromHWnd(hWnd);
-		if (dev)
-		{
-			dev->postEventFromUser(event);
+        dev = getDeviceFromHWnd(hWnd);
+        if (dev)
+        {
+            dev->postEventFromUser(event);
 
-			if ( event.MouseInput.Event >= irr::EMIE_LMOUSE_PRESSED_DOWN && event.MouseInput.Event <= irr::EMIE_MMOUSE_PRESSED_DOWN )
-			{
-				irr::u32 clicks = dev->checkSuccessiveClicks(event.MouseInput.X, event.MouseInput.Y, event.MouseInput.Event);
-				if ( clicks == 2 )
-				{
-					event.MouseInput.Event = (irr::EMOUSE_INPUT_EVENT)(irr::EMIE_LMOUSE_DOUBLE_CLICK + event.MouseInput.Event-irr::EMIE_LMOUSE_PRESSED_DOWN);
-					dev->postEventFromUser(event);
-				}
-				else if ( clicks == 3 )
-				{
-					event.MouseInput.Event = (irr::EMOUSE_INPUT_EVENT)(irr::EMIE_LMOUSE_TRIPLE_CLICK + event.MouseInput.Event-irr::EMIE_LMOUSE_PRESSED_DOWN);
-					dev->postEventFromUser(event);
-				}
-			}
-		}
+            if ( event.MouseInput.Event >= irr::EMIE_LMOUSE_PRESSED_DOWN && event.MouseInput.Event <= irr::EMIE_MMOUSE_PRESSED_DOWN )
+            {
+                irr::u32 clicks = dev->checkSuccessiveClicks(event.MouseInput.X, event.MouseInput.Y, event.MouseInput.Event);
+                if ( clicks == 2 )
+                {
+                    event.MouseInput.Event = (irr::EMOUSE_INPUT_EVENT)(irr::EMIE_LMOUSE_DOUBLE_CLICK + event.MouseInput.Event-irr::EMIE_LMOUSE_PRESSED_DOWN);
+                    dev->postEventFromUser(event);
+                }
+                else if ( clicks == 3 )
+                {
+                    event.MouseInput.Event = (irr::EMOUSE_INPUT_EVENT)(irr::EMIE_LMOUSE_TRIPLE_CLICK + event.MouseInput.Event-irr::EMIE_LMOUSE_PRESSED_DOWN);
+                    dev->postEventFromUser(event);
+                }
+            }
+        }
 
-		if (m->irrMessage == irr::EMIE_LMOUSE_PRESSED_DOWN || m->irrMessage == irr::EMIE_LMOUSE_LEFT_UP)
-		{
-			event.EventType = irr::EET_IMPUT_METHOD_EVENT;
-			event.InputMethodEvent.Event = irr::EIME_CHANGE_POS;
-			event.InputMethodEvent.Handle = hWnd;
+        if (m->irrMessage == irr::EMIE_LMOUSE_PRESSED_DOWN || m->irrMessage == irr::EMIE_LMOUSE_LEFT_UP)
+        {
+            event.EventType = irr::EET_IMPUT_METHOD_EVENT;
+            event.InputMethodEvent.Event = irr::EIME_CHANGE_POS;
+            event.InputMethodEvent.Handle = hWnd;
 
-			if (dev)
-				dev->postEventFromUser(event);
-		}
-		return 0;
-	}
+            if (dev)
+                dev->postEventFromUser(event);
+        }
+        return 0;
+    }
 
-	switch (message)
-	{
-	case WM_PAINT:
-		{
-			PAINTSTRUCT ps;
-			BeginPaint(hWnd, &ps);
-			EndPaint(hWnd, &ps);
-		}
-		return 0;
+    switch (message)
+    {
+    case WM_PAINT:
+        {
+            PAINTSTRUCT ps;
+            BeginPaint(hWnd, &ps);
+            EndPaint(hWnd, &ps);
+        }
+        return 0;
 
-	case WM_ERASEBKGND:
-		return 0;
+    case WM_ERASEBKGND:
+        return 0;
 
-	case WM_IME_CHAR:
-		{
-			event.EventType = irr::EET_IMPUT_METHOD_EVENT;
-			event.InputMethodEvent.Event = irr::EIME_CHAR_INPUT;
-			event.InputMethodEvent.Handle = hWnd;
+    case WM_IME_CHAR:
+        {
+            event.EventType = irr::EET_IMPUT_METHOD_EVENT;
+            event.InputMethodEvent.Event = irr::EIME_CHAR_INPUT;
+            event.InputMethodEvent.Handle = hWnd;
 
-			event.KeyInput.Char = 0;
-			event.KeyInput.Key = irr::IRR_KEY_OEM_CLEAR;
-			event.KeyInput.Shift = 0;
-			event.KeyInput.Control = 0;
+            event.KeyInput.Char = 0;
+            event.KeyInput.Key = irr::IRR_KEY_OEM_CLEAR;
+            event.KeyInput.Shift = 0;
+            event.KeyInput.Control = 0;
 
-			char bits[2] = { (char)((wParam & 0xff00) >> 8), (char)(wParam & 0xff) };
-			if (bits[0] == 0)
-				event.InputMethodEvent.Char = (wchar_t)wParam;
-			else
-				MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, bits, 2, &event.InputMethodEvent.Char, 1);
+            char bits[2] = { (char)((wParam & 0xff00) >> 8), (char)(wParam & 0xff) };
+            if (bits[0] == 0)
+                event.InputMethodEvent.Char = (wchar_t)wParam;
+            else
+                MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, bits, 2, &event.InputMethodEvent.Char, 1);
 
-			dev = getDeviceFromHWnd(hWnd);
-			if (dev)
-				dev->postEventFromUser(event);
+            dev = getDeviceFromHWnd(hWnd);
+            if (dev)
+                dev->postEventFromUser(event);
 
-			return	0;
-		}
+            return 0;
+        }
 
-	case WM_SYSKEYDOWN:
-	case WM_SYSKEYUP:
-	case WM_KEYDOWN:
-	case WM_KEYUP:
-		{
-			BYTE allKeys[256];
+    case WM_SYSKEYDOWN:
+    case WM_SYSKEYUP:
+    case WM_KEYDOWN:
+    case WM_KEYUP:
+        {
+            BYTE allKeys[256];
 
-			event.EventType = irr::EET_KEY_INPUT_EVENT;
-			event.KeyInput.Key = (irr::EKEY_CODE)wParam;
-			event.KeyInput.PressedDown = (message==WM_KEYDOWN || message == WM_SYSKEYDOWN);
+            event.EventType = irr::EET_KEY_INPUT_EVENT;
+            event.KeyInput.Key = (irr::EKEY_CODE)wParam;
+            event.KeyInput.PressedDown = (message==WM_KEYDOWN || message == WM_SYSKEYDOWN);
 
-			const UINT MY_MAPVK_VSC_TO_VK_EX = 3; // MAPVK_VSC_TO_VK_EX should be in SDK according to MSDN, but isn't in mine.
-			if ( event.KeyInput.Key == irr::IRR_KEY_SHIFT )
-			{
-				// this will fail on systems before windows NT/2000/XP, not sure _what_ will return there instead.
-				event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey( ((lParam>>16) & 255), MY_MAPVK_VSC_TO_VK_EX );
-			}
-			if ( event.KeyInput.Key == irr::IRR_KEY_CONTROL )
-			{
-				event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey( ((lParam>>16) & 255), MY_MAPVK_VSC_TO_VK_EX );
-				// some keyboards will just return LEFT for both - left and right keys. So also check extend bit.
-				if (lParam & 0x1000000)
-					event.KeyInput.Key = irr::IRR_KEY_RCONTROL;
-			}
-			if ( event.KeyInput.Key == irr::IRR_KEY_MENU )
-			{
-				event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey( ((lParam>>16) & 255), MY_MAPVK_VSC_TO_VK_EX );
-				if (lParam & 0x1000000)
-					event.KeyInput.Key = irr::IRR_KEY_RMENU;
-			}
+            const UINT MY_MAPVK_VSC_TO_VK_EX = 3; // MAPVK_VSC_TO_VK_EX should be in SDK according to MSDN, but isn't in mine.
+            if ( event.KeyInput.Key == irr::IRR_KEY_SHIFT )
+            {
+                // this will fail on systems before windows NT/2000/XP, not sure _what_ will return there instead.
+                event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey( ((lParam>>16) & 255), MY_MAPVK_VSC_TO_VK_EX );
+            }
+            if ( event.KeyInput.Key == irr::IRR_KEY_CONTROL )
+            {
+                event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey( ((lParam>>16) & 255), MY_MAPVK_VSC_TO_VK_EX );
+                // some keyboards will just return LEFT for both - left and right keys. So also check extend bit.
+                if (lParam & 0x1000000)
+                    event.KeyInput.Key = irr::IRR_KEY_RCONTROL;
+            }
+            if ( event.KeyInput.Key == irr::IRR_KEY_MENU )
+            {
+                event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey( ((lParam>>16) & 255), MY_MAPVK_VSC_TO_VK_EX );
+                if (lParam & 0x1000000)
+                    event.KeyInput.Key = irr::IRR_KEY_RMENU;
+            }
 
-			GetKeyboardState(allKeys);
+            GetKeyboardState(allKeys);
 
-			event.KeyInput.Shift = ((allKeys[VK_SHIFT] & 0x80)!=0);
-			event.KeyInput.Control = ((allKeys[VK_CONTROL] & 0x80)!=0);
+            event.KeyInput.Shift = ((allKeys[VK_SHIFT] & 0x80)!=0);
+            event.KeyInput.Control = ((allKeys[VK_CONTROL] & 0x80)!=0);
 
-			// Handle unicode and deadkeys in a way that works since Windows 95 and nt4.0
-			// Using ToUnicode instead would be shorter, but would to my knowledge not run on 95 and 98.
-			WORD keyChars[2];
-			UINT scanCode = HIWORD(lParam);
-			int conversionResult = ToAsciiEx(wParam,scanCode,allKeys,keyChars,0,KEYBOARD_INPUT_HKL);
-			if (conversionResult == 1)
-			{
-				WORD unicodeChar;
-				MultiByteToWideChar(
-						KEYBOARD_INPUT_CODEPAGE,
-						MB_PRECOMPOSED, // default
-						(LPCSTR)keyChars,
-						sizeof(keyChars),
-						(WCHAR*)&unicodeChar,
-						1 );
-				event.KeyInput.Char = unicodeChar;
-			}
-			else
-				event.KeyInput.Char = 0;
+            // Handle unicode and deadkeys in a way that works since Windows 95 and nt4.0
+            // Using ToUnicode instead would be shorter, but would to my knowledge not run on 95 and 98.
+            WORD keyChars[2];
+            UINT scanCode = HIWORD(lParam);
+            int conversionResult = ToAsciiEx(wParam,scanCode,allKeys,keyChars,0,KEYBOARD_INPUT_HKL);
+            if (conversionResult == 1)
+            {
+                WORD unicodeChar;
+                MultiByteToWideChar(
+                        KEYBOARD_INPUT_CODEPAGE,
+                        MB_PRECOMPOSED, // default
+                        (LPCSTR)keyChars,
+                        sizeof(keyChars),
+                        (WCHAR*)&unicodeChar,
+                        1 );
+                event.KeyInput.Char = unicodeChar;
+            }
+            else
+                event.KeyInput.Char = 0;
 
-			// allow composing characters like '@' with Alt Gr on non-US keyboards
-			if ((allKeys[VK_MENU] & 0x80) != 0)
-				event.KeyInput.Control = 0;
+            // allow composing characters like '@' with Alt Gr on non-US keyboards
+            if ((allKeys[VK_MENU] & 0x80) != 0)
+                event.KeyInput.Control = 0;
 
-			dev = getDeviceFromHWnd(hWnd);
-			if (dev)
-				dev->postEventFromUser(event);
+            dev = getDeviceFromHWnd(hWnd);
+            if (dev)
+                dev->postEventFromUser(event);
 
-			event.EventType = irr::EET_IMPUT_METHOD_EVENT;
-			event.InputMethodEvent.Event = irr::EIME_CHANGE_POS;
-			event.InputMethodEvent.Handle = hWnd;
+            event.EventType = irr::EET_IMPUT_METHOD_EVENT;
+            event.InputMethodEvent.Event = irr::EIME_CHANGE_POS;
+            event.InputMethodEvent.Handle = hWnd;
 
-			if (dev)
-				dev->postEventFromUser(event);
+            if (dev)
+                dev->postEventFromUser(event);
 
-			if (message == WM_SYSKEYDOWN || message == WM_SYSKEYUP)
-				return DefWindowProc(hWnd, message, wParam, lParam);
-			else
-				return 0;
-		}
+            if (message == WM_SYSKEYDOWN || message == WM_SYSKEYUP)
+                return DefWindowProc(hWnd, message, wParam, lParam);
+            else
+                return 0;
+        }
 
-	case WM_SIZE:
-		{
-			// resize
-			dev = getDeviceFromHWnd(hWnd);
-			if (dev)
-				dev->OnResized();
-		}
-		return 0;
+    case WM_SIZE:
+        {
+            // resize
+            dev = getDeviceFromHWnd(hWnd);
+            if (dev)
+                dev->OnResized();
+        }
+        return 0;
 
-	case WM_DESTROY:
-		PostQuitMessage(0);
-		return 0;
+    case WM_DESTROY:
+        PostQuitMessage(0);
+        return 0;
 
-	case WM_SYSCOMMAND:
-		// prevent screensaver or monitor powersave mode from starting
-		if ((wParam & 0xFFF0) == SC_SCREENSAVE ||
-			(wParam & 0xFFF0) == SC_MONITORPOWER ||
-			(wParam & 0xFFF0) == SC_KEYMENU
-			)
-			return 0;
+    case WM_SYSCOMMAND:
+        // prevent screensaver or monitor powersave mode from starting
+        if ((wParam & 0xFFF0) == SC_SCREENSAVE ||
+            (wParam & 0xFFF0) == SC_MONITORPOWER ||
+            (wParam & 0xFFF0) == SC_KEYMENU
+            )
+            return 0;
 
-		break;
+        break;
 
-	case WM_ACTIVATE:
-		// we need to take care for screen changes, e.g. Alt-Tab
-		dev = getDeviceFromHWnd(hWnd);
-		if (dev && dev->isFullscreen())
-		{
-			if ((wParam&0xFF)==WA_INACTIVE)
-			{
-				// If losing focus we minimize the app to show other one
-				ShowWindow(hWnd,SW_MINIMIZE);
-				// and switch back to default resolution
-				dev->switchToFullScreen(true);
-			}
-			else
-			{
-				// Otherwise we retore the fullscreen Irrlicht app
-				SetForegroundWindow(hWnd);
-				ShowWindow(hWnd, SW_RESTORE);
-				// and set the fullscreen resolution again
-				dev->switchToFullScreen();
-			}
-		}
-		event.EventType = irr::EET_IMPUT_METHOD_EVENT;
-		event.InputMethodEvent.Event = irr::EIME_CHANGE_POS;
-		event.InputMethodEvent.Handle = hWnd;
+    case WM_ACTIVATE:
+        // we need to take care for screen changes, e.g. Alt-Tab
+        dev = getDeviceFromHWnd(hWnd);
+        if (dev && dev->isFullscreen())
+        {
+            if ((wParam&0xFF)==WA_INACTIVE)
+            {
+                // If losing focus we minimize the app to show other one
+                ShowWindow(hWnd,SW_MINIMIZE);
+                // and switch back to default resolution
+                dev->switchToFullScreen(true);
+            }
+            else
+            {
+                // Otherwise we retore the fullscreen Irrlicht app
+                SetForegroundWindow(hWnd);
+                ShowWindow(hWnd, SW_RESTORE);
+                // and set the fullscreen resolution again
+                dev->switchToFullScreen();
+            }
+        }
+        event.EventType = irr::EET_IMPUT_METHOD_EVENT;
+        event.InputMethodEvent.Event = irr::EIME_CHANGE_POS;
+        event.InputMethodEvent.Handle = hWnd;
 
-		if (dev)
-			dev->postEventFromUser(event);
-		break;
+        if (dev)
+            dev->postEventFromUser(event);
+        break;
 
-	case WM_USER:
-		event.EventType = irr::EET_USER_EVENT;
-		event.UserEvent.UserData1 = (irr::s32)wParam;
-		event.UserEvent.UserData2 = (irr::s32)lParam;
-		dev = getDeviceFromHWnd(hWnd);
+    case WM_USER:
+        event.EventType = irr::EET_USER_EVENT;
+        event.UserEvent.UserData1 = (irr::s32)wParam;
+        event.UserEvent.UserData2 = (irr::s32)lParam;
+        dev = getDeviceFromHWnd(hWnd);
 
-		if (dev)
-			dev->postEventFromUser(event);
+        if (dev)
+            dev->postEventFromUser(event);
 
-		return 0;
+        return 0;
 
-	case WM_SETCURSOR:
-		// because Windows forgot about that in the meantime
-		dev = getDeviceFromHWnd(hWnd);
-		if (dev)
-		{
-			dev->getCursorControl()->setActiveIcon( dev->getCursorControl()->getActiveIcon() );
-			dev->getCursorControl()->setVisible( dev->getCursorControl()->isVisible() );
-		}
-		break;
+    case WM_SETCURSOR:
+        // because Windows forgot about that in the meantime
+        dev = getDeviceFromHWnd(hWnd);
+        if (dev)
+        {
+            dev->getCursorControl()->setActiveIcon( dev->getCursorControl()->getActiveIcon() );
+            dev->getCursorControl()->setVisible( dev->getCursorControl()->isVisible() );
+        }
+        break;
 
-	case WM_INPUTLANGCHANGE:
-		// get the new codepage used for keyboard input
-		KEYBOARD_INPUT_HKL = GetKeyboardLayout(0);
-		KEYBOARD_INPUT_CODEPAGE = LocaleIdToCodepage( LOWORD(KEYBOARD_INPUT_HKL) );
-		return 0;
-	}
-	return DefWindowProc(hWnd, message, wParam, lParam);
+    case WM_INPUTLANGCHANGE:
+        // get the new codepage used for keyboard input
+        KEYBOARD_INPUT_HKL = GetKeyboardLayout(0);
+        KEYBOARD_INPUT_CODEPAGE = LocaleIdToCodepage( LOWORD(KEYBOARD_INPUT_HKL) );
+        return 0;
+    }
+    return DefWindowProc(hWnd, message, wParam, lParam);
 }
 
 
@@ -1043,509 +1043,509 @@ namespace irr
 //! constructor
 CIrrDeviceWin32::CIrrDeviceWin32(const SIrrlichtCreationParameters& params)
 : CIrrDeviceStub(params), HWnd(0), ChangedToFullScreen(false), Resized(false),
-	ExternalWindow(false), Win32CursorControl(0), JoyControl(0)
+    ExternalWindow(false), Win32CursorControl(0), JoyControl(0)
 {
-	#ifdef _DEBUG
-	setDebugName("CIrrDeviceWin32");
-	#endif
+    #ifdef _DEBUG
+    setDebugName("CIrrDeviceWin32");
+    #endif
 
-	// get windows version and create OS operator
-	core::stringc winversion;
-	getWindowsVersion(winversion);
-	Operator = new COSOperator(winversion);
-	os::Printer::log(winversion.c_str(), ELL_INFORMATION);
+    // get windows version and create OS operator
+    core::stringc winversion;
+    getWindowsVersion(winversion);
+    Operator = new COSOperator(winversion);
+    os::Printer::log(winversion.c_str(), ELL_INFORMATION);
 
-	// get handle to exe file
-	HINSTANCE hInstance = GetModuleHandle(0);
+    // get handle to exe file
+    HINSTANCE hInstance = GetModuleHandle(0);
 
-	// Store original desktop mode.
+    // Store original desktop mode.
 
-	memset(&DesktopMode, 0, sizeof(DesktopMode));
-	DesktopMode.dmSize = sizeof(DesktopMode);
+    memset(&DesktopMode, 0, sizeof(DesktopMode));
+    DesktopMode.dmSize = sizeof(DesktopMode);
 
-	EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &DesktopMode);
+    EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &DesktopMode);
 
-	// create the window if we need to and we do not use the null device
-	if (!CreationParams.WindowId && CreationParams.DriverType != video::EDT_NULL)
-	{
-		const fschar_t* ClassName = __TEXT("CIrrDeviceWin32");
+    // create the window if we need to and we do not use the null device
+    if (!CreationParams.WindowId && CreationParams.DriverType != video::EDT_NULL)
+    {
+        const fschar_t* ClassName = __TEXT("CIrrDeviceWin32");
 
-		// Register Class
-		WNDCLASSEX wcex;
-		wcex.cbSize			= sizeof(WNDCLASSEX);
-		wcex.style			= CS_HREDRAW | CS_VREDRAW;
-		wcex.lpfnWndProc	= WndProc;
-		wcex.cbClsExtra		= 0;
-		wcex.cbWndExtra		= 0;
-		wcex.hInstance		= hInstance;
-		wcex.hIcon			= NULL;
-		wcex.hCursor		= 0; // LoadCursor(NULL, IDC_ARROW);
-		wcex.hbrBackground	= (HBRUSH)(COLOR_WINDOW+1);
-		wcex.lpszMenuName	= 0;
-		wcex.lpszClassName	= ClassName;
-		wcex.hIconSm		= 0;
+        // Register Class
+        WNDCLASSEX wcex;
+        wcex.cbSize         = sizeof(WNDCLASSEX);
+        wcex.style          = CS_HREDRAW | CS_VREDRAW;
+        wcex.lpfnWndProc    = WndProc;
+        wcex.cbClsExtra     = 0;
+        wcex.cbWndExtra     = 0;
+        wcex.hInstance      = hInstance;
+        wcex.hIcon          = NULL;
+        wcex.hCursor        = 0; // LoadCursor(NULL, IDC_ARROW);
+        wcex.hbrBackground  = (HBRUSH)(COLOR_WINDOW+1);
+        wcex.lpszMenuName   = 0;
+        wcex.lpszClassName  = ClassName;
+        wcex.hIconSm        = 0;
 
-		// if there is an icon, load it
-		wcex.hIcon = (HICON)LoadImage(hInstance, __TEXT("irrlicht.ico"), IMAGE_ICON, 0,0, LR_LOADFROMFILE);
+        // if there is an icon, load it
+        wcex.hIcon = (HICON)LoadImage(hInstance, __TEXT("irrlicht.ico"), IMAGE_ICON, 0,0, LR_LOADFROMFILE);
 
-		RegisterClassEx(&wcex);
+        RegisterClassEx(&wcex);
 
-		// calculate client size
+        // calculate client size
 
-		RECT clientSize;
-		clientSize.top = 0;
-		clientSize.left = 0;
-		clientSize.right = CreationParams.WindowSize.Width;
-		clientSize.bottom = CreationParams.WindowSize.Height;
+        RECT clientSize;
+        clientSize.top = 0;
+        clientSize.left = 0;
+        clientSize.right = CreationParams.WindowSize.Width;
+        clientSize.bottom = CreationParams.WindowSize.Height;
 
-		DWORD style = WS_POPUP;
+        DWORD style = WS_POPUP;
 
-		if (!CreationParams.Fullscreen)
-			style = WS_SYSMENU | WS_BORDER | WS_CAPTION | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+        if (!CreationParams.Fullscreen)
+            style = WS_SYSMENU | WS_BORDER | WS_CAPTION | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
 
-		AdjustWindowRect(&clientSize, style, FALSE);
+        AdjustWindowRect(&clientSize, style, FALSE);
 
-		const s32 realWidth = clientSize.right - clientSize.left;
-		const s32 realHeight = clientSize.bottom - clientSize.top;
+        const s32 realWidth = clientSize.right - clientSize.left;
+        const s32 realHeight = clientSize.bottom - clientSize.top;
 
-		s32 windowLeft = (GetSystemMetrics(SM_CXSCREEN) - realWidth) / 2;
-		s32 windowTop = (GetSystemMetrics(SM_CYSCREEN) - realHeight) / 2;
+        s32 windowLeft = (GetSystemMetrics(SM_CXSCREEN) - realWidth) / 2;
+        s32 windowTop = (GetSystemMetrics(SM_CYSCREEN) - realHeight) / 2;
 
-		if ( windowLeft < 0 )
-			windowLeft = 0;
-		if ( windowTop < 0 )
-			windowTop = 0;	// make sure window menus are in screen on creation
+        if ( windowLeft < 0 )
+            windowLeft = 0;
+        if ( windowTop < 0 )
+            windowTop = 0;  // make sure window menus are in screen on creation
 
-		if (CreationParams.Fullscreen)
-		{
-			windowLeft = 0;
-			windowTop = 0;
-		}
+        if (CreationParams.Fullscreen)
+        {
+            windowLeft = 0;
+            windowTop = 0;
+        }
 
-		// create window
+        // create window
 
-		HWnd = CreateWindow( ClassName, __TEXT(""), style, windowLeft, windowTop,
-					realWidth, realHeight, NULL, NULL, hInstance, NULL);
-		CreationParams.WindowId = HWnd;
-//		CreationParams.WindowSize.Width = realWidth;
-//		CreationParams.WindowSize.Height = realHeight;
+        HWnd = CreateWindow( ClassName, __TEXT(""), style, windowLeft, windowTop,
+                    realWidth, realHeight, NULL, NULL, hInstance, NULL);
+        CreationParams.WindowId = HWnd;
+//      CreationParams.WindowSize.Width = realWidth;
+//      CreationParams.WindowSize.Height = realHeight;
 
-		ShowWindow(HWnd, SW_SHOWNORMAL);
-		UpdateWindow(HWnd);
+        ShowWindow(HWnd, SW_SHOWNORMAL);
+        UpdateWindow(HWnd);
 
-		// fix ugly ATI driver bugs. Thanks to ariaci
-		MoveWindow(HWnd, windowLeft, windowTop, realWidth, realHeight, TRUE);
+        // fix ugly ATI driver bugs. Thanks to ariaci
+        MoveWindow(HWnd, windowLeft, windowTop, realWidth, realHeight, TRUE);
 
-		// make sure everything gets updated to the real sizes
-		Resized = true;
-	}
-	else if (CreationParams.WindowId)
-	{
-		// attach external window
-		HWnd = static_cast<HWND>(CreationParams.WindowId);
-		RECT r;
-		GetWindowRect(HWnd, &r);
-		CreationParams.WindowSize.Width = r.right - r.left;
-		CreationParams.WindowSize.Height = r.bottom - r.top;
-		CreationParams.Fullscreen = false;
-		ExternalWindow = true;
-	}
+        // make sure everything gets updated to the real sizes
+        Resized = true;
+    }
+    else if (CreationParams.WindowId)
+    {
+        // attach external window
+        HWnd = static_cast<HWND>(CreationParams.WindowId);
+        RECT r;
+        GetWindowRect(HWnd, &r);
+        CreationParams.WindowSize.Width = r.right - r.left;
+        CreationParams.WindowSize.Height = r.bottom - r.top;
+        CreationParams.Fullscreen = false;
+        ExternalWindow = true;
+    }
 
-	// create cursor control
+    // create cursor control
 
-	Win32CursorControl = new CCursorControl(this, CreationParams.WindowSize, HWnd, CreationParams.Fullscreen);
-	CursorControl = Win32CursorControl;
-	JoyControl = new SJoystickWin32Control(this);
+    Win32CursorControl = new CCursorControl(this, CreationParams.WindowSize, HWnd, CreationParams.Fullscreen);
+    CursorControl = Win32CursorControl;
+    JoyControl = new SJoystickWin32Control(this);
 
-	// initialize doubleclicks with system values
-	MouseMultiClicks.DoubleClickTime = GetDoubleClickTime();
+    // initialize doubleclicks with system values
+    MouseMultiClicks.DoubleClickTime = GetDoubleClickTime();
 
-	// create driver
+    // create driver
 
-	createDriver();
+    createDriver();
 
-	if (VideoDriver)
-		createGUIAndScene();
+    if (VideoDriver)
+        createGUIAndScene();
 
-	// register environment
+    // register environment
 
-	SEnvMapper em;
-	em.irrDev = this;
-	em.hWnd = HWnd;
-	EnvMap.push_back(em);
+    SEnvMapper em;
+    em.irrDev = this;
+    em.hWnd = HWnd;
+    EnvMap.push_back(em);
 
-	// set this as active window
-	if (!ExternalWindow)
-	{
-		SetActiveWindow(HWnd);
-		SetForegroundWindow(HWnd);
-	}
+    // set this as active window
+    if (!ExternalWindow)
+    {
+        SetActiveWindow(HWnd);
+        SetForegroundWindow(HWnd);
+    }
 
-	// get the codepage used for keyboard input
-	KEYBOARD_INPUT_HKL = GetKeyboardLayout(0);
-	KEYBOARD_INPUT_CODEPAGE = LocaleIdToCodepage( LOWORD(KEYBOARD_INPUT_HKL) );
+    // get the codepage used for keyboard input
+    KEYBOARD_INPUT_HKL = GetKeyboardLayout(0);
+    KEYBOARD_INPUT_CODEPAGE = LocaleIdToCodepage( LOWORD(KEYBOARD_INPUT_HKL) );
 
-	// inform driver about the window size etc.
-	resizeIfNecessary();
+    // inform driver about the window size etc.
+    resizeIfNecessary();
 
-	// for reset the position of composition window
-	updateICPos(HWnd, 0, 0, 0);
+    // for reset the position of composition window
+    updateICPos(HWnd, 0, 0, 0);
 }
 
 
 //! destructor
 CIrrDeviceWin32::~CIrrDeviceWin32()
 {
-	delete JoyControl;
+    delete JoyControl;
 
-	// unregister environment
+    // unregister environment
 
-	irr::core::list<SEnvMapper>::Iterator it = EnvMap.begin();
-	for (; it!= EnvMap.end(); ++it)
-	{
-		if ((*it).hWnd == HWnd)
-		{
-			EnvMap.erase(it);
-			break;
-		}
-	}
+    irr::core::list<SEnvMapper>::Iterator it = EnvMap.begin();
+    for (; it!= EnvMap.end(); ++it)
+    {
+        if ((*it).hWnd == HWnd)
+        {
+            EnvMap.erase(it);
+            break;
+        }
+    }
 
-	switchToFullScreen(true);
+    switchToFullScreen(true);
 }
 
 
 //! create the driver
 void CIrrDeviceWin32::createDriver()
 {
-	switch(CreationParams.DriverType)
-	{
-	case video::EDT_DIRECT3D8:
-		#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
+    switch(CreationParams.DriverType)
+    {
+    case video::EDT_DIRECT3D8:
+        #ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
 
-		VideoDriver = video::createDirectX8Driver(CreationParams, FileSystem, HWnd);
+        VideoDriver = video::createDirectX8Driver(CreationParams, FileSystem, HWnd);
 
-		if (!VideoDriver)
-		{
-			os::Printer::log("Could not create DIRECT3D8 Driver.", ELL_ERROR);
-		}
-		#else
-		os::Printer::log("DIRECT3D8 Driver was not compiled into this dll. Try another one.", ELL_ERROR);
-		#endif // _IRR_COMPILE_WITH_DIRECT3D_8_
+        if (!VideoDriver)
+        {
+            os::Printer::log("Could not create DIRECT3D8 Driver.", ELL_ERROR);
+        }
+        #else
+        os::Printer::log("DIRECT3D8 Driver was not compiled into this dll. Try another one.", ELL_ERROR);
+        #endif // _IRR_COMPILE_WITH_DIRECT3D_8_
 
-		break;
+        break;
 
-	case video::EDT_DIRECT3D9:
-		#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
+    case video::EDT_DIRECT3D9:
+        #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
 
-		VideoDriver = video::createDirectX9Driver(CreationParams, FileSystem, HWnd);
+        VideoDriver = video::createDirectX9Driver(CreationParams, FileSystem, HWnd);
 
-		if (!VideoDriver)
-		{
-			os::Printer::log("Could not create DIRECT3D9 Driver.", ELL_ERROR);
-		}
-		#else
-		os::Printer::log("DIRECT3D9 Driver was not compiled into this dll. Try another one.", ELL_ERROR);
-		#endif // _IRR_COMPILE_WITH_DIRECT3D_9_
+        if (!VideoDriver)
+        {
+            os::Printer::log("Could not create DIRECT3D9 Driver.", ELL_ERROR);
+        }
+        #else
+        os::Printer::log("DIRECT3D9 Driver was not compiled into this dll. Try another one.", ELL_ERROR);
+        #endif // _IRR_COMPILE_WITH_DIRECT3D_9_
 
-		break;
+        break;
 
-	case video::EDT_OPENGL:
+    case video::EDT_OPENGL:
 
-		#ifdef _IRR_COMPILE_WITH_OPENGL_
-		switchToFullScreen();
+        #ifdef _IRR_COMPILE_WITH_OPENGL_
+        switchToFullScreen();
 
-		VideoDriver = video::createOpenGLDriver(CreationParams, FileSystem, this);
-		if (!VideoDriver)
-		{
-			os::Printer::log("Could not create OpenGL driver.", ELL_ERROR);
-		}
-		#else
-		os::Printer::log("OpenGL driver was not compiled in.", ELL_ERROR);
-		#endif
-		break;
+        VideoDriver = video::createOpenGLDriver(CreationParams, FileSystem, this);
+        if (!VideoDriver)
+        {
+            os::Printer::log("Could not create OpenGL driver.", ELL_ERROR);
+        }
+        #else
+        os::Printer::log("OpenGL driver was not compiled in.", ELL_ERROR);
+        #endif
+        break;
 
-	case video::EDT_SOFTWARE:
+    case video::EDT_SOFTWARE:
 
-		#ifdef _IRR_COMPILE_WITH_SOFTWARE_
-		switchToFullScreen();
+        #ifdef _IRR_COMPILE_WITH_SOFTWARE_
+        switchToFullScreen();
 
-		VideoDriver = video::createSoftwareDriver(CreationParams.WindowSize, CreationParams.Fullscreen, FileSystem, this);
-		#else
-		os::Printer::log("Software driver was not compiled in.", ELL_ERROR);
-		#endif
+        VideoDriver = video::createSoftwareDriver(CreationParams.WindowSize, CreationParams.Fullscreen, FileSystem, this);
+        #else
+        os::Printer::log("Software driver was not compiled in.", ELL_ERROR);
+        #endif
 
-		break;
+        break;
 
-	case video::EDT_BURNINGSVIDEO:
-		#ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_
-		switchToFullScreen();
+    case video::EDT_BURNINGSVIDEO:
+        #ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_
+        switchToFullScreen();
 
-		VideoDriver = video::createBurningVideoDriver(CreationParams, FileSystem, this);
-		#else
-		os::Printer::log("Burning's Video driver was not compiled in.", ELL_ERROR);
-		#endif
-		break;
+        VideoDriver = video::createBurningVideoDriver(CreationParams, FileSystem, this);
+        #else
+        os::Printer::log("Burning's Video driver was not compiled in.", ELL_ERROR);
+        #endif
+        break;
 
-	case video::EDT_NULL:
-		// create null driver
-		VideoDriver = video::createNullDriver(FileSystem, CreationParams.WindowSize);
-		break;
+    case video::EDT_NULL:
+        // create null driver
+        VideoDriver = video::createNullDriver(FileSystem, CreationParams.WindowSize);
+        break;
 
-	default:
-		os::Printer::log("Unable to create video driver of unknown type.", ELL_ERROR);
-		break;
-	}
+    default:
+        os::Printer::log("Unable to create video driver of unknown type.", ELL_ERROR);
+        break;
+    }
 }
 
 
 //! runs the device. Returns false if device wants to be deleted
 bool CIrrDeviceWin32::run()
 {
-	os::Timer::tick();
+    os::Timer::tick();
 
-	static_cast<CCursorControl*>(CursorControl)->update();
+    static_cast<CCursorControl*>(CursorControl)->update();
 
-	handleSystemMessages();
+    handleSystemMessages();
 
-	if (!Close)
-		resizeIfNecessary();
+    if (!Close)
+        resizeIfNecessary();
 
-	if(!Close && JoyControl)
-		JoyControl->pollJoysticks();
+    if(!Close && JoyControl)
+        JoyControl->pollJoysticks();
 
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return !Close;
+    _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+    return !Close;
 }
 
 
 //! Pause the current process for the minimum time allowed only to allow other processes to execute
 void CIrrDeviceWin32::yield()
 {
-	Sleep(1);
+    Sleep(1);
 }
 
 //! Pause execution and let other processes to run for a specified amount of time.
 void CIrrDeviceWin32::sleep(u32 timeMs, bool pauseTimer)
 {
-	const bool wasStopped = Timer ? Timer->isStopped() : true;
-	if (pauseTimer && !wasStopped)
-		Timer->stop();
+    const bool wasStopped = Timer ? Timer->isStopped() : true;
+    if (pauseTimer && !wasStopped)
+        Timer->stop();
 
-	Sleep(timeMs);
+    Sleep(timeMs);
 
-	if (pauseTimer && !wasStopped)
-		Timer->start();
+    if (pauseTimer && !wasStopped)
+        Timer->start();
 }
 
 
 void CIrrDeviceWin32::resizeIfNecessary()
 {
-	if (!Resized || !getVideoDriver())
-		return;
+    if (!Resized || !getVideoDriver())
+        return;
 
-	RECT r;
-	GetClientRect(HWnd, &r);
+    RECT r;
+    GetClientRect(HWnd, &r);
 
-	char tmp[255];
+    char tmp[255];
 
-	if (r.right < 2 || r.bottom < 2)
-	{
-		sprintf(tmp, "Ignoring resize operation to (%ld %ld)", r.right, r.bottom);
-		os::Printer::log(tmp);
-	}
-	else
-	{
-		sprintf(tmp, "Resizing window (%ld %ld)", r.right, r.bottom);
-		os::Printer::log(tmp);
+    if (r.right < 2 || r.bottom < 2)
+    {
+        sprintf(tmp, "Ignoring resize operation to (%ld %ld)", r.right, r.bottom);
+        os::Printer::log(tmp);
+    }
+    else
+    {
+        sprintf(tmp, "Resizing window (%ld %ld)", r.right, r.bottom);
+        os::Printer::log(tmp);
 
-		getVideoDriver()->OnResize(irr::core::dimension2du((u32)r.right, (u32)r.bottom));
-		getWin32CursorControl()->OnResize(getVideoDriver()->getScreenSize());
-	}
+        getVideoDriver()->OnResize(irr::core::dimension2du((u32)r.right, (u32)r.bottom));
+        getWin32CursorControl()->OnResize(getVideoDriver()->getScreenSize());
+    }
 
-	Resized = false;
+    Resized = false;
 }
 
 
 //! sets the caption of the window
 void CIrrDeviceWin32::setWindowCaption(const wchar_t* text)
 {
-	// We use SendMessage instead of SetText to ensure proper
-	// function even in cases where the HWND was created in a different thread
-	DWORD_PTR dwResult;
-	SendMessageTimeoutW(HWnd, WM_SETTEXT, 0,
-			reinterpret_cast<LPARAM>(text),
-			SMTO_ABORTIFHUNG, 2000, &dwResult);
+    // We use SendMessage instead of SetText to ensure proper
+    // function even in cases where the HWND was created in a different thread
+    DWORD_PTR dwResult;
+    SendMessageTimeoutW(HWnd, WM_SETTEXT, 0,
+            reinterpret_cast<LPARAM>(text),
+            SMTO_ABORTIFHUNG, 2000, &dwResult);
 }
 
 
 //! presents a surface in the client area
 bool CIrrDeviceWin32::present(video::IImage* image, void* windowId, core::rect<s32>* src)
 {
-	HWND hwnd = HWnd;
-	if ( windowId )
-		hwnd = reinterpret_cast<HWND>(windowId);
+    HWND hwnd = HWnd;
+    if ( windowId )
+        hwnd = reinterpret_cast<HWND>(windowId);
 
-	HDC dc = GetDC(hwnd);
+    HDC dc = GetDC(hwnd);
 
-	if ( dc )
-	{
-		RECT rect;
-		GetClientRect(hwnd, &rect);
-		const void* memory = (const void *)image->lock();
+    if ( dc )
+    {
+        RECT rect;
+        GetClientRect(hwnd, &rect);
+        const void* memory = (const void *)image->lock();
 
-		BITMAPV4HEADER bi;
-		ZeroMemory (&bi, sizeof(bi));
-		bi.bV4Size = sizeof(BITMAPINFOHEADER);
-		bi.bV4BitCount = (WORD)image->getBitsPerPixel();
-		bi.bV4Planes = 1;
-		bi.bV4Width = image->getDimension().Width;
-		bi.bV4Height = -((s32)image->getDimension().Height);
-		bi.bV4V4Compression = BI_BITFIELDS;
-		bi.bV4AlphaMask = image->getAlphaMask();
-		bi.bV4RedMask = image->getRedMask();
-		bi.bV4GreenMask = image->getGreenMask();
-		bi.bV4BlueMask = image->getBlueMask();
+        BITMAPV4HEADER bi;
+        ZeroMemory (&bi, sizeof(bi));
+        bi.bV4Size = sizeof(BITMAPINFOHEADER);
+        bi.bV4BitCount = (WORD)image->getBitsPerPixel();
+        bi.bV4Planes = 1;
+        bi.bV4Width = image->getDimension().Width;
+        bi.bV4Height = -((s32)image->getDimension().Height);
+        bi.bV4V4Compression = BI_BITFIELDS;
+        bi.bV4AlphaMask = image->getAlphaMask();
+        bi.bV4RedMask = image->getRedMask();
+        bi.bV4GreenMask = image->getGreenMask();
+        bi.bV4BlueMask = image->getBlueMask();
 
-		if ( src )
-		{
-			StretchDIBits(dc, 0,0, rect.right, rect.bottom,
-					src->UpperLeftCorner.X, src->UpperLeftCorner.Y,
-					src->getWidth(), src->getHeight(),
-					memory, (const BITMAPINFO*)(&bi), DIB_RGB_COLORS, SRCCOPY);
-		}
-		else
-		{
-			StretchDIBits(dc, 0,0, rect.right, rect.bottom,
-					0, 0, image->getDimension().Width, image->getDimension().Height,
-					memory, (const BITMAPINFO*)(&bi), DIB_RGB_COLORS, SRCCOPY);
-		}
+        if ( src )
+        {
+            StretchDIBits(dc, 0,0, rect.right, rect.bottom,
+                    src->UpperLeftCorner.X, src->UpperLeftCorner.Y,
+                    src->getWidth(), src->getHeight(),
+                    memory, (const BITMAPINFO*)(&bi), DIB_RGB_COLORS, SRCCOPY);
+        }
+        else
+        {
+            StretchDIBits(dc, 0,0, rect.right, rect.bottom,
+                    0, 0, image->getDimension().Width, image->getDimension().Height,
+                    memory, (const BITMAPINFO*)(&bi), DIB_RGB_COLORS, SRCCOPY);
+        }
 
-		image->unlock();
+        image->unlock();
 
-		ReleaseDC(hwnd, dc);
-	}
-	return true;
+        ReleaseDC(hwnd, dc);
+    }
+    return true;
 }
 
 
 //! notifies the device that it should close itself
 void CIrrDeviceWin32::closeDevice()
 {
-	MSG msg;
-	PeekMessage(&msg, NULL, WM_QUIT, WM_QUIT, PM_REMOVE);
-	PostQuitMessage(0);
-	PeekMessage(&msg, NULL, WM_QUIT, WM_QUIT, PM_REMOVE);
-	if (!ExternalWindow)
-	{
-		DestroyWindow(HWnd);
-		const fschar_t* ClassName = __TEXT("CIrrDeviceWin32");
-		HINSTANCE hInstance = GetModuleHandle(0);
-		UnregisterClass(ClassName, hInstance);
-	}
-	Close=true;
+    MSG msg;
+    PeekMessage(&msg, NULL, WM_QUIT, WM_QUIT, PM_REMOVE);
+    PostQuitMessage(0);
+    PeekMessage(&msg, NULL, WM_QUIT, WM_QUIT, PM_REMOVE);
+    if (!ExternalWindow)
+    {
+        DestroyWindow(HWnd);
+        const fschar_t* ClassName = __TEXT("CIrrDeviceWin32");
+        HINSTANCE hInstance = GetModuleHandle(0);
+        UnregisterClass(ClassName, hInstance);
+    }
+    Close=true;
 }
 
 
 //! returns if window is active. if not, nothing needs to be drawn
 bool CIrrDeviceWin32::isWindowActive() const
 {
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return (GetActiveWindow() == HWnd);
+    _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+    return (GetActiveWindow() == HWnd);
 }
 
 
 //! returns if window has focus
 bool CIrrDeviceWin32::isWindowFocused() const
 {
-	bool ret = (GetFocus() == HWnd);
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return ret;
+    bool ret = (GetFocus() == HWnd);
+    _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+    return ret;
 }
 
 
 //! returns if window is minimized
 bool CIrrDeviceWin32::isWindowMinimized() const
 {
-	WINDOWPLACEMENT plc;
-	plc.length=sizeof(WINDOWPLACEMENT);
-	bool ret=false;
-	if (GetWindowPlacement(HWnd,&plc))
-		ret=(plc.showCmd & SW_SHOWMINIMIZED)!=0;
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return ret;
+    WINDOWPLACEMENT plc;
+    plc.length=sizeof(WINDOWPLACEMENT);
+    bool ret=false;
+    if (GetWindowPlacement(HWnd,&plc))
+        ret=(plc.showCmd & SW_SHOWMINIMIZED)!=0;
+    _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+    return ret;
 }
 
 
 //! switches to fullscreen
 bool CIrrDeviceWin32::switchToFullScreen(bool reset)
 {
-	if (!CreationParams.Fullscreen)
-		return true;
+    if (!CreationParams.Fullscreen)
+        return true;
 
-	if (reset)
-	{
-		if (ChangedToFullScreen)
-		{
-			return (ChangeDisplaySettings(&DesktopMode,0)==DISP_CHANGE_SUCCESSFUL);
-		}
-		else
-			return true;
-	}
+    if (reset)
+    {
+        if (ChangedToFullScreen)
+        {
+            return (ChangeDisplaySettings(&DesktopMode,0)==DISP_CHANGE_SUCCESSFUL);
+        }
+        else
+            return true;
+    }
 
-	// use default values from current setting
+    // use default values from current setting
 
-	DEVMODE dm;
-	memset(&dm, 0, sizeof(dm));
-	dm.dmSize = sizeof(dm);
+    DEVMODE dm;
+    memset(&dm, 0, sizeof(dm));
+    dm.dmSize = sizeof(dm);
 
-	EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dm);
-	dm.dmPelsWidth = CreationParams.WindowSize.Width;
-	dm.dmPelsHeight = CreationParams.WindowSize.Height;
-	dm.dmBitsPerPel = CreationParams.Bits;
-	dm.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY;
+    EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dm);
+    dm.dmPelsWidth = CreationParams.WindowSize.Width;
+    dm.dmPelsHeight = CreationParams.WindowSize.Height;
+    dm.dmBitsPerPel = CreationParams.Bits;
+    dm.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY;
 
-	LONG res = ChangeDisplaySettings(&dm, CDS_FULLSCREEN);
-	if (res != DISP_CHANGE_SUCCESSFUL)
-	{ // try again without forcing display frequency
-		dm.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
-		res = ChangeDisplaySettings(&dm, CDS_FULLSCREEN);
-	}
+    LONG res = ChangeDisplaySettings(&dm, CDS_FULLSCREEN);
+    if (res != DISP_CHANGE_SUCCESSFUL)
+    { // try again without forcing display frequency
+        dm.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
+        res = ChangeDisplaySettings(&dm, CDS_FULLSCREEN);
+    }
 
-	bool ret = false;
-	switch(res)
-	{
-	case DISP_CHANGE_SUCCESSFUL:
-		ChangedToFullScreen = true;
-		ret = true;
-		break;
-	case DISP_CHANGE_RESTART:
-		os::Printer::log("Switch to fullscreen: The computer must be restarted in order for the graphics mode to work.", ELL_ERROR);
-		break;
-	case DISP_CHANGE_BADFLAGS:
-		os::Printer::log("Switch to fullscreen: An invalid set of flags was passed in.", ELL_ERROR);
-		break;
-	case DISP_CHANGE_BADPARAM:
-		os::Printer::log("Switch to fullscreen: An invalid parameter was passed in. This can include an invalid flag or combination of flags.", ELL_ERROR);
-		break;
-	case DISP_CHANGE_FAILED:
-		os::Printer::log("Switch to fullscreen: The display driver failed the specified graphics mode.", ELL_ERROR);
-		break;
-	case DISP_CHANGE_BADMODE:
-		os::Printer::log("Switch to fullscreen: The graphics mode is not supported.", ELL_ERROR);
-		break;
-	default:
-		os::Printer::log("An unknown error occured while changing to fullscreen.", ELL_ERROR);
-		break;
-	}
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return ret;
+    bool ret = false;
+    switch(res)
+    {
+    case DISP_CHANGE_SUCCESSFUL:
+        ChangedToFullScreen = true;
+        ret = true;
+        break;
+    case DISP_CHANGE_RESTART:
+        os::Printer::log("Switch to fullscreen: The computer must be restarted in order for the graphics mode to work.", ELL_ERROR);
+        break;
+    case DISP_CHANGE_BADFLAGS:
+        os::Printer::log("Switch to fullscreen: An invalid set of flags was passed in.", ELL_ERROR);
+        break;
+    case DISP_CHANGE_BADPARAM:
+        os::Printer::log("Switch to fullscreen: An invalid parameter was passed in. This can include an invalid flag or combination of flags.", ELL_ERROR);
+        break;
+    case DISP_CHANGE_FAILED:
+        os::Printer::log("Switch to fullscreen: The display driver failed the specified graphics mode.", ELL_ERROR);
+        break;
+    case DISP_CHANGE_BADMODE:
+        os::Printer::log("Switch to fullscreen: The graphics mode is not supported.", ELL_ERROR);
+        break;
+    default:
+        os::Printer::log("An unknown error occured while changing to fullscreen.", ELL_ERROR);
+        break;
+    }
+    _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+    return ret;
 }
 
 
 //! returns the win32 cursor control
 CIrrDeviceWin32::CCursorControl* CIrrDeviceWin32::getWin32CursorControl()
 {
-	return Win32CursorControl;
+    return Win32CursorControl;
 }
 
 
@@ -1553,27 +1553,27 @@ CIrrDeviceWin32::CCursorControl* CIrrDeviceWin32::getWin32CursorControl()
 //! by the gfx adapter.
 video::IVideoModeList* CIrrDeviceWin32::getVideoModeList()
 {
-	if (!VideoModeList.getVideoModeCount())
-	{
-		// enumerate video modes.
-		DWORD i=0;
-		DEVMODE mode;
-		memset(&mode, 0, sizeof(mode));
-		mode.dmSize = sizeof(mode);
+    if (!VideoModeList.getVideoModeCount())
+    {
+        // enumerate video modes.
+        DWORD i=0;
+        DEVMODE mode;
+        memset(&mode, 0, sizeof(mode));
+        mode.dmSize = sizeof(mode);
 
-		while (EnumDisplaySettings(NULL, i, &mode))
-		{
-			VideoModeList.addMode(core::dimension2d<u32>(mode.dmPelsWidth, mode.dmPelsHeight),
-				mode.dmBitsPerPel);
+        while (EnumDisplaySettings(NULL, i, &mode))
+        {
+            VideoModeList.addMode(core::dimension2d<u32>(mode.dmPelsWidth, mode.dmPelsHeight),
+                mode.dmBitsPerPel);
 
-			++i;
-		}
+            ++i;
+        }
 
-		if (EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &mode))
-			VideoModeList.setDesktop(mode.dmBitsPerPel, core::dimension2d<u32>(mode.dmPelsWidth, mode.dmPelsHeight));
-	}
+        if (EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &mode))
+            VideoModeList.setDesktop(mode.dmBitsPerPel, core::dimension2d<u32>(mode.dmPelsWidth, mode.dmPelsHeight));
+    }
 
-	return &VideoModeList;
+    return &VideoModeList;
 }
 
 typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
@@ -1581,356 +1581,356 @@ typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
 // depending on the SDK version and compilers some defines might be available
 // or not
 #ifndef PRODUCT_ULTIMATE
-#define PRODUCT_ULTIMATE	0x00000001
-#define PRODUCT_HOME_BASIC	0x00000002
-#define PRODUCT_HOME_PREMIUM	0x00000003
-#define PRODUCT_ENTERPRISE	0x00000004
-#define PRODUCT_HOME_BASIC_N	0x00000005
-#define PRODUCT_BUSINESS	0x00000006
-#define PRODUCT_STARTER		0x0000000B
+#define PRODUCT_ULTIMATE     0x00000001
+#define PRODUCT_HOME_BASIC   0x00000002
+#define PRODUCT_HOME_PREMIUM 0x00000003
+#define PRODUCT_ENTERPRISE   0x00000004
+#define PRODUCT_HOME_BASIC_N 0x00000005
+#define PRODUCT_BUSINESS     0x00000006
+#define PRODUCT_STARTER      0x0000000B
 #endif
 #ifndef PRODUCT_ULTIMATE_N
-#define PRODUCT_BUSINESS_N	0x00000010
-#define PRODUCT_HOME_PREMIUM_N	0x0000001A
-#define PRODUCT_ENTERPRISE_N	0x0000001B
-#define PRODUCT_ULTIMATE_N	0x0000001C
+#define PRODUCT_BUSINESS_N      0x00000010
+#define PRODUCT_HOME_PREMIUM_N  0x0000001A
+#define PRODUCT_ENTERPRISE_N    0x0000001B
+#define PRODUCT_ULTIMATE_N      0x0000001C
 #endif
 #ifndef PRODUCT_STARTER_N
-#define PRODUCT_STARTER_N	0x0000002F
+#define PRODUCT_STARTER_N       0x0000002F
 #endif
 #ifndef PRODUCT_PROFESSIONAL
-#define PRODUCT_PROFESSIONAL	0x00000030
-#define PRODUCT_PROFESSIONAL_N	0x00000031
+#define PRODUCT_PROFESSIONAL    0x00000030
+#define PRODUCT_PROFESSIONAL_N  0x00000031
 #endif
 #ifndef PRODUCT_ULTIMATE_E
-#define PRODUCT_STARTER_E	0x00000042
-#define PRODUCT_HOME_BASIC_E	0x00000043
-#define PRODUCT_HOME_PREMIUM_E	0x00000044
-#define PRODUCT_PROFESSIONAL_E	0x00000045
-#define PRODUCT_ENTERPRISE_E	0x00000046
-#define PRODUCT_ULTIMATE_E	0x00000047
+#define PRODUCT_STARTER_E       0x00000042
+#define PRODUCT_HOME_BASIC_E    0x00000043
+#define PRODUCT_HOME_PREMIUM_E  0x00000044
+#define PRODUCT_PROFESSIONAL_E  0x00000045
+#define PRODUCT_ENTERPRISE_E    0x00000046
+#define PRODUCT_ULTIMATE_E      0x00000047
 #endif
 
 void CIrrDeviceWin32::getWindowsVersion(core::stringc& out)
 {
-	OSVERSIONINFOEX osvi;
-	PGPI pGPI;
-	BOOL bOsVersionInfoEx;
+    OSVERSIONINFOEX osvi;
+    PGPI pGPI;
+    BOOL bOsVersionInfoEx;
 
-	ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
-	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+    ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
+    osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
 
-	bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO*) &osvi);
-	if (!bOsVersionInfoEx)
-	{
-		osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-		if (! GetVersionEx((OSVERSIONINFO *) &osvi))
-			return;
-	}
+    bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO*) &osvi);
+    if (!bOsVersionInfoEx)
+    {
+        osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+        if (! GetVersionEx((OSVERSIONINFO *) &osvi))
+            return;
+    }
 
-	switch (osvi.dwPlatformId)
-	{
-	case VER_PLATFORM_WIN32_NT:
-		if (osvi.dwMajorVersion <= 4)
-			out.append("Microsoft Windows NT ");
-		else
-		if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)
-			out.append("Microsoft Windows 2000 ");
-		else
-		if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1)
-			out.append("Microsoft Windows XP ");
-		else
-		if (osvi.dwMajorVersion == 6 )
-		{
-			if (osvi.dwMinorVersion == 0)
-			{
-				if (osvi.wProductType == VER_NT_WORKSTATION)
-					out.append("Microsoft Windows Vista ");
-				else
-					out.append("Microsoft Windows Server 2008 ");
-			}
-			else if (osvi.dwMinorVersion == 1)
-			{
-				if (osvi.wProductType == VER_NT_WORKSTATION)
-					out.append("Microsoft Windows 7 ");
-				else
-					out.append("Microsoft Windows Server 2008 R2 ");
-			}
-			else if (osvi.dwMinorVersion == 2)
-			{
-				if (osvi.wProductType == VER_NT_WORKSTATION)
-					out.append("Microsoft Windows 8 ");
-				else
-					out.append("Microsoft Windows Server 2012 ");
-			}
-			else if (osvi.dwMinorVersion == 3)
-			{
-				if (osvi.wProductType == VER_NT_WORKSTATION)
-					out.append("Microsoft Windows 8.1 ");
-				else
-					out.append("Microsoft Windows Server 2012 R2 ");
-			}
-		}
+    switch (osvi.dwPlatformId)
+    {
+    case VER_PLATFORM_WIN32_NT:
+        if (osvi.dwMajorVersion <= 4)
+            out.append("Microsoft Windows NT ");
+        else
+        if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)
+            out.append("Microsoft Windows 2000 ");
+        else
+        if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1)
+            out.append("Microsoft Windows XP ");
+        else
+        if (osvi.dwMajorVersion == 6 )
+        {
+            if (osvi.dwMinorVersion == 0)
+            {
+                if (osvi.wProductType == VER_NT_WORKSTATION)
+                    out.append("Microsoft Windows Vista ");
+                else
+                    out.append("Microsoft Windows Server 2008 ");
+            }
+            else if (osvi.dwMinorVersion == 1)
+            {
+                if (osvi.wProductType == VER_NT_WORKSTATION)
+                    out.append("Microsoft Windows 7 ");
+                else
+                    out.append("Microsoft Windows Server 2008 R2 ");
+            }
+            else if (osvi.dwMinorVersion == 2)
+            {
+                if (osvi.wProductType == VER_NT_WORKSTATION)
+                    out.append("Microsoft Windows 8 ");
+                else
+                    out.append("Microsoft Windows Server 2012 ");
+            }
+            else if (osvi.dwMinorVersion == 3)
+            {
+                if (osvi.wProductType == VER_NT_WORKSTATION)
+                    out.append("Microsoft Windows 8.1 ");
+                else
+                    out.append("Microsoft Windows Server 2012 R2 ");
+            }
+        }
 
-		if (bOsVersionInfoEx)
-		{
-			if (osvi.dwMajorVersion == 6)
-			{
-				DWORD dwType;
-				pGPI = (PGPI)GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetProductInfo");
-				pGPI(osvi.dwMajorVersion, osvi.dwMinorVersion, 0, 0, &dwType);
+        if (bOsVersionInfoEx)
+        {
+            if (osvi.dwMajorVersion == 6)
+            {
+                DWORD dwType;
+                pGPI = (PGPI)GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetProductInfo");
+                pGPI(osvi.dwMajorVersion, osvi.dwMinorVersion, 0, 0, &dwType);
 
-				switch (dwType)
-				{
-				case PRODUCT_ULTIMATE:
-				case PRODUCT_ULTIMATE_E:
-				case PRODUCT_ULTIMATE_N:
-					out.append("Ultimate Edition ");
-					break;
-				case PRODUCT_PROFESSIONAL:
-				case PRODUCT_PROFESSIONAL_E:
-				case PRODUCT_PROFESSIONAL_N:
-					out.append("Professional Edition ");
-					break;
-				case PRODUCT_HOME_BASIC:
-				case PRODUCT_HOME_BASIC_E:
-				case PRODUCT_HOME_BASIC_N:
-					out.append("Home Basic Edition ");
-					break;
-				case PRODUCT_HOME_PREMIUM:
-				case PRODUCT_HOME_PREMIUM_E:
-				case PRODUCT_HOME_PREMIUM_N:
-					out.append("Home Premium Edition ");
-					break;
-				case PRODUCT_ENTERPRISE:
-				case PRODUCT_ENTERPRISE_E:
-				case PRODUCT_ENTERPRISE_N:
-					out.append("Enterprise Edition ");
-					break;
-				case PRODUCT_BUSINESS:
-				case PRODUCT_BUSINESS_N:
-					out.append("Business Edition ");
-					break;
-				case PRODUCT_STARTER:
-				case PRODUCT_STARTER_E:
-				case PRODUCT_STARTER_N:
-					out.append("Starter Edition ");
-					break;
-				}
-			}
+                switch (dwType)
+                {
+                case PRODUCT_ULTIMATE:
+                case PRODUCT_ULTIMATE_E:
+                case PRODUCT_ULTIMATE_N:
+                    out.append("Ultimate Edition ");
+                    break;
+                case PRODUCT_PROFESSIONAL:
+                case PRODUCT_PROFESSIONAL_E:
+                case PRODUCT_PROFESSIONAL_N:
+                    out.append("Professional Edition ");
+                    break;
+                case PRODUCT_HOME_BASIC:
+                case PRODUCT_HOME_BASIC_E:
+                case PRODUCT_HOME_BASIC_N:
+                    out.append("Home Basic Edition ");
+                    break;
+                case PRODUCT_HOME_PREMIUM:
+                case PRODUCT_HOME_PREMIUM_E:
+                case PRODUCT_HOME_PREMIUM_N:
+                    out.append("Home Premium Edition ");
+                    break;
+                case PRODUCT_ENTERPRISE:
+                case PRODUCT_ENTERPRISE_E:
+                case PRODUCT_ENTERPRISE_N:
+                    out.append("Enterprise Edition ");
+                    break;
+                case PRODUCT_BUSINESS:
+                case PRODUCT_BUSINESS_N:
+                    out.append("Business Edition ");
+                    break;
+                case PRODUCT_STARTER:
+                case PRODUCT_STARTER_E:
+                case PRODUCT_STARTER_N:
+                    out.append("Starter Edition ");
+                    break;
+                }
+            }
 #ifdef VER_SUITE_ENTERPRISE
-			else
-			if (osvi.wProductType == VER_NT_WORKSTATION)
-			{
+            else
+            if (osvi.wProductType == VER_NT_WORKSTATION)
+            {
 #ifndef __BORLANDC__
-				if( osvi.wSuiteMask & VER_SUITE_PERSONAL )
-					out.append("Personal ");
-				else
-					out.append("Professional ");
+                if( osvi.wSuiteMask & VER_SUITE_PERSONAL )
+                    out.append("Personal ");
+                else
+                    out.append("Professional ");
 #endif
-			}
-			else if (osvi.wProductType == VER_NT_SERVER)
-			{
-				if( osvi.wSuiteMask & VER_SUITE_DATACENTER )
-					out.append("DataCenter Server ");
-				else if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )
-					out.append("Advanced Server ");
-				else
-					out.append("Server ");
-			}
+            }
+            else if (osvi.wProductType == VER_NT_SERVER)
+            {
+                if( osvi.wSuiteMask & VER_SUITE_DATACENTER )
+                    out.append("DataCenter Server ");
+                else if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )
+                    out.append("Advanced Server ");
+                else
+                    out.append("Server ");
+            }
 #endif
-		}
-		else
-		{
-			HKEY hKey;
-			char szProductType[80];
-			DWORD dwBufLen;
+        }
+        else
+        {
+            HKEY hKey;
+            char szProductType[80];
+            DWORD dwBufLen;
 
-			RegOpenKeyEx( HKEY_LOCAL_MACHINE,
-					__TEXT("SYSTEM\\CurrentControlSet\\Control\\ProductOptions"),
-					0, KEY_QUERY_VALUE, &hKey );
-			RegQueryValueEx( hKey, __TEXT("ProductType"), NULL, NULL,
-					(LPBYTE) szProductType, &dwBufLen);
-			RegCloseKey( hKey );
+            RegOpenKeyEx( HKEY_LOCAL_MACHINE,
+                    __TEXT("SYSTEM\\CurrentControlSet\\Control\\ProductOptions"),
+                    0, KEY_QUERY_VALUE, &hKey );
+            RegQueryValueEx( hKey, __TEXT("ProductType"), NULL, NULL,
+                    (LPBYTE) szProductType, &dwBufLen);
+            RegCloseKey( hKey );
 
-			if (_strcmpi( "WINNT", szProductType) == 0 )
-				out.append("Professional ");
-			if (_strcmpi( "LANMANNT", szProductType) == 0)
-				out.append("Server ");
-			if (_strcmpi( "SERVERNT", szProductType) == 0)
-				out.append("Advanced Server ");
-		}
+            if (_strcmpi( "WINNT", szProductType) == 0 )
+                out.append("Professional ");
+            if (_strcmpi( "LANMANNT", szProductType) == 0)
+                out.append("Server ");
+            if (_strcmpi( "SERVERNT", szProductType) == 0)
+                out.append("Advanced Server ");
+        }
 
-		// Display version, service pack (if any), and build number.
+        // Display version, service pack (if any), and build number.
 
-		char tmp[255];
+        char tmp[255];
 
-		if (osvi.dwMajorVersion <= 4 )
-		{
-			sprintf(tmp, "version %ld.%ld %s (Build %ld)",
-					osvi.dwMajorVersion,
-					osvi.dwMinorVersion,
-					irr::core::stringc(osvi.szCSDVersion).c_str(),
-					osvi.dwBuildNumber & 0xFFFF);
-		}
-		else
-		{
-			sprintf(tmp, "%s (Build %ld)", irr::core::stringc(osvi.szCSDVersion).c_str(),
-			osvi.dwBuildNumber & 0xFFFF);
-		}
+        if (osvi.dwMajorVersion <= 4 )
+        {
+            sprintf(tmp, "version %ld.%ld %s (Build %ld)",
+                    osvi.dwMajorVersion,
+                    osvi.dwMinorVersion,
+                    irr::core::stringc(osvi.szCSDVersion).c_str(),
+                    osvi.dwBuildNumber & 0xFFFF);
+        }
+        else
+        {
+            sprintf(tmp, "%s (Build %ld)", irr::core::stringc(osvi.szCSDVersion).c_str(),
+            osvi.dwBuildNumber & 0xFFFF);
+        }
 
-		out.append(tmp);
-		break;
+        out.append(tmp);
+        break;
 
-	case VER_PLATFORM_WIN32_WINDOWS:
+    case VER_PLATFORM_WIN32_WINDOWS:
 
-		if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 0)
-		{
-			out.append("Microsoft Windows 95 ");
-			if ( osvi.szCSDVersion[1] == 'C' || osvi.szCSDVersion[1] == 'B' )
-				out.append("OSR2 " );
-		}
+        if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 0)
+        {
+            out.append("Microsoft Windows 95 ");
+            if ( osvi.szCSDVersion[1] == 'C' || osvi.szCSDVersion[1] == 'B' )
+                out.append("OSR2 " );
+        }
 
-		if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 10)
-		{
-			out.append("Microsoft Windows 98 ");
-			if ( osvi.szCSDVersion[1] == 'A' )
-				out.append( "SE " );
-		}
+        if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 10)
+        {
+            out.append("Microsoft Windows 98 ");
+            if ( osvi.szCSDVersion[1] == 'A' )
+                out.append( "SE " );
+        }
 
-		if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 90)
-			out.append("Microsoft Windows Me ");
+        if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 90)
+            out.append("Microsoft Windows Me ");
 
-		break;
+        break;
 
-	case VER_PLATFORM_WIN32s:
-		out.append("Microsoft Win32s ");
-		break;
-	}
+    case VER_PLATFORM_WIN32s:
+        out.append("Microsoft Win32s ");
+        break;
+    }
 }
 
 //! Notifies the device, that it has been resized
 void CIrrDeviceWin32::OnResized()
 {
-	Resized = true;
+    Resized = true;
 }
 
 //! Sets if the window should be resizable in windowed mode.
 void CIrrDeviceWin32::setResizable(bool resize)
 {
-	if (ExternalWindow || !getVideoDriver() || CreationParams.Fullscreen)
-		return;
+    if (ExternalWindow || !getVideoDriver() || CreationParams.Fullscreen)
+        return;
 
-	LONG_PTR style = WS_POPUP;
+    LONG_PTR style = WS_POPUP;
 
-	if (!resize)
-		style = WS_SYSMENU | WS_BORDER | WS_CAPTION | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
-	else
-		style = WS_THICKFRAME | WS_SYSMENU | WS_CAPTION | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
+    if (!resize)
+        style = WS_SYSMENU | WS_BORDER | WS_CAPTION | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+    else
+        style = WS_THICKFRAME | WS_SYSMENU | WS_CAPTION | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
 
-	if (!SetWindowLongPtr(HWnd, GWL_STYLE, style))
-		os::Printer::log("Could not change window style.");
+    if (!SetWindowLongPtr(HWnd, GWL_STYLE, style))
+        os::Printer::log("Could not change window style.");
 
-	RECT clientSize;
-	clientSize.top = 0;
-	clientSize.left = 0;
-	clientSize.right = getVideoDriver()->getScreenSize().Width;
-	clientSize.bottom = getVideoDriver()->getScreenSize().Height;
+    RECT clientSize;
+    clientSize.top = 0;
+    clientSize.left = 0;
+    clientSize.right = getVideoDriver()->getScreenSize().Width;
+    clientSize.bottom = getVideoDriver()->getScreenSize().Height;
 
-	AdjustWindowRect(&clientSize, style, FALSE);
+    AdjustWindowRect(&clientSize, style, FALSE);
 
-	const s32 realWidth = clientSize.right - clientSize.left;
-	const s32 realHeight = clientSize.bottom - clientSize.top;
+    const s32 realWidth = clientSize.right - clientSize.left;
+    const s32 realHeight = clientSize.bottom - clientSize.top;
 
-	const s32 windowLeft = (GetSystemMetrics(SM_CXSCREEN) - realWidth) / 2;
-	const s32 windowTop = (GetSystemMetrics(SM_CYSCREEN) - realHeight) / 2;
+    const s32 windowLeft = (GetSystemMetrics(SM_CXSCREEN) - realWidth) / 2;
+    const s32 windowTop = (GetSystemMetrics(SM_CYSCREEN) - realHeight) / 2;
 
-	SetWindowPos(HWnd, HWND_TOP, windowLeft, windowTop, realWidth, realHeight,
-		SWP_FRAMECHANGED | SWP_NOMOVE | SWP_SHOWWINDOW);
+    SetWindowPos(HWnd, HWND_TOP, windowLeft, windowTop, realWidth, realHeight,
+        SWP_FRAMECHANGED | SWP_NOMOVE | SWP_SHOWWINDOW);
 
-	static_cast<CCursorControl*>(CursorControl)->updateBorderSize(CreationParams.Fullscreen, resize);
+    static_cast<CCursorControl*>(CursorControl)->updateBorderSize(CreationParams.Fullscreen, resize);
 }
 
 
 //! Minimizes the window.
 void CIrrDeviceWin32::minimizeWindow()
 {
-	WINDOWPLACEMENT wndpl;
-	wndpl.length = sizeof(WINDOWPLACEMENT);
-	GetWindowPlacement(HWnd, &wndpl);
-	wndpl.showCmd = SW_SHOWMINNOACTIVE;
-	SetWindowPlacement(HWnd, &wndpl);
+    WINDOWPLACEMENT wndpl;
+    wndpl.length = sizeof(WINDOWPLACEMENT);
+    GetWindowPlacement(HWnd, &wndpl);
+    wndpl.showCmd = SW_SHOWMINNOACTIVE;
+    SetWindowPlacement(HWnd, &wndpl);
 }
 
 
 //! Maximizes the window.
 void CIrrDeviceWin32::maximizeWindow()
 {
-	WINDOWPLACEMENT wndpl;
-	wndpl.length = sizeof(WINDOWPLACEMENT);
-	GetWindowPlacement(HWnd, &wndpl);
-	wndpl.showCmd = SW_SHOWMAXIMIZED;
-	SetWindowPlacement(HWnd, &wndpl);
+    WINDOWPLACEMENT wndpl;
+    wndpl.length = sizeof(WINDOWPLACEMENT);
+    GetWindowPlacement(HWnd, &wndpl);
+    wndpl.showCmd = SW_SHOWMAXIMIZED;
+    SetWindowPlacement(HWnd, &wndpl);
 }
 
 
 //! Restores the window to its original size.
 void CIrrDeviceWin32::restoreWindow()
 {
-	WINDOWPLACEMENT wndpl;
-	wndpl.length = sizeof(WINDOWPLACEMENT);
-	GetWindowPlacement(HWnd, &wndpl);
-	wndpl.showCmd = SW_SHOWNORMAL;
-	SetWindowPlacement(HWnd, &wndpl);
+    WINDOWPLACEMENT wndpl;
+    wndpl.length = sizeof(WINDOWPLACEMENT);
+    GetWindowPlacement(HWnd, &wndpl);
+    wndpl.showCmd = SW_SHOWNORMAL;
+    SetWindowPlacement(HWnd, &wndpl);
 }
 
 
 bool CIrrDeviceWin32::activateJoysticks(core::array<SJoystickInfo> & joystickInfo)
 {
-	if (JoyControl)
-		return JoyControl->activateJoysticks(joystickInfo);
-	else
-		return false;
+    if (JoyControl)
+        return JoyControl->activateJoysticks(joystickInfo);
+    else
+        return false;
 }
 
 
 //! Set the current Gamma Value for the Display
 bool CIrrDeviceWin32::setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast )
 {
-	bool r;
-	u16 ramp[3][256];
+    bool r;
+    u16 ramp[3][256];
 
-	calculateGammaRamp( ramp[0], red, brightness, contrast );
-	calculateGammaRamp( ramp[1], green, brightness, contrast );
-	calculateGammaRamp( ramp[2], blue, brightness, contrast );
+    calculateGammaRamp( ramp[0], red, brightness, contrast );
+    calculateGammaRamp( ramp[1], green, brightness, contrast );
+    calculateGammaRamp( ramp[2], blue, brightness, contrast );
 
-	HDC dc = GetDC(0);
-	r = SetDeviceGammaRamp ( dc, ramp ) == TRUE;
-	ReleaseDC(HWnd, dc);
-	return r;
+    HDC dc = GetDC(0);
+    r = SetDeviceGammaRamp ( dc, ramp ) == TRUE;
+    ReleaseDC(HWnd, dc);
+    return r;
 }
 
 //! Get the current Gamma Value for the Display
 bool CIrrDeviceWin32::getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast )
 {
-	bool r;
-	u16 ramp[3][256];
+    bool r;
+    u16 ramp[3][256];
 
-	HDC dc = GetDC(0);
-	r = GetDeviceGammaRamp ( dc, ramp ) == TRUE;
-	ReleaseDC(HWnd, dc);
+    HDC dc = GetDC(0);
+    r = GetDeviceGammaRamp ( dc, ramp ) == TRUE;
+    ReleaseDC(HWnd, dc);
 
-	if ( r )
-	{
-		calculateGammaFromRamp(red, ramp[0]);
-		calculateGammaFromRamp(green, ramp[1]);
-		calculateGammaFromRamp(blue, ramp[2]);
-	}
+    if ( r )
+    {
+        calculateGammaFromRamp(red, ramp[0]);
+        calculateGammaFromRamp(green, ramp[1]);
+        calculateGammaFromRamp(blue, ramp[2]);
+    }
 
-	brightness = 0.f;
-	contrast = 0.f;
+    brightness = 0.f;
+    contrast = 0.f;
 
-	return r;
+    return r;
 
 }
 
@@ -1938,278 +1938,278 @@ bool CIrrDeviceWin32::getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &bright
 //! Process system events
 void CIrrDeviceWin32::handleSystemMessages()
 {
-	MSG msg;
+    MSG msg;
 
-	while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
-	{
-		// No message translation because we don't use WM_CHAR and it would conflict with our
-		// deadkey handling.
+    while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+    {
+        // No message translation because we don't use WM_CHAR and it would conflict with our
+        // deadkey handling.
 
-		TranslateMessage(&msg);
+        TranslateMessage(&msg);
 
-		if (ExternalWindow && msg.hwnd == HWnd)
-			WndProc(HWnd, msg.message, msg.wParam, msg.lParam);
-		else
-			DispatchMessage(&msg);
+        if (ExternalWindow && msg.hwnd == HWnd)
+            WndProc(HWnd, msg.message, msg.wParam, msg.lParam);
+        else
+            DispatchMessage(&msg);
 
-		if (msg.message == WM_QUIT)
-			Close = true;
-	}
+        if (msg.message == WM_QUIT)
+            Close = true;
+    }
 }
 
 
 //! Remove all messages pending in the system message loop
 void CIrrDeviceWin32::clearSystemMessages()
 {
-	MSG msg;
-	while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE))
-	{}
-	while (PeekMessage(&msg, NULL, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE))
-	{}
+    MSG msg;
+    while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE))
+    {}
+    while (PeekMessage(&msg, NULL, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE))
+    {}
 }
 
 // shows last error in a messagebox to help internal debugging.
 void CIrrDeviceWin32::ReportLastWinApiError()
 {
-	// (based on code from ovidiucucu from http://www.codeguru.com/forum/showthread.php?t=318721)
-	LPCTSTR pszCaption = __TEXT("Windows SDK Error Report");
-	DWORD dwError = GetLastError();
+    // (based on code from ovidiucucu from http://www.codeguru.com/forum/showthread.php?t=318721)
+    LPCTSTR pszCaption = __TEXT("Windows SDK Error Report");
+    DWORD dwError = GetLastError();
 
-	if(NOERROR == dwError)
-	{
-		MessageBox(NULL, __TEXT("No error"), pszCaption, MB_OK);
-	}
-	else
-	{
-		const DWORD dwFormatControl = FORMAT_MESSAGE_ALLOCATE_BUFFER |
-										FORMAT_MESSAGE_IGNORE_INSERTS |
-										FORMAT_MESSAGE_FROM_SYSTEM;
+    if(NOERROR == dwError)
+    {
+        MessageBox(NULL, __TEXT("No error"), pszCaption, MB_OK);
+    }
+    else
+    {
+        const DWORD dwFormatControl = FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                                        FORMAT_MESSAGE_IGNORE_INSERTS |
+                                        FORMAT_MESSAGE_FROM_SYSTEM;
 
-		LPVOID pTextBuffer = NULL;
-		DWORD dwCount = FormatMessage(dwFormatControl,
-										NULL,
-										dwError,
-										0,
-										(LPTSTR) &pTextBuffer,
-										0,
-										NULL);
-		if(0 != dwCount)
-		{
-			MessageBox(NULL, (LPCTSTR)pTextBuffer, pszCaption, MB_OK|MB_ICONERROR);
-			LocalFree(pTextBuffer);
-		}
-		else
-		{
-			MessageBox(NULL, __TEXT("Unknown error"), pszCaption, MB_OK|MB_ICONERROR);
-		}
-	}
+        LPVOID pTextBuffer = NULL;
+        DWORD dwCount = FormatMessage(dwFormatControl,
+                                        NULL,
+                                        dwError,
+                                        0,
+                                        (LPTSTR) &pTextBuffer,
+                                        0,
+                                        NULL);
+        if(0 != dwCount)
+        {
+            MessageBox(NULL, (LPCTSTR)pTextBuffer, pszCaption, MB_OK|MB_ICONERROR);
+            LocalFree(pTextBuffer);
+        }
+        else
+        {
+            MessageBox(NULL, __TEXT("Unknown error"), pszCaption, MB_OK|MB_ICONERROR);
+        }
+    }
 }
 
 // Convert an Irrlicht texture to a Windows cursor
 // Based on http://www.codeguru.com/cpp/w-p/win32/cursors/article.php/c4529/
 HCURSOR CIrrDeviceWin32::TextureToCursor(HWND hwnd, irr::video::ITexture * tex, const core::rect<s32>& sourceRect, const core::position2d<s32> &hotspot)
 {
-	//
-	// create the bitmaps needed for cursors from the texture
+    //
+    // create the bitmaps needed for cursors from the texture
 
-	HDC dc = GetDC(hwnd);
-	HDC andDc = CreateCompatibleDC(dc);
-	HDC xorDc = CreateCompatibleDC(dc);
-	HBITMAP andBitmap = CreateCompatibleBitmap(dc, sourceRect.getWidth(), sourceRect.getHeight());
-	HBITMAP xorBitmap = CreateCompatibleBitmap(dc, sourceRect.getWidth(), sourceRect.getHeight());
+    HDC dc = GetDC(hwnd);
+    HDC andDc = CreateCompatibleDC(dc);
+    HDC xorDc = CreateCompatibleDC(dc);
+    HBITMAP andBitmap = CreateCompatibleBitmap(dc, sourceRect.getWidth(), sourceRect.getHeight());
+    HBITMAP xorBitmap = CreateCompatibleBitmap(dc, sourceRect.getWidth(), sourceRect.getHeight());
 
-	HBITMAP oldAndBitmap = (HBITMAP)SelectObject(andDc, andBitmap);
-	HBITMAP oldXorBitmap = (HBITMAP)SelectObject(xorDc, xorBitmap);
+    HBITMAP oldAndBitmap = (HBITMAP)SelectObject(andDc, andBitmap);
+    HBITMAP oldXorBitmap = (HBITMAP)SelectObject(xorDc, xorBitmap);
 
 
-	video::ECOLOR_FORMAT format = tex->getColorFormat();
-	u32 bytesPerPixel = video::IImage::getBitsPerPixelFromFormat(format) / 8;
-	u32 bytesLeftGap = sourceRect.UpperLeftCorner.X * bytesPerPixel;
-	u32 bytesRightGap = tex->getPitch() - sourceRect.LowerRightCorner.X * bytesPerPixel;
-	const u8* data = (const u8*)tex->lock(video::ETLM_READ_ONLY, 0);
-	data += sourceRect.UpperLeftCorner.Y*tex->getPitch();
-	for ( s32 y = 0; y < sourceRect.getHeight(); ++y )
-	{
-		data += bytesLeftGap;
-		for ( s32 x = 0; x < sourceRect.getWidth(); ++x )
-		{
-			video::SColor pixelCol;
-			pixelCol.setData((const void*)data, format);
-			data += bytesPerPixel;
+    video::ECOLOR_FORMAT format = tex->getColorFormat();
+    u32 bytesPerPixel = video::IImage::getBitsPerPixelFromFormat(format) / 8;
+    u32 bytesLeftGap = sourceRect.UpperLeftCorner.X * bytesPerPixel;
+    u32 bytesRightGap = tex->getPitch() - sourceRect.LowerRightCorner.X * bytesPerPixel;
+    const u8* data = (const u8*)tex->lock(video::ETLM_READ_ONLY, 0);
+    data += sourceRect.UpperLeftCorner.Y*tex->getPitch();
+    for ( s32 y = 0; y < sourceRect.getHeight(); ++y )
+    {
+        data += bytesLeftGap;
+        for ( s32 x = 0; x < sourceRect.getWidth(); ++x )
+        {
+            video::SColor pixelCol;
+            pixelCol.setData((const void*)data, format);
+            data += bytesPerPixel;
 
-			if ( pixelCol.getAlpha() == 0 )	// transparent
-			{
-				SetPixel(andDc, x, y, RGB(255,255,255));
-				SetPixel(xorDc, x, y, RGB(0,0,0));
-			}
-			else	// color
-			{
-				SetPixel(andDc, x, y, RGB(0,0,0));
-				SetPixel(xorDc, x, y, RGB(pixelCol.getRed(), pixelCol.getGreen(), pixelCol.getBlue()));
-			}
-		}
-		data += bytesRightGap;
-	}
-	tex->unlock();
+            if ( pixelCol.getAlpha() == 0 )   // transparent
+            {
+                SetPixel(andDc, x, y, RGB(255,255,255));
+                SetPixel(xorDc, x, y, RGB(0,0,0));
+            }
+            else   // color
+            {
+                SetPixel(andDc, x, y, RGB(0,0,0));
+                SetPixel(xorDc, x, y, RGB(pixelCol.getRed(), pixelCol.getGreen(), pixelCol.getBlue()));
+            }
+        }
+        data += bytesRightGap;
+    }
+    tex->unlock();
 
-	SelectObject(andDc, oldAndBitmap);
-	SelectObject(xorDc, oldXorBitmap);
+    SelectObject(andDc, oldAndBitmap);
+    SelectObject(xorDc, oldXorBitmap);
 
-	DeleteDC(xorDc);
-	DeleteDC(andDc);
+    DeleteDC(xorDc);
+    DeleteDC(andDc);
 
-	ReleaseDC(hwnd, dc);
+    ReleaseDC(hwnd, dc);
 
-	// create the cursor
+    // create the cursor
 
-	ICONINFO iconinfo;
-	iconinfo.fIcon = false;	// type is cursor not icon
-	iconinfo.xHotspot = hotspot.X;
-	iconinfo.yHotspot = hotspot.Y;
-	iconinfo.hbmMask = andBitmap;
-	iconinfo.hbmColor = xorBitmap;
+    ICONINFO iconinfo;
+    iconinfo.fIcon = false;   // type is cursor not icon
+    iconinfo.xHotspot = hotspot.X;
+    iconinfo.yHotspot = hotspot.Y;
+    iconinfo.hbmMask = andBitmap;
+    iconinfo.hbmColor = xorBitmap;
 
-	HCURSOR cursor = CreateIconIndirect(&iconinfo);
+    HCURSOR cursor = CreateIconIndirect(&iconinfo);
 
-	DeleteObject(andBitmap);
-	DeleteObject(xorBitmap);
+    DeleteObject(andBitmap);
+    DeleteObject(xorBitmap);
 
-	return cursor;
+    return cursor;
 }
 
 
 CIrrDeviceWin32::CCursorControl::CCursorControl(CIrrDeviceWin32* device, const core::dimension2d<u32>& wsize, HWND hwnd, bool fullscreen)
-	: Device(device), WindowSize(wsize), InvWindowSize(0.0f, 0.0f),
-		HWnd(hwnd), BorderX(0), BorderY(0),
-		UseReferenceRect(false), IsVisible(true)
-		, ActiveIcon(gui::ECI_NORMAL), ActiveIconStartTime(0)
+    : Device(device), WindowSize(wsize), InvWindowSize(0.0f, 0.0f),
+        HWnd(hwnd), BorderX(0), BorderY(0),
+        UseReferenceRect(false), IsVisible(true)
+        , ActiveIcon(gui::ECI_NORMAL), ActiveIconStartTime(0)
 {
-	if (WindowSize.Width!=0)
-		InvWindowSize.Width = 1.0f / WindowSize.Width;
+    if (WindowSize.Width!=0)
+        InvWindowSize.Width = 1.0f / WindowSize.Width;
 
-	if (WindowSize.Height!=0)
-		InvWindowSize.Height = 1.0f / WindowSize.Height;
+    if (WindowSize.Height!=0)
+        InvWindowSize.Height = 1.0f / WindowSize.Height;
 
-	updateBorderSize(fullscreen, false);
-	initCursors();
+    updateBorderSize(fullscreen, false);
+    initCursors();
 }
 
 CIrrDeviceWin32::CCursorControl::~CCursorControl()
 {
-	for ( u32 i=0; i < Cursors.size(); ++i )
-	{
-		for ( u32 f=0; f < Cursors[i].Frames.size(); ++f )
-		{
-			DestroyCursor(Cursors[i].Frames[f].IconHW);
-		}
-	}
+    for ( u32 i=0; i < Cursors.size(); ++i )
+    {
+        for ( u32 f=0; f < Cursors[i].Frames.size(); ++f )
+        {
+            DestroyCursor(Cursors[i].Frames[f].IconHW);
+        }
+    }
 }
 
 
 void CIrrDeviceWin32::CCursorControl::initCursors()
 {
-	Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_ARROW)) );
-	Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_CROSS)) );
-	Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_HAND)) );
-	Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_HELP)) );
-	Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_IBEAM)) );
-	Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_NO)) );
-	Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_WAIT)) );
-	Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_SIZEALL)) );
-	Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_SIZENESW)) );
-	Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_SIZENWSE)) );
-	Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_SIZENS)) );
-	Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_SIZEWE)) );
-	Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_UPARROW)) );
+    Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_ARROW)) );
+    Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_CROSS)) );
+    Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_HAND)) );
+    Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_HELP)) );
+    Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_IBEAM)) );
+    Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_NO)) );
+    Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_WAIT)) );
+    Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_SIZEALL)) );
+    Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_SIZENESW)) );
+    Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_SIZENWSE)) );
+    Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_SIZENS)) );
+    Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_SIZEWE)) );
+    Cursors.push_back( CursorW32(LoadCursor(NULL, IDC_UPARROW)) );
 }
 
 
 void CIrrDeviceWin32::CCursorControl::update()
 {
-	if ( !Cursors[ActiveIcon].Frames.empty() && Cursors[ActiveIcon].FrameTime )
-	{
-		// update animated cursors. This could also be done by X11 in case someone wants to figure that out (this way was just easier to implement)
-		u32 now = Device->getTimer()->getRealTime();
-		u32 frame = ((now - ActiveIconStartTime) / Cursors[ActiveIcon].FrameTime) % Cursors[ActiveIcon].Frames.size();
-		SetCursor( Cursors[ActiveIcon].Frames[frame].IconHW );
-	}
+    if ( !Cursors[ActiveIcon].Frames.empty() && Cursors[ActiveIcon].FrameTime )
+    {
+        // update animated cursors. This could also be done by X11 in case someone wants to figure that out (this way was just easier to implement)
+        u32 now = Device->getTimer()->getRealTime();
+        u32 frame = ((now - ActiveIconStartTime) / Cursors[ActiveIcon].FrameTime) % Cursors[ActiveIcon].Frames.size();
+        SetCursor( Cursors[ActiveIcon].Frames[frame].IconHW );
+    }
 }
 
 //! Sets the active cursor icon
 void CIrrDeviceWin32::CCursorControl::setActiveIcon(gui::ECURSOR_ICON iconId)
 {
-	if ( iconId >= (s32)Cursors.size() )
-		return;
+    if ( iconId >= (s32)Cursors.size() )
+        return;
 
-	ActiveIcon = iconId;
-	ActiveIconStartTime = Device->getTimer()->getRealTime();
-	if ( Cursors[ActiveIcon].Frames.size() )
-		SetCursor( Cursors[ActiveIcon].Frames[0].IconHW );
+    ActiveIcon = iconId;
+    ActiveIconStartTime = Device->getTimer()->getRealTime();
+    if ( Cursors[ActiveIcon].Frames.size() )
+        SetCursor( Cursors[ActiveIcon].Frames[0].IconHW );
 }
 
 
 //! Add a custom sprite as cursor icon.
 gui::ECURSOR_ICON CIrrDeviceWin32::CCursorControl::addIcon(const gui::SCursorSprite& icon)
 {
-	if ( icon.SpriteId >= 0 )
-	{
-		CursorW32 cW32;
-		cW32.FrameTime = icon.SpriteBank->getSprites()[icon.SpriteId].frameTime;
+    if ( icon.SpriteId >= 0 )
+    {
+        CursorW32 cW32;
+        cW32.FrameTime = icon.SpriteBank->getSprites()[icon.SpriteId].frameTime;
 
-		for ( u32 i=0; i < icon.SpriteBank->getSprites()[icon.SpriteId].Frames.size(); ++i )
-		{
-			irr::u32 texId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].textureNumber;
-			irr::u32 rectId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].rectNumber;
-			irr::core::rect<s32> rectIcon = icon.SpriteBank->getPositions()[rectId];
+        for ( u32 i=0; i < icon.SpriteBank->getSprites()[icon.SpriteId].Frames.size(); ++i )
+        {
+            irr::u32 texId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].textureNumber;
+            irr::u32 rectId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].rectNumber;
+            irr::core::rect<s32> rectIcon = icon.SpriteBank->getPositions()[rectId];
 
-			HCURSOR hc = Device->TextureToCursor(HWnd, icon.SpriteBank->getTexture(texId), rectIcon, icon.HotSpot);
-			cW32.Frames.push_back( CursorFrameW32(hc) );
-		}
+            HCURSOR hc = Device->TextureToCursor(HWnd, icon.SpriteBank->getTexture(texId), rectIcon, icon.HotSpot);
+            cW32.Frames.push_back( CursorFrameW32(hc) );
+        }
 
-		Cursors.push_back( cW32 );
-		return (gui::ECURSOR_ICON)(Cursors.size() - 1);
-	}
-	return gui::ECI_NORMAL;
+        Cursors.push_back( cW32 );
+        return (gui::ECURSOR_ICON)(Cursors.size() - 1);
+    }
+    return gui::ECI_NORMAL;
 }
 
 
 //! replace the given cursor icon.
 void CIrrDeviceWin32::CCursorControl::changeIcon(gui::ECURSOR_ICON iconId, const gui::SCursorSprite& icon)
 {
-	if ( iconId >= (s32)Cursors.size() )
-		return;
+    if ( iconId >= (s32)Cursors.size() )
+        return;
 
-	for ( u32 i=0; i < Cursors[iconId].Frames.size(); ++i )
-		DestroyCursor(Cursors[iconId].Frames[i].IconHW);
+    for ( u32 i=0; i < Cursors[iconId].Frames.size(); ++i )
+        DestroyCursor(Cursors[iconId].Frames[i].IconHW);
 
-	if ( icon.SpriteId >= 0 )
-	{
-		CursorW32 cW32;
-		cW32.FrameTime = icon.SpriteBank->getSprites()[icon.SpriteId].frameTime;
-		for ( u32 i=0; i < icon.SpriteBank->getSprites()[icon.SpriteId].Frames.size(); ++i )
-		{
-			irr::u32 texId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].textureNumber;
-			irr::u32 rectId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].rectNumber;
-			irr::core::rect<s32> rectIcon = icon.SpriteBank->getPositions()[rectId];
+    if ( icon.SpriteId >= 0 )
+    {
+        CursorW32 cW32;
+        cW32.FrameTime = icon.SpriteBank->getSprites()[icon.SpriteId].frameTime;
+        for ( u32 i=0; i < icon.SpriteBank->getSprites()[icon.SpriteId].Frames.size(); ++i )
+        {
+            irr::u32 texId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].textureNumber;
+            irr::u32 rectId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].rectNumber;
+            irr::core::rect<s32> rectIcon = icon.SpriteBank->getPositions()[rectId];
 
-			HCURSOR hc = Device->TextureToCursor(HWnd, icon.SpriteBank->getTexture(texId), rectIcon, icon.HotSpot);
-			cW32.Frames.push_back( CursorFrameW32(hc) );
-		}
+            HCURSOR hc = Device->TextureToCursor(HWnd, icon.SpriteBank->getTexture(texId), rectIcon, icon.HotSpot);
+            cW32.Frames.push_back( CursorFrameW32(hc) );
+        }
 
-		Cursors[iconId] = cW32;
-	}
+        Cursors[iconId] = cW32;
+    }
 }
 
 
 //! Return a system-specific size which is supported for cursors. Larger icons will fail, smaller icons might work.
 core::dimension2di CIrrDeviceWin32::CCursorControl::getSupportedIconSize() const
 {
-	core::dimension2di result;
+    core::dimension2di result;
 
-	result.Width = GetSystemMetrics(SM_CXCURSOR);
-	result.Height = GetSystemMetrics(SM_CYCURSOR);
+    result.Width = GetSystemMetrics(SM_CXCURSOR);
+    result.Height = GetSystemMetrics(SM_CYCURSOR);
 
-	return result;
+    return result;
 }
 
 

From cc6a1a39093a71ab7b3ca5dbbf2482123f2ffc53 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 1 Aug 2017 17:48:18 +1000
Subject: [PATCH 009/125] Started to add XInput support (to be able to
 distinguish the two triggers).

---
 .../source/Irrlicht/CIrrDeviceWin32.cpp       | 106 +++++++++++++-----
 1 file changed, 78 insertions(+), 28 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
index c17da02b2..168f6fb82 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -31,6 +31,7 @@
 #ifdef _MSC_VER
 #pragma comment(lib, "winmm.lib")
 #endif
+#include <Xinput.h>
 #endif
 #endif
 
@@ -80,6 +81,8 @@ struct SJoystickWin32Control
 #else
         JOYCAPS Caps;
 #endif
+        /** For xbox-360 controller. */
+        bool m_use_xinput;
     };
     core::array<JoystickInfo> ActiveJoysticks;
 #endif
@@ -194,10 +197,11 @@ struct SJoystickWin32Control
 
 void pollJoysticks()
 {
+    if (0 == ActiveJoysticks.size())
+        return;
+
 #if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
 #ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
-    if(0 == ActiveJoysticks.size())
-        return;
 
     u32 joystick;
     DIJOYSTATE2 info;
@@ -295,28 +299,45 @@ void pollJoysticks()
         }
     }
 #else
-    if (0 == ActiveJoysticks.size())
-        return;
-
     u32 joystick;
-    JOYINFOEX info;
 
     for(joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
     {
-        // needs to be reset for each joystick
-        // request ALL values and POV as continuous if possible
-        info.dwSize = sizeof(info);
-        info.dwFlags = JOY_RETURNALL|JOY_RETURNPOVCTS;
-        const JOYCAPS & caps = ActiveJoysticks[joystick].Caps;
-        // if no POV is available don't ask for POV values
-        if (!(caps.wCaps & JOYCAPS_HASPOV))
-            info.dwFlags &= ~(JOY_RETURNPOV|JOY_RETURNPOVCTS);
-        if(JOYERR_NOERROR == joyGetPosEx(ActiveJoysticks[joystick].Index, &info))
-        {
-            SEvent event;
+        SEvent event;
+
+        event.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
+        event.JoystickEvent.Joystick = (u8)joystick;
+        for (int axis = 0; axis < SEvent::SJoystickEvent::NUMBER_OF_AXES; ++axis)
+            event.JoystickEvent.Axis[axis] = 0;
+
+        if (ActiveJoysticks[joystick].m_use_xinput)
+        {
+            XINPUT_STATE state;
+            memset(&state, 0, sizeof(state));
+            DWORD result = XInputGetState(joystick, &state);
+            event.JoystickEvent.ButtonStates = state.Gamepad.wButtons;
+            // Thumb values are in [-32768, 32767]
+            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_V] = state.Gamepad.sThumbRX;
+            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_X] = state.Gamepad.sThumbRY;
+            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Y] = state.Gamepad.sThumbLX;
+            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Z] = state.Gamepad.sThumbLY;
+            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_R] = state.Gamepad.bLeftTrigger*128;
+            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_U] = state.Gamepad.bRightTrigger*128;
+        }
+        else   // old API
+        { 
+            JOYINFOEX info;
+            // needs to be reset for each joystick
+            // request ALL values and POV as continuous if possible
+            info.dwSize = sizeof(info);
+            info.dwFlags = JOY_RETURNALL | JOY_RETURNPOVCTS;
+            const JOYCAPS & caps = ActiveJoysticks[joystick].Caps;
+            // if no POV is available don't ask for POV values
+            if (!(caps.wCaps & JOYCAPS_HASPOV))
+                info.dwFlags &= ~(JOY_RETURNPOV | JOY_RETURNPOVCTS);
+            if (joyGetPosEx(ActiveJoysticks[joystick].Index, &info) != JOYERR_NOERROR)
+                continue;
 
-            event.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
-            event.JoystickEvent.Joystick = (u8)joystick;
 
             event.JoystickEvent.POV = (u16)info.dwPOV;
             // set to undefined if no POV value was returned or the value
@@ -324,9 +345,6 @@ void pollJoysticks()
             if (!(info.dwFlags & JOY_RETURNPOV) || (event.JoystickEvent.POV > 35900))
                 event.JoystickEvent.POV = 65535;
 
-            for(int axis = 0; axis < SEvent::SJoystickEvent::NUMBER_OF_AXES; ++axis)
-                event.JoystickEvent.Axis[axis] = 0;
-
             event.JoystickEvent.ButtonStates = info.dwButtons;
 
             switch(caps.wNumAxes)
@@ -355,11 +373,10 @@ void pollJoysticks()
             case 1:
                 event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_X] =
                     (s16)((65535 * (info.dwXpos - caps.wXmin)) / (caps.wXmax - caps.wXmin) - 32768);
-            }
-
-            (void)Device->postEventFromUser(event);
-        }
-    }
+            }   // switch
+        }   // if XInput ... else
+        (void)Device->postEventFromUser(event);
+    }   // for all joysticks
 #endif
 #endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
 }
@@ -449,6 +466,7 @@ bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo)
     joystickInfo.clear();
     ActiveJoysticks.clear();
 
+    // This number includes XInput and legacy devices
     const u32 numberOfJoysticks = ::joyGetNumDevs();
     JOYINFOEX info;
     info.dwSize = sizeof(info);
@@ -460,7 +478,34 @@ bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo)
     joystickInfo.reallocate(numberOfJoysticks);
     ActiveJoysticks.reallocate(numberOfJoysticks);
 
+    // First discover all Xbox 360 controllers, which need to use
+    // XInput to get the state (otherwise the two triggers can not
+    // be used at the same time).
     u32 joystick = 0;
+    for (int i = 0; i < XUSER_MAX_COUNT; i++)
+    {
+        XINPUT_STATE state;
+        memset(&state, 0, sizeof(state));
+
+        DWORD result = XInputGetState(i, &state);
+        // Not connected or not an XInput device
+        if (result != ERROR_SUCCESS) continue;
+
+        activeJoystick.Index = i;
+        activeJoystick.m_use_xinput = true;
+        ActiveJoysticks.push_back(activeJoystick);
+
+        // This information is returned to the calling program
+        SJoystickInfo joy_info;
+        // 2 sticks with 2 directions each plus two triggers
+        joy_info.Axes           = 6;
+        joy_info.Buttons        = 30;
+        joy_info.Name           = "XBOX 360 Gamepad";
+        joy_info.HasGenericName = false;
+        joy_info.PovHat         = SJoystickInfo::POV_HAT_PRESENT;
+        joystickInfo.push_back(joy_info);
+    }   // for i < XUSER_MAX_COUNT
+
     for(; joystick < numberOfJoysticks; ++joystick)
     {
         if(JOYERR_NOERROR == joyGetPosEx(joystick, &info)
@@ -469,12 +514,17 @@ bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo)
                                             &activeJoystick.Caps,
                                             sizeof(activeJoystick.Caps)))
         {
+            setJoystickName(joystick, activeJoystick.Caps, &returnInfo);
+            core::stringc low_name = returnInfo.Name.make_lower();
+            // Ignore xbox controller, which are handled using XInput above
+            if (low_name.find("xbox") != -1) continue;
+            
             activeJoystick.Index = joystick;
+            activeJoystick.m_use_xinput = false;
             ActiveJoysticks.push_back(activeJoystick);
             returnInfo.Joystick = (u8)joystick;
             returnInfo.Axes = activeJoystick.Caps.wNumAxes;
             returnInfo.Buttons = activeJoystick.Caps.wNumButtons;
-            setJoystickName(joystick, activeJoystick.Caps, &returnInfo);
             returnInfo.PovHat = ((activeJoystick.Caps.wCaps & JOYCAPS_HASPOV) == JOYCAPS_HASPOV)
                                 ? SJoystickInfo::POV_HAT_PRESENT : SJoystickInfo::POV_HAT_ABSENT;
 

From 1e5d2643beef2c737cc4d27c9add2b8644ba7dd4 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 2 Aug 2017 08:13:04 +1000
Subject: [PATCH 010/125] Bugfix: incorrect index.

---
 lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
index 168f6fb82..2138ab7c2 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -314,7 +314,7 @@ void pollJoysticks()
         {
             XINPUT_STATE state;
             memset(&state, 0, sizeof(state));
-            DWORD result = XInputGetState(joystick, &state);
+            DWORD result = XInputGetState(ActiveJoysticks[joystick].Index, &state);
             event.JoystickEvent.ButtonStates = state.Gamepad.wButtons;
             // Thumb values are in [-32768, 32767]
             event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_V] = state.Gamepad.sThumbRX;

From 22208365d22ef4b00fb74a871585b1151f653023 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 2 Aug 2017 08:13:24 +1000
Subject: [PATCH 011/125] Switch to direct input for joystick handling.

---
 lib/irrlicht/include/IrrCompileConfig.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/irrlicht/include/IrrCompileConfig.h b/lib/irrlicht/include/IrrCompileConfig.h
index ccfd280e4..d262a9954 100644
--- a/lib/irrlicht/include/IrrCompileConfig.h
+++ b/lib/irrlicht/include/IrrCompileConfig.h
@@ -168,7 +168,7 @@ headers, e.g. Summer 2004.  This is a Microsoft issue, not an Irrlicht one.
 //! Define _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_ if you want to use DirectInput for joystick handling.
 /** This only applies to Windows devices, currently only supported under Win32 device.
 If not defined, Windows Multimedia library is used, which offers also broad support for joystick devices. */
-#undef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
+#define _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
 #ifdef NO_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
 #undef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
 #endif

From f3a962c391db3e0dcddaea1d9f483c7e089250c5 Mon Sep 17 00:00:00 2001
From: Geoffrey Mon <geofbot@gmail.com>
Date: Wed, 2 Aug 2017 12:49:14 -0400
Subject: [PATCH 012/125] Save and use usernames in replay files

Fixes #2754.

* Store usernames of each racer in recorded replay files
* Display those usernames in a column of the replay selection UI
  and in race result dialogs
* RaceResultGUI::getKartDisplayName functionality moved into
  Controller::getName
---
 src/karts/controller/controller.hpp           | 10 ++++---
 src/karts/controller/ghost_controller.cpp     |  3 ++-
 src/karts/controller/ghost_controller.hpp     |  6 ++++-
 src/replay/replay_base.hpp                    |  2 +-
 src/replay/replay_play.cpp                    | 18 +++++++++----
 src/replay/replay_play.hpp                    | 24 ++++++++++-------
 src/replay/replay_recorder.cpp                | 10 ++++---
 src/states_screens/ghost_replay_selection.cpp |  6 +++++
 src/states_screens/race_result_gui.cpp        | 27 ++-----------------
 src/states_screens/race_result_gui.hpp        |  1 -
 10 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/src/karts/controller/controller.hpp b/src/karts/controller/controller.hpp
index 747f9cc0c..98403badf 100644
--- a/src/karts/controller/controller.hpp
+++ b/src/karts/controller/controller.hpp
@@ -28,9 +28,9 @@ using namespace irr;
   */
 
 #include "input/input.hpp"
+#include "karts/abstract_kart.hpp"
 #include "states_screens/state_manager.hpp"
 
-class AbstractKart;
 class Item;
 class KartControl;
 class Material;
@@ -100,17 +100,19 @@ public:
     /** Only local players can get achievements. */
     virtual bool  canGetAchievements () const { return false; }
     // ------------------------------------------------------------------------
-    /** This should only be called for End- and LocalPlayer-Controller. */
+    /** Display name of the controller.
+     *  Defaults to kart name; overriden by controller classes
+     *  (such as player controllers) to display username. */
     virtual core::stringw getName() const
     {
-        assert(false);
-        return core::stringw(""); 
+        return translations->fribidize(m_kart->getName());
     }   // getName
     // ------------------------------------------------------------------------
     /** Returns the kart controlled by this controller. */
     AbstractKart *getKart() const { return m_kart; }
 };   // Controller
 
+extern Translations* translations;
 #endif
 
 /* EOF */
diff --git a/src/karts/controller/ghost_controller.cpp b/src/karts/controller/ghost_controller.cpp
index ce9fa8d96..99a4c8475 100644
--- a/src/karts/controller/ghost_controller.cpp
+++ b/src/karts/controller/ghost_controller.cpp
@@ -21,9 +21,10 @@
 #include "karts/controller/kart_control.hpp"
 #include "modes/world.hpp"
 
-GhostController::GhostController(AbstractKart *kart)
+GhostController::GhostController(AbstractKart *kart, core::stringw display_name)
                 : Controller(kart)
 {
+    m_display_name = display_name;
 }   // GhostController
 
 //-----------------------------------------------------------------------------
diff --git a/src/karts/controller/ghost_controller.hpp b/src/karts/controller/ghost_controller.hpp
index c0eb462f9..c78b4b454 100644
--- a/src/karts/controller/ghost_controller.hpp
+++ b/src/karts/controller/ghost_controller.hpp
@@ -37,11 +37,14 @@ private:
     /** The current world time. */
     float m_current_time;
 
+    /** Player name of the ghost kart. */
+    core::stringw m_display_name;
+
     /** The list of the times at which the events of kart were reached. */
     std::vector<float> m_all_times;
 
 public:
-             GhostController(AbstractKart *kart);
+             GhostController(AbstractKart *kart, core::stringw display_name);
     virtual ~GhostController() {};
     virtual void reset() OVERRIDE;
     virtual void update (float dt) OVERRIDE;
@@ -73,6 +76,7 @@ public:
     unsigned int getCurrentReplayIndex() const
                                                    { return m_current_index; }
     // ------------------------------------------------------------------------
+    core::stringw getName() const OVERRIDE { return m_display_name; }
 };   // GhostController
 
 #endif
diff --git a/src/replay/replay_base.hpp b/src/replay/replay_base.hpp
index 2d7f8b408..0655d2daf 100644
--- a/src/replay/replay_base.hpp
+++ b/src/replay/replay_base.hpp
@@ -81,7 +81,7 @@ protected:
     /** Returns the version number of the replay file. This is used to check
      *  that a loaded replay file can still be understood by this
      *  executable. */
-    unsigned int getReplayVersion() const { return 3; }
+    unsigned int getReplayVersion() const { return 4; }
 
 public:
              ReplayBase();
diff --git a/src/replay/replay_play.cpp b/src/replay/replay_play.cpp
index cc998ae74..942f07175 100644
--- a/src/replay/replay_play.cpp
+++ b/src/replay/replay_play.cpp
@@ -135,13 +135,20 @@ bool ReplayPlay::addReplayFile(const std::string& fn, bool custom_replay)
         is_end.trim();
         if (is_end == "kart_list_end") break;
         char s1[1024];
+        char display_name_encoded[1024];
 
-        if (sscanf(s,"kart: %s", s1) != 1)
+        if (sscanf(s,"kart: %s %[^\n]", s1, display_name_encoded) != 2)
         {
             Log::warn("Replay", "Could not read ghost karts info!");
             break;
         }
         rd.m_kart_list.push_back(std::string(s1));
+        rd.m_name_list.push_back(StringUtils::xmlDecode(std::string(display_name_encoded)));
+
+        if (rd.m_name_list.size() == 1) {
+            // First user is the game master and the "owner" of this replay file
+            rd.m_user_name = rd.m_name_list[0];
+        }
     }
 
     int reverse = 0;
@@ -249,11 +256,12 @@ void ReplayPlay::readKartData(FILE *fd, char *next_line)
 {
     char s[1024];
     const unsigned int kart_num = m_ghost_karts.size();
-    m_ghost_karts.push_back(new GhostKart(m_replay_file_list
-        [m_current_replay_file].m_kart_list.at(kart_num),
-        kart_num, kart_num + 1));
+    ReplayData &rd = m_replay_file_list[m_current_replay_file];
+    m_ghost_karts.push_back(new GhostKart(rd.m_kart_list.at(kart_num),
+                                          kart_num, kart_num + 1));
     m_ghost_karts[kart_num].init(RaceManager::KT_GHOST);
-    Controller* controller = new GhostController(getGhostKart(kart_num));
+    Controller* controller = new GhostController(getGhostKart(kart_num),
+                                                 rd.m_name_list[kart_num]);
     getGhostKart(kart_num)->setController(controller);
 
     unsigned int size;
diff --git a/src/replay/replay_play.hpp b/src/replay/replay_play.hpp
index c589c7fc2..04b6ed7b4 100644
--- a/src/replay/replay_play.hpp
+++ b/src/replay/replay_play.hpp
@@ -45,20 +45,23 @@ public:
         SO_KART_NUM,
         SO_DIFF,
         SO_LAPS,
-        SO_TIME
+        SO_TIME,
+        SO_USER
     };
 
     class ReplayData
     {
     public:
-        std::string              m_filename;
-        std::string              m_track_name;
-        std::vector<std::string> m_kart_list;
-        bool                     m_reverse;
-        bool                     m_custom_replay_file;
-        unsigned int             m_difficulty;
-        unsigned int             m_laps;
-        float                    m_min_time;
+        std::string                m_filename;
+        std::string                m_track_name;
+        core::stringw              m_user_name;
+        std::vector<std::string>   m_kart_list;
+        std::vector<core::stringw> m_name_list;
+        bool                       m_reverse;
+        bool                       m_custom_replay_file;
+        unsigned int               m_difficulty;
+        unsigned int               m_laps;
+        float                      m_min_time;
 
         bool operator < (const ReplayData& r) const
         {
@@ -82,6 +85,9 @@ public:
                 case SO_TIME:
                     return m_min_time < r.m_min_time;
                     break;
+                case SO_USER:
+                    return m_user_name < r.m_user_name;
+                    break;
             }   // switch
             return true;
         }   // operator <
diff --git a/src/replay/replay_recorder.cpp b/src/replay/replay_recorder.cpp
index 4a1c986e2..e94a111e4 100644
--- a/src/replay/replay_recorder.cpp
+++ b/src/replay/replay_recorder.cpp
@@ -31,6 +31,7 @@
 #include <algorithm>
 #include <stdio.h>
 #include <string>
+#include <karts/controller/player_controller.hpp>
 
 ReplayRecorder *ReplayRecorder::m_replay_recorder = NULL;
 
@@ -222,9 +223,12 @@ void ReplayRecorder::save()
     fprintf(fd, "version: %d\n",    getReplayVersion());
     for (unsigned int real_karts = 0; real_karts < num_karts; real_karts++)
     {
-        if (world->getKart(real_karts)->isGhostKart()) continue;
-        fprintf(fd, "kart: %s\n",
-            world->getKart(real_karts)->getIdent().c_str());
+        const AbstractKart *kart = world->getKart(real_karts);
+        if (kart->isGhostKart()) continue;
+
+        // XML encode the username to handle Unicode
+        fprintf(fd, "kart: %s %s\n", kart->getIdent().c_str(),
+                StringUtils::xmlEncode(kart->getController()->getName()).c_str());
     }
 
     fprintf(fd, "kart_list_end\n");
diff --git a/src/states_screens/ghost_replay_selection.cpp b/src/states_screens/ghost_replay_selection.cpp
index 7828efc4a..92fe70882 100644
--- a/src/states_screens/ghost_replay_selection.cpp
+++ b/src/states_screens/ghost_replay_selection.cpp
@@ -80,6 +80,7 @@ void GhostReplaySelection::beforeAddingWidget()
     m_replay_list_widget->addColumn( _("Difficulty"), 1);
     m_replay_list_widget->addColumn( _("Laps"), 1);
     m_replay_list_widget->addColumn( _("Finish Time"), 1);
+    m_replay_list_widget->addColumn( _("User"), 1);
 }   // beforeAddingWidget
 
 // ----------------------------------------------------------------------------
@@ -122,6 +123,8 @@ void GhostReplaySelection::loadList()
             (StringUtils::toWString(rd.m_laps), -1, 1, true));
         row.push_back(GUIEngine::ListWidget::ListCell
             (StringUtils::toWString(rd.m_min_time) + L"s", -1, 1, true));
+        row.push_back(GUIEngine::ListWidget::ListCell
+            (rd.m_user_name, -1, 1, true));
         m_replay_list_widget->addItem(StringUtils::toString(i), row);
     }
 }   // loadList
@@ -213,6 +216,9 @@ void GhostReplaySelection::onColumnClicked(int column_id)
         case 5:
             ReplayPlay::setSortOrder(ReplayPlay::SO_TIME);
             break;
+        case 6:
+            ReplayPlay::setSortOrder(ReplayPlay::SO_USER);
+            break;
         default:
             assert(0);
             break;
diff --git a/src/states_screens/race_result_gui.cpp b/src/states_screens/race_result_gui.cpp
index 7aee51f4f..0a1b65ec6 100644
--- a/src/states_screens/race_result_gui.cpp
+++ b/src/states_screens/race_result_gui.cpp
@@ -486,7 +486,7 @@ void RaceResultGUI::backToLobby()
             // Save a pointer to the current row_info entry
             RowInfo *ri = &(m_all_row_infos[position - first_position]);
             ri->m_is_player_kart = kart->getController()->isLocalPlayerController();
-            ri->m_kart_name = getKartDisplayName(kart);
+            ri->m_kart_name = kart->getController()->getName();
 
             video::ITexture *icon =
                 kart->getKartProperties()->getIconMaterial()->getTexture();
@@ -855,7 +855,7 @@ void RaceResultGUI::backToLobby()
             ri->m_kart_icon =
                 kart->getKartProperties()->getIconMaterial()->getTexture();
             ri->m_is_player_kart = kart->getController()->isLocalPlayerController();
-            ri->m_kart_name = getKartDisplayName(kart);
+            ri->m_kart_name = kart->getController()->getName();
 
             // In FTL karts do have a time, which is shown even when the kart
             // is eliminated
@@ -907,29 +907,6 @@ void RaceResultGUI::backToLobby()
 #endif
     }   // determineGPLayout
 
-    //-----------------------------------------------------------------------------
-    /** Returns a string to display next to a kart. For a player that's the name
-     *  of the player, for an AI kart it's the name of the driver.
-     */
-    core::stringw RaceResultGUI::getKartDisplayName(const AbstractKart *kart) const
-    {
-        const EndController *ec =
-            dynamic_cast<const EndController*>(kart->getController());
-        // If the race was given up, there is no end controller for the
-        // players, so this case needs to be handled separately
-        if(ec && ec->isLocalPlayerController())
-            return ec->getName();
-        else
-        {
-            // No end controller, check explicitely for a player controller
-            const PlayerController *pc =
-                dynamic_cast<const PlayerController*>(kart->getController());
-            // Check if the kart is a player controller to get the real name
-            if(pc) return pc->getName();
-        }
-        return translations->fribidize(kart->getName());
-    }   // getKartDisplayName
-
     //-----------------------------------------------------------------------------
     /** Displays the race results for a single kart.
      *  \param n Index of the kart to be displayed.
diff --git a/src/states_screens/race_result_gui.hpp b/src/states_screens/race_result_gui.hpp
index 75c663901..0c1960ca0 100644
--- a/src/states_screens/race_result_gui.hpp
+++ b/src/states_screens/race_result_gui.hpp
@@ -194,7 +194,6 @@ private:
     void displayPostRaceInfo();
     void displaySoccerResults();
     void displayScreenShots();
-    irr::core::stringw getKartDisplayName(const AbstractKart *kart) const;
 
     int  getFontHeight () const;
 

From ca5258a46cfeac04704ccf7dfe50849fcc361d6b Mon Sep 17 00:00:00 2001
From: Geoffrey Mon <geofbot@gmail.com>
Date: Wed, 2 Aug 2017 13:46:48 -0400
Subject: [PATCH 013/125] Move Controller::getName definition to avoid
 unnecessary #include

---
 src/karts/controller/controller.cpp | 4 ++++
 src/karts/controller/controller.hpp | 7 ++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/karts/controller/controller.cpp b/src/karts/controller/controller.cpp
index fe3450464..6460b0341 100644
--- a/src/karts/controller/controller.cpp
+++ b/src/karts/controller/controller.cpp
@@ -34,3 +34,7 @@ Controller::Controller(AbstractKart *kart)
     m_kart     = kart;
     setControllerName("Controller");
 }   // Controller
+
+core::stringw Controller::getName() const {
+    return translations->fribidize(m_kart->getName());
+}
diff --git a/src/karts/controller/controller.hpp b/src/karts/controller/controller.hpp
index 98403badf..1e101d137 100644
--- a/src/karts/controller/controller.hpp
+++ b/src/karts/controller/controller.hpp
@@ -28,9 +28,9 @@ using namespace irr;
   */
 
 #include "input/input.hpp"
-#include "karts/abstract_kart.hpp"
 #include "states_screens/state_manager.hpp"
 
+class AbstractKart;
 class Item;
 class KartControl;
 class Material;
@@ -103,10 +103,7 @@ public:
     /** Display name of the controller.
      *  Defaults to kart name; overriden by controller classes
      *  (such as player controllers) to display username. */
-    virtual core::stringw getName() const
-    {
-        return translations->fribidize(m_kart->getName());
-    }   // getName
+    virtual core::stringw getName() const;
     // ------------------------------------------------------------------------
     /** Returns the kart controlled by this controller. */
     AbstractKart *getKart() const { return m_kart; }

From 9ec2ff5c4a0b8223a59f7b649581962a2026f81f Mon Sep 17 00:00:00 2001
From: Geoffrey Mon <geofbot@gmail.com>
Date: Wed, 2 Aug 2017 14:13:26 -0400
Subject: [PATCH 014/125] Backwards compatibility: use kart name if username is
 not in replay

---
 src/karts/controller/ghost_controller.hpp |  5 ++++-
 src/replay/replay_base.hpp                |  2 +-
 src/replay/replay_play.cpp                | 23 ++++++++++++++++-------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/karts/controller/ghost_controller.hpp b/src/karts/controller/ghost_controller.hpp
index c78b4b454..746d95544 100644
--- a/src/karts/controller/ghost_controller.hpp
+++ b/src/karts/controller/ghost_controller.hpp
@@ -76,7 +76,10 @@ public:
     unsigned int getCurrentReplayIndex() const
                                                    { return m_current_index; }
     // ------------------------------------------------------------------------
-    core::stringw getName() const OVERRIDE { return m_display_name; }
+    /** Return the display name; if not set, use default display name (kart name) */
+    core::stringw getName() const OVERRIDE { return m_display_name.empty() ?
+                                                    Controller::getName() :
+                                                    m_display_name; }
 };   // GhostController
 
 #endif
diff --git a/src/replay/replay_base.hpp b/src/replay/replay_base.hpp
index 0655d2daf..2d7f8b408 100644
--- a/src/replay/replay_base.hpp
+++ b/src/replay/replay_base.hpp
@@ -81,7 +81,7 @@ protected:
     /** Returns the version number of the replay file. This is used to check
      *  that a loaded replay file can still be understood by this
      *  executable. */
-    unsigned int getReplayVersion() const { return 4; }
+    unsigned int getReplayVersion() const { return 3; }
 
 public:
              ReplayBase();
diff --git a/src/replay/replay_play.cpp b/src/replay/replay_play.cpp
index 942f07175..130dbad0a 100644
--- a/src/replay/replay_play.cpp
+++ b/src/replay/replay_play.cpp
@@ -137,17 +137,26 @@ bool ReplayPlay::addReplayFile(const std::string& fn, bool custom_replay)
         char s1[1024];
         char display_name_encoded[1024];
 
-        if (sscanf(s,"kart: %s %[^\n]", s1, display_name_encoded) != 2)
+        int scanned = sscanf(s,"kart: %s %[^\n]", s1, display_name_encoded);
+        if (scanned < 1)
         {
             Log::warn("Replay", "Could not read ghost karts info!");
             break;
-        }
-        rd.m_kart_list.push_back(std::string(s1));
-        rd.m_name_list.push_back(StringUtils::xmlDecode(std::string(display_name_encoded)));
+        } else {
+            rd.m_kart_list.push_back(std::string(s1));
 
-        if (rd.m_name_list.size() == 1) {
-            // First user is the game master and the "owner" of this replay file
-            rd.m_user_name = rd.m_name_list[0];
+            if (scanned == 2) {
+                // If username of kart is present, use it
+                rd.m_name_list.push_back(StringUtils::xmlDecode(std::string(display_name_encoded)));
+                if (rd.m_name_list.size() == 1) {
+                    // First user is the game master and the "owner" of this replay file
+                    rd.m_user_name = rd.m_name_list[0];
+                }
+            } else { // scanned == 1
+                // If username is not present, kart display name will default to kart name
+                // (see GhostController::getName)
+                rd.m_name_list.push_back("");
+            }
         }
     }
 

From 802d70ca8d7f50adc0d39e28ef56984cd1b8e2c8 Mon Sep 17 00:00:00 2001
From: Geoffrey Mon <geofbot@gmail.com>
Date: Wed, 2 Aug 2017 17:21:37 -0400
Subject: [PATCH 015/125] Fix code style issues

---
 src/karts/controller/controller.cpp       |  3 ++-
 src/karts/controller/ghost_controller.hpp |  7 +++---
 src/replay/replay_play.cpp                | 28 ++++++++++++-----------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/karts/controller/controller.cpp b/src/karts/controller/controller.cpp
index 6460b0341..26d8311d2 100644
--- a/src/karts/controller/controller.cpp
+++ b/src/karts/controller/controller.cpp
@@ -35,6 +35,7 @@ Controller::Controller(AbstractKart *kart)
     setControllerName("Controller");
 }   // Controller
 
-core::stringw Controller::getName() const {
+core::stringw Controller::getName() const
+{
     return translations->fribidize(m_kart->getName());
 }
diff --git a/src/karts/controller/ghost_controller.hpp b/src/karts/controller/ghost_controller.hpp
index 746d95544..245abae74 100644
--- a/src/karts/controller/ghost_controller.hpp
+++ b/src/karts/controller/ghost_controller.hpp
@@ -77,9 +77,10 @@ public:
                                                    { return m_current_index; }
     // ------------------------------------------------------------------------
     /** Return the display name; if not set, use default display name (kart name) */
-    core::stringw getName() const OVERRIDE { return m_display_name.empty() ?
-                                                    Controller::getName() :
-                                                    m_display_name; }
+    core::stringw getName() const OVERRIDE
+    {
+        return m_display_name.empty() ? Controller::getName() : m_display_name;
+    }
 };   // GhostController
 
 #endif
diff --git a/src/replay/replay_play.cpp b/src/replay/replay_play.cpp
index 130dbad0a..923374af9 100644
--- a/src/replay/replay_play.cpp
+++ b/src/replay/replay_play.cpp
@@ -142,21 +142,23 @@ bool ReplayPlay::addReplayFile(const std::string& fn, bool custom_replay)
         {
             Log::warn("Replay", "Could not read ghost karts info!");
             break;
-        } else {
-            rd.m_kart_list.push_back(std::string(s1));
+        }
 
-            if (scanned == 2) {
-                // If username of kart is present, use it
-                rd.m_name_list.push_back(StringUtils::xmlDecode(std::string(display_name_encoded)));
-                if (rd.m_name_list.size() == 1) {
-                    // First user is the game master and the "owner" of this replay file
-                    rd.m_user_name = rd.m_name_list[0];
-                }
-            } else { // scanned == 1
-                // If username is not present, kart display name will default to kart name
-                // (see GhostController::getName)
-                rd.m_name_list.push_back("");
+        rd.m_kart_list.push_back(std::string(s1));
+        if (scanned == 2)
+        {
+            // If username of kart is present, use it
+            rd.m_name_list.push_back(StringUtils::xmlDecode(std::string(display_name_encoded)));
+            if (rd.m_name_list.size() == 1)
+            {
+                // First user is the game master and the "owner" of this replay file
+                rd.m_user_name = rd.m_name_list[0];
             }
+        } else
+        { // scanned == 1
+            // If username is not present, kart display name will default to kart name
+            // (see GhostController::getName)
+            rd.m_name_list.push_back("");
         }
     }
 

From d3da93f3682bc8f893616e29d952d50830c04d1b Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 3 Aug 2017 09:24:50 +1000
Subject: [PATCH 016/125] Try to use a Microsoft function to detect XInput
 devices when using DirectInput - atm not working yet :(

---
 .../source/Irrlicht/CIrrDeviceWin32.cpp       | 139 +++++++++++++++++-
 1 file changed, 138 insertions(+), 1 deletion(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
index 2138ab7c2..619a359be 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -23,6 +23,9 @@
 #ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
 #define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>
+#include <wbemidl.h>
+#include <oleauto.h>
+
 #ifdef _MSC_VER
 #pragma comment(lib, "dinput8.lib")
 #pragma comment(lib, "dxguid.lib")
@@ -123,12 +126,15 @@ struct SJoystickWin32Control
         p->directInputAddJoystick(lpddi);
         return DIENUM_CONTINUE;
     }
+    bool IsXInputDevice(const GUID* pGuidProductFromDirectInput);
+
     void directInputAddJoystick(LPCDIDEVICEINSTANCE lpddi)
     {
         //Get the GUID of the joystuck
         const GUID guid = lpddi->guidInstance;
-
         JoystickInfo activeJoystick;
+        activeJoystick.m_use_xinput = isXInputDevice(&guid);
+    
         activeJoystick.Index=ActiveJoysticks.size();
         activeJoystick.guid=guid;
         activeJoystick.Name=lpddi->tszProductName;
@@ -193,6 +199,137 @@ struct SJoystickWin32Control
 
         ActiveJoysticks.push_back(activeJoystick);
     }
+
+    //-----------------------------------------------------------------------------
+    /** Taken from:
+     *  https://msdn.microsoft.com/en-us/library/windows/desktop/dd940435(v=vs.85).aspx
+     */
+    template <class T> void SAFE_RELEASE(T **ppT)
+    {
+        if (*ppT)
+        {
+            (*ppT)->Release();
+            *ppT = NULL;
+        }
+    }
+
+    /** Taken from:
+     *  https://msdn.microsoft.com/en-us/library/windows/desktop/ee417014(v=vs.85).aspx
+     */
+    //-----------------------------------------------------------------------------
+    // Enum each PNP device using WMI and check each device ID to see if it contains 
+    // "IG_" (ex. "VID_045E&PID_028E&IG_00").  If it does, then it's an XInput device
+    // Unfortunately this information can not be found by just using DirectInput 
+    //-----------------------------------------------------------------------------
+    bool isXInputDevice(const GUID* pGuidProductFromDirectInput)
+    {
+        IWbemLocator*           pIWbemLocator = NULL;
+        IEnumWbemClassObject*   pEnumDevices = NULL;
+        IWbemClassObject*       pDevices[20] = { 0 };
+        IWbemServices*          pIWbemServices = NULL;
+        BSTR                    bstrNamespace = NULL;
+        BSTR                    bstrDeviceID = NULL;
+        BSTR                    bstrClassName = NULL;
+        DWORD                   uReturned = 0;
+        bool                    bIsXinputDevice = false;
+        UINT                    iDevice = 0;
+        VARIANT                 var;
+        HRESULT                 hr;
+
+        // CoInit if needed
+        hr = CoInitialize(NULL);
+        bool bCleanupCOM = SUCCEEDED(hr);
+
+        // Create WMI
+        hr = CoCreateInstance(__uuidof(WbemLocator),
+            NULL,
+            CLSCTX_INPROC_SERVER,
+            __uuidof(IWbemLocator),
+            (LPVOID*)&pIWbemLocator);
+        if (FAILED(hr) || pIWbemLocator == NULL)
+            goto LCleanup;
+
+        bstrNamespace = SysAllocString(L"\\\\.\\root\\cimv2"); if (bstrNamespace == NULL) goto LCleanup;
+        bstrClassName = SysAllocString(L"Win32_PNPEntity");   if (bstrClassName == NULL) goto LCleanup;
+        bstrDeviceID = SysAllocString(L"DeviceID");          if (bstrDeviceID == NULL)  goto LCleanup;
+
+        // Connect to WMI 
+        hr = pIWbemLocator->ConnectServer(bstrNamespace, NULL, NULL, 0L,
+            0L, NULL, NULL, &pIWbemServices);
+        if (FAILED(hr) || pIWbemServices == NULL)
+            goto LCleanup;
+
+        // Switch security level to IMPERSONATE. 
+        CoSetProxyBlanket(pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL,
+            RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE);
+
+        hr = pIWbemServices->CreateInstanceEnum(bstrClassName, 0, NULL, &pEnumDevices);
+        if (FAILED(hr) || pEnumDevices == NULL)
+            goto LCleanup;
+
+        // Loop over all devices
+        for (;; )
+        {
+            // Get 20 at a time
+            hr = pEnumDevices->Next(10000, 20, pDevices, &uReturned);
+            if (FAILED(hr))
+                goto LCleanup;
+            if (uReturned == 0)
+                break;
+
+            for (iDevice = 0; iDevice<uReturned; iDevice++)
+            {
+                // For each device, get its device ID
+                hr = pDevices[iDevice]->Get(bstrDeviceID, 0L, &var, NULL, NULL);
+                if (SUCCEEDED(hr) && var.vt == VT_BSTR && var.bstrVal != NULL)
+                {
+                    // Check if the device ID contains "IG_".  If it does, then it's an XInput device
+                    // This information can not be found from DirectInput 
+                    if (wcsstr(var.bstrVal, L"IG_"))
+                    {
+                        // If it does, then get the VID/PID from var.bstrVal
+                        DWORD dwPid = 0, dwVid = 0;
+                        WCHAR* strVid = wcsstr(var.bstrVal, L"VID_");
+                        if (strVid && swscanf(strVid, L"VID_%4X", &dwVid) != 1)
+                            dwVid = 0;
+                        WCHAR* strPid = wcsstr(var.bstrVal, L"PID_");
+                        if (strPid && swscanf(strPid, L"PID_%4X", &dwPid) != 1)
+                            dwPid = 0;
+
+                        // Compare the VID/PID to the DInput device
+                        DWORD dwVidPid = MAKELONG(dwVid, dwPid);
+                        if (dwVidPid == pGuidProductFromDirectInput->Data1)
+                        {
+                            bIsXinputDevice = true;
+                            goto LCleanup;
+                        }
+                    }
+                }
+                SAFE_RELEASE(&pDevices[iDevice]);
+            }
+        }
+
+    LCleanup:
+        if (bstrNamespace)
+            SysFreeString(bstrNamespace);
+        if (bstrDeviceID)
+            SysFreeString(bstrDeviceID);
+        if (bstrClassName)
+            SysFreeString(bstrClassName);
+        for (iDevice = 0; iDevice<20; iDevice++)
+            SAFE_RELEASE(&pDevices[iDevice]);
+        SAFE_RELEASE(&pEnumDevices);
+        SAFE_RELEASE(&pIWbemLocator);
+        SAFE_RELEASE(&pIWbemServices);
+
+        if (bCleanupCOM)
+            CoUninitialize();
+
+        return bIsXinputDevice;
+    }
+
+    // ------------------------------------------------------------------------
+
 #endif
 
 void pollJoysticks()

From f4317302784a5a15bff485cd3ffb5973b96d485a Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 5 Aug 2017 00:12:22 +1000
Subject: [PATCH 017/125] Fixed recognition of XInput devices.

---
 lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
index 619a359be..73ff7ca55 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -131,7 +131,7 @@ struct SJoystickWin32Control
     void directInputAddJoystick(LPCDIDEVICEINSTANCE lpddi)
     {
         //Get the GUID of the joystuck
-        const GUID guid = lpddi->guidInstance;
+        const GUID guid = lpddi->guidProduct;
         JoystickInfo activeJoystick;
         activeJoystick.m_use_xinput = isXInputDevice(&guid);
     

From 68d41a07ba2caae04db766d189030242ea079fee Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 5 Aug 2017 00:34:51 +1000
Subject: [PATCH 018/125] Now actually use XInput to read the joystick events
 for all XInput devices.

---
 .../source/Irrlicht/CIrrDeviceWin32.cpp       | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
index 73ff7ca55..6a34a3cec 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -20,6 +20,7 @@
 #include <regstr.h>
 #include <winuser.h>
 #if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+#include <Xinput.h>
 #ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
 #define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>
@@ -34,7 +35,6 @@
 #ifdef _MSC_VER
 #pragma comment(lib, "winmm.lib")
 #endif
-#include <Xinput.h>
 #endif
 #endif
 
@@ -345,6 +345,31 @@ void pollJoysticks()
 
     for(joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
     {
+        SEvent event;
+
+        event.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
+        event.JoystickEvent.Joystick = (u8)joystick;
+
+        if (ActiveJoysticks[joystick].m_use_xinput)
+        {
+            XINPUT_STATE state;
+            memset(&state, 0, sizeof(state));
+            DWORD result = XInputGetState(ActiveJoysticks[joystick].Index, &state);
+            event.JoystickEvent.ButtonStates = state.Gamepad.wButtons;
+            // Map the axis as they were previously, so existing configs
+            // still work as expected. The Y axis needs to be reversed: 
+            // -32768 --> 32767, ..., 32767 --> -32768
+            // Inverting the bits with ~ does that (-sThumbLY would map -32768 to -32768!!)
+            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_X] =  state.Gamepad.sThumbLX;
+            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Y] = ~state.Gamepad.sThumbLY;
+            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Z] =  state.Gamepad.bLeftTrigger * 128;
+            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_R] =  state.Gamepad.sThumbRX; 
+            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_U] = ~state.Gamepad.sThumbRY;
+            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_V] =  state.Gamepad.bRightTrigger * 128;
+            (void)Device->postEventFromUser(event);
+
+            continue;
+        }
         // needs to be reset for each joystick
         // request ALL values and POV as continuous if possible
 
@@ -353,11 +378,6 @@ void pollJoysticks()
 
         if (!FAILED(ActiveJoysticks[joystick].lpdijoy->GetDeviceState(sizeof(info),&info)))
         {
-            SEvent event;
-
-            event.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
-            event.JoystickEvent.Joystick = (u8)joystick;
-
             event.JoystickEvent.POV = (u16)info.rgdwPOV[0];
             // set to undefined if no POV value was returned or the value
             // is out of range

From 891e4392645d47ca7827090d8adc81e3ff6338f6 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sun, 6 Aug 2017 22:56:59 +1000
Subject: [PATCH 019/125] Remapped XInput to be the same as DirectInput
 buttons, so that existing configs works as expected. Hard-coded 6 axis for
 xbox controller to allow for triggers to be reported as two different axis
 (instead of as one axis). Updated gamepad config to use proper names for
 triggers.

---
 .../source/Irrlicht/CIrrDeviceWin32.cpp       | 38 ++++++++++++++++++-
 src/input/gamepad_config.cpp                  |  8 ++--
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
index 6a34a3cec..04d568a36 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -197,6 +197,11 @@ struct SJoystickWin32Control
                 activeJoystick.axisValid[i+caxis]=1;
         }
 
+        // On Xbox 360 devices left and right trigger are reported as two
+        // different axes (instead of 1 with DirectInput), so we need one
+        // additional axis:
+        if (activeJoystick.m_use_xinput && activeJoystick.devcaps.dwAxes == 5)
+            activeJoystick.devcaps.dwAxes = 6;
         ActiveJoysticks.push_back(activeJoystick);
     }
 
@@ -355,8 +360,37 @@ void pollJoysticks()
             XINPUT_STATE state;
             memset(&state, 0, sizeof(state));
             DWORD result = XInputGetState(ActiveJoysticks[joystick].Index, &state);
-            event.JoystickEvent.ButtonStates = state.Gamepad.wButtons;
-            // Map the axis as they were previously, so existing configs
+            // XInput reports the buttons in a different order. So to keep
+            // old configs to work as expected, remap the buttons.
+            int abxy     = (state.Gamepad.wButtons & (XINPUT_GAMEPAD_A | 
+                                                      XINPUT_GAMEPAD_B |
+                                                      XINPUT_GAMEPAD_X |
+                                                      XINPUT_GAMEPAD_Y   )
+                           ) >> 12;
+            int shoulder = (state.Gamepad.wButtons & (XINPUT_GAMEPAD_LEFT_SHOULDER|
+                                                      XINPUT_GAMEPAD_RIGHT_SHOULDER)
+                           ) >> 4;
+            int start    = (state.Gamepad.wButtons & XINPUT_GAMEPAD_START) << 3;
+            int back     = (state.Gamepad.wButtons & XINPUT_GAMEPAD_BACK ) << 1;
+
+            event.JoystickEvent.ButtonStates = abxy | shoulder | start | back;
+            int angle = 65535;
+            if (state.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN)
+            {
+                if (state.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT) angle = 22500;
+                else if (state.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT) angle = 13500;
+                else angle = 18000;
+            }
+            else if (state.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP)
+            {
+                if (state.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT) angle = 31500;
+                else if (state.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT) angle = 4500;
+                else angle = 0;
+            }
+            else if (state.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT) angle = 9000;
+            else if (state.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT)  angle = 27000;
+            event.JoystickEvent.POV = angle;
+                // Map the axis as they were previously, so existing configs
             // still work as expected. The Y axis needs to be reversed: 
             // -32768 --> 32767, ..., 32767 --> -32768
             // Inverting the bits with ~ does that (-sThumbLY would map -32768 to -32768!!)
diff --git a/src/input/gamepad_config.cpp b/src/input/gamepad_config.cpp
index 0be20e5e8..9670eb205 100644
--- a/src/input/gamepad_config.cpp
+++ b/src/input/gamepad_config.cpp
@@ -236,10 +236,7 @@ core::stringw GamepadConfig::getBindingAsString(const PlayerAction action) const
                                                     // I18N: name of stick on gamepads
                                                     : _("Left thumb up");
                                                     // I18N: name of stick on gamepads
-            case 2: return (ad==Input::AD_POSITIVE) ? _("Left trigger")
-                                                    // I18N: name of stick on gamepads
-                                                    : _("Right trigger");
-                                                    // I18N: name of stick on gamepads
+            case 2: return _("Left trigger");       // I18N: name of trigger on gamepads
             case 3: return (ad==Input::AD_POSITIVE) ? _("Right thumb down")
                                                     // I18N: name of stick on gamepads
                                                     : _("Right thumb up");
@@ -248,7 +245,8 @@ core::stringw GamepadConfig::getBindingAsString(const PlayerAction action) const
                                                     // I18N: name of stick on gamepads
                                                     : _("Right thumb left");
                                                     // I18N: name of buttons on gamepads
-            case Input::HAT_H_ID: return (ad == Input::AD_POSITIVE) ? _("DPad up") 
+            case 5: return _("Right trigger");      // I18N: name of trigger on gamepads
+            case Input::HAT_H_ID: return (ad == Input::AD_POSITIVE) ? _("DPad up")
                                                     // I18N: name of buttons on gamepads
                                                                     : _("DPad down");
                                                     // I18N: name of buttons on gamepads

From e6c2c3df95af542eae44c40a0db0168abfbfaa8c Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 7 Aug 2017 09:15:09 +1000
Subject: [PATCH 020/125] Revert to using guidProduct for all existing code,
 but the correct guidInstance for detecting XInput devices only.

---
 lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
index 04d568a36..21319c149 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -131,9 +131,9 @@ struct SJoystickWin32Control
     void directInputAddJoystick(LPCDIDEVICEINSTANCE lpddi)
     {
         //Get the GUID of the joystuck
-        const GUID guid = lpddi->guidProduct;
+        const GUID guid = lpddi->guidInstance;
         JoystickInfo activeJoystick;
-        activeJoystick.m_use_xinput = isXInputDevice(&guid);
+        activeJoystick.m_use_xinput = isXInputDevice(&lpddi->guidProduct);
     
         activeJoystick.Index=ActiveJoysticks.size();
         activeJoystick.guid=guid;

From 620d1f34c15e3598f8d169a110110106bc5bd896 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 7 Aug 2017 23:50:09 +1000
Subject: [PATCH 021/125] Link in xinput on windows builds.

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 552f04ac0..6e1c9fcb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -473,7 +473,7 @@ if(USE_WIIUSE)
 endif()
 
 if(MSVC OR MINGW)
-  target_link_libraries(supertuxkart iphlpapi.lib)
+  target_link_libraries(supertuxkart iphlpapi.lib xinput)
   add_custom_command(TARGET supertuxkart POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory
         "${PROJECT_SOURCE_DIR}/dependencies/dll"

From 0a715ac31a45a964366642f35f210708182e1e14 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 7 Aug 2017 22:33:57 +0200
Subject: [PATCH 022/125] Fixed 32-bit mingw compilation

---
 cmake/Toolchain-mingw.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/Toolchain-mingw.cmake b/cmake/Toolchain-mingw.cmake
index 141465228..052c984c0 100644
--- a/cmake/Toolchain-mingw.cmake
+++ b/cmake/Toolchain-mingw.cmake
@@ -10,7 +10,7 @@ SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++-posix)
 SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
 
 # figure out folder to look in
-execute_process(COMMAND sh -c "ls /usr/lib/gcc/x86_64-w64-mingw32/ | grep posix | tr -d '\n'" OUTPUT_VARIABLE MINGW_DEPS_FOLDER)
+execute_process(COMMAND sh -c "ls /usr/lib/gcc/i686-w64-mingw32/ | grep posix | tr -d '\n'" OUTPUT_VARIABLE MINGW_DEPS_FOLDER)
 
 # here is the target environment located
 SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32 /usr/lib/gcc/i686-w64-mingw32/${MINGW_DEPS_FOLDER}/ ${PROJECT_SOURCE_DIR}/dependencies)

From bd5eb89cc0557c3863448b04785fa46acccd1f03 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 8 Aug 2017 21:44:32 +1000
Subject: [PATCH 023/125] Use XInput 9.1 which does not need an installer and
 works on most windows platforms. Move the linking to irrlicht cmake.

---
 CMakeLists.txt                                   | 2 +-
 lib/irrlicht/CMakeLists.txt                      | 2 +-
 lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e1c9fcb1..552f04ac0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -473,7 +473,7 @@ if(USE_WIIUSE)
 endif()
 
 if(MSVC OR MINGW)
-  target_link_libraries(supertuxkart iphlpapi.lib xinput)
+  target_link_libraries(supertuxkart iphlpapi.lib)
   add_custom_command(TARGET supertuxkart POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory
         "${PROJECT_SOURCE_DIR}/dependencies/dll"
diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
index c7d649612..545e857ca 100644
--- a/lib/irrlicht/CMakeLists.txt
+++ b/lib/irrlicht/CMakeLists.txt
@@ -570,5 +570,5 @@ if(ENABLE_WAYLAND_DEVICE)
 endif()
 
 if(WIN32)
-    target_link_libraries(stkirrlicht imm32)
+    target_link_libraries(stkirrlicht imm32 XINPUT9_1_0.LIB)
 endif()
diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
index 04d568a36..a2834c7ab 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -20,6 +20,10 @@
 #include <regstr.h>
 #include <winuser.h>
 #if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+// This define will switch to use XInput 9.1, which does not
+// require an installer and works on most windows platforms.
+// See https://blogs.msdn.microsoft.com/chuckw/2012/04/25/xinput-and-windows-8/
+#define _WIN32_WINNT 0x0601
 #include <Xinput.h>
 #ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
 #define DIRECTINPUT_VERSION 0x0800

From b440511c955b90e50e604037a320207e9faed58e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 8 Aug 2017 21:55:28 +1000
Subject: [PATCH 024/125] Fixed incorrect right thumbstick mapping.

---
 lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
index a2834c7ab..b38c04b59 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -401,8 +401,8 @@ void pollJoysticks()
             event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_X] =  state.Gamepad.sThumbLX;
             event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Y] = ~state.Gamepad.sThumbLY;
             event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Z] =  state.Gamepad.bLeftTrigger * 128;
-            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_R] =  state.Gamepad.sThumbRX; 
-            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_U] = ~state.Gamepad.sThumbRY;
+            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_R] = ~state.Gamepad.sThumbRY;
+            event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_U] =  state.Gamepad.sThumbRX;
             event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_V] =  state.Gamepad.bRightTrigger * 128;
             (void)Device->postEventFromUser(event);
 

From f589bbea04732f1e2505db1df6646fef7a45070f Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Tue, 8 Aug 2017 20:23:22 -0400
Subject: [PATCH 025/125] Attempt to fix 2617

---
 src/input/input_manager.cpp | 6 ++++--
 src/input/input_manager.hpp | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp
index f41aafab6..e604e6b82 100644
--- a/src/input/input_manager.cpp
+++ b/src/input/input_manager.cpp
@@ -488,11 +488,13 @@ void InputManager::inputSensing(Input::InputType type, int deviceID,
         // We have to save the direction in which the axis was moved.
         // This is done by storing it as a sign (and since button can
         // be zero, we add one before changing the sign).
-        int input_id = value>=0 ? 1+button : -(1+button);
+        int input_button_id = value>=0 ? 1+button : -(1+button);
+        std::tuple<int, int> input_id(deviceID, input_button_id);
+        std::tuple<int, int> input_id_inv(deviceID, -input_button_id);
 
         bool id_was_high         = m_sensed_input_high_gamepad.find(input_id)
                                    != m_sensed_input_high_gamepad.end();
-        bool inverse_id_was_high = m_sensed_input_high_gamepad.find(-input_id)
+        bool inverse_id_was_high = m_sensed_input_high_gamepad.find(input_id_inv)
                                    != m_sensed_input_high_gamepad.end();
         bool id_was_zero         = m_sensed_input_zero_gamepad.find(button)
                                    != m_sensed_input_zero_gamepad.end();
diff --git a/src/input/input_manager.hpp b/src/input/input_manager.hpp
index 2ffff2ea4..8c2ed7ff0 100644
--- a/src/input/input_manager.hpp
+++ b/src/input/input_manager.hpp
@@ -53,7 +53,7 @@ public:
 private:
 
     DeviceManager  *m_device_manager;
-    std::set<int>   m_sensed_input_high_gamepad;
+    std::set<std::tuple<int, int>>   m_sensed_input_high_gamepad;
     std::set<int>   m_sensed_input_high_kbd;
     std::set<int>   m_sensed_input_zero_gamepad;
 

From 94bb657102cc7cb430916a35de67e60af54477ca Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Tue, 8 Aug 2017 20:44:31 -0400
Subject: [PATCH 026/125] Ignore input sensing coming from the wrong gamepad

---
 src/states_screens/options_screen_device.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/states_screens/options_screen_device.cpp b/src/states_screens/options_screen_device.cpp
index caa3c43ea..8033226dc 100644
--- a/src/states_screens/options_screen_device.cpp
+++ b/src/states_screens/options_screen_device.cpp
@@ -434,6 +434,10 @@ void OptionsScreenDevice::gotSensedInput(const Input& sensed_input)
             // refresh display
             updateInputButtons();
         }
+        else
+        {
+            return;
+        }
     }
     else if (sensed_input.m_type == Input::IT_NONE)
     {

From ea97258b65e49f4bf7389944a1a0a1aa02bf02e8 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Wed, 9 Aug 2017 12:23:37 +0800
Subject: [PATCH 027/125] Add scripting code for throwing banana monkeys

---
 lib/irrlicht/include/IAnimatedMeshSceneNode.h |   3 +-
 .../Irrlicht/CAnimatedMeshSceneNode.cpp       |  55 ++++++++
 .../source/Irrlicht/CAnimatedMeshSceneNode.h  |   3 +-
 src/scriptengine/script_track.cpp             |  73 +++++++++--
 src/tracks/track_object.cpp                   |  37 +++++-
 src/tracks/track_object.hpp                   |   2 +-
 src/tracks/track_object_presentation.cpp      | 120 ++++++++++--------
 src/tracks/track_object_presentation.hpp      |  26 ++--
 8 files changed, 241 insertions(+), 78 deletions(-)

diff --git a/lib/irrlicht/include/IAnimatedMeshSceneNode.h b/lib/irrlicht/include/IAnimatedMeshSceneNode.h
index 89c84d740..6929dd347 100644
--- a/lib/irrlicht/include/IAnimatedMeshSceneNode.h
+++ b/lib/irrlicht/include/IAnimatedMeshSceneNode.h
@@ -177,8 +177,9 @@ namespace scene
 		\param newManager An optional new scene manager.
 		\return The newly created clone of this node. */
 		virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) = 0;
-
+		virtual void setFrameLoopOnce(s32 begin, s32 end) = 0;
 		virtual u32 getAnimationSetNum() = 0;
+		virtual s32 getAnimationSet() const = 0;
 		virtual void addAnimationSet(u32 start, u32 end) = 0;
 		virtual void useAnimationSet(u32 set_num) = 0;
 	};
diff --git a/lib/irrlicht/source/Irrlicht/CAnimatedMeshSceneNode.cpp b/lib/irrlicht/source/Irrlicht/CAnimatedMeshSceneNode.cpp
index 3d6b08aa5..030b107e2 100644
--- a/lib/irrlicht/source/Irrlicht/CAnimatedMeshSceneNode.cpp
+++ b/lib/irrlicht/source/Irrlicht/CAnimatedMeshSceneNode.cpp
@@ -1002,5 +1002,60 @@ void CAnimatedMeshSceneNode::useAnimationSet(u32 set_num)
 	setFrameLoop(m_animation_set[set_num * 2], m_animation_set[set_num * 2 + 1]);
 }
 
+void CAnimatedMeshSceneNode::setFrameLoopOnce(s32 begin, s32 end)
+{
+	if (LoopCallBack != NULL || !Looping)
+	{
+		return;
+	}
+	Looping = false;
+	class MiniLoopSetter : public IAnimationEndCallBack
+	{
+	private:
+		int m_old_start, m_old_end, m_new_start, m_new_end;
+
+		bool m_run_cb;
+	public:
+		MiniLoopSetter(int old_start, int old_end, int new_start, int new_end)
+			: m_old_start(old_start), m_old_end(old_end),
+			m_new_start(new_start), m_new_end(new_end), m_run_cb(false) {}
+		virtual void OnAnimationEnd(IAnimatedMeshSceneNode* node)
+		{
+			if (!m_run_cb)
+			{
+				m_run_cb = true;
+				node->setFrameLoop(m_new_start, m_new_end);
+				return;
+			}
+			if (m_run_cb)
+			{
+				node->setFrameLoop(m_old_start, m_old_end);
+				node->setLoopMode(true);
+				node->setAnimationEndCallback(NULL);
+				return;
+			}
+		}
+	};
+	MiniLoopSetter* mls = new MiniLoopSetter(StartFrame, EndFrame,
+		begin, end);
+	setAnimationEndCallback(mls);
+	mls->drop();
+
+}
+
+s32 CAnimatedMeshSceneNode::getAnimationSet() const
+{
+	for (u32 i = 0; i < m_animation_set.size(); i += 2)
+	{
+		if (m_animation_set[i] == (u32)StartFrame &&
+			m_animation_set[i + 1] == (u32)EndFrame)
+		{
+			return (s32)(i >> 1);
+		}
+	}
+	return -1;
+}
+
+
 } // end namespace scene
 } // end namespace irr
diff --git a/lib/irrlicht/source/Irrlicht/CAnimatedMeshSceneNode.h b/lib/irrlicht/source/Irrlicht/CAnimatedMeshSceneNode.h
index 1ea8f5112..68dc93748 100644
--- a/lib/irrlicht/source/Irrlicht/CAnimatedMeshSceneNode.h
+++ b/lib/irrlicht/source/Irrlicht/CAnimatedMeshSceneNode.h
@@ -161,13 +161,14 @@ namespace scene
 		virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0);
 
 		virtual u32 getAnimationSetNum() { return m_animation_set.size() / 2; }
+		virtual s32 getAnimationSet() const;
 		virtual void addAnimationSet(u32 start, u32 end)
 		{
 			m_animation_set.push_back(start);
 			m_animation_set.push_back(end);
 		}
 		virtual void useAnimationSet(u32 set_num);
-
+		virtual void setFrameLoopOnce(s32 begin, s32 end);
 	protected:
 
 		//! Get a static mesh for the current frame of this animated mesh
diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index e4ad0e7cd..114657ba7 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -127,6 +127,23 @@ namespace Scripting
 #endif
         }
 
+        /** Function for re-enable a trigger after a specific timeout*/
+        void setTriggerReenableTimeout(std::string* triggerID, std::string* lib_id,
+                                       float reenable_time)
+        {
+            ::TrackObject* tobj = ::Track::getCurrentTrack()->getTrackObjectManager()
+                ->getTrackObject(*lib_id, *triggerID);
+            if (tobj != NULL)
+            {
+                TrackObjectPresentationActionTrigger* topat =
+                    tobj->getPresentation<TrackObjectPresentationActionTrigger>();
+                if (topat != NULL)
+                {
+                    topat->setReenableTimeout(reenable_time);
+                }
+            }
+        }
+
         /** Exits the race to the main menu */
         void exitRace()
         {
@@ -231,22 +248,52 @@ namespace Scripting
 
             /** Sets a loop for a skeletal animation */
             // TODO: can we use a type and avoid void* ?
-            void setLoop(int start, int end /** \cond DOXYGEN_IGNORE */, void *memory /** \endcond */)
+            void setFrameLoop(int start, int end /** \cond DOXYGEN_IGNORE */, void *memory /** \endcond */)
             {
-                ((TrackObjectPresentationMesh*)(memory))->setLoop(start, end);
+                if (memory)
+                {
+                    ((scene::IAnimatedMeshSceneNode*)(memory))->setFrameLoop(start, end);
+                }
+            }
+
+            /** Sets a loop once for a skeletal animation */
+            void setFrameLoopOnce(int start, int end /** \cond DOXYGEN_IGNORE */, void *memory /** \endcond */)
+            {
+                if (memory)
+                {
+                    ((scene::IAnimatedMeshSceneNode*)(memory))->setFrameLoopOnce(start, end);
+                }
+            }
+
+            /** Get current frame in a skeletal animation */
+            int getFrameNr(/** \cond DOXYGEN_IGNORE */void *memory /** \endcond */)
+            {
+                if (memory)
+                {
+                    return ((scene::IAnimatedMeshSceneNode*)(memory))->getFrameNr();
+                }
+                return -1;
+            }
+
+            /** Gets the animation set for a skeletal animation */
+            int getAnimationSet(/** \cond DOXYGEN_IGNORE */void *memory /** \endcond */)
+            {
+                if (memory)
+                {
+                    return ((scene::IAnimatedMeshSceneNode*)(memory))->getAnimationSet();
+                }
+                return -1;
             }
 
             /** Sets the current frame for a skeletal animation */
             void setCurrentFrame(int frame /** \cond DOXYGEN_IGNORE */, void *memory /** \endcond */)
             {
-                ((TrackObjectPresentationMesh*)(memory))->setCurrentFrame(frame);
+                if (memory)
+                {
+                    ((scene::IAnimatedMeshSceneNode*)(memory))->setCurrentFrame(frame);
+                }
             }
 
-            /** Get current frame in a skeletal animation */
-            int getCurrentFrame(/** \cond DOXYGEN_IGNORE */void *memory /** \endcond */)
-            {
-                return ((TrackObjectPresentationMesh*)(memory))->getCurrentFrame();
-            }
             /** @} */
         }
 
@@ -384,6 +431,8 @@ namespace Scripting
                 asFUNCTION(createTrigger), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void createTextBillboard(const string &in, const Vec3 &in)",
                 asFUNCTION(createTextBillboard), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void setTriggerReenableTimeout(const string &in, const string &in, float reenable_time)",
+                asFUNCTION(setTriggerReenableTimeout), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("TrackObject@ getTrackObject(const string &in, const string &in)", asFUNCTION(getTrackObject), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void exitRace()", asFUNCTION(exitRace), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void pauseRace()", asFUNCTION(pauseRace), asCALL_CDECL); assert(r >= 0);
@@ -410,9 +459,11 @@ namespace Scripting
             r = engine->RegisterObjectMethod("PhysicalObject", "void disable()", asMETHOD(PhysicalObject, disable), asCALL_THISCALL); assert(r >= 0);
             r = engine->RegisterObjectMethod("PhysicalObject", "void enable()", asMETHOD(PhysicalObject, enable), asCALL_THISCALL); assert(r >= 0);
 
-            // TrackObjectPresentationMesh (Mesh or Skeletal Animation)
-            r = engine->RegisterObjectMethod("Mesh", "void setLoop(int start, int end)", asFUNCTION(Mesh::setLoop), asCALL_CDECL_OBJLAST); assert(r >= 0);
-            r = engine->RegisterObjectMethod("Mesh", "int getCurrentFrame()", asFUNCTION(Mesh::getCurrentFrame), asCALL_CDECL_OBJLAST); assert(r >= 0);
+            // Animated Mesh
+            r = engine->RegisterObjectMethod("Mesh", "void setFrameLoop(int start, int end)", asFUNCTION(Mesh::setFrameLoop), asCALL_CDECL_OBJLAST); assert(r >= 0);
+            r = engine->RegisterObjectMethod("Mesh", "void setFrameLoopOnce(int start, int end)", asFUNCTION(Mesh::setFrameLoopOnce), asCALL_CDECL_OBJLAST); assert(r >= 0);
+            r = engine->RegisterObjectMethod("Mesh", "int getFrameNr()", asFUNCTION(Mesh::getFrameNr), asCALL_CDECL_OBJLAST); assert(r >= 0);
+            r = engine->RegisterObjectMethod("Mesh", "int getAnimationSet()", asFUNCTION(Mesh::getAnimationSet), asCALL_CDECL_OBJLAST); assert(r >= 0);
             r = engine->RegisterObjectMethod("Mesh", "void setCurrentFrame(int frame)", asFUNCTION(Mesh::setCurrentFrame), asCALL_CDECL_OBJLAST); assert(r >= 0);
             //r = engine->RegisterObjectMethod("Mesh", "void move(Vec3 &in)", asFUNCTION(movePresentation), asCALL_CDECL_OBJLAST); assert(r >= 0);
 
diff --git a/src/tracks/track_object.cpp b/src/tracks/track_object.cpp
index ada404ae6..f68dc3f0c 100644
--- a/src/tracks/track_object.cpp
+++ b/src/tracks/track_object.cpp
@@ -20,6 +20,7 @@
 
 #include "animations/three_d_animation.hpp"
 #include "graphics/irr_driver.hpp"
+#include "graphics/lod_node.hpp"
 #include "graphics/material.hpp"
 #include "graphics/material_manager.hpp"
 #include "graphics/render_info.hpp"
@@ -32,6 +33,7 @@
 #include "scriptengine/script_engine.hpp"
 #include "tracks/model_definition_loader.hpp"
 
+#include <IAnimatedMeshSceneNode.h>
 #include <ISceneManager.h>
 
 /** A track object: any additional object on the track. This object implements
@@ -156,6 +158,7 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
     }
     else if (xml_node.getName() == "library")
     {
+        xml_node.get("name", &m_name);
         m_presentation = new TrackObjectPresentationLibraryNode(this, xml_node, model_def_loader);
     }
     else if (type == "sfx-emitter")
@@ -170,7 +173,7 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
         std::string action;
         xml_node.get("action", &action);
         m_name = action; //adds action as name so that it can be found by using getName()
-        m_presentation = new TrackObjectPresentationActionTrigger(xml_node);
+        m_presentation = new TrackObjectPresentationActionTrigger(xml_node, parent_library);
     }
     else if (type == "billboard")
     {
@@ -661,3 +664,35 @@ void TrackObject::moveTo(const Scripting::SimpleVec3* pos, bool isAbsoluteCoord)
             isAbsoluteCoord);
     }
 }
+
+// ----------------------------------------------------------------------------
+scene::IAnimatedMeshSceneNode* TrackObject::getMesh()
+{
+    if (getPresentation<TrackObjectPresentationLOD>())
+    {
+        LODNode* ln = dynamic_cast<LODNode*>
+            (getPresentation<TrackObjectPresentationLOD>()->getNode());
+        if (ln && !ln->getAllNodes().empty())
+        {
+            scene::IAnimatedMeshSceneNode* an =
+                dynamic_cast<scene::IAnimatedMeshSceneNode*>
+                (ln->getFirstNode());
+            if (an)
+            {
+                return an;
+            }
+        }
+    }
+    else if (getPresentation<TrackObjectPresentationMesh>())
+    {
+        scene::IAnimatedMeshSceneNode* an =
+            dynamic_cast<scene::IAnimatedMeshSceneNode*>
+            (getPresentation<TrackObjectPresentationMesh>()->getNode());
+        if (an)
+        {
+            return an;
+        }
+    }
+    Log::debug("TrackObject", "No animated mesh");
+    return NULL;
+}   // getMesh
diff --git a/src/tracks/track_object.hpp b/src/tracks/track_object.hpp
index ceabc0c31..c8b7b5acc 100644
--- a/src/tracks/track_object.hpp
+++ b/src/tracks/track_object.hpp
@@ -190,7 +190,7 @@ public:
     /** Should only be used on mesh track objects.
     * On the script side, the returned object is of type : @ref Scripting_Mesh
     */
-    TrackObjectPresentationMesh* getMesh() { return getPresentation<TrackObjectPresentationMesh>(); }
+    scene::IAnimatedMeshSceneNode* getMesh();
     /** Should only be used on particle emitter track objects.
     * On the script side, the returned object is of type : @ref Scripting_ParticleEmitter
     */
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 7a2914171..8f70e1ee6 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -358,11 +358,13 @@ void TrackObjectPresentationLOD::reset()
                 dynamic_cast<scene::IAnimatedMeshSceneNode*>(node);
             if (a_node)
             {
+                a_node->setLoopMode(true);
+                a_node->setAnimationEndCallback(NULL);
                 RandomGenerator rg;
                 int animation_set = 0;
                 if (a_node->getAnimationSetNum() > 0)
                     animation_set = rg.get(a_node->getAnimationSetNum());
-                 a_node->useAnimationSet(animation_set);
+                a_node->useAnimationSet(animation_set);
             }
         }
     }
@@ -642,6 +644,7 @@ void TrackObjectPresentationMesh::reset()
         a_node->setRotation(m_init_hpr);
         a_node->setScale(m_init_scale);
         a_node->setLoopMode(m_is_looped);
+        a_node->setAnimationEndCallback(NULL);
         a_node->setCurrentFrame((float)(a_node->getStartFrame()));
 
         // trick to reset the animation AND also the timer inside it
@@ -658,49 +661,6 @@ void TrackObjectPresentationMesh::reset()
     }
 }   // reset
 
-// ----------------------------------------------------------------------------
-int TrackObjectPresentationMesh::getCurrentFrame()
-{
-    if (m_node->getType() == scene::ESNT_ANIMATED_MESH)
-    {
-        scene::IAnimatedMeshSceneNode *a_node =
-            (scene::IAnimatedMeshSceneNode*)m_node;
-
-        return (int)a_node->getFrameNr();
-    }
-    return -1; //Not a skeletal animation
-}   // getCurrentFrame
-
-// ----------------------------------------------------------------------------
-void TrackObjectPresentationMesh::setCurrentFrame(int frame)
-{
-    if (m_node->getType() == scene::ESNT_ANIMATED_MESH)
-    {
-        scene::IAnimatedMeshSceneNode *a_node =
-            (scene::IAnimatedMeshSceneNode*)m_node;
-
-        a_node->setCurrentFrame((f32)frame);
-    }
-}   // setCurrentFrame
-
-// ----------------------------------------------------------------------------
-/** Set custom loops, as well as pause by scripts.
- *  \param start Start frame.
- *  \param end End frame.
- */
-void TrackObjectPresentationMesh::setLoop(int start, int end)
-{
-    if (m_node->getType() == scene::ESNT_ANIMATED_MESH)
-    {
-        scene::IAnimatedMeshSceneNode *a_node =
-            (scene::IAnimatedMeshSceneNode*)m_node;
-
-        // irrlicht's "setFrameLoop" is a misnomer, it just sets the first and
-        // last frame, even if looping is disabled
-        a_node->setFrameLoop(start, end);
-    }
-}   // setLoop
-
 // ----------------------------------------------------------------------------
 TrackObjectPresentationSound::TrackObjectPresentationSound(
                                                      const XMLNode& xml_node,
@@ -1094,7 +1054,8 @@ void TrackObjectPresentationLight::setEnergy(float energy)
 }
 // ----------------------------------------------------------------------------
 TrackObjectPresentationActionTrigger::TrackObjectPresentationActionTrigger(
-                                                       const XMLNode& xml_node)
+                                                     const XMLNode& xml_node,
+                                                     TrackObject* parent)
                                     :  TrackObjectPresentation(xml_node)
 {
     float trigger_distance = 1.0f;
@@ -1115,11 +1076,36 @@ TrackObjectPresentationActionTrigger::TrackObjectPresentationActionTrigger(
     {
         assert(false);
     }
+    m_xml_reenable_timeout = 999999.9f;
+    xml_node.get("reenable-timeout", &m_xml_reenable_timeout);
+    m_reenable_timeout = 0.0f;
 
-    m_action_active = true;
-
-    if (m_action.size() == 0)
+    if (m_action.empty())
+    {
         Log::warn("TrackObject", "Action-trigger has no action defined.");
+        return;
+    }
+
+    if (parent != NULL)
+    {
+        core::vector3df parent_xyz = parent->getInitXYZ();
+        core::vector3df parent_rot = parent->getInitRotation();
+        core::vector3df parent_scale = parent->getInitScale();
+        core::matrix4 lm, sm, rm;
+        lm.setTranslation(parent_xyz);
+        sm.setScale(parent_scale);
+        rm.setRotationDegrees(parent_rot);
+        core::matrix4 abs_trans = lm * rm * sm;
+
+        m_library_id = parent->getID();
+        m_library_name = parent->getName();
+        xml_node.get("triggered-object", &m_triggered_object);
+        if (!m_library_id.empty() && !m_triggered_object.empty() &&
+            !m_library_name.empty())
+        {
+            abs_trans.transformVect(m_init_xyz);
+        }
+    }
 
     if (m_type == TRIGGER_TYPE_POINT)
     {
@@ -1149,7 +1135,8 @@ TrackObjectPresentationActionTrigger::TrackObjectPresentationActionTrigger(
     m_init_scale           = core::vector3df(1, 1, 1);
     float trigger_distance = distance;
     m_action               = script_name;
-    m_action_active        = true;
+    m_xml_reenable_timeout = 999999.9f;
+    m_reenable_timeout     = 0.0f;
     m_type                 = TRIGGER_TYPE_POINT;
     ItemManager::get()->newItem(m_init_xyz, trigger_distance, this);
 }   // TrackObjectPresentationActionTrigger
@@ -1157,13 +1144,36 @@ TrackObjectPresentationActionTrigger::TrackObjectPresentationActionTrigger(
 // ----------------------------------------------------------------------------
 void TrackObjectPresentationActionTrigger::onTriggerItemApproached()
 {
-    if (!m_action_active) return;
+    if (m_reenable_timeout > 0.0f)
+    {
+        return;
+    }
+    m_reenable_timeout = m_xml_reenable_timeout;
 
-    m_action_active = false; // TODO: allow auto re-activating?
-    int idKart = 0;
+    int kart_id = 0;
     Camera* camera = Camera::getActiveCamera();
     if (camera != NULL && camera->getKart() != NULL)
-        idKart = camera->getKart()->getWorldKartId();
-    Scripting::ScriptEngine::getInstance()->runFunction(true, "void " + m_action + "(int)",
-                               [=](asIScriptContext* ctx) { ctx->SetArgDWord(0, idKart); });
+    {
+        kart_id = camera->getKart()->getWorldKartId();
+    }
+    if (!m_library_id.empty() && !m_triggered_object.empty() &&
+        !m_library_name.empty())
+    {
+        Scripting::ScriptEngine::getInstance()->runFunction(true, "void "
+            + m_library_name + "::" + m_action +
+            "(int, const string, const string)", [=](asIScriptContext* ctx)
+            {
+                ctx->SetArgDWord(0, kart_id);
+                ctx->SetArgObject(1, &m_library_id);
+                ctx->SetArgObject(2, &m_triggered_object);
+            });
+    }
+    else
+    {
+        Scripting::ScriptEngine::getInstance()->runFunction(true,
+            "void " + m_action + "(int)", [=](asIScriptContext* ctx)
+            {
+                ctx->SetArgDWord(0, kart_id);
+            });
+    }
 }   // onTriggerItemApproached
diff --git a/src/tracks/track_object_presentation.hpp b/src/tracks/track_object_presentation.hpp
index 000ee5071..ed87ad248 100644
--- a/src/tracks/track_object_presentation.hpp
+++ b/src/tracks/track_object_presentation.hpp
@@ -251,9 +251,6 @@ public:
                                 const core::vector3df& hpr,
                                 const core::vector3df& scale);
     virtual ~TrackObjectPresentationMesh();
-    void setLoop(int start, int end);
-    void setCurrentFrame(int frame);
-    int getCurrentFrame();
     virtual void reset() OVERRIDE;
     // ------------------------------------------------------------------------
     /** Returns the mode file name. */
@@ -382,14 +379,15 @@ class TrackObjectPresentationActionTrigger : public TrackObjectPresentation,
 {
 private:
     /** For action trigger objects */
-    std::string m_action;
+    std::string m_action, m_library_id, m_triggered_object, m_library_name;
 
-    bool m_action_active;
+    float m_xml_reenable_timeout, m_reenable_timeout;
 
     ActionTriggerType m_type;
 
 public:
-    TrackObjectPresentationActionTrigger(const XMLNode& xml_node);
+    TrackObjectPresentationActionTrigger(const XMLNode& xml_node,
+                                         TrackObject* parent);
     TrackObjectPresentationActionTrigger(const core::vector3df& xyz,
                                          const std::string& scriptname,
                                          float distance);
@@ -399,11 +397,23 @@ public:
     virtual void onTriggerItemApproached() OVERRIDE;
     // ------------------------------------------------------------------------
     /** Reset the trigger (i.e. sets it to active again). */
-    virtual void reset() OVERRIDE { m_action_active = true; }
+    virtual void reset() OVERRIDE                { m_reenable_timeout = 0.0f; }
+    // ------------------------------------------------------------------------
+    virtual void update(float dt) OVERRIDE
+    {
+        if (m_reenable_timeout < 900000.0f)
+        {
+            m_reenable_timeout -= dt;
+        }
+    }
     // ------------------------------------------------------------------------
     /** Sets the trigger to be enabled or disabled. */
-    virtual void setEnable(bool status) OVERRIDE{ m_action_active = status; }
+    virtual void setEnable(bool status) OVERRIDE
+                            { m_reenable_timeout = status ? 0.0f : 999999.9f; }
+    // ------------------------------------------------------------------------
+    void setReenableTimeout(float time)          { m_reenable_timeout = time; }
 };   // class TrackObjectPresentationActionTrigger
 
 
 #endif // TRACKOBJECTPRESENTATION_HPP
+

From 79c6705bb14f1af96d47e1e2fdd73ea737190a66 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Wed, 9 Aug 2017 13:00:09 +0800
Subject: [PATCH 028/125] Fix #2814

---
 data/shaders/grass_pass.vert            |  2 +-
 data/shaders/grass_pass2.frag           | 21 +-----------
 data/shaders/instanced_grass.vert       |  2 +-
 data/shaders/instanced_grass_pass2.frag | 25 ++------------
 src/graphics/command_buffer.cpp         | 20 ------------
 src/graphics/command_buffer.hpp         | 10 +-----
 src/graphics/draw_policies.cpp          | 43 -------------------------
 src/graphics/materials.cpp              | 14 ++++----
 src/graphics/materials.hpp              |  4 +--
 9 files changed, 14 insertions(+), 127 deletions(-)

diff --git a/data/shaders/grass_pass.vert b/data/shaders/grass_pass.vert
index e6903c19e..c3c5d3721 100644
--- a/data/shaders/grass_pass.vert
+++ b/data/shaders/grass_pass.vert
@@ -20,7 +20,7 @@ out vec2 uv;
 void main()
 {
 
-    vec3 test = sin(windDir * (Position.y* 0.5)) * 0.5;
+    vec3 test = sin(windDir * (Position.y * 0.1)) * 1.;
     test += cos(windDir) * 0.7;
 
     mat4 new_model_matrix = ModelMatrix;
diff --git a/data/shaders/grass_pass2.frag b/data/shaders/grass_pass2.frag
index b5ebadbd9..c6d18a6c9 100644
--- a/data/shaders/grass_pass2.frag
+++ b/data/shaders/grass_pass2.frag
@@ -1,11 +1,9 @@
 #ifdef Use_Bindless_Texture
 layout(bindless_sampler) uniform sampler2D Albedo;
-layout(bindless_sampler) uniform sampler2D dtex;
 layout(bindless_sampler) uniform sampler2D SpecMap;
 layout(bindless_sampler) uniform sampler2D colorization_mask;
 #else
 uniform sampler2D Albedo;
-uniform sampler2D dtex;
 uniform sampler2D SpecMap;
 uniform sampler2D colorization_mask;
 #endif
@@ -36,25 +34,8 @@ void main(void)
         vec2 new_xy = mix(vec2(old_hsv.x, old_hsv.y), vec2(color_change.x, max(old_hsv.y, color_change.y)), vec2(mask_step, mask_step));
         color.xyz = hsvToRgb(vec3(new_xy.x, new_xy.y, old_hsv.z));
     }
-
-    vec2 texc = gl_FragCoord.xy / screen;
-    float z = texture(dtex, texc).x;
-
-    vec4 xpos = 2.0 * vec4(texc, z, 1.0) - 1.0f;
-    xpos = InverseProjectionMatrix * xpos;
-    xpos /= xpos.w;
-    vec3 eyedir = normalize(xpos.xyz);
-
-    // Inspired from http://http.developer.nvidia.com/GPUGems3/gpugems3_ch16.html
-    vec3 L = normalize((transpose(InverseViewMatrix) * vec4(sun_direction, 0.)).xyz);
-    float fEdotL = clamp(dot(L, eyedir), 0., 1.);
-    float fPowEdotL = pow(fEdotL, 4.);
-
-    float fLdotNBack  = max(0., - dot(nor, L) * 0.6 + 0.4);
-    float scattering = mix(fPowEdotL, fLdotNBack, .5);
-
     float specmap = texture(SpecMap, uv).g;
     float emitmap = texture(SpecMap, uv).b;
-    vec3 LightFactor = color.xyz * (scattering * 0.1) + getLightFactor(color.xyz, vec3(1.), specmap, emitmap);
+    vec3 LightFactor = getLightFactor(color.xyz, vec3(1.), specmap, emitmap);
     FragColor = vec4(LightFactor, 1.);
 }
diff --git a/data/shaders/instanced_grass.vert b/data/shaders/instanced_grass.vert
index 0127a8346..92cac1e4f 100644
--- a/data/shaders/instanced_grass.vert
+++ b/data/shaders/instanced_grass.vert
@@ -41,7 +41,7 @@ flat out sampler2D thirdhandle;
 
 void main()
 {
-    vec3 test = sin(windDir * (Position.y* 0.5)) * 0.5;
+    vec3 test = sin(windDir * (Position.y * 0.1)) * 1.;
     test += cos(windDir) * 0.7;
     mat4 ModelMatrix = getWorldMatrix(Origin + test * Color.r, Orientation, Scale);
     mat4 TransposeInverseModelView = transpose(getInverseWorldMatrix(Origin + test * Color.r, Orientation, Scale) * InverseViewMatrix);
diff --git a/data/shaders/instanced_grass_pass2.frag b/data/shaders/instanced_grass_pass2.frag
index 6ba698f7b..0577f3f75 100644
--- a/data/shaders/instanced_grass_pass2.frag
+++ b/data/shaders/instanced_grass_pass2.frag
@@ -1,9 +1,6 @@
-#ifdef Use_Bindless_Texture
-layout(bindless_sampler) uniform sampler2D dtex;
-#else
+#ifndef Use_Bindless_Texture
 uniform sampler2D Albedo;
 uniform sampler2D SpecMap;
-uniform sampler2D dtex;
 uniform sampler2D colorization_mask;
 #endif
 
@@ -45,24 +42,6 @@ void main(void)
         vec2 new_xy = mix(vec2(old_hsv.x, old_hsv.y), vec2(color_change.x, max(old_hsv.y, color_change.y)), vec2(mask_step, mask_step));
         color.xyz = hsvToRgb(vec3(new_xy.x, new_xy.y, old_hsv.z));
     }
-
-    vec2 texc = gl_FragCoord.xy / screen;
-    float z = texture(dtex, texc).x;
-
-    vec4 xpos = 2.0 * vec4(texc, z, 1.0) - 1.0f;
-    xpos = InverseProjectionMatrix * xpos;
-    xpos /= xpos.w;
-    vec3 eyedir = normalize(xpos.xyz);
-
-    // Inspired from http://http.developer.nvidia.com/GPUGems3/gpugems3_ch16.html
-    vec3 L = normalize((transpose(InverseViewMatrix) * vec4(sun_direction, 0.)).xyz);
-    float fEdotL = clamp(dot(L, eyedir), 0., 1.);
-    float fPowEdotL = pow(fEdotL, 4.);
-
-    float fLdotNBack  = max(0., - dot(nor, L) * 0.6 + 0.4);
-    float scattering = mix(fPowEdotL, fLdotNBack, .5);
-    
-    vec3 LightFactor = color.xyz * (scattering * 0.1) + getLightFactor(color.xyz, vec3(1.), specmap, emitmap);
-
+    vec3 LightFactor = getLightFactor(color.xyz, vec3(1.), specmap, emitmap);
     FragColor = vec4(LightFactor, 1.);
 }
diff --git a/src/graphics/command_buffer.cpp b/src/graphics/command_buffer.cpp
index 24df0d6cb..761ae122b 100644
--- a/src/graphics/command_buffer.cpp
+++ b/src/graphics/command_buffer.cpp
@@ -80,26 +80,6 @@ void InstanceFiller<GlowInstanceData>::add(GLMesh* mesh,
     instance.Color = nd->getGlowColor().color;
 }
 
-// ----------------------------------------------------------------------------
-template<>
-void expandTexSecondPass<GrassMat>(const GLMesh &mesh,
-                                   const std::vector<GLuint> &prefilled_tex)
-{
-    TexExpander<typename GrassMat::InstancedSecondPassShader>::
-        expandTex(mesh, GrassMat::SecondPassTextures, prefilled_tex[0],
-                  prefilled_tex[1], prefilled_tex[2], prefilled_tex[3]);
-}
-
-// ----------------------------------------------------------------------------
-template<>
-void expandHandlesSecondPass<GrassMat>(const std::vector<uint64_t> &handles)
-{
-    uint64_t nulltex[10] = {};
-    HandleExpander<GrassMat::InstancedSecondPassShader>::
-        expand(nulltex, GrassMat::SecondPassTextures,
-               handles[0], handles[1], handles[2], handles[3]);
-}
-
 #if !defined(USE_GLES2)
 // ----------------------------------------------------------------------------
 template<int N>
diff --git a/src/graphics/command_buffer.hpp b/src/graphics/command_buffer.hpp
index 565b2c7b2..c1e7543bd 100644
--- a/src/graphics/command_buffer.hpp
+++ b/src/graphics/command_buffer.hpp
@@ -112,11 +112,7 @@ void expandTexSecondPass(const GLMesh &mesh,
         expandTex(mesh, T::SecondPassTextures, prefilled_tex[0],
                   prefilled_tex[1], prefilled_tex[2]);
 }
-
-template<>
-void expandTexSecondPass<GrassMat>(const GLMesh &mesh,
-                                   const std::vector<GLuint> &prefilled_tex);
-                                   
+                   
 // ----------------------------------------------------------------------------
 /** Give acces textures for second rendering pass in shaders 
  * without first binding them in order to reduce driver overhead.
@@ -133,10 +129,6 @@ void expandHandlesSecondPass(const std::vector<uint64_t> &handles)
                handles[0], handles[1], handles[2]);
 }
 
-template<>
-void expandHandlesSecondPass<GrassMat>(const std::vector<uint64_t> &handles);
-
-
 #if !defined(USE_GLES2)
 // ----------------------------------------------------------------------------
 /**
diff --git a/src/graphics/draw_policies.cpp b/src/graphics/draw_policies.cpp
index 9414caa8c..b9e593f2e 100644
--- a/src/graphics/draw_policies.cpp
+++ b/src/graphics/draw_policies.cpp
@@ -89,49 +89,6 @@ void renderMeshes2ndPass( const std::vector<uint64_t> &Prefilled_Handle,
     }
 }   // renderMeshes2ndPass
 
-// ----------------------------------------------------------------------------
-template<>
-void renderMeshes2ndPass<GrassMat, 4, 3, 1>
-    (const std::vector<uint64_t> &Prefilled_Handle,
-     const std::vector<GLuint> &Prefilled_Tex)
-{
-    auto &meshes = GrassMat::List::getInstance()->SolidPass;
-    GrassMat::SecondPassShader::getInstance()->use();
-    if (CVS->isARBBaseInstanceUsable())
-        glBindVertexArray(VAOManager::getInstance()->getVAO(GrassMat::VertexType));
-    for (unsigned i = 0; i < meshes.size(); i++)
-    {
-        GLMesh &mesh = *(std::get<0>(meshes.at(i)));
-        if (!CVS->isARBBaseInstanceUsable())
-            glBindVertexArray(mesh.vao);
-
-        if (mesh.VAOType != GrassMat::VertexType)
-        {
-#ifdef DEBUG
-            Log::error("Materials", "Wrong vertex Type associed to pass 2 "
-                                    "(hint texture : %s)",
-                       mesh.textures[0]->getName().getPath().c_str());
-#endif
-            continue;
-        }
-
-        if (CVS->isAZDOEnabled())
-        {
-            HandleExpander<GrassMat::SecondPassShader>::
-                expand(mesh.TextureHandles, GrassMat::SecondPassTextures,
-                       Prefilled_Handle[0], Prefilled_Handle[1],
-                       Prefilled_Handle[2], Prefilled_Handle[3]);
-        }
-        else
-        {
-            TexExpander<GrassMat::SecondPassShader>::
-                expandTex(mesh, GrassMat::SecondPassTextures, Prefilled_Tex[0],
-                          Prefilled_Tex[1], Prefilled_Tex[2], Prefilled_Tex[3]);
-        }
-        CustomUnrollArgs<4, 3, 1>::drawMesh<GrassMat::SecondPassShader>(meshes.at(i));
-    }
-}   // renderMeshes2ndPass
-
 // ----------------------------------------------------------------------------
 template<typename T, int...List>
 void renderShadow(unsigned cascade)
diff --git a/src/graphics/materials.cpp b/src/graphics/materials.cpp
index e7b098071..681f43b76 100644
--- a/src/graphics/materials.cpp
+++ b/src/graphics/materials.cpp
@@ -432,10 +432,9 @@ GrassPass2Shader::GrassPass2Shader()
     assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
                        1, "SpecularMap", ST_NEAREST_FILTERED,
                        2, "SSAO", ST_BILINEAR_FILTERED,
-                       3, "dtex", ST_NEAREST_FILTERED,
-                       4, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                       5, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                       6, "colorization_mask",
+                       3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                       4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                       5, "colorization_mask",
                        ST_TRILINEAR_ANISOTROPIC_FILTERED);
 }   // GrassPass2Shader
 
@@ -448,10 +447,9 @@ InstancedGrassPass2Shader::InstancedGrassPass2Shader()
     assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
                        1, "SpecularMap", ST_NEAREST_FILTERED,
                        2, "SSAO", ST_BILINEAR_FILTERED,
-                       3, "dtex", ST_NEAREST_FILTERED,
-                       4, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                       5, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                       6, "colorization_mask",
+                       3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                       4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                       5, "colorization_mask",
                        ST_TRILINEAR_ANISOTROPIC_FILTERED);
 }   // InstancedGrassPass2Shader
 
diff --git a/src/graphics/materials.hpp b/src/graphics/materials.hpp
index 4bc52bd82..8cce5a087 100644
--- a/src/graphics/materials.hpp
+++ b/src/graphics/materials.hpp
@@ -260,7 +260,7 @@ public:
 };   // InstancedGrassShadowShader
 
 // ============================================================================
-class GrassPass2Shader : public TextureShader<GrassPass2Shader, 7,
+class GrassPass2Shader : public TextureShader<GrassPass2Shader, 6,
                                               core::matrix4, core::vector3df,
                                               core::vector2df>
 {
@@ -270,7 +270,7 @@ public:
 
 // ============================================================================
 class InstancedGrassPass2Shader
-          : public TextureShader<InstancedGrassPass2Shader, 7, core::vector3df>
+          : public TextureShader<InstancedGrassPass2Shader, 6, core::vector3df>
 {
 public:
     InstancedGrassPass2Shader();

From cc8331f5cdf8a51b473fcb71b7d34f487478cb51 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Wed, 9 Aug 2017 15:03:37 +0800
Subject: [PATCH 029/125] Fix #2897

---
 data/shaders/billboard.frag            |  2 ++
 data/shaders/billboard.vert            |  6 ++--
 src/graphics/shader_based_renderer.cpp |  2 ++
 src/graphics/stk_billboard.cpp         | 49 ++++++++++++++++++--------
 src/graphics/stk_billboard.hpp         |  5 +++
 5 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/data/shaders/billboard.frag b/data/shaders/billboard.frag
index 7b7af00a8..6f583946a 100644
--- a/data/shaders/billboard.frag
+++ b/data/shaders/billboard.frag
@@ -1,10 +1,12 @@
 uniform sampler2D tex;
 
 in vec2 uv;
+in vec4 vertex_color;
 out vec4 FragColor;
 
 void main(void)
 {
     vec4 color = texture(tex, uv);
+    color *= vertex_color;
     FragColor = vec4(color.a * color.rgb, color.a);
 }
diff --git a/data/shaders/billboard.vert b/data/shaders/billboard.vert
index 06882526d..c47b2f15a 100644
--- a/data/shaders/billboard.vert
+++ b/data/shaders/billboard.vert
@@ -1,4 +1,4 @@
-uniform mat4 ModelViewMatrix;
+uniform mat4 color_matrix;
 uniform vec3 Position;
 uniform vec2 Size;
 
@@ -11,10 +11,12 @@ in vec2 Texcoord;
 #endif
 
 out vec2 uv;
+out vec4 vertex_color;
 
 void main(void)
 {
     uv = Texcoord;
-    vec4 Center = ModelViewMatrix * vec4(Position, 1.);
+    vec4 Center = ViewMatrix * vec4(Position, 1.);
     gl_Position = ProjectionMatrix * (Center + vec4(Size * Corner, 0., 0.));
+    vertex_color = color_matrix[gl_VertexID];
 }
diff --git a/src/graphics/shader_based_renderer.cpp b/src/graphics/shader_based_renderer.cpp
index 1d253cb58..8a86c2464 100644
--- a/src/graphics/shader_based_renderer.cpp
+++ b/src/graphics/shader_based_renderer.cpp
@@ -33,6 +33,7 @@
 #include "graphics/rtts.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/skybox.hpp"
+#include "graphics/stk_billboard.hpp"
 #include "graphics/stk_mesh_scene_node.hpp"
 #include "graphics/spherical_harmonics.hpp"
 #include "items/item_manager.hpp"
@@ -659,6 +660,7 @@ ShaderBasedRenderer::~ShaderBasedRenderer()
     delete m_skybox;
     delete m_rtts;
     ShaderFilesManager::kill();
+    STKBillboard::destroyBillboardVAO();
 }
 
 // ----------------------------------------------------------------------------
diff --git a/src/graphics/stk_billboard.cpp b/src/graphics/stk_billboard.cpp
index 2a3d99ca8..53c0cb39c 100644
--- a/src/graphics/stk_billboard.cpp
+++ b/src/graphics/stk_billboard.cpp
@@ -30,10 +30,10 @@
 using namespace irr;
 
 
-static GLuint billboardvao = 0;
+GLuint STKBillboard::m_billboard_vao = 0;
 
 
-class BillboardShader : public TextureShader<BillboardShader, 1, core::matrix4,
+class BillboardShader : public TextureShader<BillboardShader, 1,
                                       core::matrix4, core::vector3df,
                                       core::dimension2df>
 {
@@ -43,18 +43,16 @@ public:
         loadProgram(OBJECT, GL_VERTEX_SHADER, "billboard.vert",
                             GL_FRAGMENT_SHADER, "billboard.frag");
 
-        assignUniforms("ModelViewMatrix", "ProjectionMatrix", "Position",
-                       "Size");
+        assignUniforms("color_matrix", "Position", "Size");
         assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }   // BillboardShader
 };   // BillboardShader
 
 // ============================================================================
-
-static void createBillboardVAO()
+void STKBillboard::createBillboardVAO()
 {
-    glGenVertexArrays(1, &billboardvao);
-    glBindVertexArray(billboardvao);
+    glGenVertexArrays(1, &m_billboard_vao);
+    glBindVertexArray(m_billboard_vao);
     glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getBillboardVBO());
     glEnableVertexAttribArray(0);
     glEnableVertexAttribArray(3);
@@ -64,6 +62,16 @@ static void createBillboardVAO()
     glBindVertexArray(0);
 }   // createBillboardVAO
 
+// ----------------------------------------------------------------------------
+void STKBillboard::destroyBillboardVAO()
+{
+    if (m_billboard_vao != 0)
+    {
+        glDeleteVertexArrays(1, &m_billboard_vao);
+        m_billboard_vao = 0;
+    }
+}   // destroyBillboardVAO
+
 // ----------------------------------------------------------------------------
 STKBillboard::STKBillboard(irr::scene::ISceneNode* parent,
                            irr::scene::ISceneManager* mgr, irr::s32 id,
@@ -75,7 +83,7 @@ STKBillboard::STKBillboard(irr::scene::ISceneNode* parent,
               CBillboardSceneNode(parent, mgr, id, position, size, 
                                   colorTop, colorBottom)
 {
-    if (!billboardvao)
+    if (!m_billboard_vao)
         createBillboardVAO();
 }   // STKBillboard
 
@@ -97,9 +105,9 @@ void STKBillboard::render()
         return;
 
     core::vector3df pos = getAbsolutePosition();
-    glBindVertexArray(billboardvao);
+    glBindVertexArray(m_billboard_vao);
     video::ITexture *tex = Material.getTexture(0);
-    if (!tex )
+    if (!tex)
         return;
 
     ::Material* material = material_manager->getMaterialFor(tex, 
@@ -109,11 +117,24 @@ void STKBillboard::render()
     else
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
+    video::SColor col[2];
+    getColor(col[0], col[1]);
+    const float colors[] =
+    {
+        col[1].getRed() / 255.f, col[1].getGreen() / 255.f,
+        col[1].getBlue() / 255.f, col[1].getAlpha() / 255.f,
+        col[0].getRed() / 255.f, col[0].getGreen() / 255.f,
+        col[0].getBlue() / 255.f, col[0].getAlpha() / 255.f,
+        col[1].getRed() / 255.f, col[1].getGreen() / 255.f,
+        col[1].getBlue() / 255.f, col[1].getAlpha() / 255.f,
+        col[0].getRed() / 255.f, col[0].getGreen() / 255.f,
+        col[0].getBlue() / 255.f, col[0].getAlpha() / 255.f,
+    };
+    core::matrix4 color_matrix;
+    color_matrix.setM(colors);
     BillboardShader::getInstance()->use();
     BillboardShader::getInstance()->setTextureUnits(tex->getOpenGLTextureName());
-    BillboardShader::getInstance()->setUniforms(irr_driver->getViewMatrix(), 
-                                                irr_driver->getProjMatrix(),
-                                                pos, Size);
+    BillboardShader::getInstance()->setUniforms(color_matrix, pos, Size);
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
     glBindVertexArray(0);
 }   // render
diff --git a/src/graphics/stk_billboard.hpp b/src/graphics/stk_billboard.hpp
index 63ef48d4d..b8a8be723 100644
--- a/src/graphics/stk_billboard.hpp
+++ b/src/graphics/stk_billboard.hpp
@@ -21,10 +21,14 @@
 #include "../lib/irrlicht/source/Irrlicht/CBillboardSceneNode.h"
 #include <IBillboardSceneNode.h>
 #include <irrTypes.h>
+#include "graphics/gl_headers.hpp"
 #include "utils/cpp2011.hpp"
 
 class STKBillboard : public irr::scene::CBillboardSceneNode
 {
+private:
+    static GLuint m_billboard_vao;
+    static void createBillboardVAO();
 public:
     STKBillboard(irr::scene::ISceneNode* parent, irr::scene::ISceneManager* mgr,
                  irr::s32 id, const irr::core::vector3df& position, 
@@ -35,6 +39,7 @@ public:
     virtual void OnRegisterSceneNode() OVERRIDE;
 
     virtual void render() OVERRIDE;
+    static void destroyBillboardVAO();
 };   // STKBillboard
 
 #endif

From 861e7f7ebd885a1bb19d795c2dbe98ae1c2675fc Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Wed, 9 Aug 2017 15:36:26 +0800
Subject: [PATCH 030/125] Remove contradiction

---
 src/karts/kart_model.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index ebd1fb17c..111eab374 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -273,7 +273,6 @@ KartModel::~KartModel()
     for (size_t i = 0; i < m_headlight_objects.size(); i++)
     {
         HeadlightObject& obj = m_headlight_objects[i];
-        obj.setNode(NULL);
         if (obj.getNode())
         {
             // Master KartModels should never have a headlight attached.

From d46b03b317de7c19ffcb58592919864402a96e15 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 9 Aug 2017 17:54:29 +1000
Subject: [PATCH 031/125] Hopefully fixed cygwin build problems.

---
 lib/irrlicht/CMakeLists.txt                      | 2 +-
 lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
index 545e857ca..89de9cf10 100644
--- a/lib/irrlicht/CMakeLists.txt
+++ b/lib/irrlicht/CMakeLists.txt
@@ -570,5 +570,5 @@ if(ENABLE_WAYLAND_DEVICE)
 endif()
 
 if(WIN32)
-    target_link_libraries(stkirrlicht imm32 XINPUT9_1_0.LIB)
+    target_link_libraries(stkirrlicht imm32 XINPUT9_1_0)
 endif()
diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
index a5d0644db..32863337c 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -23,8 +23,14 @@
 // This define will switch to use XInput 9.1, which does not
 // require an installer and works on most windows platforms.
 // See https://blogs.msdn.microsoft.com/chuckw/2012/04/25/xinput-and-windows-8/
+#ifdef __CYGWIN__
+#define _WIN32_WINNT 0x0601
+#include <xinput.h>
+#else
+#undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0601
 #include <Xinput.h>
+#endif
 #ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
 #define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>

From e03c0849ce908b1b3ba8c093118c0266de487b1a Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 9 Aug 2017 20:30:44 +1000
Subject: [PATCH 032/125] Fixed previous commit - got confused with the #undef
 :P

---
 lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
index 32863337c..90fc86c1e 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -23,12 +23,11 @@
 // This define will switch to use XInput 9.1, which does not
 // require an installer and works on most windows platforms.
 // See https://blogs.msdn.microsoft.com/chuckw/2012/04/25/xinput-and-windows-8/
-#ifdef __CYGWIN__
-#define _WIN32_WINNT 0x0601
-#include <xinput.h>
-#else
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0601
+#ifdef __CYGWIN__
+#include <xinput.h>
+#else
 #include <Xinput.h>
 #endif
 #ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_

From 936ef3c4c732aaa126a116d1ed853ec3f952cab4 Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Wed, 9 Aug 2017 19:37:49 -0400
Subject: [PATCH 033/125] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f12f5b50..ba326e73e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * Hardware skinning
 * New smoother camera by Auria
 * New grand prix win scene
+* Gamepad configuration bugfixes
 * Various improvements (wall driving fixes, parachutes, GP points, cannon fixes, colorization shader)
 
 ## SuperTuxKart 0.9.2

From 5b68e18df412629fe5e57f9484b995965a58e21f Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 11 Aug 2017 09:38:58 +1000
Subject: [PATCH 034/125] Fix cygwin support.

---
 lib/irrlicht/CMakeLists.txt                      | 2 +-
 lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
index 89de9cf10..ae2b46f41 100644
--- a/lib/irrlicht/CMakeLists.txt
+++ b/lib/irrlicht/CMakeLists.txt
@@ -570,5 +570,5 @@ if(ENABLE_WAYLAND_DEVICE)
 endif()
 
 if(WIN32)
-    target_link_libraries(stkirrlicht imm32 XINPUT9_1_0)
+    target_link_libraries(stkirrlicht imm32 xinput9_1_0)
 endif()
diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
index 90fc86c1e..ffead1982 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -25,11 +25,8 @@
 // See https://blogs.msdn.microsoft.com/chuckw/2012/04/25/xinput-and-windows-8/
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0601
-#ifdef __CYGWIN__
+// Don't change the case of xinput.h, otherwise cygwin compilation fails.
 #include <xinput.h>
-#else
-#include <Xinput.h>
-#endif
 #ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
 #define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>

From 3923da30bcbaa33160297280cf825dafd8d53dd6 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 11 Aug 2017 09:41:22 +1000
Subject: [PATCH 035/125] Use unique names for profiler events.

---
 src/main_loop.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main_loop.cpp b/src/main_loop.cpp
index 6f97697f2..446320c0e 100644
--- a/src/main_loop.cpp
+++ b/src/main_loop.cpp
@@ -256,7 +256,7 @@ void MainLoop::run()
         // enabled.
         if (!m_abort && !ProfileWorld::isNoGraphics())
         {
-            PROFILER_PUSH_CPU_MARKER("Music/input/GUI", 0x7F, 0x00, 0x00);
+            PROFILER_PUSH_CPU_MARKER("Input/GUI", 0x7F, 0x00, 0x00);
             input_manager->update(dt);
 
             #ifdef ENABLE_WIIUSE
@@ -269,7 +269,7 @@ void MainLoop::run()
             // Update sfx and music after graphics, so that graphics code
             // can use as many threads as possible without interfering
             // with audio
-            PROFILER_PUSH_CPU_MARKER("Music/input/GUI", 0x7F, 0x00, 0x00);
+            PROFILER_PUSH_CPU_MARKER("Music", 0x7F, 0x00, 0x00);
             SFXManager::get()->update();
             PROFILER_POP_CPU_MARKER();
 

From cf868df93f628e56301b0064dffd32c469fd3bb1 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sun, 13 Aug 2017 01:03:13 +0200
Subject: [PATCH 036/125] Fixed memory leaks in wayland device

---
 .../source/Irrlicht/CIrrDeviceWayland.cpp     | 44 ++++++++++++++++---
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp
index 8493ecf5a..6ceff83f3 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp
@@ -715,6 +715,9 @@ CIrrDeviceWayland::CIrrDeviceWayland(const SIrrlichtCreationParameters& params)
 CIrrDeviceWayland::~CIrrDeviceWayland()
 {
     delete m_egl_context;
+    
+    if (m_egl_window)
+        wl_egl_window_destroy(m_egl_window);
 
     if (m_keyboard)
         wl_keyboard_destroy(m_keyboard);
@@ -730,15 +733,46 @@ CIrrDeviceWayland::~CIrrDeviceWayland()
 
     if (m_shell_surface)
         wl_shell_surface_destroy(m_shell_surface);
+        
+    if (m_surface)
+        wl_surface_destroy(m_surface);
+        
+    if (m_shell)
+        wl_shell_destroy(m_shell);
+        
+    if (m_shm)
+        wl_shm_destroy(m_shm);
+        
+    if (m_compositor)
+        wl_compositor_destroy(m_compositor);
+
+    if (m_output)
+        wl_output_destroy(m_output);
+
+    if (m_seat)
+        wl_seat_destroy(m_seat);
+
+    if (m_registry)
+        wl_registry_destroy(m_registry);
+
+    if (m_xkb_state)
+        xkb_state_unref(m_xkb_state);
+        
+    if (m_xkb_keymap)
+        xkb_keymap_unref(m_xkb_keymap);
+        
+    if (m_xkb_compose_state)
+        xkb_compose_state_unref(m_xkb_compose_state);
+        
+    if (m_xkb_compose_table)
+        xkb_compose_table_unref(m_xkb_compose_table);
+
+    if (m_xkb_context)
+        xkb_context_unref(m_xkb_context);
 
-    wl_output_destroy(m_output);
-    wl_seat_destroy(m_seat);
-    wl_registry_destroy(m_registry);
     wl_display_flush(m_display);
     wl_display_disconnect(m_display);
 
-    xkb_context_unref(m_xkb_context);
-
     closeJoysticks();
 }
 

From fd4ab9d88f94c794f349c454d3c0012bdd0bc9c3 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sun, 13 Aug 2017 01:04:19 +0200
Subject: [PATCH 037/125] Fixed possible uninitialized variable in gles
 renderer

---
 lib/irrlicht/source/Irrlicht/COGLES2MaterialRenderer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/irrlicht/source/Irrlicht/COGLES2MaterialRenderer.cpp b/lib/irrlicht/source/Irrlicht/COGLES2MaterialRenderer.cpp
index fea967bee..a068dbf3f 100644
--- a/lib/irrlicht/source/Irrlicht/COGLES2MaterialRenderer.cpp
+++ b/lib/irrlicht/source/Irrlicht/COGLES2MaterialRenderer.cpp
@@ -93,7 +93,7 @@ COGLES2MaterialRenderer::~COGLES2MaterialRenderer()
 	if (Program)
 	{
 		GLuint shaders[8];
-		GLint count;
+		GLint count = 0;
 		glGetAttachedShaders(Program, 8, &count, shaders);
 
 		count=core::min_(count,8);

From ee5bdad9260d6eb65245f6fed0529334f0e61e95 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sun, 13 Aug 2017 01:12:00 +0200
Subject: [PATCH 038/125] Move output/seat listener to better place

---
 lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp
index 6ceff83f3..0c504d84f 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp
@@ -537,6 +537,7 @@ public:
             device->m_seat = static_cast<wl_seat*>(wl_registry_bind(registry,
                                                    name, &wl_seat_interface,
                                                    version < 4 ? version : 4));
+            wl_seat_add_listener(device->m_seat, &seat_listener, device);
         }
         else if (interface_str == "wl_shm")
         {
@@ -547,6 +548,7 @@ public:
         {
             device->m_output = static_cast<wl_output*>(wl_registry_bind(registry,
                                                 name, &wl_output_interface, 2));
+            wl_output_add_listener(device->m_output, &output_listener, device);
         }
     }
 
@@ -700,9 +702,6 @@ CIrrDeviceWayland::CIrrDeviceWayland(const SIrrlichtCreationParameters& params)
             return;
     }
 
-    wl_seat_add_listener(m_seat, &WaylandCallbacks::seat_listener, this);
-    wl_output_add_listener(m_output, &WaylandCallbacks::output_listener, this);
-
     createDriver();
 
     if (VideoDriver)

From 1f4a9135b63e2c7fd258c0e91f23d2b02ed98998 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sun, 13 Aug 2017 01:20:22 +0200
Subject: [PATCH 039/125] Remove useless elif

---
 src/graphics/shader_based_renderer.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/graphics/shader_based_renderer.cpp b/src/graphics/shader_based_renderer.cpp
index 8a86c2464..0a6aca980 100644
--- a/src/graphics/shader_based_renderer.cpp
+++ b/src/graphics/shader_based_renderer.cpp
@@ -59,12 +59,9 @@ void ShaderBasedRenderer::setRTT(RTT* rtts)
                                  rtts->getDepthStencilTexture());
         m_geometry_passes->setFirstPassRenderTargets(prefilled_textures,
             rtts->getPrefilledHandles());
-        m_rtts = rtts;
-    }
-    else if (rtts == NULL)
-    {
-        m_rtts = NULL;
     }
+    
+    m_rtts = rtts;
 } //setRTT
 
 // ----------------------------------------------------------------------------

From 0bf0ca0a35b31e5161a60cb09e8c700af1ffd57a Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sun, 13 Aug 2017 01:34:43 +0200
Subject: [PATCH 040/125] Fixed memory leak

---
 src/input/device_manager.cpp | 6 ++++++
 src/input/device_manager.hpp | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/input/device_manager.cpp b/src/input/device_manager.cpp
index e5fc6f144..4ea2b0059 100644
--- a/src/input/device_manager.cpp
+++ b/src/input/device_manager.cpp
@@ -47,6 +47,12 @@ DeviceManager::DeviceManager()
     m_multitouch_device = NULL;
 }   // DeviceManager
 
+// -----------------------------------------------------------------------------
+DeviceManager::~DeviceManager()
+{
+    delete m_multitouch_device;
+}   // ~DeviceManager
+
 // -----------------------------------------------------------------------------
 bool DeviceManager::initialize()
 {
diff --git a/src/input/device_manager.hpp b/src/input/device_manager.hpp
index 341ebaf5f..e9e0388cc 100644
--- a/src/input/device_manager.hpp
+++ b/src/input/device_manager.hpp
@@ -103,6 +103,7 @@ public:
 
 
     DeviceManager();
+    ~DeviceManager();
 
     // ---- Assign mode ----
     PlayerAssignMode    getAssignMode() const               { return m_assign_mode; }

From 71bbafadbd35a98921208c3fa74a7fd99941df0c Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sun, 13 Aug 2017 22:02:55 +0200
Subject: [PATCH 041/125] Fixed memory leaks in gles

---
 lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp |  3 +++
 lib/irrlicht/source/Irrlicht/COGLES2Driver.cpp   | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
index 85dd171f8..4f4ed1358 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
@@ -1218,6 +1218,9 @@ bool CIrrDeviceLinux::createInputContext()
 		return false;
 	}
 
+	// It's showed as memory leak, but we shouldn't delete it. From the xlib
+	// documentation: "The returned modifiers string is owned by Xlib and 
+	// should not be modified or freed by the client."
 	char* p = XSetLocaleModifiers("");
 	if (p == NULL)
 	{
diff --git a/lib/irrlicht/source/Irrlicht/COGLES2Driver.cpp b/lib/irrlicht/source/Irrlicht/COGLES2Driver.cpp
index 77890ecf5..7b86362e7 100644
--- a/lib/irrlicht/source/Irrlicht/COGLES2Driver.cpp
+++ b/lib/irrlicht/source/Irrlicht/COGLES2Driver.cpp
@@ -432,6 +432,13 @@ namespace video
 		addAndDropMaterialRenderer(new COGLES2ParallaxMapRenderer(PMVSData, PMFSData, EMT_PARALLAX_MAP_TRANSPARENT_VERTEX_ALPHA, this));
 
 		addAndDropMaterialRenderer(new COGLES2FixedPipelineRenderer(FPVSData, FPFSData, EMT_ONETEXTURE_BLEND, this));
+		
+		delete[] FPVSData;
+		delete[] FPFSData;
+		delete[] NMVSData;
+		delete[] NMFSData;
+		delete[] PMVSData;
+		delete[] PMFSData;
 
 		// Create 2D material renderer.
 
@@ -476,6 +483,9 @@ namespace video
 			R2DFSFile->drop();
 
 		MaterialRenderer2D = new COGLES2Renderer2D(R2DVSData, R2DFSData, this);
+
+		delete[] R2DVSData;
+		delete[] R2DFSData;
 	}
 
 

From 0a2d05a998ff354d7d0e07e86cd632e206424299 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Tue, 15 Aug 2017 09:00:49 +0200
Subject: [PATCH 042/125] Add a possibility to convert png->jpg for spm format
 for smaller apk

---
 android/generate_assets.sh | 144 +++++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)

diff --git a/android/generate_assets.sh b/android/generate_assets.sh
index b76822c6a..2c0c26d47 100755
--- a/android/generate_assets.sh
+++ b/android/generate_assets.sh
@@ -401,6 +401,149 @@ convert_b3d()
    mv tmp.b3d "$FILE"
 }
 
+convert_spm()
+{
+   if [ -z "$1" ]; then
+      echo "No file to convert"
+      return
+   fi
+
+   FILE="$1"
+   echo "Convert file: $FILE"
+
+   if [ ! -f "$FILE" ]; then
+      echo "  File doesn't exist."
+      return
+   fi
+
+   HEX_FILE=`hexdump -ve '1/1 "%.2x"' "$FILE"`
+   
+   SP_HEADER="5350"
+   SP_FOUND=`echo $HEX_FILE | head -c 4`
+
+   if [ -z "$SP_FOUND" ] || [ "$SP_FOUND" != "$SP_HEADER" ]; then
+      echo "  Unsupported format."
+      return
+   fi
+
+   TEXS_BEGIN=60
+   TEXS_COUNT=`echo $HEX_FILE | head -c $TEXS_BEGIN | tail -c 4`
+   
+   TEXS_COUNT_CONVERTED=`echo $TEXS_COUNT | cut -c3-4`
+   TEXS_COUNT_CONVERTED=$TEXS_COUNT_CONVERTED`echo $TEXS_COUNT | cut -c1-2`
+   TEXS_COUNT_CONVERTED=`echo $((0x$TEXS_COUNT_CONVERTED))`
+   TEXS_COUNT_CONVERTED=$(($TEXS_COUNT_CONVERTED * 2))
+   
+   if [ $TEXS_COUNT_CONVERTED -le 0 ]; then
+      echo "  Invalid textures count value."
+      return
+   fi
+
+   CURR_POS=$(($TEXS_BEGIN + 2))
+
+   cp "$FILE" tmp.spm
+
+   while [ $TEXS_COUNT_CONVERTED -gt 0 ]; do
+      TEXS_COUNT_CONVERTED=$(($TEXS_COUNT_CONVERTED - 1))
+
+      TEX_LEN=`echo $HEX_FILE | head -c $(($CURR_POS)) | tail -c 2`
+      TEX_LEN=`echo $((0x$TEX_LEN))`
+
+      TEXNAME_BEGIN=$(($CURR_POS / 2))
+      TEXNAME_END=$(($CURR_POS / 2 + $TEX_LEN))
+      CURR_POS=$(($CURR_POS + 2 + $TEX_LEN * 2))
+      
+      if [ $TEX_LEN -eq 0 ]; then
+         echo "  Empty texture name, ignore..."
+         continue
+      fi
+
+      TEXTURE_NAME=`dd if="$FILE" bs=1 skip=$TEXNAME_BEGIN \
+                     count=$(($TEXNAME_END - $TEXNAME_BEGIN)) 2> /dev/null`
+                     
+      DIRNAME=`dirname "$FILE"`
+      TEXTURE_PATH="$DIRNAME/$TEXTURE_NAME"
+
+      echo "  Texture: $TEXTURE_NAME"
+
+      ALREADY_CONVERTED=0
+
+      if [ -s "./converted_textures" ]; then
+         while read -r CONVERTED_TEXTURE; do
+            if [ "$TEXTURE_PATH" = "$CONVERTED_TEXTURE" ]; then
+               ALREADY_CONVERTED=1
+               break
+            fi
+         done < "./converted_textures"
+      fi
+
+      if [ $ALREADY_CONVERTED -eq 0 ]; then
+         if [ ! -f "$TEXTURE_PATH" ]; then
+            echo "  Couldn't find texture file. Ignore..."
+            continue
+         fi
+
+         FILE_EXTENSION=`echo "$TEXTURE_PATH" | tail -c 5`
+
+         if [ `echo "$FILE_EXTENSION" | head -c 1` != "." ]; then
+            echo "  Unsupported file extension. Ignore..."
+            continue
+         fi
+
+         FILE_FORMAT=`identify -format %m "$TEXTURE_PATH"`
+
+         if [ "$FILE_FORMAT" = "JPEG" ]; then
+            echo "  File is already JPEG. Ignore..."
+            continue
+         fi
+
+         #IS_OPAQUE=`identify -format '%[opaque]' "$TEXTURE_PATH"`
+         HAS_ALPHA=`identify -format '%A' "$TEXTURE_PATH"`
+
+         if [ "$HAS_ALPHA" = "True" ] || [ "$HAS_ALPHA" = "true" ]; then
+            echo "  File has alpha channel. Ignore..."
+            continue
+         fi
+
+         NEW_TEXTURE_NAME="`echo $TEXTURE_NAME | head -c -5`.jpg"
+         NEW_TEXTURE_PATH="`echo $TEXTURE_PATH | head -c -5`.jpg"
+
+         if [ -f "$NEW_TEXTURE_PATH" ]; then
+            echo "  There is already a file with .jpg extension. Ignore..."
+            continue
+         fi
+
+         convert -quality $JPEG_QUALITY "$TEXTURE_PATH" "$NEW_TEXTURE_PATH"
+         rm -f "$TEXTURE_PATH"
+
+         if [ -s "$DIRNAME/materials.xml" ]; then
+            sed -i "s/name=\"$TEXTURE_NAME\"/name=\"$NEW_TEXTURE_NAME\"/g" \
+                                                      "$DIRNAME/materials.xml"
+         fi
+
+         if [ -s "$DIRNAME/scene.xml" ]; then
+            sed -i "s/name=\"$TEXTURE_NAME\"/name=\"$NEW_TEXTURE_NAME\"/g" \
+                                                      "$DIRNAME/scene.xml"
+         fi
+
+         echo "$TEXTURE_PATH" >> "./converted_textures"
+      fi
+
+      echo -n ".jpg" | dd of=./tmp.spm bs=1 seek=$(($TEXNAME_END - 4)) \
+                                                      conv=notrunc 2> /dev/null
+   done
+   
+   SIZE_OLD=`du -b "$FILE" | cut -f1`
+   SIZE_NEW=`du -b "tmp.spm" | cut -f1`
+
+   if [ $SIZE_NEW -ne $SIZE_OLD ]; then
+      echo "  Something went wrong..."
+      exit
+   fi
+
+   mv tmp.spm "$FILE"
+}
+
 
 if [ $DECREASE_QUALITY -gt 0 ]; then
    find assets/data -iname "*.png" | while read f; do convert_image "$f" "png"; done
@@ -411,6 +554,7 @@ fi
 
 if [ $CONVERT_TO_JPG -gt 0 ]; then
    find assets/data -iname "*.b3d" | while read f; do convert_b3d "$f"; done
+   find assets/data -iname "*.spm" | while read f; do convert_spm "$f"; done
 
    if [ -s "./converted_textures" ]; then
       echo "Converted textures:"

From 4da945f710480fd1a0fc10d50dd741715c873809 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Tue, 15 Aug 2017 09:58:06 +0200
Subject: [PATCH 043/125] Move duplicated code to separate function

---
 android/generate_assets.sh | 250 ++++++++++++++-----------------------
 1 file changed, 94 insertions(+), 156 deletions(-)

diff --git a/android/generate_assets.sh b/android/generate_assets.sh
index 2c0c26d47..c2774b113 100755
--- a/android/generate_assets.sh
+++ b/android/generate_assets.sh
@@ -250,6 +250,92 @@ convert_sound()
    rm -f tmp.wav tmp.ogg
 }
 
+convert_model()
+{
+   if [ -z "$1" ]; then
+      echo "No texture path provided"
+      return
+   fi
+
+   TEXTURE_PATH="$1"
+   
+   echo "  Texture: $TEXTURE_NAME"
+
+   ALREADY_CONVERTED=0
+
+   if [ -s "./converted_textures" ]; then
+      while read -r CONVERTED_TEXTURE; do
+         if [ "$TEXTURE_PATH" = "$CONVERTED_TEXTURE" ]; then
+            ALREADY_CONVERTED=1
+            break
+         fi
+      done < "./converted_textures"
+   fi
+
+   if [ $ALREADY_CONVERTED -eq 0 ]; then
+      if [ ! -f "$TEXTURE_PATH" ]; then
+         echo "  Couldn't find texture file. Ignore..."
+         continue
+      fi
+
+      FILE_EXTENSION=`echo "$TEXTURE_PATH" | tail -c 5`
+
+      if [ `echo "$FILE_EXTENSION" | head -c 1` != "." ]; then
+         echo "  Unsupported file extension. Ignore..."
+         continue
+      fi
+
+      FILE_FORMAT=`identify -format %m "$TEXTURE_PATH"`
+
+      if [ "$FILE_FORMAT" = "JPEG" ]; then
+         echo "  File is already JPEG. Ignore..."
+         continue
+      fi
+
+      #IS_OPAQUE=`identify -format '%[opaque]' "$TEXTURE_PATH"`
+      HAS_ALPHA=`identify -format '%A' "$TEXTURE_PATH"`
+
+      if [ "$HAS_ALPHA" = "True" ] || [ "$HAS_ALPHA" = "true" ]; then
+         echo "  File has alpha channel. Ignore..."
+         continue
+      fi
+
+      NEW_TEXTURE_NAME="`echo $TEXTURE_NAME | head -c -5`.jpg"
+      NEW_TEXTURE_PATH="`echo $TEXTURE_PATH | head -c -5`.jpg"
+
+      if [ -f "$NEW_TEXTURE_PATH" ]; then
+         echo "  There is already a file with .jpg extension. Ignore..."
+         continue
+      fi
+
+      convert -quality $JPEG_QUALITY "$TEXTURE_PATH" "$NEW_TEXTURE_PATH"
+      rm -f "$TEXTURE_PATH"
+
+      if [ -s "$DIRNAME/materials.xml" ]; then
+         sed -i "s/name=\"$TEXTURE_NAME\"/name=\"$NEW_TEXTURE_NAME\"/g" \
+                                                   "$DIRNAME/materials.xml"
+      fi
+
+      if [ -s "$DIRNAME/scene.xml" ]; then
+         sed -i "s/name=\"$TEXTURE_NAME\"/name=\"$NEW_TEXTURE_NAME\"/g" \
+                                                   "$DIRNAME/scene.xml"
+      fi
+
+      echo "$TEXTURE_PATH" >> "./converted_textures"
+   fi
+
+   echo -n ".jpg" | dd of=./tmp bs=1 seek=$(($TEXNAME_END - 4)) \
+                                                   conv=notrunc 2> /dev/null
+                                                   
+   SIZE_OLD=`du -b "$FILE" | cut -f1`
+   SIZE_NEW=`du -b "tmp" | cut -f1`
+
+   if [ $SIZE_NEW -ne $SIZE_OLD ]; then
+      echo "  Something went wrong..."
+      exit
+   fi
+}
+
 convert_b3d()
 {
    if [ -z "$1" ]; then
@@ -296,7 +382,7 @@ convert_b3d()
    HEX_TEXS=`echo $HEX_FILE | head -c $TEXS_END | tail -c +$(($TEXS_BEGIN+1))`
    CURR_POS=0
 
-   cp "$FILE" tmp.b3d
+   cp "$FILE" tmp
 
    while [ $CURR_POS -lt $TEXS_END ]; do
       NULL_POS=`echo $HEX_TEXS | tail -c +$(($CURR_POS+1)) | grep -b -o "00" \
@@ -320,85 +406,11 @@ convert_b3d()
                      count=$(($TEXNAME_END - $TEXNAME_BEGIN)) 2> /dev/null`
       DIRNAME=`dirname "$FILE"`
       TEXTURE_PATH="$DIRNAME/$TEXTURE_NAME"
-
-      echo "  Texture: $TEXTURE_NAME"
-
-      ALREADY_CONVERTED=0
-
-      if [ -s "./converted_textures" ]; then
-         while read -r CONVERTED_TEXTURE; do
-            if [ "$TEXTURE_PATH" = "$CONVERTED_TEXTURE" ]; then
-               ALREADY_CONVERTED=1
-               break
-            fi
-         done < "./converted_textures"
-      fi
-
-      if [ $ALREADY_CONVERTED -eq 0 ]; then
-         if [ ! -f "$TEXTURE_PATH" ]; then
-            echo "  Couldn't find texture file. Ignore..."
-            continue
-         fi
-
-         FILE_EXTENSION=`echo "$TEXTURE_PATH" | tail -c 5`
-
-         if [ `echo "$FILE_EXTENSION" | head -c 1` != "." ]; then
-            echo "  Unsupported file extension. Ignore..."
-            continue
-         fi
-
-         FILE_FORMAT=`identify -format %m "$TEXTURE_PATH"`
-
-         if [ "$FILE_FORMAT" = "JPEG" ]; then
-            echo "  File is already JPEG. Ignore..."
-            continue
-         fi
-
-         #IS_OPAQUE=`identify -format '%[opaque]' "$TEXTURE_PATH"`
-         HAS_ALPHA=`identify -format '%A' "$TEXTURE_PATH"`
-
-         if [ "$HAS_ALPHA" = "True" ] || [ "$HAS_ALPHA" = "true" ]; then
-            echo "  File has alpha channel. Ignore..."
-            continue
-         fi
-
-         NEW_TEXTURE_NAME="`echo $TEXTURE_NAME | head -c -5`.jpg"
-         NEW_TEXTURE_PATH="`echo $TEXTURE_PATH | head -c -5`.jpg"
-
-         if [ -f "$NEW_TEXTURE_PATH" ]; then
-            echo "  There is already a file with .jpg extension. Ignore..."
-            continue
-         fi
-
-         convert -quality $JPEG_QUALITY "$TEXTURE_PATH" "$NEW_TEXTURE_PATH"
-         rm -f "$TEXTURE_PATH"
-
-         if [ -s "$DIRNAME/materials.xml" ]; then
-            sed -i "s/name=\"$TEXTURE_NAME\"/name=\"$NEW_TEXTURE_NAME\"/g" \
-                                                      "$DIRNAME/materials.xml"
-         fi
-
-         if [ -s "$DIRNAME/scene.xml" ]; then
-            sed -i "s/name=\"$TEXTURE_NAME\"/name=\"$NEW_TEXTURE_NAME\"/g" \
-                                                      "$DIRNAME/scene.xml"
-         fi
-
-         echo "$TEXTURE_PATH" >> "./converted_textures"
-      fi
-
-      echo -n ".jpg" | dd of=./tmp.b3d bs=1 seek=$(($TEXNAME_END - 4)) \
-                                                      conv=notrunc 2> /dev/null
+      
+      convert_model "$TEXTURE_PATH"
    done
 
-   SIZE_OLD=`du -b "$FILE" | cut -f1`
-   SIZE_NEW=`du -b "tmp.b3d" | cut -f1`
-
-   if [ $SIZE_NEW -ne $SIZE_OLD ]; then
-      echo "  Something went wrong..."
-      exit
-   fi
-
-   mv tmp.b3d "$FILE"
+   mv tmp "$FILE"
 }
 
 convert_spm()
@@ -441,7 +453,7 @@ convert_spm()
 
    CURR_POS=$(($TEXS_BEGIN + 2))
 
-   cp "$FILE" tmp.spm
+   cp "$FILE" tmp
 
    while [ $TEXS_COUNT_CONVERTED -gt 0 ]; do
       TEXS_COUNT_CONVERTED=$(($TEXS_COUNT_CONVERTED - 1))
@@ -463,85 +475,11 @@ convert_spm()
                      
       DIRNAME=`dirname "$FILE"`
       TEXTURE_PATH="$DIRNAME/$TEXTURE_NAME"
-
-      echo "  Texture: $TEXTURE_NAME"
-
-      ALREADY_CONVERTED=0
-
-      if [ -s "./converted_textures" ]; then
-         while read -r CONVERTED_TEXTURE; do
-            if [ "$TEXTURE_PATH" = "$CONVERTED_TEXTURE" ]; then
-               ALREADY_CONVERTED=1
-               break
-            fi
-         done < "./converted_textures"
-      fi
-
-      if [ $ALREADY_CONVERTED -eq 0 ]; then
-         if [ ! -f "$TEXTURE_PATH" ]; then
-            echo "  Couldn't find texture file. Ignore..."
-            continue
-         fi
-
-         FILE_EXTENSION=`echo "$TEXTURE_PATH" | tail -c 5`
-
-         if [ `echo "$FILE_EXTENSION" | head -c 1` != "." ]; then
-            echo "  Unsupported file extension. Ignore..."
-            continue
-         fi
-
-         FILE_FORMAT=`identify -format %m "$TEXTURE_PATH"`
-
-         if [ "$FILE_FORMAT" = "JPEG" ]; then
-            echo "  File is already JPEG. Ignore..."
-            continue
-         fi
-
-         #IS_OPAQUE=`identify -format '%[opaque]' "$TEXTURE_PATH"`
-         HAS_ALPHA=`identify -format '%A' "$TEXTURE_PATH"`
-
-         if [ "$HAS_ALPHA" = "True" ] || [ "$HAS_ALPHA" = "true" ]; then
-            echo "  File has alpha channel. Ignore..."
-            continue
-         fi
-
-         NEW_TEXTURE_NAME="`echo $TEXTURE_NAME | head -c -5`.jpg"
-         NEW_TEXTURE_PATH="`echo $TEXTURE_PATH | head -c -5`.jpg"
-
-         if [ -f "$NEW_TEXTURE_PATH" ]; then
-            echo "  There is already a file with .jpg extension. Ignore..."
-            continue
-         fi
-
-         convert -quality $JPEG_QUALITY "$TEXTURE_PATH" "$NEW_TEXTURE_PATH"
-         rm -f "$TEXTURE_PATH"
-
-         if [ -s "$DIRNAME/materials.xml" ]; then
-            sed -i "s/name=\"$TEXTURE_NAME\"/name=\"$NEW_TEXTURE_NAME\"/g" \
-                                                      "$DIRNAME/materials.xml"
-         fi
-
-         if [ -s "$DIRNAME/scene.xml" ]; then
-            sed -i "s/name=\"$TEXTURE_NAME\"/name=\"$NEW_TEXTURE_NAME\"/g" \
-                                                      "$DIRNAME/scene.xml"
-         fi
-
-         echo "$TEXTURE_PATH" >> "./converted_textures"
-      fi
-
-      echo -n ".jpg" | dd of=./tmp.spm bs=1 seek=$(($TEXNAME_END - 4)) \
-                                                      conv=notrunc 2> /dev/null
+      
+      convert_model "$TEXTURE_PATH"
    done
-   
-   SIZE_OLD=`du -b "$FILE" | cut -f1`
-   SIZE_NEW=`du -b "tmp.spm" | cut -f1`
 
-   if [ $SIZE_NEW -ne $SIZE_OLD ]; then
-      echo "  Something went wrong..."
-      exit
-   fi
-
-   mv tmp.spm "$FILE"
+   mv tmp "$FILE"
 }
 
 

From 8fa0e4e7b356b95fedcf74cae41fd64e15a3d45b Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Tue, 15 Aug 2017 10:10:17 +0200
Subject: [PATCH 044/125] Make it less verbose

---
 android/generate_assets.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/generate_assets.sh b/android/generate_assets.sh
index c2774b113..180aa2b93 100755
--- a/android/generate_assets.sh
+++ b/android/generate_assets.sh
@@ -259,7 +259,7 @@ convert_model()
 
    TEXTURE_PATH="$1"
    
-   echo "  Texture: $TEXTURE_NAME"
+   #echo "  Texture: $TEXTURE_NAME"
 
    ALREADY_CONVERTED=0
 
@@ -274,21 +274,21 @@ convert_model()
 
    if [ $ALREADY_CONVERTED -eq 0 ]; then
       if [ ! -f "$TEXTURE_PATH" ]; then
-         echo "  Couldn't find texture file. Ignore..."
+         #echo "  Couldn't find texture file. Ignore..."
          continue
       fi
 
       FILE_EXTENSION=`echo "$TEXTURE_PATH" | tail -c 5`
 
       if [ `echo "$FILE_EXTENSION" | head -c 1` != "." ]; then
-         echo "  Unsupported file extension. Ignore..."
+         #echo "  Unsupported file extension. Ignore..."
          continue
       fi
 
       FILE_FORMAT=`identify -format %m "$TEXTURE_PATH"`
 
       if [ "$FILE_FORMAT" = "JPEG" ]; then
-         echo "  File is already JPEG. Ignore..."
+         #echo "  File is already JPEG. Ignore..."
          continue
       fi
 
@@ -296,7 +296,7 @@ convert_model()
       HAS_ALPHA=`identify -format '%A' "$TEXTURE_PATH"`
 
       if [ "$HAS_ALPHA" = "True" ] || [ "$HAS_ALPHA" = "true" ]; then
-         echo "  File has alpha channel. Ignore..."
+         #echo "  File has alpha channel. Ignore..."
          continue
       fi
 
@@ -304,7 +304,7 @@ convert_model()
       NEW_TEXTURE_PATH="`echo $TEXTURE_PATH | head -c -5`.jpg"
 
       if [ -f "$NEW_TEXTURE_PATH" ]; then
-         echo "  There is already a file with .jpg extension. Ignore..."
+         #echo "  There is already a file with .jpg extension. Ignore..."
          continue
       fi
 
@@ -389,7 +389,7 @@ convert_b3d()
                                        | head -n 1 | cut -f1 -d":"`
 
       if [ -z $NULL_POS ]; then
-         echo "  Done."
+         #echo "  Done."
          break
       fi
 
@@ -466,7 +466,7 @@ convert_spm()
       CURR_POS=$(($CURR_POS + 2 + $TEX_LEN * 2))
       
       if [ $TEX_LEN -eq 0 ]; then
-         echo "  Empty texture name, ignore..."
+         #echo "  Empty texture name, ignore..."
          continue
       fi
 

From 01be8002531256bdaaab6ba63bba27125762eebb Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 15 Aug 2017 23:54:39 +1000
Subject: [PATCH 045/125] Fixed stack traces for win32 (#2642).

---
 src/utils/crash_reporting.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/crash_reporting.cpp b/src/utils/crash_reporting.cpp
index debe715e3..0440c9360 100644
--- a/src/utils/crash_reporting.cpp
+++ b/src/utils/crash_reporting.cpp
@@ -193,8 +193,8 @@
                 }
 
                 // Only keep the directory
-                char* last_separator = strchr(filepath, '/');
-                if(!last_separator) last_separator = strchr(filepath, '\\');
+                char* last_separator = strrchr(filepath, '/');
+                if(!last_separator) last_separator = strrchr(filepath, '\\');
                 if(last_separator)
                     last_separator[0] = '\0';
 

From 196fe378b4c9c6455d2066d783a85d206c26ea81 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Tue, 15 Aug 2017 22:42:53 +0200
Subject: [PATCH 046/125] Fix for png->jpg converter.

It's possible that there are multiple file names in single parameter, for example:
<sky-box texture="0006.png 0001.png 0004.png 0002.png 0003.png 0005.png" ... />
now it should work.

Also use is_opaque rather than has_alpha that gives better results.
---
 android/generate_assets.sh | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/android/generate_assets.sh b/android/generate_assets.sh
index 180aa2b93..aeae74e36 100755
--- a/android/generate_assets.sh
+++ b/android/generate_assets.sh
@@ -292,10 +292,10 @@ convert_model()
          continue
       fi
 
-      #IS_OPAQUE=`identify -format '%[opaque]' "$TEXTURE_PATH"`
-      HAS_ALPHA=`identify -format '%A' "$TEXTURE_PATH"`
+      IS_OPAQUE=`identify -format '%[opaque]' "$TEXTURE_PATH"`
+      #HAS_ALPHA=`identify -format '%A' "$TEXTURE_PATH"`
 
-      if [ "$HAS_ALPHA" = "True" ] || [ "$HAS_ALPHA" = "true" ]; then
+      if [ "$IS_OPAQUE" = "False" ] || [ "$IS_OPAQUE" = "false" ]; then
          #echo "  File has alpha channel. Ignore..."
          continue
       fi
@@ -312,13 +312,22 @@ convert_model()
       rm -f "$TEXTURE_PATH"
 
       if [ -s "$DIRNAME/materials.xml" ]; then
-         sed -i "s/name=\"$TEXTURE_NAME\"/name=\"$NEW_TEXTURE_NAME\"/g" \
-                                                   "$DIRNAME/materials.xml"
+         sed -i "s/\"$TEXTURE_NAME\"/\"$NEW_TEXTURE_NAME\"/g" \
+                                                        "$DIRNAME/materials.xml"
+         sed -i "s/\"$TEXTURE_NAME /\"$NEW_TEXTURE_NAME /g" \
+                                                        "$DIRNAME/materials.xml"
+         sed -i "s/ $TEXTURE_NAME\"/ $NEW_TEXTURE_NAME\"/g" \
+                                                        "$DIRNAME/materials.xml"
+         sed -i "s/ $TEXTURE_NAME / $NEW_TEXTURE_NAME /g" \
+                                                        "$DIRNAME/materials.xml"
       fi
 
       if [ -s "$DIRNAME/scene.xml" ]; then
-         sed -i "s/name=\"$TEXTURE_NAME\"/name=\"$NEW_TEXTURE_NAME\"/g" \
-                                                   "$DIRNAME/scene.xml"
+         sed -i "s/\"$TEXTURE_NAME\"/\"$NEW_TEXTURE_NAME\"/g" \
+                                                            "$DIRNAME/scene.xml"
+         sed -i "s/\"$TEXTURE_NAME /\"$NEW_TEXTURE_NAME /g" "$DIRNAME/scene.xml"
+         sed -i "s/ $TEXTURE_NAME\"/ $NEW_TEXTURE_NAME\"/g" "$DIRNAME/scene.xml"
+         sed -i "s/ $TEXTURE_NAME / $NEW_TEXTURE_NAME /g" "$DIRNAME/scene.xml"
       fi
 
       echo "$TEXTURE_PATH" >> "./converted_textures"

From 3031fabcf930a3a386df32cca51e62a475aedf0f Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Wed, 16 Aug 2017 13:48:27 +0800
Subject: [PATCH 047/125] Add spm loader

---
 data/stk_config.xml                           |   4 +-
 lib/irrlicht/source/Irrlicht/CSkinnedMesh.cpp |  18 +-
 lib/irrlicht/source/Irrlicht/CSkinnedMesh.h   |   3 +
 src/graphics/irr_driver.cpp                   |   4 +
 src/graphics/sp_mesh_loader.cpp               | 637 ++++++++++++++++++
 src/graphics/sp_mesh_loader.hpp               | 403 +++++++++++
 src/graphics/stk_mesh_loader.cpp              |   1 +
 src/tracks/track.cpp                          |  55 +-
 8 files changed, 1100 insertions(+), 25 deletions(-)
 create mode 100644 src/graphics/sp_mesh_loader.cpp
 create mode 100644 src/graphics/sp_mesh_loader.hpp

diff --git a/data/stk_config.xml b/data/stk_config.xml
index 4556f524a..1bc90808b 100644
--- a/data/stk_config.xml
+++ b/data/stk_config.xml
@@ -3,11 +3,11 @@
 <config>
   <!--  Minimum and maximum kart versions that can be used by this binary.
         Older version will be ignored. -->
-  <kart-version min="2" max="2"/>
+  <kart-version min="2" max="3"/>
 
   <!-- Minimum and maxium track versions that be be read by this binary.
        Older versions will be ignored. -->
-  <track-version min="6" max="6"/>
+  <track-version min="6" max="7"/>
 
   <!-- Maximum number of karts to be used at the same time. This limit
        can easily be increased, but some tracks might not have valid start
diff --git a/lib/irrlicht/source/Irrlicht/CSkinnedMesh.cpp b/lib/irrlicht/source/Irrlicht/CSkinnedMesh.cpp
index b4fcf2b64..79a925523 100644
--- a/lib/irrlicht/source/Irrlicht/CSkinnedMesh.cpp
+++ b/lib/irrlicht/source/Irrlicht/CSkinnedMesh.cpp
@@ -21,7 +21,7 @@ namespace scene
 CSkinnedMesh::CSkinnedMesh()
 : SkinningBuffers(0), AnimationFrames(0.f), FramesPerSecond(25.f),
 	LastAnimatedFrame(-1), SkinnedLastFrame(false),
-	InterpolationMode(EIM_LINEAR),
+	InterpolationMode(EIM_LINEAR), TransposedMatrix(false),
 	HasAnimation(false), PreparedForSkinning(false),
 	AnimateNormals(true), HardwareSkinning(false), m_total_joints(0),
 	m_current_joint(0)
@@ -92,6 +92,13 @@ IMesh* CSkinnedMesh::getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop, s32
 }
 
 
+//! For loader usage.
+void CSkinnedMesh::setTransposedMatrix(bool val)
+{
+	TransposedMatrix = val;
+}
+
+
 //--------------------------------------------------------------------------
 //			Keyframe Animation
 //--------------------------------------------------------------------------
@@ -183,7 +190,14 @@ void CSkinnedMesh::buildAllLocalAnimatedMatrices()
 
 			// IRR_TEST_BROKEN_QUATERNION_USE: TODO - switched to getMatrix_transposed instead of getMatrix for downward compatibility. 
 			//								   Not tested so far if this was correct or wrong before quaternion fix!
-			joint->Animatedrotation.getMatrix_transposed(joint->LocalAnimatedMatrix);
+			if (TransposedMatrix)
+			{
+				joint->Animatedrotation.getMatrix_transposed(joint->LocalAnimatedMatrix);
+			}
+			else
+			{
+				joint->LocalAnimatedMatrix=joint->Animatedrotation.getMatrix();
+			}
 
 			// --- joint->LocalAnimatedMatrix *= joint->Animatedrotation.getMatrix() ---
 			f32 *m1 = joint->LocalAnimatedMatrix.pointer();
diff --git a/lib/irrlicht/source/Irrlicht/CSkinnedMesh.h b/lib/irrlicht/source/Irrlicht/CSkinnedMesh.h
index 0dd936f0d..e104f747c 100644
--- a/lib/irrlicht/source/Irrlicht/CSkinnedMesh.h
+++ b/lib/irrlicht/source/Irrlicht/CSkinnedMesh.h
@@ -155,6 +155,8 @@ namespace scene
 
 		virtual void updateBoundingBox(void);
 
+		void setTransposedMatrix(bool);
+
 		//! Recovers the joints from the mesh
 		void recoverJointsFromMesh(core::array<IBoneSceneNode*> &jointChildSceneNodes);
 
@@ -223,6 +225,7 @@ private:
 
 		E_INTERPOLATION_MODE InterpolationMode:8;
 
+		bool TransposedMatrix;
 		bool HasAnimation;
 		bool PreparedForSkinning;
 		bool AnimateNormals;
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 13a933673..ce66d17ba 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -37,6 +37,7 @@
 #include "graphics/stk_animated_mesh.hpp"
 #include "graphics/stk_billboard.hpp"
 #include "graphics/stk_mesh_loader.hpp"
+#include "graphics/sp_mesh_loader.hpp"
 #include "graphics/stk_mesh_scene_node.hpp"
 #include "graphics/stk_tex_manager.hpp"
 #include "graphics/stk_texture.hpp"
@@ -605,6 +606,9 @@ void IrrDriver::initDevice()
     STKMeshLoader* sml = new STKMeshLoader(m_scene_manager);
     m_scene_manager->addExternalMeshLoader(sml);
     sml->drop();
+    SPMeshLoader* spml = new SPMeshLoader(m_scene_manager);
+    m_scene_manager->addExternalMeshLoader(spml);
+    spml->drop();
 
     m_actual_screen_size = m_video_driver->getCurrentRenderTargetSize();
 
diff --git a/src/graphics/sp_mesh_loader.cpp b/src/graphics/sp_mesh_loader.cpp
new file mode 100644
index 000000000..f897d3820
--- /dev/null
+++ b/src/graphics/sp_mesh_loader.cpp
@@ -0,0 +1,637 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2017 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "graphics/sp_mesh_loader.hpp"
+#include "graphics/stk_tex_manager.hpp"
+#include "utils/constants.hpp"
+
+const uint8_t VERSION_NOW = 1;
+
+#include <algorithm>
+#include <cmath>
+#include <IVideoDriver.h>
+#include <IFileSystem.h>
+
+// ----------------------------------------------------------------------------
+bool SPMeshLoader::isALoadableFileExtension(const io::path& filename) const
+{
+    return core::hasFileExtension(filename, "spm");
+}   // isALoadableFileExtension
+
+// ----------------------------------------------------------------------------
+scene::IAnimatedMesh* SPMeshLoader::createMesh(io::IReadFile* f)
+{
+    if (!IS_LITTLE_ENDIAN)
+    {
+        Log::error("SPMeshLoader", "Not little endian machine.");
+        return NULL;
+    }
+    if (f == NULL)
+    {
+        return NULL;
+    }
+    m_bind_frame = 0;
+    m_joint_count = 0;
+    //m_frame_count = 0;
+    m_mesh = NULL;
+    m_mesh = new scene::CSkinnedMesh();
+    io::IFileSystem* fs = m_scene_manager->getFileSystem();
+    std::string base_path = fs->getFileDir(f->getFileName()).c_str();
+    std::string header;
+    header.resize(2);
+    f->read(&header.front(), 2);
+    if (header != "SP")
+    {
+        Log::error("SPMeshLoader", "Not a spm file.");
+        m_mesh->drop();
+        return NULL;
+    }
+    uint8_t byte = 0;
+    f->read(&byte, 1);
+    uint8_t version = byte >> 3;
+    if (version != VERSION_NOW)
+    {
+        Log::error("SPMeshLoader", "Version mismatch, file %d SP %d", version,
+            VERSION_NOW);
+        m_mesh->drop();
+        return NULL;
+    }
+    byte &= ~0x08;
+    header = byte == 0 ? "SPMS" : byte == 1 ? "SPMA" : "SPMN";
+    if (header == "SPMS")
+    {
+        Log::error("SPMeshLoader", "Space partitioned mesh not supported.");
+        m_mesh->drop();
+        return NULL;
+    }
+    f->read(&byte, 1);
+    bool read_normal = byte & 0x01;
+    bool read_vcolor = byte >> 1 & 0x01;
+    bool read_tangent = byte >> 2 & 0x01;
+    const bool is_skinned = header == "SPMA";
+    const SPVertexType vt = is_skinned ? SPVT_SKINNED : SPVT_NORMAL;
+    float bbox[6];
+    f->read(bbox, 24);
+    uint16_t size_num = 0;
+    f->read(&size_num, 2);
+    unsigned id = 0;
+    std::unordered_map<unsigned, std::tuple<video::SMaterial, bool,
+        bool> > mat_map;
+    while (size_num != 0)
+    {
+        uint8_t tex_size;
+        std::string tex_name_1, tex_name_2;
+        f->read(&tex_size, 1);
+        if (tex_size > 0)
+        {
+            tex_name_1.resize(tex_size);
+            f->read(&tex_name_1.front(), tex_size);
+        }
+        f->read(&tex_size, 1);
+        if (tex_size > 0)
+        {
+            tex_name_2.resize(tex_size);
+            f->read(&tex_name_2.front(), tex_size);
+        }
+        TexConfig mtc(true/*srgb*/, false/*premul_alpha*/, true/*mesh_tex*/,
+            true/*set_material*/);
+        video::ITexture* textures[2] = { NULL, NULL };
+        if (!tex_name_1.empty())
+        {
+            std::string full_path = base_path + "/" + tex_name_1;
+            if (fs->existFile(full_path.c_str()))
+            {
+                tex_name_1 = full_path;
+            }
+            video::ITexture* tex = STKTexManager::getInstance()
+                ->getTexture(tex_name_1, &mtc);
+            if (tex != NULL)
+            {
+                textures[0] = tex;
+            }
+        }
+        if (!tex_name_2.empty())
+        {
+            std::string full_path = base_path + "/" + tex_name_2;
+            if (fs->existFile(full_path.c_str()))
+            {
+                tex_name_2 = full_path;
+            }
+            textures[1] = STKTexManager::getInstance()->getTexture(tex_name_2,
+                &mtc);
+        }
+        video::SMaterial m;
+        m.MaterialType = video::EMT_SOLID;
+        if (textures[0] != NULL)
+        {
+            m.setTexture(0, textures[0]);
+        }
+        if (textures[1] != NULL)
+        {
+            m.setTexture(1, textures[1]);
+        }
+        mat_map[id] =
+            std::make_tuple(m, !tex_name_1.empty(), !tex_name_2.empty());
+        size_num--;
+        id++;
+    }
+    f->read(&size_num, 2);
+    while (size_num != 0)
+    {
+        uint16_t mat_size;
+        f->read(&mat_size, 2);
+        while (mat_size != 0)
+        {
+            uint32_t vertices_count, indices_count;
+            uint16_t mat_id;
+            f->read(&vertices_count, 4);
+            if (vertices_count > 65535)
+            {
+                Log::error("SPMeshLoader", "32bit index not supported.");
+                m_mesh->drop();
+                return NULL;
+            }
+            f->read(&indices_count, 4);
+            f->read(&mat_id, 2);
+            assert(mat_id < mat_map.size());
+            decompress(f, vertices_count, indices_count, read_normal,
+                read_vcolor, read_tangent, std::get<1>(mat_map[mat_id]),
+                std::get<2>(mat_map[mat_id]), vt,
+                std::get<0>(mat_map[mat_id]));
+            mat_size--;
+        }
+        if (header == "SPMS")
+        {
+            // Reserved, never used
+            assert(false);
+            f->read(bbox, 24);
+        }
+        size_num--;
+    }
+    if (header == "SPMA")
+    {
+        createAnimationData(f);
+        convertIrrlicht();
+    }
+    else if (header == "SPMS")
+    {
+        // Reserved, never used
+        assert(false);
+        uint16_t pre_computed_size = 0;
+        f->read(&pre_computed_size, 2);
+    }
+    m_mesh->finalize();
+    m_all_armatures.clear();
+    m_to_bind_pose_matrices.clear();
+    m_joints.clear();
+    return m_mesh;
+}   // createMesh
+
+// ----------------------------------------------------------------------------
+void SPMeshLoader::decompress(irr::io::IReadFile* spm, unsigned vertices_count,
+                              unsigned indices_count, bool read_normal,
+                              bool read_vcolor, bool read_tangent, bool uv_one,
+                              bool uv_two, SPVertexType vt,
+                              const video::SMaterial& m)
+{
+    assert(vertices_count != 0);
+    assert(indices_count != 0);
+    scene::SSkinMeshBuffer* mb = m_mesh->addMeshBuffer();
+    if (uv_two)
+    {
+        mb->convertTo2TCoords();
+    }
+    using namespace MiniGLM;
+    const unsigned idx_size = vertices_count > 255 ? 2 : 1;
+    char tmp[8] = {};
+    std::vector<std::pair<std::array<short, 4>, std::array<float, 4> > >
+        cur_joints;
+    for (unsigned i = 0; i < vertices_count; i++)
+    {
+        video::S3DVertex2TCoords vertex;
+        // 3 * float position
+        spm->read(&vertex.Pos, 12);
+        if (read_normal)
+        {
+            // 3 10 + 2 bits normal
+            uint32_t packed;
+            spm->read(&packed, 4);
+            vertex.Normal = extract3Int10Bit(packed);
+        }
+        if (read_vcolor)
+        {
+            // Color identifier
+            uint8_t ci;
+            spm->read(&ci, 1);
+            if (ci == 128)
+            {
+                // All white
+                vertex.Color = video::SColor(255, 255, 255, 255);
+            }
+            else
+            {
+                uint8_t r, g, b;
+                spm->read(&r, 1);
+                spm->read(&g, 1);
+                spm->read(&b, 1);
+                vertex.Color = video::SColor(255, r, g, b);
+            }
+        }
+        else
+        {
+            vertex.Color = video::SColor(255, 255, 255, 255);
+        }
+        if (uv_one)
+        {
+            short hf[2];
+            spm->read(hf, 4);
+            vertex.TCoords.X = toFloat32(hf[0]);
+            vertex.TCoords.Y = toFloat32(hf[1]);
+            assert(!std::isnan(vertex.TCoords.X));
+            assert(!std::isnan(vertex.TCoords.Y));
+            if (uv_two)
+            {
+                spm->read(hf, 4);
+                vertex.TCoords2.X = toFloat32(hf[0]);
+                vertex.TCoords2.Y = toFloat32(hf[1]);
+                assert(!std::isnan(vertex.TCoords2.X));
+                assert(!std::isnan(vertex.TCoords2.Y));
+            }
+            if (read_tangent)
+            {
+                // Unused, tangents are re-calculated anyway
+                spm->read(tmp, 8);
+            }
+        }
+        if (vt == SPVT_SKINNED)
+        {
+            std::array<short, 4> joint_idx;
+            spm->read(joint_idx.data(), 8);
+            spm->read(tmp, 8);
+            std::array<float, 4> joint_weight = {};
+            for (int j = 0; j < 8; j += 2)
+            {
+                short hf;
+                memcpy(&hf, tmp + j, 2);
+                const unsigned idx = j >> 1;
+                joint_weight[idx] = toFloat32(hf);
+                assert(!std::isnan(joint_weight[idx]));
+            }
+            cur_joints.emplace_back(joint_idx, joint_weight);
+        }
+        if (uv_two)
+        {
+            mb->Vertices_2TCoords.push_back(vertex);
+        }
+        else
+        {
+            mb->Vertices_Standard.push_back(vertex);
+        }
+    }
+    if (vt == SPVT_SKINNED)
+    {
+        m_joints.emplace_back(std::move(cur_joints));
+    }
+    if (m.TextureLayer[0].Texture != NULL)
+    {
+        mb->Material = m;
+    }
+    mb->Indices.set_used(indices_count);
+    if (idx_size == 2)
+    {
+        spm->read(mb->Indices.pointer(), indices_count * 2);
+    }
+    else
+    {
+        std::vector<uint8_t> tmp_idx;
+        tmp_idx.resize(indices_count);
+        spm->read(tmp_idx.data(), indices_count);
+        for (unsigned i = 0; i < indices_count; i++)
+        {
+            mb->Indices[i] = tmp_idx[i];
+        }
+    }
+}   // decompress
+
+// ----------------------------------------------------------------------------
+void SPMeshLoader::createAnimationData(irr::io::IReadFile* spm)
+{
+    if (m_joints.empty())
+    {
+        Log::error("SPMeshLoader", "No joints are added.");
+        return;
+    }
+    assert(m_joints.size() == m_mesh->getMeshBufferCount());
+    uint8_t armature_size = 0;
+    spm->read(&armature_size, 1);
+    assert(armature_size > 0);
+    m_bind_frame = 0;
+    spm->read(&m_bind_frame, 2);
+    m_all_armatures.resize(armature_size);
+    for (unsigned i = 0; i < armature_size; i++)
+    {
+        m_all_armatures[i].read(spm);
+    }
+    for (unsigned i = 0; i < armature_size; i++)
+    {
+        //m_frame_count = std::max(m_frame_count,
+        //    (unsigned)m_all_armatures[i].m_frame_pose_matrices.back().first);
+        m_joint_count += m_all_armatures[i].m_joint_used;
+    }
+
+    m_to_bind_pose_matrices.resize(m_joint_count);
+    unsigned accumulated_joints = 0;
+    for (unsigned i = 0; i < armature_size; i++)
+    {
+        m_all_armatures[i].getPose((float)m_bind_frame,
+            &m_to_bind_pose_matrices[accumulated_joints]);
+        accumulated_joints += m_all_armatures[i].m_joint_used;
+    }
+    for (unsigned i = 0; i < m_to_bind_pose_matrices.size(); i++)
+    {
+        m_to_bind_pose_matrices[i].makeInverse();
+    }
+    for (unsigned i = 0; i < m_mesh->getMeshBufferCount(); i++)
+    {
+        for (unsigned j = 0; j < m_joints[i].size(); j++)
+        {
+            if (!(m_joints[i][j].first[0] == -1 ||
+                m_joints[i][j].second[0] == 0.0f))
+            {
+                core::vector3df bind_pos, bind_nor;
+                for (unsigned k = 0; k < 4; k++)
+                {
+                    if (m_joints[i][j].second[k] == 0.0f)
+                    {
+                        break;
+                    }
+                    core::vector3df cur_pos, cur_nor;
+                    m_to_bind_pose_matrices[m_joints[i][j].first[k]]
+                        .transformVect(cur_pos,
+                        m_mesh->getMeshBuffers()[i]->getVertex(j)->Pos);
+                    bind_pos += cur_pos * m_joints[i][j].second[k];
+                    m_to_bind_pose_matrices[m_joints[i][j].first[k]]
+                        .rotateVect(cur_nor,
+                        m_mesh->getMeshBuffers()[i]->getVertex(j)->Normal);
+                    bind_nor += cur_nor * m_joints[i][j].second[k];
+                }
+                m_mesh->getMeshBuffers()[i]->getVertex(j)->Pos = bind_pos;
+                m_mesh->getMeshBuffers()[i]->getVertex(j)->Normal = bind_nor;
+            }
+        }
+    }
+}   // createAnimationData
+
+// ----------------------------------------------------------------------------
+void SPMeshLoader::convertIrrlicht()
+{
+    unsigned total_joints = 0;
+    for (unsigned i = 0; i < m_all_armatures.size(); i++)
+    {
+        total_joints += (unsigned)m_all_armatures[i].m_joint_names.size();
+    }
+    for (unsigned i = 0; i < total_joints; i++)
+    {
+        m_mesh->addJoint(NULL);
+    }
+    core::array<scene::CSkinnedMesh::SJoint*>& joints = m_mesh->getAllJoints();
+    std::vector<int> used_joints_map;
+    used_joints_map.resize(m_joint_count);
+    total_joints = 0;
+    unsigned used_joints = 0;
+    for (unsigned i = 0; i < m_all_armatures.size(); i++)
+    {
+        for (unsigned j = 0; j < m_all_armatures[i].m_joint_names.size(); j++)
+        {
+            if (m_all_armatures[i].m_joint_used > j)
+            {
+                used_joints_map[used_joints + j] = total_joints + j;
+            }
+            joints[total_joints + j]->Name =
+                m_all_armatures[i].m_joint_names[j].c_str();
+            const int p_id = m_all_armatures[i].m_parent_infos[j];
+            core::matrix4 tmp;
+            if (p_id != -1)
+            {
+                joints[total_joints + p_id]->Children.push_back
+                    (joints[total_joints + j]);
+                m_all_armatures[i].m_joint_matrices[j].getInverse(tmp);
+                tmp = m_all_armatures[i].m_joint_matrices[p_id] * tmp;
+            }
+            else
+            {
+                m_all_armatures[i].m_joint_matrices[j].getInverse(tmp);
+            }
+            joints[total_joints + j]->LocalMatrix = tmp;
+            for (unsigned k = 0; k <
+                m_all_armatures[i].m_frame_pose_matrices.size(); k++)
+            {
+                float frame = (float)
+                    m_all_armatures[i].m_frame_pose_matrices[k].first;
+                core::vector3df pos = m_all_armatures[i]
+                    .m_frame_pose_matrices[k].second[j].m_loc;
+                core::quaternion q = m_all_armatures[i]
+                    .m_frame_pose_matrices[k].second[j].m_rot;
+                core::vector3df scl = m_all_armatures[i]
+                    .m_frame_pose_matrices[k].second[j].m_scale;
+                joints[total_joints + j]->PositionKeys.push_back({frame, pos});
+                joints[total_joints + j]->RotationKeys.push_back({frame, q});
+                joints[total_joints + j]->ScaleKeys.push_back({frame, scl});
+            }
+        }
+        total_joints += (unsigned)m_all_armatures[i].m_joint_names.size();
+        used_joints += m_all_armatures[i].m_joint_used;
+    }
+
+    for (unsigned i = 0; i < m_joints.size(); i++)
+    {
+        for (unsigned j = 0; j < m_joints[i].size(); j++)
+        {
+            for (unsigned k = 0; k < 4; k++)
+            {
+                if (m_joints[i][j].first[k] == -1 ||
+                    m_joints[i][j].second[k] == 0.0f)
+                {
+                    break;
+                }
+                scene::CSkinnedMesh::SWeight* w = m_mesh->addWeight
+                    (joints[used_joints_map[m_joints[i][j].first[k]]]);
+                w->buffer_id = (uint16_t)i;
+                w->vertex_id = j;
+                w->strength = m_joints[i][j].second[k];
+            }
+        }
+    }
+
+}   // convertIrrlicht
+
+// ----------------------------------------------------------------------------
+void SPMeshLoader::Armature::read(irr::io::IReadFile* spm)
+{
+    LocRotScale lrs;
+    spm->read(&m_joint_used, 2);
+    assert(m_joint_used > 0);
+    unsigned all_joints_size = 0;
+    spm->read(&all_joints_size, 2);
+    assert(all_joints_size > 0);
+    m_joint_names.resize(all_joints_size);
+    for (unsigned i = 0; i < all_joints_size; i++)
+    {
+        unsigned str_len = 0;
+        spm->read(&str_len, 1);
+        m_joint_names[i].resize(str_len);
+        spm->read(&m_joint_names[i].front(), str_len);
+    }
+    m_joint_matrices.resize(all_joints_size);
+    m_interpolated_matrices.resize(all_joints_size);
+    for (unsigned i = 0; i < all_joints_size; i++)
+    {
+        lrs.read(spm);
+        m_joint_matrices[i] = lrs.toMatrix();
+    }
+    m_world_matrices.resize(m_interpolated_matrices.size(),
+        std::make_pair(core::matrix4(), false));
+    m_parent_infos.resize(all_joints_size);
+    bool non_parent_bone = false;
+    for (unsigned i = 0; i < all_joints_size; i++)
+    {
+        int16_t info = 0;
+        spm->read(&info, 2);
+        if (info == -1)
+        {
+            non_parent_bone = true;
+        }
+        m_parent_infos[i] = info;
+    }
+    if (!non_parent_bone)
+    {
+        Log::fatal("SPMeshLoader::Armature", "Non-parent bone missing in"
+            "armature");
+    }
+    unsigned frame_size = 0;
+    spm->read(&frame_size, 2);
+    m_frame_pose_matrices.resize(frame_size);
+    for (unsigned i = 0; i < frame_size; i++)
+    {
+        m_frame_pose_matrices[i].second.resize(all_joints_size);
+        unsigned frame_index = 0;
+        spm->read(&frame_index, 2);
+        m_frame_pose_matrices[i].first = frame_index;
+        for (unsigned j = 0; j < m_frame_pose_matrices[i].second.size(); j++)
+        {
+            m_frame_pose_matrices[i].second[j].read(spm);
+        }
+    }
+}   // Armature::read
+
+// ----------------------------------------------------------------------------
+void SPMeshLoader::LocRotScale::read(irr::io::IReadFile* spm)
+{
+    float tmp[10];
+    spm->read(&tmp, 40);
+    m_loc = core::vector3df(tmp[0], tmp[1], tmp[2]);
+    m_rot = core::quaternion(tmp[3], tmp[4], tmp[5], tmp[6]);
+    m_rot.normalize();
+    m_scale = core::vector3df(tmp[7], tmp[8], tmp[9]);
+}   // LocRotScale::read
+
+// ----------------------------------------------------------------------------
+void SPMeshLoader::Armature::getInterpolatedMatrices(float frame)
+{
+    if (frame < float(m_frame_pose_matrices.front().first) ||
+        frame >= float(m_frame_pose_matrices.back().first))
+    {
+        for (unsigned i = 0; i < m_interpolated_matrices.size(); i++)
+        {
+            m_interpolated_matrices[i] =
+                frame >= float(m_frame_pose_matrices.back().first) ?
+                m_frame_pose_matrices.back().second[i].toMatrix() :
+                m_frame_pose_matrices.front().second[i].toMatrix();
+        }
+        return;
+    }
+    int frame_1 = -1;
+    int frame_2 = -1;
+    float interpolation = 0.0f;
+    for (unsigned i = 0; i < m_frame_pose_matrices.size(); i++)
+    {
+        assert(i + 1 < m_frame_pose_matrices.size());
+        if (frame >= float(m_frame_pose_matrices[i].first) &&
+            frame < float(m_frame_pose_matrices[i + 1].first))
+        {
+            frame_1 = i;
+            frame_2 = i + 1;
+            interpolation =
+                (frame - float(m_frame_pose_matrices[i].first)) /
+                float(m_frame_pose_matrices[i + 1].first -
+                m_frame_pose_matrices[i].first);
+            break;
+        }
+    }
+    assert(frame_1 != -1);
+    assert(frame_2 != -1);
+    for (unsigned i = 0; i < m_interpolated_matrices.size(); i++)
+    {
+        LocRotScale interpolated;
+        interpolated.m_loc =
+            m_frame_pose_matrices[frame_2].second[i].m_loc.getInterpolated
+            (m_frame_pose_matrices[frame_1].second[i].m_loc, interpolation);
+        interpolated.m_rot.slerp
+            (m_frame_pose_matrices[frame_1].second[i].m_rot,
+            m_frame_pose_matrices[frame_2].second[i].m_rot, interpolation);
+        interpolated.m_scale =
+            m_frame_pose_matrices[frame_2].second[i].m_scale.getInterpolated
+            (m_frame_pose_matrices[frame_1].second[i].m_scale, interpolation);
+        m_interpolated_matrices[i] = interpolated.toMatrix();
+    }
+}   // Armature::getInterpolatedMatrices
+
+// ----------------------------------------------------------------------------
+void SPMeshLoader::Armature::getPose(float frame, core::matrix4* dest)
+{
+    getInterpolatedMatrices(frame);
+    for (auto& p : m_world_matrices)
+    {
+        p.second = false;
+    }
+    for (unsigned i = 0; i < m_joint_used; i++)
+    {
+        dest[i] = getWorldMatrix(m_interpolated_matrices, i) *
+            m_joint_matrices[i];
+    }
+}   // Armature::getPose
+
+// ----------------------------------------------------------------------------
+core::matrix4 SPMeshLoader::Armature::getWorldMatrix(
+    const std::vector<core::matrix4>& matrix, unsigned id)
+{
+    core::matrix4 mat = matrix[id];
+    int parent_id = m_parent_infos[id];
+    if (parent_id == -1)
+    {
+        m_world_matrices[id] = std::make_pair(mat, true);
+        return mat;
+    }
+    if (!m_world_matrices[parent_id].second)
+    {
+        m_world_matrices[parent_id] = std::make_pair
+            (getWorldMatrix(matrix, parent_id), true);
+    }
+    m_world_matrices[id] =
+        std::make_pair(m_world_matrices[parent_id].first * mat, true);
+    return m_world_matrices[id].first;
+}   // Armature::getWorldMatrix
diff --git a/src/graphics/sp_mesh_loader.hpp b/src/graphics/sp_mesh_loader.hpp
new file mode 100644
index 000000000..b63a517ca
--- /dev/null
+++ b/src/graphics/sp_mesh_loader.hpp
@@ -0,0 +1,403 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2017 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_SP_MESH_LOADER_HPP
+#define HEADER_SP_MESH_LOADER_HPP
+
+#include "../lib/irrlicht/source/Irrlicht/CSkinnedMesh.h"
+#include "utils/types.hpp"
+
+#include <IMeshLoader.h>
+#include <ISceneManager.h>
+#include <IReadFile.h>
+#include <array>
+#include <vector>
+
+using namespace irr;
+
+
+// GLM without template
+namespace MiniGLM
+{
+    // ------------------------------------------------------------------------
+    inline float overflow()
+    {
+        volatile float f = 1e10;
+        for (int i = 0; i < 10; i++)
+            f *= f; // this will overflow before the for loop terminates
+        return f;
+    }   // overflow
+    // ------------------------------------------------------------------------
+    inline float toFloat32(short value)
+    {
+        int s = (value >> 15) & 0x00000001;
+        int e = (value >> 10) & 0x0000001f;
+        int m =  value        & 0x000003ff;
+        if (e == 0)
+        {
+            if (m == 0)
+            {
+                //
+                // Plus or minus zero
+                //
+                uint32_t tmp_data = (unsigned int)(s << 31);
+                float ret;
+                memcpy(&ret, &tmp_data, 4);
+                return ret;
+            }
+            else
+            {
+                //
+                // Denormalized number -- renormalize it
+                //
+                while(!(m & 0x00000400))
+                {
+                    m <<= 1;
+                    e -=  1;
+                }
+
+                e += 1;
+                m &= ~0x00000400;
+            }
+        }
+        else if (e == 31)
+        {
+            if (m == 0)
+            {
+                //
+                // Positive or negative infinity
+                //
+                uint32_t tmp_data = (unsigned int)((s << 31) | 0x7f800000);
+                float ret;
+                memcpy(&ret, &tmp_data, 4);
+                return ret;
+            }
+            else
+            {
+                //
+                // Nan -- preserve sign and significand bits
+                //
+                uint32_t tmp_data = (unsigned int)((s << 31) | 0x7f800000 |
+                    (m << 13));
+                float ret;
+                memcpy(&ret, &tmp_data, 4);
+                return ret;
+            }
+        }
+
+        //
+        // Normalized number
+        //
+        e = e + (127 - 15);
+        m = m << 13;
+        //
+        // Assemble s, e and m.
+        //
+        uint32_t tmp_data = (unsigned int)((s << 31) | (e << 23) | m);
+        float ret;
+        memcpy(&ret, &tmp_data, 4);
+        return ret;
+    }   // toFloat32
+    // ------------------------------------------------------------------------
+    inline short toFloat16(float const & f)
+    {
+        int i;
+        memcpy(&i, &f, 4);
+        //
+        // Our floating point number, f, is represented by the bit
+        // pattern in integer i.  Disassemble that bit pattern into
+        // the sign, s, the exponent, e, and the significand, m.
+        // Shift s into the position where it will go in in the
+        // resulting half number.
+        // Adjust e, accounting for the different exponent bias
+        // of float and half (127 versus 15).
+        //
+        int s =  (i >> 16) & 0x00008000;
+        int e = ((i >> 23) & 0x000000ff) - (127 - 15);
+        int m =   i        & 0x007fffff;
+
+        //
+        // Now reassemble s, e and m into a half:
+        //
+        if (e <= 0)
+        {
+            if (e < -10)
+            {
+                //
+                // E is less than -10.  The absolute value of f is
+                // less than half_MIN (f may be a small normalized
+                // float, a denormalized float or a zero).
+                //
+                // We convert f to a half zero.
+                //
+                return short(s);
+            }
+
+            //
+            // E is between -10 and 0.  F is a normalized float,
+            // whose magnitude is less than __half_NRM_MIN.
+            //
+            // We convert f to a denormalized half.
+            //
+            m = (m | 0x00800000) >> (1 - e);
+
+            //
+            // Round to nearest, round "0.5" up.
+            //
+            // Rounding may cause the significand to overflow and make
+            // our number normalized.  Because of the way a half's bits
+            // are laid out, we don't have to treat this case separately;
+            // the code below will handle it correctly.
+            //
+            if (m & 0x00001000)
+                m += 0x00002000;
+
+            //
+            // Assemble the half from s, e (zero) and m.
+            //
+            return short(s | (m >> 13));
+        }
+        else if (e == 0xff - (127 - 15))
+        {
+            if (m == 0)
+            {
+                //
+                // F is an infinity; convert f to a half
+                // infinity with the same sign as f.
+                //
+                return short(s | 0x7c00);
+            }
+            else
+            {
+                //
+                // F is a NAN; we produce a half NAN that preserves
+                // the sign bit and the 10 leftmost bits of the
+                // significand of f, with one exception: If the 10
+                // leftmost bits are all zero, the NAN would turn
+                // into an infinity, so we have to set at least one
+                // bit in the significand.
+                //
+                m >>= 13;
+                return short(s | 0x7c00 | m | (m == 0));
+            }
+        }
+        else
+        {
+            //
+            // E is greater than zero.  F is a normalized float.
+            // We try to convert f to a normalized half.
+            //
+            //
+            // Round to nearest, round "0.5" up
+            //
+            if (m &  0x00001000)
+            {
+                m += 0x00002000;
+                if (m & 0x00800000)
+                {
+                    m =  0;     // overflow in significand,
+                    e += 1;     // adjust exponent
+                }
+            }
+
+            //
+            // Handle exponent overflow
+            //
+            if (e > 30)
+            {
+                overflow();        // Cause a hardware floating point overflow;
+
+                return short(s | 0x7c00);
+                // if this returns, the half becomes an
+            }   // infinity with the same sign as f.
+
+            //
+            // Assemble the half from s, e and m.
+            //
+            return short(s | (e << 10) | (m >> 13));
+        }
+    }   // toFloat16
+    // ------------------------------------------------------------------------
+    inline uint32_t vectorTo3Int10Bit(const irr::core::vector3df& vec)
+    {
+        int part;
+        uint32_t sum;
+        float v;
+        sum = 0;
+        v = fminf(1.0, fmaxf(-1.0, vec.X));
+        if (v > 0.0)
+        {
+            part = (int)((v * 511.0) + 0.5);
+        }
+        else
+        {
+            part = (int)((v * 512.0) - 0.5);
+        }
+        sum |= ((uint32_t)part & 1023) << 0;
+        v = fminf(1.0, fmaxf(-1.0, vec.Y));
+        if (v > 0.0)
+        {
+            part = (int)((v * 511.0) + 0.5);
+        }
+        else
+        {
+            part = (int)((v * 512.0) - 0.5);
+        }
+        sum |= ((uint32_t)part & 1023) << 10;
+        v = fminf(1.0, fmaxf(-1.0, vec.Z));
+        if (v > 0.0)
+        {
+            part = (int)((v * 511.0) + 0.5);
+        }
+        else
+        {
+            part = (int)((v * 512.0) - 0.5);
+        }
+        sum |= ((uint32_t)part & 1023) << 20;
+        v = 0.0f;
+        part = (int)((v * 2.0) - 0.5);
+        sum |= ((uint32_t)part & 3) << 30;
+        return sum;
+    }   // vectorTo3Int10Bit
+    // ------------------------------------------------------------------------
+    inline core::vector3df extract3Int10Bit(uint32_t sum)
+    {
+        core::vector3df ret;
+        int part = sum & 1023;
+        if (part & 512)
+        {
+            ret.X = (float)(1024 - part) * (-1.0f / 512.0f);
+        }
+        else
+        {
+            ret.X = (float)part * (1.0f / 511.0f);
+        }
+        part = (sum >> 10) & 1023;
+        if (part & 512)
+        {
+            ret.Y = (float)(1024 - part) * (-1.0f / 512.0f);
+        }
+        else
+        {
+            ret.Y = (float)part * (1.0f / 511.0f);
+        }
+        part = (sum >> 20) & 1023;
+        if (part & 512)
+        {
+            ret.Z = (float)(1024 - part) * (-1.0f / 512.0f);
+        }
+        else
+        {
+            ret.Z = (float)part * (1.0f / 511.0f);
+        }
+        return ret.normalize();
+    }   // extract3Int10Bit
+
+}
+
+class SPMeshLoader : public scene::IMeshLoader
+{
+private:
+    // ------------------------------------------------------------------------
+    struct LocRotScale
+    {
+        core::vector3df m_loc;
+
+        core::quaternion m_rot;
+
+        core::vector3df m_scale;
+        // --------------------------------------------------------------------
+        inline core::matrix4 toMatrix() const
+        {
+            core::matrix4 lm, sm, rm;
+            lm.setTranslation(m_loc);
+            sm.setScale(m_scale);
+            m_rot.getMatrix(rm);
+            return lm * rm * sm;
+        }
+        // --------------------------------------------------------------------
+        void read(irr::io::IReadFile* spm);
+
+    };
+    struct Armature
+    {
+        unsigned m_joint_used;
+
+        std::vector<std::string> m_joint_names;
+
+        std::vector<core::matrix4> m_joint_matrices;
+
+        std::vector<core::matrix4> m_interpolated_matrices;
+
+        std::vector<std::pair<core::matrix4, bool> > m_world_matrices;
+
+        std::vector<int> m_parent_infos;
+
+        std::vector<std::pair<int, std::vector<LocRotScale> > >
+            m_frame_pose_matrices;
+
+        // --------------------------------------------------------------------
+        void read(irr::io::IReadFile* spm);
+        // --------------------------------------------------------------------
+        void getPose(float frame, core::matrix4* dest);
+        // --------------------------------------------------------------------
+        void getInterpolatedMatrices(float frame);
+        // --------------------------------------------------------------------
+        core::matrix4 getWorldMatrix(const std::vector<core::matrix4>& matrix,
+                                     unsigned id);
+    };
+    // ------------------------------------------------------------------------
+    unsigned m_bind_frame, m_joint_count;//, m_frame_count;
+    // ------------------------------------------------------------------------
+    std::vector<Armature> m_all_armatures;
+    // ------------------------------------------------------------------------
+    std::vector<core::matrix4> m_to_bind_pose_matrices;
+    // ------------------------------------------------------------------------
+    enum SPVertexType: unsigned int
+    {
+        SPVT_NORMAL,
+        SPVT_SKINNED
+    };
+    // ------------------------------------------------------------------------
+    void decompress(irr::io::IReadFile* spm, unsigned vertices_count,
+                    unsigned indices_count, bool read_normal, bool read_vcolor,
+                    bool read_tangent, bool uv_one, bool uv_two,
+                    SPVertexType vt, const video::SMaterial& m);
+    // ------------------------------------------------------------------------
+    void createAnimationData(irr::io::IReadFile* spm);
+    // ------------------------------------------------------------------------
+    void convertIrrlicht();
+
+    scene::CSkinnedMesh* m_mesh;
+
+    scene::ISceneManager* m_scene_manager;
+
+    std::vector<std::vector<
+        std::pair<std::array<short, 4>, std::array<float, 4> > > > m_joints;
+
+public:
+    // ------------------------------------------------------------------------
+    SPMeshLoader(scene::ISceneManager* smgr) : m_scene_manager(smgr) {}
+    // ------------------------------------------------------------------------
+    virtual bool isALoadableFileExtension(const io::path& filename) const;
+    // ------------------------------------------------------------------------
+    virtual scene::IAnimatedMesh* createMesh(io::IReadFile* file);
+
+};
+
+#endif
+
diff --git a/src/graphics/stk_mesh_loader.cpp b/src/graphics/stk_mesh_loader.cpp
index a11dca346..7cdd4f5c2 100644
--- a/src/graphics/stk_mesh_loader.cpp
+++ b/src/graphics/stk_mesh_loader.cpp
@@ -41,6 +41,7 @@ scene::IAnimatedMesh* STKMeshLoader::createMesh(io::IReadFile* f)
 
     B3DFile = f;
     AnimatedMesh = new scene::CSkinnedMesh();
+    AnimatedMesh->setTransposedMatrix(true);
     ShowWarning = true; // If true a warning is issued if too many textures are used
     VerticesStart=0;
 
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 1c68ec412..1a32ac064 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -1111,39 +1111,52 @@ bool Track::loadMainTrack(const XMLNode &root)
                    track_node->getName().c_str(), model_name.c_str());
     }
 
-    // The mesh as returned does not have all mesh buffers with the same
-    // texture combined. This can result in a _HUGE_ overhead. E.g. instead
-    // of 46 different mesh buffers over 500 (for some tracks even >1000)
-    // were created. This means less effect from hardware support, less
-    // vertices per opengl operation, more overhead on CPU, ...
-    // So till we have a better b3d exporter which can combine the different
-    // meshes which use the same texture when exporting, the meshes are
-    // combined using CBatchingMesh.
-    scene::CBatchingMesh *merged_mesh = new scene::CBatchingMesh();
-    merged_mesh->addMesh(mesh);
-    merged_mesh->finalize();
+    scene::ISceneNode* scene_node = NULL;
+    scene::IMesh* tangent_mesh = NULL;
+    if (m_version < 7)
+    {
+        // The mesh as returned does not have all mesh buffers with the same
+        // texture combined. This can result in a _HUGE_ overhead. E.g. instead
+        // of 46 different mesh buffers over 500 (for some tracks even >1000)
+        // were created. This means less effect from hardware support, less
+        // vertices per opengl operation, more overhead on CPU, ...
+        // So till we have a better b3d exporter which can combine the different
+        // meshes which use the same texture when exporting, the meshes are
+        // combined using CBatchingMesh.
+        scene::CBatchingMesh *merged_mesh = new scene::CBatchingMesh();
+        merged_mesh->addMesh(mesh);
+        merged_mesh->finalize();
 #ifndef SERVER_ONLY
-    scene::IMesh* tangent_mesh = MeshTools::createMeshWithTangents(merged_mesh, &MeshTools::isNormalMap);
+        tangent_mesh = MeshTools::createMeshWithTangents(merged_mesh, &MeshTools::isNormalMap);
 
-    adjustForFog(tangent_mesh, NULL);
+        adjustForFog(tangent_mesh, NULL);
 #else
-    scene::IMesh* tangent_mesh = merged_mesh;
+        tangent_mesh = merged_mesh;
 #endif
-
+        // The reference count of the mesh is 1, since it is in irrlicht's
+        // cache. So we only have to remove it from the cache.
+        irr_driver->removeMeshFromCache(mesh);
+    }
+    else
+    {
+        // SPM does the combine for you
+#ifndef SERVER_ONLY
+        tangent_mesh = MeshTools::createMeshWithTangents(mesh, &MeshTools::isNormalMap);
+        adjustForFog(tangent_mesh, NULL);
+        tangent_mesh->grab();
+#else
+        tangent_mesh = mesh;
+#endif
+    }
     // The merged mesh is grabbed by the octtree, so we don't need
     // to keep a reference to it.
-    scene::ISceneNode *scene_node = irr_driver->addMesh(tangent_mesh, "track_main");
-    //scene::IMeshSceneNode *scene_node = irr_driver->addOctTree(merged_mesh);
+    scene_node = irr_driver->addMesh(tangent_mesh, "track_main");
     // We should drop the merged mesh (since it's now referred to in the
     // scene node), but then we need to grab it since it's in the
     // m_all_cached_meshes.
     m_all_cached_meshes.push_back(tangent_mesh);
     irr_driver->grabAllTextures(tangent_mesh);
 
-    // The reference count of the mesh is 1, since it is in irrlicht's
-    // cache. So we only have to remove it from the cache.
-    irr_driver->removeMeshFromCache(mesh);
-
 #ifdef DEBUG
     std::string debug_name=model_name+" (main track, octtree)";
     scene_node->setName(debug_name.c_str());

From a00b87891997fb947fc1eb0f91d3ad1d34505364 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Thu, 17 Aug 2017 01:26:08 +0800
Subject: [PATCH 048/125] Use transposed matrix everywhere

---
 lib/irrlicht/source/Irrlicht/CSkinnedMesh.cpp | 18 ++----------------
 lib/irrlicht/source/Irrlicht/CSkinnedMesh.h   |  3 ---
 sources.cmake                                 |  2 +-
 src/graphics/sp_mesh_loader.cpp               |  2 +-
 src/graphics/sp_mesh_loader.hpp               |  2 +-
 src/graphics/stk_mesh_loader.cpp              |  1 -
 6 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CSkinnedMesh.cpp b/lib/irrlicht/source/Irrlicht/CSkinnedMesh.cpp
index 79a925523..b4fcf2b64 100644
--- a/lib/irrlicht/source/Irrlicht/CSkinnedMesh.cpp
+++ b/lib/irrlicht/source/Irrlicht/CSkinnedMesh.cpp
@@ -21,7 +21,7 @@ namespace scene
 CSkinnedMesh::CSkinnedMesh()
 : SkinningBuffers(0), AnimationFrames(0.f), FramesPerSecond(25.f),
 	LastAnimatedFrame(-1), SkinnedLastFrame(false),
-	InterpolationMode(EIM_LINEAR), TransposedMatrix(false),
+	InterpolationMode(EIM_LINEAR),
 	HasAnimation(false), PreparedForSkinning(false),
 	AnimateNormals(true), HardwareSkinning(false), m_total_joints(0),
 	m_current_joint(0)
@@ -92,13 +92,6 @@ IMesh* CSkinnedMesh::getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop, s32
 }
 
 
-//! For loader usage.
-void CSkinnedMesh::setTransposedMatrix(bool val)
-{
-	TransposedMatrix = val;
-}
-
-
 //--------------------------------------------------------------------------
 //			Keyframe Animation
 //--------------------------------------------------------------------------
@@ -190,14 +183,7 @@ void CSkinnedMesh::buildAllLocalAnimatedMatrices()
 
 			// IRR_TEST_BROKEN_QUATERNION_USE: TODO - switched to getMatrix_transposed instead of getMatrix for downward compatibility. 
 			//								   Not tested so far if this was correct or wrong before quaternion fix!
-			if (TransposedMatrix)
-			{
-				joint->Animatedrotation.getMatrix_transposed(joint->LocalAnimatedMatrix);
-			}
-			else
-			{
-				joint->LocalAnimatedMatrix=joint->Animatedrotation.getMatrix();
-			}
+			joint->Animatedrotation.getMatrix_transposed(joint->LocalAnimatedMatrix);
 
 			// --- joint->LocalAnimatedMatrix *= joint->Animatedrotation.getMatrix() ---
 			f32 *m1 = joint->LocalAnimatedMatrix.pointer();
diff --git a/lib/irrlicht/source/Irrlicht/CSkinnedMesh.h b/lib/irrlicht/source/Irrlicht/CSkinnedMesh.h
index e104f747c..0dd936f0d 100644
--- a/lib/irrlicht/source/Irrlicht/CSkinnedMesh.h
+++ b/lib/irrlicht/source/Irrlicht/CSkinnedMesh.h
@@ -155,8 +155,6 @@ namespace scene
 
 		virtual void updateBoundingBox(void);
 
-		void setTransposedMatrix(bool);
-
 		//! Recovers the joints from the mesh
 		void recoverJointsFromMesh(core::array<IBoneSceneNode*> &jointChildSceneNodes);
 
@@ -225,7 +223,6 @@ private:
 
 		E_INTERPOLATION_MODE InterpolationMode:8;
 
-		bool TransposedMatrix;
 		bool HasAnimation;
 		bool PreparedForSkinning;
 		bool AnimateNormals;
diff --git a/sources.cmake b/sources.cmake
index ddc029d4f..d4f28ae4d 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,4 +1,4 @@
-# Modify this file to change the last-modified date when you add/remove a file. 
+# Modify this file to change the last-modified date when you add/remove a file.
 # This will then trigger a new cmake run automatically.
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
 file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
diff --git a/src/graphics/sp_mesh_loader.cpp b/src/graphics/sp_mesh_loader.cpp
index f897d3820..fd1bd48ea 100644
--- a/src/graphics/sp_mesh_loader.cpp
+++ b/src/graphics/sp_mesh_loader.cpp
@@ -544,7 +544,7 @@ void SPMeshLoader::LocRotScale::read(irr::io::IReadFile* spm)
     float tmp[10];
     spm->read(&tmp, 40);
     m_loc = core::vector3df(tmp[0], tmp[1], tmp[2]);
-    m_rot = core::quaternion(tmp[3], tmp[4], tmp[5], tmp[6]);
+    m_rot = core::quaternion(-tmp[3], -tmp[4], -tmp[5], tmp[6]);
     m_rot.normalize();
     m_scale = core::vector3df(tmp[7], tmp[8], tmp[9]);
 }   // LocRotScale::read
diff --git a/src/graphics/sp_mesh_loader.hpp b/src/graphics/sp_mesh_loader.hpp
index b63a517ca..5333339be 100644
--- a/src/graphics/sp_mesh_loader.hpp
+++ b/src/graphics/sp_mesh_loader.hpp
@@ -326,7 +326,7 @@ private:
             core::matrix4 lm, sm, rm;
             lm.setTranslation(m_loc);
             sm.setScale(m_scale);
-            m_rot.getMatrix(rm);
+            m_rot.getMatrix_transposed(rm);
             return lm * rm * sm;
         }
         // --------------------------------------------------------------------
diff --git a/src/graphics/stk_mesh_loader.cpp b/src/graphics/stk_mesh_loader.cpp
index 7cdd4f5c2..a11dca346 100644
--- a/src/graphics/stk_mesh_loader.cpp
+++ b/src/graphics/stk_mesh_loader.cpp
@@ -41,7 +41,6 @@ scene::IAnimatedMesh* STKMeshLoader::createMesh(io::IReadFile* f)
 
     B3DFile = f;
     AnimatedMesh = new scene::CSkinnedMesh();
-    AnimatedMesh->setTransposedMatrix(true);
     ShowWarning = true; // If true a warning is issued if too many textures are used
     VerticesStart=0;
 

From 3cf8649a6efb0a851da029acef2827dc2a0103a5 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 16 Aug 2017 23:35:37 +0200
Subject: [PATCH 049/125] More work with generate_assets script.

Now uncompressed tux with .spm takes just 350 kb.
---
 android/generate_assets.sh | 262 +++++++++++++++++++++----------------
 1 file changed, 148 insertions(+), 114 deletions(-)

diff --git a/android/generate_assets.sh b/android/generate_assets.sh
index aeae74e36..51bda9b3c 100755
--- a/android/generate_assets.sh
+++ b/android/generate_assets.sh
@@ -160,13 +160,14 @@ echo "Decrease assets quality"
 
 convert_image()
 {
-   if [ -z "$1" ]; then
-      echo "No file to convert"
-      return
-   fi
-
    FILE="$1"
    FILE_TYPE="$2"
+   echo "Convert file: $FILE"
+
+   if [ ! -f "$FILE" ]; then
+      echo "  File doesn't exist."
+      return
+   fi
 
    W=`identify -format "%[fx:w]" "$FILE"`
    H=`identify -format "%[fx:h]" "$FILE"`
@@ -210,13 +211,14 @@ convert_image()
 
 convert_sound()
 {
-   if [ -z "$1" ]; then
-      echo "No file to convert"
+   FILE="$1"
+   echo "Convert file: $FILE"
+
+   if [ ! -f "$FILE" ]; then
+      echo "  File doesn't exist."
       return
    fi
 
-   FILE="$1"
-
    oggdec "$FILE" -o tmp.wav
 
    if [ -s tmp.wav ]; then
@@ -250,108 +252,75 @@ convert_sound()
    rm -f tmp.wav tmp.ogg
 }
 
-convert_model()
+convert_to_jpg()
 {
-   if [ -z "$1" ]; then
-      echo "No texture path provided"
+   FILE="$1"
+   echo "Convert file: $FILE"
+
+   if [ ! -f "$FILE" ]; then
+      echo "  File doesn't exist."
       return
    fi
-
-   TEXTURE_PATH="$1"
    
-   #echo "  Texture: $TEXTURE_NAME"
-
    ALREADY_CONVERTED=0
 
    if [ -s "./converted_textures" ]; then
       while read -r CONVERTED_TEXTURE; do
-         if [ "$TEXTURE_PATH" = "$CONVERTED_TEXTURE" ]; then
+         if [ "$FILE" = "$CONVERTED_TEXTURE" ]; then
             ALREADY_CONVERTED=1
             break
          fi
       done < "./converted_textures"
    fi
 
-   if [ $ALREADY_CONVERTED -eq 0 ]; then
-      if [ ! -f "$TEXTURE_PATH" ]; then
-         #echo "  Couldn't find texture file. Ignore..."
-         continue
-      fi
-
-      FILE_EXTENSION=`echo "$TEXTURE_PATH" | tail -c 5`
-
-      if [ `echo "$FILE_EXTENSION" | head -c 1` != "." ]; then
-         #echo "  Unsupported file extension. Ignore..."
-         continue
-      fi
-
-      FILE_FORMAT=`identify -format %m "$TEXTURE_PATH"`
-
-      if [ "$FILE_FORMAT" = "JPEG" ]; then
-         #echo "  File is already JPEG. Ignore..."
-         continue
-      fi
-
-      IS_OPAQUE=`identify -format '%[opaque]' "$TEXTURE_PATH"`
-      #HAS_ALPHA=`identify -format '%A' "$TEXTURE_PATH"`
-
-      if [ "$IS_OPAQUE" = "False" ] || [ "$IS_OPAQUE" = "false" ]; then
-         #echo "  File has alpha channel. Ignore..."
-         continue
-      fi
-
-      NEW_TEXTURE_NAME="`echo $TEXTURE_NAME | head -c -5`.jpg"
-      NEW_TEXTURE_PATH="`echo $TEXTURE_PATH | head -c -5`.jpg"
-
-      if [ -f "$NEW_TEXTURE_PATH" ]; then
-         #echo "  There is already a file with .jpg extension. Ignore..."
-         continue
-      fi
-
-      convert -quality $JPEG_QUALITY "$TEXTURE_PATH" "$NEW_TEXTURE_PATH"
-      rm -f "$TEXTURE_PATH"
-
-      if [ -s "$DIRNAME/materials.xml" ]; then
-         sed -i "s/\"$TEXTURE_NAME\"/\"$NEW_TEXTURE_NAME\"/g" \
-                                                        "$DIRNAME/materials.xml"
-         sed -i "s/\"$TEXTURE_NAME /\"$NEW_TEXTURE_NAME /g" \
-                                                        "$DIRNAME/materials.xml"
-         sed -i "s/ $TEXTURE_NAME\"/ $NEW_TEXTURE_NAME\"/g" \
-                                                        "$DIRNAME/materials.xml"
-         sed -i "s/ $TEXTURE_NAME / $NEW_TEXTURE_NAME /g" \
-                                                        "$DIRNAME/materials.xml"
-      fi
-
-      if [ -s "$DIRNAME/scene.xml" ]; then
-         sed -i "s/\"$TEXTURE_NAME\"/\"$NEW_TEXTURE_NAME\"/g" \
-                                                            "$DIRNAME/scene.xml"
-         sed -i "s/\"$TEXTURE_NAME /\"$NEW_TEXTURE_NAME /g" "$DIRNAME/scene.xml"
-         sed -i "s/ $TEXTURE_NAME\"/ $NEW_TEXTURE_NAME\"/g" "$DIRNAME/scene.xml"
-         sed -i "s/ $TEXTURE_NAME / $NEW_TEXTURE_NAME /g" "$DIRNAME/scene.xml"
-      fi
-
-      echo "$TEXTURE_PATH" >> "./converted_textures"
+   if [ $ALREADY_CONVERTED -eq 1 ]; then
+	   return
    fi
 
-   echo -n ".jpg" | dd of=./tmp bs=1 seek=$(($TEXNAME_END - 4)) \
-                                                   conv=notrunc 2> /dev/null
-                                                   
-   SIZE_OLD=`du -b "$FILE" | cut -f1`
-   SIZE_NEW=`du -b "tmp" | cut -f1`
-
-   if [ $SIZE_NEW -ne $SIZE_OLD ]; then
-      echo "  Something went wrong..."
-      exit
+   if [ ! -f "$FILE" ]; then
+	   #echo "  Couldn't find texture file. Ignore..."
+	   continue
    fi
+
+   FILE_EXTENSION=`echo "$FILE" | tail -c 5`
+
+   if [ `echo "$FILE_EXTENSION" | head -c 1` != "." ]; then
+	   #echo "  Unsupported file extension. Ignore..."
+	   continue
+   fi
+
+   FILE_FORMAT=`identify -format %m "$FILE"`
+
+   if [ "$FILE_FORMAT" = "JPEG" ]; then
+      #echo "  File is already JPEG. Ignore..."
+	   continue
+   fi
+
+   IS_OPAQUE=`identify -format '%[opaque]' "$FILE"`
+   #HAS_ALPHA=`identify -format '%A' "$FILE"`
+
+   if [ "$IS_OPAQUE" = "False" ] || [ "$IS_OPAQUE" = "false" ]; then
+	   #echo "  File has alpha channel. Ignore..."
+	   continue
+   fi
+
+   NEW_FILE="`echo $FILE | head -c -5`.jpg"
+
+   if [ -f "$NEW_FILE" ]; then
+	   #echo "  There is already a file with .jpg extension. Ignore..."
+	   continue
+   fi
+
+   # We can check if new file is smaller
+   convert -quality $JPEG_QUALITY "$FILE" "$NEW_FILE"
+   rm -f "$FILE"
+
+   echo "$FILE" >> "./converted_textures"
 }
 
-convert_b3d()
-{
-   if [ -z "$1" ]; then
-      echo "No file to convert"
-      return
-   fi
 
+convert_to_jpg_extract_b3dz()
+{
    FILE="$1"
    echo "Convert file: $FILE"
 
@@ -360,6 +329,28 @@ convert_b3d()
       return
    fi
 
+   DIRNAME="`dirname "$FILE"`"
+   
+   unzip "$FILE" -d "$DIRNAME"
+   rm -f "$FILE"
+   
+   TEXNAME="`basename "$FILE"`"
+   NEWNAME="`echo $TEXNAME | head -c -6`.b3d"
+   
+   sed -i "s/\"$TEXNAME\"/\"$NEWNAME\"/g" "$DIRNAME/kart.xml"
+}
+
+
+convert_to_jpg_update_b3d()
+{
+   FILE="$1"
+   echo "Convert file: $FILE"
+   
+   if [ ! -f "$1" ]; then
+      echo "  File doesn't exist."
+      return
+   fi
+
    HEX_FILE=`hexdump -ve '1/1 "%.2x"' "$FILE"`
 
    TEXS_CHUNK="54455853"
@@ -369,7 +360,7 @@ convert_b3d()
                               | tail -c +$(($TEXS_CHUNK_POS + 1))`
 
    if [ -z "$FOUND_CHUNK" ] || [ "$FOUND_CHUNK" != "$TEXS_CHUNK" ]; then
-      echo "  Unsupported format."
+      echo "  File has no textures."
       return
    fi
 
@@ -391,8 +382,6 @@ convert_b3d()
    HEX_TEXS=`echo $HEX_FILE | head -c $TEXS_END | tail -c +$(($TEXS_BEGIN+1))`
    CURR_POS=0
 
-   cp "$FILE" tmp
-
    while [ $CURR_POS -lt $TEXS_END ]; do
       NULL_POS=`echo $HEX_TEXS | tail -c +$(($CURR_POS+1)) | grep -b -o "00" \
                                        | head -n 1 | cut -f1 -d":"`
@@ -413,26 +402,32 @@ convert_b3d()
 
       TEXTURE_NAME=`dd if="$FILE" bs=1 skip=$TEXNAME_BEGIN \
                      count=$(($TEXNAME_END - $TEXNAME_BEGIN)) 2> /dev/null`
-      DIRNAME=`dirname "$FILE"`
+      DIRNAME="`dirname "$FILE"`"
       TEXTURE_PATH="$DIRNAME/$TEXTURE_NAME"
+	  
+	   IS_CONVERTED=0
+	  
+      while read -r CONVERTED_TEXTURE; do
+         if [ "$TEXTURE_PATH" = "$CONVERTED_TEXTURE" ]; then
+            IS_CONVERTED=1
+            break
+         fi
+      done < "./converted_textures"
       
-      convert_model "$TEXTURE_PATH"
+	   if [ $IS_CONVERTED -eq 1 ]; then
+		   echo -n ".jpg" | dd of="$FILE" bs=1 seek=$(($TEXNAME_END - 4)) \
+														   conv=notrunc 2> /dev/null
+	   fi;
    done
-
-   mv tmp "$FILE"
 }
 
-convert_spm()
-{
-   if [ -z "$1" ]; then
-      echo "No file to convert"
-      return
-   fi
 
+convert_to_jpg_update_spm()
+{
    FILE="$1"
    echo "Convert file: $FILE"
-
-   if [ ! -f "$FILE" ]; then
+   
+   if [ ! -f "$1" ]; then
       echo "  File doesn't exist."
       return
    fi
@@ -462,8 +457,6 @@ convert_spm()
 
    CURR_POS=$(($TEXS_BEGIN + 2))
 
-   cp "$FILE" tmp
-
    while [ $TEXS_COUNT_CONVERTED -gt 0 ]; do
       TEXS_COUNT_CONVERTED=$(($TEXS_COUNT_CONVERTED - 1))
 
@@ -482,13 +475,50 @@ convert_spm()
       TEXTURE_NAME=`dd if="$FILE" bs=1 skip=$TEXNAME_BEGIN \
                      count=$(($TEXNAME_END - $TEXNAME_BEGIN)) 2> /dev/null`
                      
-      DIRNAME=`dirname "$FILE"`
+      DIRNAME="`dirname "$FILE"`"
       TEXTURE_PATH="$DIRNAME/$TEXTURE_NAME"
       
-      convert_model "$TEXTURE_PATH"
+	   IS_CONVERTED=0
+	  
+      while read -r CONVERTED_TEXTURE; do
+         if [ "$TEXTURE_PATH" = "$CONVERTED_TEXTURE" ]; then
+            IS_CONVERTED=1
+            break
+         fi
+      done < "./converted_textures"
+      
+	   if [ $IS_CONVERTED -eq 1 ]; then
+		   echo -n ".jpg" | dd of="$FILE" bs=1 seek=$(($TEXNAME_END - 4)) \
+														   conv=notrunc 2> /dev/null
+	   fi
    done
+}
 
-   mv tmp "$FILE"
+
+convert_to_jpg_update_xml()
+{
+   FILE="$1"
+   echo "Convert file: $FILE"
+   
+   if [ ! -f "$FILE" ]; then
+      echo "  File doesn't exist."
+      return
+   fi
+   
+   DIRNAME="`dirname "$FILE"`"
+   
+	while read -r CONVERTED_TEXTURE; do
+		DIRNAME_TEX="`dirname "$CONVERTED_TEXTURE"`"
+		
+		if [ "$DIRNAME_TEX" != "$DIRNAME" ]; then
+			continue;
+		fi
+      
+		TEXNAME="`basename "$CONVERTED_TEXTURE" | head -c -5`"
+      
+      sed -i "s/\"$TEXNAME.[pP][nN][gG]/\"$TEXNAME.jpg/g" "$FILE"
+      sed -i "s/ $TEXNAME.[pP][nN][gG]/ $TEXNAME.jpg/g" "$FILE"
+	done < "./converted_textures"
 }
 
 
@@ -500,9 +530,13 @@ fi
 
 
 if [ $CONVERT_TO_JPG -gt 0 ]; then
-   find assets/data -iname "*.b3d" | while read f; do convert_b3d "$f"; done
-   find assets/data -iname "*.spm" | while read f; do convert_spm "$f"; done
-
+   find assets/data -not -path "assets/data/textures/*" -iname "*.png" | while read f; do convert_to_jpg "$f"; done
+	
+   find assets/data -iname "*.b3dz" | while read f; do convert_to_jpg_extract_b3dz "$f"; done
+   find assets/data -iname "*.b3d" | while read f; do convert_to_jpg_update_b3d "$f"; done
+   find assets/data -iname "*.spm" | while read f; do convert_to_jpg_update_spm "$f"; done
+   find assets/data -iname "*.xml" | while read f; do convert_to_jpg_update_xml "$f"; done
+	
    if [ -s "./converted_textures" ]; then
       echo "Converted textures:"
       cat "./converted_textures"

From ad062d3b81c890aebffdf0d847975ed40db7181a Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Thu, 17 Aug 2017 00:05:34 +0200
Subject: [PATCH 050/125] Fixed indentations

---
 android/generate_assets.sh | 696 ++++++++++++++++++-------------------
 1 file changed, 346 insertions(+), 350 deletions(-)

diff --git a/android/generate_assets.sh b/android/generate_assets.sh
index 51bda9b3c..d0f2f32ec 100755
--- a/android/generate_assets.sh
+++ b/android/generate_assets.sh
@@ -52,21 +52,21 @@ cd "`dirname "$0"`"
 
 # Find assets path
 for ASSETS_PATH in $ASSETS_PATHS; do
-   if [ -d $ASSETS_PATH ] && [ `ls $ASSETS_PATH | grep -c tracks` -gt 0 ]; then
-      echo "Assets found in $ASSETS_PATH"
-      ASSETS_PATH_FOUND=1
-      break
-   fi
+    if [ -d $ASSETS_PATH ] && [ `ls $ASSETS_PATH | grep -c tracks` -gt 0 ]; then
+        echo "Assets found in $ASSETS_PATH"
+        ASSETS_PATH_FOUND=1
+        break
+    fi
 done
 
 if [ -z $ASSETS_PATH_FOUND ]; then
-   echo "Couldn't find assets path"
-   exit 1
+    echo "Couldn't find assets path"
+    exit 1
 fi
 
 if [ ! -d "../data" ]; then
-   echo "Couldn't find data directory"
-   exit 1
+    echo "Couldn't find data directory"
+    exit 1
 fi
 
 
@@ -81,27 +81,27 @@ echo "Copy all assets"
 mkdir -p assets/data
 
 for DIR in `ls $ASSETS_PATH`; do
-   CAN_BE_COPIED=0
+    CAN_BE_COPIED=0
 
-   for ASSETS_DIR in $ASSETS_DIRS; do
-      if [ $DIR = $ASSETS_DIR ]; then
-         CAN_BE_COPIED=1
-         break
-      fi
-   done;
+    for ASSETS_DIR in $ASSETS_DIRS; do
+        if [ $DIR = $ASSETS_DIR ]; then
+            CAN_BE_COPIED=1
+            break
+        fi
+    done;
 
-   # Don't copy karts and tracks. It will be handled later
-   BLACKLIST_ASSETS="karts tracks"
-   for ASSETS_DIR in $BLACKLIST_ASSETS; do
-      if [ $DIR = $ASSETS_DIR ]; then
-         CAN_BE_COPIED=0
-         break
-      fi
-   done;
+    # Don't copy karts and tracks. It will be handled later
+    BLACKLIST_ASSETS="karts tracks"
+    for ASSETS_DIR in $BLACKLIST_ASSETS; do
+        if [ $DIR = $ASSETS_DIR ]; then
+            CAN_BE_COPIED=0
+            break
+        fi
+    done;
 
-   if [ $CAN_BE_COPIED -gt 0 ]; then
-      cp -a "$ASSETS_PATH/$DIR" assets/data/
-   fi
+    if [ $CAN_BE_COPIED -gt 0 ]; then
+        cp -a "$ASSETS_PATH/$DIR" assets/data/
+    fi
 done;
 
 
@@ -111,22 +111,22 @@ echo "Copy selected tracks"
 mkdir -p assets/data/tracks
 
 for DIR in `ls $ASSETS_PATH/tracks`; do
-   CAN_BE_COPIED=0
+    CAN_BE_COPIED=0
 
-   if [ "$TRACKS" != "all" ]; then
-      for TRACK in $TRACKS; do
-         if [ $DIR = $TRACK ]; then
-            CAN_BE_COPIED=1
-            break
-         fi
-      done;
-   else
-      CAN_BE_COPIED=1
-   fi
+    if [ "$TRACKS" != "all" ]; then
+        for TRACK in $TRACKS; do
+            if [ $DIR = $TRACK ]; then
+                CAN_BE_COPIED=1
+                break
+            fi
+        done;
+    else
+        CAN_BE_COPIED=1
+    fi
 
-   if [ $CAN_BE_COPIED -gt 0 ]; then
-      cp -a "$ASSETS_PATH/tracks/$DIR" assets/data/tracks/
-   fi
+    if [ $CAN_BE_COPIED -gt 0 ]; then
+        cp -a "$ASSETS_PATH/tracks/$DIR" assets/data/tracks/
+    fi
 done
 
 
@@ -136,22 +136,22 @@ echo "Copy selected karts"
 mkdir -p assets/data/karts
 
 for DIR in `ls $ASSETS_PATH/karts`; do
-   CAN_BE_COPIED=0
+    CAN_BE_COPIED=0
 
-   if [ "$KARTS" != "all" ]; then
-      for KART in $KARTS; do
-         if [ $DIR = $KART ]; then
-            CAN_BE_COPIED=1
-            break
-         fi
-      done;
-   else
-      CAN_BE_COPIED=1
-   fi
+    if [ "$KARTS" != "all" ]; then
+        for KART in $KARTS; do
+            if [ $DIR = $KART ]; then
+                CAN_BE_COPIED=1
+                break
+            fi
+        done;
+    else
+        CAN_BE_COPIED=1
+    fi
 
-   if [ $CAN_BE_COPIED -gt 0 ]; then
-      cp -a "$ASSETS_PATH/karts/$DIR" assets/data/karts/
-   fi
+    if [ $CAN_BE_COPIED -gt 0 ]; then
+        cp -a "$ASSETS_PATH/karts/$DIR" assets/data/karts/
+    fi
 done
 
 
@@ -160,388 +160,384 @@ echo "Decrease assets quality"
 
 convert_image()
 {
-   FILE="$1"
-   FILE_TYPE="$2"
-   echo "Convert file: $FILE"
+    FILE="$1"
+    FILE_TYPE="$2"
+    echo "Convert file: $FILE"
 
-   if [ ! -f "$FILE" ]; then
-      echo "  File doesn't exist."
-      return
-   fi
+    if [ ! -f "$FILE" ]; then
+        echo "  File doesn't exist."
+        return
+    fi
 
-   W=`identify -format "%[fx:w]" "$FILE"`
-   H=`identify -format "%[fx:h]" "$FILE"`
+    W=`identify -format "%[fx:w]" "$FILE"`
+    H=`identify -format "%[fx:h]" "$FILE"`
 
-   if [ -z $W ] || [ -z $H ]; then
-      echo "Couldn't convert $FILE file"
-      return
-   fi
+    if [ -z $W ] || [ -z $H ]; then
+        echo "Couldn't convert $FILE file"
+        return
+    fi
 
-   if [ $W -gt $TEXTURE_SIZE ] || [ $H -gt $TEXTURE_SIZE ]; then
-      if [ $W -gt $H ]; then
-         SCALED_W=$TEXTURE_SIZE
-         SCALED_H=$(($TEXTURE_SIZE * $H / $W))
-      else
-         SCALED_W=$(($TEXTURE_SIZE * $W / $H))
-         SCALED_H=$TEXTURE_SIZE
-      fi
+    if [ $W -gt $TEXTURE_SIZE ] || [ $H -gt $TEXTURE_SIZE ]; then
+        if [ $W -gt $H ]; then
+            SCALED_W=$TEXTURE_SIZE
+            SCALED_H=$(($TEXTURE_SIZE * $H / $W))
+        else
+            SCALED_W=$(($TEXTURE_SIZE * $W / $H))
+            SCALED_H=$TEXTURE_SIZE
+        fi
 
-      SCALE_CMD="-scale ${SCALED_W}x${SCALED_H}"
-   fi
+        SCALE_CMD="-scale ${SCALED_W}x${SCALED_H}"
+    fi
 
-   if [ "$FILE_TYPE" = "jpg" ]; then
-      QUALITY_CMD="-quality $JPEG_QUALITY"
-   elif [ "$FILE_TYPE" = "png" ]; then
-      QUALITY_CMD="-quality $PNG_QUALITY"
-   fi
+    if [ "$FILE_TYPE" = "jpg" ]; then
+        QUALITY_CMD="-quality $JPEG_QUALITY"
+    elif [ "$FILE_TYPE" = "png" ]; then
+        QUALITY_CMD="-quality $PNG_QUALITY"
+    fi
 
-   convert $SCALE_CMD $QUALITY_CMD "$FILE" "tmp.$FILE_TYPE"
+    convert $SCALE_CMD $QUALITY_CMD "$FILE" "tmp.$FILE_TYPE"
 
-   if [ -s "tmp.$FILE_TYPE" ]; then
-      SIZE_OLD=`du -k "$FILE" | cut -f1`
-      SIZE_NEW=`du -k "tmp.$FILE_TYPE" | cut -f1`
+    if [ -s "tmp.$FILE_TYPE" ]; then
+        SIZE_OLD=`du -k "$FILE" | cut -f1`
+        SIZE_NEW=`du -k "tmp.$FILE_TYPE" | cut -f1`
 
-      if [ $SIZE_NEW -lt $SIZE_OLD ]; then
-         mv "tmp.$FILE_TYPE" "$FILE"
-      fi
-   fi
+        if [ $SIZE_NEW -lt $SIZE_OLD ]; then
+            mv "tmp.$FILE_TYPE" "$FILE"
+        fi
+    fi
 
-   rm -f "tmp.$FILE_TYPE"
+    rm -f "tmp.$FILE_TYPE"
 }
 
 convert_sound()
 {
-   FILE="$1"
-   echo "Convert file: $FILE"
+    FILE="$1"
+    echo "Convert file: $FILE"
 
-   if [ ! -f "$FILE" ]; then
-      echo "  File doesn't exist."
-      return
-   fi
+    if [ ! -f "$FILE" ]; then
+        echo "  File doesn't exist."
+        return
+    fi
 
-   oggdec "$FILE" -o tmp.wav
+    oggdec "$FILE" -o tmp.wav
 
-   if [ -s tmp.wav ]; then
-      OGGENC_CMD=""
+    if [ -s tmp.wav ]; then
+        OGGENC_CMD=""
 
-      if [ "$SOUND_MONO" -gt 0 ]; then
-         OGGENC_CMD="$OGGENC_CMD --downmix"
-      fi
+        if [ "$SOUND_MONO" -gt 0 ]; then
+            OGGENC_CMD="$OGGENC_CMD --downmix"
+        fi
 
-      OGG_RATE=`ogginfo "$FILE" | grep "Rate: " | cut -f 2 -d " " \
-                                                            | grep -o '[0-9]*'`
+        OGG_RATE=`ogginfo "$FILE" | grep "Rate: " | cut -f 2 -d " " \
+                                                             | grep -o '[0-9]*'`
 
-      if [ ! -z "$OGG_RATE" ] && [ "$OGG_RATE" -gt "$SOUND_SAMPLE" ]; then
-         OGGENC_CMD="$OGGENC_CMD --resample $SOUND_SAMPLE"
-      fi
+        if [ ! -z "$OGG_RATE" ] && [ "$OGG_RATE" -gt "$SOUND_SAMPLE" ]; then
+            OGGENC_CMD="$OGGENC_CMD --resample $SOUND_SAMPLE"
+        fi
 
-      OGGENC_CMD="$OGGENC_CMD -b $SOUND_QUALITY"
+        OGGENC_CMD="$OGGENC_CMD -b $SOUND_QUALITY"
 
-      oggenc $OGGENC_CMD tmp.wav -o tmp.ogg
-   fi
+        oggenc $OGGENC_CMD tmp.wav -o tmp.ogg
+    fi
 
-   if [ -s tmp.ogg ]; then
-      SIZE_OLD=`du -k "$FILE" | cut -f1`
-      SIZE_NEW=`du -k "tmp.ogg" | cut -f1`
+    if [ -s tmp.ogg ]; then
+        SIZE_OLD=`du -k "$FILE" | cut -f1`
+        SIZE_NEW=`du -k "tmp.ogg" | cut -f1`
 
-      if [ $SIZE_NEW -lt $SIZE_OLD ]; then
-         mv tmp.ogg "$FILE"
-      fi
-   fi
+        if [ $SIZE_NEW -lt $SIZE_OLD ]; then
+            mv tmp.ogg "$FILE"
+        fi
+    fi
 
-   rm -f tmp.wav tmp.ogg
+    rm -f tmp.wav tmp.ogg
 }
 
 convert_to_jpg()
 {
-   FILE="$1"
-   echo "Convert file: $FILE"
+    FILE="$1"
+    echo "Convert file: $FILE"
 
-   if [ ! -f "$FILE" ]; then
-      echo "  File doesn't exist."
-      return
-   fi
-   
-   ALREADY_CONVERTED=0
+    if [ ! -f "$FILE" ]; then
+        echo "  File doesn't exist."
+        return
+    fi
 
-   if [ -s "./converted_textures" ]; then
-      while read -r CONVERTED_TEXTURE; do
-         if [ "$FILE" = "$CONVERTED_TEXTURE" ]; then
-            ALREADY_CONVERTED=1
-            break
-         fi
-      done < "./converted_textures"
-   fi
+    ALREADY_CONVERTED=0
 
-   if [ $ALREADY_CONVERTED -eq 1 ]; then
-	   return
-   fi
+    if [ -s "./converted_textures" ]; then
+        while read -r CONVERTED_TEXTURE; do
+            if [ "$FILE" = "$CONVERTED_TEXTURE" ]; then
+                ALREADY_CONVERTED=1
+                break
+            fi
+        done < "./converted_textures"
+    fi
 
-   if [ ! -f "$FILE" ]; then
-	   #echo "  Couldn't find texture file. Ignore..."
-	   continue
-   fi
+    if [ $ALREADY_CONVERTED -eq 1 ]; then
+        return
+    fi
 
-   FILE_EXTENSION=`echo "$FILE" | tail -c 5`
+    if [ ! -f "$FILE" ]; then
+        #echo "  Couldn't find texture file. Ignore..."
+        continue
+    fi
 
-   if [ `echo "$FILE_EXTENSION" | head -c 1` != "." ]; then
-	   #echo "  Unsupported file extension. Ignore..."
-	   continue
-   fi
+    FILE_EXTENSION=`echo "$FILE" | tail -c 5`
 
-   FILE_FORMAT=`identify -format %m "$FILE"`
+    if [ `echo "$FILE_EXTENSION" | head -c 1` != "." ]; then
+        #echo "  Unsupported file extension. Ignore..."
+        continue
+    fi
 
-   if [ "$FILE_FORMAT" = "JPEG" ]; then
-      #echo "  File is already JPEG. Ignore..."
-	   continue
-   fi
+    FILE_FORMAT=`identify -format %m "$FILE"`
 
-   IS_OPAQUE=`identify -format '%[opaque]' "$FILE"`
-   #HAS_ALPHA=`identify -format '%A' "$FILE"`
+    if [ "$FILE_FORMAT" = "JPEG" ]; then
+        #echo "  File is already JPEG. Ignore..."
+        continue
+    fi
 
-   if [ "$IS_OPAQUE" = "False" ] || [ "$IS_OPAQUE" = "false" ]; then
-	   #echo "  File has alpha channel. Ignore..."
-	   continue
-   fi
+    IS_OPAQUE=`identify -format '%[opaque]' "$FILE"`
+    #HAS_ALPHA=`identify -format '%A' "$FILE"`
 
-   NEW_FILE="`echo $FILE | head -c -5`.jpg"
+    if [ "$IS_OPAQUE" = "False" ] || [ "$IS_OPAQUE" = "false" ]; then
+        #echo "  File has alpha channel. Ignore..."
+        continue
+    fi
 
-   if [ -f "$NEW_FILE" ]; then
-	   #echo "  There is already a file with .jpg extension. Ignore..."
-	   continue
-   fi
+    NEW_FILE="`echo $FILE | head -c -5`.jpg"
 
-   # We can check if new file is smaller
-   convert -quality $JPEG_QUALITY "$FILE" "$NEW_FILE"
-   rm -f "$FILE"
+    if [ -f "$NEW_FILE" ]; then
+        #echo "  There is already a file with .jpg extension. Ignore..."
+        continue
+    fi
 
-   echo "$FILE" >> "./converted_textures"
+    # We can check if new file is smaller
+    convert -quality $JPEG_QUALITY "$FILE" "$NEW_FILE"
+    rm -f "$FILE"
+
+    echo "$FILE" >> "./converted_textures"
 }
 
-
 convert_to_jpg_extract_b3dz()
 {
-   FILE="$1"
-   echo "Convert file: $FILE"
+    FILE="$1"
+    echo "Convert file: $FILE"
 
-   if [ ! -f "$FILE" ]; then
-      echo "  File doesn't exist."
-      return
-   fi
+    if [ ! -f "$FILE" ]; then
+        echo "  File doesn't exist."
+        return
+    fi
 
-   DIRNAME="`dirname "$FILE"`"
-   
-   unzip "$FILE" -d "$DIRNAME"
-   rm -f "$FILE"
-   
-   TEXNAME="`basename "$FILE"`"
-   NEWNAME="`echo $TEXNAME | head -c -6`.b3d"
-   
-   sed -i "s/\"$TEXNAME\"/\"$NEWNAME\"/g" "$DIRNAME/kart.xml"
+    DIRNAME="`dirname "$FILE"`"
+
+    unzip "$FILE" -d "$DIRNAME"
+    rm -f "$FILE"
+
+    TEXNAME="`basename "$FILE"`"
+    NEWNAME="`echo $TEXNAME | head -c -6`.b3d"
+
+    sed -i "s/\"$TEXNAME\"/\"$NEWNAME\"/g" "$DIRNAME/kart.xml"
 }
 
-
 convert_to_jpg_update_b3d()
 {
-   FILE="$1"
-   echo "Convert file: $FILE"
-   
-   if [ ! -f "$1" ]; then
-      echo "  File doesn't exist."
-      return
-   fi
+    FILE="$1"
+    echo "Convert file: $FILE"
 
-   HEX_FILE=`hexdump -ve '1/1 "%.2x"' "$FILE"`
+    if [ ! -f "$1" ]; then
+        echo "  File doesn't exist."
+        return
+    fi
 
-   TEXS_CHUNK="54455853"
-   TEXS_CHUNK_POS=24
+    HEX_FILE=`hexdump -ve '1/1 "%.2x"' "$FILE"`
 
-   FOUND_CHUNK=`echo $HEX_FILE | head -c $(($TEXS_CHUNK_POS + 8)) \
-                              | tail -c +$(($TEXS_CHUNK_POS + 1))`
+    TEXS_CHUNK="54455853"
+    TEXS_CHUNK_POS=24
 
-   if [ -z "$FOUND_CHUNK" ] || [ "$FOUND_CHUNK" != "$TEXS_CHUNK" ]; then
-      echo "  File has no textures."
-      return
-   fi
+    FOUND_CHUNK=`echo $HEX_FILE | head -c $(($TEXS_CHUNK_POS + 8)) \
+                                            | tail -c +$(($TEXS_CHUNK_POS + 1))`
 
-   TEXS_SIZE=`echo $HEX_FILE | head -c $(($TEXS_CHUNK_POS + 16)) | tail -c 8`
+    if [ -z "$FOUND_CHUNK" ] || [ "$FOUND_CHUNK" != "$TEXS_CHUNK" ]; then
+        echo "  File has no textures."
+        return
+    fi
 
-   TEXS_SIZE_CONVERTED=`echo $TEXS_SIZE | cut -c7-8`
-   TEXS_SIZE_CONVERTED=$TEXS_SIZE_CONVERTED`echo $TEXS_SIZE | cut -c5-6`
-   TEXS_SIZE_CONVERTED=$TEXS_SIZE_CONVERTED`echo $TEXS_SIZE | cut -c3-4`
-   TEXS_SIZE_CONVERTED=$TEXS_SIZE_CONVERTED`echo $TEXS_SIZE | cut -c1-2`
-   TEXS_SIZE_CONVERTED=`echo $((0x$TEXS_SIZE_CONVERTED))`
+    TEXS_SIZE=`echo $HEX_FILE | head -c $(($TEXS_CHUNK_POS + 16)) | tail -c 8`
 
-   if [ $TEXS_SIZE_CONVERTED -le 0 ]; then
-      echo "  Invalid TEXS size value."
-      return
-   fi
+    TEXS_SIZE_CONVERTED=`echo $TEXS_SIZE | cut -c7-8`
+    TEXS_SIZE_CONVERTED=$TEXS_SIZE_CONVERTED`echo $TEXS_SIZE | cut -c5-6`
+    TEXS_SIZE_CONVERTED=$TEXS_SIZE_CONVERTED`echo $TEXS_SIZE | cut -c3-4`
+    TEXS_SIZE_CONVERTED=$TEXS_SIZE_CONVERTED`echo $TEXS_SIZE | cut -c1-2`
+    TEXS_SIZE_CONVERTED=`echo $((0x$TEXS_SIZE_CONVERTED))`
 
-   TEXS_BEGIN=$(($TEXS_CHUNK_POS + 16))
-   TEXS_END=$(($TEXS_BEGIN + $TEXS_SIZE_CONVERTED * 2))
-   HEX_TEXS=`echo $HEX_FILE | head -c $TEXS_END | tail -c +$(($TEXS_BEGIN+1))`
-   CURR_POS=0
+    if [ $TEXS_SIZE_CONVERTED -le 0 ]; then
+        echo "  Invalid TEXS size value."
+        return
+    fi
 
-   while [ $CURR_POS -lt $TEXS_END ]; do
-      NULL_POS=`echo $HEX_TEXS | tail -c +$(($CURR_POS+1)) | grep -b -o "00" \
-                                       | head -n 1 | cut -f1 -d":"`
+    TEXS_BEGIN=$(($TEXS_CHUNK_POS + 16))
+    TEXS_END=$(($TEXS_BEGIN + $TEXS_SIZE_CONVERTED * 2))
+    HEX_TEXS=`echo $HEX_FILE | head -c $TEXS_END | tail -c +$(($TEXS_BEGIN+1))`
+    CURR_POS=0
 
-      if [ -z $NULL_POS ]; then
-         #echo "  Done."
-         break
-      fi
+    while [ $CURR_POS -lt $TEXS_END ]; do
+        NULL_POS=`echo $HEX_TEXS | tail -c +$(($CURR_POS+1)) | grep -b -o "00" \
+                                                    | head -n 1 | cut -f1 -d":"`
 
-      if [ $NULL_POS -lt 4 ]; then
-         echo "  Something went wrong..."
-         break
-      fi
-
-      TEXNAME_BEGIN=$((($TEXS_BEGIN + $CURR_POS) / 2))
-      TEXNAME_END=$((($TEXS_BEGIN + $CURR_POS + $NULL_POS) / 2))
-      CURR_POS=$(($CURR_POS + $NULL_POS + 58))
-
-      TEXTURE_NAME=`dd if="$FILE" bs=1 skip=$TEXNAME_BEGIN \
-                     count=$(($TEXNAME_END - $TEXNAME_BEGIN)) 2> /dev/null`
-      DIRNAME="`dirname "$FILE"`"
-      TEXTURE_PATH="$DIRNAME/$TEXTURE_NAME"
-	  
-	   IS_CONVERTED=0
-	  
-      while read -r CONVERTED_TEXTURE; do
-         if [ "$TEXTURE_PATH" = "$CONVERTED_TEXTURE" ]; then
-            IS_CONVERTED=1
+        if [ -z $NULL_POS ]; then
+            #echo "  Done."
             break
-         fi
-      done < "./converted_textures"
-      
-	   if [ $IS_CONVERTED -eq 1 ]; then
-		   echo -n ".jpg" | dd of="$FILE" bs=1 seek=$(($TEXNAME_END - 4)) \
-														   conv=notrunc 2> /dev/null
-	   fi;
-   done
-}
+        fi
 
+        if [ $NULL_POS -lt 4 ]; then
+            echo "  Something went wrong..."
+            break
+        fi
+
+        TEXNAME_BEGIN=$((($TEXS_BEGIN + $CURR_POS) / 2))
+        TEXNAME_END=$((($TEXS_BEGIN + $CURR_POS + $NULL_POS) / 2))
+        CURR_POS=$(($CURR_POS + $NULL_POS + 58))
+
+        TEXTURE_NAME=`dd if="$FILE" bs=1 skip=$TEXNAME_BEGIN \
+                          count=$(($TEXNAME_END - $TEXNAME_BEGIN)) 2> /dev/null`
+        DIRNAME="`dirname "$FILE"`"
+        TEXTURE_PATH="$DIRNAME/$TEXTURE_NAME"
+
+        IS_CONVERTED=0
+
+        while read -r CONVERTED_TEXTURE; do
+            if [ "$TEXTURE_PATH" = "$CONVERTED_TEXTURE" ]; then
+                IS_CONVERTED=1
+                break
+            fi
+        done < "./converted_textures"
+
+        if [ $IS_CONVERTED -eq 1 ]; then
+            echo -n ".jpg" | dd of="$FILE" bs=1 seek=$(($TEXNAME_END - 4)) \
+                                                       conv=notrunc 2> /dev/null
+        fi;
+    done
+}
 
 convert_to_jpg_update_spm()
 {
-   FILE="$1"
-   echo "Convert file: $FILE"
-   
-   if [ ! -f "$1" ]; then
-      echo "  File doesn't exist."
-      return
-   fi
+    FILE="$1"
+    echo "Convert file: $FILE"
 
-   HEX_FILE=`hexdump -ve '1/1 "%.2x"' "$FILE"`
-   
-   SP_HEADER="5350"
-   SP_FOUND=`echo $HEX_FILE | head -c 4`
+    if [ ! -f "$1" ]; then
+        echo "  File doesn't exist."
+        return
+    fi
 
-   if [ -z "$SP_FOUND" ] || [ "$SP_FOUND" != "$SP_HEADER" ]; then
-      echo "  Unsupported format."
-      return
-   fi
+    HEX_FILE=`hexdump -ve '1/1 "%.2x"' "$FILE"`
 
-   TEXS_BEGIN=60
-   TEXS_COUNT=`echo $HEX_FILE | head -c $TEXS_BEGIN | tail -c 4`
-   
-   TEXS_COUNT_CONVERTED=`echo $TEXS_COUNT | cut -c3-4`
-   TEXS_COUNT_CONVERTED=$TEXS_COUNT_CONVERTED`echo $TEXS_COUNT | cut -c1-2`
-   TEXS_COUNT_CONVERTED=`echo $((0x$TEXS_COUNT_CONVERTED))`
-   TEXS_COUNT_CONVERTED=$(($TEXS_COUNT_CONVERTED * 2))
-   
-   if [ $TEXS_COUNT_CONVERTED -le 0 ]; then
-      echo "  Invalid textures count value."
-      return
-   fi
+    SP_HEADER="5350"
+    SP_FOUND=`echo $HEX_FILE | head -c 4`
 
-   CURR_POS=$(($TEXS_BEGIN + 2))
+    if [ -z "$SP_FOUND" ] || [ "$SP_FOUND" != "$SP_HEADER" ]; then
+        echo "  Unsupported format."
+        return
+    fi
 
-   while [ $TEXS_COUNT_CONVERTED -gt 0 ]; do
-      TEXS_COUNT_CONVERTED=$(($TEXS_COUNT_CONVERTED - 1))
+    TEXS_BEGIN=60
+    TEXS_COUNT=`echo $HEX_FILE | head -c $TEXS_BEGIN | tail -c 4`
 
-      TEX_LEN=`echo $HEX_FILE | head -c $(($CURR_POS)) | tail -c 2`
-      TEX_LEN=`echo $((0x$TEX_LEN))`
+    TEXS_COUNT_CONVERTED=`echo $TEXS_COUNT | cut -c3-4`
+    TEXS_COUNT_CONVERTED=$TEXS_COUNT_CONVERTED`echo $TEXS_COUNT | cut -c1-2`
+    TEXS_COUNT_CONVERTED=`echo $((0x$TEXS_COUNT_CONVERTED))`
+    TEXS_COUNT_CONVERTED=$(($TEXS_COUNT_CONVERTED * 2))
 
-      TEXNAME_BEGIN=$(($CURR_POS / 2))
-      TEXNAME_END=$(($CURR_POS / 2 + $TEX_LEN))
-      CURR_POS=$(($CURR_POS + 2 + $TEX_LEN * 2))
+    if [ $TEXS_COUNT_CONVERTED -le 0 ]; then
+        echo "  Invalid textures count value."
+        return
+    fi
+
+    CURR_POS=$(($TEXS_BEGIN + 2))
+
+    while [ $TEXS_COUNT_CONVERTED -gt 0 ]; do
+        TEXS_COUNT_CONVERTED=$(($TEXS_COUNT_CONVERTED - 1))
+
+        TEX_LEN=`echo $HEX_FILE | head -c $(($CURR_POS)) | tail -c 2`
+        TEX_LEN=`echo $((0x$TEX_LEN))`
+
+        TEXNAME_BEGIN=$(($CURR_POS / 2))
+        TEXNAME_END=$(($CURR_POS / 2 + $TEX_LEN))
+        CURR_POS=$(($CURR_POS + 2 + $TEX_LEN * 2))
+
+        if [ $TEX_LEN -eq 0 ]; then
+            #echo "  Empty texture name, ignore..."
+            continue
+        fi
+
+        TEXTURE_NAME=`dd if="$FILE" bs=1 skip=$TEXNAME_BEGIN \
+                          count=$(($TEXNAME_END - $TEXNAME_BEGIN)) 2> /dev/null`
       
-      if [ $TEX_LEN -eq 0 ]; then
-         #echo "  Empty texture name, ignore..."
-         continue
-      fi
+        DIRNAME="`dirname "$FILE"`"
+        TEXTURE_PATH="$DIRNAME/$TEXTURE_NAME"
 
-      TEXTURE_NAME=`dd if="$FILE" bs=1 skip=$TEXNAME_BEGIN \
-                     count=$(($TEXNAME_END - $TEXNAME_BEGIN)) 2> /dev/null`
-                     
-      DIRNAME="`dirname "$FILE"`"
-      TEXTURE_PATH="$DIRNAME/$TEXTURE_NAME"
-      
-	   IS_CONVERTED=0
-	  
-      while read -r CONVERTED_TEXTURE; do
-         if [ "$TEXTURE_PATH" = "$CONVERTED_TEXTURE" ]; then
-            IS_CONVERTED=1
-            break
-         fi
-      done < "./converted_textures"
-      
-	   if [ $IS_CONVERTED -eq 1 ]; then
-		   echo -n ".jpg" | dd of="$FILE" bs=1 seek=$(($TEXNAME_END - 4)) \
-														   conv=notrunc 2> /dev/null
-	   fi
-   done
+        IS_CONVERTED=0
+
+        while read -r CONVERTED_TEXTURE; do
+            if [ "$TEXTURE_PATH" = "$CONVERTED_TEXTURE" ]; then
+                IS_CONVERTED=1
+                break
+            fi
+        done < "./converted_textures"
+
+        if [ $IS_CONVERTED -eq 1 ]; then
+            echo -n ".jpg" | dd of="$FILE" bs=1 seek=$(($TEXNAME_END - 4)) \
+                                                       conv=notrunc 2> /dev/null
+        fi
+    done
 }
 
-
 convert_to_jpg_update_xml()
 {
-   FILE="$1"
-   echo "Convert file: $FILE"
-   
-   if [ ! -f "$FILE" ]; then
-      echo "  File doesn't exist."
-      return
-   fi
-   
-   DIRNAME="`dirname "$FILE"`"
-   
-	while read -r CONVERTED_TEXTURE; do
-		DIRNAME_TEX="`dirname "$CONVERTED_TEXTURE"`"
-		
-		if [ "$DIRNAME_TEX" != "$DIRNAME" ]; then
-			continue;
-		fi
-      
-		TEXNAME="`basename "$CONVERTED_TEXTURE" | head -c -5`"
-      
-      sed -i "s/\"$TEXNAME.[pP][nN][gG]/\"$TEXNAME.jpg/g" "$FILE"
-      sed -i "s/ $TEXNAME.[pP][nN][gG]/ $TEXNAME.jpg/g" "$FILE"
-	done < "./converted_textures"
+    FILE="$1"
+    echo "Convert file: $FILE"
+
+    if [ ! -f "$FILE" ]; then
+        echo "  File doesn't exist."
+        return
+    fi
+
+    DIRNAME="`dirname "$FILE"`"
+
+    while read -r CONVERTED_TEXTURE; do
+        DIRNAME_TEX="`dirname "$CONVERTED_TEXTURE"`"
+
+        if [ "$DIRNAME_TEX" != "$DIRNAME" ]; then
+            continue;
+        fi
+
+        TEXNAME="`basename "$CONVERTED_TEXTURE" | head -c -5`"
+
+        sed -i "s/\"$TEXNAME.[pP][nN][gG]/\"$TEXNAME.jpg/g" "$FILE"
+        sed -i "s/ $TEXNAME.[pP][nN][gG]/ $TEXNAME.jpg/g" "$FILE"
+    done < "./converted_textures"
 }
 
 
 if [ $DECREASE_QUALITY -gt 0 ]; then
-   find assets/data -iname "*.png" | while read f; do convert_image "$f" "png"; done
-   find assets/data -iname "*.jpg" | while read f; do convert_image "$f" "jpg"; done
-   find assets/data -iname "*.ogg" | while read f; do convert_sound "$f"; done
+    find assets/data -iname "*.png" | while read f; do convert_image "$f" "png"; done
+    find assets/data -iname "*.jpg" | while read f; do convert_image "$f" "jpg"; done
+    find assets/data -iname "*.ogg" | while read f; do convert_sound "$f"; done
 fi
 
 
 if [ $CONVERT_TO_JPG -gt 0 ]; then
-   find assets/data -not -path "assets/data/textures/*" -iname "*.png" | while read f; do convert_to_jpg "$f"; done
-	
-   find assets/data -iname "*.b3dz" | while read f; do convert_to_jpg_extract_b3dz "$f"; done
-   find assets/data -iname "*.b3d" | while read f; do convert_to_jpg_update_b3d "$f"; done
-   find assets/data -iname "*.spm" | while read f; do convert_to_jpg_update_spm "$f"; done
-   find assets/data -iname "*.xml" | while read f; do convert_to_jpg_update_xml "$f"; done
-	
-   if [ -s "./converted_textures" ]; then
-      echo "Converted textures:"
-      cat "./converted_textures"
-      rm -f "./converted_textures"
-   fi
+    find assets/data -not -path "assets/data/textures/*" -iname "*.png" | while read f; do convert_to_jpg "$f"; done
+
+    find assets/data -iname "*.b3dz" | while read f; do convert_to_jpg_extract_b3dz "$f"; done
+    find assets/data -iname "*.b3d" | while read f; do convert_to_jpg_update_b3d "$f"; done
+    find assets/data -iname "*.spm" | while read f; do convert_to_jpg_update_spm "$f"; done
+    find assets/data -iname "*.xml" | while read f; do convert_to_jpg_update_xml "$f"; done
+
+    if [ -s "./converted_textures" ]; then
+        echo "Converted textures:"
+        cat "./converted_textures"
+        rm -f "./converted_textures"
+    fi
 fi
 
 
@@ -552,14 +548,14 @@ cp -a ../data/* assets/data/
 
 # Remove unused files
 for BLACKLIST_FILE in $BLACKLIST_FILES; do
-   rm -f "assets/$BLACKLIST_FILE"
+    rm -f "assets/$BLACKLIST_FILE"
 done
 
 
 # Run optimize_data.sh script
 if [ $RUN_OPTIMIZE_SCRIPT -gt 0 ]; then
-   echo "Run optimize_data.sh script"
-   sh -c 'cd assets/data; ../../../data/optimize_data.sh'
+    echo "Run optimize_data.sh script"
+    sh -c 'cd assets/data; ../../../data/optimize_data.sh'
 fi
 
 

From fd7bf80493151a8712a4bfad4861dd6cde819d7a Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Thu, 17 Aug 2017 15:28:04 +0800
Subject: [PATCH 051/125] Fix kart selection screen animation if only 1 kart

---
 src/guiengine/widgets/player_kart_widget.cpp | 25 +++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/guiengine/widgets/player_kart_widget.cpp b/src/guiengine/widgets/player_kart_widget.cpp
index 7928e4fb8..afc0a7ff8 100644
--- a/src/guiengine/widgets/player_kart_widget.cpp
+++ b/src/guiengine/widgets/player_kart_widget.cpp
@@ -193,10 +193,29 @@ PlayerKartWidget::PlayerKartWidget(KartSelectionScreen* parent,
         scale = 30.0f;
     }
 
+    const bool has_win_anime =
+        UserConfigParams::m_show_steering_animations != 0 &&
+        (((kart_model.getFrame(KartModel::AF_WIN_LOOP_START) > -1 ||
+        kart_model.getFrame(KartModel::AF_WIN_START) > -1) &&
+        kart_model.getFrame(KartModel::AF_WIN_END) > -1) ||
+        (kart_model.getFrame(KartModel::AF_SELECTION_START) > -1 &&
+        kart_model.getFrame(KartModel::AF_SELECTION_END) > -1));
     m_model_view->addModel( kart_model.getModel(), Vec3(0,0,0),
-                            Vec3(scale, scale, scale),
-                            kart_model.getBaseFrame(),
-                            kart_model.getBaseFrame() );
+        Vec3(scale, scale, scale),
+        has_win_anime ?
+        kart_model.getFrame(KartModel::AF_SELECTION_START) > -1 ?
+        kart_model.getFrame(KartModel::AF_SELECTION_START) :
+        kart_model.getFrame(KartModel::AF_WIN_LOOP_START) > -1 ?
+        kart_model.getFrame(KartModel::AF_WIN_LOOP_START) :
+        kart_model.getFrame(KartModel::AF_WIN_START) :
+        kart_model.getBaseFrame(),
+        has_win_anime ?
+        kart_model.getFrame(KartModel::AF_SELECTION_END) > -1 ?
+        kart_model.getFrame(KartModel::AF_SELECTION_END) :
+        kart_model.getFrame(KartModel::AF_WIN_END) :
+        kart_model.getBaseFrame(),
+        false/*all_parts_colorized*/,
+        kart_model.getAnimationSpeed());
     m_model_view->addModel( kart_model.getWheelModel(0),
                             kart_model.getWheelGraphicsPosition(0) );
     m_model_view->addModel( kart_model.getWheelModel(1),

From 4c0b28a43e46d1b9ea0d6d1367d14ee798cbf142 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Thu, 17 Aug 2017 15:48:21 +0800
Subject: [PATCH 052/125] Fix speed weight object looping in non-animated
 character

---
 src/karts/kart_model.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index 111eab374..90b53ba36 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -637,7 +637,10 @@ bool KartModel::loadModels(const KartProperties &kart_properties)
 #endif
         // Update min/max
         Vec3 obj_min, obj_max;
-        MeshTools::minMax3D(obj.m_model, &obj_min, &obj_max);
+        int frame = m_animation_frame[AF_SPEED_WEIGHTED_START];
+        if (frame < 0)
+            frame = 0;
+        MeshTools::minMax3D(obj.m_model->getMesh(frame), &obj_min, &obj_max);
         obj_min += obj.m_position;
         obj_max += obj.m_position;
         kart_min.min(obj_min);
@@ -1026,15 +1029,6 @@ void KartModel::update(float dt, float distance, float steer, float speed,
         m_wheel_node[i]->setRotation(wheel_rotation);
     } // for (i < 4)
 
-    // If animations are disabled, stop here
-    if (m_animated_node == NULL) return;
-
-    if (m_play_non_loop && m_animated_node->getLoopMode() == true)
-    {
-        m_play_non_loop = false;
-        this->setAnimation(AF_DEFAULT);
-    }
-
     // Update the speed-weighted objects' animations
     if (m_kart != NULL)
     {
@@ -1088,6 +1082,15 @@ void KartModel::update(float dt, float distance, float steer, float speed,
         }
     }
 
+    // If animations are disabled, stop here
+    if (m_animated_node == NULL) return;
+
+    if (m_play_non_loop && m_animated_node->getLoopMode() == true)
+    {
+        m_play_non_loop = false;
+        this->setAnimation(AF_DEFAULT);
+    }
+
     // Check if the end animation is being played, if so, don't
     // play steering animation.
     if(m_current_animation!=AF_DEFAULT) return;

From 1ca6a6edeafcd85d9b7557d5b501bb7711bf3749 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Sat, 19 Aug 2017 08:51:09 +0800
Subject: [PATCH 053/125] Remove the need of 2nd UVmap for displace objects

---
 src/graphics/geometry_passes.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/graphics/geometry_passes.cpp b/src/graphics/geometry_passes.cpp
index 011f964eb..ae807470b 100644
--- a/src/graphics/geometry_passes.cpp
+++ b/src/graphics/geometry_passes.cpp
@@ -317,8 +317,9 @@ void AbstractGeometryPasses::renderTransparent(const DrawCalls& draw_calls,
     glStencilFunc(GL_ALWAYS, 1, 0xFF);
     glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
 
+    video::E_VERTEX_TYPE cur_dis_type = video::EVT_2TCOORDS;
     if (CVS->isARBBaseInstanceUsable())
-        glBindVertexArray(VAOManager::getInstance()->getVAO(video::EVT_2TCOORDS));
+        glBindVertexArray(VAOManager::getInstance()->getVAO(cur_dis_type));
     // Generate displace mask
     // Use RTT_TMP4 as displace mask
     if (ListDisplacement::getInstance()->size() > 0)
@@ -334,12 +335,10 @@ void AbstractGeometryPasses::renderTransparent(const DrawCalls& draw_calls,
             glBindVertexArray(mesh.vao);
         const core::matrix4 &AbsoluteTransformation
             = std::get<1>(ListDisplacement::getInstance()->at(i));
-        if (mesh.VAOType != video::EVT_2TCOORDS)
+        if (mesh.VAOType != cur_dis_type && CVS->isARBBaseInstanceUsable())
         {
-#ifdef DEBUG
-            Log::error("Materials", "Displacement has wrong vertex type");
-#endif
-            continue;
+            cur_dis_type = mesh.VAOType;
+            glBindVertexArray(VAOManager::getInstance()->getVAO(cur_dis_type));
         }
 
         GLenum ptype = mesh.PrimitiveType;
@@ -357,6 +356,9 @@ void AbstractGeometryPasses::renderTransparent(const DrawCalls& draw_calls,
         displace_framebuffer.bind();
         glClear(GL_COLOR_BUFFER_BIT);
     }
+    cur_dis_type = video::EVT_2TCOORDS;
+    if (CVS->isARBBaseInstanceUsable())
+        glBindVertexArray(VAOManager::getInstance()->getVAO(cur_dis_type));
     for (unsigned i = 0; i < ListDisplacement::getInstance()->size(); i++)
     {
         const GLMesh &mesh = 
@@ -365,8 +367,11 @@ void AbstractGeometryPasses::renderTransparent(const DrawCalls& draw_calls,
             glBindVertexArray(mesh.vao);
         const core::matrix4 &AbsoluteTransformation =
             std::get<1>(ListDisplacement::getInstance()->at(i));
-        if (mesh.VAOType != video::EVT_2TCOORDS)
-            continue;
+        if (mesh.VAOType != cur_dis_type && CVS->isARBBaseInstanceUsable())
+        {
+            cur_dis_type = mesh.VAOType;
+            glBindVertexArray(VAOManager::getInstance()->getVAO(cur_dis_type));
+        }
 
         GLenum ptype = mesh.PrimitiveType;
         GLenum itype = mesh.IndexType;

From d698e62053c095df254d404bf3bd4b6f0d9d25f3 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sat, 19 Aug 2017 22:09:42 +0200
Subject: [PATCH 054/125] Minor fix in video settings dialog

---
 src/states_screens/dialogs/custom_video_settings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/states_screens/dialogs/custom_video_settings.cpp b/src/states_screens/dialogs/custom_video_settings.cpp
index b7b5a6dd5..786e2041b 100644
--- a/src/states_screens/dialogs/custom_video_settings.cpp
+++ b/src/states_screens/dialogs/custom_video_settings.cpp
@@ -163,7 +163,7 @@ GUIEngine::EventPropagation CustomVideoSettingsDialog::processEvent(const std::s
             advanced_pipeline && getWidget<CheckBoxWidget>("lightshaft")->getState();
 
         UserConfigParams::m_degraded_IBL =
-            !getWidget<CheckBoxWidget>("ibl")->getState();
+            !advanced_pipeline || !getWidget<CheckBoxWidget>("ibl")->getState();
 
         UserConfigParams::m_gi =
             advanced_pipeline && CVS->supportsGlobalIllumination() &&

From a8e20101f83aa8f1a91241d68146a23847fed819 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Mon, 21 Aug 2017 14:57:33 +0800
Subject: [PATCH 055/125] Make SPM loader more portable (for stk-editor later)

Also allow calculating normal if required
---
 src/graphics/sp_mesh_loader.cpp | 23 ++++++++++++++++++++---
 src/graphics/sp_mesh_loader.hpp |  7 +++----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/graphics/sp_mesh_loader.cpp b/src/graphics/sp_mesh_loader.cpp
index fd1bd48ea..07c61cdf1 100644
--- a/src/graphics/sp_mesh_loader.cpp
+++ b/src/graphics/sp_mesh_loader.cpp
@@ -48,7 +48,7 @@ scene::IAnimatedMesh* SPMeshLoader::createMesh(io::IReadFile* f)
     m_joint_count = 0;
     //m_frame_count = 0;
     m_mesh = NULL;
-    m_mesh = new scene::CSkinnedMesh();
+    m_mesh = m_scene_manager->createSkinnedMesh();
     io::IFileSystem* fs = m_scene_manager->getFileSystem();
     std::string base_path = fs->getFileDir(f->getFileName()).c_str();
     std::string header;
@@ -325,6 +325,23 @@ void SPMeshLoader::decompress(irr::io::IReadFile* spm, unsigned vertices_count,
             mb->Indices[i] = tmp_idx[i];
         }
     }
+
+    if (!read_normal)
+    {
+        for (unsigned i = 0; i < mb->Indices.size(); i += 3)
+        {
+            core::plane3df p(mb->getVertex(mb->Indices[i])->Pos,
+                mb->getVertex(mb->Indices[i + 1])->Pos,
+                mb->getVertex(mb->Indices[i + 2])->Pos);
+            mb->getVertex(mb->Indices[i])->Normal += p.Normal;
+            mb->getVertex(mb->Indices[i + 1])->Normal += p.Normal;
+            mb->getVertex(mb->Indices[i + 2])->Normal += p.Normal;
+        }
+        for (unsigned i = 0; i < mb->getVertexCount(); i++)
+        {
+            mb->getVertex(i)->Normal.normalize();
+        }
+    }
 }   // decompress
 
 // ----------------------------------------------------------------------------
@@ -408,7 +425,7 @@ void SPMeshLoader::convertIrrlicht()
     {
         m_mesh->addJoint(NULL);
     }
-    core::array<scene::CSkinnedMesh::SJoint*>& joints = m_mesh->getAllJoints();
+    core::array<scene::ISkinnedMesh::SJoint*>& joints = m_mesh->getAllJoints();
     std::vector<int> used_joints_map;
     used_joints_map.resize(m_joint_count);
     total_joints = 0;
@@ -468,7 +485,7 @@ void SPMeshLoader::convertIrrlicht()
                 {
                     break;
                 }
-                scene::CSkinnedMesh::SWeight* w = m_mesh->addWeight
+                scene::ISkinnedMesh::SWeight* w = m_mesh->addWeight
                     (joints[used_joints_map[m_joints[i][j].first[k]]]);
                 w->buffer_id = (uint16_t)i;
                 w->vertex_id = j;
diff --git a/src/graphics/sp_mesh_loader.hpp b/src/graphics/sp_mesh_loader.hpp
index 5333339be..b218abcaa 100644
--- a/src/graphics/sp_mesh_loader.hpp
+++ b/src/graphics/sp_mesh_loader.hpp
@@ -18,13 +18,12 @@
 #ifndef HEADER_SP_MESH_LOADER_HPP
 #define HEADER_SP_MESH_LOADER_HPP
 
-#include "../lib/irrlicht/source/Irrlicht/CSkinnedMesh.h"
-#include "utils/types.hpp"
-
 #include <IMeshLoader.h>
 #include <ISceneManager.h>
+#include <ISkinnedMesh.h>
 #include <IReadFile.h>
 #include <array>
+#include <cstdint>
 #include <vector>
 
 using namespace irr;
@@ -382,7 +381,7 @@ private:
     // ------------------------------------------------------------------------
     void convertIrrlicht();
 
-    scene::CSkinnedMesh* m_mesh;
+    scene::ISkinnedMesh* m_mesh;
 
     scene::ISceneManager* m_scene_manager;
 

From ad369b88da8582e2526dd64c9419204b2b76aa8b Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Mon, 21 Aug 2017 16:02:06 +0800
Subject: [PATCH 056/125] Remove .b3d usage in stk-code

---
 data/items.xml                          | 16 ++++++++--------
 data/powerup.xml                        | 12 ++++++------
 src/items/attachment_manager.cpp        | 16 ++++++++--------
 src/items/swatter.cpp                   |  2 +-
 src/karts/kart_model.cpp                |  2 +-
 src/main.cpp                            |  4 ++--
 src/modes/three_strikes_battle.cpp      | 12 ++++++------
 src/states_screens/feature_unlocked.cpp |  6 +++---
 src/states_screens/grand_prix_win.cpp   |  6 +++---
 src/states_screens/kart_selection.cpp   |  2 +-
 10 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/data/items.xml b/data/items.xml
index df764d7cb..e302f67d7 100644
--- a/data/items.xml
+++ b/data/items.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <items>
-  <bonus-box   model="gift-box.b3d"        lowmodel="gift-box-low.b3d"        glow="31 202 253"/>
-  <banana      model="banana.b3d"          lowmodel="banana-low.b3d"          glow="197 152 37"/>
-  <nitro-big   model="nitrotank-big.b3d"   lowmodel="nitrotank-big-low.b3d"   glow="0 70 158"/>
-  <nitro-small model="nitrotank-small.b3d" lowmodel="nitrotank-small-low.b3d" glow="0 70 158"/>
+  <bonus-box   model="gift-box.spm"        lowmodel="gift-box-low.spm"        glow="31 202 253"/>
+  <banana      model="banana.spm"          lowmodel="banana-low.spm"          glow="197 152 37"/>
+  <nitro-big   model="nitrotank-big.spm"   lowmodel="nitrotank-big-low.spm"   glow="0 70 158"/>
+  <nitro-small model="nitrotank-small.spm" lowmodel="nitrotank-small-low.spm" glow="0 70 158"/>
   <!-- While a bubble gum technically 
        isn't an item, it is internally 
        handled as one, so list it here    -->
-  <bubblegum   model="bubblegum.b3d"       lowmodel="bubblegum-low.b3d"       glow="246 150 209"/>
-  <bubblegum-nolok   model="bubblegum-nolok.b3d" lowmodel="bubblegum-nolok-low.b3d"/>
-  <!-- <easter-egg  model="easter_egg.b3d"  /> -->
-  <easter-egg  model="easter_egg.b3d"  />
+  <bubblegum   model="bubblegum.spm"       lowmodel="bubblegum-low.spm"       glow="246 150 209"/>
+  <bubblegum-nolok   model="bubblegum-nolok.spm" lowmodel="bubblegum-nolok-low.spm"/>
+  <!-- <easter-egg  model="easter_egg.spm"  /> -->
+  <easter-egg  model="easter_egg.spm"  />
 </items>
 
diff --git a/data/powerup.xml b/data/powerup.xml
index 2c581f13a..5c92bfe0c 100644
--- a/data/powerup.xml
+++ b/data/powerup.xml
@@ -2,17 +2,17 @@
 <powerup>
   <item name="zipper"         icon="zipper_collect.png" />
   <item name="bowling"        icon="bowling-icon.png"
-        model="bowling.b3d"   speed="4.0"
+        model="bowling.spm"   speed="4.0"
         min-height="0.2"      max-height="1.0"
         force-updown="1"      force-to-target="40"
         max-distance="25"                               />
   <item name="bubblegum"      icon="bubblegum-icon.png" />
   <item name="cake"           icon="cake-icon.png"
-        model="cake.b3d"      speed="50"
+        model="cake.spm"      speed="50"
         min-height="0.2"      max-height="1.0"
         force-updown="25"     max-distance="90"         />
   <item name="anchor"         icon="anchor-icon.png"
-        model="anchor.b3d"                              />
+        model="anchor.spm"                              />
   <item name="switch"         icon="swap-icon.png"      />
   <item name="swatter"        icon="swatter-icon.png"   />
   <!--  interval: How long a single bounce takes.
@@ -56,7 +56,7 @@
                     tunneling.
    -->
   <item name="rubber-ball"    icon="rubber_ball-icon.png"
-        model="rubber_ball.b3d" speed="35.0" 
+        model="rubber_ball.spm" speed="35.0"
         scale="1 1 1"         interval="1"
         max-height="4.0"      min-height="0"
         fast-ping-distance="50" 
@@ -67,9 +67,9 @@
         squash-slowdown="0.5" squash-duration="2"
         delete-time="5.0"     max-height-difference="10" />
   <item name="parachute"      icon="parachute-icon.png"
-        model="parachute.b3d"                           />
+        model="parachute.spm"                           />
   <item name="plunger"        icon="plunger-icon.png"
-        model="plunger.b3d"   speed="35"
+        model="plunger.spm"   speed="35"
         min-height="0.2"      max-height="1.0"
         force-updown="35"     force-to-target="15"
         max-distance="25"                               />
diff --git a/src/items/attachment_manager.cpp b/src/items/attachment_manager.cpp
index 1238d36d7..b49bf4bb8 100644
--- a/src/items/attachment_manager.cpp
+++ b/src/items/attachment_manager.cpp
@@ -48,14 +48,14 @@ struct  initAttachmentType {Attachment::AttachmentType attachment;
 
 static const initAttachmentType iat[]=
 {
-    {Attachment::ATTACH_PARACHUTE,        "parachute.b3d",        "parachute-attach-icon.png"    },
-    {Attachment::ATTACH_BOMB,             "bomb.b3d",             "bomb-attach-icon.png"         },
-    {Attachment::ATTACH_ANVIL,            "anchor.b3d",           "anchor-attach-icon.png"       },
-    {Attachment::ATTACH_SWATTER,          "swatter.b3d",          "swatter-icon.png"             },
-    {Attachment::ATTACH_NOLOKS_SWATTER,   "swatter_nolok.b3d",    "swatter-icon.png"             },
-    {Attachment::ATTACH_TINYTUX,          "reset-button.b3d",     "reset-attach-icon.png"        },
-    {Attachment::ATTACH_BUBBLEGUM_SHIELD, "bubblegum_shield.b3d", "shield-icon.png"              },
-    {Attachment::ATTACH_NOLOK_BUBBLEGUM_SHIELD, "bubblegum_shield_nolok.b3d", "shield-icon.png"              },
+    {Attachment::ATTACH_PARACHUTE,        "parachute.spm",        "parachute-attach-icon.png"    },
+    {Attachment::ATTACH_BOMB,             "bomb.spm",             "bomb-attach-icon.png"         },
+    {Attachment::ATTACH_ANVIL,            "anchor.spm",           "anchor-attach-icon.png"       },
+    {Attachment::ATTACH_SWATTER,          "swatter.spm",          "swatter-icon.png"             },
+    {Attachment::ATTACH_NOLOKS_SWATTER,   "swatter_nolok.spm",    "swatter-icon.png"             },
+    {Attachment::ATTACH_TINYTUX,          "reset-button.spm",     "reset-attach-icon.png"        },
+    {Attachment::ATTACH_BUBBLEGUM_SHIELD, "bubblegum_shield.spm", "shield-icon.png"              },
+    {Attachment::ATTACH_NOLOK_BUBBLEGUM_SHIELD, "bubblegum_shield_nolok.spm", "shield-icon.png"              },
     {Attachment::ATTACH_MAX,              "",                     ""                             },
 };
 
diff --git a/src/items/swatter.cpp b/src/items/swatter.cpp
index 41803c972..4241d6654 100644
--- a/src/items/swatter.cpp
+++ b/src/items/swatter.cpp
@@ -75,7 +75,7 @@ Swatter::Swatter(AbstractKart *kart, bool was_bomb,
     if (m_removing_bomb)
     {
         m_scene_node->setMesh(irr_driver->getAnimatedMesh(
-                        file_manager->getAsset(FileManager::MODEL,"swatter_anim2.b3d") ) );
+                        file_manager->getAsset(FileManager::MODEL,"swatter_anim.spm") ) );
         m_scene_node->setRotation(core::vector3df(0.0, -180.0, 0.0));
         m_scene_node->setAnimationSpeed(0.9f);
         m_scene_node->setCurrentFrame(0.0f);
diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index 90b53ba36..f3e2313f8 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -770,7 +770,7 @@ void KartModel::loadHeadlights(const XMLNode &node)
         const XMLNode* child = node.getNode(i);
         if (child->getName() == "object")
         {
-            // <object position="-0.168000 0.151288 0.917929" model="TuxHeadlight.b3d"/>
+            // <object position="-0.168000 0.151288 0.917929" model="TuxHeadlight.spm"/>
             core::vector3df position;
             child->get("position", &position);
 
diff --git a/src/main.cpp b/src/main.cpp
index 05df09787..719da100c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -421,7 +421,7 @@ void handleXmasMode()
     }   // switch m_xmas_mode
 
     if(xmas)
-        kart_properties_manager->setHatMeshName("christmas_hat.b3d");
+        kart_properties_manager->setHatMeshName("christmas_hat.spm");
 }   // handleXmasMode
 // ============================================================================
 /** Determines if Easter Ears should be used
@@ -478,7 +478,7 @@ void handleEasterEarMode()
     int day, month, year;
     StkTime::getDate(&day, &month, &year);
     if (isEasterMode(day, month, year, /*before_after_days*/5))
-        kart_properties_manager->setHatMeshName("easter_ears.b3d");
+        kart_properties_manager->setHatMeshName("easter_ears.spm");
 }   // handleEasterMode
 
 // ============================================================================
diff --git a/src/modes/three_strikes_battle.cpp b/src/modes/three_strikes_battle.cpp
index 86f789243..a6231ff35 100644
--- a/src/modes/three_strikes_battle.cpp
+++ b/src/modes/three_strikes_battle.cpp
@@ -51,7 +51,7 @@ ThreeStrikesBattle::ThreeStrikesBattle() : WorldWithRank()
     m_insert_tire = 0;
 
     m_tire = irr_driver->getMesh(file_manager->getAsset(FileManager::MODEL,
-                                 "tire.b3d") );
+                                 "tire.spm") );
     irr_driver->grabAllTextures(m_tire);
 
     m_total_rescue = 0;
@@ -375,7 +375,7 @@ void ThreeStrikesBattle::update(float dt)
         if(m_insert_tire == 1)
         {
             tire_offset = core::vector3df(0.0f, 0.0f, 0.0f);
-            tire = file_manager->getAsset(FileManager::MODEL,"tire.b3d");
+            tire = file_manager->getAsset(FileManager::MODEL,"tire.spm");
             scale = 0.5f;
             radius = 0.5f;
             body_shape = PhysicalObject::MP_CYLINDER_Y;
@@ -387,13 +387,13 @@ void ThreeStrikesBattle::update(float dt)
             radius = m_tire_radius[m_insert_tire-2];
             tire_offset = m_tire_offsets[m_insert_tire-2];
             if     (m_insert_tire == 2)
-                tire = m_tire_dir+"/wheel-rear-left.b3d";
+                tire = m_tire_dir+"/wheel-rear-left.spm";
             else if(m_insert_tire == 3)
-                tire = m_tire_dir+"/wheel-front-left.b3d";
+                tire = m_tire_dir+"/wheel-front-left.spm";
             else if(m_insert_tire == 4)
-                tire = m_tire_dir+"/wheel-front-right.b3d";
+                tire = m_tire_dir+"/wheel-front-right.spm";
             else if(m_insert_tire == 5)
-                tire = m_tire_dir+"/wheel-rear-right.b3d";
+                tire = m_tire_dir+"/wheel-rear-right.spm";
             if(!file_manager->fileExists(tire))
             {
                 m_insert_tire--;
diff --git a/src/states_screens/feature_unlocked.cpp b/src/states_screens/feature_unlocked.cpp
index a0d728ed2..f4d8b4e19 100644
--- a/src/states_screens/feature_unlocked.cpp
+++ b/src/states_screens/feature_unlocked.cpp
@@ -216,13 +216,13 @@ void FeatureUnlockedCutScene::addTrophy(RaceManager::Difficulty difficulty)
     switch (difficulty)
     {
         case RaceManager::DIFFICULTY_EASY:
-            model = file_manager->getAsset(FileManager::MODEL,"trophy_bronze.b3d");
+            model = file_manager->getAsset(FileManager::MODEL,"trophy_bronze.spm");
             break;
         case RaceManager::DIFFICULTY_MEDIUM:
-            model = file_manager->getAsset(FileManager::MODEL,"trophy_silver.b3d");
+            model = file_manager->getAsset(FileManager::MODEL,"trophy_silver.spm");
             break;
         case RaceManager::DIFFICULTY_HARD:
-            model = file_manager->getAsset(FileManager::MODEL,"trophy_gold.b3d");
+            model = file_manager->getAsset(FileManager::MODEL,"trophy_gold.spm");
             break;
         default:
             assert(false);
diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp
index d992b6931..30e9bca59 100644
--- a/src/states_screens/grand_prix_win.cpp
+++ b/src/states_screens/grand_prix_win.cpp
@@ -376,11 +376,11 @@ void GrandPrixWin::setKarts(const std::string idents_arg[3])
         TrackObjectPresentationMesh* meshPresentation = currObj->getPresentation<TrackObjectPresentationMesh>();
         if (meshPresentation != NULL)
         {
-            if (meshPresentation->getModelFile() == "gpwin_podium1.b3d")
+            if (meshPresentation->getModelFile() == "gpwin_podium1.spm")
                 m_podium_steps[0] = currObj;
-            else if (meshPresentation->getModelFile() == "gpwin_podium2.b3d")
+            else if (meshPresentation->getModelFile() == "gpwin_podium2.spm")
                 m_podium_steps[1] = currObj;
-            else if (meshPresentation->getModelFile() == "gpwin_podium3.b3d")
+            else if (meshPresentation->getModelFile() == "gpwin_podium3.spm")
                 m_podium_steps[2] = currObj;
         }
     }
diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp
index db7cc3d76..3afc5663e 100644
--- a/src/states_screens/kart_selection.cpp
+++ b/src/states_screens/kart_selection.cpp
@@ -844,7 +844,7 @@ void KartSelectionScreen::updateKartWidgetModel(int widget_id,
     {
         w3->clearModels();
         w3->addModel(irr_driver->getAnimatedMesh(
-                         file_manager->getAsset(FileManager::MODEL, "chest.b3d") )->getMesh(20),
+                         file_manager->getAsset(FileManager::MODEL, "chest.spm") )->getMesh(20),
                      Vec3(0,0,0), Vec3(15.0f, 15.0f, 15.0f) );
         w3->update(0);
 

From bd84929982d9708861af09a62cf5cdd7e1555de6 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 21 Aug 2017 11:27:14 +0200
Subject: [PATCH 057/125] Don't convert gloss maps.

It causes artifacts when advanced lighting is enabled.
---
 android/generate_assets.sh | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/android/generate_assets.sh b/android/generate_assets.sh
index d0f2f32ec..d3b61a5c4 100755
--- a/android/generate_assets.sh
+++ b/android/generate_assets.sh
@@ -19,7 +19,7 @@
 
 ################################################################################
 
-export KARTS="elephpant gnu nolok pidgin suzanne tux xue"
+export KARTS="all"
 export TRACKS="battleisland cornfield_crossing featunlocked gplose gpwin   \
                hacienda introcutscene introcutscene2 lighthouse olivermath \
                overworld sandtrack scotland snowmountain snowtuxpeak       \
@@ -42,6 +42,8 @@ export RUN_OPTIMIZE_SCRIPT=0
 export DECREASE_QUALITY=1
 export CONVERT_TO_JPG=1
 
+export CONVERT_TO_JPG_BLACKLIST="data/karts/hexley/hexley_kart_diffuse.png"
+
 export BLACKLIST_FILES="data/music/cocoa_river_fast.ogg2"
 
 ################################################################################
@@ -276,9 +278,18 @@ convert_to_jpg()
     if [ $ALREADY_CONVERTED -eq 1 ]; then
         return
     fi
-
-    if [ ! -f "$FILE" ]; then
-        #echo "  Couldn't find texture file. Ignore..."
+    
+    BLACKLISTED=0
+    
+    for BLACKLIST_FILE in $CONVERT_TO_JPG_BLACKLIST; do
+        if [ "$FILE" = "assets/$BLACKLIST_FILE" ]; then
+            BLACKLISTED=1
+            break
+        fi
+    done
+    
+    if [ $BLACKLISTED -eq 1 ]; then
+        #echo "  File is blacklisted. Ignore..."
         continue
     fi
 
@@ -304,6 +315,16 @@ convert_to_jpg()
         continue
     fi
 
+    DIRNAME="`dirname "$FILE"`"
+    BASENAME="`basename "$FILE"`"     
+    IS_GLOSS_MAP=`find "$DIRNAME" -iname "*.xml" -exec cat {} \; \
+                                            | grep -c "gloss-map=\"$BASENAME\""`
+    
+    if [ $IS_GLOSS_MAP -gt 0 ]; then
+        #echo "  File is a gloss-map. Ignore..."
+        continue
+    fi
+
     NEW_FILE="`echo $FILE | head -c -5`.jpg"
 
     if [ -f "$NEW_FILE" ]; then
@@ -526,6 +547,8 @@ fi
 
 
 if [ $CONVERT_TO_JPG -gt 0 ]; then
+    rm -f "./converted_textures"
+    
     find assets/data -not -path "assets/data/textures/*" -iname "*.png" | while read f; do convert_to_jpg "$f"; done
 
     find assets/data -iname "*.b3dz" | while read f; do convert_to_jpg_extract_b3dz "$f"; done

From 6a03f147f6194a9329e5ae8ad9a0a55271f6660c Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Tue, 22 Aug 2017 00:02:34 +0200
Subject: [PATCH 058/125] Add a possibility to use ubo on gles.

Disabled by default on android, because it's been tested on only one device and it's a bit slower in most cases.
---
 data/graphical_restrictions.xml   | 1 +
 src/graphics/central_settings.cpp | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/data/graphical_restrictions.xml b/data/graphical_restrictions.xml
index f9db1ec2f..999b5520a 100644
--- a/data/graphical_restrictions.xml
+++ b/data/graphical_restrictions.xml
@@ -39,4 +39,5 @@
   <card                           os="android"                     disable="ColorBufferFloat"/>
   <card contains="Adreno"         os="android"  version="<=19"     disable="VertexIdWorking"/>
   <card contains="Android Emulator" os="android"                   disable="ForceLegacyDevice"/>
+  <card                           os="android"                     disable="UniformBufferObject"/>
 </graphical-restrictions>
diff --git a/src/graphics/central_settings.cpp b/src/graphics/central_settings.cpp
index f6e8127cc..a7925643a 100644
--- a/src/graphics/central_settings.cpp
+++ b/src/graphics/central_settings.cpp
@@ -252,6 +252,13 @@ void CentralVideoSettings::init()
             Log::info("GLDriver", "Explicit Attrib Location Present");
             hasExplicitAttribLocation = true;
         }
+        
+        if (!GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_UNIFORM_BUFFER_OBJECT) &&
+            m_glsl == true) 
+        {
+            hasUBO = true;
+            Log::info("GLDriver", "ARB Uniform Buffer Object Present");
+        }
 
         if (!GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_TEXTURE_FORMAT_BGRA8888) &&
             (hasGLExtension("GL_IMG_texture_format_BGRA8888") ||

From 850afc862073baff40a86cd13671b5bce4e7c68c Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Wed, 23 Aug 2017 00:55:25 +0800
Subject: [PATCH 059/125] Allow using animated texture with displace shader

Plus some clean-up
---
 data/shaders/displace.frag       |  1 -
 data/shaders/displace.vert       | 22 ----------------------
 data/shaders/object_pass.vert    |  3 ++-
 src/graphics/geometry_passes.cpp |  1 +
 src/graphics/materials.cpp       |  6 +++---
 src/graphics/materials.hpp       |  3 ++-
 6 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 data/shaders/displace.vert

diff --git a/data/shaders/displace.frag b/data/shaders/displace.frag
index 748909f82..d76be70a6 100644
--- a/data/shaders/displace.frag
+++ b/data/shaders/displace.frag
@@ -6,7 +6,6 @@ uniform vec2 dir;
 uniform vec2 dir2;
 
 in vec2 uv;
-in vec2 uv_bis;
 in float camdist;
 
 out vec4 FragColor;
diff --git a/data/shaders/displace.vert b/data/shaders/displace.vert
deleted file mode 100644
index e5acc43b5..000000000
--- a/data/shaders/displace.vert
+++ /dev/null
@@ -1,22 +0,0 @@
-uniform mat4 ModelMatrix;
-
-#ifdef Explicit_Attrib_Location_Usable
-layout(location = 0) in vec3 Position;
-layout(location = 3) in vec2 Texcoord;
-layout(location = 4) in vec2 SecondTexcoord;
-#else
-in vec3 Position;
-in vec2 Texcoord;
-in vec2 SecondTexcoord;
-#endif
-
-out vec2 uv;
-out vec2 uv_bis;
-out float camdist;
-
-void main() {
-	gl_Position = ProjectionViewMatrix * ModelMatrix * vec4(Position, 1.);
-	uv = Texcoord;
-	uv_bis = SecondTexcoord;
-	camdist = length(ViewMatrix * ModelMatrix *  vec4(Position, 1.));
-}
diff --git a/data/shaders/object_pass.vert b/data/shaders/object_pass.vert
index 124e8c26e..ed9b2838e 100644
--- a/data/shaders/object_pass.vert
+++ b/data/shaders/object_pass.vert
@@ -41,7 +41,7 @@ out vec3 bitangent;
 out vec2 uv;
 out vec2 uv_bis;
 out vec4 color;
-
+out float camdist;
 
 void main(void)
 {
@@ -56,4 +56,5 @@ void main(void)
     bitangent = (ViewMatrix * ModelMatrix * vec4(Bitangent, 0.)).xyz;
     uv = vec2(Texcoord.x + texture_trans.x, Texcoord.y + texture_trans.y);
     uv_bis = SecondTexcoord;
+    camdist = length(ViewMatrix * ModelMatrix * vec4(Position, 1.));
 }
diff --git a/src/graphics/geometry_passes.cpp b/src/graphics/geometry_passes.cpp
index ae807470b..7100e4319 100644
--- a/src/graphics/geometry_passes.cpp
+++ b/src/graphics/geometry_passes.cpp
@@ -384,6 +384,7 @@ void AbstractGeometryPasses::renderTransparent(const DrawCalls& draw_calls,
             mesh.textures[0]->getOpenGLTextureName());
         DisplaceShader::getInstance()->use();
         DisplaceShader::getInstance()->setUniforms(AbsoluteTransformation,
+            mesh.texture_trans,
             core::vector2df(cb->getDirX(), cb->getDirY()),
             core::vector2df(cb->getDir2X(), cb->getDir2Y()));
 
diff --git a/src/graphics/materials.cpp b/src/graphics/materials.cpp
index 681f43b76..e8ed79880 100644
--- a/src/graphics/materials.cpp
+++ b/src/graphics/materials.cpp
@@ -329,7 +329,7 @@ InstancedRefShadowShader::InstancedRefShadowShader()
 // ============================================================================
 DisplaceMaskShader::DisplaceMaskShader()
 {
-    loadProgram(OBJECT, GL_VERTEX_SHADER, "displace.vert",
+    loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
                         GL_FRAGMENT_SHADER, "white.frag");
     assignUniforms("ModelMatrix");
 }   // DisplaceMaskShader
@@ -337,9 +337,9 @@ DisplaceMaskShader::DisplaceMaskShader()
 // ============================================================================
 DisplaceShader::DisplaceShader()
 {
-    loadProgram(OBJECT, GL_VERTEX_SHADER, "displace.vert",
+    loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
                         GL_FRAGMENT_SHADER, "displace.frag");
-    assignUniforms("ModelMatrix", "dir", "dir2");
+    assignUniforms("ModelMatrix", "texture_trans", "dir", "dir2");
     assignSamplerNames(0, "displacement_tex", ST_BILINEAR_FILTERED,
                        1, "color_tex", ST_BILINEAR_FILTERED,
                        2, "mask_tex", ST_BILINEAR_FILTERED,
diff --git a/src/graphics/materials.hpp b/src/graphics/materials.hpp
index 8cce5a087..61ce7f847 100644
--- a/src/graphics/materials.hpp
+++ b/src/graphics/materials.hpp
@@ -212,7 +212,8 @@ public:
 
 // ============================================================================
 class DisplaceShader : public TextureShader<DisplaceShader, 4, core::matrix4,
-                                            core::vector2df, core::vector2df>
+                                            core::vector2df, core::vector2df,
+                                            core::vector2df>
 {
 public:
     DisplaceShader();

From b03e10890222c23acf32b0b912f8da35743c5c4f Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Tue, 22 Aug 2017 23:52:02 +0200
Subject: [PATCH 060/125] Handle a case when request for srgb-capable
 framebuffer failed.

It fixes #2902.
---
 .../source/Irrlicht/CIrrDeviceLinux.cpp       | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
index 4f4ed1358..e253cecb6 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
@@ -719,6 +719,39 @@ bool CIrrDeviceLinux::createWindow()
 						}
 					}
 				}
+				// Try to disable sRGB framebuffer
+				if (!configList && CreationParams.HandleSRGB)
+				{
+					os::Printer::log("No sRGB framebuffer available.", ELL_WARNING);
+					CreationParams.HandleSRGB=false;
+					visualAttrBuffer[21] = GLX_DONT_CARE;
+					configList=glxChooseFBConfig(display, screennr, visualAttrBuffer,&nitems);
+					if (!configList && CreationParams.AntiAlias)
+					{
+						while (!configList && (visualAttrBuffer[19]>1))
+						{
+							visualAttrBuffer[19] -= 1;
+							configList=glxChooseFBConfig(display, screennr, visualAttrBuffer,&nitems);
+						}
+						if (!configList)
+						{
+							visualAttrBuffer[17] = 0;
+							visualAttrBuffer[19] = 0;
+							configList=glxChooseFBConfig(display, screennr, visualAttrBuffer,&nitems);
+							if (configList)
+							{
+								os::Printer::log("No FSAA available.", ELL_WARNING);
+								CreationParams.AntiAlias=0;
+							}
+							else
+							{
+								//reenable multisampling
+								visualAttrBuffer[17] = 1;
+								visualAttrBuffer[19] = CreationParams.AntiAlias;
+							}
+						}
+					}
+				}
 				// Next try with flipped stencil buffer value
 				// If the first round was with stencil flag it's now without
 				// Other way round also makes sense because some configs

From dec9948d0bf04425cdc0f381f02a779502d97811 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 23 Aug 2017 00:13:57 +0200
Subject: [PATCH 061/125] Make sure we don't write out of array.

It shouldn't happen, but code below assumes that visualAttrBuffer has its full size, so just in case...
---
 lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
index e253cecb6..d4c6735bc 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
@@ -673,11 +673,15 @@ bool CIrrDeviceLinux::createWindow()
 #elif defined(GLX_SGIS_multisample)
 					GLX_SAMPLE_BUFFERS_SGIS, 1,
 					GLX_SAMPLES_SGIS, CreationParams.AntiAlias, // 18,19
+#else
+#error
 #endif
 #ifdef GLX_ARB_framebuffer_sRGB
 					GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB, CreationParams.HandleSRGB,
 #elif defined(GLX_EXT_framebuffer_sRGB)
 					GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT, CreationParams.HandleSRGB,
+#else
+#error
 #endif
 					GLX_STEREO, CreationParams.Stereobuffer?True:False,
 					None

From 6465cc45692916ea7ef5e4c658ca3e3f6182587d Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 23 Aug 2017 21:18:45 +0200
Subject: [PATCH 062/125] Minor fix in graphics restrictions.

Some android restrictions are very basic, eg. UniformBufferObject is disabled on whole platform. So make sure that it's not used on any exotic OS.
---
 src/graphics/graphics_restrictions.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/graphics/graphics_restrictions.cpp b/src/graphics/graphics_restrictions.cpp
index 18b78bada..cfebc4c1a 100644
--- a/src/graphics/graphics_restrictions.cpp
+++ b/src/graphics/graphics_restrictions.cpp
@@ -365,18 +365,16 @@ public:
         {
 #if defined(__linux__) && !defined(ANDROID)
             if(m_os!="linux") return false;
-#endif
-#ifdef WIN32
+#elif defined(WIN32)
             if(m_os!="windows") return false;
-#endif
-#ifdef __APPLE__
+#elif defined(__APPLE__)
             if(m_os!="osx") return false;
-#endif
-#ifdef BSD
+#elif defined(BSD)
             if(m_os!="bsd") return false;
-#endif
-#ifdef ANDROID
+#elif defined(ANDROID)
             if(m_os!="android") return false;
+#else
+            return false;
 #endif
         }   // m_os.size()>0
 

From e852714466f0817aa898886d377ad7461980253d Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Wed, 23 Aug 2017 18:52:10 -0400
Subject: [PATCH 063/125] Update challenges for new city track

---
 data/challenges/city.challenge | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/challenges/city.challenge b/data/challenges/city.challenge
index e75b552e7..0d61874e3 100644
--- a/data/challenges/city.challenge
+++ b/data/challenges/city.challenge
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <challenge version="2">
-    <track id="city" laps="3"/>
+    <track id="candela_city" laps="3"/>
     <mode major="single" minor="quickrace"/>
     <requirements trophies="70"/>
     

From 5999e83cba13839cf2eac91a81ec5f1ea210fb9d Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Wed, 23 Aug 2017 19:02:19 -0400
Subject: [PATCH 064/125] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba326e73e..63bc7e02b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 * Reduced RAM and VRAM usage, reducing load times by Auria and Benau
 * New kart Wilbert by Jymis
 * New kart Hexley by Jymis
-* New track Cornfield Crossing by samuncle
+* New tracks Cornfield Crossing and Candela City by samuncle
 * Physics improvements and various physics bugfixes by hiker
 * Kart GFX improvements (exhaust and headlight)
 * In-game screen recording feature by Benau and Stragus

From 7b571de39552dc71df66fe0b35636145ec87123d Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Fri, 25 Aug 2017 16:39:34 +0800
Subject: [PATCH 065/125] Fix the wrong "misuse"

Now you can play hot.ogg
---
 src/graphics/material.cpp |  8 ++++----
 src/io/file_manager.cpp   | 34 ++++++++++++++++++++++++++--------
 src/io/file_manager.hpp   |  2 ++
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/graphics/material.cpp b/src/graphics/material.cpp
index 57878c9bc..21776ff7d 100644
--- a/src/graphics/material.cpp
+++ b/src/graphics/material.cpp
@@ -618,10 +618,10 @@ void Material::initCustomSFX(const XMLNode *sfx)
     {
 
         // The directory for the track was added to the model search path
-        // so just misuse the getModelFile function
-        const std::string full_path = file_manager->getAsset(FileManager::MODEL,
-                                                             filename);
-        SFXBuffer* buffer = SFXManager::get()->loadSingleSfx(sfx, full_path);
+        // so just misuse the searchModel function
+        std::string path = file_manager->searchModel(filename);
+        path = StringUtils::getPath(path);
+        SFXBuffer* buffer = SFXManager::get()->loadSingleSfx(sfx, path);
 
         if (buffer != NULL)
         {
diff --git a/src/io/file_manager.cpp b/src/io/file_manager.cpp
index 8e29049cc..8aea5e793 100644
--- a/src/io/file_manager.cpp
+++ b/src/io/file_manager.cpp
@@ -601,14 +601,14 @@ bool FileManager::findFile(std::string& full_path,
     return false;
 }   // findFile
 
-    //-----------------------------------------------------------------------------
-    /** Tries to find the specified file in any of the given search paths.
-    *  \param full_path On return contains the full path of the file, or
-    *         "" if the file is not found.
-    *  \param file_name The name of the file to look for.
-    *  \param search_path The list of paths to search for the file.
-    *  \return True if the file is found, false otherwise.
-    */
+//-----------------------------------------------------------------------------
+/** Tries to find the specified file in any of the given search paths.
+*  \param full_path On return contains the full path of the file, or
+*         "" if the file is not found.
+*  \param file_name The name of the file to look for.
+*  \param search_path The list of paths to search for the file.
+*  \return True if the file is found, false otherwise.
+*/
 bool FileManager::findFile(std::string& full_path,
     const std::string& file_name,
     const std::vector<TextureSearchPath>& search_path) const
@@ -1231,6 +1231,24 @@ std::string FileManager::searchMusic(const std::string& file_name) const
     return path;
 }   // searchMusic
 
+//-----------------------------------------------------------------------------
+/** Returns the full path of a model file by searching all model search paths.
+ *  It throws an exception if the file is not found.
+ *  \param file_name File name to search for.
+ */
+std::string FileManager::searchModel(const std::string& file_name) const
+{
+    std::string path;
+    bool success = findFile(path, file_name, m_model_search_path);
+    if (!success)
+    {
+        throw std::runtime_error(
+            "[FileManager::searchModel] Cannot find model file '"
+            +file_name+"'.");
+    }
+    return path;
+}   // searchModel
+
 //-----------------------------------------------------------------------------
 /** Returns true if the given name is a directory.
  *  \param path File name to test.
diff --git a/src/io/file_manager.hpp b/src/io/file_manager.hpp
index 26e56f165..6c766e3de 100644
--- a/src/io/file_manager.hpp
+++ b/src/io/file_manager.hpp
@@ -162,6 +162,8 @@ public:
     }
     // ------------------------------------------------------------------------
     std::string searchMusic(const std::string& file_name) const;
+    // ------------------------------------------------------------------------
+    std::string searchModel(const std::string& file_name) const;
     std::string searchTexture(const std::string& fname) const;
     std::string getUserConfigFile(const std::string& fname) const;
     bool        fileExists(const std::string& path) const;

From ea58a736d5b1f4d6f56e81e5bdc85b542d664091 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Mon, 28 Aug 2017 13:04:41 +0800
Subject: [PATCH 066/125] Fix displace fallback in non-advanced pipeline

---
 src/graphics/stk_mesh.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/graphics/stk_mesh.cpp b/src/graphics/stk_mesh.cpp
index 87e2e2b29..a7a3bcd7d 100644
--- a/src/graphics/stk_mesh.cpp
+++ b/src/graphics/stk_mesh.cpp
@@ -84,8 +84,10 @@ TransparentMaterial getTransparentMaterialFromType(video::E_MATERIAL_TYPE type,
     {
         if (CVS->isDefferedEnabled())
             return TM_DISPLACEMENT;
-        else
+        else if (tp == video::EVT_2TCOORDS)
             return TM_TRANSLUCENT_2TC;
+        else
+            return TM_TRANSLUCENT_STD;
     }
     if (material->getShaderType() == Material::SHADERTYPE_ADDITIVE)
         return TM_ADDITIVE;

From 704d3ea9d99dff49ccfa838ea3d6b1dc45937459 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 28 Aug 2017 21:10:09 +0200
Subject: [PATCH 067/125] Try to make touch device a bit more comfortable

---
 src/input/multitouch_device.cpp | 35 +++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/input/multitouch_device.cpp b/src/input/multitouch_device.cpp
index e73bfefd5..cbd6f8610 100644
--- a/src/input/multitouch_device.cpp
+++ b/src/input/multitouch_device.cpp
@@ -157,7 +157,6 @@ void MultitouchDevice::addButton(MultitouchButtonType type, int x, int y,
                 m_accelerometer_active = true;
             }
         }
-
     }
 #endif
 } // addButton
@@ -193,32 +192,38 @@ void MultitouchDevice::updateDeviceState(unsigned int event_id)
 {
     assert(event_id < m_events.size());
 
-    MultitouchEvent event = m_events[event_id];
+    MultitouchButton* pressed_button = NULL;
+    
+    for (MultitouchButton* button : m_buttons)
+    {
+        if (button->pressed && button->event_id == event_id) 
+        {
+            pressed_button = button;
+            break;
+        }
+    }
 
     for (MultitouchButton* button : m_buttons)
     {
+        if (pressed_button != NULL && button != pressed_button)
+            continue;
+            
         bool update_controls = false;
         bool prev_button_state = button->pressed;
-        float prev_axis_x = button->axis_x;
-        float prev_axis_y = button->axis_y;
+        MultitouchEvent event = m_events[event_id];
 
-        if (event.x < button->x || event.x > button->x + button->width ||
-            event.y < button->y || event.y > button->y + button->height)
-        {
-            if (button->event_id == event_id)
-            {
-                button->pressed = false;
-                button->event_id = 0;
-                updateButtonAxes(button, 0.0f, 0.0f);
-            }
-        }
-        else
+        if (pressed_button != NULL ||
+            (event.x >= button->x && event.x <= button->x + button->width &&
+            event.y >= button->y && event.y <= button->y + button->height))
         {
             button->pressed = event.touched;
             button->event_id = event_id;
 
             if (button->type == MultitouchButtonType::BUTTON_STEERING)
             {
+                float prev_axis_x = button->axis_x;
+                float prev_axis_y = button->axis_y;
+                
                 if (button->pressed == true)
                 {
                     updateButtonAxes(button,

From 2fdb33990ed71a36a4323364c370dad3e8e3f62d Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 28 Aug 2017 22:24:57 +0200
Subject: [PATCH 068/125] Tweak some touch device params.

Better on 5'', worse on 10''... Can be changed in options anyway.
---
 src/config/user_config.hpp                 | 4 ++--
 src/states_screens/race_gui_multitouch.cpp | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index 954848541..d59706ab3 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -431,13 +431,13 @@ namespace UserConfigParams
             "considered as centered in steering button."));
 
     PARAM_PREFIX FloatUserConfigParam         m_multitouch_deadzone_edge
-            PARAM_DEFAULT( FloatUserConfigParam(0.25f, "multitouch_deadzone_edge",
+            PARAM_DEFAULT( FloatUserConfigParam(0.1f, "multitouch_deadzone_edge",
             &m_multitouch_group,
             "A parameter in range [0, 0.5] that determines the zone that is "
             "considered as max value in steering button."));
 
     PARAM_PREFIX FloatUserConfigParam         m_multitouch_scale
-            PARAM_DEFAULT( FloatUserConfigParam(1.0f, "multitouch_scale",
+            PARAM_DEFAULT( FloatUserConfigParam(1.1f, "multitouch_scale",
             &m_multitouch_group,
             "A parameter in range [0.5, 1.5] that determines the scale of the "
             "multitouch interface."));
diff --git a/src/states_screens/race_gui_multitouch.cpp b/src/states_screens/race_gui_multitouch.cpp
index fbf0fa474..0a906eb49 100644
--- a/src/states_screens/race_gui_multitouch.cpp
+++ b/src/states_screens/race_gui_multitouch.cpp
@@ -114,19 +114,21 @@ void RaceGUIMultitouch::initMultitouchSteering()
 
     float first_column_x = w - 2 * col_size;
     float second_column_x = w - 1 * col_size;
-    float steering_btn_x = 0.5f * margin;
+    float steering_btn_margin = 0.6f * margin;
+    float steering_btn_x = steering_btn_margin;
+    float steering_btn_y = h - steering_btn_margin - btn2_size;
     
     if (UserConfigParams::m_multitouch_inverted)
     {
         first_column_x = margin + 1 * col_size;
         second_column_x = margin;
-        steering_btn_x = w - btn2_size - 0.5f * margin;
+        steering_btn_x = w - btn2_size - steering_btn_margin;
     }
 
     m_minimap_bottom = (unsigned int)(h - 2 * col_size);
 
     m_device->addButton(BUTTON_STEERING,
-                        int(steering_btn_x), int(h - 0.5f * margin - btn2_size),
+                        int(steering_btn_x), int(steering_btn_y),
                         int(btn2_size), int(btn2_size));
     m_device->addButton(BUTTON_ESCAPE,
                         int(margin_top), int(margin_small),

From cf98e049b01604f527e23fb8ddfbe12b31237c39 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 29 Aug 2017 08:23:06 +1000
Subject: [PATCH 069/125] Fixed sliding (i.e. not being able to drive up steep
 uphill sections). Fixes #2906.

---
 src/karts/kart.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 3d9e8c684..6379915c9 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -2509,13 +2509,18 @@ void Kart::updateSliding()
     // Now test for each wheel if it should be sliding
     // -----------------------------------------------
     bool enable_sliding = false;
+
+    // We need the 'up' vector, which can be affected by material
+    // with gravity. So use the body's gravity to determine up:
+    Vec3 up = -m_body->getGravity();
+    up.normalize();
     for (int i = 0; i < m_vehicle->getNumWheels(); i++)
     {
         const btWheelInfo &wheel = m_vehicle->getWheelInfo(i);
         if (!wheel.m_raycastInfo.m_isInContact) continue;
 
         const btVector3 &norm = m_vehicle->getWheelInfo(i).m_raycastInfo.m_contactNormalWS;
-        float distanceFromUp = norm.dot(getNormal());
+        float distanceFromUp = norm.dot(up);
         float friction;
         if (distanceFromUp < 0.85f)
         {

From 96c4e26ef3ebe447a25e37e02a71f330877b4364 Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Mon, 28 Aug 2017 19:36:34 -0400
Subject: [PATCH 070/125] Update strings

---
 data/po/supertuxkart.pot | 595 ++++++++++++++++++++++++---------------
 1 file changed, 365 insertions(+), 230 deletions(-)

diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index 08bddec9a..0444ecccb 100644
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: supertuxkart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-23 20:00-0400\n"
+"POT-Creation-Date: 2017-08-28 19:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -181,7 +181,7 @@ msgstr ""
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/grand_prix_editor_screen.cpp:325
+#: src/states_screens/grand_prix_editor_screen.cpp:330
 msgid "Standard"
 msgstr ""
 
@@ -195,7 +195,7 @@ msgstr ""
 #. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:83
 #: src/states_screens/easter_egg_screen.cpp:145
-#: src/states_screens/grand_prix_editor_screen.cpp:327
+#: src/states_screens/grand_prix_editor_screen.cpp:332
 #: src/states_screens/kart_selection.cpp:286
 #: src/states_screens/tracks_and_gp_screen.cpp:148
 msgid "Add-Ons"
@@ -215,18 +215,18 @@ msgstr ""
 #: src/states_screens/easter_egg_screen.cpp:137
 #: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/gp_info_screen.cpp:76
-#: src/states_screens/grand_prix_editor_screen.cpp:324
+#: src/states_screens/grand_prix_editor_screen.cpp:329
 #: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:456
 #: src/states_screens/tracks_and_gp_screen.cpp:138
-#: src/states_screens/tracks_screen.cpp:142
+#: src/states_screens/tracks_screen.cpp:141
 msgid "All"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
 #: src/states_screens/edit_gp_screen.cpp:257
-#: src/states_screens/ghost_replay_selection.cpp:116
+#: src/states_screens/ghost_replay_selection.cpp:117
 msgid "Yes"
 msgstr ""
 
@@ -235,8 +235,8 @@ msgstr ""
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
 #. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
+#. I18N: ./data/gui/general_text_field_dialog.stkgui
+#. I18N: In the general textfield dialog
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
@@ -341,11 +341,6 @@ msgstr ""
 msgid "Texture compression"
 msgstr ""
 
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Use high definition textures"
-msgstr ""
-
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Animated Characters"
@@ -353,7 +348,12 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-msgid "Texture filtering"
+msgid "Rendered image quality"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Geometry detail"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
@@ -362,6 +362,7 @@ msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: ./data/gui/multitouch_settings.stkgui
 msgid "Apply"
 msgstr ""
 
@@ -428,8 +429,8 @@ msgid "Reverse:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
+#. I18N: ./data/gui/general_text_field_dialog.stkgui
+#. I18N: In the general textfield dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
@@ -441,11 +442,6 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-msgid "Please enter the name of the grand prix"
-msgstr ""
-
 #. I18N: ./data/gui/feature_unlocked.stkgui
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
@@ -550,6 +546,7 @@ msgstr ""
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help5.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
@@ -561,6 +558,10 @@ msgstr ""
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
+#. I18N: ./data/gui/help5.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/multitouch_settings.stkgui
+#. I18N: In the multitouch settings screen
 msgid "General"
 msgstr ""
 
@@ -572,6 +573,8 @@ msgstr ""
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
+#. I18N: ./data/gui/help5.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
@@ -583,6 +586,8 @@ msgstr ""
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
+#. I18N: ./data/gui/help5.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
@@ -594,11 +599,26 @@ msgstr ""
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
+#. I18N: ./data/gui/help5.stkgui
+#. I18N: Tab in help menu
 msgid "Multi-player"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-msgid "Click here to play the tutorial"
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help5.stkgui
+#. I18N: Tab in help menu
+msgid "Bananas"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+msgid "Start the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
@@ -767,6 +787,29 @@ msgid ""
 "not be used for this operation."
 msgstr ""
 
+#. I18N: ./data/gui/help5.stkgui
+msgid ""
+"Hitting a banana can result in one of the following being attached to the "
+"kart:"
+msgstr ""
+
+#. I18N: ./data/gui/help5.stkgui
+#. I18N: In the help menu
+msgid "Anchor - slows down the kart."
+msgstr ""
+
+#. I18N: ./data/gui/help5.stkgui
+#. I18N: In the help menu
+msgid "Parachute - slows down the kart less than the anchor."
+msgstr ""
+
+#. I18N: ./data/gui/help5.stkgui
+#. I18N: In the help menu
+msgid ""
+"Bomb - detonates after a short amount of time to throw the kart up in the "
+"air. Bump into another kart to transfer the bomb to another player."
+msgstr ""
+
 #. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
@@ -825,7 +868,7 @@ msgstr ""
 
 #. I18N: ./data/gui/main_menu.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:465
+#: src/states_screens/race_gui_overworld.cpp:503
 msgid "Tutorial"
 msgstr ""
 
@@ -852,6 +895,49 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
+#. I18N: ./data/gui/multitouch_settings.stkgui
+msgid "Touch Device Settings"
+msgstr ""
+
+#. I18N: ./data/gui/multitouch_settings.stkgui
+#. I18N: In the multitouch settings screen
+msgid "Device enabled"
+msgstr ""
+
+#. I18N: ./data/gui/multitouch_settings.stkgui
+#. I18N: In the multitouch settings screen
+msgid "Inverted buttons"
+msgstr ""
+
+#. I18N: ./data/gui/multitouch_settings.stkgui
+#. I18N: In the multitouch settings screen
+msgid "Buttons scale"
+msgstr ""
+
+#. I18N: ./data/gui/multitouch_settings.stkgui
+#. I18N: In the multitouch settings screen
+msgid "Accelerometer"
+msgstr ""
+
+#. I18N: ./data/gui/multitouch_settings.stkgui
+#. I18N: In the multitouch settings screen
+msgid "Advanced"
+msgstr ""
+
+#. I18N: ./data/gui/multitouch_settings.stkgui
+#. I18N: In the multitouch settings screen
+msgid "Deadzone center"
+msgstr ""
+
+#. I18N: ./data/gui/multitouch_settings.stkgui
+#. I18N: In the multitouch settings screen
+msgid "Deadzone edge"
+msgstr ""
+
+#. I18N: ./data/gui/multitouch_settings.stkgui
+msgid "Restore defaults"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 msgid "Password Change"
@@ -933,8 +1019,8 @@ msgstr ""
 #. I18N: Difficulty
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Difficulty
-#: src/race/race_manager.hpp:544
-#: src/states_screens/ghost_replay_selection.cpp:120
+#: src/race/race_manager.hpp:546
+#: src/states_screens/ghost_replay_selection.cpp:121
 msgid "Novice"
 msgstr ""
 
@@ -944,8 +1030,8 @@ msgstr ""
 #. I18N: Difficulty
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Difficulty
-#: src/race/race_manager.hpp:545
-#: src/states_screens/ghost_replay_selection.cpp:120
+#: src/race/race_manager.hpp:547
+#: src/states_screens/ghost_replay_selection.cpp:121
 msgid "Intermediate"
 msgstr ""
 
@@ -955,8 +1041,8 @@ msgstr ""
 #. I18N: Difficulty
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Difficulty
-#: src/race/race_manager.hpp:546
-#: src/states_screens/ghost_replay_selection.cpp:119
+#: src/race/race_manager.hpp:548
+#: src/states_screens/ghost_replay_selection.cpp:120
 msgid "Expert"
 msgstr ""
 
@@ -964,8 +1050,8 @@ msgstr ""
 #. I18N: Difficulty
 #. I18N: ./data/gui/race_setup.stkgui
 #. I18N: Difficulty
-#: src/race/race_manager.hpp:547
-#: src/states_screens/ghost_replay_selection.cpp:118
+#: src/race/race_manager.hpp:549
+#: src/states_screens/ghost_replay_selection.cpp:119
 msgid "SuperTux"
 msgstr ""
 
@@ -1317,9 +1403,9 @@ msgstr ""
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
 #: src/states_screens/options_screen_device.cpp:86
-#: src/states_screens/options_screen_input.cpp:140
-#: src/states_screens/options_screen_ui.cpp:122
-#: src/states_screens/options_screen_video.cpp:172
+#: src/states_screens/options_screen_input.cpp:150
+#: src/states_screens/options_screen_ui.cpp:123
+#: src/states_screens/options_screen_video.cpp:238
 #: src/states_screens/user_screen.cpp:660
 msgid "Audio"
 msgstr ""
@@ -1333,7 +1419,7 @@ msgstr ""
 #. I18N: In the audio options screen
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is enabled
-#: src/states_screens/options_screen_video.cpp:384
+#: src/states_screens/options_screen_video.cpp:451
 msgid "Enabled"
 msgstr ""
 
@@ -1352,8 +1438,8 @@ msgstr ""
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:68
-#: src/states_screens/options_screen_ui.cpp:124
-#: src/states_screens/options_screen_video.cpp:175
+#: src/states_screens/options_screen_ui.cpp:125
+#: src/states_screens/options_screen_video.cpp:241
 #: src/states_screens/user_screen.cpp:662
 msgid "Controls"
 msgstr ""
@@ -1393,9 +1479,9 @@ msgstr ""
 #: src/states_screens/ghost_replay_selection.cpp:78
 #: src/states_screens/options_screen_audio.cpp:67
 #: src/states_screens/options_screen_device.cpp:88
-#: src/states_screens/options_screen_input.cpp:142
-#: src/states_screens/options_screen_ui.cpp:123
-#: src/states_screens/options_screen_video.cpp:174
+#: src/states_screens/options_screen_input.cpp:152
+#: src/states_screens/options_screen_ui.cpp:124
+#: src/states_screens/options_screen_video.cpp:240
 #: src/states_screens/server_selection.cpp:103
 msgid "Players"
 msgstr ""
@@ -1418,8 +1504,8 @@ msgstr ""
 #. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
 #: src/states_screens/options_screen_device.cpp:87
-#: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_video.cpp:173
+#: src/states_screens/options_screen_input.cpp:151
+#: src/states_screens/options_screen_video.cpp:239
 #: src/states_screens/user_screen.cpp:661
 msgid "User Interface"
 msgstr ""
@@ -1458,8 +1544,8 @@ msgstr ""
 #. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:65
 #: src/states_screens/options_screen_device.cpp:85
-#: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121
+#: src/states_screens/options_screen_input.cpp:149
+#: src/states_screens/options_screen_ui.cpp:122
 #: src/states_screens/user_screen.cpp:659
 msgid "Graphics"
 msgstr ""
@@ -1668,20 +1754,20 @@ msgstr ""
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/cave/track.xml
-msgid "Cave X"
+#. I18N: ../stk-assets/tracks/candela_city/track.xml
+msgid "Candela City"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/city/track.xml
-msgid "Shiny Suburbs"
+#. I18N: ../stk-assets/tracks/cave/track.xml
+msgid "Cave X"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/farm/track.xml
-msgid "Bovine Barnyard"
+#. I18N: ../stk-assets/tracks/cornfield_crossing/track.xml
+msgid "Cornfield Crossing"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
@@ -1872,18 +1958,18 @@ msgstr ""
 msgid "Completed achievement \"%s\"."
 msgstr ""
 
-#: src/addons/addons_manager.cpp:104 src/addons/news_manager.cpp:325
-msgid "Can't access stkaddons server..."
+#: src/addons/addons_manager.cpp:104 src/addons/news_manager.cpp:322
+msgid "Failed to connect to the SuperTuxKart add-ons server."
 msgstr ""
 
-#: src/addons/news_manager.cpp:182
+#: src/addons/news_manager.cpp:179
 #, c-format
 msgid "Error downloading news: '%s'."
 msgstr ""
 
 #. I18N: number of laps to race in a challenge
 #: src/challenges/challenge_data.cpp:266
-#: src/states_screens/race_result_gui.cpp:1422
+#: src/states_screens/race_result_gui.cpp:1424
 #, c-format
 msgid "Laps: %i"
 msgstr ""
@@ -1897,22 +1983,22 @@ msgstr ""
 msgid "New track '%s' now available"
 msgstr ""
 
-#: src/challenges/challenge_data.cpp:523
+#: src/challenges/challenge_data.cpp:522
 #, c-format
 msgid "New game mode '%s' now available"
 msgstr ""
 
-#: src/challenges/challenge_data.cpp:533
+#: src/challenges/challenge_data.cpp:532
 #, c-format
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
-#: src/challenges/challenge_data.cpp:537
+#: src/challenges/challenge_data.cpp:536
 #, c-format
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/challenges/challenge_data.cpp:547
+#: src/challenges/challenge_data.cpp:546
 #, c-format
 msgid "New kart '%s' now available"
 msgstr ""
@@ -1944,40 +2030,48 @@ msgid ""
 "created."
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1950
-#, c-format
-msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
+#: src/graphics/irr_driver.cpp:618
+msgid "Video recording started."
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1961
+#: src/graphics/irr_driver.cpp:624
+#, c-format
+msgid "Video saved in \"%s\"."
+msgstr ""
+
+#: src/graphics/irr_driver.cpp:628
+msgid "Encoding progress:"
+msgstr ""
+
+#: src/graphics/irr_driver.cpp:1801
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1289
+#: src/guiengine/engine.cpp:1296
 msgid "Loading"
 msgstr ""
 
-#: src/guiengine/widgets/kart_stats_widget.cpp:89
+#: src/guiengine/widgets/kart_stats_widget.cpp:108
 msgid "WEIGHT"
 msgstr ""
 
-#: src/guiengine/widgets/kart_stats_widget.cpp:94
+#: src/guiengine/widgets/kart_stats_widget.cpp:113
 msgid "SPEED"
 msgstr ""
 
-#: src/guiengine/widgets/kart_stats_widget.cpp:98
+#: src/guiengine/widgets/kart_stats_widget.cpp:117
 msgid "POWER"
 msgstr ""
 
 #. I18N: 'handicapped' indicates that per-player handicaps are
 #. activated for this kart (i.e. it will drive slower)
-#: src/guiengine/widgets/player_kart_widget.cpp:361
+#: src/guiengine/widgets/player_kart_widget.cpp:381
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:420
+#: src/guiengine/widgets/player_kart_widget.cpp:440
 #, c-format
 msgid "%s is ready"
 msgstr ""
@@ -2469,11 +2563,11 @@ msgid "Mouse axis %d %s"
 msgstr ""
 
 #. I18N: shown when config file is too old
-#: src/input/device_manager.cpp:501
+#: src/input/device_manager.cpp:543
 msgid "Please re-configure your key bindings."
 msgstr ""
 
-#: src/input/device_manager.cpp:502
+#: src/input/device_manager.cpp:544
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
 
@@ -2495,51 +2589,51 @@ msgstr ""
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
-#: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
+#: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:244
 msgid "Right thumb right"
 msgstr ""
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
-#: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
+#: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:246
 msgid "Right thumb left"
 msgstr ""
 
 #. I18N: name of buttons on gamepads
-#. I18N: name of stick on gamepads
-#: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
+#. I18N: name of trigger on gamepads
+#: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:240
 msgid "Right thumb down"
 msgstr ""
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
-#: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
+#: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:242
 msgid "Right thumb up"
 msgstr ""
 
 #. I18N: name of buttons on gamepads
-#. I18N: name of stick on gamepads
-#: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
+#: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:248
 msgid "Right trigger"
 msgstr ""
 
 #. I18N: name of buttons on gamepads
-#: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
+#: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:253
 msgid "DPad right"
 msgstr ""
 
 #. I18N: name of buttons on gamepads
-#: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
+#: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:255
 msgid "DPad left"
 msgstr ""
 
 #. I18N: name of buttons on gamepads
-#: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
+#: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:251
 msgid "DPad down"
 msgstr ""
 
 #. I18N: name of buttons on gamepads
-#: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
+#. I18N: name of trigger on gamepads
+#: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:249
 msgid "DPad up"
 msgstr ""
 
@@ -2588,55 +2682,63 @@ msgstr ""
 msgid "Left thumb up"
 msgstr ""
 
-#: src/input/input_manager.cpp:768
+#: src/input/input_manager.cpp:807
 #, c-format
 msgid "Ignoring '%s'. You needed to join earlier to play!"
 msgstr ""
 
-#: src/input/input_manager.cpp:798
+#: src/input/input_manager.cpp:837
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:389
+#: src/input/wiimote_manager.cpp:388
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok. Detailed "
 "instructions at supertuxkart.net/Wiimote"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:392
+#: src/input/wiimote_manager.cpp:391
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok. Detailed instructions at supertuxkart.net/Wiimote"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:415
+#: src/input/wiimote_manager.cpp:414
 #, c-format
 msgid "Found %d wiimote"
 msgid_plural "Found %d wiimotes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/input/wiimote_manager.cpp:420
+#: src/input/wiimote_manager.cpp:419
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
-#: src/karts/controller/local_player_controller.cpp:206
+#: src/karts/controller/local_player_controller.cpp:244
 msgid "Penalty time!!"
 msgstr ""
 
-#: src/karts/controller/local_player_controller.cpp:208
+#: src/karts/controller/local_player_controller.cpp:246
 msgid "Don't accelerate before go"
 msgstr ""
 
-#: src/karts/kart.cpp:852 src/karts/kart.cpp:857
+#: src/karts/controller/spare_tire_ai.cpp:147
+msgid "You can have at most 3 lives!"
+msgstr ""
+
+#: src/karts/controller/spare_tire_ai.cpp:153
+msgid "+1 life."
+msgstr ""
+
+#: src/karts/kart.cpp:903 src/karts/kart.cpp:908
 msgid "You won the race!"
 msgstr ""
 
-#: src/karts/kart.cpp:857
+#: src/karts/kart.cpp:908
 msgid "You finished the race!"
 msgstr ""
 
-#: src/main.cpp:1413
+#: src/main.cpp:1500
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
@@ -2646,12 +2748,16 @@ msgid ""
 "edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
 msgstr ""
 
-#: src/main.cpp:1563
+#: src/main.cpp:1654
+msgid "Your screen resolution is too small to run STK."
+msgstr ""
+
+#: src/main.cpp:1668
 msgid ""
 "Your driver version is too old. Please install the latest video drivers."
 msgstr ""
 
-#: src/main.cpp:1580
+#: src/main.cpp:1685
 #, c-format
 msgid ""
 "Your OpenGL version appears to be too old. Please verify if an update for "
@@ -2663,81 +2769,89 @@ msgstr ""
 msgid "Eggs: %d / %d"
 msgstr ""
 
-#: src/modes/follow_the_leader.cpp:61 src/modes/follow_the_leader.cpp:284
+#: src/modes/follow_the_leader.cpp:62 src/modes/follow_the_leader.cpp:285
 msgid "Leader"
 msgstr ""
 
-#: src/modes/linear_world.cpp:284
+#: src/modes/linear_world.cpp:287
 msgid "Final lap!"
 msgstr ""
 
-#: src/modes/linear_world.cpp:311
+#: src/modes/linear_world.cpp:314
 #, c-format
 msgid "Lap %i"
 msgstr ""
 
-#: src/modes/linear_world.cpp:366
+#: src/modes/linear_world.cpp:369
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr ""
 
-#: src/modes/linear_world.cpp:371
+#: src/modes/linear_world.cpp:374
 msgid "New fastest lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:890
+#: src/modes/linear_world.cpp:891
 msgid "WRONG WAY!"
 msgstr ""
 
-#: src/modes/world.cpp:1207
+#: src/modes/three_strikes_battle.cpp:664
+#, c-format
+msgid "%i spare tire kart has been spawned!"
+msgid_plural "%i spare tire karts have been spawned!"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modes/world.cpp:1202
 msgid "You have been eliminated!"
 msgstr ""
 
-#: src/modes/world.cpp:1210
+#: src/modes/world.cpp:1205
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ""
 
-#: src/network/protocols/server_lobby_room_protocol.cpp:237
-msgid "Failed to register server"
+#: src/network/protocols/server_lobby.cpp:318
+#, c-format
+msgid "Failed to register server: %s"
 msgstr ""
 
-#: src/network/servers_manager.cpp:197
+#: src/network/servers_manager.cpp:198
 msgid "No LAN server detected"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:420
+#: src/online/online_player_profile.cpp:419
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/online/online_player_profile.cpp:424
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
 
-#: src/online/online_player_profile.cpp:429
+#: src/online/online_player_profile.cpp:428
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:435
+#: src/online/online_player_profile.cpp:434
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:472
+#: src/online/online_player_profile.cpp:471
 #, c-format
 msgid "You have %d new friend request!"
 msgid_plural "You have %d new friend requests!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:478
+#: src/online/online_player_profile.cpp:477
 msgid "You have a new friend request!"
 msgstr ""
 
@@ -2777,11 +2891,11 @@ msgstr ""
 msgid "Soccer"
 msgstr ""
 
-#: src/replay/replay_recorder.cpp:182
+#: src/replay/replay_recorder.cpp:183
 msgid "Incomplete replay file will not be saved."
 msgstr ""
 
-#: src/replay/replay_recorder.cpp:218
+#: src/replay/replay_recorder.cpp:219
 #, c-format
 msgid "Replay saved in \"%s\"."
 msgstr ""
@@ -2844,7 +2958,7 @@ msgid "Please wait while addons are updated"
 msgstr ""
 
 #: src/states_screens/addons_screen.cpp:551
-#: src/states_screens/main_menu_screen.cpp:554
+#: src/states_screens/main_menu_screen.cpp:571
 msgid ""
 "Sorry, an error occurred while contacting the add-ons website. Make sure you "
 "are connected to the Internet and that SuperTuxKart is not blocked by a "
@@ -2866,8 +2980,8 @@ msgstr ""
 #: src/states_screens/arenas_screen.cpp:327
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
-#: src/states_screens/kart_selection.cpp:864
-#: src/states_screens/kart_selection.cpp:1450
+#: src/states_screens/kart_selection.cpp:859
+#: src/states_screens/kart_selection.cpp:1464
 #: src/states_screens/race_setup_screen.cpp:99
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
@@ -2904,7 +3018,7 @@ msgstr ""
 msgid "The maxinum number of players has to be between 2 and 12."
 msgstr ""
 
-#: src/states_screens/credits.cpp:217
+#: src/states_screens/credits.cpp:180
 msgid "translator-credits"
 msgstr ""
 
@@ -3010,74 +3124,74 @@ msgid_plural "Confirm resolution within %i seconds"
 msgstr[0] ""
 msgstr[1] ""
 
+#. I18N: Geometry level disabled : lowest level, no details
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:62
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
-#: src/states_screens/options_screen_video.cpp:387
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:95
+#: src/states_screens/dialogs/multitouch_settings_dialog.cpp:59
+#: src/states_screens/options_screen_video.cpp:454
 msgid "Disabled"
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:64
+#: src/states_screens/dialogs/custom_video_settings.cpp:68
 msgid "Human players only"
 msgstr ""
 
-#. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:66
+#: src/states_screens/dialogs/custom_video_settings.cpp:71
 msgid "Enabled for all"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
-msgid "Bilinear"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
-msgid "Trilinear"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
-msgid "Anisotropic x2"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
-msgid "Anisotropic x4"
-msgstr ""
-
+#. I18N: Geometry level low : few details are displayed
+#. I18N: in the graphical options tooltip;
+#. indicates the rendered image quality is low
 #: src/states_screens/dialogs/custom_video_settings.cpp:80
-msgid "Anisotropic x8"
+#: src/states_screens/dialogs/custom_video_settings.cpp:89
+#: src/states_screens/dialogs/custom_video_settings.cpp:96
+#: src/states_screens/options_screen_video.cpp:467
+msgid "Low"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:81
-msgid "Anisotropic x16"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
-msgid "low"
+#. I18N: Geometry level high : everything is displayed
+#. I18N: in the graphical options tooltip;
+#. indicates the rendered image quality is high
+#: src/states_screens/dialogs/custom_video_settings.cpp:82
+#: src/states_screens/dialogs/custom_video_settings.cpp:90
+#: src/states_screens/dialogs/custom_video_settings.cpp:97
+#: src/states_screens/options_screen_video.cpp:470
+msgid "High"
 msgstr ""
 
+#. I18N: in the graphical options tooltip;
+#. indicates the rendered image quality is very low
 #: src/states_screens/dialogs/custom_video_settings.cpp:88
-msgid "high"
+#: src/states_screens/options_screen_video.cpp:464
+msgid "Very Low"
 msgstr ""
 
-#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
-msgid "Name is empty."
-msgstr ""
-
-#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
-msgid "Another grand prix with this name already exists."
-msgstr ""
-
-#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
-msgid "Name is too long."
+#. I18N: in the graphical options tooltip;
+#. indicates the rendered image quality is very high
+#: src/states_screens/dialogs/custom_video_settings.cpp:91
+#: src/states_screens/options_screen_video.cpp:473
+msgid "Very High"
 msgstr ""
 
 #: src/states_screens/dialogs/message_dialog.cpp:129
 #: src/states_screens/edit_gp_screen.cpp:257
-#: src/states_screens/ghost_replay_selection.cpp:116
+#: src/states_screens/ghost_replay_selection.cpp:117
 msgid "No"
 msgstr ""
 
+#: src/states_screens/dialogs/multitouch_settings_dialog.cpp:60
+msgid "Tablet"
+msgstr ""
+
+#: src/states_screens/dialogs/multitouch_settings_dialog.cpp:61
+msgid "Phone"
+msgstr ""
+
 #: src/states_screens/dialogs/recovery_dialog.cpp:121
 msgid "Username and/or email address invalid."
 msgstr ""
@@ -3176,7 +3290,7 @@ msgstr ""
 
 #: src/states_screens/easter_egg_screen.cpp:270
 #: src/states_screens/tracks_and_gp_screen.cpp:292
-#: src/states_screens/tracks_screen.cpp:242
+#: src/states_screens/tracks_screen.cpp:241
 msgid "Random Track"
 msgstr ""
 
@@ -3195,8 +3309,8 @@ msgid "Reversed"
 msgstr ""
 
 #: src/states_screens/edit_gp_screen.cpp:124
-#: src/states_screens/ghost_replay_selection.cpp:174
-#: src/states_screens/grand_prix_editor_screen.cpp:109
+#: src/states_screens/ghost_replay_selection.cpp:177
+#: src/states_screens/grand_prix_editor_screen.cpp:112
 #, c-format
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
@@ -3215,7 +3329,7 @@ msgstr ""
 msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
-#: src/states_screens/edit_track_screen.cpp:237
+#: src/states_screens/edit_track_screen.cpp:235
 msgid "Select a track"
 msgstr ""
 
@@ -3252,13 +3366,17 @@ msgstr ""
 msgid "Finish Time"
 msgstr ""
 
+#: src/states_screens/ghost_replay_selection.cpp:83
+msgid "User"
+msgstr ""
+
 #: src/states_screens/gp_info_screen.cpp:74
 msgid "Default"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
 #: src/states_screens/gp_info_screen.cpp:75
-#: src/states_screens/options_screen_video.cpp:393
+#: src/states_screens/options_screen_video.cpp:460
 msgid "None"
 msgstr ""
 
@@ -3271,62 +3389,80 @@ msgstr ""
 msgid "Reload"
 msgstr ""
 
-#: src/states_screens/grand_prix_editor_screen.cpp:164
+#: src/states_screens/grand_prix_cutscene.cpp:75
+#: src/states_screens/grand_prix_editor_screen.cpp:101
+#: src/states_screens/grand_prix_editor_screen.cpp:118
+msgid "Please enter the name of the grand prix"
+msgstr ""
+
+#: src/states_screens/grand_prix_editor_screen.cpp:169
 msgid "Please select a Grand Prix"
 msgstr ""
 
-#: src/states_screens/grand_prix_editor_screen.cpp:326
+#: src/states_screens/grand_prix_editor_screen.cpp:331
 msgid "User defined"
 msgstr ""
 
+#: src/states_screens/grand_prix_editor_screen.cpp:344
+msgid "Name is empty."
+msgstr ""
+
+#: src/states_screens/grand_prix_editor_screen.cpp:352
+msgid "Another grand prix with this name already exists."
+msgstr ""
+
+#: src/states_screens/grand_prix_editor_screen.cpp:358
+msgid "Name is too long."
+msgstr ""
+
 #. I18N: when failing a GP
 #: src/states_screens/grand_prix_lose.cpp:154
 msgid "Better luck next time!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:127
+#: src/states_screens/grand_prix_win.cpp:166
 #: src/states_screens/race_result_gui.cpp:194
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:284
+#: src/states_screens/grand_prix_win.cpp:322
 msgid "You completed the Grand Prix!"
 msgstr ""
 
-#: src/states_screens/kart_selection.cpp:845
-#: src/states_screens/kart_selection.cpp:1468
+#: src/states_screens/kart_selection.cpp:840
+#: src/states_screens/kart_selection.cpp:1482
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/kart_selection.cpp:859
+#: src/states_screens/kart_selection.cpp:854
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/kart_selection.cpp:929
+#: src/states_screens/kart_selection.cpp:944
 msgid ""
 "Everyone:\n"
 "Press the 'Select' button to join the game"
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:493
+#: src/states_screens/main_menu_screen.cpp:510
 msgid ""
 "You can not play online without internet access. If you want to play online, "
 "go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:517
+#: src/states_screens/main_menu_screen.cpp:534
 msgid ""
 "You can not download addons without internet access. If you want to download "
 "addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:549
+#: src/states_screens/main_menu_screen.cpp:566
 msgid "The add-ons module is currently disabled in the Options screen"
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:561
+#: src/states_screens/main_menu_screen.cpp:578
 msgid "Please wait while the add-ons are loading"
 msgstr ""
 
@@ -3389,13 +3525,13 @@ msgstr ""
 
 #. I18N: button to disable a gamepad configuration
 #: src/states_screens/options_screen_device.cpp:96
-#: src/states_screens/options_screen_device.cpp:575
+#: src/states_screens/options_screen_device.cpp:579
 msgid "Disable Device"
 msgstr ""
 
 #. I18N: button to enable a gamepad configuration
 #: src/states_screens/options_screen_device.cpp:98
-#: src/states_screens/options_screen_device.cpp:576
+#: src/states_screens/options_screen_device.cpp:580
 msgid "Enable Device"
 msgstr ""
 
@@ -3497,7 +3633,7 @@ msgstr ""
 msgid "* A red item means a conflict in the current configuration"
 msgstr ""
 
-#: src/states_screens/options_screen_device.cpp:467
+#: src/states_screens/options_screen_device.cpp:471
 msgid ""
 "Warning: The 'Shift' is not a recommended key. When 'Shift' is pressed down, "
 "all keys that contain a character that is different in upper-case will stop "
@@ -3505,33 +3641,33 @@ msgid ""
 msgstr ""
 
 #. I18N: shown before deleting an input configuration
-#: src/states_screens/options_screen_device.cpp:563
+#: src/states_screens/options_screen_device.cpp:567
 msgid "Are you sure you want to permanently delete this configuration?"
 msgstr ""
 
-#: src/states_screens/options_screen_input.cpp:97
+#: src/states_screens/options_screen_input.cpp:100
 #, c-format
 msgid "Keyboard %i"
 msgstr ""
 
-#: src/states_screens/options_screen_ui.cpp:158
+#: src/states_screens/options_screen_ui.cpp:159
 msgid ""
 "In multiplayer mode, players can select handicapped (more difficult) "
 "profiles on the kart selection screen"
 msgstr ""
 
 #. I18N: in the language choice, to select the same language as the OS
-#: src/states_screens/options_screen_ui.cpp:190
+#: src/states_screens/options_screen_ui.cpp:191
 msgid "System Language"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:366
+#: src/states_screens/options_screen_video.cpp:433
 msgid "Custom"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:391
+#: src/states_screens/options_screen_video.cpp:458
 msgid "Me Only"
 msgstr ""
 
@@ -3539,94 +3675,93 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders: %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:399
+#: src/states_screens/options_screen_video.cpp:479
 #, c-format
 msgid "Animated Scenery: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:402
+#: src/states_screens/options_screen_video.cpp:482
 #, c-format
 msgid "Weather Effects: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:405
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Animated Characters: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/options_screen_video.cpp:490
 #, c-format
 msgid "Dynamic lights: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:413
+#: src/states_screens/options_screen_video.cpp:493
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:416
+#: src/states_screens/options_screen_video.cpp:496
 #, c-format
 msgid "Anti-aliasing: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:419
+#: src/states_screens/options_screen_video.cpp:499
 #, c-format
 msgid "Ambient occlusion: %s"
 msgstr ""
 
-#: src/states_screens/options_screen_video.cpp:423
+#: src/states_screens/options_screen_video.cpp:503
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:505
 #, c-format
 msgid "Shadows: %i"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:508
 #, c-format
 msgid "Bloom: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:432
+#: src/states_screens/options_screen_video.cpp:512
 #, c-format
 msgid "Glow (outlines): %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:516
 #, c-format
 msgid "Light shaft (God rays): %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:440
+#: src/states_screens/options_screen_video.cpp:520
 #, c-format
 msgid "Depth of field: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:444
+#: src/states_screens/options_screen_video.cpp:524
 #, c-format
 msgid "Global illumination: %s"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:448
+#: src/states_screens/options_screen_video.cpp:529
 #, c-format
-msgid "Use high definition textures: %s"
+msgid "Rendered image quality: %s"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:306 src/states_screens/race_gui.cpp:308
+#: src/states_screens/race_gui.cpp:350 src/states_screens/race_gui.cpp:352
 msgid "Challenge Failed"
 msgstr ""
 
@@ -3651,42 +3786,42 @@ msgid "GOAL!"
 msgstr ""
 
 #. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
-#: src/states_screens/race_gui_base.cpp:496
+#: src/states_screens/race_gui_base.cpp:520
 msgid "by"
 msgstr ""
 
-#: src/states_screens/race_gui_base.cpp:604
+#: src/states_screens/race_gui_base.cpp:629
 msgid "Collect nitro!"
 msgstr ""
 
-#: src/states_screens/race_gui_base.cpp:606
+#: src/states_screens/race_gui_base.cpp:631
 msgid "Follow the leader!"
 msgstr ""
 
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
-#: src/states_screens/race_gui_base.cpp:772
+#: src/states_screens/race_gui_base.cpp:809
 #, c-format
 msgid "Top %i"
 msgstr ""
 
 #. I18N: Shown at the end of a race
-#: src/states_screens/race_gui_overworld.cpp:108
+#: src/states_screens/race_gui_overworld.cpp:136
 msgid "Lap"
 msgstr ""
 
-#: src/states_screens/race_gui_overworld.cpp:109
+#: src/states_screens/race_gui_overworld.cpp:137
 msgid "Rank"
 msgstr ""
 
-#: src/states_screens/race_gui_overworld.cpp:472
-msgid "Press fire to play the tutorial"
+#: src/states_screens/race_gui_overworld.cpp:510
+msgid "Press fire to start the tutorial"
 msgstr ""
 
-#: src/states_screens/race_gui_overworld.cpp:511
+#: src/states_screens/race_gui_overworld.cpp:549
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/states_screens/race_gui_overworld.cpp:548
+#: src/states_screens/race_gui_overworld.cpp:586
 msgid "Press fire to start the challenge"
 msgstr ""
 
@@ -3718,52 +3853,52 @@ msgstr ""
 msgid "Back to the menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:373
+#: src/states_screens/race_result_gui.cpp:372
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:498
-#: src/states_screens/race_result_gui.cpp:861
+#: src/states_screens/race_result_gui.cpp:499
+#: src/states_screens/race_result_gui.cpp:865
 msgid "Eliminated"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1028
+#: src/states_screens/race_result_gui.cpp:1012
 msgid "Red Team Wins"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1032
+#: src/states_screens/race_result_gui.cpp:1016
 msgid "Blue Team Wins"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1037
+#: src/states_screens/race_result_gui.cpp:1021
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: indicates a player that scored in their own goal in result screen
-#: src/states_screens/race_result_gui.cpp:1106
+#: src/states_screens/race_result_gui.cpp:1098
 #: src/states_screens/race_result_gui.cpp:1154
 msgid "(Own Goal)"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1219
+#: src/states_screens/race_result_gui.cpp:1220
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1303
+#: src/states_screens/race_result_gui.cpp:1304
 msgid "Grand Prix progress:"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1344
+#: src/states_screens/race_result_gui.cpp:1346
 msgid "Highscores"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1430
+#: src/states_screens/race_result_gui.cpp:1432
 #, c-format
 msgid "Difficulty: %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1438
+#: src/states_screens/race_result_gui.cpp:1440
 #, c-format
 msgid "Best lap time: %s"
 msgstr ""
@@ -3835,7 +3970,7 @@ msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
 #: src/states_screens/server_selection.cpp:79
-#: src/states_screens/server_selection.cpp:248
+#: src/states_screens/server_selection.cpp:247
 msgid "Fetching servers"
 msgstr ""
 
@@ -3849,11 +3984,11 @@ msgid "Locked!"
 msgstr ""
 
 #: src/states_screens/tracks_and_gp_screen.cpp:278
-#: src/states_screens/tracks_screen.cpp:228
+#: src/states_screens/tracks_screen.cpp:227
 msgid "Locked: solve active challenges to gain access to more!"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:195
+#: src/states_screens/tracks_screen.cpp:194
 msgid "Only official tracks are supported."
 msgstr ""
 
@@ -3871,12 +4006,12 @@ msgid "Max players supported: %d"
 msgstr ""
 
 #. I18N: In the track info screen
-#: src/states_screens/track_info_screen.cpp:214
+#: src/states_screens/track_info_screen.cpp:213
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: In the track info screen
-#: src/states_screens/track_info_screen.cpp:219
+#: src/states_screens/track_info_screen.cpp:218
 msgid "Random item location"
 msgstr ""
 

From ba55fc7d2ed249713c0810c79e3b8f8f5f5cdca5 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Tue, 29 Aug 2017 10:31:56 +0800
Subject: [PATCH 071/125] Fix previously always true statement

bufferSize (Real*BOSize) was never used and set
---
 src/graphics/vao_manager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/graphics/vao_manager.cpp b/src/graphics/vao_manager.cpp
index 969f55e9d..e553162d0 100644
--- a/src/graphics/vao_manager.cpp
+++ b/src/graphics/vao_manager.cpp
@@ -83,12 +83,12 @@ VAOManager::~VAOManager()
 }
 
 static void
-resizeBufferIfNecessary(size_t &lastIndex, size_t newLastIndex, size_t bufferSize, size_t stride, GLenum type, GLuint &id, void *&Pointer)
+resizeBufferIfNecessary(size_t &lastIndex, size_t newLastIndex, size_t& bufferSize, size_t stride, GLenum type, GLuint &id, void *&Pointer)
 {
-    if (newLastIndex * stride >= bufferSize)
+    if (newLastIndex >= bufferSize)
     {
         while (newLastIndex >= bufferSize)
-            bufferSize = 2 * bufferSize + 1;
+            bufferSize = bufferSize == 0 ? 1 : bufferSize * 2;
         GLuint newVBO;
         glGenBuffers(1, &newVBO);
         glBindBuffer(type, newVBO);

From 65363a2fa001d4359d113eaeb46e5ab02a1e53a1 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Tue, 29 Aug 2017 21:02:12 +0200
Subject: [PATCH 072/125] Move multitouch race gui creation.

It's to avoid duplicated buttons because result gui uses gui_base too.
---
 src/states_screens/race_gui.cpp           | 8 ++++++++
 src/states_screens/race_gui_base.cpp      | 8 --------
 src/states_screens/race_gui_overworld.cpp | 8 ++++++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp
index a052c7a92..3c69d9833 100644
--- a/src/states_screens/race_gui.cpp
+++ b/src/states_screens/race_gui.cpp
@@ -87,6 +87,13 @@ RaceGUI::RaceGUI()
     const float map_size = 100.0f;
     const float top_margin = 3.5f * m_font_height;
     
+    if (UserConfigParams::m_multitouch_enabled && 
+        UserConfigParams::m_multitouch_mode != 0 &&
+        race_manager->getNumLocalPlayers() == 1)
+    {
+        m_multitouch_gui = new RaceGUIMultitouch(this);
+    }
+    
     // Check if we have enough space for minimap when touch steering is enabled
     if (m_multitouch_gui != NULL)
     {
@@ -139,6 +146,7 @@ RaceGUI::RaceGUI()
 //-----------------------------------------------------------------------------
 RaceGUI::~RaceGUI()
 {
+    delete m_multitouch_gui;
 }   // ~Racegui
 
 
diff --git a/src/states_screens/race_gui_base.cpp b/src/states_screens/race_gui_base.cpp
index f89eda495..75b519ad7 100644
--- a/src/states_screens/race_gui_base.cpp
+++ b/src/states_screens/race_gui_base.cpp
@@ -101,13 +101,6 @@ RaceGUIBase::RaceGUIBase()
 
     m_referee               = NULL;
     m_multitouch_gui        = NULL;
-
-    if (UserConfigParams::m_multitouch_enabled && 
-        UserConfigParams::m_multitouch_mode != 0 &&
-        race_manager->getNumLocalPlayers() == 1)
-    {
-        m_multitouch_gui = new RaceGUIMultitouch(this);
-    }
 }   // RaceGUIBase
 
 // ----------------------------------------------------------------------------
@@ -173,7 +166,6 @@ RaceGUIBase::~RaceGUIBase()
     // If the referee is currently being shown,
     // remove it from the scene graph.
     delete m_referee;
-    delete m_multitouch_gui;
 }   // ~RaceGUIBase
 
 //-----------------------------------------------------------------------------
diff --git a/src/states_screens/race_gui_overworld.cpp b/src/states_screens/race_gui_overworld.cpp
index 9a1ce79eb..c2d8b0099 100644
--- a/src/states_screens/race_gui_overworld.cpp
+++ b/src/states_screens/race_gui_overworld.cpp
@@ -86,6 +86,13 @@ RaceGUIOverworld::RaceGUIOverworld()
 
     float scaling = irr_driver->getFrameSize().Height / 420.0f;
     const float map_size = 250.0f;
+    
+    if (UserConfigParams::m_multitouch_enabled && 
+        UserConfigParams::m_multitouch_mode != 0 &&
+        race_manager->getNumLocalPlayers() == 1)
+    {
+        m_multitouch_gui = new RaceGUIMultitouch(this);
+    }
 
     // Check if we have enough space for minimap when touch steering is enabled
     if (m_multitouch_gui != NULL)
@@ -156,6 +163,7 @@ RaceGUIOverworld::RaceGUIOverworld()
 //-----------------------------------------------------------------------------
 RaceGUIOverworld::~RaceGUIOverworld()
 {
+    delete m_multitouch_gui;
 }   // ~RaceGUIOverworld
 
 //-----------------------------------------------------------------------------

From 184ecce836491c3d4e671d81c5d85c67c99187e4 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Tue, 29 Aug 2017 21:44:27 +0200
Subject: [PATCH 073/125] Reset multitouch buttons state when game is restarted

---
 src/input/multitouch_device.cpp            | 31 ++++++++++++++++------
 src/input/multitouch_device.hpp            |  1 +
 src/states_screens/race_gui_base.cpp       |  5 ++++
 src/states_screens/race_gui_multitouch.cpp | 12 +++++++++
 src/states_screens/race_gui_multitouch.hpp |  1 +
 5 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/input/multitouch_device.cpp b/src/input/multitouch_device.cpp
index cbd6f8610..9d1c8e4eb 100644
--- a/src/input/multitouch_device.cpp
+++ b/src/input/multitouch_device.cpp
@@ -43,14 +43,7 @@ MultitouchDevice::MultitouchDevice()
     assert(m_android_device != NULL);
 #endif
 
-    for (MultitouchEvent& event : m_events)
-    {
-        event.id = 0;
-        event.touched = false;
-        event.x = 0;
-        event.y = 0;
-    }
-
+    reset();
     updateConfigParams();
 }   // MultitouchDevice
 
@@ -183,6 +176,28 @@ void MultitouchDevice::clearButtons()
     m_buttons.clear();
 } // clearButtons
 
+// ----------------------------------------------------------------------------
+/** Sets all buttons and events to default state
+ */
+void MultitouchDevice::reset()
+{
+    for (MultitouchButton* button : m_buttons)
+    {
+        button->pressed = false;
+        button->event_id = 0;
+        button->axis_x = 0.0f;
+        button->axis_y = 0.0f;
+    }
+
+    for (MultitouchEvent& event : m_events)
+    {
+        event.id = 0;
+        event.touched = false;
+        event.x = 0;
+        event.y = 0;
+    }
+} // reset
+
 // ----------------------------------------------------------------------------
 /** The function that is executed when touch event occurs. It updates the
  *  buttons state when it's needed.
diff --git a/src/input/multitouch_device.hpp b/src/input/multitouch_device.hpp
index 47c644f22..8dd21d153 100644
--- a/src/input/multitouch_device.hpp
+++ b/src/input/multitouch_device.hpp
@@ -111,6 +111,7 @@ public:
     void addButton(MultitouchButtonType type, int x, int y, int width,
                    int height);
     void clearButtons();
+    void reset();
 
     /** Returns the number of created buttons */
     unsigned int getButtonsCount() {return m_buttons.size();}
diff --git a/src/states_screens/race_gui_base.cpp b/src/states_screens/race_gui_base.cpp
index 75b519ad7..9966b2041 100644
--- a/src/states_screens/race_gui_base.cpp
+++ b/src/states_screens/race_gui_base.cpp
@@ -154,6 +154,11 @@ void RaceGUIBase::reset()
     m_plunger_speed     = core::vector2df(0,0);
     m_plunger_state     = PLUNGER_STATE_INIT;
     clearAllMessages();
+    
+    if (m_multitouch_gui != NULL)
+    {
+        m_multitouch_gui->reset();
+    }
 }   // reset
 
 //-----------------------------------------------------------------------------
diff --git a/src/states_screens/race_gui_multitouch.cpp b/src/states_screens/race_gui_multitouch.cpp
index 0a906eb49..84c49e3b5 100644
--- a/src/states_screens/race_gui_multitouch.cpp
+++ b/src/states_screens/race_gui_multitouch.cpp
@@ -76,6 +76,18 @@ RaceGUIMultitouch::~RaceGUIMultitouch()
 }   // ~RaceGUIMultitouch
 
 
+//-----------------------------------------------------------------------------
+/** Sets the multitouch race gui to its initial state
+ */
+void RaceGUIMultitouch::reset()
+{
+    if (m_device != NULL)
+    {
+        m_device->reset();
+    }
+}   // reset
+
+
 //-----------------------------------------------------------------------------
 /** Clears all previously created buttons in the multitouch device
  */
diff --git a/src/states_screens/race_gui_multitouch.hpp b/src/states_screens/race_gui_multitouch.hpp
index 876551a94..c691ca078 100644
--- a/src/states_screens/race_gui_multitouch.hpp
+++ b/src/states_screens/race_gui_multitouch.hpp
@@ -62,6 +62,7 @@ public:
                                 
     unsigned int getMinimapBottom() {return m_minimap_bottom;}
     void setGuiAction(bool enabled = true) {m_gui_action = enabled;}
+    void reset();
                                  
 };   // RaceGUIMultitouch
 

From e05ef71b7760662628e220ee1b9ef0df38429d8e Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Tue, 29 Aug 2017 21:59:44 +0200
Subject: [PATCH 074/125] Make it clear that NDK >= r15b is atm. not supported

---
 android/README.ANDROID | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/README.ANDROID b/android/README.ANDROID
index bd8793919..689d09928 100644
--- a/android/README.ANDROID
+++ b/android/README.ANDROID
@@ -44,7 +44,8 @@ and extract it to stk-code/lib. It contains sources of libraries that are used
 in STK, but are not availiable in stk-code repository (curl, freetype, openal).
 
 You need also Android SDK for android-19 platform (the API for Android 4.4) and
-Android NDK r12b.
+Android NDK. Note that NDK >= r15b is atm. not supported. Version r12b is
+strongly recommended, because it's known that it works without issues.
 
 You need to create proper "android-sdk" and "android-ndk" symlinks in the
 directory with Android project, so that the compilation script will have access

From f08b53c1fcd5c172ba231126366fa10d62771b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Wed, 30 Aug 2017 01:47:07 +0200
Subject: [PATCH 075/125] Spelling: Chose, add-ons, low, command-line (#2914)

* Spelling: Chose, add-ons, low, command-line, HTTPS

* Back to http for privacy.supertuxkart.net

It auto-negotiates for https from Let's Encrypt when connected to through http, strange.
---
 src/main.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 719da100c..4675bbe93 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1132,7 +1132,7 @@ int handleCmdLine()
     if(CommandLine::has("--track", &s) || CommandLine::has("-t", &s))
     {
         race_manager->setTrack(s);
-        Log::verbose("main", "You choose to start in track '%s'.",
+        Log::verbose("main", "You chose to start in track '%s'.",
                      s.c_str());
 
         Track* t = track_manager->getTrack(s);
@@ -1142,7 +1142,7 @@ int handleCmdLine()
         }
         else if (t->isArena())
         {
-            //if it's arena, don't create ai karts
+            //if it's arena, don't create AI karts
             const std::vector<std::string> l;
             race_manager->setDefaultAIKartList(l);
             // Add 1 for the player kart
@@ -1151,7 +1151,7 @@ int handleCmdLine()
         }
         else if (t->isSoccer())
         {
-            //if it's soccer, don't create ai karts
+            //if it's soccer, don't create AI karts
             const std::vector<std::string> l;
             race_manager->setDefaultAIKartList(l);
             // Add 1 for the player kart
@@ -1218,7 +1218,7 @@ int handleCmdLine()
         }
         else
         {
-            Log::verbose("main", "You choose to have %d laps.", laps);
+            Log::verbose("main", "You chose to have %d laps.", laps);
             race_manager->setNumLaps(laps);
         }
     }   // --laps
@@ -1330,7 +1330,7 @@ int handleCmdLine()
 
         if (request->isSuccess())
         {
-            Log::info("Main", "Logged in from command line.");
+            Log::info("Main", "Logged in from command-line.");
         }
     }
 
@@ -1390,9 +1390,9 @@ void initRest()
     font_manager->loadFonts();
     GUIEngine::init(device, driver, StateManager::get());
 
-    // This only initialises the non-network part of the addons manager. The
-    // online section of the addons manager will be initialised from a
-    // separate thread running in network http.
+    // This only initialises the non-network part of the add-ons manager. The
+    // online section of the add-ons manager will be initialised from a
+    // separate thread running in network HTTP.
     addons_manager          = new AddonsManager();
     Online::ProfileManager::create();
 
@@ -1477,7 +1477,7 @@ void askForInternetPermission()
             // Typically internet is disabled here (just better safe
             // than sorry). If internet should be allowed, the news
             // manager needs to be started (which in turn activates
-            // the addons manager).
+            // the add-ons manager).
             bool need_to_start_news_manager =
                 UserConfigParams::m_internet_status !=
                                   Online::RequestManager::IPERM_ALLOWED;
@@ -1615,8 +1615,8 @@ int main(int argc, char *argv[] )
 
         addons_manager->checkInstalledAddons();
 
-        // Load addons.xml to get info about addons even when not
-        // allowed to access the internet
+        // Load addons.xml to get info about add-ons even when not
+        // allowed to access the Internet
         if (UserConfigParams::m_internet_status !=
             Online::RequestManager::IPERM_ALLOWED)
         {
@@ -1630,7 +1630,7 @@ int main(int argc, char *argv[] )
                 }
                 catch (std::runtime_error& e)
                 {
-                    Log::warn("Addons", "Exception thrown when initializing addons manager : %s", e.what());
+                    Log::warn("Addons", "Exception thrown when initializing add-ons manager : %s", e.what());
                 }
             }
         }
@@ -1652,7 +1652,7 @@ int main(int argc, char *argv[] )
                 {
                     MessageDialog *dialog =
                         new MessageDialog(_("Your screen resolution is too "
-                                            "small to run STK."),
+                                            "low to run STK."),
                                             /*from queue*/ true);
                     GUIEngine::DialogQueue::get()->pushDialog(dialog);
                 }
@@ -1898,7 +1898,7 @@ static void cleanSuperTuxKart()
     // But still give them some additional time to finish. It avoids a
     // race condition where a thread might access the file manager after it
     // was deleted (in cleanUserConfig below), but before STK finishes and
-    // the os takes all threads down.
+    // the OS takes all threads down.
 
     if(!NewsManager::get()->waitForReadyToDeleted(2.0f))
     {
@@ -1918,12 +1918,12 @@ static void cleanSuperTuxKart()
     }
     SFXManager::destroy();
 
-    // Music manager can not be deleted before the sfx thread is stopped
-    // (since sfx commands can contain music information, which are
+    // Music manager can not be deleted before the SFX thread is stopped
+    // (since SFX commands can contain music information, which are
     // deleted by the music manager).
     delete music_manager;
 
-    // The addons manager might still be called from a currenty running request
+    // The add-ons manager might still be called from a currenty running request
     // in the request manager, so it can not be deleted earlier.
     if(addons_manager)  delete addons_manager;
 

From 6e30154fc31d8745696694796d5384ec3c7e693f Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Tue, 29 Aug 2017 19:48:32 -0400
Subject: [PATCH 076/125] Update strings

---
 data/po/supertuxkart.pot | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index 0444ecccb..cb8f96d6c 100644
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: supertuxkart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-28 19:28-0400\n"
+"POT-Creation-Date: 2017-08-29 19:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -868,7 +868,7 @@ msgstr ""
 
 #. I18N: ./data/gui/main_menu.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:503
+#: src/states_screens/race_gui_overworld.cpp:511
 msgid "Tutorial"
 msgstr ""
 
@@ -2749,7 +2749,7 @@ msgid ""
 msgstr ""
 
 #: src/main.cpp:1654
-msgid "Your screen resolution is too small to run STK."
+msgid "Your screen resolution is too low to run STK."
 msgstr ""
 
 #: src/main.cpp:1668
@@ -3761,7 +3761,7 @@ msgstr ""
 msgid "Rendered image quality: %s"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:350 src/states_screens/race_gui.cpp:352
+#: src/states_screens/race_gui.cpp:358 src/states_screens/race_gui.cpp:360
 msgid "Challenge Failed"
 msgstr ""
 
@@ -3786,42 +3786,42 @@ msgid "GOAL!"
 msgstr ""
 
 #. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
-#: src/states_screens/race_gui_base.cpp:520
+#: src/states_screens/race_gui_base.cpp:517
 msgid "by"
 msgstr ""
 
-#: src/states_screens/race_gui_base.cpp:629
+#: src/states_screens/race_gui_base.cpp:626
 msgid "Collect nitro!"
 msgstr ""
 
-#: src/states_screens/race_gui_base.cpp:631
+#: src/states_screens/race_gui_base.cpp:628
 msgid "Follow the leader!"
 msgstr ""
 
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
-#: src/states_screens/race_gui_base.cpp:809
+#: src/states_screens/race_gui_base.cpp:806
 #, c-format
 msgid "Top %i"
 msgstr ""
 
 #. I18N: Shown at the end of a race
-#: src/states_screens/race_gui_overworld.cpp:136
+#: src/states_screens/race_gui_overworld.cpp:143
 msgid "Lap"
 msgstr ""
 
-#: src/states_screens/race_gui_overworld.cpp:137
+#: src/states_screens/race_gui_overworld.cpp:144
 msgid "Rank"
 msgstr ""
 
-#: src/states_screens/race_gui_overworld.cpp:510
+#: src/states_screens/race_gui_overworld.cpp:518
 msgid "Press fire to start the tutorial"
 msgstr ""
 
-#: src/states_screens/race_gui_overworld.cpp:549
+#: src/states_screens/race_gui_overworld.cpp:557
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/states_screens/race_gui_overworld.cpp:586
+#: src/states_screens/race_gui_overworld.cpp:594
 msgid "Press fire to start the challenge"
 msgstr ""
 

From 2de3a39e048d2317887b828b4586a1fe78c6577c Mon Sep 17 00:00:00 2001
From: deve <deveee@gmail.com>
Date: Wed, 30 Aug 2017 06:46:55 +0200
Subject: [PATCH 077/125] Make device name translatable

---
 src/states_screens/options_screen_input.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/states_screens/options_screen_input.cpp b/src/states_screens/options_screen_input.cpp
index e8728fdd7..92ea2599c 100644
--- a/src/states_screens/options_screen_input.cpp
+++ b/src/states_screens/options_screen_input.cpp
@@ -134,7 +134,8 @@ void OptionsScreenInput::buildDeviceList()
                                                         
     if (touch_device != NULL)
     {
-        devices->addItem("touch_device", "   Touch device", 1);
+        devices->addItem("touch_device", (core::stringw("   ") + 
+                                                _("Touch Device")).c_str(), 1);
     }
 }   // buildDeviceList
 

From 8c73b67309c71857fa40181c92a7b6f605e71207 Mon Sep 17 00:00:00 2001
From: deve <deveee@gmail.com>
Date: Wed, 30 Aug 2017 06:50:51 +0200
Subject: [PATCH 078/125] Update supertuxkart.pot

---
 data/po/supertuxkart.pot | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index cb8f96d6c..eeaf75bb7 100644
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the supertuxkart package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: supertuxkart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-29 19:48-0400\n"
+"POT-Creation-Date: 2017-08-30 06:48+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1403,7 +1403,7 @@ msgstr ""
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
 #: src/states_screens/options_screen_device.cpp:86
-#: src/states_screens/options_screen_input.cpp:150
+#: src/states_screens/options_screen_input.cpp:151
 #: src/states_screens/options_screen_ui.cpp:123
 #: src/states_screens/options_screen_video.cpp:238
 #: src/states_screens/user_screen.cpp:660
@@ -1479,7 +1479,7 @@ msgstr ""
 #: src/states_screens/ghost_replay_selection.cpp:78
 #: src/states_screens/options_screen_audio.cpp:67
 #: src/states_screens/options_screen_device.cpp:88
-#: src/states_screens/options_screen_input.cpp:152
+#: src/states_screens/options_screen_input.cpp:153
 #: src/states_screens/options_screen_ui.cpp:124
 #: src/states_screens/options_screen_video.cpp:240
 #: src/states_screens/server_selection.cpp:103
@@ -1504,7 +1504,7 @@ msgstr ""
 #. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
 #: src/states_screens/options_screen_device.cpp:87
-#: src/states_screens/options_screen_input.cpp:151
+#: src/states_screens/options_screen_input.cpp:152
 #: src/states_screens/options_screen_video.cpp:239
 #: src/states_screens/user_screen.cpp:661
 msgid "User Interface"
@@ -1544,7 +1544,7 @@ msgstr ""
 #. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:65
 #: src/states_screens/options_screen_device.cpp:85
-#: src/states_screens/options_screen_input.cpp:149
+#: src/states_screens/options_screen_input.cpp:150
 #: src/states_screens/options_screen_ui.cpp:122
 #: src/states_screens/user_screen.cpp:659
 msgid "Graphics"
@@ -3197,7 +3197,13 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #: src/states_screens/dialogs/registration_dialog.cpp:42
-msgid "Please read the terms and conditions "
+#, c-format
+msgid ""
+"Please read the terms and conditions for SuperTuxKart at '%s'. You must "
+"agree to these terms in order to register an account for STK. By checking "
+"the box below, you are confirming that you understand these terms. If you "
+"have any questions or comments regarding these terms, one of the members of "
+"the development team would gladly assist you."
 msgstr ""
 
 #: src/states_screens/dialogs/select_challenge.cpp:52
@@ -3650,6 +3656,10 @@ msgstr ""
 msgid "Keyboard %i"
 msgstr ""
 
+#: src/states_screens/options_screen_input.cpp:138
+msgid "Touch Device"
+msgstr ""
+
 #: src/states_screens/options_screen_ui.cpp:159
 msgid ""
 "In multiplayer mode, players can select handicapped (more difficult) "

From 4440c7e40a5c3b65e91d23ca398b464500b8b160 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 30 Aug 2017 17:46:07 +1000
Subject: [PATCH 079/125] Added error check for alDeleteSource.

---
 src/audio/sfx_openal.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/audio/sfx_openal.cpp b/src/audio/sfx_openal.cpp
index 174c60db3..652fd56c6 100644
--- a/src/audio/sfx_openal.cpp
+++ b/src/audio/sfx_openal.cpp
@@ -70,6 +70,7 @@ SFXOpenAL::~SFXOpenAL()
     if (m_status!=SFX_UNKNOWN && m_status!=SFX_NOT_INITIALISED)
     {
         alDeleteSources(1, &m_sound_source);
+        SFXManager::checkError("deleting a source");
     }
 
     if (m_owns_buffer && m_sound_buffer)

From 0dd3bbbd9bfeb4b1b3e9d08eb2546267017b620e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 30 Aug 2017 17:54:45 +1000
Subject: [PATCH 080/125] Changed severity level so that additional information
 in case of a crash is certain to be seen.

---
 src/karts/kart_model.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index f3e2313f8..77296b1ff 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -904,7 +904,7 @@ void KartModel::OnAnimationEnd(scene::IAnimatedMeshSceneNode *node)
     if(m_current_animation==AF_DEFAULT ||
         m_animation_frame[m_current_animation]<=-1)
     {
-        Log::debug("Kart_Model", "OnAnimationEnd for '%s': current %d frame %d",
+        Log::error("Kart_Model", "OnAnimationEnd for '%s': current %d frame %d",
                m_model_filename.c_str(),
                m_current_animation, m_animation_frame[m_current_animation]);
         assert(false);

From 69e26d7561df4b8cd399c46a3ba634f76b5f32b4 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 30 Aug 2017 21:21:43 +0200
Subject: [PATCH 081/125] Remove unclear warning.

Weather node without particles is fine and it's used in Blackhill Mansion (just for lightning). The warning was suggesting that something is wrong there.
---
 src/tracks/track.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 1a32ac064..b6b9fad50 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -2030,11 +2030,6 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
                 m_sky_particles =
                     ParticleKindManager::get()->getParticles(weather_particles);
             }
-            else
-            {
-                Log::error("track", "Bad weather node found - ignored.\n");
-                continue;
-            }
         }
         else if (name == "sun")
         {

From 64c1e8d19c018a455c3b057158383a45c46b6380 Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Wed, 30 Aug 2017 20:39:20 -0400
Subject: [PATCH 082/125] Fix SFX leaks

---
 src/items/powerup.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/items/powerup.cpp b/src/items/powerup.cpp
index ca669e551..c1572f7fc 100644
--- a/src/items/powerup.cpp
+++ b/src/items/powerup.cpp
@@ -325,6 +325,11 @@ void Powerup::use()
                 }
             }
 
+            if (m_sound_use != NULL)
+            {
+                m_sound_use->deleteSFX();
+                m_sound_use = NULL;
+            }
             m_sound_use = SFXManager::get()->createSoundSource("inflate");//Extraordinary. Usually sounds are set in Powerup::set()
             //In this case this is a workaround, since the bubblegum item has two different sounds.
 

From 4759ff24906327ba78df1a27b73c78f53c19c683 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 31 Aug 2017 23:47:39 +1000
Subject: [PATCH 083/125] Cancel the setAnimationEndCallback when a
 non-existing animation is tried to be set. Fixes #2628.

---
 src/karts/kart_model.cpp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index 77296b1ff..c2281e5e4 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -881,6 +881,7 @@ void KartModel::setAnimation(AnimationFrameType type, bool play_non_loop)
     {
         // Special animation not found, revert to default
         m_current_animation = AF_DEFAULT;
+        m_animated_node->setAnimationEndCallback(NULL);
     }
 }   // setAnimation
 
@@ -899,17 +900,6 @@ void KartModel::OnAnimationEnd(scene::IAnimatedMeshSceneNode *node)
     // kart_model
     assert(node==m_animated_node);
 
-    // It should be a non-default type of animation, and should have
-    // a non negative frame (i.e. the animation is indeed defined).
-    if(m_current_animation==AF_DEFAULT ||
-        m_animation_frame[m_current_animation]<=-1)
-    {
-        Log::error("Kart_Model", "OnAnimationEnd for '%s': current %d frame %d",
-               m_model_filename.c_str(),
-               m_current_animation, m_animation_frame[m_current_animation]);
-        assert(false);
-    }
-
     // 'type' is the start frame of the animation, type + 1 the frame
     // to begin the loop with, type + 2 to end the frame with
     AnimationFrameType start = (AnimationFrameType)(m_current_animation+1);

From f07a7062b3fa77d2ea092f0ee19a8b2c4dea6ce8 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Fri, 1 Sep 2017 14:12:10 +0800
Subject: [PATCH 084/125] Add min / max height testing for all graphs

---
 src/tracks/arena_graph.cpp | 12 ++++++++++++
 src/tracks/drive_graph.cpp | 15 ++++++++++++++-
 src/tracks/graph.cpp       |  2 ++
 src/tracks/graph.hpp       |  3 +++
 src/tracks/quad.cpp        |  7 +++++--
 src/tracks/quad.hpp        | 10 ++++++++--
 6 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/tracks/arena_graph.cpp b/src/tracks/arena_graph.cpp
index d888e4c47..6fa3e6ac1 100644
--- a/src/tracks/arena_graph.cpp
+++ b/src/tracks/arena_graph.cpp
@@ -158,6 +158,18 @@ void ArenaGraph::loadNavmesh(const std::string &navmesh)
             }
         }
     }
+    const XMLNode* ht = xml->getNode("height-testing");
+    if (ht)
+    {
+        float min = Graph::MIN_HEIGHT_TESTING;
+        float max = Graph::MAX_HEIGHT_TESTING;
+        ht->get("min", &min);
+        ht->get("max", &max);
+        for (unsigned i = 0; i < m_all_nodes.size(); i++)
+        {
+            m_all_nodes[i]->setHeightTesting(min, max);
+        }
+    }
     delete xml;
 
 }   // loadNavmesh
diff --git a/src/tracks/drive_graph.cpp b/src/tracks/drive_graph.cpp
index e73b730fb..8155b2ab0 100644
--- a/src/tracks/drive_graph.cpp
+++ b/src/tracks/drive_graph.cpp
@@ -97,16 +97,24 @@ void DriveGraph::load(const std::string &quad_file_name,
         return;
     }
 
+    float min_height_testing = Graph::MIN_HEIGHT_TESTING;
+    float max_height_testing = Graph::MAX_HEIGHT_TESTING;
     // Each quad is part of the graph exactly once now.
     for (unsigned int i = 0; i < quad->getNumNodes(); i++)
     {
         const XMLNode *xml_node = quad->getNode(i);
-        if (xml_node->getName() != "quad")
+        if (!(xml_node->getName() == "quad" || xml_node->getName() == "height-testing"))
         {
             Log::warn("DriveGraph: Unsupported node type '%s' found in '%s' - ignored.",
                 xml_node->getName().c_str(), filename.c_str());
             continue;
         }
+        if (xml_node->getName() == "height-testing")
+        {
+            xml_node->get("min", &min_height_testing);
+            xml_node->get("max", &max_height_testing);
+            continue;
+        }
 
         // Note that it's not easy to do the reading of the parameters here
         // in quad, since the specification in the xml can contain references
@@ -141,6 +149,11 @@ void DriveGraph::load(const std::string &quad_file_name,
         createQuad(p0, p1, p2, p3, m_all_nodes.size(), invisible, ai_ignore,
                    false/*is_arena*/, ignored);
     }
+    for (unsigned i = 0; i < m_all_nodes.size(); i++)
+    {
+        m_all_nodes[i]->setHeightTesting(min_height_testing,
+            max_height_testing);
+    }
     delete quad;
 
     const XMLNode *xml = file_manager->createXMLTree(filename);
diff --git a/src/tracks/graph.cpp b/src/tracks/graph.cpp
index 117da8e72..704e78c0b 100644
--- a/src/tracks/graph.cpp
+++ b/src/tracks/graph.cpp
@@ -31,6 +31,8 @@
 #include "utils/log.hpp"
 
 const int Graph::UNKNOWN_SECTOR = -1;
+const float Graph::MIN_HEIGHT_TESTING = -1.0f;
+const float Graph::MAX_HEIGHT_TESTING = 5.0f;
 Graph *Graph::m_graph = NULL;
 // -----------------------------------------------------------------------------
 Graph::Graph()
diff --git a/src/tracks/graph.hpp b/src/tracks/graph.hpp
index 31ab048fb..54de20be0 100644
--- a/src/tracks/graph.hpp
+++ b/src/tracks/graph.hpp
@@ -103,6 +103,9 @@ private:
 
 public:
     static const int UNKNOWN_SECTOR;
+    // For 2d Quad
+    static const float MIN_HEIGHT_TESTING;
+    static const float MAX_HEIGHT_TESTING;
     // ------------------------------------------------------------------------
     /** Returns the one instance of this object. It is possible that there
      *  is no instance created (e.g. arena without navmesh) so we don't assert
diff --git a/src/tracks/quad.cpp b/src/tracks/quad.cpp
index 48b66035f..a8c4c9f30 100644
--- a/src/tracks/quad.cpp
+++ b/src/tracks/quad.cpp
@@ -17,6 +17,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "tracks/quad.hpp"
+#include "tracks/graph.hpp"
 #include "utils/log.hpp"
 
 #include <algorithm>
@@ -36,6 +37,8 @@ Quad::Quad(const Vec3 &p0, const Vec3 &p1, const Vec3 &p2, const Vec3 &p3,
                               std::min(p2.getY(), p3.getY())  );
     m_max_height = std::max ( std::max(p0.getY(), p1.getY()),
                               std::max(p2.getY(), p3.getY())  );
+    m_min_height_testing = Graph::MIN_HEIGHT_TESTING;
+    m_max_height_testing = Graph::MAX_HEIGHT_TESTING;
 }   // Quad
 
 // ----------------------------------------------------------------------------
@@ -77,8 +80,8 @@ bool Quad::pointInside(const Vec3& p, bool ignore_vertical) const
     // with the minimum height of the quad (and not with the actual
     // height of the quad at the point where the kart is).
     if(!ignore_vertical                &&
-       (p.getY() - m_max_height > 5.0f ||
-       p.getY() - m_min_height < -1.0f   ))
+       (p.getY() - m_max_height > m_max_height_testing ||
+       p.getY() - m_min_height < m_min_height_testing   ))
        return false;
 
     // If a point is exactly on the line of two quads (e.g. between points
diff --git a/src/tracks/quad.hpp b/src/tracks/quad.hpp
index 2f046d3b3..396f618cf 100644
--- a/src/tracks/quad.hpp
+++ b/src/tracks/quad.hpp
@@ -58,11 +58,11 @@ private:
 
     /** The minimum height of the quad, used in case that several quads
      *  are on top of each other when determining the sector a kart is on. */
-    float m_min_height;
+    float m_min_height, m_min_height_testing;
 
     /** The maximum height of the quad, used together with m_min_height
      *  to distinguish between quads which are on top of each other. */
-    float m_max_height;
+    float m_max_height, m_max_height_testing;
 
 public:
     LEAK_CHECK()
@@ -81,6 +81,12 @@ public:
     /** Returns the center of a quad. */
     const Vec3& getCenter ()      const                    { return m_center; }
     // ------------------------------------------------------------------------
+    void setHeightTesting(float min, float max)
+    {
+        m_min_height_testing = min;
+        m_max_height_testing = max;
+    }
+    // ------------------------------------------------------------------------
     /** Returns the minimum height of a quad. */
     float getMinHeight() const                         { return m_min_height; }
     // ------------------------------------------------------------------------

From 6f11a1669f96c3082b0adf673a1f5c735ba23923 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sat, 2 Sep 2017 01:01:35 +0200
Subject: [PATCH 085/125] Make particles in GLES renderer to look a bit better.

Now kart exhaust is not too dark anymore.
---
 data/shaders/flipparticle.vert | 4 ++--
 data/shaders/particle.frag     | 5 ++---
 data/shaders/particle.vert     | 7 +++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/data/shaders/flipparticle.vert b/data/shaders/flipparticle.vert
index 4c81d8082..dc2e8f5dd 100644
--- a/data/shaders/flipparticle.vert
+++ b/data/shaders/flipparticle.vert
@@ -22,7 +22,7 @@ float anglespeed;
 
 out float lf;
 out vec2 tc;
-out vec3 pc;
+out vec4 pc;
 
 void main(void)
 {
@@ -68,5 +68,5 @@ void main(void)
 
 	vec4 viewpos = ViewMatrix * vec4(newposition + newquadcorner, 1.0);
 	gl_Position = ProjectionMatrix * viewpos;
-	pc = vec3(1.);
+	pc = vec4(1.);
 }
diff --git a/data/shaders/particle.frag b/data/shaders/particle.frag
index 3a2dd232a..25eec19e2 100644
--- a/data/shaders/particle.frag
+++ b/data/shaders/particle.frag
@@ -4,7 +4,7 @@ uniform mat4 invproj;
 
 in float lf;
 in vec2 tc;
-in vec3 pc;
+in vec4 pc;
 out vec4 FragColor;
 
 #stk_include "utils/getPosFromUVDepth.frag"
@@ -17,6 +17,5 @@ void main(void)
     float EnvZ = texture(dtex, xy).x;
     vec4 EnvPos = getPosFromUVDepth(vec3(xy, EnvZ), InverseProjectionMatrix);
     float alpha = clamp((EnvPos.z - FragmentPos.z) * 0.3, 0., 1.);
-    vec4 color = texture(tex, tc) * vec4(pc, 1.0);
-    FragColor = color * alpha * smoothstep(1., 0.8, lf);
+    FragColor = texture(tex, tc) * pc * alpha;
 }
diff --git a/data/shaders/particle.vert b/data/shaders/particle.vert
index d9a7d8659..600e247a2 100644
--- a/data/shaders/particle.vert
+++ b/data/shaders/particle.vert
@@ -19,13 +19,16 @@ in vec2 quadcorner;
 
 out float lf;
 out vec2 tc;
-out vec3 pc;
+out vec4 pc;
 
 void main(void)
 {
     tc = Texcoord;
     lf = lifetime;
-    pc = color_from + (color_to - color_from) * lifetime;
+    pc = vec4(vec3(color_from + (color_to - color_from) * lf), 1.0) * smoothstep(1., 0.8, lf);
+#if defined(GL_ES) && !defined(Advanced_Lighting_Enabled)
+    pc.rgb = pow(pc.rgb, vec3(1. / 2.2));
+#endif
     vec3 newposition = Position;
 
     vec4 viewpos = ViewMatrix * vec4(newposition, 1.0);

From 6710fc2a5c1c68f58d4f2ec311bf5561b243d828 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sat, 2 Sep 2017 23:47:25 +0200
Subject: [PATCH 086/125] Don't add absolute path if screenshot name is empty

---
 src/tracks/track.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index b6b9fad50..1b2b5f51d 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -573,7 +573,10 @@ void Track::loadTrackInfo()
     if(xml_node) loadCurves(*xml_node);
 
     // Set the correct paths
-    m_screenshot = m_root+m_screenshot;
+    if (m_screenshot.length() > 0)
+    {
+        m_screenshot = m_root+m_screenshot;
+    }
     delete root;
 
     std::string dir = StringUtils::getPath(m_filename);

From 1123ceeceb5df639ea248c2e364c17e08f538ea3 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sun, 3 Sep 2017 00:04:29 +0200
Subject: [PATCH 087/125] Don't try to create textures for empty names.

It's not designed to work with empty file names, because the "existFile" function in irrlicht returns true for directories, our file manager doesn't check that it's a directory and generally strange things happen.

This solves a problem with luna track that doesn't have a screenshot and possibly with some broken add-ons, so that valgrind doesn't complain anymore.

Benau, feel free to revert it if you have better solution.
---
 src/graphics/stk_tex_manager.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/graphics/stk_tex_manager.cpp b/src/graphics/stk_tex_manager.cpp
index 4ea5ccd94..e1b7ede45 100644
--- a/src/graphics/stk_tex_manager.cpp
+++ b/src/graphics/stk_tex_manager.cpp
@@ -147,6 +147,12 @@ video::ITexture* STKTexManager::getTexture(const std::string& path,
                                            TexConfig* tc, bool no_upload,
                                            bool create_if_unfound)
 {
+    if (path.empty())
+    {
+        Log::error("STKTexManager", "Texture name is empty.");
+        return NULL;
+    }
+
     auto ret = m_all_textures.find(path);
     if (!no_upload && ret != m_all_textures.end())
         return ret->second;

From 590ec78640b29dd5cbf59737c842af43a9652684 Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Sat, 2 Sep 2017 21:54:02 -0400
Subject: [PATCH 088/125] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63bc7e02b..64b9c875a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * New smoother camera by Auria
 * New grand prix win scene
 * Gamepad configuration bugfixes
+* 3 Strikes Battles : added spare tire karts
 * Various improvements (wall driving fixes, parachutes, GP points, cannon fixes, colorization shader)
 
 ## SuperTuxKart 0.9.2

From 663c7aacaf62586785c14602888c67ac95adfb09 Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Sat, 2 Sep 2017 22:00:37 -0400
Subject: [PATCH 089/125] Tweak kart audio code to use fewer OpenAL sources
 (see #2921). Seems to work well, though I need to take a closer look to make
 it thread-safe

---
 src/audio/sfx_base.hpp    |  1 +
 src/audio/sfx_manager.cpp | 16 +++++++
 src/audio/sfx_manager.hpp |  3 ++
 src/audio/sfx_openal.cpp  | 29 +++++++++++++
 src/audio/sfx_openal.hpp  |  4 ++
 src/karts/kart.cpp        | 90 ++++++++++++++++++++++-----------------
 src/karts/kart.hpp        | 17 +++++---
 7 files changed, 114 insertions(+), 46 deletions(-)

diff --git a/src/audio/sfx_base.hpp b/src/audio/sfx_base.hpp
index f01479346..e0fff346d 100644
--- a/src/audio/sfx_base.hpp
+++ b/src/audio/sfx_base.hpp
@@ -83,6 +83,7 @@ public:
     virtual void       onSoundEnabledBack()                 = 0;
     virtual void       setRolloff(float rolloff)            = 0;
     virtual const SFXBuffer* getBuffer() const              = 0;
+    virtual void setBuffer(SFXBuffer* buffer, bool owns_buffer) = 0;
     virtual SFXStatus  getStatus()                          = 0;
 
 };   // SFXBase
diff --git a/src/audio/sfx_manager.cpp b/src/audio/sfx_manager.cpp
index 4761e2c47..12b24ba5d 100644
--- a/src/audio/sfx_manager.cpp
+++ b/src/audio/sfx_manager.cpp
@@ -675,6 +675,22 @@ SFXBase* SFXManager::createSoundSource(const std::string &name,
     return createSoundSource( i->second, add_to_SFXList );
 }  // createSoundSource
 
+//----------------------------------------------------------------------------
+
+SFXBuffer* SFXManager::getBuffer(const std::string &name)
+{
+    std::map<std::string, SFXBuffer*>::iterator i = m_all_sfx_types.find(name);
+    if (i == m_all_sfx_types.end())
+    {
+        Log::error("SFXManager",
+            "SFXManager::getBuffer could not find the "
+            "requested sound effect : '%s'.", name.c_str());
+        return NULL;
+    }
+
+    return i->second;
+}
+
 //----------------------------------------------------------------------------
 /** Returns true if a sfx with the given name exists.
  *  \param name The internal name of the sfx (not the name of the ogg file)
diff --git a/src/audio/sfx_manager.hpp b/src/audio/sfx_manager.hpp
index d9bfbf515..8e0c701cc 100644
--- a/src/audio/sfx_manager.hpp
+++ b/src/audio/sfx_manager.hpp
@@ -296,6 +296,9 @@ public:
     /** Returns the current position of the listener. */
     Vec3 getListenerPos() const { return m_listener_position.getData(); }
 
+    // ------------------------------------------------------------------------
+
+    SFXBuffer* getBuffer(const std::string &name);
 };
 
 #endif // HEADER_SFX_MANAGER_HPP
diff --git a/src/audio/sfx_openal.cpp b/src/audio/sfx_openal.cpp
index 652fd56c6..61456e5a3 100644
--- a/src/audio/sfx_openal.cpp
+++ b/src/audio/sfx_openal.cpp
@@ -52,6 +52,7 @@ SFXOpenAL::SFXOpenAL(SFXBuffer* buffer, bool positional, float volume,
     m_master_gain  = 1.0f;
     m_owns_buffer  = owns_buffer;
     m_play_time    = 0.0f;
+    m_sound_buffer_changed = false;
 
     // Don't initialise anything else if the sfx manager was not correctly
     // initialised. First of all the initialisation will not work, and it
@@ -377,6 +378,18 @@ void SFXOpenAL::reallyPlayNow()
         if (m_status==SFX_UNKNOWN) return;
     }
 
+    if (m_sound_buffer_changed)
+    {
+        if (m_status == SFX_PLAYING || m_status == SFX_PAUSED)
+            reallyStopNow();
+
+        alSourcei(m_sound_source, AL_BUFFER, m_sound_buffer->getBufferID());
+        m_sound_buffer_changed = false;
+
+        if (!SFXManager::checkError("attaching the buffer to the source"))
+            return;
+    }
+
     alSourcePlay(m_sound_source);
     SFXManager::checkError("playing");
     // Esp. with terrain sounds it can (very likely) happen that the status
@@ -528,4 +541,20 @@ void SFXOpenAL::setRolloff(float rolloff)
     alSourcef (m_sound_source, AL_ROLLOFF_FACTOR,  rolloff);
 }
 
+//-----------------------------------------------------------------------------
+
+// TODO: make this thread-safe
+void SFXOpenAL::setBuffer(SFXBuffer* buffer, bool owns_buffer)
+{
+    if (m_owns_buffer && m_sound_buffer)
+    {
+        m_sound_buffer->unload();
+        delete m_sound_buffer;
+    }
+
+    m_sound_buffer = buffer;
+    m_owns_buffer = owns_buffer;
+    m_sound_buffer_changed = true;
+}
+
 #endif //if HAVE_OGGVORBIS
diff --git a/src/audio/sfx_openal.hpp b/src/audio/sfx_openal.hpp
index 10b1c0717..cd2d095b4 100644
--- a/src/audio/sfx_openal.hpp
+++ b/src/audio/sfx_openal.hpp
@@ -75,6 +75,8 @@ private:
     /** How long the sfx has been playing. */
     float m_play_time;
 
+    bool m_sound_buffer_changed;
+
 public:
               SFXOpenAL(SFXBuffer* buffer, bool positional, float volume,
                         bool owns_buffer = false);
@@ -117,6 +119,8 @@ public:
     // ------------------------------------------------------------------------
     /** Returns the buffer associated with this sfx. */
     virtual const SFXBuffer* getBuffer() const { return m_sound_buffer; }
+    // ------------------------------------------------------------------------
+    virtual void setBuffer(SFXBuffer* buffer, bool owns_buffer);
 
 };   // SFXOpenAL
 
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 6379915c9..28a1c0855 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -171,12 +171,9 @@ Kart::Kart (const std::string& ident, unsigned int world_kart_id,
     }*/
 
     m_engine_sound  = SFXManager::get()->createSoundSource(m_kart_properties->getEngineSfxType());
-    m_beep_sound    = SFXManager::get()->createSoundSource( "horn"  );
-    m_crash_sound   = SFXManager::get()->createSoundSource( "crash" );
-    m_crash_sound2  = SFXManager::get()->createSoundSource( "crash2");
-    m_crash_sound3  = SFXManager::get()->createSoundSource( "crash3");
-    m_boing_sound   = SFXManager::get()->createSoundSource( "boing" );
-    m_goo_sound     = SFXManager::get()->createSoundSource( "goo"   );
+    m_emitter_1 = SFXManager::get()->createSoundSource("crash");
+    m_emitter_2 = SFXManager::get()->createSoundSource("crash");
+    m_emitter_3 = SFXManager::get()->createSoundSource("crash");
     m_skid_sound    = SFXManager::get()->createSoundSource( "skid"  );
     m_nitro_sound   = SFXManager::get()->createSoundSource( "nitro" );
     m_terrain_sound          = NULL;
@@ -201,13 +198,10 @@ void Kart::init(RaceManager::KartType type)
         if (type == RaceManager::KT_PLAYER)
             factor = std::min(1.0f, race_manager->getNumLocalPlayers()/2.0f);
 
-        m_goo_sound->setVolume(factor);
+        m_emitter_1->setVolume(factor);
+        m_emitter_2->setVolume(factor);
+        m_emitter_3->setVolume(factor);
         m_skid_sound->setVolume(factor);
-        m_crash_sound->setVolume(factor);
-        m_crash_sound2->setVolume(factor);
-        m_crash_sound3->setVolume(factor);
-        m_boing_sound->setVolume(factor);
-        m_beep_sound->setVolume(factor);
         m_nitro_sound->setVolume(factor);
     }   // if getNumLocalPlayers > 1
 
@@ -257,13 +251,10 @@ Kart::~Kart()
     }*/
 
     m_engine_sound->deleteSFX();
-    m_crash_sound ->deleteSFX();
-    m_crash_sound2->deleteSFX();
-    m_crash_sound3->deleteSFX();
     m_skid_sound  ->deleteSFX();
-    m_goo_sound   ->deleteSFX();
-    m_beep_sound  ->deleteSFX();
-    m_boing_sound ->deleteSFX();
+    m_emitter_1->deleteSFX();
+    m_emitter_2->deleteSFX();
+    m_emitter_3->deleteSFX();
     m_nitro_sound ->deleteSFX();
     delete m_kart_gfx;
     if(m_terrain_sound)          m_terrain_sound->deleteSFX();
@@ -1029,8 +1020,11 @@ void Kart::collectedItem(Item *item, int add_info)
                                  m_kart_properties->getBubblegumSpeedFraction() ,
                                  m_kart_properties->getBubblegumFadeInTime(),
                                  m_bubblegum_time);
-        m_goo_sound->setPosition(getXYZ());
-        m_goo_sound->play();
+        {
+            SFXBase* emitter = getNextEmitter();
+            emitter->setBuffer(SFXManager::get()->getBuffer("goo"), false);
+            emitter->play(getXYZ());
+        }
         // Play appropriate custom character sound
         playCustomSFX(SFXManager::CUSTOM_GOO);
         break;
@@ -1361,12 +1355,10 @@ void Kart::update(float dt)
     }
      */
 
-    m_beep_sound->setPosition   ( getXYZ() );
-    m_crash_sound->setPosition  ( getXYZ() );
-    m_crash_sound2->setPosition ( getXYZ() );
-    m_crash_sound3->setPosition ( getXYZ() );
+    m_emitter_1->setPosition(getXYZ());
+    m_emitter_2->setPosition(getXYZ());
+    m_emitter_3->setPosition(getXYZ());
     m_skid_sound->setPosition   ( getXYZ() );
-    m_boing_sound->setPosition  ( getXYZ() );
     m_nitro_sound->setPosition  ( getXYZ() );
 
     // Check if a kart is (nearly) upside down and not moving much -->
@@ -2166,23 +2158,22 @@ void Kart::playCrashSFX(const Material* m, AbstractKart *k)
             // it's not already playing.
             if (isShielded() || (k != NULL && k->isShielded()))
             {
-                if (m_boing_sound->getStatus() != SFXBase::SFX_PLAYING)
-                    m_boing_sound->play(getXYZ());
+                SFXBase* emitter = getNextEmitter();
+                emitter->setBuffer(SFXManager::get()->getBuffer("boing"), false);
+                emitter->play(getXYZ());
             }
             else
             {
-                if (m_crash_sound->getStatus() != SFXBase::SFX_PLAYING
-                    && m_crash_sound2->getStatus() != SFXBase::SFX_PLAYING
-                    && m_crash_sound3->getStatus() != SFXBase::SFX_PLAYING)
-                {
-                    int idx = rand() % 3;
-                    if (idx == 0)
-                        m_crash_sound->play(getXYZ());
-                    else if (idx == 1)
-                        m_crash_sound2->play(getXYZ());
-                    else
-                        m_crash_sound3->play(getXYZ());
-                }
+                int idx = rand() % 3;
+
+                SFXBase* emitter = getNextEmitter();
+                if (idx == 0)
+                    emitter->setBuffer(SFXManager::get()->getBuffer("crash"), false);
+                else if (idx == 1)
+                    emitter->setBuffer(SFXManager::get()->getBuffer("crash2"), false);
+                else
+                    emitter->setBuffer(SFXManager::get()->getBuffer("crash3"), false);
+                emitter->play(getXYZ());
             }
         }    // if lin_vel > 0.555
     }   // if m_bounce_back_time <= 0
@@ -2196,7 +2187,9 @@ void Kart::beep()
     // If the custom horn can't play (isn't defined) then play the default one
     if (!playCustomSFX(SFXManager::CUSTOM_HORN))
     {
-        m_beep_sound->play(getXYZ());
+        SFXBase* emitter = getNextEmitter();
+        emitter->setBuffer(SFXManager::get()->getBuffer("horn"), false);
+        emitter->play(getXYZ());
     }
 
 } // beep
@@ -2690,6 +2683,23 @@ void Kart::kartIsInRestNow()
     m_kart_model->setDefaultSuspension();
 }   // kartIsInRestNow
 
+//-----------------------------------------------------------------------------
+
+SFXBase* Kart::getNextEmitter()
+{
+    m_emitter_id = (m_emitter_id + 1) % 3;
+
+    SFXBase* next_emitter;
+    if (m_emitter_id == 0)
+        next_emitter = m_emitter_1;
+    else if (m_emitter_id == 1)
+        next_emitter = m_emitter_2;
+    else
+        next_emitter = m_emitter_3;
+
+    return next_emitter;
+}
+
 //-----------------------------------------------------------------------------
 /** Updates the graphics model. It is responsible for positioning the graphical
  *  chasses at an 'appropriate' position: typically, the physical model has
diff --git a/src/karts/kart.hpp b/src/karts/kart.hpp
index 9440130f1..3e2f7a307 100644
--- a/src/karts/kart.hpp
+++ b/src/karts/kart.hpp
@@ -206,19 +206,23 @@ protected:
     float         m_last_factor_engine_sound;
 
     std::vector<SFXBase*> m_custom_sounds;
-    SFXBase      *m_beep_sound;
+    int m_emitter_id = 0;
+    SFXBase      *m_emitter_1;
+    SFXBase      *m_emitter_2;
+    SFXBase      *m_emitter_3;
+    //SFXBase      *m_beep_sound;
     SFXBase      *m_engine_sound;
-    SFXBase      *m_crash_sound;
-    SFXBase      *m_crash_sound2;
-    SFXBase      *m_crash_sound3;
+    //SFXBase      *m_crash_sound;
+    //SFXBase      *m_crash_sound2;
+    //SFXBase      *m_crash_sound3;
     SFXBase      *m_terrain_sound;
     SFXBase      *m_nitro_sound;
     /** A pointer to the previous terrain sound needs to be saved so that an
      *  'older' sfx can be finished and an abrupt end of the sfx is avoided. */
     SFXBase      *m_previous_terrain_sound;
     SFXBase      *m_skid_sound;
-    SFXBase      *m_goo_sound;
-    SFXBase      *m_boing_sound;
+    //SFXBase      *m_goo_sound;
+    //SFXBase      *m_boing_sound;
     float         m_time_last_crash;
     RaceManager::KartType m_type;
 
@@ -237,6 +241,7 @@ protected:
     float         getActualWheelForce();
     void          playCrashSFX(const Material* m, AbstractKart *k);
     void          loadData(RaceManager::KartType type, bool animatedModel);
+    SFXBase*      getNextEmitter();
 
 public:
                    Kart(const std::string& ident, unsigned int world_kart_id,

From cb2295c7383863d1bece46524291d163154cea1a Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Sat, 2 Sep 2017 22:35:41 -0400
Subject: [PATCH 090/125] Improve kart audio refactor, see #2921

---
 src/audio/dummy_sfx.hpp   |  6 +++---
 src/audio/sfx_base.hpp    |  7 +++----
 src/audio/sfx_manager.cpp | 11 ++++++++++-
 src/audio/sfx_manager.hpp | 17 +++++++++++------
 src/audio/sfx_openal.cpp  | 33 ++++++++++-----------------------
 src/audio/sfx_openal.hpp  | 15 ++++++---------
 src/karts/kart.cpp        | 34 +++++++++++++++++-----------------
 src/karts/kart.hpp        | 12 ++++++------
 8 files changed, 66 insertions(+), 69 deletions(-)

diff --git a/src/audio/dummy_sfx.hpp b/src/audio/dummy_sfx.hpp
index 63f9893e9..32eb1116d 100644
--- a/src/audio/dummy_sfx.hpp
+++ b/src/audio/dummy_sfx.hpp
@@ -47,9 +47,9 @@ public:
     virtual void       reallySetSpeedPosition(float f,
                                          const Vec3 &p) {}
     virtual void       play()                           {}
-    virtual void       reallyPlayNow()                  {}
-    virtual void       play(const Vec3 &xyz)            {}
-    virtual void       reallyPlayNow(const Vec3 &xyz)   {}
+    virtual void       reallyPlayNow(SFXBuffer* buffer = NULL) {}
+    virtual void       play(const Vec3 &xyz, SFXBuffer* buffer = NULL) {}
+    virtual void       reallyPlayNow(const Vec3 &xyz, SFXBuffer* buffer = NULL) {}
     virtual void       stop()                           {}
     virtual void       reallyStopNow()                  {}
     virtual void       pause()                          {}
diff --git a/src/audio/sfx_base.hpp b/src/audio/sfx_base.hpp
index e0fff346d..da601bbf1 100644
--- a/src/audio/sfx_base.hpp
+++ b/src/audio/sfx_base.hpp
@@ -64,9 +64,9 @@ public:
     virtual void       setLoop(bool status)                 = 0;
     virtual void       reallySetLoop(bool status)           = 0;
     virtual void       play()                               = 0;
-    virtual void       reallyPlayNow()                      = 0;
-    virtual void       play(const Vec3 &xyz)                = 0;
-    virtual void       reallyPlayNow(const Vec3 &xyz)       = 0;
+    virtual void       reallyPlayNow(SFXBuffer* buffer = NULL) = 0;
+    virtual void       play(const Vec3 &xyz, SFXBuffer* buffer = NULL) = 0;
+    virtual void       reallyPlayNow(const Vec3 &xyz, SFXBuffer* buffer = NULL) = 0;
     virtual void       stop()                               = 0;
     virtual void       reallyStopNow()                      = 0;
     virtual void       pause()                              = 0;
@@ -83,7 +83,6 @@ public:
     virtual void       onSoundEnabledBack()                 = 0;
     virtual void       setRolloff(float rolloff)            = 0;
     virtual const SFXBuffer* getBuffer() const              = 0;
-    virtual void setBuffer(SFXBuffer* buffer, bool owns_buffer) = 0;
     virtual SFXStatus  getStatus()                          = 0;
 
 };   // SFXBase
diff --git a/src/audio/sfx_manager.cpp b/src/audio/sfx_manager.cpp
index 12b24ba5d..9cecda9dc 100644
--- a/src/audio/sfx_manager.cpp
+++ b/src/audio/sfx_manager.cpp
@@ -217,6 +217,15 @@ void SFXManager::queue(SFXCommands command, SFXBase *sfx, const Vec3 &p)
    queueCommand(sfx_command);
 }   // queue (Vec3)
 
+//----------------------------------------------------------------------------
+
+void SFXManager::queue(SFXCommands command, SFXBase *sfx, const Vec3 &p, SFXBuffer* buffer)
+{
+    SFXCommand *sfx_command = new SFXCommand(command, sfx, p);
+    sfx_command->m_buffer = buffer;
+    queueCommand(sfx_command);
+}   // queue (Vec3)
+
 //----------------------------------------------------------------------------
 /** Adds a sound effect command with a float and a Vec3 parameter to the queue
  *  of the sfx manager. Openal commands can sometimes cause a 5ms delay, so it
@@ -340,7 +349,7 @@ void* SFXManager::mainLoop(void *obj)
         {
         case SFX_PLAY:     current->m_sfx->reallyPlayNow();       break;
         case SFX_PLAY_POSITION:
-            current->m_sfx->reallyPlayNow(current->m_parameter);  break;
+            current->m_sfx->reallyPlayNow(current->m_parameter, current->m_buffer);  break;
         case SFX_STOP:     current->m_sfx->reallyStopNow();       break;
         case SFX_PAUSE:    current->m_sfx->reallyPauseNow();      break;
         case SFX_RESUME:   current->m_sfx->reallyResumeNow();     break;
diff --git a/src/audio/sfx_manager.hpp b/src/audio/sfx_manager.hpp
index 8e0c701cc..beb476395 100644
--- a/src/audio/sfx_manager.hpp
+++ b/src/audio/sfx_manager.hpp
@@ -122,6 +122,9 @@ private:
         /** The sound effect for which the command should be executed. */
         SFXBase *m_sfx;
 
+        /** The sound buffer to play (null = no change) */
+        SFXBuffer *m_buffer = NULL;
+
         /** Stores music information for music commands. */
         MusicInformation *m_music_information;
 
@@ -232,12 +235,14 @@ private:
 public:
     static void create();
     static void destroy();
-    void queue(SFXCommands command,  SFXBase *sfx=NULL);
-    void queue(SFXCommands command,  SFXBase *sfx, float f);
-    void queue(SFXCommands command,  SFXBase *sfx, const Vec3 &p);
-    void queue(SFXCommands command,  SFXBase *sfx, float f, const Vec3 &p);
-    void queue(SFXCommands command,  MusicInformation *mi);
-    void queue(SFXCommands command,  MusicInformation *mi, float f);
+    void queue(SFXCommands command, SFXBase *sfx=NULL);
+    void queue(SFXCommands command, SFXBase *sfx, float f);
+    void queue(SFXCommands command, SFXBase *sfx, const Vec3 &p);
+    void queue(SFXCommands command, SFXBase *sfx, float f, const Vec3 &p);
+    void queue(SFXCommands command, MusicInformation *mi);
+    void queue(SFXCommands command, MusicInformation *mi, float f);
+    void queue(SFXCommands command, SFXBase *sfx, const Vec3 &p, SFXBuffer* buffer);
+
     // ------------------------------------------------------------------------
     /** Static function to get the singleton sfx manager. */
     static SFXManager *get()
diff --git a/src/audio/sfx_openal.cpp b/src/audio/sfx_openal.cpp
index 61456e5a3..21368e1b5 100644
--- a/src/audio/sfx_openal.cpp
+++ b/src/audio/sfx_openal.cpp
@@ -52,7 +52,6 @@ SFXOpenAL::SFXOpenAL(SFXBuffer* buffer, bool positional, float volume,
     m_master_gain  = 1.0f;
     m_owns_buffer  = owns_buffer;
     m_play_time    = 0.0f;
-    m_sound_buffer_changed = false;
 
     // Don't initialise anything else if the sfx manager was not correctly
     // initialised. First of all the initialisation will not work, and it
@@ -366,7 +365,7 @@ void SFXOpenAL::play()
 //-----------------------------------------------------------------------------
 /** Plays this sound effect.
  */
-void SFXOpenAL::reallyPlayNow()
+void SFXOpenAL::reallyPlayNow(SFXBuffer* buffer)
 {
     if (!SFXManager::get()->sfxAllowed()) return;
     if (m_status==SFX_NOT_INITIALISED)
@@ -378,13 +377,13 @@ void SFXOpenAL::reallyPlayNow()
         if (m_status==SFX_UNKNOWN) return;
     }
 
-    if (m_sound_buffer_changed)
+    if (buffer != NULL)
     {
         if (m_status == SFX_PLAYING || m_status == SFX_PAUSED)
             reallyStopNow();
 
+        m_sound_buffer = buffer;
         alSourcei(m_sound_source, AL_BUFFER, m_sound_buffer->getBufferID());
-        m_sound_buffer_changed = false;
 
         if (!SFXManager::checkError("attaching the buffer to the source"))
             return;
@@ -405,8 +404,11 @@ void SFXOpenAL::reallyPlayNow()
 /** This actually queues up the sfx in the sfx manager. It will be started
  *  from a separate thread later (in this frame).
  */
-void SFXOpenAL::play(const Vec3 &position)
+void SFXOpenAL::play(const Vec3 &position, SFXBuffer* buffer)
 {
+    if (m_owns_buffer && buffer != NULL)
+        assert(false); // sources that own a buffer cannot play any other buffer
+
     if (m_status == SFX_UNKNOWN || !SFXManager::get()->sfxAllowed()) return;
 
     if(m_status==SFX_STOPPED || m_status==SFX_NOT_INITIALISED)
@@ -418,16 +420,15 @@ void SFXOpenAL::play(const Vec3 &position)
     // - which can happen if the sfx thread had no time to actually start
     // it yet.
     m_status = SFX_PLAYING;
-    SFXManager::get()->queue(SFXManager::SFX_PLAY_POSITION, this, position);
+    SFXManager::get()->queue(SFXManager::SFX_PLAY_POSITION, this, position, buffer);
 }   // play(Vec3)
-
 //-----------------------------------------------------------------------------
 /** Plays this sound effect.
  */
-void SFXOpenAL::reallyPlayNow(const Vec3 &position)
+void SFXOpenAL::reallyPlayNow(const Vec3 &position, SFXBuffer* buffer)
 {
     reallySetPosition(position);
-    reallyPlayNow();
+    reallyPlayNow(buffer);
 }   // reallyPlayNow(Vec3)
 
 //-----------------------------------------------------------------------------
@@ -543,18 +544,4 @@ void SFXOpenAL::setRolloff(float rolloff)
 
 //-----------------------------------------------------------------------------
 
-// TODO: make this thread-safe
-void SFXOpenAL::setBuffer(SFXBuffer* buffer, bool owns_buffer)
-{
-    if (m_owns_buffer && m_sound_buffer)
-    {
-        m_sound_buffer->unload();
-        delete m_sound_buffer;
-    }
-
-    m_sound_buffer = buffer;
-    m_owns_buffer = owns_buffer;
-    m_sound_buffer_changed = true;
-}
-
 #endif //if HAVE_OGGVORBIS
diff --git a/src/audio/sfx_openal.hpp b/src/audio/sfx_openal.hpp
index cd2d095b4..0d491b097 100644
--- a/src/audio/sfx_openal.hpp
+++ b/src/audio/sfx_openal.hpp
@@ -29,6 +29,7 @@
 #endif
 #include "audio/sfx_base.hpp"
 #include "utils/leak_check.hpp"
+#include "utils/cpp2011.hpp"
 
 /**
   * \brief OpenAL implementation of the abstract SFXBase interface
@@ -75,19 +76,17 @@ private:
     /** How long the sfx has been playing. */
     float m_play_time;
 
-    bool m_sound_buffer_changed;
-
 public:
               SFXOpenAL(SFXBuffer* buffer, bool positional, float volume,
                         bool owns_buffer = false);
     virtual  ~SFXOpenAL();
 
     virtual void      updatePlayingSFX(float dt);
-    virtual bool      init();
-    virtual void      play();
-    virtual void      reallyPlayNow();
-    virtual void      play(const Vec3 &xyz);
-    virtual void      reallyPlayNow(const Vec3 &xyz);
+    virtual bool      init() OVERRIDE;
+    virtual void      play() OVERRIDE;
+    virtual void      reallyPlayNow(SFXBuffer* buffer = NULL) OVERRIDE;
+    virtual void      play(const Vec3 &xyz, SFXBuffer* buffer = NULL) OVERRIDE;
+    virtual void      reallyPlayNow(const Vec3 &xyz, SFXBuffer* buffer = NULL) OVERRIDE;
     virtual void      setLoop(bool status);
     virtual void      reallySetLoop(bool status);
     virtual void      stop();
@@ -119,8 +118,6 @@ public:
     // ------------------------------------------------------------------------
     /** Returns the buffer associated with this sfx. */
     virtual const SFXBuffer* getBuffer() const { return m_sound_buffer; }
-    // ------------------------------------------------------------------------
-    virtual void setBuffer(SFXBuffer* buffer, bool owns_buffer);
 
 };   // SFXOpenAL
 
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 28a1c0855..5e20d8a67 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -170,6 +170,13 @@ Kart::Kart (const std::string& ident, unsigned int world_kart_id,
         }
     }*/
 
+    m_horn_sound = SFXManager::get()->getBuffer("horn");
+    m_crash_sound = SFXManager::get()->getBuffer("crash");
+    m_crash_sound2 = SFXManager::get()->getBuffer("crash2");
+    m_crash_sound3 = SFXManager::get()->getBuffer("crash3");
+    m_goo_sound = SFXManager::get()->getBuffer("goo");
+    m_boing_sound = SFXManager::get()->getBuffer("boing");
+
     m_engine_sound  = SFXManager::get()->createSoundSource(m_kart_properties->getEngineSfxType());
     m_emitter_1 = SFXManager::get()->createSoundSource("crash");
     m_emitter_2 = SFXManager::get()->createSoundSource("crash");
@@ -1020,11 +1027,8 @@ void Kart::collectedItem(Item *item, int add_info)
                                  m_kart_properties->getBubblegumSpeedFraction() ,
                                  m_kart_properties->getBubblegumFadeInTime(),
                                  m_bubblegum_time);
-        {
-            SFXBase* emitter = getNextEmitter();
-            emitter->setBuffer(SFXManager::get()->getBuffer("goo"), false);
-            emitter->play(getXYZ());
-        }
+        getNextEmitter()->play(getXYZ(), m_goo_sound);
+
         // Play appropriate custom character sound
         playCustomSFX(SFXManager::CUSTOM_GOO);
         break;
@@ -2158,22 +2162,20 @@ void Kart::playCrashSFX(const Material* m, AbstractKart *k)
             // it's not already playing.
             if (isShielded() || (k != NULL && k->isShielded()))
             {
-                SFXBase* emitter = getNextEmitter();
-                emitter->setBuffer(SFXManager::get()->getBuffer("boing"), false);
-                emitter->play(getXYZ());
+                getNextEmitter()->play(getXYZ(), m_boing_sound);
             }
             else
             {
                 int idx = rand() % 3;
-
-                SFXBase* emitter = getNextEmitter();
+                SFXBuffer* buffer;
                 if (idx == 0)
-                    emitter->setBuffer(SFXManager::get()->getBuffer("crash"), false);
+                    buffer = m_crash_sound;
                 else if (idx == 1)
-                    emitter->setBuffer(SFXManager::get()->getBuffer("crash2"), false);
+                    buffer = m_crash_sound2;
                 else
-                    emitter->setBuffer(SFXManager::get()->getBuffer("crash3"), false);
-                emitter->play(getXYZ());
+                    buffer = m_crash_sound3;
+
+                getNextEmitter()->play(getXYZ(), buffer);
             }
         }    // if lin_vel > 0.555
     }   // if m_bounce_back_time <= 0
@@ -2187,9 +2189,7 @@ void Kart::beep()
     // If the custom horn can't play (isn't defined) then play the default one
     if (!playCustomSFX(SFXManager::CUSTOM_HORN))
     {
-        SFXBase* emitter = getNextEmitter();
-        emitter->setBuffer(SFXManager::get()->getBuffer("horn"), false);
-        emitter->play(getXYZ());
+        getNextEmitter()->play(getXYZ(), m_horn_sound);
     }
 
 } // beep
diff --git a/src/karts/kart.hpp b/src/karts/kart.hpp
index 3e2f7a307..6d364bd01 100644
--- a/src/karts/kart.hpp
+++ b/src/karts/kart.hpp
@@ -210,19 +210,19 @@ protected:
     SFXBase      *m_emitter_1;
     SFXBase      *m_emitter_2;
     SFXBase      *m_emitter_3;
-    //SFXBase      *m_beep_sound;
     SFXBase      *m_engine_sound;
-    //SFXBase      *m_crash_sound;
-    //SFXBase      *m_crash_sound2;
-    //SFXBase      *m_crash_sound3;
     SFXBase      *m_terrain_sound;
     SFXBase      *m_nitro_sound;
     /** A pointer to the previous terrain sound needs to be saved so that an
      *  'older' sfx can be finished and an abrupt end of the sfx is avoided. */
     SFXBase      *m_previous_terrain_sound;
     SFXBase      *m_skid_sound;
-    //SFXBase      *m_goo_sound;
-    //SFXBase      *m_boing_sound;
+    SFXBuffer    *m_horn_sound;
+    SFXBuffer    *m_crash_sound;
+    SFXBuffer    *m_crash_sound2;
+    SFXBuffer    *m_crash_sound3;
+    SFXBuffer    *m_goo_sound;
+    SFXBuffer    *m_boing_sound;
     float         m_time_last_crash;
     RaceManager::KartType m_type;
 

From beb10863c438fef1e89cbd7d56ff6ea4574c24a7 Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Sat, 2 Sep 2017 22:49:36 -0400
Subject: [PATCH 091/125] Continue optimizing OpenAL sources, see #2921

---
 src/karts/abstract_kart.hpp                   |  4 ++-
 .../controller/local_player_controller.cpp    | 29 +++++++++----------
 .../controller/local_player_controller.hpp    | 11 +++----
 src/karts/kart.cpp                            |  7 +++++
 src/karts/kart.hpp                            |  6 ++--
 5 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/karts/abstract_kart.hpp b/src/karts/abstract_kart.hpp
index 71582aa4b..5bab9703c 100644
--- a/src/karts/abstract_kart.hpp
+++ b/src/karts/abstract_kart.hpp
@@ -45,6 +45,7 @@ class KartModel;
 class KartProperties;
 class Material;
 class Powerup;
+class SFXBuffer;
 class Skidding;
 class SlipStream;
 class TerrainInfo;
@@ -472,7 +473,8 @@ public:
     // ------------------------------------------------------------------------
     /** Returns whether this kart is jumping. */
     virtual bool isJumping() const = 0;
-
+    // ------------------------------------------------------------------------
+    virtual void playSound(SFXBuffer* buffer) = 0;
 };   // AbstractKart
 
 
diff --git a/src/karts/controller/local_player_controller.cpp b/src/karts/controller/local_player_controller.cpp
index 01eb0879f..2c8b96b47 100644
--- a/src/karts/controller/local_player_controller.cpp
+++ b/src/karts/controller/local_player_controller.cpp
@@ -65,11 +65,11 @@ LocalPlayerController::LocalPlayerController(AbstractKart *kart,
     // the right camera once per frame later.
     Camera *camera = Camera::createCamera(kart);
     m_camera_index = camera->getIndex();
-    m_bzzt_sound   = SFXManager::get()->createSoundSource("bzzt");
     m_wee_sound    = SFXManager::get()->createSoundSource("wee");
-    m_ugh_sound    = SFXManager::get()->createSoundSource("ugh");
-    m_grab_sound   = SFXManager::get()->createSoundSource("grab_collectable");
-    m_full_sound   = SFXManager::get()->createSoundSource("energy_bar_full");
+    m_bzzt_sound   = SFXManager::get()->getBuffer("bzzt");
+    m_ugh_sound    = SFXManager::get()->getBuffer("ugh");
+    m_grab_sound   = SFXManager::get()->getBuffer("grab_collectable");
+    m_full_sound   = SFXManager::get()->getBuffer("energy_bar_full");
 
     // Attach Particle System
     Track *track = Track::getCurrentTrack();
@@ -97,11 +97,8 @@ LocalPlayerController::LocalPlayerController(AbstractKart *kart,
  */
 LocalPlayerController::~LocalPlayerController()
 {
-    m_bzzt_sound->deleteSFX();
-    m_wee_sound ->deleteSFX();
-    m_ugh_sound ->deleteSFX();
-    m_grab_sound->deleteSFX();
-    m_full_sound->deleteSFX();
+    m_wee_sound->deleteSFX();
+
     if (m_sky_particles_emitter)
         delete m_sky_particles_emitter;
 }   // ~LocalPlayerController
@@ -228,7 +225,7 @@ void LocalPlayerController::update(float dt)
     else if (!m_kart->getKartAnimation() && m_sound_schedule == true)
     {
         m_sound_schedule = false;
-        m_bzzt_sound->play();
+        m_kart->playSound(m_bzzt_sound);
     }
 }   // update
 
@@ -246,7 +243,7 @@ void LocalPlayerController::displayPenaltyWarning()
         m->addMessage(_("Don't accelerate before go"), m_kart, 2.0f,
                       GUIEngine::getSkin()->getColor("font::normal"));
     }
-    m_bzzt_sound->play();
+    m_kart->playSound(m_bzzt_sound);
 }   // displayPenaltyWarning
 
 //-----------------------------------------------------------------------------
@@ -326,31 +323,31 @@ void LocalPlayerController::collectedItem(const Item &item, int add_info,
     if (old_energy < m_kart->getKartProperties()->getNitroMax() &&
         m_kart->getEnergy() == m_kart->getKartProperties()->getNitroMax())
     {
-        m_full_sound->play();
+        m_kart->playSound(m_full_sound);
     }
     else if (race_manager->getCoinTarget() > 0 &&
              old_energy < race_manager->getCoinTarget() &&
              m_kart->getEnergy() == race_manager->getCoinTarget())
     {
-        m_full_sound->play();
+        m_kart->playSound(m_full_sound);
     }
     else
     {
         switch(item.getType())
         {
         case Item::ITEM_BANANA:
-            m_ugh_sound->play();
+            m_kart->playSound(m_ugh_sound);
             break;
         case Item::ITEM_BUBBLEGUM:
             //More sounds are played by the kart class
             //See Kart::collectedItem()
-            m_ugh_sound->play();
+            m_kart->playSound(m_ugh_sound);
             break;
         case Item::ITEM_TRIGGER:
             // no default sound for triggers
             break;
         default:
-            m_grab_sound->play();
+            m_kart->playSound(m_grab_sound);
             break;
         }
     }
diff --git a/src/karts/controller/local_player_controller.hpp b/src/karts/controller/local_player_controller.hpp
index 5493e1b2d..fbe327030 100644
--- a/src/karts/controller/local_player_controller.hpp
+++ b/src/karts/controller/local_player_controller.hpp
@@ -26,6 +26,7 @@
 class AbstractKart;
 class ParticleEmitter;
 class SFXBase;
+class SFXBuffer;
 
 /** PlayerKart manages control events from the player and moves
   * them to the Kart
@@ -47,11 +48,11 @@ private:
      *  camera object is managed in the Camera class, so no need to free it. */
     int  m_camera_index;
 
-    SFXBase       *m_bzzt_sound;
-    SFXBase       *m_wee_sound;
-    SFXBase       *m_ugh_sound;
-    SFXBase       *m_grab_sound;
-    SFXBase       *m_full_sound;
+    SFXBase     *m_wee_sound;
+    SFXBuffer   *m_bzzt_sound;
+    SFXBuffer   *m_ugh_sound;
+    SFXBuffer   *m_grab_sound;
+    SFXBuffer   *m_full_sound;
 
     virtual void steer(float, int) OVERRIDE;
     virtual void displayPenaltyWarning() OVERRIDE;
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 5e20d8a67..a1097cd58 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -2994,4 +2994,11 @@ const Vec3& Kart::getNormal() const
     return m_terrain_info->getNormal();
 }   // getNormal
 
+// ------------------------------------------------------------------------
+
+void Kart::playSound(SFXBuffer* buffer)
+{
+    getNextEmitter()->play(getXYZ(), buffer);
+}
+
 /* EOF */
diff --git a/src/karts/kart.hpp b/src/karts/kart.hpp
index 6d364bd01..5b7d8902d 100644
--- a/src/karts/kart.hpp
+++ b/src/karts/kart.hpp
@@ -241,7 +241,6 @@ protected:
     float         getActualWheelForce();
     void          playCrashSFX(const Material* m, AbstractKart *k);
     void          loadData(RaceManager::KartType type, bool animatedModel);
-    SFXBase*      getNextEmitter();
 
 public:
                    Kart(const std::string& ident, unsigned int world_kart_id,
@@ -478,7 +477,10 @@ public:
     // ------------------------------------------------------------------------
     /** Returns whether this kart is jumping. */
     virtual bool isJumping() const { return m_is_jumping; };
-
+    // ------------------------------------------------------------------------
+    SFXBase* getNextEmitter();
+    // ------------------------------------------------------------------------
+    virtual void playSound(SFXBuffer* buffer);
 };   // Kart
 
 

From b820a60e9831a296ffb9d8613ae8a591cb9b84ff Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sun, 3 Sep 2017 23:36:55 +0200
Subject: [PATCH 092/125] Tweak default accelerometer sensitivity.

Also move it to the config file.
---
 src/config/user_config.hpp  | 5 +++++
 src/input/input_manager.cpp | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index d59706ab3..bf059c058 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -435,6 +435,11 @@ namespace UserConfigParams
             &m_multitouch_group,
             "A parameter in range [0, 0.5] that determines the zone that is "
             "considered as max value in steering button."));
+            
+    PARAM_PREFIX FloatUserConfigParam         m_multitouch_tilt_factor
+            PARAM_DEFAULT( FloatUserConfigParam(4.0f, "multitouch_tilt_factor",
+            &m_multitouch_group,
+            "A parameter that determines general accelerometer sensitivity."));
 
     PARAM_PREFIX FloatUserConfigParam         m_multitouch_scale
             PARAM_DEFAULT( FloatUserConfigParam(1.1f, "multitouch_scale",
diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp
index e604e6b82..9057b888e 100644
--- a/src/input/input_manager.cpp
+++ b/src/input/input_manager.cpp
@@ -1191,15 +1191,18 @@ EventPropagation InputManager::input(const SEvent& event)
 
                 if (button->type != BUTTON_STEERING)
                     continue;
+                    
+                float factor = UserConfigParams::m_multitouch_tilt_factor;
+                factor = std::max(factor, 0.1f);
 
                 if (UserConfigParams::m_multitouch_accelerometer == 1)
                 {
-                    button->axis_x = (float)-event.AccelerometerEvent.X / 5.0f;
+                    button->axis_x = (float)-event.AccelerometerEvent.X / factor;
                     device->handleControls(button);
                 }
                 else if (UserConfigParams::m_multitouch_accelerometer == 2)
                 {
-                    button->axis_x = (float)event.AccelerometerEvent.Y / 5.0f;
+                    button->axis_x = (float)event.AccelerometerEvent.Y / factor;
                     device->handleControls(button);
                 }
             }

From bd6c2d9b21072eb97622aa654f9a628ee4e4e0b1 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 4 Sep 2017 08:30:31 +1000
Subject: [PATCH 093/125] Allow setting bevel to 0, fix incorrect Y position
 when using bevelled values for wheel positions.

---
 src/karts/kart.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 6379915c9..b14d0d0af 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -606,7 +606,6 @@ void Kart::createPhysics()
 
     const Vec3 &bevel = m_kart_properties->getBevelFactor();
     Vec3 wheel_pos[4];
-    assert(bevel.getX() || bevel.getY() || bevel.getZ());
 
     Vec3 orig_factor(1, 1, 1 - bevel.getZ());
     Vec3 bevel_factor(1.0f - bevel.getX(), 1.0f - bevel.getY(), 1.0f);
@@ -622,9 +621,9 @@ void Kart::createPhysics()
                        z*kart_length *0.5f);
 
                 hull->addPoint(p*orig_factor);
-                hull->addPoint(p*bevel_factor);
-                // Store the x/z position for the wheels as a weighted average
-                // of the two bevelled points.
+                // Only add bevelled point if bevel is defined (i.e.!=0)
+                if(bevel.length2()>0)
+                    hull->addPoint(p*bevel_factor);
                 if (y == -1)
                 {
                     int index = (x + 1) / 2 + 1 - z;  // get index of wheel
@@ -636,19 +635,19 @@ void Kart::createPhysics()
                         // All wheel positions are relative to the center of
                         // the collision shape.
                         wheel_pos[index].setX(x*0.5f*kart_width);
-                        // The y position of the wheels (i.e. the points where
-                        // the suspension is attached to) is just at the
-                        // bottom of the kart. That is half the kart height
-                        // down.
-                        wheel_pos[index].setY(- 0.5f*kart_height);
                         wheel_pos[index].setZ((0.5f*kart_length-0.25f)* z);
-
                     }
                     else
                     {
+                        // Store the x/z position for the wheels as a weighted average
+                        // of the two bevelled points (y is set below).
                         wheel_pos[index] = p*(orig_factor*(1.0f - f) + bevel_factor*f);
-                        wheel_pos[index].setY(0);
                     }
+                    // The y position of the wheels (i.e. the points where
+                    // the suspension is attached to) is just at the
+                    // bottom of the kart (independent of collision shape). 
+                    // That is half the kart height down.
+                    wheel_pos[index].setY(-0.5f*kart_height);
                 }  // if y==-1
             }   // for x
         }   // for z

From 5d51b7fcd1336604b135b0ced8c412a6633e5da2 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 4 Sep 2017 08:41:21 +1000
Subject: [PATCH 094/125] Added #define to switch between AI-debugging-topview
 camera (high up) and physics-debugging-topview camera (close to kart).

---
 src/graphics/camera_debug.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/graphics/camera_debug.cpp b/src/graphics/camera_debug.cpp
index 6069a6be7..29637d5bd 100644
--- a/src/graphics/camera_debug.cpp
+++ b/src/graphics/camera_debug.cpp
@@ -92,9 +92,7 @@ void CameraDebug::update(float dt)
 {
     Camera::update(dt);
 
-    // To view inside tunnels in top mode, increase near value
-    m_camera->setNearValue(m_default_debug_Type==CM_DEBUG_TOP_OF_KART 
-                           ? 27.0f : 1.0f);
+    m_camera->setNearValue(1.0f);
 
     float above_kart, cam_angle, side_way, distance;
 
@@ -104,8 +102,17 @@ void CameraDebug::update(float dt)
     {
         core::vector3df xyz = m_kart->getXYZ().toIrrVector();
         m_camera->setTarget(xyz);
+#define CLOSE_TO_KART
+#ifdef CLOSE_TO_KART
+        // Better for debugging physics/collision issues
+        xyz.Y = xyz.Y+7;
+        m_camera->setNearValue(7.0f);
+#else
+        // Very high few, better for debugging AI behaviour
         xyz.Y = xyz.Y+55;
         xyz.Z -= 5.0f;
+        m_camera->setNearValue(27.0f);
+#endif
         m_camera->setPosition(xyz);
     }
     else if (m_default_debug_Type==CM_DEBUG_SIDE_OF_KART)

From b974b35a070fb886b653e535cb1b815daf06c925 Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Sun, 3 Sep 2017 20:37:43 -0400
Subject: [PATCH 095/125] Code cleanup in kart audio code

---
 src/karts/kart.cpp | 54 +++++++++++++++++-----------------------------
 src/karts/kart.hpp | 10 ++++-----
 2 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index a1097cd58..1f45aef69 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -171,16 +171,17 @@ Kart::Kart (const std::string& ident, unsigned int world_kart_id,
     }*/
 
     m_horn_sound = SFXManager::get()->getBuffer("horn");
-    m_crash_sound = SFXManager::get()->getBuffer("crash");
-    m_crash_sound2 = SFXManager::get()->getBuffer("crash2");
-    m_crash_sound3 = SFXManager::get()->getBuffer("crash3");
+    m_crash_sounds[0] = SFXManager::get()->getBuffer("crash");
+    m_crash_sounds[1] = SFXManager::get()->getBuffer("crash2");
+    m_crash_sounds[2] = SFXManager::get()->getBuffer("crash3");
     m_goo_sound = SFXManager::get()->getBuffer("goo");
     m_boing_sound = SFXManager::get()->getBuffer("boing");
 
     m_engine_sound  = SFXManager::get()->createSoundSource(m_kart_properties->getEngineSfxType());
-    m_emitter_1 = SFXManager::get()->createSoundSource("crash");
-    m_emitter_2 = SFXManager::get()->createSoundSource("crash");
-    m_emitter_3 = SFXManager::get()->createSoundSource("crash");
+    
+    for (int i = 0; i < EMITTER_COUNT; i++)
+        m_emitters[i] = SFXManager::get()->createSoundSource("crash");
+
     m_skid_sound    = SFXManager::get()->createSoundSource( "skid"  );
     m_nitro_sound   = SFXManager::get()->createSoundSource( "nitro" );
     m_terrain_sound          = NULL;
@@ -205,9 +206,9 @@ void Kart::init(RaceManager::KartType type)
         if (type == RaceManager::KT_PLAYER)
             factor = std::min(1.0f, race_manager->getNumLocalPlayers()/2.0f);
 
-        m_emitter_1->setVolume(factor);
-        m_emitter_2->setVolume(factor);
-        m_emitter_3->setVolume(factor);
+        for (int i = 0; i < EMITTER_COUNT; i++)
+            m_emitters[i]->setVolume(factor);
+
         m_skid_sound->setVolume(factor);
         m_nitro_sound->setVolume(factor);
     }   // if getNumLocalPlayers > 1
@@ -259,9 +260,10 @@ Kart::~Kart()
 
     m_engine_sound->deleteSFX();
     m_skid_sound  ->deleteSFX();
-    m_emitter_1->deleteSFX();
-    m_emitter_2->deleteSFX();
-    m_emitter_3->deleteSFX();
+
+    for (int i = 0; i < EMITTER_COUNT; i++)
+        m_emitters[i]->deleteSFX();
+
     m_nitro_sound ->deleteSFX();
     delete m_kart_gfx;
     if(m_terrain_sound)          m_terrain_sound->deleteSFX();
@@ -1359,9 +1361,9 @@ void Kart::update(float dt)
     }
      */
 
-    m_emitter_1->setPosition(getXYZ());
-    m_emitter_2->setPosition(getXYZ());
-    m_emitter_3->setPosition(getXYZ());
+    for (int i = 0; i < EMITTER_COUNT; i++)
+        m_emitters[i]->setPosition(getXYZ());
+
     m_skid_sound->setPosition   ( getXYZ() );
     m_nitro_sound->setPosition  ( getXYZ() );
 
@@ -2166,15 +2168,8 @@ void Kart::playCrashSFX(const Material* m, AbstractKart *k)
             }
             else
             {
-                int idx = rand() % 3;
-                SFXBuffer* buffer;
-                if (idx == 0)
-                    buffer = m_crash_sound;
-                else if (idx == 1)
-                    buffer = m_crash_sound2;
-                else
-                    buffer = m_crash_sound3;
-
+                int idx = rand() % CRASH_SOUND_COUNT;
+                SFXBuffer* buffer = m_crash_sounds[idx];
                 getNextEmitter()->play(getXYZ(), buffer);
             }
         }    // if lin_vel > 0.555
@@ -2688,16 +2683,7 @@ void Kart::kartIsInRestNow()
 SFXBase* Kart::getNextEmitter()
 {
     m_emitter_id = (m_emitter_id + 1) % 3;
-
-    SFXBase* next_emitter;
-    if (m_emitter_id == 0)
-        next_emitter = m_emitter_1;
-    else if (m_emitter_id == 1)
-        next_emitter = m_emitter_2;
-    else
-        next_emitter = m_emitter_3;
-
-    return next_emitter;
+    return m_emitters[m_emitter_id];
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/karts/kart.hpp b/src/karts/kart.hpp
index 5b7d8902d..6353f2022 100644
--- a/src/karts/kart.hpp
+++ b/src/karts/kart.hpp
@@ -207,9 +207,8 @@ protected:
 
     std::vector<SFXBase*> m_custom_sounds;
     int m_emitter_id = 0;
-    SFXBase      *m_emitter_1;
-    SFXBase      *m_emitter_2;
-    SFXBase      *m_emitter_3;
+    static const int EMITTER_COUNT = 3;
+    SFXBase      *m_emitters[EMITTER_COUNT];
     SFXBase      *m_engine_sound;
     SFXBase      *m_terrain_sound;
     SFXBase      *m_nitro_sound;
@@ -218,9 +217,8 @@ protected:
     SFXBase      *m_previous_terrain_sound;
     SFXBase      *m_skid_sound;
     SFXBuffer    *m_horn_sound;
-    SFXBuffer    *m_crash_sound;
-    SFXBuffer    *m_crash_sound2;
-    SFXBuffer    *m_crash_sound3;
+    static const int CRASH_SOUND_COUNT = 3;
+    SFXBuffer    *m_crash_sounds[CRASH_SOUND_COUNT];
     SFXBuffer    *m_goo_sound;
     SFXBuffer    *m_boing_sound;
     float         m_time_last_crash;

From 416b93b0a152122e8267b71ad9ebf5d4912874da Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 4 Sep 2017 18:08:14 +1000
Subject: [PATCH 096/125] Reset steering when calling reset in a kart, which
 results in more accurate physics replays.

---
 src/karts/kart.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 7c20cbce5..9a5a65df4 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -377,6 +377,8 @@ void Kart::reset()
     if(m_body)
         m_body->setDamping(m_kart_properties->getStabilityChassisLinearDamping(),
                            m_kart_properties->getStabilityChassisAngularDamping());
+    for (unsigned int i = 0; i < 4; i++)
+        m_vehicle->getWheelInfo(i).m_steering = 0;
 
     if(m_terrain_sound)
     {

From 8a3cdb4fefa77e75e3eef2b6d677111ee09ea2c1 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Tue, 5 Sep 2017 00:14:21 +0200
Subject: [PATCH 097/125] Don't link with useless libs.

Also remove custom script for xrandr.
---
 CMakeLists.txt         |  5 ++---
 cmake/FindXrandr.cmake | 18 ------------------
 2 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 cmake/FindXrandr.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 552f04ac0..56c2d32d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,8 +255,7 @@ if(UNIX AND NOT APPLE AND NOT SERVER_ONLY)
     find_package(X11 REQUIRED)
     include_directories(${X11_INCLUDE_DIR})
 
-    find_package(Xrandr REQUIRED)
-    if(NOT XRANDR_FOUND)
+    if(NOT X11_Xrandr_FOUND)
         message(FATAL_ERROR "XRANDR not found.")
     endif()
 
@@ -419,7 +418,7 @@ if(NOT SERVER_ONLY)
 endif()
 
 if(UNIX AND NOT APPLE)
-    target_link_libraries(supertuxkart ${X11_LIBRARIES} ${XRANDR_LIBRARIES})
+    target_link_libraries(supertuxkart ${X11_X11_LIB} ${X11_Xrandr_LIB})
     if(USE_LIBBFD)
         target_link_libraries(supertuxkart ${LIBBFD_LIBRARIES})
     endif()
diff --git a/cmake/FindXrandr.cmake b/cmake/FindXrandr.cmake
deleted file mode 100644
index 820f82be7..000000000
--- a/cmake/FindXrandr.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-find_path(XRANDR_INCLUDE_DIR NAMES X11/extensions/Xrandr.h
-          PATH_SUFFIXES X11/extensions
-          DOC "The XRANDR include directory"
-)
-
-find_library(XRANDR_LIBRARY NAMES Xrandr
-          DOC "The XRANDR library"
-)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(XRANDR DEFAULT_MSG XRANDR_LIBRARY XRANDR_INCLUDE_DIR)
-
-if(XRANDR_FOUND)
-  set( XRANDR_LIBRARIES ${XRANDR_LIBRARY} )
-  set( XRANDR_INCLUDE_DIRS ${XRANDR_INCLUDE_DIR} )
-endif()
-
-mark_as_advanced(XRANDR_INCLUDE_DIR XRANDR_LIBRARY)

From 92aec928a14243cdd1b94650c228cb6ea7c6e798 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 6 Sep 2017 09:06:04 +1000
Subject: [PATCH 098/125] Tweaked physics so that wheel raycasts happen from
 inside the collision shape (fixes karts getting stuck at borders), use a
 longer less bevelled collision shape better kart stability), and reduce
 angular factor to make it less likely that karts can drive on walls.

---
 data/kart_characteristics.xml | 2 +-
 data/stk_config.xml           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/kart_characteristics.xml b/data/kart_characteristics.xml
index b4542ba97..c7fd9ad7c 100644
--- a/data/kart_characteristics.xml
+++ b/data/kart_characteristics.xml
@@ -55,7 +55,7 @@
                    chassis-angular-damping="0"
                    downward-impulse-factor="5"
                    track-connection-accel="2"
-                   angular-factor="0.5 1.0 0.5"
+                   angular-factor="0.25 1.0 0.5"
                    smooth-flying-impulse="250" />
 
         <!-- Turning
diff --git a/data/stk_config.xml b/data/stk_config.xml
index 1bc90808b..fb73a6b6f 100644
--- a/data/stk_config.xml
+++ b/data/stk_config.xml
@@ -399,8 +399,8 @@
            behaviour of the karts. -->
     <collision impulse-type="normal"
                impulse="3000" impulse-time="0.1" terrain-impulse="160"
-               restitution="1.0" bevel-factor="0.5 0.0 0.7"
-               physical-wheel-position="-1" />
+               restitution="1.0" bevel-factor="0.5 0.0 0.3"
+               physical-wheel-position="0" />
 
      <!-- Skidding: increase: multiplicative increase of skidding factor in each frame.
               decrease: multiplicative decrease of skidding factor in each frame.

From ee3d0df2422855af7b2d6b5efe5a4694219564ca Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Wed, 6 Sep 2017 15:13:50 +0800
Subject: [PATCH 099/125] Try to fix "Cannot find container_id for texture" for
 models

---
 src/graphics/irr_driver.cpp | 2 +-
 src/main.cpp                | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index ce66d17ba..4e026a3c3 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -1022,11 +1022,11 @@ void IrrDriver::applyResolutionSettings()
     GUIEngine::addLoadingIcon(
         irr_driver->getTexture(file_manager->getAsset(FileManager::GUI,"gift.png")) );
 
-    file_manager->popTextureSearchPath();
 
     kart_properties_manager->loadAllKarts();
 
     attachment_manager->loadModels();
+    file_manager->popTextureSearchPath();
     std::string banana = file_manager->getAsset(FileManager::GUI, "banana.png");
     GUIEngine::addLoadingIcon(irr_driver->getTexture(banana) );
     // No need to reload cached track data (track_manager->cleanAllCachedData
diff --git a/src/main.cpp b/src/main.cpp
index 4675bbe93..67a3129f5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1603,9 +1603,8 @@ int main(int argc, char *argv[] )
         GUIEngine::addLoadingIcon( irr_driver->getTexture(FileManager::GUI,
                                                           "gift.png")       );
 
-        file_manager->popTextureSearchPath();
-
         attachment_manager->loadModels();
+        file_manager->popTextureSearchPath();
 
         GUIEngine::addLoadingIcon( irr_driver->getTexture(FileManager::GUI,
                                                           "banana.png")    );

From 88972f830878711eef4e020a48d12c21a57314f8 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Wed, 6 Sep 2017 15:14:36 +0800
Subject: [PATCH 100/125] Cache all mipmap levels for compressed texture

Not sure if devee has super-fast loading speed like me
---
 src/graphics/stk_texture.cpp | 79 +++++++++++++++++++++++++++++-------
 1 file changed, 64 insertions(+), 15 deletions(-)

diff --git a/src/graphics/stk_texture.cpp b/src/graphics/stk_texture.cpp
index 022e82119..7c6323be4 100644
--- a/src/graphics/stk_texture.cpp
+++ b/src/graphics/stk_texture.cpp
@@ -32,7 +32,7 @@
 #include <functional>
 
 #if !defined(USE_GLES2)
-static const uint8_t CACHE_VERSION = 1;
+static const uint8_t CACHE_VERSION = 2;
 #endif
 // ----------------------------------------------------------------------------
 STKTexture::STKTexture(const std::string& path, TexConfig* tc, bool no_upload)
@@ -443,10 +443,10 @@ bool STKTexture::loadCompressedTexture(const std::string& file_name)
     ifs.read((char*)&cache_verison, sizeof(uint8_t));
     if (cache_verison != CACHE_VERSION)
     {
-        Log::warn("STKTexture", "%s version %d is not supported!",
+        Log::debug("STKTexture", "%s version %d is not supported!",
             file_name.c_str(), cache_verison);
         ifs.close();
-        // Remove the file later if we have more version
+        std::remove(file_name.c_str());
         return false;
     }
     ifs.read((char*)&internal_format, sizeof(int));
@@ -459,8 +459,9 @@ bool STKTexture::loadCompressedTexture(const std::string& file_name)
     if (ifs.fail() || m_texture_size == 0)
         return false;
 
-    char *data = new char[m_texture_size];
-    ifs.read(data, m_texture_size);
+    std::vector<char> compressed;
+    compressed.resize(m_texture_size);
+    ifs.read(compressed.data(), m_texture_size);
     if (!ifs.fail())
     {
         // No on the fly reload is supported for compressed texture
@@ -475,14 +476,38 @@ bool STKTexture::loadCompressedTexture(const std::string& file_name)
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_RED);
         }
         glCompressedTexImage2D(GL_TEXTURE_2D, 0, internal_format,
-            m_size.Width, m_size.Height, 0, m_texture_size, (GLvoid*)data);
-        glGenerateMipmap(GL_TEXTURE_2D);
+            m_size.Width, m_size.Height, 0, m_texture_size, compressed.data());
+        unsigned width = m_size.Width;
+        unsigned height = m_size.Height;
+        std::vector<std::pair<unsigned, unsigned> > mipmap_sizes;
+        while (true)
+        {
+            width = width < 2 ? 1 : width >> 1;
+            height = height < 2 ? 1 : height >> 1;
+            mipmap_sizes.emplace_back(width, height);
+            if (width == 1 && height == 1)
+                break;
+        }
+        for (unsigned i = 0; i < mipmap_sizes.size(); i++)
+        {
+            unsigned cur_mipmap_size = 0;
+            ifs.read((char*)&cur_mipmap_size, sizeof(unsigned int));
+            ifs.read(compressed.data(), cur_mipmap_size);
+            if (cur_mipmap_size == 0 || ifs.fail())
+            {
+                ifs.close();
+                std::remove(file_name.c_str());
+                return false;
+            }
+            glCompressedTexImage2D(GL_TEXTURE_2D, i + 1, internal_format,
+                mipmap_sizes[i].first, mipmap_sizes[i].second, 0,
+                cur_mipmap_size, compressed.data());
+        }
         glBindTexture(GL_TEXTURE_2D, 0);
-        delete[] data;
-        ifs.close();
         return true;
     }
-    delete[] data;
+    ifs.close();
+    std::remove(file_name.c_str());
 #endif
     return false;
 }   // loadCompressedTexture
@@ -515,8 +540,9 @@ void STKTexture::saveCompressedTexture(const std::string& compressed_tex)
         GL_TEXTURE_COMPRESSED_IMAGE_SIZE, (GLint *)&m_texture_size);
     if (m_texture_size == 0) return;
 
-    char *data = new char[m_texture_size];
-    glGetCompressedTexImage(GL_TEXTURE_2D, 0, (GLvoid*)data);
+    std::vector<char> compressed;
+    compressed.resize(m_texture_size);
+    glGetCompressedTexImage(GL_TEXTURE_2D, 0, compressed.data());
     std::ofstream ofs(compressed_tex.c_str(),
         std::ios::out | std::ios::binary);
     if (ofs.is_open())
@@ -528,10 +554,33 @@ void STKTexture::saveCompressedTexture(const std::string& compressed_tex)
         ofs.write((char*)&m_orig_size.Width, sizeof(unsigned int));
         ofs.write((char*)&m_orig_size.Height, sizeof(unsigned int));
         ofs.write((char*)&m_texture_size, sizeof(unsigned int));
-        ofs.write(data, m_texture_size);
-        ofs.close();
+        ofs.write(compressed.data(), m_texture_size);
+        unsigned width = m_size.Width;
+        unsigned height = m_size.Height;
+        std::vector<std::pair<unsigned, unsigned> > mipmap_sizes;
+        while (true)
+        {
+            width = width < 2 ? 1 : width >> 1;
+            height = height < 2 ? 1 : height >> 1;
+            mipmap_sizes.emplace_back(width, height);
+            if (width == 1 && height == 1)
+                break;
+        }
+        for (unsigned i = 0; i < mipmap_sizes.size(); i++)
+        {
+            GLint cur_mipmap_size = 0;
+            glGetTexLevelParameteriv(GL_TEXTURE_2D, i + 1,
+                GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &cur_mipmap_size);
+            if (cur_mipmap_size == 0)
+            {
+                ofs.close();
+                std::remove(compressed_tex.c_str());
+            }
+            glGetCompressedTexImage(GL_TEXTURE_2D, i + 1, compressed.data());
+            ofs.write((char*)&cur_mipmap_size, sizeof(unsigned int));
+            ofs.write(compressed.data(), cur_mipmap_size);
+        }
     }
-    delete[] data;
 #endif
 }   // saveCompressedTexture
 

From 5e8f25a1fc6fe5eab61706ef63fdc2df0055a5d4 Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Wed, 6 Sep 2017 19:23:35 -0400
Subject: [PATCH 101/125] Add a slight delay when triggering the falling
 camera, avoids triggering it too soon when the kart is not yet sure to fall

---
 src/karts/kart.cpp | 16 +++++++++++++---
 src/karts/kart.hpp |  4 +++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 9a5a65df4..811a14225 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -1445,7 +1445,7 @@ void Kart::update(float dt)
     }
 
     PROFILER_PUSH_CPU_MARKER("Kart::Update (material)", 0x60, 0x34, 0x7F);
-    handleMaterialGFX();
+    handleMaterialGFX(dt);
     const Material* material=m_terrain_info->getMaterial();
     if (!material)   // kart falling off the track
     {
@@ -1764,7 +1764,7 @@ void Kart::handleMaterialSFX(const Material *material)
  *  kart is falling, or if the surface the kart is driving on has
  *  the 'isBelowSurface' property set.
  */
-void Kart::handleMaterialGFX()
+void Kart::handleMaterialGFX(float dt)
 {
     const Material *material = getMaterial();
 
@@ -1798,12 +1798,22 @@ void Kart::handleMaterialGFX()
     // --------------------------------------------------------------
     if (m_controller->isLocalPlayerController() && !hasFinishedRace())
     {
+        bool falling = material && material->hasFallingEffect() && !m_flying;
+        if (falling)
+        {
+            m_falling_time -= dt;
+            if (m_falling_time < 0.0f)
+                m_falling_time = 0.0f;
+        }
+        else
+            m_falling_time = 0.35f;
+
         for(unsigned int i=0; i<Camera::getNumCameras(); i++)
         {
             Camera *camera = Camera::getCamera(i);
             if(camera->getKart()!=this) continue;
 
-            if (material && material->hasFallingEffect() && !m_flying)
+            if (falling && m_falling_time <= 0.0f)
             {
                 camera->setMode(Camera::CM_FALLING);
             }
diff --git a/src/karts/kart.hpp b/src/karts/kart.hpp
index 6353f2022..85598ec37 100644
--- a/src/karts/kart.hpp
+++ b/src/karts/kart.hpp
@@ -193,6 +193,8 @@ protected:
     float           m_finish_time;
     bool            m_finished_race;
 
+    float           m_falling_time = 0.35f;
+
     /** When a kart has its view blocked by the plunger, this variable will be
      *  > 0 the number it contains is the time left before removing plunger. */
     float         m_view_blocked_by_plunger;
@@ -229,7 +231,7 @@ protected:
 
     void          updatePhysics(float dt);
     void          handleMaterialSFX(const Material *material);
-    void          handleMaterialGFX();
+    void          handleMaterialGFX(float dt);
     void          updateFlying();
     void          updateSliding();
     void          updateEnginePowerAndBrakes(float dt);

From 039a7d0ecc5842dcab50696d72437b48242aa752 Mon Sep 17 00:00:00 2001
From: QwertyChouskie <qwertychouskie@users.noreply.github.com>
Date: Wed, 6 Sep 2017 17:22:05 -0700
Subject: [PATCH 102/125] Put screenshots in
 ~/.local/share/supertuxkart/screenshots (#2932)

* Put screenshots in ~/.local/share/supertuxkart/screenshots

Instead of `~/.cache/supertuxkart/screenshots`.

* whoops :(
---
 src/io/file_manager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/io/file_manager.cpp b/src/io/file_manager.cpp
index 8aea5e793..e228bfcfb 100644
--- a/src/io/file_manager.cpp
+++ b/src/io/file_manager.cpp
@@ -960,7 +960,8 @@ void FileManager::checkAndCreateScreenshotDir()
     m_screenshot_dir  = getenv("HOME");
     m_screenshot_dir += "/Library/Application Support/SuperTuxKart/Screenshots/";
 #else
-    m_screenshot_dir = checkAndCreateLinuxDir("XDG_CACHE_HOME", "supertuxkart", ".cache/", ".");
+    m_screenshot_dir  = checkAndCreateLinuxDir("XDG_DATA_HOME", "supertuxkart",
+                                          ".local/share", ".stkscreenshots");
     m_screenshot_dir += "screenshots/";
 #endif
 

From f96863c421123858cfbc661a58f839790177c27b Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Fri, 8 Sep 2017 00:28:34 +0200
Subject: [PATCH 103/125] Add a possibility to totally disable particles.

Particles cause a crash on some radeon devices, so people can at least disable it to make the game working.
Also tfb causes quite big slowdown on slow devices even if there is no particles displayed, so it can give few more fps.
---
 data/gui/custom_video_settings.stkgui         | 18 ++++++++----------
 src/animations/three_d_animation.cpp          |  3 ++-
 src/config/user_config.hpp                    |  6 +++---
 src/graphics/explosion.cpp                    | 13 ++++++++++---
 src/items/attachment.cpp                      |  4 ++--
 src/karts/kart.cpp                            |  6 +++---
 src/karts/kart_gfx.cpp                        | 12 +++---------
 src/main.cpp                                  |  4 ++--
 src/modes/world.cpp                           |  2 +-
 .../dialogs/custom_video_settings.cpp         | 10 ++++++++--
 src/states_screens/options_screen_video.cpp   | 19 ++++++++++++-------
 src/states_screens/options_screen_video.hpp   |  2 +-
 src/tracks/model_definition_loader.cpp        |  2 +-
 src/tracks/track.cpp                          |  4 ++--
 src/tracks/track_object_presentation.cpp      |  6 +++---
 15 files changed, 61 insertions(+), 50 deletions(-)

diff --git a/data/gui/custom_video_settings.stkgui b/data/gui/custom_video_settings.stkgui
index be2b29448..06a677405 100644
--- a/data/gui/custom_video_settings.stkgui
+++ b/data/gui/custom_video_settings.stkgui
@@ -132,16 +132,6 @@
 
             <spacer height="4" width="10" />
 
-            <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="anim_gfx"/>
-                <spacer width="10" height="10"/>
-                <label text="Animated Scenery" I18N="Video settings"/>
-            </div>
-        </div>
-
-        <spacer height="4" width="10" />
-
-        <div layout="horizontal-row" width="100%" proportion="1">
             <div layout="horizontal-row" proportion="1" height="fit">
                 <checkbox id="texture_compression"/>
                 <spacer width="10" height="10"/>
@@ -151,6 +141,14 @@
 
         <spacer height="20" width="10" />
 
+        <div layout="horizontal-row" width="100%" proportion="1">
+            <label text="Animated Scenery" I18N="Video settings" width="40%"/>
+            <spacer width="10" height="10"/>
+            <gauge id="anim_gfx" min_value="0" max_value="2" width="50%" />
+        </div>
+
+        <spacer height="4" width="10" />
+
         <div layout="horizontal-row" width="100%" proportion="1">
             <label text="Animated Characters" I18N="Video settings" width="40%"/>
             <spacer width="10" height="10"/>
diff --git a/src/animations/three_d_animation.cpp b/src/animations/three_d_animation.cpp
index d6446aed0..242324297 100644
--- a/src/animations/three_d_animation.cpp
+++ b/src/animations/three_d_animation.cpp
@@ -73,7 +73,8 @@ ThreeDAnimation::~ThreeDAnimation()
  */
 void ThreeDAnimation::update(float dt)
 {
-    //if ( UserConfigParams::m_graphical_effects || m_important_animation )
+    //if (UserConfigParams::m_graphical_effects > 1 || 
+    //    (UserConfigParams::m_graphical_effects > 0 && m_important_animation))
     {
         Vec3 xyz   = m_object->getPosition();
         Vec3 scale = m_object->getScale();
diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index bf059c058..457c19192 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -727,9 +727,9 @@ namespace UserConfigParams
 #define FBO_DEFAULT true
 #endif
 
-    PARAM_PREFIX BoolUserConfigParam        m_graphical_effects
-            PARAM_DEFAULT(  BoolUserConfigParam(true, "anim_gfx",
-                            &m_graphics_quality, "Scenery animations") );
+    PARAM_PREFIX IntUserConfigParam        m_graphical_effects
+            PARAM_DEFAULT(  IntUserConfigParam(2, "anim_gfx",
+                            &m_graphics_quality, "Scenery animations: 0 disabled, 1 only important, 2 enabled") );
 
     // This saves the actual user preference.
     PARAM_PREFIX IntUserConfigParam        m_xmas_mode
diff --git a/src/graphics/explosion.cpp b/src/graphics/explosion.cpp
index 4ce9b7493..ab0a9fbfa 100644
--- a/src/graphics/explosion.cpp
+++ b/src/graphics/explosion.cpp
@@ -20,6 +20,7 @@
 
 #include "audio/sfx_base.hpp"
 #include "audio/sfx_manager.hpp"
+#include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/material.hpp"
 #include "graphics/material_manager.hpp"
@@ -44,7 +45,12 @@ Explosion::Explosion(const Vec3& coord, const char* explosion_sound, const char
 #ifndef SERVER_ONLY
     ParticleKindManager* pkm = ParticleKindManager::get();
     ParticleKind* particles = pkm->getParticles(particle_file);
-    m_emitter = new ParticleEmitter(particles, coord,  NULL);
+    m_emitter = NULL;
+    
+    if (UserConfigParams::m_graphical_effects > 0)
+    {
+        m_emitter = new ParticleEmitter(particles, coord,  NULL);
+    }
 #endif
 }   // Explosion
 
@@ -76,7 +82,8 @@ bool Explosion::updateAndDelete(float dt)
     m_remaining_time -= dt;
 
 #ifndef SERVER_ONLY
-    if (m_remaining_time < 0.0f && m_remaining_time >= -explosion_time)
+    if (m_remaining_time < 0.0f && m_remaining_time >= -explosion_time &&
+        m_emitter != NULL)
     {
         scene::ISceneNode* node = m_emitter->getNode();
         
@@ -106,7 +113,7 @@ bool Explosion::updateAndDelete(float dt)
 #ifndef SERVER_ONLY
         // if framerate is very low, emit for at least a few frames, in case
         // burst time is lower than the time of 1 frame
-        if (m_emission_frames > 2)
+        if (m_emission_frames > 2 && m_emitter != NULL)
         {
             // Stop the emitter and wait a little while for all particles to have time to fade out
             m_emitter->getNode()->getEmitter()->setMinParticlesPerSecond(0);
diff --git a/src/items/attachment.cpp b/src/items/attachment.cpp
index 5c22afe5b..b4b1dfd9f 100644
--- a/src/items/attachment.cpp
+++ b/src/items/attachment.cpp
@@ -153,7 +153,7 @@ void Attachment::set(AttachmentType type, float time,
         break;
     }   // switch(type)
 
-    if (!UserConfigParams::m_graphical_effects)
+    if (UserConfigParams::m_graphical_effects < 2)
     {
         m_node->setAnimationSpeed(0);
         m_node->setCurrentFrame(0);
@@ -190,7 +190,7 @@ void Attachment::set(AttachmentType type, float time,
 
         m_time_left = m_time_left * speed_mult;
 
-        if (UserConfigParams::m_graphical_effects)
+        if (UserConfigParams::m_graphical_effects > 1)
         {
             // .blend was created @25 (<10 real, slow computer), make it faster
             m_node->setAnimationSpeed(50);
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 811a14225..9d5b1586a 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -1773,7 +1773,7 @@ void Kart::handleMaterialGFX(float dt)
     // something with the wheels, and the material has not the
     // below surface property set.
     if (material && isOnGround() && !material->isBelowSurface() &&
-        !getKartAnimation()      && UserConfigParams::m_graphical_effects)
+        !getKartAnimation()      && UserConfigParams::m_graphical_effects > 1)
     {
 
         // Get the appropriate particle data depending on
@@ -1825,7 +1825,7 @@ void Kart::handleMaterialGFX(float dt)
         }   // for i in all cameras for this kart
     }   // camera != final camera
 
-    if (!UserConfigParams::m_graphical_effects)
+    if (UserConfigParams::m_graphical_effects < 2)
         return;
 
     // Use the middle of the contact points of the two rear wheels
@@ -2108,7 +2108,7 @@ void Kart::crashed(const Material *m, const Vec3 &normal)
     {
 #ifndef SERVER_ONLY
         std::string particles = m->getCrashResetParticles();
-        if (particles.size() > 0)
+        if (particles.size() > 0 && UserConfigParams::m_graphical_effects > 0)
         {
             ParticleKind* kind =
                 ParticleKindManager::get()->getParticles(particles);
diff --git a/src/karts/kart_gfx.cpp b/src/karts/kart_gfx.cpp
index 5d44de431..69f20e8aa 100644
--- a/src/karts/kart_gfx.cpp
+++ b/src/karts/kart_gfx.cpp
@@ -45,13 +45,6 @@ KartGFX::KartGFX(const AbstractKart *kart, RaceManager::KartType type, bool is_d
     m_kart = kart;
     m_wheel_toggle = 0;
     m_skid_level = 0;
-    
-    //if(!UserConfigParams::m_graphical_effects)
-    //{
-    //    for(unsigned int i=0; i<KGFX_COUNT; i++)
-    //        m_all_emitters.push_back(NULL);
-    //    return;
-    //}
 
     const KartModel *km = m_kart->getKartModel();
     const float length = km->getLength();
@@ -173,9 +166,10 @@ void KartGFX::addEffect(KartGFXType type, const std::string &file_name,
                         const Vec3 &position, bool important)
 {
 #ifndef SERVER_ONLY
-    if ((!UserConfigParams::m_graphical_effects || !CVS->isGLSL()) &&
+    if (((UserConfigParams::m_graphical_effects < 2 || !CVS->isGLSL()) &&
         (!important || m_kart->getType() == RaceManager::KT_AI ||
-        m_kart->getType() == RaceManager::KT_SPARE_TIRE))
+        m_kart->getType() == RaceManager::KT_SPARE_TIRE)) ||
+        UserConfigParams::m_graphical_effects < 1)
     {
         m_all_emitters.push_back(NULL);
         return;
diff --git a/src/main.cpp b/src/main.cpp
index 67a3129f5..1726a918b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -805,9 +805,9 @@ int handleCmdLinePreliminary()
         UserConfigParams::m_gi = false;
     // animated scenery
     if (CommandLine::has("--enable-gfx"))
-        UserConfigParams::m_graphical_effects = true;
+        UserConfigParams::m_graphical_effects = 2;
     else if (CommandLine::has("--disable-gfx"))
-        UserConfigParams::m_graphical_effects = false;
+        UserConfigParams::m_graphical_effects = 0;
     if (CommandLine::has("--enable-motion-blur"))
         UserConfigParams::m_motionblur = true;
     else if (CommandLine::has("--disable-motion-blur"))
diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index c48bfdede..93ae8c83d 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -1007,7 +1007,7 @@ void World::update(float dt)
     }
 
     PROFILER_PUSH_CPU_MARKER("World::update (weather)", 0x80, 0x7F, 0x00);
-    if (UserConfigParams::m_graphical_effects && Weather::getInstance())
+    if (UserConfigParams::m_graphical_effects > 1 && Weather::getInstance())
     {
         Weather::getInstance()->update(dt);
     }
diff --git a/src/states_screens/dialogs/custom_video_settings.cpp b/src/states_screens/dialogs/custom_video_settings.cpp
index 786e2041b..939320533 100644
--- a/src/states_screens/dialogs/custom_video_settings.cpp
+++ b/src/states_screens/dialogs/custom_video_settings.cpp
@@ -58,9 +58,15 @@ CustomVideoSettingsDialog::~CustomVideoSettingsDialog()
 void CustomVideoSettingsDialog::beforeAddingWidgets()
 {
 #ifndef SERVER_ONLY
-    getWidget<CheckBoxWidget>("anim_gfx")->setState(UserConfigParams::m_graphical_effects);
     getWidget<CheckBoxWidget>("weather_gfx")->setState(UserConfigParams::m_weather_effects);
     getWidget<CheckBoxWidget>("dof")->setState(UserConfigParams::m_dof);
+    
+    SpinnerWidget* anim_gfx = getWidget<SpinnerWidget>("anim_gfx");
+    assert(anim_gfx != NULL);
+    anim_gfx->addLabel(_("Disabled"));
+    anim_gfx->addLabel(_("Important only"));
+    anim_gfx->addLabel(_("Enabled"));
+    anim_gfx->setValue(UserConfigParams::m_graphical_effects);
 
     SpinnerWidget* kart_anim = getWidget<SpinnerWidget>("steering_animations");
     kart_anim->addLabel(_("Disabled")); // 0
@@ -179,7 +185,7 @@ GUIEngine::EventPropagation CustomVideoSettingsDialog::processEvent(const std::s
             getWidget<CheckBoxWidget>("texture_compression")->getState();
 
         UserConfigParams::m_graphical_effects =
-            getWidget<CheckBoxWidget>("anim_gfx")->getState();
+            getWidget<SpinnerWidget>("anim_gfx")->getValue();
 
         UserConfigParams::m_weather_effects =
             getWidget<CheckBoxWidget>("weather_gfx")->getState();
diff --git a/src/states_screens/options_screen_video.cpp b/src/states_screens/options_screen_video.cpp
index 9b2980578..611bc043d 100644
--- a/src/states_screens/options_screen_video.cpp
+++ b/src/states_screens/options_screen_video.cpp
@@ -54,7 +54,7 @@ void OptionsScreenVideo::initPresets()
     ({
         false /* light */, 0 /* shadow */, false /* bloom */, false /* motionblur */,
         false /* lightshaft */, false /* glow */, false /* mlaa */, false /* ssao */, false /* weather */,
-        false /* animatedScenery */, 0 /* animatedCharacters */, 0 /* image_quality */,
+        1 /* animatedScenery */, 0 /* animatedCharacters */, 0 /* image_quality */,
         false /* depth of field */, false /* global illumination */, true /* degraded IBL */
     });
 
@@ -62,7 +62,7 @@ void OptionsScreenVideo::initPresets()
     ({
         false /* light */, 0 /* shadow */, false /* bloom */, false /* motionblur */,
         false /* lightshaft */, false /* glow */, false /* mlaa */, false /* ssao */, false /* weather */,
-        true /* animatedScenery */, 1 /* animatedCharacters */, 1 /* image_quality */,
+        2 /* animatedScenery */, 1 /* animatedCharacters */, 1 /* image_quality */,
         false /* depth of field */, false /* global illumination */, true /* degraded IBL */
     });
 
@@ -70,7 +70,7 @@ void OptionsScreenVideo::initPresets()
     ({
         true /* light */, 0 /* shadow */, false /* bloom */, false /* motionblur */,
         false /* lightshaft */, false /* glow */, false /* mlaa */, false /* ssao */, true /* weather */,
-        true /* animatedScenery */, 1 /* animatedCharacters */, 2 /* image_quality */,
+        2 /* animatedScenery */, 1 /* animatedCharacters */, 2 /* image_quality */,
         false /* depth of field */, false /* global illumination */, true /* degraded IBL */
     });
 
@@ -78,7 +78,7 @@ void OptionsScreenVideo::initPresets()
     ({
         true /* light */, 0 /* shadow */, false /* bloom */, true /* motionblur */,
         true /* lightshaft */, true /* glow */, true /* mlaa */, false /* ssao */, true /* weather */,
-        true /* animatedScenery */, 1 /* animatedCharacters */, 2 /* image_quality */,
+        2 /* animatedScenery */, 1 /* animatedCharacters */, 2 /* image_quality */,
         false /* depth of field */, false /* global illumination */, false /* degraded IBL */
     });
 
@@ -86,7 +86,7 @@ void OptionsScreenVideo::initPresets()
     ({
         true /* light */, 512 /* shadow */, true /* bloom */, true /* motionblur */,
         true /* lightshaft */, true /* glow */, true /* mlaa */, true /* ssao */, true /* weather */,
-        true /* animatedScenery */,
+        2 /* animatedScenery */,
 #ifndef SERVER_ONLY
         (SharedGPUObjects::getMaxMat4Size() > 512 || !CVS->supportsHardwareSkinning() ? 2 : 1),
 #else
@@ -100,7 +100,7 @@ void OptionsScreenVideo::initPresets()
     ({
         true /* light */, 1024 /* shadow */, true /* bloom */, true /* motionblur */,
         true /* lightshaft */, true /* glow */, true /* mlaa */, true /* ssao */, true /* weather */,
-        true /* animatedScenery */,
+        2 /* animatedScenery */,
 #ifndef SERVER_ONLY
         (SharedGPUObjects::getMaxMat4Size() > 512 || !CVS->supportsHardwareSkinning() ? 2 : 1),
 #else
@@ -458,6 +458,8 @@ void OptionsScreenVideo::updateTooltip()
     const core::stringw me = _LTR("Me Only");
     //I18N: if no kart animations are enabled
     const core::stringw none = _LTR("None");
+    //I18N: if only important animated scenery is enabled
+    const core::stringw important_only = _LTR("Important only");
 
     //I18N: in the graphical options tooltip;
     // indicates the rendered image quality is very low
@@ -477,7 +479,10 @@ void OptionsScreenVideo::updateTooltip()
 //                                  UserConfigParams::m_pixel_shaders ? enabled : disabled);
     //I18N: in graphical options
     tooltip = _("Animated Scenery: %s",
-        UserConfigParams::m_graphical_effects ? enabled : disabled);
+        UserConfigParams::m_graphical_effects == 2 ? enabled : 
+        UserConfigParams::m_graphical_effects == 1 ? important_only : 
+        disabled);
+        
     //I18N: in graphical options
     tooltip = tooltip + L"\n" + _("Weather Effects: %s",
         UserConfigParams::m_weather_effects ? enabled : disabled);
diff --git a/src/states_screens/options_screen_video.hpp b/src/states_screens/options_screen_video.hpp
index 95f966655..c37b1c5ec 100644
--- a/src/states_screens/options_screen_video.hpp
+++ b/src/states_screens/options_screen_video.hpp
@@ -36,7 +36,7 @@ struct GFXPreset
     bool mlaa;
     bool ssao;
     bool weather;
-    bool animatedScenery;
+    int animatedScenery;
     int animatedCharacters;
     int image_quality;
     /** Depth of field */
diff --git a/src/tracks/model_definition_loader.cpp b/src/tracks/model_definition_loader.cpp
index 1217e1a65..f3bef39a6 100644
--- a/src/tracks/model_definition_loader.cpp
+++ b/src/tracks/model_definition_loader.cpp
@@ -76,7 +76,7 @@ LODNode* ModelDefinitionLoader::instanciateAsLOD(const XMLNode* node, scene::ISc
         for (unsigned int m=0; m<group.size(); m++)
         {
             if (group[m].m_skeletal_animation &&
-                (UserConfigParams::m_graphical_effects ||
+                (UserConfigParams::m_graphical_effects > 1 ||
                 World::getWorld()->getIdent() == IDENT_CUTSCENE))
             {
                 scene::IAnimatedMesh* a_mesh = irr_driver->getAnimatedMesh(group[m].m_model_file);
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 1b2b5f51d..7168c3663 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -1522,7 +1522,7 @@ void Track::createWater(const XMLNode &node)
     */
     scene::ISceneNode* scene_node = NULL;
     /*
-    if (UserConfigParams::m_graphical_effects)
+    if (UserConfigParams::m_graphical_effects > 1)
     {
         scene::IMesh *welded;
         scene_node = irr_driver->addWaterNode(mesh, &welded,
@@ -2003,7 +2003,7 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
         }
         else if (name == "particle-emitter")
         {
-            if (UserConfigParams::m_graphical_effects)
+            if (UserConfigParams::m_graphical_effects > 1)
             {
                 m_track_object_manager->add(*node, parent, model_def_loader, parent_library);
             }
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 8f70e1ee6..f233524e1 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -401,7 +401,7 @@ TrackObjectPresentationMesh::TrackObjectPresentationMesh(
         m_is_in_skybox = true;
     }
 
-    bool animated = skeletal_animation && (UserConfigParams::m_graphical_effects ||
+    bool animated = skeletal_animation && (UserConfigParams::m_graphical_effects > 1 ||
                      World::getWorld()->getIdent() == IDENT_CUTSCENE);
     bool displacing = false;
     xml_node.get("displacing", &displacing);
@@ -467,7 +467,7 @@ TrackObjectPresentationMesh::TrackObjectPresentationMesh(
     m_node         = NULL;
     m_is_in_skybox = false;
     m_render_info  = NULL;
-    bool animated  = (UserConfigParams::m_graphical_effects ||
+    bool animated  = (UserConfigParams::m_graphical_effects > 1 ||
                       World::getWorld()->getIdent() == IDENT_CUTSCENE);
 
     m_model_file = model_file;
@@ -512,7 +512,7 @@ void TrackObjectPresentationMesh::init(const XMLNode* xml_node,
     if(xml_node)
         xml_node->get("skeletal-animation", &skeletal_animation);
 
-    bool animated = skeletal_animation && (UserConfigParams::m_graphical_effects ||
+    bool animated = skeletal_animation && (UserConfigParams::m_graphical_effects > 1 ||
              World::getWorld()->getIdent() == IDENT_CUTSCENE);
     bool displacing = false;
     std::string interaction;

From 4610572649fd0c14f8640a5a67800fb3ca8676ea Mon Sep 17 00:00:00 2001
From: deve <deveee@gmail.com>
Date: Fri, 8 Sep 2017 06:25:21 +0200
Subject: [PATCH 104/125] Don't draw explosion particles if only important
 effects are selected in options.

It causes slowdown on some devices, i.e. from 30fps to 5fps when explosion occurs very near of the camera. So disable it for lowest graphical level.
---
 src/graphics/explosion.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/explosion.cpp b/src/graphics/explosion.cpp
index ab0a9fbfa..e62ebcbf9 100644
--- a/src/graphics/explosion.cpp
+++ b/src/graphics/explosion.cpp
@@ -47,7 +47,7 @@ Explosion::Explosion(const Vec3& coord, const char* explosion_sound, const char
     ParticleKind* particles = pkm->getParticles(particle_file);
     m_emitter = NULL;
     
-    if (UserConfigParams::m_graphical_effects > 0)
+    if (UserConfigParams::m_graphical_effects > 1)
     {
         m_emitter = new ParticleEmitter(particles, coord,  NULL);
     }

From fd00ef4d92d9a2f4e3f5e0e0186461acfb76874d Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sat, 9 Sep 2017 21:25:56 +0200
Subject: [PATCH 105/125] Fixed a crash in grand prix editor

---
 src/states_screens/grand_prix_editor_screen.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/states_screens/grand_prix_editor_screen.cpp b/src/states_screens/grand_prix_editor_screen.cpp
index e3eae21b0..c859f22b4 100644
--- a/src/states_screens/grand_prix_editor_screen.cpp
+++ b/src/states_screens/grand_prix_editor_screen.cpp
@@ -315,8 +315,15 @@ void GrandPrixEditorScreen::onConfirm()
     {
         grand_prix_manager->remove(m_selection->getId());
         loadGPList();
+        
         if (grand_prix_manager->getNumberOfGrandPrix() > 0)
-            setSelection (grand_prix_manager->getGrandPrix(0));
+        {
+            setSelection(grand_prix_manager->getGrandPrix(0));
+        }
+        else
+        {
+            setSelection(NULL);
+        }
     }
     ModalDialog::dismiss();
 }

From 6829bb1e513866a189e7f32e403b7d18d4a5e26f Mon Sep 17 00:00:00 2001
From: deve <deveee@gmail.com>
Date: Tue, 12 Sep 2017 06:10:23 +0200
Subject: [PATCH 106/125] Fixed aspect ratio for icon button widget.

It happened when using non-hd textures. Textures with aspect ratio != 1, are scaled to MAX_TEXTURE_SIZE, for example from 512x256 to 256x256, so we can't base on scaled texture size.

Btw. such behaviour seems to not have a sense (for example 2048x256 will be scaled down to 256x256), so it may need some work in stk_texture.cpp.
---
 src/guiengine/widgets/icon_button_widget.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/guiengine/widgets/icon_button_widget.cpp b/src/guiengine/widgets/icon_button_widget.cpp
index 379af20fe..b4bd8ef0b 100644
--- a/src/guiengine/widgets/icon_button_widget.cpp
+++ b/src/guiengine/widgets/icon_button_widget.cpp
@@ -125,7 +125,9 @@ void IconButtonWidget::add()
 
     if (m_scale_mode == SCALE_MODE_KEEP_TEXTURE_ASPECT_RATIO)
     {
-        useAspectRatio = (float)m_texture_w / (float)m_texture_h;
+        assert(m_texture->getOriginalSize().Height > 0);
+        useAspectRatio = (float)m_texture->getOriginalSize().Width / 
+                         (float)m_texture->getOriginalSize().Height;
     }
     else if (m_scale_mode == SCALE_MODE_KEEP_CUSTOM_ASPECT_RATIO)
     {

From be4d0e7208860fe9dc498442793489994d6e2591 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Tue, 12 Sep 2017 20:14:10 +0200
Subject: [PATCH 107/125] Fixed a crash when starting ghost replay

---
 src/karts/kart.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 9d5b1586a..b26329438 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -377,8 +377,6 @@ void Kart::reset()
     if(m_body)
         m_body->setDamping(m_kart_properties->getStabilityChassisLinearDamping(),
                            m_kart_properties->getStabilityChassisAngularDamping());
-    for (unsigned int i = 0; i < 4; i++)
-        m_vehicle->getWheelInfo(i).m_steering = 0;
 
     if(m_terrain_sound)
     {
@@ -396,8 +394,14 @@ void Kart::reset()
 
     m_controls.reset();
     m_slipstream->reset();
+    
     if(m_vehicle)
     {
+        for (unsigned int i = 0; i < 4; i++)
+        {
+            m_vehicle->getWheelInfo(i).m_steering = 0;
+        }
+            
         m_vehicle->reset();
     }
 

From e615ff67d69f90f4f6e47b7ed01a8dc10dffccba Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Tue, 12 Sep 2017 23:49:35 +0200
Subject: [PATCH 108/125] Don't use gl functions that are not available in core
 context.

Fixes some driver warnings.
---
 lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp         |  6 ++++--
 .../source/Irrlicht/COpenGLExtensionHandler.cpp        | 10 ++++++++--
 lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp b/lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp
index 2d58a401a..e78f2fc91 100644
--- a/lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp
+++ b/lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp
@@ -809,7 +809,7 @@ bool COpenGLDriver::genericDriverInit()
 	u32 i;
 	CurrentTexture.clear();
 	// load extensions
-	initExtensions(Params.Stencilbuffer);
+	initExtensions(Params.Stencilbuffer, useCoreContext);
 	if (queryFeature(EVDF_ARB_GLSL))
 	{
 		char buf[32];
@@ -872,9 +872,11 @@ bool COpenGLDriver::genericDriverInit()
 
 	glClearDepth(1.0);
 	if (!useCoreContext)
+	{
 		glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+		glHint(GL_POINT_SMOOTH_HINT, GL_FASTEST);
+	}
 	glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
-	glHint(GL_POINT_SMOOTH_HINT, GL_FASTEST);
 	glDepthFunc(GL_LEQUAL);
 	glFrontFace(GL_CW);
 	// adjust flat coloring scheme to DirectX version
diff --git a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.cpp b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.cpp
index 095083ef6..8b7afb0ad 100644
--- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.cpp
+++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.cpp
@@ -327,7 +327,7 @@ void COpenGLExtensionHandler::dumpFramebufferFormats() const
 }
 
 
-void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
+void COpenGLExtensionHandler::initExtensions(bool stencilBuffer, bool useCoreContext)
 {
 	const f32 ogl_ver = core::fast_atof(reinterpret_cast<const c8*>(glGetString(GL_VERSION)));
 	Version = static_cast<u16>(core::floor32(ogl_ver)*100+core::round32(core::fract(ogl_ver)*10.0f));
@@ -337,9 +337,15 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
 		os::Printer::log("OpenGL driver version is not 1.2 or better.", ELL_WARNING);
 
 	{
-		const char* t = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS));
+		const char* t = NULL;
 		size_t len = 0;
 		c8 *str = 0;
+		
+		if (!useCoreContext)
+		{
+			t = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS));
+		}
+		
 		if (t)
 		{
 			len = strlen(t);
diff --git a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
index 757d416ee..597c71b6e 100644
--- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
+++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
@@ -924,7 +924,7 @@ class COpenGLExtensionHandler
 	COpenGLExtensionHandler();
 
 	// deferred initialization
-	void initExtensions(bool stencilBuffer);
+	void initExtensions(bool stencilBuffer, bool useCoreContext);
 
 	//! queries the features of the driver, returns true if feature is available
 	bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const;

From 6500cf716a4c8ad5b9c62f0960b9a7b89406eafa Mon Sep 17 00:00:00 2001
From: deve <deveee@gmail.com>
Date: Wed, 13 Sep 2017 06:18:07 +0200
Subject: [PATCH 109/125] Use better names in touch device settings

---
 data/gui/multitouch_settings.stkgui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/gui/multitouch_settings.stkgui b/data/gui/multitouch_settings.stkgui
index 9107dc109..9704560a9 100644
--- a/data/gui/multitouch_settings.stkgui
+++ b/data/gui/multitouch_settings.stkgui
@@ -42,7 +42,7 @@
         <label width="100%" I18N="In the multitouch settings screen" text="Advanced"/>
 
         <div width="75%" layout="horizontal-row" proportion="1">
-            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Deadzone center"/>
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Deadzone"/>
             <div proportion="1" align="center" height="fit" layout="horizontal-row" >
                 <spacer width="40" height="10" />
                 <gauge id="deadzone_center" proportion="1" min_value="0" max_value="50"/>
@@ -50,7 +50,7 @@
         </div>
 
         <div width="75%" layout="horizontal-row" proportion="1">
-            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Deadzone edge"/>
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Sensitivity"/>
             <div proportion="1" align="center" height="fit" layout="horizontal-row" >
                 <spacer width="40" height="10" />
                 <gauge id="deadzone_edge" proportion="1" min_value="0" max_value="50"/>

From 9681a9586fe30b1f2f0e4eb1e7ed5d21f3b5b602 Mon Sep 17 00:00:00 2001
From: deve <deveee@gmail.com>
Date: Wed, 13 Sep 2017 06:20:20 +0200
Subject: [PATCH 110/125] Update supertuxkart.pot

---
 data/po/supertuxkart.pot | 108 +++++++++++++++++++++------------------
 1 file changed, 58 insertions(+), 50 deletions(-)

diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index eeaf75bb7..4c0323a95 100644
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: supertuxkart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-30 06:48+0200\n"
+"POT-Creation-Date: 2017-09-13 06:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -181,7 +181,7 @@ msgstr ""
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/grand_prix_editor_screen.cpp:330
+#: src/states_screens/grand_prix_editor_screen.cpp:337
 msgid "Standard"
 msgstr ""
 
@@ -195,7 +195,7 @@ msgstr ""
 #. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:83
 #: src/states_screens/easter_egg_screen.cpp:145
-#: src/states_screens/grand_prix_editor_screen.cpp:332
+#: src/states_screens/grand_prix_editor_screen.cpp:339
 #: src/states_screens/kart_selection.cpp:286
 #: src/states_screens/tracks_and_gp_screen.cpp:148
 msgid "Add-Ons"
@@ -215,7 +215,7 @@ msgstr ""
 #: src/states_screens/easter_egg_screen.cpp:137
 #: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/gp_info_screen.cpp:76
-#: src/states_screens/grand_prix_editor_screen.cpp:329
+#: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:278
 #: src/states_screens/options_screen_video.cpp:456
 #: src/states_screens/tracks_and_gp_screen.cpp:138
@@ -333,12 +333,12 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-msgid "Animated Scenery"
+msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-msgid "Texture compression"
+msgid "Animated Scenery"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
@@ -926,12 +926,12 @@ msgstr ""
 
 #. I18N: ./data/gui/multitouch_settings.stkgui
 #. I18N: In the multitouch settings screen
-msgid "Deadzone center"
+msgid "Deadzone"
 msgstr ""
 
 #. I18N: ./data/gui/multitouch_settings.stkgui
 #. I18N: In the multitouch settings screen
-msgid "Deadzone edge"
+msgid "Sensitivity"
 msgstr ""
 
 #. I18N: ./data/gui/multitouch_settings.stkgui
@@ -1419,6 +1419,7 @@ msgstr ""
 #. I18N: In the audio options screen
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is enabled
+#: src/states_screens/dialogs/custom_video_settings.cpp:68
 #: src/states_screens/options_screen_video.cpp:451
 msgid "Enabled"
 msgstr ""
@@ -2714,11 +2715,11 @@ msgstr[1] ""
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
-#: src/karts/controller/local_player_controller.cpp:244
+#: src/karts/controller/local_player_controller.cpp:241
 msgid "Penalty time!!"
 msgstr ""
 
-#: src/karts/controller/local_player_controller.cpp:246
+#: src/karts/controller/local_player_controller.cpp:243
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -2730,11 +2731,11 @@ msgstr ""
 msgid "+1 life."
 msgstr ""
 
-#: src/karts/kart.cpp:903 src/karts/kart.cpp:908
+#: src/karts/kart.cpp:908 src/karts/kart.cpp:913
 msgid "You won the race!"
 msgstr ""
 
-#: src/karts/kart.cpp:908
+#: src/karts/kart.cpp:913
 msgid "You finished the race!"
 msgstr ""
 
@@ -2748,16 +2749,16 @@ msgid ""
 "edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
 msgstr ""
 
-#: src/main.cpp:1654
+#: src/main.cpp:1653
 msgid "Your screen resolution is too low to run STK."
 msgstr ""
 
-#: src/main.cpp:1668
+#: src/main.cpp:1667
 msgid ""
 "Your driver version is too old. Please install the latest video drivers."
 msgstr ""
 
-#: src/main.cpp:1685
+#: src/main.cpp:1684
 #, c-format
 msgid ""
 "Your OpenGL version appears to be too old. Please verify if an update for "
@@ -3128,53 +3129,60 @@ msgstr[1] ""
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
 #: src/states_screens/dialogs/custom_video_settings.cpp:66
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
-#: src/states_screens/dialogs/custom_video_settings.cpp:95
+#: src/states_screens/dialogs/custom_video_settings.cpp:72
+#: src/states_screens/dialogs/custom_video_settings.cpp:84
+#: src/states_screens/dialogs/custom_video_settings.cpp:101
 #: src/states_screens/dialogs/multitouch_settings_dialog.cpp:59
 #: src/states_screens/options_screen_video.cpp:454
 msgid "Disabled"
 msgstr ""
 
+#. I18N: if only important animated scenery is enabled
+#: src/states_screens/dialogs/custom_video_settings.cpp:67
+#: src/states_screens/options_screen_video.cpp:462
+msgid "Important only"
+msgstr ""
+
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:68
+#: src/states_screens/dialogs/custom_video_settings.cpp:74
 msgid "Human players only"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:71
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: Geometry level low : few details are displayed
 #. I18N: in the graphical options tooltip;
 #. indicates the rendered image quality is low
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
-#: src/states_screens/dialogs/custom_video_settings.cpp:89
-#: src/states_screens/dialogs/custom_video_settings.cpp:96
-#: src/states_screens/options_screen_video.cpp:467
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:95
+#: src/states_screens/dialogs/custom_video_settings.cpp:102
+#: src/states_screens/options_screen_video.cpp:469
 msgid "Low"
 msgstr ""
 
 #. I18N: Geometry level high : everything is displayed
 #. I18N: in the graphical options tooltip;
 #. indicates the rendered image quality is high
-#: src/states_screens/dialogs/custom_video_settings.cpp:82
-#: src/states_screens/dialogs/custom_video_settings.cpp:90
-#: src/states_screens/dialogs/custom_video_settings.cpp:97
-#: src/states_screens/options_screen_video.cpp:470
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
+#: src/states_screens/dialogs/custom_video_settings.cpp:96
+#: src/states_screens/dialogs/custom_video_settings.cpp:103
+#: src/states_screens/options_screen_video.cpp:472
 msgid "High"
 msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates the rendered image quality is very low
-#: src/states_screens/dialogs/custom_video_settings.cpp:88
-#: src/states_screens/options_screen_video.cpp:464
+#: src/states_screens/dialogs/custom_video_settings.cpp:94
+#: src/states_screens/options_screen_video.cpp:466
 msgid "Very Low"
 msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates the rendered image quality is very high
-#: src/states_screens/dialogs/custom_video_settings.cpp:91
-#: src/states_screens/options_screen_video.cpp:473
+#: src/states_screens/dialogs/custom_video_settings.cpp:97
+#: src/states_screens/options_screen_video.cpp:475
 msgid "Very High"
 msgstr ""
 
@@ -3405,19 +3413,19 @@ msgstr ""
 msgid "Please select a Grand Prix"
 msgstr ""
 
-#: src/states_screens/grand_prix_editor_screen.cpp:331
+#: src/states_screens/grand_prix_editor_screen.cpp:338
 msgid "User defined"
 msgstr ""
 
-#: src/states_screens/grand_prix_editor_screen.cpp:344
+#: src/states_screens/grand_prix_editor_screen.cpp:351
 msgid "Name is empty."
 msgstr ""
 
-#: src/states_screens/grand_prix_editor_screen.cpp:352
+#: src/states_screens/grand_prix_editor_screen.cpp:359
 msgid "Another grand prix with this name already exists."
 msgstr ""
 
-#: src/states_screens/grand_prix_editor_screen.cpp:358
+#: src/states_screens/grand_prix_editor_screen.cpp:365
 msgid "Name is too long."
 msgstr ""
 
@@ -3685,88 +3693,88 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders: %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:479
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Animated Scenery: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:482
+#: src/states_screens/options_screen_video.cpp:487
 #, c-format
 msgid "Weather Effects: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:485
+#: src/states_screens/options_screen_video.cpp:490
 #, c-format
 msgid "Animated Characters: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:490
+#: src/states_screens/options_screen_video.cpp:495
 #, c-format
 msgid "Dynamic lights: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:493
+#: src/states_screens/options_screen_video.cpp:498
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:496
+#: src/states_screens/options_screen_video.cpp:501
 #, c-format
 msgid "Anti-aliasing: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:499
+#: src/states_screens/options_screen_video.cpp:504
 #, c-format
 msgid "Ambient occlusion: %s"
 msgstr ""
 
-#: src/states_screens/options_screen_video.cpp:503
+#: src/states_screens/options_screen_video.cpp:508
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
-#: src/states_screens/options_screen_video.cpp:505
+#: src/states_screens/options_screen_video.cpp:510
 #, c-format
 msgid "Shadows: %i"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:508
+#: src/states_screens/options_screen_video.cpp:513
 #, c-format
 msgid "Bloom: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:512
+#: src/states_screens/options_screen_video.cpp:517
 #, c-format
 msgid "Glow (outlines): %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:516
+#: src/states_screens/options_screen_video.cpp:521
 #, c-format
 msgid "Light shaft (God rays): %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:520
+#: src/states_screens/options_screen_video.cpp:525
 #, c-format
 msgid "Depth of field: %s"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:524
+#: src/states_screens/options_screen_video.cpp:529
 #, c-format
 msgid "Global illumination: %s"
 msgstr ""
 
-#: src/states_screens/options_screen_video.cpp:529
+#: src/states_screens/options_screen_video.cpp:534
 #, c-format
 msgid "Rendered image quality: %s"
 msgstr ""

From 04cc5bb62cbf9c45c9ebc27dfea2469d07409267 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 13 Sep 2017 21:00:10 +0200
Subject: [PATCH 111/125] Make sure that music pointers are always null when
 deleted

---
 src/audio/music_information.cpp | 43 +++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/audio/music_information.cpp b/src/audio/music_information.cpp
index 455f131ce..a3e95a190 100644
--- a/src/audio/music_information.cpp
+++ b/src/audio/music_information.cpp
@@ -145,10 +145,23 @@ void MusicInformation::startMusic()
     m_time_since_faster  = 0.0f;
     m_mode               = SOUND_NORMAL;
 
-    if (m_normal_filename== "") return;
-
+    if (m_normal_music)
+    {
+        delete m_normal_music;
+        m_normal_music = NULL;
+    }
+    
+    if (m_fast_music)
+    {
+        delete m_fast_music;
+        m_fast_music = NULL;
+    }
+    
     // First load the 'normal' music
     // -----------------------------
+    if (m_normal_filename.empty())
+        return;
+    
     if (StringUtils::getExtension(m_normal_filename) != "ogg")
     {
         Log::warn("MusicInformation", "Music file %s is not found or file "
@@ -156,15 +169,13 @@ void MusicInformation::startMusic()
         return;
     }
 
-    if (m_normal_music) delete m_normal_music;
-
 #if HAVE_OGGVORBIS
     m_normal_music = new MusicOggStream(m_normal_loop_start);
 #else
     m_normal_music = new MusicDummy();
 #endif
 
-    if((m_normal_music->load(m_normal_filename)) == false)
+    if (m_normal_music->load(m_normal_filename) == false)
     {
         delete m_normal_music;
         m_normal_music = NULL;
@@ -178,18 +189,14 @@ void MusicInformation::startMusic()
 
     // Then (if available) load the music for the last track
     // -----------------------------------------------------
-    if (m_fast_music) delete m_fast_music;
-    if (m_fast_filename == "")
+    if (m_fast_filename.empty())
+        return;
+    
+    if (StringUtils::getExtension(m_fast_filename) != "ogg")
     {
-        m_fast_music = NULL;
-        return;   // no fast music
-    }
-
-    if(StringUtils::getExtension(m_fast_filename)!="ogg")
-    {
-        Log::warn(
-                "Music file %s format not recognized, fast music is ignored",
-                m_fast_filename.c_str());
+        Log::warn("MusicInformation",
+                  "Music file %s format not recognized, fast music is ignored",
+                  m_fast_filename.c_str());
         return;
     }
 
@@ -199,10 +206,10 @@ void MusicInformation::startMusic()
     m_fast_music = new MusicDummy();
 #endif
 
-    if((m_fast_music->load(m_fast_filename)) == false)
+    if (m_fast_music->load(m_fast_filename) == false)
     {
         delete m_fast_music;
-        m_fast_music=0;
+        m_fast_music = NULL;
         Log::warn("MusicInformation", "Unabled to load fast music %s, not "
                   "supported or not found.\n", m_fast_filename.c_str());
         return;

From 024b642d27bdc000f529f7013f77c9120c38555d Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Thu, 14 Sep 2017 19:24:23 -0400
Subject: [PATCH 112/125] Add margin

---
 src/guiengine/widgets/skill_level_widget.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/guiengine/widgets/skill_level_widget.cpp b/src/guiengine/widgets/skill_level_widget.cpp
index d422a0af2..a5e8cc571 100644
--- a/src/guiengine/widgets/skill_level_widget.cpp
+++ b/src/guiengine/widgets/skill_level_widget.cpp
@@ -127,8 +127,8 @@ void SkillLevelWidget::setSize(const int x, const int y, const int w, const int
     m_iconbutton_w = iconbox_w * 3 / 4; 
 
     // -- sizes
-    m_bar_w = m_w - iconbox_w;  //leaving just enough space for icon + its margin  
-    m_bar_h = h;    
+    m_bar_w = m_w - iconbox_w - 25;  //leaving just enough space for icon + its margin  
+    m_bar_h = h;
 
     // for shrinking effect
     if (h < 175)

From 32243e7eb36534229f298b292395e881e0c5d65c Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Thu, 14 Sep 2017 19:44:34 -0400
Subject: [PATCH 113/125] Update the newlt-added icons with ones whose liense
 is known

---
 data/gui/License.txt           |   4 ++++
 data/gui/mass.png              | Bin 21897 -> 6102 bytes
 data/gui/power.png             | Bin 23859 -> 5221 bytes
 data/gui/power.png.license.txt |   3 ---
 data/gui/speed.png             | Bin 30742 -> 9514 bytes
 5 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 data/gui/power.png.license.txt

diff --git a/data/gui/License.txt b/data/gui/License.txt
index 0b57b1285..6e3474c64 100644
--- a/data/gui/License.txt
+++ b/data/gui/License.txt
@@ -28,6 +28,10 @@ Gauge and bar by Totoplus62, released under CC-BY-SA 3
 
 menu_story by tavariz91, released under CC-0
 
+mass.png by Auria, released under CC-0
+
+power.png by Auria, based on https://openclipart.org/detail/193925/check-engine and https://openclipart.org/detail/144799/power-icon, released under CC-0
+
 ====
 
 Glass Skin by Auria, under CC-BY-SA 3+
diff --git a/data/gui/mass.png b/data/gui/mass.png
index e0c876830fc94a6fa01234bb228dd394fc52d370..cb7bf28c9e8745c62523929cdf2a5d39ada12642 100644
GIT binary patch
literal 6102
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

literal 21897
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
Ij#Kpi0Km7LegFUf

diff --git a/data/gui/power.png b/data/gui/power.png
index 0be43a276c78046004ee2473ea346334b82199bf..67ed97f01499dc5a9db0cf236a5fd0a983161e4c 100644
GIT binary patch
literal 5221
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

literal 23859
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

diff --git a/data/gui/power.png.license.txt b/data/gui/power.png.license.txt
deleted file mode 100644
index c10721136..000000000
--- a/data/gui/power.png.license.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This file is based on https://commons.wikimedia.org/wiki/File:Pferdestaerke.svg#
-This file is licensed under the Creative Commons Attribution-Share Alike 3.0 Unported license.
-
diff --git a/data/gui/speed.png b/data/gui/speed.png
index 50b9d61d1b4621385860b44ca0e54df62b2ccca2..5655239f16d62c5fc67d41ec35cec0b940d15862 100644
GIT binary patch
literal 9514
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
IM6N<$f+64y>;M1&

literal 30742
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


From 00660293b7d9c0b4b4f32b69921b0cde9b5dbbc5 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Fri, 15 Sep 2017 16:14:57 +0800
Subject: [PATCH 114/125] Fix #1795, fix #2755 and fix #2886

Allow using bone attachment in straight-frame static mesh.

Advanced headlight rendering with light origin from center mass
of headlight model which can be bound to any bone in kart model
---
 src/graphics/shader_based_renderer.cpp |  15 +-
 src/graphics/shader_based_renderer.hpp |   5 +-
 src/karts/abstract_kart.hpp            |   5 +-
 src/karts/kart.cpp                     |   2 +-
 src/karts/kart_gfx.cpp                 |  21 +--
 src/karts/kart_gfx.hpp                 |   6 +-
 src/karts/kart_model.cpp               | 223 ++++++++++++++-----------
 src/karts/kart_model.hpp               |  59 ++++---
 8 files changed, 181 insertions(+), 155 deletions(-)

diff --git a/src/graphics/shader_based_renderer.cpp b/src/graphics/shader_based_renderer.cpp
index 0a6aca980..3e8bf9e5a 100644
--- a/src/graphics/shader_based_renderer.cpp
+++ b/src/graphics/shader_based_renderer.cpp
@@ -153,13 +153,6 @@ void ShaderBasedRenderer::prepareForwardRenderer()
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);    
 }
 
-// ----------------------------------------------------------------------------
-void ShaderBasedRenderer::updateLightsInfo(scene::ICameraSceneNode * const camnode,
-                                           float dt)
-{
-    m_lighting_passes.updateLightsInfo(camnode, dt);
-}
-
 // ----------------------------------------------------------------------------
 /** Upload lighting info to the dedicated uniform buffer
  */
@@ -257,6 +250,10 @@ void ShaderBasedRenderer::renderScene(scene::ICameraSceneNode * const camnode,
     m_poly_count[SOLID_NORMAL_AND_DEPTH_PASS] += solid_poly_count;
     m_poly_count[SHADOW_PASS] += shadow_poly_count;
     PROFILER_POP_CPU_MARKER();
+    // For correct position of headlight in karts
+    PROFILER_PUSH_CPU_MARKER("Update Light Info", 0xFF, 0x0, 0x0);
+    m_lighting_passes.updateLightsInfo(camnode, dt);
+    PROFILER_POP_CPU_MARKER();
 
 #if !defined(USE_GLES2)    
     // Shadows
@@ -806,9 +803,6 @@ void ShaderBasedRenderer::render(float dt)
         if (!CVS->isDefferedEnabled())
             glEnable(GL_FRAMEBUFFER_SRGB);
         
-        PROFILER_PUSH_CPU_MARKER("Update Light Info", 0xFF, 0x0, 0x0);
-        m_lighting_passes.updateLightsInfo(camnode, dt);
-        PROFILER_POP_CPU_MARKER();
         PROFILER_PUSH_CPU_MARKER("UBO upload", 0x0, 0xFF, 0x0);
         computeMatrixesAndCameras(camnode, m_rtts->getWidth(), m_rtts->getHeight());
         m_shadow_matrices.updateSunOrthoMatrices();
@@ -920,7 +914,6 @@ void ShaderBasedRenderer::renderToTexture(GL3RenderTarget *render_target,
     irr_driver->getSceneManager()->setActiveCamera(camera);
 
     computeMatrixesAndCameras(camera, m_rtts->getWidth(), m_rtts->getHeight());
-    updateLightsInfo(camera, dt);
     if (CVS->isARBUniformBufferObjectUsable())
         uploadLightingData();
 
diff --git a/src/graphics/shader_based_renderer.hpp b/src/graphics/shader_based_renderer.hpp
index d5eee08a2..59a340b1e 100644
--- a/src/graphics/shader_based_renderer.hpp
+++ b/src/graphics/shader_based_renderer.hpp
@@ -60,10 +60,7 @@ private:
     void removeItemsInGlowingList();
     
     void prepareForwardRenderer();
-    
-    void updateLightsInfo(irr::scene::ICameraSceneNode * const camnode,
-                          float dt);
-                          
+
     void uploadLightingData() const;
 
     void computeMatrixesAndCameras(scene::ICameraSceneNode * const camnode,
diff --git a/src/karts/abstract_kart.hpp b/src/karts/abstract_kart.hpp
index 5bab9703c..ea1cf5f74 100644
--- a/src/karts/abstract_kart.hpp
+++ b/src/karts/abstract_kart.hpp
@@ -167,10 +167,7 @@ public:
     // Access to the graphical kart model.
     // ------------------------------------------------------------------------
     /** Returns this kart's kart model. */
-    KartModel* getKartModel() { return m_kart_model;      }
-    // ------------------------------------------------------------------------
-    /** Returns this kart's kart model. */
-    const KartModel* getKartModel() const { return m_kart_model;      }
+    KartModel* getKartModel() const { return m_kart_model;      }
     // ------------------------------------------------------------------------
     /** Returns the length of the kart. */
     float getKartLength() const { return m_kart_length; }
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index b26329438..b1659e7f0 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -235,7 +235,7 @@ void Kart::init(RaceManager::KartType type)
     }
     loadData(type, animations);
 
-    m_kart_gfx = new KartGFX(this, m_type, Track::getCurrentTrack()->getIsDuringDay());
+    m_kart_gfx = new KartGFX(this, Track::getCurrentTrack()->getIsDuringDay());
     m_skidding = new Skidding(this);
     // Create the stars effect
     m_stars_effect = new Stars(this);
diff --git a/src/karts/kart_gfx.cpp b/src/karts/kart_gfx.cpp
index 69f20e8aa..fe4e44c20 100644
--- a/src/karts/kart_gfx.cpp
+++ b/src/karts/kart_gfx.cpp
@@ -36,12 +36,11 @@
 
 #include <iostream>
 
-KartGFX::KartGFX(const AbstractKart *kart, RaceManager::KartType type, bool is_day)
+KartGFX::KartGFX(const AbstractKart *kart, bool is_day)
 {
     m_nitro_light = NULL;
     m_skidding_light_1 = NULL;
     m_skidding_light_2 = NULL;
-    m_head_light = NULL;
     m_kart = kart;
     m_wheel_toggle = 0;
     m_skid_level = 0;
@@ -80,22 +79,11 @@ KartGFX::KartGFX(const AbstractKart *kart, RaceManager::KartType type, bool is_d
                                  0.05f), /* force */0.4f, /*radius*/4.0f,
                                  1.0f, 0.0f, 0.0f, false, node);
         m_skidding_light_2->setVisible(false);
-        m_skidding_light_2->setName(("skidding emitter 2 (" + m_kart->getIdent() 
-                                                             + ")").c_str() );
-    
-        m_head_light = 
-            irr_driver->addLight(core::vector3df(0.0f, 0.2f, 1.5f * length),
-                                 /* force */ 0.5f, /*radius*/5.0f, 1.0f, 1.0f, 
-                                 1.0f, false, node);
-        m_head_light->setName( ("head light " + m_kart->getIdent() 
-                                                             + ")").c_str() );
-    
-        m_head_light->setVisible(type == RaceManager::KT_PLAYER && !is_day);
-    
+        m_skidding_light_2->setName(("skidding emitter 2 (" + m_kart->getIdent()
+                                                            + ")").c_str() );
         m_nitro_light->grab();
         m_skidding_light_1->grab();
         m_skidding_light_2->grab();
-        m_head_light->grab();
     }
 #endif
 
@@ -149,7 +137,6 @@ KartGFX::~KartGFX()
         m_nitro_light->drop();
         m_skidding_light_1->drop();
         m_skidding_light_2->drop();
-        m_head_light->drop();
     }
 #endif
 
@@ -560,7 +547,7 @@ void KartGFX::setGFXInvisible()
         m_nitro_light->setVisible(false);
         m_skidding_light_1->setVisible(false);
         m_skidding_light_2->setVisible(false);
-        m_head_light->setVisible(false);
+        m_kart->getKartModel()->turnOffHeadlights();
     }
 #endif
 }   // setGFXInvisible
diff --git a/src/karts/kart_gfx.hpp b/src/karts/kart_gfx.hpp
index d7c2929a6..16ed9a0bf 100644
--- a/src/karts/kart_gfx.hpp
+++ b/src/karts/kart_gfx.hpp
@@ -24,7 +24,6 @@
 
 #include <vector>
 #include <string>
-#include "race/race_manager.hpp"
 
 class AbstractKart;
 class ParticleEmitter;
@@ -90,15 +89,12 @@ private:
     /** A light that's shown on the second skid-level with another color. */
     irr::scene::ISceneNode* m_skidding_light_2;
 
-    /** A light that's shown on the second skid-level with another color. */
-    irr::scene::ISceneNode* m_head_light;
-
     void addEffect(KartGFXType type, const std::string &file_name,
                    const Vec3 &position, bool important);
     void resizeBox(const KartGFXType type, float new_size);
 
 public:
-         KartGFX(const AbstractKart *kart, RaceManager::KartType type, bool is_day);
+         KartGFX(const AbstractKart *kart, bool is_day);
         ~KartGFX();
     void reset();
     void setSkidLevel(const unsigned int level);
diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index c2281e5e4..3d21abe73 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -117,9 +117,7 @@ KartModel::KartModel(bool is_master)
     m_is_master  = is_master;
     m_kart       = NULL;
     m_mesh       = NULL;
-    m_hat_name   = "";
-    m_hat_node   = NULL;
-    m_hat_offset = core::vector3df(0,0,0);
+    m_hat_location = NULL;
     m_render_info = NULL;
 
     for(unsigned int i=0; i<4; i++)
@@ -159,6 +157,7 @@ KartModel::KartModel(bool is_master)
  */
 void KartModel::loadInfo(const XMLNode &node)
 {
+    node.get("version", &m_version);
     node.get("model-file", &m_model_filename);
     if(const XMLNode *animation_node=node.getNode("animations"))
     {
@@ -195,11 +194,6 @@ void KartModel::loadInfo(const XMLNode &node)
         loadWheelInfo(*wheels_node, "rear-right",  2);
         loadWheelInfo(*wheels_node, "rear-left",   3);
     }
-    
-    if (const XMLNode *headlights_node = node.getNode("headlights"))
-    {
-        loadHeadlights(*headlights_node);
-    }
 
     m_nitro_emitter_position[0] = Vec3 (0,0.1f,0);
     m_nitro_emitter_position[1] = Vec3 (0,0.1f,0);
@@ -223,10 +217,27 @@ void KartModel::loadInfo(const XMLNode &node)
         }
     }
 
-    if(const XMLNode *hat_node=node.getNode("hat"))
+    if (m_version > 2)
     {
-        hat_node->get("offset", &m_hat_offset);
+        if (const XMLNode* headlights_node = node.getNode("headlights"))
+        {
+            loadHeadlights(*headlights_node);
+        }
+        if (const XMLNode* hat_node = node.getNode("hat"))
+        {
+            core::vector3df position, rotation, scale;
+            hat_node->get("position", &position);
+            hat_node->get("rotation", &rotation);
+            hat_node->get("scale", &scale);
+            core::matrix4 lm, sm, rm;
+            lm.setTranslation(position);
+            sm.setScale(scale);
+            rm.setRotationDegrees(rotation);
+            m_hat_location = new core::matrix4(lm * rm * sm);
+            hat_node->get("bone", &m_hat_bone);
+        }
     }
+
 }   // loadInfo
 
 // ----------------------------------------------------------------------------
@@ -298,6 +309,7 @@ KartModel::~KartModel()
         }
     }
 
+    delete m_hat_location;
     delete m_render_info;
 #ifdef DEBUG
 #if SKELETON_DEBUG
@@ -322,6 +334,7 @@ KartModel* KartModel::makeCopy(KartRenderType krt)
     assert(m_render_info == NULL);
     assert(!m_animated_node);
     KartModel *km              = new KartModel(/*is master*/ false);
+    km->m_version              = m_version;
     km->m_kart_width           = m_kart_width;
     km->m_kart_length          = m_kart_length;
     km->m_kart_height          = m_kart_height;
@@ -332,8 +345,8 @@ KartModel* KartModel::makeCopy(KartRenderType krt)
     km->m_animation_speed      = m_animation_speed;
     km->m_current_animation    = AF_DEFAULT;
     km->m_animated_node        = NULL;
-    km->m_hat_offset           = m_hat_offset;
     km->m_hat_name             = m_hat_name;
+    km->m_hat_bone             = m_hat_bone;
     km->m_krt                  = krt;
     km->m_support_colorization = m_support_colorization;
     km->m_render_info          = new RenderInfo();
@@ -342,6 +355,11 @@ KartModel* KartModel::makeCopy(KartRenderType krt)
     km->m_nitro_emitter_position[0] = m_nitro_emitter_position[0];
     km->m_nitro_emitter_position[1] = m_nitro_emitter_position[1];
     km->m_has_nitro_emitter = m_has_nitro_emitter;
+    if (m_hat_location)
+    {
+        km->m_hat_location = new core::matrix4();
+        *(km->m_hat_location) = *m_hat_location;
+    }
 
     for(unsigned int i=0; i<4; i++)
     {
@@ -383,7 +401,7 @@ KartModel* KartModel::makeCopy(KartRenderType krt)
 /** Attach the kart model and wheels to the scene node.
  *  \return the node with the model attached
  */
-scene::ISceneNode* KartModel::attachModel(bool animated_models, bool always_animated)
+scene::ISceneNode* KartModel::attachModel(bool animated_models, bool human_player)
 {
     assert(!m_is_master);
 
@@ -401,7 +419,7 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool always_anim
                NULL/*parent*/, getRenderInfo());
         node->setAutomaticCulling(scene::EAC_FRUSTUM_BOX);
 #endif
-        if (always_animated)
+        if (human_player)
         {
             // give a huge LOD distance for the player's kart. the reason is that it should
             // use its animations for the shadow pass too, where the camera can be quite far
@@ -418,8 +436,6 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool always_anim
             m_animated_node = static_cast<scene::IAnimatedMeshSceneNode*>(node);
         }
 
-        attachHat();
-
 #ifdef DEBUG
         std::string debug_name = m_model_filename+" (animated-kart-model)";
         node->setName(debug_name.c_str());
@@ -445,12 +461,6 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool always_anim
             m_speed_weighted_objects[i].m_node->setParent(lod_node);
         }
 
-        for (size_t i = 0; i<m_headlight_objects.size(); i++)
-        {
-            if (!m_headlight_objects[i].getNode()) continue;
-            m_headlight_objects[i].getNode()->setParent(lod_node);
-        }
-
 #ifndef SERVER_ONLY
         // Enable rim lighting for the kart
         irr_driver->applyObjectPassShader(lod_node, true);
@@ -528,28 +538,48 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool always_anim
                 obj.m_node->setPosition(obj.m_position.toIrrVector());
             }
         }
-
-        for (unsigned int i = 0; i < m_headlight_objects.size(); i++)
-        {
-            HeadlightObject& obj = m_headlight_objects[i];
-
-            obj.setNode(NULL);
-            if (obj.getModel())
-            {
-                scene::ISceneNode *new_node =
-                    irr_driver->addMesh(obj.getModel(), "kart_headlight",
-                                        node, getRenderInfo()            );
-
-                new_node->grab();
-                obj.setNode(new_node);
-                
-                Track* track = Track::getCurrentTrack();
-                if (track == NULL || track->getIsDuringDay())
-                    obj.getNode()->setVisible(false);
-            }
-        }
-
     }
+    const float each_energy = 0.2f / m_headlight_objects.size();
+    const float each_radius = 2.0f / m_headlight_objects.size();
+    for (unsigned int i = 0; i < m_headlight_objects.size(); i++)
+    {
+        HeadlightObject& obj = m_headlight_objects[i];
+        Track* track = Track::getCurrentTrack();
+        if (obj.getModel() && !(track == NULL || track->getIsDuringDay()))
+        {
+            const bool bone_attachment =
+                m_animated_node && !obj.getBoneName().empty();
+            scene::ISceneNode* parent = bone_attachment ?
+                m_animated_node->getJointNode(obj.getBoneName().c_str()) : node;
+            scene::ISceneNode* new_node =
+                irr_driver->addMesh(obj.getModel(), "kart_headlight",
+                parent, getRenderInfo());
+#ifndef SERVER_ONLY
+            if (human_player && CVS->isGLSL() && CVS->isDefferedEnabled())
+            {
+                obj.setNode(irr_driver->addLight(core::vector3df
+                    (0.0f, 0.0f, 0.0f), each_energy, each_radius,
+                    1.0f, 1.0f, 1.0f, false, new_node));
+                obj.getNode()->grab();
+            }
+#endif
+            configNode(new_node, obj.getLocation(), bone_attachment ?
+                getInverseBoneMatrix(obj.getBoneName().c_str()) : core::matrix4());
+        }
+    }
+
+    if (m_hat_location && !m_hat_name.empty())
+    {
+        const bool bone_attachment = m_animated_node && !m_hat_bone.empty();
+        scene::ISceneNode* parent = bone_attachment ?
+            m_animated_node->getJointNode(m_hat_bone.c_str()) : node;
+        scene::IMesh* hat_mesh = irr_driver->getAnimatedMesh
+            (file_manager->getAsset(FileManager::MODEL, m_hat_name));
+        scene::ISceneNode* node = irr_driver->addMesh(hat_mesh, "hat", parent);
+        configNode(node, *m_hat_location, bone_attachment ?
+                getInverseBoneMatrix(m_hat_bone.c_str()) : core::matrix4());
+    }
+
     return node;
 }   // attachModel
 
@@ -770,14 +800,20 @@ void KartModel::loadHeadlights(const XMLNode &node)
         const XMLNode* child = node.getNode(i);
         if (child->getName() == "object")
         {
-            // <object position="-0.168000 0.151288 0.917929" model="TuxHeadlight.spm"/>
-            core::vector3df position;
+            core::vector3df position, rotation, scale;
             child->get("position", &position);
-
+            child->get("rotation", &rotation);
+            child->get("scale", &scale);
+            core::matrix4 lm, sm, rm;
+            lm.setTranslation(position);
+            sm.setScale(scale);
+            rm.setRotationDegrees(rotation);
+            core::matrix4 location = lm * rm * sm;
+            std::string bone_name;
+            child->get("bone", &bone_name);
             std::string model;
             child->get("model", &model);
-
-            m_headlight_objects.push_back(HeadlightObject(model, position));
+            m_headlight_objects.push_back(HeadlightObject(model, location, bone_name));
         }
         else
         {
@@ -809,6 +845,15 @@ void KartModel::reset()
     LODNode *lod = dynamic_cast<LODNode*>(m_kart->getNode());
     if (lod)
         lod->forceLevelOfDetail(-1);
+
+    for (unsigned int i = 0; i < m_headlight_objects.size(); i++)
+    {
+        HeadlightObject& obj = m_headlight_objects[i];
+        if (obj.getNode())
+        {
+            obj.getNode()->setVisible(true);
+        }
+    }
 }   // reset
 
 // ----------------------------------------------------------------------------
@@ -1123,55 +1168,47 @@ void KartModel::resetVisualWheelPosition()
     }   // for i < 4
 }   // resetVisualSuspension
 
-//-----------------------------------------------------------------------------
-void KartModel::attachHat()
-{
-    m_hat_node = NULL;
-    if(m_hat_name.size()>0)
-    {
-        scene::IBoneSceneNode *bone = m_animated_node->getJointNode("Head");
-        if(!bone)
-            bone = m_animated_node->getJointNode("head");
-        if(bone)
-        {
-            // Till we have all models fixed, accept Head and head as bone name
-            scene::IMesh *hat_mesh =
-                irr_driver->getAnimatedMesh(
-                           file_manager->getAsset(FileManager::MODEL, m_hat_name));
-            m_hat_node = irr_driver->addMesh(hat_mesh, "hat");
-            bone->addChild(m_hat_node);
-            m_animated_node->setCurrentFrame((float)m_animation_frame[AF_STRAIGHT]);
-#ifndef SERVER_ONLY
-            STKAnimatedMesh* am = dynamic_cast<STKAnimatedMesh*>(m_animated_node);
-            if (am)
-            {
-                am->setHardwareSkinning(false);
-                am->OnAnimate(0);
-                am->setHardwareSkinning(true);
-            }
-            else
-#endif
-                m_animated_node->OnAnimate(0);
-            bone->updateAbsolutePosition();
-             // With the hat node attached to the head bone, we have to
-            // reverse the transformation of the bone, so that the hat
-            // is still properly placed. Esp. the hat offset needs
-            // to be rotated.
-            const core::matrix4 mat = bone->getAbsoluteTransformation();
-            core::matrix4 inv;
-            mat.getInverse(inv);
-            core::vector3df rotated_offset;
-            inv.rotateVect(rotated_offset, m_hat_offset);
-            m_hat_node->setPosition(rotated_offset);
-            m_hat_node->setScale(inv.getScale());
-            m_hat_node->setRotation(inv.getRotationDegrees());
-        }   // if bone
-    }   // if(m_hat_name)
-}   // attachHat
-
 //-----------------------------------------------------------------------------
 RenderInfo* KartModel::getRenderInfo()
 {
     return m_support_colorization || m_krt == KRT_TRANSPARENT ?
         m_render_info : NULL;
 }   // getRenderInfo
+
+//-----------------------------------------------------------------------------
+void KartModel::turnOffHeadlights()
+{
+    for (unsigned int i = 0; i < m_headlight_objects.size(); i++)
+    {
+        HeadlightObject& obj = m_headlight_objects[i];
+        if (obj.getNode())
+        {
+            obj.getNode()->setVisible(false);
+        }
+    }
+}   // turnOffHeadlights
+
+//-----------------------------------------------------------------------------
+core::matrix4 KartModel::getInverseBoneMatrix(const char* bone_name)
+{
+    assert(m_animated_node);
+    scene::IBoneSceneNode* bone = m_animated_node->getJointNode(bone_name);
+    assert(bone);
+    m_animated_node->setCurrentFrame((float)m_animation_frame[AF_STRAIGHT]);
+#ifndef SERVER_ONLY
+    STKAnimatedMesh* am = dynamic_cast<STKAnimatedMesh*>(m_animated_node);
+    if (am)
+    {
+        am->setHardwareSkinning(false);
+        am->OnAnimate(0);
+        am->setHardwareSkinning(true);
+    }
+    else
+#endif
+        m_animated_node->OnAnimate(0);
+    bone->updateAbsolutePosition();
+    const core::matrix4 mat = bone->getAbsoluteTransformation();
+    core::matrix4 inv;
+    mat.getInverse(inv);
+    return inv;
+}   // getInverseBoneMatrix
diff --git a/src/karts/kart_model.hpp b/src/karts/kart_model.hpp
index 99c180279..e68fc8677 100644
--- a/src/karts/kart_model.hpp
+++ b/src/karts/kart_model.hpp
@@ -92,30 +92,32 @@ class HeadlightObject
 private:
     /** The filename of the headlight model. */
     std::string m_filename;
-    /** The position relative to the parent kart scene node where the
-     *  headlight mesh is attached to. */
-    core::vector3df m_position;
+    /** The relative matrix to the parent kart scene node
+     *  or bone where the headlight mesh is attached to. */
+    core::matrix4 m_location;
     /** The mesh for the headlight. */
     scene::IMesh* m_model;
     /** The scene node of the headlight. */
     scene::ISceneNode* m_node;
 
+    std::string m_bone_name;
+
 public:
 
     HeadlightObject()
     {
         m_model    = NULL;
         m_node     = NULL;
-        m_filename = "";
-        m_position.set(0, 0, 0);
     }   // HeadlightObject
     // ------------------------------------------------------------------------
-    HeadlightObject(const std::string& filename, core::vector3df &pos)
+    HeadlightObject(const std::string& filename, const core::matrix4& location,
+                    const std::string& bone_name)
     {
         m_filename = filename;
-        m_position = pos;
+        m_location = location;
         m_model    = NULL;
         m_node     = NULL;
+        m_bone_name = bone_name;
     }   // HeadlightObjects
     // ------------------------------------------------------------------------
     const std::string& getFilename() const { return m_filename; }
@@ -123,12 +125,10 @@ public:
     /** Sets the mesh for this headlight object. */
     void setModel(scene::IMesh *mesh) { m_model = mesh; }
     // ------------------------------------------------------------------------
-    /** Sets the node of the headlight, and (if not NULL) also sets the
-     *  position of this scene node to be the position of the headlight. */
+    /** Sets the node of the headlight. */
     void setNode(scene::ISceneNode *node)
     {
-        m_node = node; 
-        if (m_node) m_node->setPosition(m_position);
+        m_node = node;
     }   // setNode
     // ------------------------------------------------------------------------
     const scene::ISceneNode *getNode() const { return m_node;  }
@@ -139,6 +139,10 @@ public:
     // ------------------------------------------------------------------------
     scene::IMesh *getModel() { return m_model; }
     // ------------------------------------------------------------------------
+    const core::matrix4& getLocation() const { return m_location; }
+    // ------------------------------------------------------------------------
+    const std::string& getBoneName() const { return m_bone_name; }
+    // ------------------------------------------------------------------------
 };   // class HeadlightObject
 
 // ============================================================================
@@ -198,11 +202,11 @@ private:
      *  (i.e. neither read nor written) if animations are disabled. */
     scene::IAnimatedMeshSceneNode *m_animated_node;
 
-    /** The scene node for a hat the driver is wearing. */
-    scene::IMeshSceneNode *m_hat_node;
+    /** Location of hat in object space. */
+    core::matrix4* m_hat_location;
 
-    /** Offset of the hat relative to the bone called 'head'. */
-    core::vector3df m_hat_offset;
+    /** Name of the bone for hat attachment. */
+    std::string m_hat_bone;
 
     /** Name of the hat to use for this kart. "" if no hat. */
     std::string m_hat_name;
@@ -307,6 +311,23 @@ private:
 
     bool m_support_colorization;
 
+    unsigned m_version;
+
+    // ------------------------------------------------------------------------
+    core::matrix4 getInverseBoneMatrix(const char* bone_name);
+    // ------------------------------------------------------------------------
+    void configNode(scene::ISceneNode* node, const core::matrix4& global_mat,
+                    const core::matrix4& inv_mat)
+    {
+        const core::matrix4 mat = inv_mat * global_mat;
+        const core::vector3df position = mat.getTranslation();
+        const core::vector3df rotation = mat.getRotationDegrees();
+        const core::vector3df scale = mat.getScale();
+        node->setPosition(position);
+        node->setRotation(rotation);
+        node->setScale(scale);
+    }
+
 public:
                   KartModel(bool is_master);
                  ~KartModel();
@@ -321,7 +342,7 @@ public:
     void          finishedRace();
     void          resetVisualWheelPosition();
     scene::ISceneNode*
-                  attachModel(bool animatedModels, bool always_animated);
+                  attachModel(bool animatedModels, bool human_player);
     // ------------------------------------------------------------------------
     /** Returns the animated mesh of this kart model. */
     scene::IAnimatedMesh*
@@ -403,18 +424,16 @@ public:
     /**  Name of the hat mesh to use. */
     void setHatMeshName(const std::string &name) {m_hat_name = name; }
     // ------------------------------------------------------------------------
-    void attachHat();
-    // ------------------------------------------------------------------------
     /** Returns the array of wheel nodes. */
     scene::ISceneNode** getWheelNodes() { return m_wheel_node; }
     // ------------------------------------------------------------------------
     scene::IAnimatedMeshSceneNode* getAnimatedNode(){ return m_animated_node; }
     // ------------------------------------------------------------------------
-    core::vector3df getHatOffset() { return m_hat_offset; }
-    // ------------------------------------------------------------------------
     RenderInfo* getRenderInfo();
     // ------------------------------------------------------------------------
     bool supportColorization() const         { return m_support_colorization; }
+    // ------------------------------------------------------------------------
+    void turnOffHeadlights();
 
 };   // KartModel
 #endif

From 12188c52872e9ce913fcf76dad963b48fc0fbc97 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Sat, 16 Sep 2017 14:46:21 +0800
Subject: [PATCH 115/125] Allow sharing headlight model and config its color
 (for gnu)

---
 src/karts/kart_gfx.cpp   |  2 +-
 src/karts/kart_model.cpp | 56 +++++++++++++++++++++++-----------------
 src/karts/kart_model.hpp | 24 ++++++++++-------
 3 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/src/karts/kart_gfx.cpp b/src/karts/kart_gfx.cpp
index fe4e44c20..1106146e6 100644
--- a/src/karts/kart_gfx.cpp
+++ b/src/karts/kart_gfx.cpp
@@ -547,7 +547,7 @@ void KartGFX::setGFXInvisible()
         m_nitro_light->setVisible(false);
         m_skidding_light_1->setVisible(false);
         m_skidding_light_2->setVisible(false);
-        m_kart->getKartModel()->turnOffHeadlights();
+        m_kart->getKartModel()->toggleHeadlights(false);
     }
 #endif
 }   // setGFXInvisible
diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index 3d21abe73..7a5b46ea4 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -284,16 +284,20 @@ KartModel::~KartModel()
     for (size_t i = 0; i < m_headlight_objects.size(); i++)
     {
         HeadlightObject& obj = m_headlight_objects[i];
-        if (obj.getNode())
+        if (obj.getLightNode())
         {
             // Master KartModels should never have a headlight attached.
             assert(!m_is_master);
-            obj.getNode()->drop();
+            obj.getLightNode()->drop();
         }
         if (m_is_master && obj.getModel())
         {
+            obj.getModel()->drop();
             irr_driver->dropAllTextures(obj.getModel());
-            irr_driver->removeMeshFromCache(obj.getModel());
+            if (obj.getModel()->getReferenceCount() == 1)
+            {
+                irr_driver->removeMeshFromCache(obj.getModel());
+            }
         }
     }
 
@@ -386,7 +390,7 @@ KartModel* KartModel::makeCopy(KartRenderType krt)
     for (size_t i = 0; i<m_headlight_objects.size(); i++)
     {
         // Master should not have any headlight nodes.
-        assert(!m_headlight_objects[i].getNode());
+        assert(!m_headlight_objects[i].getLightNode());
         km->m_headlight_objects[i] = m_headlight_objects[i];
     }
 
@@ -551,19 +555,16 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool human_playe
                 m_animated_node && !obj.getBoneName().empty();
             scene::ISceneNode* parent = bone_attachment ?
                 m_animated_node->getJointNode(obj.getBoneName().c_str()) : node;
-            scene::ISceneNode* new_node =
+            scene::ISceneNode* headlight_model =
                 irr_driver->addMesh(obj.getModel(), "kart_headlight",
                 parent, getRenderInfo());
 #ifndef SERVER_ONLY
             if (human_player && CVS->isGLSL() && CVS->isDefferedEnabled())
             {
-                obj.setNode(irr_driver->addLight(core::vector3df
-                    (0.0f, 0.0f, 0.0f), each_energy, each_radius,
-                    1.0f, 1.0f, 1.0f, false, new_node));
-                obj.getNode()->grab();
+                obj.setLight(headlight_model, each_energy, each_radius);
             }
 #endif
-            configNode(new_node, obj.getLocation(), bone_attachment ?
+            configNode(headlight_model, obj.getLocation(), bone_attachment ?
                 getInverseBoneMatrix(obj.getBoneName().c_str()) : core::matrix4());
         }
     }
@@ -583,6 +584,18 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool human_playe
     return node;
 }   // attachModel
 
+// ----------------------------------------------------------------------------
+/** Add a light node emitted from the center mass the headlight.
+ */
+void HeadlightObject::setLight(scene::ISceneNode* parent,
+                                          float energy, float radius)
+{
+    m_node = irr_driver->addLight(core::vector3df(0.0f, 0.0f, 0.0f),
+        energy, radius, m_headlight_color.getRed() / 255.f,
+        m_headlight_color.getGreen() / 255.f,
+        m_headlight_color.getBlue() / 255.f, false/*sun*/, parent);
+    m_node->grab();
+}   // setLight
 
 // ----------------------------------------------------------------------------
 /** Loads the 3d model and all wheels.
@@ -682,6 +695,7 @@ bool KartModel::loadModels(const KartProperties &kart_properties)
         HeadlightObject& obj = m_headlight_objects[i];
         std::string full_name = kart_properties.getKartDir() + obj.getFilename();
         obj.setModel(irr_driver->getMesh(full_name));
+        obj.getModel()->grab();
         irr_driver->grabAllTextures(obj.getModel());
     }
 
@@ -813,7 +827,10 @@ void KartModel::loadHeadlights(const XMLNode &node)
             child->get("bone", &bone_name);
             std::string model;
             child->get("model", &model);
-            m_headlight_objects.push_back(HeadlightObject(model, location, bone_name));
+            video::SColor headlight_color(-1);
+            child->get("color", &headlight_color);
+            m_headlight_objects.push_back(HeadlightObject(model, location,
+                bone_name, headlight_color));
         }
         else
         {
@@ -846,14 +863,7 @@ void KartModel::reset()
     if (lod)
         lod->forceLevelOfDetail(-1);
 
-    for (unsigned int i = 0; i < m_headlight_objects.size(); i++)
-    {
-        HeadlightObject& obj = m_headlight_objects[i];
-        if (obj.getNode())
-        {
-            obj.getNode()->setVisible(true);
-        }
-    }
+    toggleHeadlights(true);
 }   // reset
 
 // ----------------------------------------------------------------------------
@@ -1176,17 +1186,17 @@ RenderInfo* KartModel::getRenderInfo()
 }   // getRenderInfo
 
 //-----------------------------------------------------------------------------
-void KartModel::turnOffHeadlights()
+void KartModel::toggleHeadlights(bool on)
 {
     for (unsigned int i = 0; i < m_headlight_objects.size(); i++)
     {
         HeadlightObject& obj = m_headlight_objects[i];
-        if (obj.getNode())
+        if (obj.getLightNode())
         {
-            obj.getNode()->setVisible(false);
+            obj.getLightNode()->setVisible(on);
         }
     }
-}   // turnOffHeadlights
+}   // toggleHeadlights
 
 //-----------------------------------------------------------------------------
 core::matrix4 KartModel::getInverseBoneMatrix(const char* bone_name)
diff --git a/src/karts/kart_model.hpp b/src/karts/kart_model.hpp
index e68fc8677..e218860c6 100644
--- a/src/karts/kart_model.hpp
+++ b/src/karts/kart_model.hpp
@@ -92,14 +92,21 @@ class HeadlightObject
 private:
     /** The filename of the headlight model. */
     std::string m_filename;
+
     /** The relative matrix to the parent kart scene node
      *  or bone where the headlight mesh is attached to. */
     core::matrix4 m_location;
+
     /** The mesh for the headlight. */
     scene::IMesh* m_model;
-    /** The scene node of the headlight. */
+
+    /** The scene node of the headlight (real light). */
     scene::ISceneNode* m_node;
 
+    /** The color of the real light. */
+    video::SColor m_headlight_color;
+
+    /** Attach to which bone in kart model if not empty. */
     std::string m_bone_name;
 
 public:
@@ -111,13 +118,14 @@ public:
     }   // HeadlightObject
     // ------------------------------------------------------------------------
     HeadlightObject(const std::string& filename, const core::matrix4& location,
-                    const std::string& bone_name)
+                    const std::string& bone_name, const video::SColor& color)
     {
         m_filename = filename;
         m_location = location;
         m_model    = NULL;
         m_node     = NULL;
         m_bone_name = bone_name;
+        m_headlight_color = color;
     }   // HeadlightObjects
     // ------------------------------------------------------------------------
     const std::string& getFilename() const { return m_filename; }
@@ -125,15 +133,11 @@ public:
     /** Sets the mesh for this headlight object. */
     void setModel(scene::IMesh *mesh) { m_model = mesh; }
     // ------------------------------------------------------------------------
-    /** Sets the node of the headlight. */
-    void setNode(scene::ISceneNode *node)
-    {
-        m_node = node;
-    }   // setNode
+    void setLight(scene::ISceneNode* parent, float energy, float radius);
     // ------------------------------------------------------------------------
-    const scene::ISceneNode *getNode() const { return m_node;  }
+    const scene::ISceneNode *getLightNode() const { return m_node;  }
     // ------------------------------------------------------------------------
-    scene::ISceneNode *getNode() { return m_node; }
+    scene::ISceneNode *getLightNode() { return m_node; }
     // ------------------------------------------------------------------------
     const scene::IMesh *getModel() const { return m_model;  }
     // ------------------------------------------------------------------------
@@ -433,7 +437,7 @@ public:
     // ------------------------------------------------------------------------
     bool supportColorization() const         { return m_support_colorization; }
     // ------------------------------------------------------------------------
-    void turnOffHeadlights();
+    void toggleHeadlights(bool on);
 
 };   // KartModel
 #endif

From 29ba4ee543c307cc5d583a553968e943324b3ce9 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sat, 16 Sep 2017 23:38:26 +0200
Subject: [PATCH 116/125] Avoid a warning about missing texture in race result
 gui

---
 src/guiengine/widgets/icon_button_widget.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/guiengine/widgets/icon_button_widget.cpp b/src/guiengine/widgets/icon_button_widget.cpp
index b4bd8ef0b..66934808f 100644
--- a/src/guiengine/widgets/icon_button_widget.cpp
+++ b/src/guiengine/widgets/icon_button_widget.cpp
@@ -65,15 +65,15 @@ void IconButtonWidget::add()
     // ---- Icon
     if (m_texture == NULL)
     {
-        if (m_icon_path_type == ICON_PATH_TYPE_ABSOLUTE)
+        // Avoid warning about missing texture in case of e.g.
+        // screenshot widget
+        if (m_properties[PROP_ICON] != "")
         {
-            setTexture(irr_driver->getTexture(m_properties[PROP_ICON]));
-        }
-        else if (m_icon_path_type == ICON_PATH_TYPE_RELATIVE)
-        {
-            // Avoid warning about missing texture in case of e.g.
-            // screenshot widget
-            if(m_properties[PROP_ICON] != "")
+            if (m_icon_path_type == ICON_PATH_TYPE_ABSOLUTE)
+            {
+                setTexture(irr_driver->getTexture(m_properties[PROP_ICON]));
+            }
+            else if (m_icon_path_type == ICON_PATH_TYPE_RELATIVE)
             {
                 std::string file = file_manager->getAsset(m_properties[PROP_ICON]);
                 setTexture(irr_driver->getTexture(file));

From cef65cb98afabaa9f1493a617b77db394719471c Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Sun, 17 Sep 2017 08:44:58 +0800
Subject: [PATCH 117/125] Use the same radius as before

---
 src/karts/kart_model.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index 7a5b46ea4..8aee5b140 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -543,8 +543,8 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool human_playe
             }
         }
     }
-    const float each_energy = 0.2f / m_headlight_objects.size();
-    const float each_radius = 2.0f / m_headlight_objects.size();
+    const float each_energy = 0.5f / m_headlight_objects.size();
+    const float each_radius = 5.0f / m_headlight_objects.size();
     for (unsigned int i = 0; i < m_headlight_objects.size(); i++)
     {
         HeadlightObject& obj = m_headlight_objects[i];

From f6fa44f0df680ec99a347adce6e800f226899709 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sun, 17 Sep 2017 21:51:07 +0200
Subject: [PATCH 118/125] Request srgb colorspace on wayland

---
 lib/irrlicht/source/Irrlicht/CContextEGL.cpp  | 99 ++++++++++++-------
 lib/irrlicht/source/Irrlicht/CContextEGL.h    | 10 ++
 .../source/Irrlicht/CIrrDeviceWayland.cpp     |  1 +
 .../source/Irrlicht/COGLES2Driver.cpp         |  1 +
 4 files changed, 73 insertions(+), 38 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CContextEGL.cpp b/lib/irrlicht/source/Irrlicht/CContextEGL.cpp
index 50f12a60e..b2bdef42b 100644
--- a/lib/irrlicht/source/Irrlicht/CContextEGL.cpp
+++ b/lib/irrlicht/source/Irrlicht/CContextEGL.cpp
@@ -262,52 +262,75 @@ bool ContextManagerEGL::chooseConfig()
 
 bool ContextManagerEGL::createSurface()
 {
-    if (m_creation_params.surface_type == CEGL_SURFACE_WINDOW)
-    {
-        if (m_egl_surface == EGL_NO_SURFACE)
-        {
-            m_egl_surface = eglCreateWindowSurface(m_egl_display, m_egl_config,
-                                                   m_egl_window, NULL);
-        }
+    unsigned int colorspace_attr_pos = 0;
+    unsigned int largest_pbuffer_attr_pos = 0;
+    
+    std::vector<EGLint> attribs;
 
-        if (m_egl_surface == EGL_NO_SURFACE)
+    if (m_creation_params.opengl_api == CEGL_API_OPENGL)
+    {
+        if (hasEGLExtension("EGL_KHR_gl_colorspace") || m_egl_version >= 150)
         {
-            m_egl_surface = eglCreateWindowSurface(m_egl_display, m_egl_config,
-                                                   0, NULL);
+            attribs.push_back(EGL_GL_COLORSPACE);
+            attribs.push_back(m_creation_params.handle_srgb ? 
+                             EGL_GL_COLORSPACE_SRGB : EGL_GL_COLORSPACE_LINEAR);
+            colorspace_attr_pos = attribs.size() - 1;
         }
     }
-    else if (m_creation_params.surface_type == CEGL_SURFACE_PBUFFER)
+    
+    if (m_creation_params.surface_type == CEGL_SURFACE_PBUFFER)
     {
-        if (m_egl_surface == EGL_NO_SURFACE)
+        attribs.push_back(EGL_WIDTH);
+        attribs.push_back(m_creation_params.pbuffer_width);
+        attribs.push_back(EGL_HEIGHT);
+        attribs.push_back(m_creation_params.pbuffer_height);
+        attribs.push_back(EGL_LARGEST_PBUFFER);
+        attribs.push_back(EGL_FALSE);
+        largest_pbuffer_attr_pos = attribs.size() - 1;
+    }
+    
+    attribs.push_back(EGL_NONE);
+    attribs.push_back(0);
+    
+    if (m_egl_surface == EGL_NO_SURFACE)
+    {
+        if (m_creation_params.surface_type == CEGL_SURFACE_WINDOW)
         {
-            std::vector<EGLint> pbuffer_attribs;
-            pbuffer_attribs.push_back(EGL_WIDTH);
-            pbuffer_attribs.push_back(m_creation_params.pbuffer_width);
-            pbuffer_attribs.push_back(EGL_HEIGHT);
-            pbuffer_attribs.push_back(m_creation_params.pbuffer_height);
-            pbuffer_attribs.push_back(EGL_NONE);
-            pbuffer_attribs.push_back(0);
-
-            m_egl_surface = eglCreatePbufferSurface(m_egl_display,
-                                                    m_egl_config,
-                                                    &pbuffer_attribs[0]);
+            m_egl_surface = eglCreateWindowSurface(m_egl_display, m_egl_config,
+                                                   m_egl_window, &attribs[0]);
         }
-
-        if (m_egl_surface == EGL_NO_SURFACE)
+        else if (m_creation_params.surface_type == CEGL_SURFACE_PBUFFER)
         {
-            std::vector<EGLint> pbuffer_attribs;
-            pbuffer_attribs.push_back(EGL_WIDTH);
-            pbuffer_attribs.push_back(m_creation_params.pbuffer_width);
-            pbuffer_attribs.push_back(EGL_HEIGHT);
-            pbuffer_attribs.push_back(m_creation_params.pbuffer_height);
-            pbuffer_attribs.push_back(EGL_LARGEST_PBUFFER);
-            pbuffer_attribs.push_back(EGL_TRUE);
-            pbuffer_attribs.push_back(EGL_NONE);
-            pbuffer_attribs.push_back(0);
-
-            m_egl_surface = eglCreatePbufferSurface(m_egl_display,
-                                                    m_egl_config,
-                                                    &pbuffer_attribs[0]);
+            m_egl_surface = eglCreatePbufferSurface(m_egl_display, m_egl_config,
+                                                    &attribs[0]);
+        }
+    }
+        
+    if (m_egl_surface == EGL_NO_SURFACE && colorspace_attr_pos > 0 &&
+        m_creation_params.handle_srgb == true)
+    {
+        attribs[colorspace_attr_pos] = EGL_GL_COLORSPACE_LINEAR;
+        
+        if (m_creation_params.surface_type == CEGL_SURFACE_WINDOW)
+        {
+            m_egl_surface = eglCreateWindowSurface(m_egl_display, m_egl_config,
+                                                   m_egl_window, &attribs[0]);
+        }
+        else if (m_creation_params.surface_type == CEGL_SURFACE_PBUFFER)
+        {
+            m_egl_surface = eglCreatePbufferSurface(m_egl_display, m_egl_config,
+                                                    &attribs[0]);
+        }
+    }
+    
+    if (m_egl_surface == EGL_NO_SURFACE && largest_pbuffer_attr_pos > 0)
+    {
+        attribs[largest_pbuffer_attr_pos] = EGL_TRUE;
+        
+        if (m_creation_params.surface_type == CEGL_SURFACE_PBUFFER)
+        {
+            m_egl_surface = eglCreatePbufferSurface(m_egl_display, m_egl_config,
+                                                    &attribs[0]);
         }
     }
 
diff --git a/lib/irrlicht/source/Irrlicht/CContextEGL.h b/lib/irrlicht/source/Irrlicht/CContextEGL.h
index 6851a2504..3a3b0e823 100644
--- a/lib/irrlicht/source/Irrlicht/CContextEGL.h
+++ b/lib/irrlicht/source/Irrlicht/CContextEGL.h
@@ -30,6 +30,15 @@
 #ifndef EGL_CONTEXT_MINOR_VERSION
 #define EGL_CONTEXT_MINOR_VERSION 0x30FB
 #endif
+#ifndef EGL_GL_COLORSPACE
+#define EGL_GL_COLORSPACE 0x309D
+#endif
+#ifndef EGL_GL_COLORSPACE_SRGB
+#define EGL_GL_COLORSPACE_SRGB 0x3089
+#endif
+#ifndef EGL_GL_COLORSPACE_LINEAR
+#define EGL_GL_COLORSPACE_LINEAR 0x308A
+#endif
 
 enum ContextEGLOpenGLAPI
 {
@@ -50,6 +59,7 @@ struct ContextEGLParams
     EGLNativeWindowType window;
     EGLNativeDisplayType display;
     bool force_legacy_device;
+    bool handle_srgb;
     bool with_alpha_channel;
     bool vsync_enabled;
     int pbuffer_width;
diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp
index 0c504d84f..bd6aedf7d 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp
@@ -794,6 +794,7 @@ bool CIrrDeviceWayland::initEGL()
 
     egl_params.surface_type = CEGL_SURFACE_WINDOW;
     egl_params.force_legacy_device = CreationParams.ForceLegacyDevice;
+    egl_params.handle_srgb = CreationParams.HandleSRGB;
     egl_params.with_alpha_channel = CreationParams.WithAlphaChannel;
     egl_params.vsync_enabled = CreationParams.Vsync;
     egl_params.window = m_egl_window;
diff --git a/lib/irrlicht/source/Irrlicht/COGLES2Driver.cpp b/lib/irrlicht/source/Irrlicht/COGLES2Driver.cpp
index 7b86362e7..8699779d3 100644
--- a/lib/irrlicht/source/Irrlicht/COGLES2Driver.cpp
+++ b/lib/irrlicht/source/Irrlicht/COGLES2Driver.cpp
@@ -69,6 +69,7 @@ namespace video
 		ContextEGLParams egl_params;
 		egl_params.opengl_api = CEGL_API_OPENGL_ES;
 		egl_params.surface_type = CEGL_SURFACE_WINDOW;
+		egl_params.handle_srgb = Params.HandleSRGB;
 		egl_params.force_legacy_device = Params.ForceLegacyDevice;
 		egl_params.with_alpha_channel = Params.WithAlphaChannel;
 		egl_params.vsync_enabled = Params.Vsync;

From b09eec4bcb9b617f571d49e1418db5598ebd43a7 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Mon, 18 Sep 2017 11:27:21 +0800
Subject: [PATCH 119/125] Allow speed weight objects to be attached to bone

---
 src/graphics/camera_debug.cpp                |   1 +
 src/guiengine/widgets/model_view_widget.cpp  |  58 ++--
 src/guiengine/widgets/model_view_widget.hpp  |  10 +-
 src/guiengine/widgets/player_kart_widget.cpp |  37 ++-
 src/karts/abstract_kart.cpp                  |   1 +
 src/karts/cannon_animation.cpp               |   1 +
 src/karts/kart_gfx.cpp                       |   1 +
 src/karts/kart_model.cpp                     | 280 ++++++++++---------
 src/karts/kart_model.hpp                     |  28 +-
 src/karts/kart_properties.cpp                |  27 +-
 src/karts/kart_properties.hpp                |  29 +-
 src/main.cpp                                 |   1 +
 src/physics/btKart.cpp                       |   1 +
 src/states_screens/feature_unlocked.cpp      |   1 +
 src/states_screens/grand_prix_lose.cpp       |   1 +
 src/states_screens/grand_prix_lose.hpp       |   2 +-
 src/states_screens/kart_selection.cpp        |  51 ++--
 src/states_screens/soccer_setup_screen.cpp   |  64 ++---
 18 files changed, 322 insertions(+), 272 deletions(-)

diff --git a/src/graphics/camera_debug.cpp b/src/graphics/camera_debug.cpp
index 29637d5bd..7dae1c69a 100644
--- a/src/graphics/camera_debug.cpp
+++ b/src/graphics/camera_debug.cpp
@@ -23,6 +23,7 @@
 #include "karts/abstract_kart.hpp"
 #include "karts/explosion_animation.hpp"
 #include "karts/kart.hpp"
+#include "karts/kart_model.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/skidding.hpp"
 #include "physics/btKart.hpp"
diff --git a/src/guiengine/widgets/model_view_widget.cpp b/src/guiengine/widgets/model_view_widget.cpp
index bd6e3e9c3..b7e542b0a 100644
--- a/src/guiengine/widgets/model_view_widget.cpp
+++ b/src/guiengine/widgets/model_view_widget.cpp
@@ -89,10 +89,10 @@ void ModelViewWidget::clearModels()
 {
     m_models.clearWithoutDeleting();
     m_model_location.clear();
-    m_model_scale.clear();
     m_model_frames.clear();
     m_model_render_info_affected.clear();
     m_model_animation_speed.clear();
+    m_bone_attached.clear();
 
     if (m_rtt_main_node != NULL) m_rtt_main_node->remove();
     if (m_light != NULL) m_light->remove();
@@ -106,19 +106,21 @@ void ModelViewWidget::clearModels()
 
 // -----------------------------------------------------------------------------
 
-void ModelViewWidget::addModel(irr::scene::IMesh* mesh, const Vec3& location,
-                               const Vec3& scale, const int start_loop_frame,
+void ModelViewWidget::addModel(irr::scene::IMesh* mesh,
+                               const core::matrix4& location,
+                               const int start_loop_frame,
                                const int end_loop_frame,
-                               bool all_parts_colorized, float animation_speed)
+                               bool all_parts_colorized, float animation_speed,
+                               const std::string& bone_name)
 {
     if(!mesh) return;
 
     m_models.push_back(mesh);
     m_model_location.push_back(location);
-    m_model_scale.push_back(scale);
     m_model_frames.emplace_back(start_loop_frame, end_loop_frame);
     m_model_render_info_affected.push_back(all_parts_colorized);
     m_model_animation_speed.push_back(animation_speed);
+    m_bone_attached.push_back(bone_name);
 #ifndef SERVER_ONLY
     if (!CVS->isGLSL())
         m_render_target = NULL;
@@ -219,59 +221,69 @@ void ModelViewWidget::setupRTTScene()
     m_light = NULL;
 
     irr_driver->clearLights();
+    scene::IAnimatedMeshSceneNode* animated_node = NULL;
 
     if (m_model_frames[0].first == -1)
     {
         scene::ISceneNode* node = irr_driver->addMesh(m_models.get(0), "rtt_mesh",
             NULL, m_render_info, m_model_render_info_affected[0]);
-        node->setPosition(m_model_location[0].toIrrVector());
-        node->setScale(m_model_scale[0].toIrrVector());
+        node->setPosition(m_model_location[0].getTranslation());
+        node->setRotation(m_model_location[0].getRotationDegrees());
+        node->setScale(m_model_location[0].getScale());
         node->setMaterialFlag(video::EMF_FOG_ENABLE, false);
         m_rtt_main_node = node;
     }
     else
     {
-        scene::IAnimatedMeshSceneNode* node =
+        animated_node =
         irr_driver->addAnimatedMesh((scene::IAnimatedMesh*)m_models.get(0), "rtt_mesh",
             NULL, m_render_info, m_model_render_info_affected[0]);
-        node->setPosition(m_model_location[0].toIrrVector());
-        node->setFrameLoop(m_model_frames[0].first, m_model_frames[0].second);
-        node->setAnimationSpeed(m_model_animation_speed[0]);
-        node->setScale(m_model_scale[0].toIrrVector());
-        node->setMaterialFlag(video::EMF_FOG_ENABLE, false);
-        m_rtt_main_node = node;
+        animated_node->setPosition(m_model_location[0].getTranslation());
+        animated_node->setRotation(m_model_location[0].getRotationDegrees());
+        animated_node->setScale(m_model_location[0].getScale());
+        animated_node->setFrameLoop(m_model_frames[0].first, m_model_frames[0].second);
+        animated_node->setAnimationSpeed(m_model_animation_speed[0]);
+        animated_node->setMaterialFlag(video::EMF_FOG_ENABLE, false);
+        m_rtt_main_node = animated_node;
     }
 
     assert(m_rtt_main_node != NULL);
     assert(m_models.size() == m_model_location.size());
     assert(m_models.size() == m_model_frames.size());
-    assert(m_models.size() == m_model_scale.size());
     assert(m_models.size() == m_model_render_info_affected.size());
     assert(m_models.size() == m_model_animation_speed.size());
-
+    assert(m_models.size() == m_bone_attached.size());
     const int mesh_amount = m_models.size();
-    for (int n = 1; n<mesh_amount; n++)
+    for (int n = 1; n < mesh_amount; n++)
     {
+        const bool bone_attachment =
+            animated_node && !m_bone_attached[n].empty();
+        scene::ISceneNode* parent = bone_attachment ?
+            animated_node->getJointNode(m_bone_attached[n].c_str()) :
+            m_rtt_main_node;
+        assert(parent);
         if (m_model_frames[n].first == -1)
         {
             scene::ISceneNode* node =
-            irr_driver->addMesh(m_models.get(n), "rtt_node", m_rtt_main_node,
+            irr_driver->addMesh(m_models.get(n), "rtt_node", parent,
                 m_render_info, m_model_render_info_affected[n]);
-            node->setPosition(m_model_location[n].toIrrVector());
+            node->setPosition(m_model_location[n].getTranslation());
+            node->setRotation(m_model_location[n].getRotationDegrees());
+            node->setScale(m_model_location[n].getScale());
             node->updateAbsolutePosition();
-            node->setScale(m_model_scale[n].toIrrVector());
         }
         else
         {
             scene::IAnimatedMeshSceneNode* node =
             irr_driver->addAnimatedMesh((scene::IAnimatedMesh*)m_models.get(n),
-                "modelviewrtt", m_rtt_main_node, m_render_info,
+                "modelviewrtt", parent, m_render_info,
                 m_model_render_info_affected[n]);
-            node->setPosition(m_model_location[n].toIrrVector());
+            node->setPosition(m_model_location[n].getTranslation());
+            node->setRotation(m_model_location[n].getRotationDegrees());
+            node->setScale(m_model_location[n].getScale());
             node->setFrameLoop(m_model_frames[n].first, m_model_frames[n].second);
             node->setAnimationSpeed(m_model_animation_speed[n]);
             node->updateAbsolutePosition();
-            node->setScale(m_model_scale[n].toIrrVector());
             //Log::info("ModelViewWidget", "Set frame %d", m_model_frames[n]);
         }
     }
diff --git a/src/guiengine/widgets/model_view_widget.hpp b/src/guiengine/widgets/model_view_widget.hpp
index 21447d775..0adfcba5c 100644
--- a/src/guiengine/widgets/model_view_widget.hpp
+++ b/src/guiengine/widgets/model_view_widget.hpp
@@ -48,11 +48,11 @@ namespace GUIEngine
         float m_rotation_target;
 
         PtrVector<scene::IMesh, REF> m_models;
-        AlignedArray<Vec3> m_model_location;
-        AlignedArray<Vec3> m_model_scale;
+        std::vector<core::matrix4> m_model_location;
         std::vector<std::pair<int, int> > m_model_frames;
         std::vector<bool> m_model_render_info_affected;
         std::vector<float> m_model_animation_speed;
+        std::vector<std::string> m_bone_attached;
         std::unique_ptr<RenderTarget> m_render_target;
         float m_angle;
 
@@ -76,12 +76,12 @@ namespace GUIEngine
         void add();
         void clearModels();
         void addModel(irr::scene::IMesh* mesh,
-                      const Vec3& location = Vec3(0,0,0),
-                      const Vec3& scale = Vec3(1,1,1),
+                      const core::matrix4& location = core::matrix4(),
                       const int start_loop_frame=-1,
                       const int end_loop_frame=-1,
                       bool all_parts_colorized = false,
-                      float animation_speed=0.0f);
+                      float animation_speed = 0.0f,
+                      const std::string& bone_name = std::string());
 
         void update(float delta);
 
diff --git a/src/guiengine/widgets/player_kart_widget.cpp b/src/guiengine/widgets/player_kart_widget.cpp
index ee498027c..b958cfa1e 100644
--- a/src/guiengine/widgets/player_kart_widget.cpp
+++ b/src/guiengine/widgets/player_kart_widget.cpp
@@ -24,6 +24,7 @@
 #include "guiengine/widgets/model_view_widget.hpp"
 #include "guiengine/widgets/player_name_spinner.hpp"
 #include "input/input_device.hpp"
+#include "karts/kart_model.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/kart_properties_manager.hpp"
 #include "network/network_player_profile.hpp"
@@ -193,6 +194,8 @@ PlayerKartWidget::PlayerKartWidget(KartSelectionScreen* parent,
         scale = 30.0f;
     }
 
+    core::matrix4 model_location;
+    model_location.setScale(core::vector3df(scale, scale, scale));
     const bool has_win_anime =
         UserConfigParams::m_show_steering_animations != 0 &&
         (((kart_model.getFrame(KartModel::AF_WIN_LOOP_START) > -1 ||
@@ -200,8 +203,7 @@ PlayerKartWidget::PlayerKartWidget(KartSelectionScreen* parent,
         kart_model.getFrame(KartModel::AF_WIN_END) > -1) ||
         (kart_model.getFrame(KartModel::AF_SELECTION_START) > -1 &&
         kart_model.getFrame(KartModel::AF_SELECTION_END) > -1));
-    m_model_view->addModel( kart_model.getModel(), Vec3(0,0,0),
-        Vec3(scale, scale, scale),
+    m_model_view->addModel( kart_model.getModel(), model_location,
         has_win_anime ?
         kart_model.getFrame(KartModel::AF_SELECTION_START) > -1 ?
         kart_model.getFrame(KartModel::AF_SELECTION_START) :
@@ -216,18 +218,27 @@ PlayerKartWidget::PlayerKartWidget(KartSelectionScreen* parent,
         kart_model.getBaseFrame(),
         false/*all_parts_colorized*/,
         kart_model.getAnimationSpeed());
-    m_model_view->addModel( kart_model.getWheelModel(0),
-                            kart_model.getWheelGraphicsPosition(0) );
-    m_model_view->addModel( kart_model.getWheelModel(1),
-                            kart_model.getWheelGraphicsPosition(1) );
-    m_model_view->addModel( kart_model.getWheelModel(2),
-                            kart_model.getWheelGraphicsPosition(2) );
-    m_model_view->addModel( kart_model.getWheelModel(3),
-                            kart_model.getWheelGraphicsPosition(3) );
-    for(size_t i=0 ; i < kart_model.getSpeedWeightedObjectsCount() ; i++)
+
+    model_location.setScale(core::vector3df(1.0f, 1.0f, 1.0f));
+    for (unsigned i = 0; i < 4; i++)
     {
-        const SpeedWeightedObject& obj = kart_model.getSpeedWeightedObject((int)i);
-        m_model_view->addModel(obj.m_model, obj.m_position);
+        model_location.setTranslation(kart_model
+            .getWheelGraphicsPosition(i).toIrrVector());
+        m_model_view->addModel(kart_model.getWheelModel(i), model_location);
+    }
+
+    for (unsigned i = 0; i < kart_model.getSpeedWeightedObjectsCount(); i++)
+    {
+        const SpeedWeightedObject& obj = kart_model.getSpeedWeightedObject(i);
+        core::matrix4 swol = obj.m_location;
+        if (!obj.m_bone_name.empty())
+        {
+            core::matrix4 inv =
+                kart_model.getInverseBoneMatrix(obj.m_bone_name);
+            swol = inv * obj.m_location;
+        }
+        m_model_view->addModel(obj.m_model, swol, -1, -1, false, 0.0f,
+            obj.m_bone_name);
     }
     m_model_view->setRotateContinuously( 35.0f );
 
diff --git a/src/karts/abstract_kart.cpp b/src/karts/abstract_kart.cpp
index 6125ff273..3d8a5c042 100644
--- a/src/karts/abstract_kart.cpp
+++ b/src/karts/abstract_kart.cpp
@@ -22,6 +22,7 @@
 #include "graphics/render_info.hpp"
 #include "items/powerup.hpp"
 #include "karts/abstract_kart_animation.hpp"
+#include "karts/kart_model.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/kart_properties_manager.hpp"
 #include "utils/log.hpp"
diff --git a/src/karts/cannon_animation.cpp b/src/karts/cannon_animation.cpp
index 68a31f073..47e39f8b9 100644
--- a/src/karts/cannon_animation.cpp
+++ b/src/karts/cannon_animation.cpp
@@ -23,6 +23,7 @@
 #include "animations/three_d_animation.hpp"
 #include "items/flyable.hpp"
 #include "karts/abstract_kart.hpp"
+#include "karts/kart_model.hpp"
 #include "karts/kart_properties.hpp"
 #include "modes/world.hpp"
 
diff --git a/src/karts/kart_gfx.cpp b/src/karts/kart_gfx.cpp
index 1106146e6..4f22d03b9 100644
--- a/src/karts/kart_gfx.cpp
+++ b/src/karts/kart_gfx.cpp
@@ -28,6 +28,7 @@
 #include "karts/abstract_kart.hpp"
 #include "karts/controller/controller.hpp"
 #include "karts/kart.hpp"
+#include "karts/kart_model.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/skidding.hpp"
 #include "physics/btKart.hpp"
diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index 8aee5b140..7be6544e2 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -52,14 +52,12 @@ float KartModel::UNDEFINED = -99.9f;
 // ------------------------------------------------------------
 // SpeedWeightedObject implementation
 
-#define SPEED_WEIGHTED_OBJECT_PROPERTY_UNDEFINED -99.f
-
 SpeedWeightedObject::Properties::Properties()
 {
-    m_strength_factor = SPEED_WEIGHTED_OBJECT_PROPERTY_UNDEFINED;
-    m_speed_factor    = SPEED_WEIGHTED_OBJECT_PROPERTY_UNDEFINED;
-    m_texture_speed.X = SPEED_WEIGHTED_OBJECT_PROPERTY_UNDEFINED;
-    m_texture_speed.Y = SPEED_WEIGHTED_OBJECT_PROPERTY_UNDEFINED;
+    m_strength_factor = -1.0f;
+    m_speed_factor    = 0.0f;
+    m_texture_speed.X = 0.0f;
+    m_texture_speed.Y = 0.0f;
 }   // SpeedWeightedObject::Properties::Properties
 
 // ----------------------------------------------------------------------------
@@ -71,22 +69,6 @@ void SpeedWeightedObject::Properties::loadFromXMLNode(const XMLNode* xml_node)
     xml_node->get("texture-speed-y", &m_texture_speed.Y);
 }   // SpeedWeightedObject::Properties::loadFromXMLNode
 
-// ----------------------------------------------------------------------------
-void SpeedWeightedObject::Properties::checkAllSet()
-{
-#define CHECK_NEG(  a,strA) if(a<=SPEED_WEIGHTED_OBJECT_PROPERTY_UNDEFINED)  \
-        {                                                                    \
-            Log::fatal("SpeedWeightedObject",                                \
-                       "Missing default value for '%s'.",                    \
-                       strA);                                                \
-        }
-    CHECK_NEG(m_strength_factor,  "speed-weighted strength-factor"    );
-    CHECK_NEG(m_speed_factor,     "speed-weighted speed-factor"       );
-    CHECK_NEG(m_texture_speed.X,  "speed-weighted texture speed X"    );
-    CHECK_NEG(m_texture_speed.Y,  "speed-weighted texture speed Y"    );
-#undef CHECK_NEG
-}   // SpeedWeightedObject::Properties::checkAllSet
-
 // ============================================================================
 /** Default constructor which initialises all variables with defaults.
  *  Note that the KartModel is copied, so make sure to update makeCopy
@@ -157,7 +139,6 @@ KartModel::KartModel(bool is_master)
  */
 void KartModel::loadInfo(const XMLNode &node)
 {
-    node.get("version", &m_version);
     node.get("model-file", &m_model_filename);
     if(const XMLNode *animation_node=node.getNode("animations"))
     {
@@ -177,13 +158,11 @@ void KartModel::loadInfo(const XMLNode &node)
         animation_node->get("start-jump",     &m_animation_frame[AF_JUMP_START]);
         animation_node->get("start-jump-loop",&m_animation_frame[AF_JUMP_LOOP] );
         animation_node->get("end-jump",       &m_animation_frame[AF_JUMP_END]  );
+        animation_node->get("selection-start", &m_animation_frame[AF_SELECTION_START]);
+        animation_node->get("selection-end",   &m_animation_frame[AF_SELECTION_END]  );
         animation_node->get("backpedal-left", &m_animation_frame[AF_BACK_LEFT]);
         animation_node->get("backpedal",      &m_animation_frame[AF_BACK_STRAIGHT]);
         animation_node->get("backpedal-right",&m_animation_frame[AF_BACK_RIGHT]);
-        animation_node->get("start-speed-weighted", &m_animation_frame[AF_SPEED_WEIGHTED_START]);
-        animation_node->get("end-speed-weighted",   &m_animation_frame[AF_SPEED_WEIGHTED_END]  );
-        animation_node->get("selection-start", &m_animation_frame[AF_SELECTION_START]);
-        animation_node->get("selection-end",   &m_animation_frame[AF_SELECTION_END]  );
         animation_node->get("speed",          &m_animation_speed               );
     }
 
@@ -206,19 +185,17 @@ void KartModel::loadInfo(const XMLNode &node)
         m_has_nitro_emitter = true;
     }
 
-    if(const XMLNode *speed_weighted_objects_node=node.getNode("speed-weighted-objects"))
+    unsigned kart_version;
+    node.get("version", &kart_version);
+    if (kart_version > 2)
     {
-        SpeedWeightedObject::Properties   fallback_properties;
-        fallback_properties.loadFromXMLNode(speed_weighted_objects_node);
-
-        for(unsigned int i=0 ; i < speed_weighted_objects_node->getNumNodes() ; i++)
+        if (const XMLNode *speed_weighted_objects_node = node.getNode("speed-weighted-objects"))
         {
-            loadSpeedWeightedInfo(speed_weighted_objects_node->getNode(i), fallback_properties);
+            for (unsigned int i = 0 ;i < speed_weighted_objects_node->getNumNodes() ; i++)
+            {
+                loadSpeedWeightedInfo(speed_weighted_objects_node->getNode(i));
+            }
         }
-    }
-
-    if (m_version > 2)
-    {
         if (const XMLNode* headlights_node = node.getNode("headlights"))
         {
             loadHeadlights(*headlights_node);
@@ -274,10 +251,14 @@ KartModel::~KartModel()
             assert(!m_is_master);
             m_speed_weighted_objects[i].m_node->drop();
         }
-        if(m_is_master && m_speed_weighted_objects[i].m_model)
+        if (m_is_master && m_speed_weighted_objects[i].m_model)
         {
+            m_speed_weighted_objects[i].m_model->drop();
             irr_driver->dropAllTextures(m_speed_weighted_objects[i].m_model);
-            irr_driver->removeMeshFromCache(m_speed_weighted_objects[i].m_model);
+            if (m_speed_weighted_objects[i].m_model->getReferenceCount() == 1)
+            {
+                irr_driver->removeMeshFromCache(m_speed_weighted_objects[i].m_model);
+            }
         }
     }
 
@@ -337,23 +318,23 @@ KartModel* KartModel::makeCopy(KartRenderType krt)
     assert(m_is_master);
     assert(m_render_info == NULL);
     assert(!m_animated_node);
-    KartModel *km              = new KartModel(/*is master*/ false);
-    km->m_version              = m_version;
-    km->m_kart_width           = m_kart_width;
-    km->m_kart_length          = m_kart_length;
-    km->m_kart_height          = m_kart_height;
-    km->m_kart_highest_point   = m_kart_highest_point;
-    km->m_kart_lowest_point    = m_kart_lowest_point;
-    km->m_mesh                 = m_mesh;
-    km->m_model_filename       = m_model_filename;
-    km->m_animation_speed      = m_animation_speed;
-    km->m_current_animation    = AF_DEFAULT;
-    km->m_animated_node        = NULL;
-    km->m_hat_name             = m_hat_name;
-    km->m_hat_bone             = m_hat_bone;
-    km->m_krt                  = krt;
-    km->m_support_colorization = m_support_colorization;
-    km->m_render_info          = new RenderInfo();
+    KartModel *km               = new KartModel(/*is master*/ false);
+    km->m_kart_width            = m_kart_width;
+    km->m_kart_length           = m_kart_length;
+    km->m_kart_height           = m_kart_height;
+    km->m_kart_highest_point    = m_kart_highest_point;
+    km->m_kart_lowest_point     = m_kart_lowest_point;
+    km->m_mesh                  = m_mesh;
+    km->m_model_filename        = m_model_filename;
+    km->m_animation_speed       = m_animation_speed;
+    km->m_current_animation     = AF_DEFAULT;
+    km->m_animated_node         = NULL;
+    km->m_hat_name              = m_hat_name;
+    km->m_hat_bone              = m_hat_bone;
+    km->m_krt                   = krt;
+    km->m_support_colorization  = m_support_colorization;
+    km->m_render_info           = new RenderInfo();
+    km->m_inverse_bone_matrices = m_inverse_bone_matrices;
     km->m_render_info->setKartModelRenderInfo(krt);
 
     km->m_nitro_emitter_position[0] = m_nitro_emitter_position[0];
@@ -458,13 +439,6 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool human_playe
             m_wheel_node[i]->setParent(lod_node);
         }
 
-        // Become the owner of the speed weighted objects
-        for(size_t i=0; i<m_speed_weighted_objects.size(); i++)
-        {
-            if(!m_speed_weighted_objects[i].m_node) continue;
-            m_speed_weighted_objects[i].m_node->setParent(lod_node);
-        }
-
 #ifndef SERVER_ONLY
         // Enable rim lighting for the kart
         irr_driver->applyObjectPassShader(lod_node, true);
@@ -513,36 +487,51 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool human_playe
 
             m_wheel_node[i]->grab();
             ((scene::IMeshSceneNode *) m_wheel_node[i])->setReadOnlyMaterials(true);
-    #ifdef DEBUG
+#ifdef DEBUG
             std::string debug_name = m_wheel_filename[i]+" (wheel)";
             m_wheel_node[i]->setName(debug_name.c_str());
-    #endif
+#endif
             m_wheel_node[i]->setPosition(m_wheel_graphics_position[i].toIrrVector());
         }
 
-        // Attach the speed weighted objects + set the animation state
-        for(size_t i=0 ; i < m_speed_weighted_objects.size() ; i++)
+    }
+
+    // Attach the speed weighted objects + set the animation state
+    for (unsigned int i = 0; i < m_speed_weighted_objects.size() ;i++)
+    {
+        SpeedWeightedObject& obj = m_speed_weighted_objects[i];
+        obj.m_node = NULL;
+        if (obj.m_model)
         {
-            SpeedWeightedObject&    obj = m_speed_weighted_objects[i];
-            obj.m_node = NULL;
-            if(obj.m_model)
+            const bool bone_attachment =
+                m_animated_node && !obj.m_bone_name.empty();
+            scene::ISceneNode* parent = bone_attachment ?
+                m_animated_node->getJointNode(obj.m_bone_name.c_str()) : node;
+            scene::ISceneNode* swo = NULL;
+            if (animated_models)
             {
+                // Only need to keep track of animated node for speed setting
                 obj.m_node = irr_driver->addAnimatedMesh(obj.m_model, 
-                             "speedweighted", node, getRenderInfo(),
-                             true/*all_parts_colorized*/);
+                    "speedweighted", parent, getRenderInfo(),
+                    true/*all_parts_colorized*/);
+                swo = obj.m_node;
                 obj.m_node->grab();
-
-                obj.m_node->setFrameLoop(m_animation_frame[AF_SPEED_WEIGHTED_START],
-                                         m_animation_frame[AF_SPEED_WEIGHTED_END]);
-
-        #ifdef DEBUG
-                std::string debug_name = obj.m_name+" (speed-weighted)";
-                obj.m_node->setName(debug_name.c_str());
-        #endif
-                obj.m_node->setPosition(obj.m_position.toIrrVector());
+                obj.m_node->setFrameLoop(0, obj.m_model->getFrameCount() - 1);
             }
+            else
+            {
+                swo = irr_driver->addMesh(obj.m_model, "speedweighted",
+                    parent, getRenderInfo(), true/*all_parts_colorized*/);
+            }
+#ifdef DEBUG
+            std::string debug_name = obj.m_name + " (speed-weighted)";
+            swo->setName(debug_name.c_str());
+#endif
+            configNode(swo, obj.m_location, bone_attachment ?
+                getInverseBoneMatrix(obj.m_bone_name) : core::matrix4());
         }
     }
+
     const float each_energy = 0.5f / m_headlight_objects.size();
     const float each_radius = 5.0f / m_headlight_objects.size();
     for (unsigned int i = 0; i < m_headlight_objects.size(); i++)
@@ -565,7 +554,7 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool human_playe
             }
 #endif
             configNode(headlight_model, obj.getLocation(), bone_attachment ?
-                getInverseBoneMatrix(obj.getBoneName().c_str()) : core::matrix4());
+                getInverseBoneMatrix(obj.getBoneName()) : core::matrix4());
         }
     }
 
@@ -578,7 +567,7 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool human_playe
             (file_manager->getAsset(FileManager::MODEL, m_hat_name));
         scene::ISceneNode* node = irr_driver->addMesh(hat_mesh, "hat", parent);
         configNode(node, *m_hat_location, bone_attachment ?
-                getInverseBoneMatrix(m_hat_bone.c_str()) : core::matrix4());
+                getInverseBoneMatrix(m_hat_bone) : core::matrix4());
     }
 
     return node;
@@ -657,6 +646,7 @@ bool KartModel::loadModels(const KartProperties &kart_properties)
 #endif
     m_kart_highest_point = kart_max.getY();
     m_kart_lowest_point  = kart_min.getY();
+    initInverseBoneMatrices();
 
     // Load the speed weighted object models. We need to do that now because it can affect the dimensions of the kart
     for(size_t i=0 ; i < m_speed_weighted_objects.size() ; i++)
@@ -676,18 +666,18 @@ bool KartModel::loadModels(const KartProperties &kart_properties)
             MeshTools::createSkinnedMeshWithTangents(sm,
                 &MeshTools::isNormalMap);
         }
-        irr_driver->grabAllTextures(obj.m_model);
 #endif
-        // Update min/max
+        obj.m_model->grab();
+        irr_driver->grabAllTextures(obj.m_model);
+
+        // Update min/max, speed weight can be scaled
         Vec3 obj_min, obj_max;
-        int frame = m_animation_frame[AF_SPEED_WEIGHTED_START];
-        if (frame < 0)
-            frame = 0;
-        MeshTools::minMax3D(obj.m_model->getMesh(frame), &obj_min, &obj_max);
-        obj_min += obj.m_position;
-        obj_max += obj.m_position;
-        kart_min.min(obj_min);
-        kart_max.max(obj_max);
+        MeshTools::minMax3D(obj.m_model->getMesh(0), &obj_min, &obj_max);
+        core::vector3df transformed_min, transformed_max;
+        obj.m_location.transformVect(transformed_min, obj_min.toIrrVector());
+        obj.m_location.transformVect(transformed_max, obj_max.toIrrVector());
+        kart_min.min(transformed_min);
+        kart_max.max(transformed_max);
     }
 
     for (unsigned int i = 0; i < m_headlight_objects.size(); i++)
@@ -771,18 +761,33 @@ void KartModel::loadNitroEmitterInfo(const XMLNode &node,
 // ----------------------------------------------------------------------------
 
 /** Loads a single speed weighted node. */
-void KartModel::loadSpeedWeightedInfo(const XMLNode* speed_weighted_node,
-                    const SpeedWeightedObject::Properties& fallback_properties)
+void KartModel::loadSpeedWeightedInfo(const XMLNode* speed_weighted_node)
 {
     SpeedWeightedObject obj;
-    obj.m_properties    = fallback_properties;
-    obj.m_properties.loadFromXMLNode(speed_weighted_node);
-    
-    speed_weighted_node->get("position", &obj.m_position);
-    speed_weighted_node->get("model",    &obj.m_name);
-
-    if(!obj.m_name.empty())
+    if (speed_weighted_node->getName() == "object")
+    {
+        core::vector3df position, rotation, scale;
+        speed_weighted_node->get("position", &position);
+        speed_weighted_node->get("rotation", &rotation);
+        speed_weighted_node->get("scale", &scale);
+        core::matrix4 lm, sm, rm;
+        lm.setTranslation(position);
+        sm.setScale(scale);
+        rm.setRotationDegrees(rotation);
+        obj.m_location = lm * rm * sm;
+        speed_weighted_node->get("bone", &obj.m_bone_name);
+        speed_weighted_node->get("model", &obj.m_name);
+        obj.m_properties.loadFromXMLNode(speed_weighted_node);
+    }
+    else
+    {
+        Log::warn("KartModel",
+            "Unknown XML node in the speed weighted objects section");
+    }
+    if (!obj.m_name.empty())
+    {
         m_speed_weighted_objects.push_back(obj);
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -1081,20 +1086,21 @@ void KartModel::update(float dt, float distance, float steer, float speed,
         {
             SpeedWeightedObject&    obj = m_speed_weighted_objects[i];
 
-#define GET_VALUE(obj, value_name)   \
-    obj.m_properties.value_name > SPEED_WEIGHTED_OBJECT_PROPERTY_UNDEFINED ? obj.m_properties.value_name : \
-    m_kart->getKartProperties()->getSpeedWeightedObjectProperties().value_name
-
+            if (obj.m_node == NULL)
+            {
+                continue;
+            }
             // Animation strength
-            const float strength_factor = GET_VALUE(obj, m_strength_factor);
+            const float strength_factor = obj.m_properties.m_strength_factor;
             if (strength_factor >= 0.0f)
             {
                 float strength = speed * strength_factor;
                 btClamp<float>(strength, 0.0f, 1.0f);
+                obj.m_node->setAnimationStrength(strength);
             }
 
             // Animation speed
-            const float speed_factor = GET_VALUE(obj, m_speed_factor);
+            const float speed_factor = obj.m_properties.m_speed_factor;
             if (speed_factor >= 0.0f)
             {
                 float anim_speed = speed * speed_factor;
@@ -1103,8 +1109,8 @@ void KartModel::update(float dt, float distance, float steer, float speed,
 
             // Texture animation
             core::vector2df tex_speed;
-            tex_speed.X = GET_VALUE(obj, m_texture_speed.X);
-            tex_speed.Y = GET_VALUE(obj, m_texture_speed.Y);
+            tex_speed.X = obj.m_properties.m_texture_speed.X;
+            tex_speed.Y = obj.m_properties.m_texture_speed.Y;
             if (tex_speed != core::vector2df(0.0f, 0.0f))
             {
                 obj.m_texture_cur_offset += speed * tex_speed * dt;
@@ -1123,7 +1129,6 @@ void KartModel::update(float dt, float distance, float steer, float speed,
                     }   // for j<MATERIAL_MAX_TEXTURES
                 }   // for i<getMaterialCount
             }
-#undef GET_VALUE
         }
     }
 
@@ -1199,26 +1204,41 @@ void KartModel::toggleHeadlights(bool on)
 }   // toggleHeadlights
 
 //-----------------------------------------------------------------------------
-core::matrix4 KartModel::getInverseBoneMatrix(const char* bone_name)
+void KartModel::initInverseBoneMatrices()
 {
-    assert(m_animated_node);
-    scene::IBoneSceneNode* bone = m_animated_node->getJointNode(bone_name);
-    assert(bone);
-    m_animated_node->setCurrentFrame((float)m_animation_frame[AF_STRAIGHT]);
-#ifndef SERVER_ONLY
-    STKAnimatedMesh* am = dynamic_cast<STKAnimatedMesh*>(m_animated_node);
-    if (am)
+    // Due to irrlicht mesh doesn't expose bone name, we have to create a
+    // dummy aniamted node
+    // All bone matrices are configured in straight frame (as in exporting)
+    scene::IAnimatedMeshSceneNode* node = irr_driver->getSceneManager()
+        ->addAnimatedMeshSceneNode(m_mesh);
+    node->setCurrentFrame((float)m_animation_frame[AF_STRAIGHT]);
+    const unsigned total_joint = node->getJointCount();
+    for (unsigned i = 0; i < total_joint; i++)
     {
-        am->setHardwareSkinning(false);
-        am->OnAnimate(0);
-        am->setHardwareSkinning(true);
+        node->OnAnimate(0);
+        scene::IBoneSceneNode* bone = node->getJointNode(i);
+        bone->updateAbsolutePosition();
+        const core::matrix4 mat = bone->getAbsoluteTransformation();
+        core::matrix4 inv;
+        mat.getInverse(inv);
+        const std::string bone_name = bone->getName();
+        auto ret = m_inverse_bone_matrices.find(bone_name);
+        if (ret != m_inverse_bone_matrices.end())
+        {
+            Log::warn("KartModel", "%s has duplicated bone, name: %s,"
+                " attachment may not work correctly.",
+                m_model_filename.c_str(), bone_name.c_str());
+        }
+        m_inverse_bone_matrices[bone_name] = inv;
     }
-    else
-#endif
-        m_animated_node->OnAnimate(0);
-    bone->updateAbsolutePosition();
-    const core::matrix4 mat = bone->getAbsoluteTransformation();
-    core::matrix4 inv;
-    mat.getInverse(inv);
-    return inv;
+    node->remove();
+}   // initInverseBoneMatrices
+
+//-----------------------------------------------------------------------------
+const core::matrix4& KartModel::getInverseBoneMatrix
+                                           (const std::string& bone_name) const
+{
+    auto ret = m_inverse_bone_matrices.find(bone_name);
+    assert(ret != m_inverse_bone_matrices.end());
+    return ret->second;
 }   // getInverseBoneMatrix
diff --git a/src/karts/kart_model.hpp b/src/karts/kart_model.hpp
index e218860c6..22817c11c 100644
--- a/src/karts/kart_model.hpp
+++ b/src/karts/kart_model.hpp
@@ -20,6 +20,7 @@
 #define HEADER_KART_MODEL_HPP
 
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #include <IAnimatedMeshSceneNode.h>
@@ -59,22 +60,25 @@ struct SpeedWeightedObject
 
         void    loadFromXMLNode(const XMLNode* xml_node);
 
-        void    checkAllSet();
     };
 
-    SpeedWeightedObject() : m_model(NULL), m_node(NULL), m_position(), m_name() {}
+    SpeedWeightedObject() : m_model(NULL), m_node(NULL), m_name() {}
     /** Model */
     scene::IAnimatedMesh *              m_model;
 
     /** The scene node the speed weighted model is attached to */
     scene::IAnimatedMeshSceneNode *     m_node;
 
-    /** The position of the "speed weighted" objects relative to the kart */
-    Vec3                                m_position;
+    /** The relative matrix to the parent kart scene node
+     *  where the speed weighted object is attached to. */
+    core::matrix4                       m_location;
 
     /** Filename of the "speed weighted" object */
     std::string                         m_name;
 
+    /** Attach to which bone in kart model if not empty. */
+    std::string                         m_bone_name;
+
     /** Current uv translation in the texture matrix for speed-weighted texture animations */
     core::vector2df                     m_texture_cur_offset;
 
@@ -94,7 +98,7 @@ private:
     std::string m_filename;
 
     /** The relative matrix to the parent kart scene node
-     *  or bone where the headlight mesh is attached to. */
+     *  where the headlight mesh is attached to. */
     core::matrix4 m_location;
 
     /** The mesh for the headlight. */
@@ -186,9 +190,7 @@ public:
             AF_BACK_LEFT,          // Going back left
             AF_BACK_STRAIGHT,      // Going back straight
             AF_BACK_RIGHT,         // Going back right
-            AF_SPEED_WEIGHTED_START,        // Start of speed-weighted animation
-            AF_SPEED_WEIGHTED_END,          // End of speed-weighted animation
-            AF_END=AF_SPEED_WEIGHTED_END,   // Last animation frame
+            AF_END=AF_BACK_RIGHT,  // Last animation frame
             AF_COUNT};             // Number of entries here
 
 private:
@@ -299,8 +301,7 @@ private:
     void  loadNitroEmitterInfo(const XMLNode &node,
                         const std::string &emitter_name, int index);
 
-    void  loadSpeedWeightedInfo(const XMLNode* speed_weighted_node,
-                                const SpeedWeightedObject::Properties& fallback_properties);
+    void  loadSpeedWeightedInfo(const XMLNode* speed_weighted_node);
 
     void  loadHeadlights(const XMLNode &node);
 
@@ -315,10 +316,10 @@ private:
 
     bool m_support_colorization;
 
-    unsigned m_version;
+    std::unordered_map<std::string, core::matrix4> m_inverse_bone_matrices;
 
     // ------------------------------------------------------------------------
-    core::matrix4 getInverseBoneMatrix(const char* bone_name);
+    void initInverseBoneMatrices();
     // ------------------------------------------------------------------------
     void configNode(scene::ISceneNode* node, const core::matrix4& global_mat,
                     const core::matrix4& inv_mat)
@@ -438,6 +439,9 @@ public:
     bool supportColorization() const         { return m_support_colorization; }
     // ------------------------------------------------------------------------
     void toggleHeadlights(bool on);
+    // ------------------------------------------------------------------------
+    const core::matrix4&
+                      getInverseBoneMatrix(const std::string& bone_name) const;
 
 };   // KartModel
 #endif
diff --git a/src/karts/kart_properties.cpp b/src/karts/kart_properties.cpp
index bbec01ea1..f79a99524 100644
--- a/src/karts/kart_properties.cpp
+++ b/src/karts/kart_properties.cpp
@@ -306,6 +306,25 @@ void KartProperties::load(const std::string &filename, const std::string &node)
 
 }   // load
 
+// ----------------------------------------------------------------------------
+/** Returns a pointer to the KartModel object.
+ *  \param krt The KartRenderType, like default, red, blue or transparent.
+ *  see the RenderInfo include for details
+ */
+KartModel* KartProperties::getKartModelCopy(KartRenderType krt) const
+{
+    return m_kart_model->makeCopy(krt);
+}  // getKartModelCopy
+
+// ----------------------------------------------------------------------------
+/** Sets the name of a mesh to be used for this kart.
+ *  \param hat_name Name of the mesh.
+ */
+void KartProperties::setHatMeshName(const std::string &hat_name)
+{
+    m_kart_model->setHatMeshName(hat_name);
+}  // setHatMeshName
+
 //-----------------------------------------------------------------------------
 void KartProperties::combineCharacteristics()
 {
@@ -372,11 +391,6 @@ void KartProperties::getAllData(const XMLNode * root)
         m_ai_properties[RaceManager::DIFFICULTY_BEST]->load(best);
     }
 
-    if(const XMLNode *speed_weighted_objects_node = root->getNode("speed-weighted-objects"))
-    {
-        m_speed_weighted_object_properties.loadFromXMLNode(speed_weighted_objects_node);
-    }
-
     if(const XMLNode *friction_node = root->getNode("friction"))
         friction_node->get("slip", &m_friction_slip);
 
@@ -480,8 +494,6 @@ void KartProperties::checkAllSet(const std::string &filename)
     CHECK_NEG(m_restitution,                "collision restitution"         );
     CHECK_NEG(m_physical_wheel_position,    "collision physical-wheel-position");
 
-    m_speed_weighted_object_properties.checkAllSet();
-
     for(unsigned int i=0; i<RaceManager::DIFFICULTY_COUNT; i++)
         m_ai_properties[i]->checkAllSet(filename);
 }   // checkAllSet
@@ -1173,6 +1185,5 @@ bool KartProperties::getSkidEnabled() const
     return m_cached_characteristic->getSkidEnabled();
 }  // getSkidEnabled
 
-
 /* <characteristics-end kpgetter> */
 
diff --git a/src/karts/kart_properties.hpp b/src/karts/kart_properties.hpp
index a81e5bf6e..af1aab56c 100644
--- a/src/karts/kart_properties.hpp
+++ b/src/karts/kart_properties.hpp
@@ -32,7 +32,6 @@ namespace irr
 using namespace irr;
 
 #include "audio/sfx_manager.hpp"
-#include "karts/kart_model.hpp"
 #include "io/xml_node.hpp"
 #include "race/race_manager.hpp"
 #include "utils/interpolation_array.hpp"
@@ -42,6 +41,7 @@ class AbstractCharacteristic;
 class AIProperties;
 class CachedCharacteristic;
 class CombinedCharacteristic;
+class KartModel;
 class Material;
 class XMLNode;
 
@@ -176,9 +176,6 @@ private:
     // -------------------
     float m_friction_slip;
 
-    /** Parameters for the speed-weighted objects */
-    SpeedWeightedObject::Properties   m_speed_weighted_object_properties;
-
     /** Shift of center of gravity. */
     Vec3  m_gravity_center_shift;
 
@@ -244,26 +241,13 @@ public:
     video::ITexture *getMinimapIcon  () const {return m_minimap_icon;         }
 
     // ------------------------------------------------------------------------
-    /** Returns a pointer to the KartModel object.
-     *  \param krt The KartRenderType, like default, red, blue or transparent.
-     *  see the RenderInfo include for details
-     */
-    KartModel*    getKartModelCopy(KartRenderType krt) const
-                                         {return m_kart_model->makeCopy(krt); }
-
+    KartModel*    getKartModelCopy(KartRenderType krt) const;
     // ------------------------------------------------------------------------
     /** Returns a pointer to the main KartModel object. This copy
      *  should not be modified, not attachModel be called on it. */
     const KartModel& getMasterKartModel() const {return *m_kart_model;        }
-
     // ------------------------------------------------------------------------
-    /** Sets the name of a mesh to be used for this kart.
-     *  \param hat_name Name of the mesh.
-     */
-    void setHatMeshName(const std::string &hat_name)
-    {
-        m_kart_model->setHatMeshName(hat_name);
-    }   // setHatMeshName
+    void setHatMeshName(const std::string &hat_name);
     // ------------------------------------------------------------------------
     /** Returns the name of this kart.
         \note Pass it through fridibi as needed, this is the LTR name
@@ -324,13 +308,6 @@ public:
     /** Returns friction slip. */
     float getFrictionSlip           () const {return m_friction_slip;         }
 
-    // ------------------------------------------------------------------------
-    /** Returns parameters for the speed-weighted objects */
-    const SpeedWeightedObject::Properties& getSpeedWeightedObjectProperties() const
-    {
-        return m_speed_weighted_object_properties;
-    }
-
     // ------------------------------------------------------------------------
     /** Returns the wheel base (distance front to rear axis). */
     float getWheelBase              () const {return m_wheel_base;            }
diff --git a/src/main.cpp b/src/main.cpp
index 1726a918b..09c69b995 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -202,6 +202,7 @@
 #include "items/projectile_manager.hpp"
 #include "karts/combined_characteristic.hpp"
 #include "karts/controller/ai_base_lap_controller.hpp"
+#include "karts/kart_model.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/kart_properties_manager.hpp"
 #include "modes/cutscene_world.hpp"
diff --git a/src/physics/btKart.cpp b/src/physics/btKart.cpp
index 1f08cfbe8..b84bc6e6b 100644
--- a/src/physics/btKart.cpp
+++ b/src/physics/btKart.cpp
@@ -24,6 +24,7 @@
 
 #include "graphics/material.hpp"
 #include "karts/kart.hpp"
+#include "karts/kart_model.hpp"
 #include "physics/triangle_mesh.hpp"
 #include "tracks/terrain_info.hpp"
 #include "tracks/track.hpp"
diff --git a/src/states_screens/feature_unlocked.cpp b/src/states_screens/feature_unlocked.cpp
index f4d8b4e19..3a1262cf0 100644
--- a/src/states_screens/feature_unlocked.cpp
+++ b/src/states_screens/feature_unlocked.cpp
@@ -29,6 +29,7 @@
 #include "guiengine/engine.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "io/file_manager.hpp"
+#include "karts/kart_model.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/kart_properties_manager.hpp"
 #include "modes/cutscene_world.hpp"
diff --git a/src/states_screens/grand_prix_lose.cpp b/src/states_screens/grand_prix_lose.cpp
index 25ea129f5..0649d3b34 100644
--- a/src/states_screens/grand_prix_lose.cpp
+++ b/src/states_screens/grand_prix_lose.cpp
@@ -30,6 +30,7 @@
 #include "guiengine/widgets/label_widget.hpp"
 #include "io/file_manager.hpp"
 #include "items/item_manager.hpp"
+#include "karts/kart_model.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/kart_properties_manager.hpp"
 #include "modes/cutscene_world.hpp"
diff --git a/src/states_screens/grand_prix_lose.hpp b/src/states_screens/grand_prix_lose.hpp
index 23a2b78be..db294d928 100644
--- a/src/states_screens/grand_prix_lose.hpp
+++ b/src/states_screens/grand_prix_lose.hpp
@@ -20,13 +20,13 @@
 #define HEADER_GRAND_PRIX_LOSE_HPP
 
 #include "guiengine/screen.hpp"
-#include "karts/kart_model.hpp"
 #include "states_screens/grand_prix_cutscene.hpp"
 
 #include <vector>
 #include <string>
 
 namespace irr { namespace scene { class ISceneNode; class ICameraSceneNode; class ILightSceneNode; class IMeshSceneNode; } }
+class KartModel;
 class KartProperties;
 class TrackObject;
 
diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp
index 3afc5663e..c03e1ab91 100644
--- a/src/states_screens/kart_selection.cpp
+++ b/src/states_screens/kart_selection.cpp
@@ -32,6 +32,7 @@
 #include "input/device_manager.hpp"
 #include "items/item_manager.hpp"
 #include "karts/abstract_characteristic.hpp"
+#include "karts/kart_model.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/kart_properties_manager.hpp"
 #include "modes/overworld.hpp"
@@ -833,8 +834,10 @@ void KartSelectionScreen::updateKartWidgetModel(int widget_id,
             ItemManager::getItemModel(Item::ITEM_BONUS_BOX);
 
         w3->clearModels();
-        w3->addModel( model, Vec3(0.0f, -12.0f, 0.0f),
-                      Vec3(35.0f, 35.0f, 35.0f) );
+        core::matrix4 model_location;
+        model_location.setTranslation(core::vector3df(0.0f, -12.0f, 0.0f));
+        model_location.setScale(core::vector3df(35.0f, 35.0f, 35.0f));
+        w3->addModel(model, model_location);
         w3->update(0);
         m_kart_widgets[widget_id].m_kart_name
         ->setText( _("Random Kart"), false );
@@ -843,9 +846,11 @@ void KartSelectionScreen::updateKartWidgetModel(int widget_id,
     else if (StringUtils::startsWith(selection, ID_LOCKED) && !m_multiplayer)
     {
         w3->clearModels();
+        core::matrix4 model_location;
+        model_location.setScale(core::vector3df(15.0f, 15.0f, 15.0f));
         w3->addModel(irr_driver->getAnimatedMesh(
-                         file_manager->getAsset(FileManager::MODEL, "chest.spm") )->getMesh(20),
-                     Vec3(0,0,0), Vec3(15.0f, 15.0f, 15.0f) );
+            file_manager->getAsset(FileManager::MODEL, "chest.spm"))
+            ->getMesh(20), model_location);
         w3->update(0);
 
         if (m_multiplayer)
@@ -874,6 +879,8 @@ void KartSelectionScreen::updateKartWidgetModel(int widget_id,
                 scale = 30.0f;
             }
 
+            core::matrix4 model_location;
+            model_location.setScale(core::vector3df(scale, scale, scale));
             w3->clearModels();
             const bool has_win_anime =
                 UserConfigParams::m_show_steering_animations != 0 &&
@@ -882,8 +889,7 @@ void KartSelectionScreen::updateKartWidgetModel(int widget_id,
                 kart_model.getFrame(KartModel::AF_WIN_END) > -1) ||
                 (kart_model.getFrame(KartModel::AF_SELECTION_START) > -1 &&
                 kart_model.getFrame(KartModel::AF_SELECTION_END) > -1));
-            w3->addModel( kart_model.getModel(), Vec3(0,0,0),
-                Vec3(scale, scale, scale),
+            w3->addModel( kart_model.getModel(), model_location,
                 has_win_anime ?
                 kart_model.getFrame(KartModel::AF_SELECTION_START) > -1 ?
                 kart_model.getFrame(KartModel::AF_SELECTION_START) :
@@ -898,18 +904,29 @@ void KartSelectionScreen::updateKartWidgetModel(int widget_id,
                 kart_model.getBaseFrame(),
                 false/*all_parts_colorized*/,
                 kart_model.getAnimationSpeed());
-            w3->addModel( kart_model.getWheelModel(0),
-                          kart_model.getWheelGraphicsPosition(0) );
-            w3->addModel( kart_model.getWheelModel(1),
-                          kart_model.getWheelGraphicsPosition(1) );
-            w3->addModel( kart_model.getWheelModel(2),
-                          kart_model.getWheelGraphicsPosition(2) );
-            w3->addModel( kart_model.getWheelModel(3),
-                          kart_model.getWheelGraphicsPosition(3) );
-            for (size_t i = 0; i < kart_model.getSpeedWeightedObjectsCount(); i++)
+
+            model_location.setScale(core::vector3df(1.0f, 1.0f, 1.0f));
+            for (unsigned i = 0; i < 4; i++)
             {
-                const SpeedWeightedObject&  obj = kart_model.getSpeedWeightedObject((int)i);
-                w3->addModel(obj.m_model, obj.m_position);
+                model_location.setTranslation(kart_model
+                    .getWheelGraphicsPosition(i).toIrrVector());
+                w3->addModel(kart_model.getWheelModel(i), model_location);
+            }
+
+            for (unsigned i = 0;
+                 i < kart_model.getSpeedWeightedObjectsCount(); i++)
+            {
+                const SpeedWeightedObject& obj =
+                    kart_model.getSpeedWeightedObject(i);
+                core::matrix4 swol = obj.m_location;
+                if (!obj.m_bone_name.empty())
+                {
+                    core::matrix4 inv =
+                        kart_model.getInverseBoneMatrix(obj.m_bone_name);
+                    swol = inv * obj.m_location;
+                }
+                w3->addModel(obj.m_model, swol, -1, -1, false, 0.0f,
+                    obj.m_bone_name);
             }
             //w3->update(0);
 
diff --git a/src/states_screens/soccer_setup_screen.cpp b/src/states_screens/soccer_setup_screen.cpp
index 4f3311ad5..f56251fce 100644
--- a/src/states_screens/soccer_setup_screen.cpp
+++ b/src/states_screens/soccer_setup_screen.cpp
@@ -161,46 +161,36 @@ void SoccerSetupScreen::beforeAddingWidget()
                 (info.team == SOCCER_TEAM_BLUE ? KRT_BLUE : KRT_RED);
         }
 
+        core::matrix4 model_location;
+        model_location.setScale(core::vector3df(35.0f, 35.0f, 35.0f));
         // Add the kart model (including wheels and speed weight objects)
-        kart_view->addModel(kart_model.getModel(), Vec3(0, 0, 0),
-            Vec3(35.0f, 35.0f, 35.0f), kart_model.getBaseFrame(),
-            kart_model.getBaseFrame());
+        kart_view->addModel(kart_model.getModel(), model_location,
+            kart_model.getBaseFrame(), kart_model.getBaseFrame());
 
-        kart_view->addModel( kart_model.getWheelModel(0),
-                                kart_model.getWheelGraphicsPosition(0),
-                                Vec3(1, 1, 1), /*scale*/
-                                -1, /*start_loop_frame*/
-                                -1, /*end_loop_frame*/
-                                true /*all_parts_colorized*/);
-
-        kart_view->addModel( kart_model.getWheelModel(1),
-                                kart_model.getWheelGraphicsPosition(1),
-                                Vec3(1, 1, 1), /*scale*/
-                                -1, /*start_loop_frame*/
-                                -1, /*end_loop_frame*/
-                                true /*all_parts_colorized*/);
-        kart_view->addModel( kart_model.getWheelModel(2),
-                                kart_model.getWheelGraphicsPosition(2),
-                                Vec3(1, 1, 1), /*scale*/
-                                -1, /*start_loop_frame*/
-                                -1, /*end_loop_frame*/
-                                true /*all_parts_colorized*/);
-
-        kart_view->addModel( kart_model.getWheelModel(3),
-                                kart_model.getWheelGraphicsPosition(3),
-                                Vec3(1, 1, 1), /*scale*/
-                                -1, /*start_loop_frame*/
-                                -1, /*end_loop_frame*/
-                                true /*all_parts_colorized*/);
-
-        for (size_t i = 0; i < kart_model.getSpeedWeightedObjectsCount(); i++)
+        model_location.setScale(core::vector3df(1.0f, 1.0f, 1.0f));
+        for (unsigned i = 0; i < 4; i++)
         {
-            const SpeedWeightedObject& obj = kart_model.getSpeedWeightedObject((int)i);
-            kart_view->addModel(obj.m_model, obj.m_position,
-                                Vec3(1, 1, 1), /*scale*/
-                                -1, /*start_loop_frame*/
-                                -1, /*end_loop_frame*/
-                                true /*all_parts_colorized*/);
+            model_location.setTranslation(kart_model
+                .getWheelGraphicsPosition(i).toIrrVector());
+            kart_view->addModel(kart_model.getWheelModel(i), model_location,
+                -1/*start_loop_frame*/ -1/*end_loop_frame*/,
+                true/*all_parts_colorized*/);
+        }
+
+        for (unsigned i = 0; i < kart_model.getSpeedWeightedObjectsCount();
+            i++)
+        {
+            const SpeedWeightedObject& obj =
+                kart_model.getSpeedWeightedObject(i);
+            core::matrix4 swol = obj.m_location;
+            if (!obj.m_bone_name.empty())
+            {
+                core::matrix4 inv =
+                    kart_model.getInverseBoneMatrix(obj.m_bone_name);
+                swol = inv * obj.m_location;
+            }
+            kart_view->addModel(obj.m_model, swol, -1, -1, true, 0.0f,
+                obj.m_bone_name);
         }
 
         kart_view->setRotateContinuously( KART_CONTINUOUS_ROTATION_SPEED );

From 66cebbdbe7b25d9c5194ffd8d4de1ceefcbee7d3 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 18 Sep 2017 21:48:54 +0200
Subject: [PATCH 120/125] Add cmake scripts that find egl and wayland libraries

---
 cmake/FindEGL.cmake         | 18 ++++++++++
 cmake/FindWayland.cmake     | 52 ++++++++++++++++++++++++++++
 lib/irrlicht/CMakeLists.txt | 69 ++++++++++++++++++++++---------------
 3 files changed, 111 insertions(+), 28 deletions(-)
 create mode 100644 cmake/FindEGL.cmake
 create mode 100644 cmake/FindWayland.cmake

diff --git a/cmake/FindEGL.cmake b/cmake/FindEGL.cmake
new file mode 100644
index 000000000..430334b4a
--- /dev/null
+++ b/cmake/FindEGL.cmake
@@ -0,0 +1,18 @@
+# - Find EGL
+# Find the EGL includes and libraries
+#
+# Following variables are provided:
+# EGL_FOUND
+#     True if EGL has been found
+# EGL_INCLUDE_DIR
+#     The include directory of EGL
+# EGL_LIBRARY
+#     EGL library list
+
+find_path(EGL_INCLUDE_DIR EGL/egl.h)
+find_library(EGL_LIBRARY NAMES EGL)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(EGL DEFAULT_MSG EGL_LIBRARY EGL_INCLUDE_DIR)
+
+mark_as_advanced(EGL_LIBRARY EGL_INCLUDE_DIR)
diff --git a/cmake/FindWayland.cmake b/cmake/FindWayland.cmake
new file mode 100644
index 000000000..17d200da6
--- /dev/null
+++ b/cmake/FindWayland.cmake
@@ -0,0 +1,52 @@
+# - Find Wayland
+# Find the Wayland includes and libraries
+#
+# Following variables are provided:
+# WAYLAND_FOUND
+#     True if Wayland has been found
+# WAYLAND_INCLUDE_DIRS
+#     The include directories of Wayland
+# WAYLAND_LIBRARIES
+#     Wayland library list
+
+find_path(WAYLAND_CLIENT_INCLUDE_DIR wayland-client.h)
+find_path(WAYLAND_CURSOR_INCLUDE_DIR wayland-cursor.h)
+find_path(WAYLAND_EGL_INCLUDE_DIR wayland-egl.h)
+find_path(XKBCOMMON_INCLUDE_DIR xkbcommon/xkbcommon.h)
+
+find_library(WAYLAND_CLIENT_LIBRARY NAMES wayland-client)
+find_library(WAYLAND_CURSOR_LIBRARY NAMES wayland-cursor)
+find_library(WAYLAND_EGL_LIBRARY NAMES wayland-egl)
+find_library(XKBCOMMON_LIBRARY NAMES xkbcommon)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Wayland DEFAULT_MSG WAYLAND_CLIENT_LIBRARY 
+                                                      WAYLAND_CURSOR_LIBRARY
+                                                      WAYLAND_EGL_LIBRARY
+                                                      XKBCOMMON_LIBRARY
+                                                      WAYLAND_CLIENT_INCLUDE_DIR
+                                                      WAYLAND_CURSOR_INCLUDE_DIR
+                                                      WAYLAND_EGL_INCLUDE_DIR
+                                                      XKBCOMMON_INCLUDE_DIR)
+
+set(WAYLAND_INCLUDE_DIRS ${WAYLAND_CLIENT_INCLUDE_DIR} 
+                         ${WAYLAND_CURSOR_INCLUDE_DIR} 
+                         ${WAYLAND_EGL_INCLUDE_DIR} 
+                         ${XKBCOMMON_INCLUDE_DIR})
+
+set(WAYLAND_LIBRARIES ${WAYLAND_CLIENT_LIBRARY} 
+                      ${WAYLAND_CURSOR_LIBRARY} 
+                      ${WAYLAND_EGL_LIBRARY} 
+                      ${XKBCOMMON_LIBRARY})
+                      
+list(REMOVE_DUPLICATES WAYLAND_INCLUDE_DIRS)
+list(REMOVE_DUPLICATES WAYLAND_LIBRARIES)
+
+mark_as_advanced(WAYLAND_CLIENT_LIBRARY 
+                 WAYLAND_CURSOR_LIBRARY
+                 WAYLAND_EGL_LIBRARY
+                 XKBCOMMON_LIBRARY
+                 WAYLAND_CLIENT_INCLUDE_DIR
+                 WAYLAND_CURSOR_INCLUDE_DIR
+                 WAYLAND_EGL_INCLUDE_DIR
+                 XKBCOMMON_INCLUDE_DIR)
diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
index ae2b46f41..0d77b6e0d 100644
--- a/lib/irrlicht/CMakeLists.txt
+++ b/lib/irrlicht/CMakeLists.txt
@@ -12,24 +12,40 @@ if(MSVC OR APPLE)
                         "${CMAKE_CURRENT_BINARY_DIR}/../libpng/")
 endif()
 
-if (SERVER_ONLY)
-    add_definitions(-DNO_IRR_COMPILE_WITH_OPENGL_)
-    add_definitions(-DNO_IRR_COMPILE_WITH_X11_)
-    add_definitions(-DNO_IRR_COMPILE_WITH_WAYLAND_DEVICE_)
-else()
+if (NOT SERVER_ONLY)
     if(NOT USE_GLES2)
         find_package(OpenGL REQUIRED)
         include_directories(${OPENGL_INCLUDE_DIR})
     endif()
-endif()
+        
+        if(UNIX AND NOT APPLE)
+                find_package(X11 REQUIRED)
+                include_directories(${X11_INCLUDE_DIR})
+        endif()
 
-if (UNIX AND NOT APPLE)
-    find_package(X11 REQUIRED)
-    include_directories(${X11_INCLUDE_DIR})
-endif()
+        if(ENABLE_WAYLAND_DEVICE)
+                find_package(Wayland REQUIRED)
+                include_directories(${WAYLAND_INCLUDE_DIR})
+                
+                if(NOT WAYLAND_FOUND)
+                        message(FATAL_ERROR "Wayland not found.")
+                endif()
+                
+                add_definitions(-D_IRR_COMPILE_WITH_WAYLAND_DEVICE_)
+        endif()
 
-if(ENABLE_WAYLAND_DEVICE)
-    add_definitions(-D_IRR_COMPILE_WITH_WAYLAND_DEVICE_)
+        if(USE_GLES2 OR ENABLE_WAYLAND_DEVICE)
+                find_package(EGL REQUIRED)
+                include_directories(${EGL_INCLUDE_DIR})
+                
+                if(NOT EGL_FOUND)
+                        message(FATAL_ERROR "EGL not found.")
+                endif()
+        endif()
+else()
+    add_definitions(-DNO_IRR_COMPILE_WITH_OPENGL_)
+    add_definitions(-DNO_IRR_COMPILE_WITH_X11_)
+    add_definitions(-DNO_IRR_COMPILE_WITH_WAYLAND_DEVICE_)
 endif()
 
 if(APPLE)
@@ -44,21 +60,18 @@ if(UNIX OR MINGW)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
 endif()
 
-if(MSVC)
-  add_definitions(/D_IRR_STATIC_LIB_)
-  add_definitions(/D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
-elseif(MINGW)
-  add_definitions(-D_IRR_STATIC_LIB_)
-  add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
+if(WIN32)
+    add_definitions(-D_IRR_STATIC_LIB_)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
 else()
-  set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing")
-  if(CMAKE_COMPILER_IS_GNUCC)
-	  set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fexpensive-optimizations")
-  endif()
-  if(CMAKE_COMPILER_IS_GNUCXX)
-	  set(CMAKE_CXX_FLAGS   "${CMAKE_CXX_FLAGS} -fexpensive-optimizations")
-  endif()
+    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing")
+    if(CMAKE_COMPILER_IS_GNUCC)
+        set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fexpensive-optimizations")
+    endif()
+    if(CMAKE_COMPILER_IS_GNUCXX)
+        set(CMAKE_CXX_FLAGS   "${CMAKE_CXX_FLAGS} -fexpensive-optimizations")
+    endif()
 endif()
 
 if(USE_GLES2)
@@ -562,11 +575,11 @@ add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES})
 target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
 
 if(USE_GLES2 OR ENABLE_WAYLAND_DEVICE)
-    target_link_libraries(stkirrlicht EGL)
+    target_link_libraries(stkirrlicht ${EGL_LIBRARY})
 endif()
 
 if(ENABLE_WAYLAND_DEVICE)
-    target_link_libraries(stkirrlicht wayland-client wayland-egl wayland-cursor xkbcommon)
+    target_link_libraries(stkirrlicht ${WAYLAND_LIBRARIES})
 endif()
 
 if(WIN32)

From 71334bac5ba843df3ff7b7eb2039a7dc8aba43fa Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 18 Sep 2017 22:14:43 +0200
Subject: [PATCH 121/125] Move xrandr to irrlicht cmake file and also fixed
 indentations

---
 CMakeLists.txt              |  6 +---
 lib/irrlicht/CMakeLists.txt | 67 +++++++++++++++++++++++--------------
 2 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56c2d32d6..a8f1a4d7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,10 +255,6 @@ if(UNIX AND NOT APPLE AND NOT SERVER_ONLY)
     find_package(X11 REQUIRED)
     include_directories(${X11_INCLUDE_DIR})
 
-    if(NOT X11_Xrandr_FOUND)
-        message(FATAL_ERROR "XRANDR not found.")
-    endif()
-
     if(USE_LIBBFD)
         find_package(Libbfd)
         if(LIBBFD_FOUND)
@@ -418,7 +414,7 @@ if(NOT SERVER_ONLY)
 endif()
 
 if(UNIX AND NOT APPLE)
-    target_link_libraries(supertuxkart ${X11_X11_LIB} ${X11_Xrandr_LIB})
+    target_link_libraries(supertuxkart ${X11_X11_LIB})
     if(USE_LIBBFD)
         target_link_libraries(supertuxkart ${LIBBFD_LIBRARIES})
     endif()
diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
index 0d77b6e0d..812f61b8a 100644
--- a/lib/irrlicht/CMakeLists.txt
+++ b/lib/irrlicht/CMakeLists.txt
@@ -12,36 +12,44 @@ if(MSVC OR APPLE)
                         "${CMAKE_CURRENT_BINARY_DIR}/../libpng/")
 endif()
 
-if (NOT SERVER_ONLY)
+if(NOT SERVER_ONLY)
     if(NOT USE_GLES2)
         find_package(OpenGL REQUIRED)
         include_directories(${OPENGL_INCLUDE_DIR})
     endif()
         
-        if(UNIX AND NOT APPLE)
-                find_package(X11 REQUIRED)
-                include_directories(${X11_INCLUDE_DIR})
+    if(UNIX AND NOT APPLE)
+        find_package(X11 REQUIRED)
+        include_directories(${X11_INCLUDE_DIR})
+        
+        if(NOT X11_FOUND)
+            message(FATAL_ERROR "X11 not found.")
         endif()
+        
+        if(NOT X11_Xrandr_FOUND)
+            message(FATAL_ERROR "XRANDR not found.")
+        endif()
+    endif()
 
-        if(ENABLE_WAYLAND_DEVICE)
-                find_package(Wayland REQUIRED)
-                include_directories(${WAYLAND_INCLUDE_DIR})
-                
-                if(NOT WAYLAND_FOUND)
-                        message(FATAL_ERROR "Wayland not found.")
-                endif()
-                
-                add_definitions(-D_IRR_COMPILE_WITH_WAYLAND_DEVICE_)
+    if(ENABLE_WAYLAND_DEVICE)
+        find_package(Wayland REQUIRED)
+        include_directories(${WAYLAND_INCLUDE_DIR})
+        
+        if(NOT WAYLAND_FOUND)
+            message(FATAL_ERROR "Wayland not found.")
         endif()
+        
+        add_definitions(-D_IRR_COMPILE_WITH_WAYLAND_DEVICE_)
+    endif()
 
-        if(USE_GLES2 OR ENABLE_WAYLAND_DEVICE)
-                find_package(EGL REQUIRED)
-                include_directories(${EGL_INCLUDE_DIR})
-                
-                if(NOT EGL_FOUND)
-                        message(FATAL_ERROR "EGL not found.")
-                endif()
+    if(USE_GLES2 OR ENABLE_WAYLAND_DEVICE)
+        find_package(EGL REQUIRED)
+        include_directories(${EGL_INCLUDE_DIR})
+        
+        if(NOT EGL_FOUND)
+            message(FATAL_ERROR "EGL not found.")
         endif()
+    endif()
 else()
     add_definitions(-DNO_IRR_COMPILE_WITH_OPENGL_)
     add_definitions(-DNO_IRR_COMPILE_WITH_X11_)
@@ -572,14 +580,21 @@ if(APPLE)
 endif()
 
 add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES})
+
 target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
 
-if(USE_GLES2 OR ENABLE_WAYLAND_DEVICE)
-    target_link_libraries(stkirrlicht ${EGL_LIBRARY})
-endif()
-
-if(ENABLE_WAYLAND_DEVICE)
-    target_link_libraries(stkirrlicht ${WAYLAND_LIBRARIES})
+if(NOT SERVER_ONLY)
+    if(UNIX AND NOT APPLE)
+        target_link_libraries(stkirrlicht ${X11_X11_LIB} ${X11_Xrandr_LIB})
+    endif()
+        
+    if(USE_GLES2 OR ENABLE_WAYLAND_DEVICE)
+        target_link_libraries(stkirrlicht ${EGL_LIBRARY})
+    endif()
+    
+    if(ENABLE_WAYLAND_DEVICE)
+        target_link_libraries(stkirrlicht ${WAYLAND_LIBRARIES})
+    endif()
 endif()
 
 if(WIN32)

From 3cd2f403e0b0a482216be8819b8c1eedc1e5fe85 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Wed, 20 Sep 2017 01:27:52 +0800
Subject: [PATCH 122/125] Force re-skin when getMesh with hardware skinning on

Actually spm has a built in way to use mesh without bothering bind
pose
---
 lib/irrlicht/source/Irrlicht/CSkinnedMesh.cpp |  3 +++
 src/karts/kart_model.cpp                      | 13 ++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CSkinnedMesh.cpp b/lib/irrlicht/source/Irrlicht/CSkinnedMesh.cpp
index b4fcf2b64..411ba1077 100644
--- a/lib/irrlicht/source/Irrlicht/CSkinnedMesh.cpp
+++ b/lib/irrlicht/source/Irrlicht/CSkinnedMesh.cpp
@@ -77,7 +77,10 @@ IMesh* CSkinnedMesh::getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop, s32
 {
 	const bool is_hw_skinning_before = HardwareSkinning;
 	if (is_hw_skinning_before)
+	{
 		HardwareSkinning = false;
+		LastAnimatedFrame = -1;
+	}
 	//animate(frame,startFrameLoop, endFrameLoop);
 	if (frame==-1)
 		return this;
diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index 7be6544e2..1d5c659bc 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -520,8 +520,9 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool human_playe
             }
             else
             {
-                swo = irr_driver->addMesh(obj.m_model, "speedweighted",
-                    parent, getRenderInfo(), true/*all_parts_colorized*/);
+                swo = irr_driver->addMesh(obj.m_model->getMesh(0),
+                    "speedweighted", parent, getRenderInfo(),
+                    true/*all_parts_colorized*/);
             }
 #ifdef DEBUG
             std::string debug_name = obj.m_name + " (speed-weighted)";
@@ -1211,7 +1212,13 @@ void KartModel::initInverseBoneMatrices()
     // All bone matrices are configured in straight frame (as in exporting)
     scene::IAnimatedMeshSceneNode* node = irr_driver->getSceneManager()
         ->addAnimatedMeshSceneNode(m_mesh);
-    node->setCurrentFrame((float)m_animation_frame[AF_STRAIGHT]);
+    float striaght_frame = (float)m_animation_frame[AF_STRAIGHT];
+    if (m_animation_frame[AF_STRAIGHT] == -1)
+    {
+        Log::warn("KartModel", "%s has no striaght frame defined.");
+        striaght_frame = 0.0f;
+    }
+    node->setCurrentFrame(striaght_frame);
     const unsigned total_joint = node->getJointCount();
     for (unsigned i = 0; i < total_joint; i++)
     {

From 70471a7266e2960427e61fd32477da03fe853b4b Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Tue, 19 Sep 2017 22:42:39 +0200
Subject: [PATCH 123/125] Adjust explosion particle size to updated explosion
 image (removed transparent margins).

Causes minor performance improvement, but better than nothing.
---
 data/gfx/explosion.xml      | 4 ++--
 data/gfx/explosion_bomb.xml | 4 ++--
 data/gfx/explosion_cake.xml | 4 ++--
 data/gfx/fire.xml           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/gfx/explosion.xml b/data/gfx/explosion.xml
index 18538c256..b953e5599 100644
--- a/data/gfx/explosion.xml
+++ b/data/gfx/explosion.xml
@@ -18,8 +18,8 @@
                max="1200"         />
     
     <!-- Size of the particles -->
-    <size      min="0.65"
-               max="0.95"
+    <size      min="0.60"
+               max="0.85"
                x-increase-factor="0.6"
                y-increase-factor="0.6"
                />
diff --git a/data/gfx/explosion_bomb.xml b/data/gfx/explosion_bomb.xml
index 18538c256..b953e5599 100644
--- a/data/gfx/explosion_bomb.xml
+++ b/data/gfx/explosion_bomb.xml
@@ -18,8 +18,8 @@
                max="1200"         />
     
     <!-- Size of the particles -->
-    <size      min="0.65"
-               max="0.95"
+    <size      min="0.60"
+               max="0.85"
                x-increase-factor="0.6"
                y-increase-factor="0.6"
                />
diff --git a/data/gfx/explosion_cake.xml b/data/gfx/explosion_cake.xml
index 18538c256..b953e5599 100644
--- a/data/gfx/explosion_cake.xml
+++ b/data/gfx/explosion_cake.xml
@@ -18,8 +18,8 @@
                max="1200"         />
     
     <!-- Size of the particles -->
-    <size      min="0.65"
-               max="0.95"
+    <size      min="0.60"
+               max="0.85"
                x-increase-factor="0.6"
                y-increase-factor="0.6"
                />
diff --git a/data/gfx/fire.xml b/data/gfx/fire.xml
index 4f69ec46c..3c4a0749e 100644
--- a/data/gfx/fire.xml
+++ b/data/gfx/fire.xml
@@ -18,8 +18,8 @@
                max="500"         />
     
     <!-- Size of the particles -->
-    <size      min="0.6"
-               max="0.8"        />
+    <size      min="0.55"
+               max="0.75"        />
     
     <color     min="255 255 255"
                max="255 255 255" />

From 4078863d1d89f2d64a62878c455c68b47150d227 Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Tue, 19 Sep 2017 18:44:05 -0400
Subject: [PATCH 124/125] Update achivements.xml, fixes #2940

---
 data/achievements.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/achievements.xml b/data/achievements.xml
index b9f4b1d12..dfa196d5a 100644
--- a/data/achievements.xml
+++ b/data/achievements.xml
@@ -2,7 +2,7 @@
 <achievements>
   <achievement id="1" check-type="all-at-least" reset-type="never"
                name="Christoffel Columbus" description="Play every official track at least once." >
-      <city goal="1"/>
+      <candela_city goal="1"/>
       <cocoa_temple goal="1"/>
       <cornfield_crossing goal="1"/>
       <fortmagma goal="1"/>
@@ -22,6 +22,7 @@
       <abyss goal="1"/>
       <xr591 goal="1"/>
       <zengarden goal="1"/>      
+      <volcano_island goal="1"/>
   </achievement>
   <achievement id="2" check-type="all-at-least" reset-type="never"
                name="Strike!" description="Hit 10 karts with a bowling-ball.">

From e655c5e97137af61aa435470fd056c168da62409 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Wed, 20 Sep 2017 13:27:46 +0800
Subject: [PATCH 125/125] Don't initInverseBoneMatrices for < version 3 karts

grep -rn speed-weighted-object in deveee's addon karts show nothing
(even most addons)
---
 src/karts/kart_model.cpp | 16 ++++++++++++----
 src/karts/kart_model.hpp |  2 ++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index 1d5c659bc..b15355141 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -96,6 +96,7 @@ void SpeedWeightedObject::Properties::loadFromXMLNode(const XMLNode* xml_node)
  */
 KartModel::KartModel(bool is_master)
 {
+    m_version    = 0;
     m_is_master  = is_master;
     m_kart       = NULL;
     m_mesh       = NULL;
@@ -185,9 +186,8 @@ void KartModel::loadInfo(const XMLNode &node)
         m_has_nitro_emitter = true;
     }
 
-    unsigned kart_version;
-    node.get("version", &kart_version);
-    if (kart_version > 2)
+    node.get("version", &m_version);
+    if (m_version > 2)
     {
         if (const XMLNode *speed_weighted_objects_node = node.getNode("speed-weighted-objects"))
         {
@@ -335,6 +335,7 @@ KartModel* KartModel::makeCopy(KartRenderType krt)
     km->m_support_colorization  = m_support_colorization;
     km->m_render_info           = new RenderInfo();
     km->m_inverse_bone_matrices = m_inverse_bone_matrices;
+    km->m_version               = m_version;
     km->m_render_info->setKartModelRenderInfo(krt);
 
     km->m_nitro_emitter_position[0] = m_nitro_emitter_position[0];
@@ -1207,6 +1208,11 @@ void KartModel::toggleHeadlights(bool on)
 //-----------------------------------------------------------------------------
 void KartModel::initInverseBoneMatrices()
 {
+    if (m_version < 3)
+    {
+        // Only need for >= 3 version of kart
+        return;
+    }
     // Due to irrlicht mesh doesn't expose bone name, we have to create a
     // dummy aniamted node
     // All bone matrices are configured in straight frame (as in exporting)
@@ -1215,7 +1221,8 @@ void KartModel::initInverseBoneMatrices()
     float striaght_frame = (float)m_animation_frame[AF_STRAIGHT];
     if (m_animation_frame[AF_STRAIGHT] == -1)
     {
-        Log::warn("KartModel", "%s has no striaght frame defined.");
+        Log::warn("KartModel", "%s has no striaght frame defined.",
+            m_model_filename.c_str());
         striaght_frame = 0.0f;
     }
     node->setCurrentFrame(striaght_frame);
@@ -1245,6 +1252,7 @@ void KartModel::initInverseBoneMatrices()
 const core::matrix4& KartModel::getInverseBoneMatrix
                                            (const std::string& bone_name) const
 {
+    assert(m_version >= 3);
     auto ret = m_inverse_bone_matrices.find(bone_name);
     assert(ret != m_inverse_bone_matrices.end());
     return ret->second;
diff --git a/src/karts/kart_model.hpp b/src/karts/kart_model.hpp
index 22817c11c..a49a04881 100644
--- a/src/karts/kart_model.hpp
+++ b/src/karts/kart_model.hpp
@@ -318,6 +318,8 @@ private:
 
     std::unordered_map<std::string, core::matrix4> m_inverse_bone_matrices;
 
+    unsigned m_version;
+
     // ------------------------------------------------------------------------
     void initInverseBoneMatrices();
     // ------------------------------------------------------------------------