From 107e434fe9abf1c57bf72a9c504d37689d49e186 Mon Sep 17 00:00:00 2001
From: Mathieu Laprise <mathieu.laprise@polymtl.ca>
Date: Sat, 6 Dec 2014 15:14:27 -0500
Subject: [PATCH 01/20] Missing button in grand prix editor name dialog #1765

---
 data/gui/enter_gp_name_dialog.stkgui          | 11 ++--
 .../dialogs/enter_gp_name_dialog.cpp          | 65 +++++++++++--------
 .../dialogs/enter_gp_name_dialog.hpp          |  2 +-
 3 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/data/gui/enter_gp_name_dialog.stkgui b/data/gui/enter_gp_name_dialog.stkgui
index 2946fc64f..d6ed12dfc 100644
--- a/data/gui/enter_gp_name_dialog.stkgui
+++ b/data/gui/enter_gp_name_dialog.stkgui
@@ -11,10 +11,13 @@
         <textbox id="textfield" width="75%" I18N="In the 'add new grand prix' dialog" align="center"/>
 
         <spacer height="20" width="20" />
-
-        <button id="cancel" I18N="In the 'add new grand prix' dialog" text="Press ESC to cancel" align="center"/>
-
+        
+        <div width="100%" height="60" layout="horizontal-row">
+        <button id="accept" I18N="In the 'add new grand prix' dialog" text="Create" align="center" proportion="1"/>
         <spacer height="15" width="20" />
-
+        <button id="cancel" I18N="In the 'add new grand prix' dialog" text="Cancel" align="center" proportion="1"/>
+        <spacer height="15" width="20" />
+        </div>
+        
     </div>
 </stkgui>
diff --git a/src/states_screens/dialogs/enter_gp_name_dialog.cpp b/src/states_screens/dialogs/enter_gp_name_dialog.cpp
index 37f9c28da..3b14d960c 100644
--- a/src/states_screens/dialogs/enter_gp_name_dialog.cpp
+++ b/src/states_screens/dialogs/enter_gp_name_dialog.cpp
@@ -62,6 +62,10 @@ GUIEngine::EventPropagation EnterGPNameDialog::processEvent(const std::string& e
         dismiss();
         return GUIEngine::EVENT_BLOCK;
     }
+    else if (eventSource == "accept")
+    {
+        validateName();
+    }
     return GUIEngine::EVENT_LET;
 }
 
@@ -77,7 +81,39 @@ void EnterGPNameDialog::onEnterPressedInternal()
         return;
     }
 
-    //Otherwise, see if we can accept the new name
+    //Otherwise, see if we can accept the new name and create the grand prix
+    validateName();
+}
+
+// -----------------------------------------------------------------------------
+void EnterGPNameDialog::onUpdate(float dt)
+{
+    // It's unsafe to delete from inside the event handler so we do it here
+    if (m_self_destroy)
+    {
+        TextBoxWidget* textCtrl = getWidget<TextBoxWidget>("textfield");
+        stringw name = textCtrl->getText().trim();
+
+        // irrLicht is too stupid to remove focus from deleted widgets
+        // so do it by hand
+        GUIEngine::getGUIEnv()->removeFocus( textCtrl->getIrrlichtElement() );
+        GUIEngine::getGUIEnv()->removeFocus( m_irrlicht_window );
+
+        // we will destroy the dialog before notifying the listener to be safer.
+        // but in order not to crash we must make a local copy of the listern
+        // otherwise we will crash
+        INewGPListener* listener = m_listener;
+
+        ModalDialog::dismiss();
+
+        if (listener != NULL)
+            listener->onNewGPWithName(name);
+    }
+}
+
+// ----------------------------------------------------------------------------
+void EnterGPNameDialog::validateName()
+{
     TextBoxWidget* textCtrl = getWidget<TextBoxWidget>("textfield");
     assert(textCtrl != NULL);
     LabelWidget* label = getWidget<LabelWidget>("title");
@@ -106,30 +142,5 @@ void EnterGPNameDialog::onEnterPressedInternal()
         // in onUpdate (which checks for m_self_destroy)
         m_self_destroy = true;
     }
-}
 
-// -----------------------------------------------------------------------------
-void EnterGPNameDialog::onUpdate(float dt)
-{
-    // It's unsafe to delete from inside the event handler so we do it here
-    if (m_self_destroy)
-    {
-        TextBoxWidget* textCtrl = getWidget<TextBoxWidget>("textfield");
-        stringw name = textCtrl->getText().trim();
-
-        // irrLicht is too stupid to remove focus from deleted widgets
-        // so do it by hand
-        GUIEngine::getGUIEnv()->removeFocus( textCtrl->getIrrlichtElement() );
-        GUIEngine::getGUIEnv()->removeFocus( m_irrlicht_window );
-
-        // we will destroy the dialog before notifying the listener to be safer.
-        // but in order not to crash we must make a local copy of the listern
-        // otherwise we will crash
-        INewGPListener* listener = m_listener;
-
-        ModalDialog::dismiss();
-
-        if (listener != NULL)
-            listener->onNewGPWithName(name);
-    }
-}
+}
\ No newline at end of file
diff --git a/src/states_screens/dialogs/enter_gp_name_dialog.hpp b/src/states_screens/dialogs/enter_gp_name_dialog.hpp
index a9a5cc42d..99e729a06 100644
--- a/src/states_screens/dialogs/enter_gp_name_dialog.hpp
+++ b/src/states_screens/dialogs/enter_gp_name_dialog.hpp
@@ -62,8 +62,8 @@ public:
     ~EnterGPNameDialog();
 
     void onEnterPressedInternal();
+    void validateName();
     GUIEngine::EventPropagation processEvent(const std::string& eventSource);
-
     virtual void onUpdate(float dt);
 };
 

From f98a169e9c7473b56fcacdf6abcfbce95528e05d Mon Sep 17 00:00:00 2001
From: Mathieu Laprise <mathieu.laprise@polymtl.ca>
Date: Sat, 6 Dec 2014 17:28:02 -0500
Subject: [PATCH 02/20] Friends Search bar goes off the bottom of the screen
 #1762

---
 data/gui/online/profile_friends.stkgui | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/gui/online/profile_friends.stkgui b/data/gui/online/profile_friends.stkgui
index 37a89864e..f5514dd00 100644
--- a/data/gui/online/profile_friends.stkgui
+++ b/data/gui/online/profile_friends.stkgui
@@ -22,9 +22,9 @@
         <div id="search_div" height="fit" width="100%" layout="vertical-row">
             <spacer width="10" height="10"/>
             <box height="fit" width="100%" layout="vertical-row">
-                <label height="fit" text_align="left" I18N="In the profile screen" text="Look for more friends:"/>
-                <spacer width="10" height="10"/>
-                <div height="fit" width="100%" layout="horizontal-row" align="center">
+                <label height="fit" text_align="left" I18N="In the profile screen" text="Look for more friends:" proportion = "1"/>
+                <spacer width="10" height="10" proportion = "1"/>
+                <div height="fit" width="100%" layout="horizontal-row" align="center" proportion = "3">
                     <textbox id="search_box" proportion="1" height="fit"/>
                     <spacer width="10" height="100%"/>
                     <button id="search_button" height="100%" width="fit" text="Search" />

From cb8017cae1717c95f29f0efa95ad82a716aab1f0 Mon Sep 17 00:00:00 2001
From: samuncle <samuncle06@gmail.com>
Date: Wed, 10 Dec 2014 03:02:36 +0100
Subject: [PATCH 03/20] clamping values to avoid pink specularity

---
 data/shaders/utils/SpecularIBL.frag | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/shaders/utils/SpecularIBL.frag b/data/shaders/utils/SpecularIBL.frag
index d8eec8fb9..053348a7f 100644
--- a/data/shaders/utils/SpecularIBL.frag
+++ b/data/shaders/utils/SpecularIBL.frag
@@ -7,5 +7,5 @@ vec3 SpecularIBL(vec3 normal, vec3 V, float roughness)
 
      // Assume 8 level of lod (ie 256x256 texture)
     float lodval = 8. * (1. - roughness);
-    return max(textureLod(probe, sampleDirection, lodval).rgb, vec3(0.));
-}
\ No newline at end of file
+    return clamp(  textureLod(probe, sampleDirection, lodval).rgb, 0., 1.);
+}

From adaeb37465be9bd38835217fae9c8ba334a7abcd Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 10 Dec 2014 14:11:15 +1100
Subject: [PATCH 04/20] Modified sources.cmake to trigger automatic run of
 cmake.

---
 sources.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources.cmake b/sources.cmake
index 0837c5629..8f7f40bbb 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,5 +1,5 @@
 # Modify this file to change the last-modified date when you add/remove a file. 
-# This will then trigger a new cmake run automatically.    
+# 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")
 file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")

From 3c6204732e56d7349f81976b64ba6b8c3bd95ce4 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 10 Dec 2014 17:02:39 +1100
Subject: [PATCH 05/20] Switch to fast music immediatley on lastp lap, and not
 only when 30 seconds are left.

---
 src/modes/linear_world.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/modes/linear_world.cpp b/src/modes/linear_world.cpp
index 03086a353..4d884189e 100644
--- a/src/modes/linear_world.cpp
+++ b/src/modes/linear_world.cpp
@@ -740,14 +740,11 @@ void LinearWorld::updateRacePosition()
 #endif
 
         // Switch on faster music if not already done so, if the
-        // first kart is doing its last lap, and if the estimated
-        // remaining time is less than 30 seconds.
+        // first kart is doing its last lap.
         if(!m_faster_music_active                                  &&
-           kart_info.m_race_lap == race_manager->getNumLaps()-1    &&
-           p==1                                                    &&
-           useFastMusicNearEnd()                                   &&
-           kart_info.m_estimated_finish > 0                        &&
-           kart_info.m_estimated_finish - getTime() < 30.0f              )
+            p == 1                                                 &&
+            kart_info.m_race_lap == race_manager->getNumLaps() - 1 &&
+            useFastMusicNearEnd()                                       )
         {
             music_manager->switchToFastMusic();
             m_faster_music_active=true;

From ed82106fe63498c01e279b4d8c034a9ba2848fa4 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Wed, 10 Dec 2014 17:35:09 +0100
Subject: [PATCH 06/20] Try to fix #1772

Avoid doing glViewport call in IBL.cpp since the result is not used
without dynamic light.
---
 src/graphics/IBL.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/graphics/IBL.cpp b/src/graphics/IBL.cpp
index 9f944a76d..86e057c68 100644
--- a/src/graphics/IBL.cpp
+++ b/src/graphics/IBL.cpp
@@ -260,6 +260,9 @@ GLuint generateSpecularCubemap(GLuint probe)
         glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, GL_RGBA16F, cubemap_size, cubemap_size, 0, GL_BGRA, GL_FLOAT, 0);
     glGenerateMipmap(GL_TEXTURE_CUBE_MAP);
 
+    if (!UserConfigParams::m_dynamic_lights)
+        return cubemap_texture;
+
     GLuint fbo;
     glGenFramebuffers(1, &fbo);
     glBindFramebuffer(GL_FRAMEBUFFER, fbo);

From c638be64128f157089105abaca124f2fbf69028b Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Wed, 10 Dec 2014 19:06:58 +0100
Subject: [PATCH 07/20] Do not use motion blur if no boost amount

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

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index fc1a23b7f..b44936b0a 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -867,7 +867,10 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
     {
         PROFILER_PUSH_CPU_MARKER("- Motion blur", 0xFF, 0x00, 0x00);
         ScopedGPUTimer Timer(irr_driver->getGPUTimer(Q_MOTIONBLUR));
-        if (isRace && UserConfigParams::m_motionblur && World::getWorld() != NULL) // motion blur
+        MotionBlurProvider * const cb = (MotionBlurProvider *)irr_driver->
+            getCallback(ES_MOTIONBLUR);
+
+        if (isRace && UserConfigParams::m_motionblur && World::getWorld() != NULL && cb->getBoostTime(0) > 0.) // motion blur
         {
             renderMotionBlur(0, *in_fbo, *out_fbo);
             std::swap(in_fbo, out_fbo);

From db6600a6876d34611b6e4a95dff5b1037b1b4f6c Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Thu, 11 Dec 2014 01:19:17 +0100
Subject: [PATCH 08/20] Frustrum shader is updated to new system

---
 data/shaders/frustrum.vert |  2 +-
 src/graphics/render.cpp    |  6 +++---
 src/graphics/shaders.cpp   | 23 ++++-------------------
 src/graphics/shaders.hpp   | 10 +++-------
 4 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/data/shaders/frustrum.vert b/data/shaders/frustrum.vert
index 1ef1ee264..4d46e3c7a 100644
--- a/data/shaders/frustrum.vert
+++ b/data/shaders/frustrum.vert
@@ -1,6 +1,6 @@
 uniform int idx;
 
-in vec3 Position;
+layout(location = 0) in vec3 Position;
 
 void main(void)
 {
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 4afb5e1b1..495c01711 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -964,12 +964,12 @@ void IrrDriver::computeCameraMatrix(scene::ICameraSceneNode * const camnode, siz
 
 static void renderWireFrameFrustrum(float *tmp, unsigned i)
 {
-    glUseProgram(MeshShader::ViewFrustrumShader::Program);
-    glBindVertexArray(MeshShader::ViewFrustrumShader::frustrumvao);
+    glUseProgram(MeshShader::ViewFrustrumShader::getInstance()->Program);
+    glBindVertexArray(MeshShader::ViewFrustrumShader::getInstance()->frustrumvao);
     glBindBuffer(GL_ARRAY_BUFFER, SharedObject::frustrumvbo);
 
     glBufferSubData(GL_ARRAY_BUFFER, 0, 8 * 3 * sizeof(float), (void *)tmp);
-    MeshShader::ViewFrustrumShader::setUniforms(video::SColor(255, 0, 255, 0), i);
+    MeshShader::ViewFrustrumShader::getInstance()->setUniforms(video::SColor(255, 0, 255, 0), i);
     glDrawElements(GL_LINES, 24, GL_UNSIGNED_INT, 0);
 }
 
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 6841f0daa..a5eeb3953 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -528,7 +528,6 @@ void Shaders::loadShaders()
     initFrustrumVBO();
     initShadowVPMUBO();
     initParticleQuadVBO();
-    MeshShader::ViewFrustrumShader::init();
     UtilShader::ColoredLine::init();
 }
 
@@ -1399,36 +1398,22 @@ namespace MeshShader
         AssignUniforms("color");
     }
 
-    GLuint ViewFrustrumShader::Program;
-    GLuint ViewFrustrumShader::attrib_position;
-    GLuint ViewFrustrumShader::uniform_color;
-    GLuint ViewFrustrumShader::uniform_idx;
-    GLuint ViewFrustrumShader::frustrumvao;
-
-    void ViewFrustrumShader::init()
+    ViewFrustrumShader::ViewFrustrumShader()
     {
         Program = LoadProgram(OBJECT,
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/frustrum.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/coloredquad.frag").c_str());
-        attrib_position = glGetAttribLocation(Program, "Position");
 
-        uniform_color = glGetUniformLocation(Program, "color");
-        uniform_idx = glGetUniformLocation(Program, "idx");
+        AssignUniforms("color", "idx");
 
         glGenVertexArrays(1, &frustrumvao);
         glBindVertexArray(frustrumvao);
         glBindBuffer(GL_ARRAY_BUFFER, SharedObject::frustrumvbo);
-        glEnableVertexAttribArray(attrib_position);
-        glVertexAttribPointer(attrib_position, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
+        glEnableVertexAttribArray(0);
+        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
         glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, SharedObject::frustrumindexes);
         glBindVertexArray(0);
     }
-
-    void ViewFrustrumShader::setUniforms(const video::SColor &color, unsigned idx)
-    {
-        glUniform4i(uniform_color, color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha());
-        glUniform1i(uniform_idx, idx);
-    }
 }
 
 namespace LightShader
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 367588845..f7aec3593 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -297,16 +297,12 @@ public:
     NormalVisualizer();
 };
 
-class ViewFrustrumShader
+class ViewFrustrumShader : public ShaderHelperSingleton<ViewFrustrumShader, video::SColor, int>
 {
 public:
-    static GLuint Program;
-    static GLuint attrib_position;
-    static GLuint uniform_color, uniform_idx;
-    static GLuint frustrumvao;
+    GLuint frustrumvao;
 
-    static void init();
-    static void setUniforms(const video::SColor &color, unsigned idx);
+    ViewFrustrumShader();
 };
 
 }

From 1c05d9ef68c4b853620f3c9e33bd93626b47b74a Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Thu, 11 Dec 2014 01:44:58 +0100
Subject: [PATCH 09/20] Port colored lines too

---
 data/shaders/object_pass.vert | 12 ++++++++++--
 src/graphics/glwrap.cpp       |  8 ++++----
 src/graphics/render.cpp       | 17 ++++++++---------
 src/graphics/shaders.cpp      | 27 ++++++++-------------------
 src/graphics/shaders.hpp      |  9 +++------
 5 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/data/shaders/object_pass.vert b/data/shaders/object_pass.vert
index d8996d06b..a9ea319fe 100644
--- a/data/shaders/object_pass.vert
+++ b/data/shaders/object_pass.vert
@@ -1,5 +1,13 @@
-uniform mat4 ModelMatrix;
-uniform mat4 InverseModelMatrix;
+uniform mat4 ModelMatrix =
+    mat4(1., 0., 0., 0.,
+         0., 1., 0., 0.,
+         0., 0., 1., 0.,
+         0., 0., 0., 1.);
+uniform mat4 InverseModelMatrix =
+    mat4(1., 0., 0., 0.,
+         0., 1., 0., 0.,
+         0., 0., 1., 0.,
+         0., 0., 0., 1.);
 
 uniform mat4 TextureMatrix =
     mat4(1., 0., 0., 0.,
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index ad55cf9df..8cac2f903 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -275,12 +275,12 @@ void draw3DLine(const core::vector3df& start,
         end.X, end.Y, end.Z
     };
 
-    glBindVertexArray(UtilShader::ColoredLine::vao);
-    glBindBuffer(GL_ARRAY_BUFFER, UtilShader::ColoredLine::vbo);
+    glBindVertexArray(UtilShader::ColoredLine::getInstance()->vao);
+    glBindBuffer(GL_ARRAY_BUFFER, UtilShader::ColoredLine::getInstance()->vbo);
     glBufferSubData(GL_ARRAY_BUFFER, 0, 6 * sizeof(float), vertex);
 
-    glUseProgram(UtilShader::ColoredLine::Program);
-    UtilShader::ColoredLine::setUniforms(color);
+    glUseProgram(UtilShader::ColoredLine::getInstance()->Program);
+    UtilShader::ColoredLine::getInstance()->setUniforms(color);
     glDrawArrays(GL_LINES, 0, 2);
 
     glGetError();
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 495c01711..b6c9bb995 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -191,10 +191,10 @@ void IrrDriver::renderGLSL(float dt)
         // Render bounding boxes
         if (irr_driver->getBoundingBoxesViz())
         {
-            glUseProgram(UtilShader::ColoredLine::Program);
-            glBindVertexArray(UtilShader::ColoredLine::vao);
-            glBindBuffer(GL_ARRAY_BUFFER, UtilShader::ColoredLine::vbo);
-            UtilShader::ColoredLine::setUniforms(SColor(255, 255, 0, 0));
+            glUseProgram(UtilShader::ColoredLine::getInstance()->Program);
+            glBindVertexArray(UtilShader::ColoredLine::getInstance()->vao);
+            glBindBuffer(GL_ARRAY_BUFFER, UtilShader::ColoredLine::getInstance()->vbo);
+            UtilShader::ColoredLine::getInstance()->setUniforms(SColor(255, 255, 0, 0));
             const float *tmp = BoundingBoxes.data();
             for (unsigned int i = 0; i < BoundingBoxes.size(); i += 1024 * 6)
             {
@@ -220,13 +220,12 @@ void IrrDriver::renderGLSL(float dt)
                 const std::map<video::SColor, std::vector<float> >& lines = debug_drawer->getLines();
                 std::map<video::SColor, std::vector<float> >::const_iterator it;
 
-
-                glUseProgram(UtilShader::ColoredLine::Program);
-                glBindVertexArray(UtilShader::ColoredLine::vao);
-                glBindBuffer(GL_ARRAY_BUFFER, UtilShader::ColoredLine::vbo);
+                glUseProgram(UtilShader::ColoredLine::getInstance()->Program);
+                glBindVertexArray(UtilShader::ColoredLine::getInstance()->vao);
+                glBindBuffer(GL_ARRAY_BUFFER, UtilShader::ColoredLine::getInstance()->vbo);
                 for (it = lines.begin(); it != lines.end(); it++)
                 {
-                    UtilShader::ColoredLine::setUniforms(it->first);
+                    UtilShader::ColoredLine::getInstance()->setUniforms(it->first);
                     const std::vector<float> &vertex = it->second;
                     const float *tmp = vertex.data();
                     for (unsigned int i = 0; i < vertex.size(); i += 1024 * 6)
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index a5eeb3953..e4a5ecad2 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -528,7 +528,6 @@ void Shaders::loadShaders()
     initFrustrumVBO();
     initShadowVPMUBO();
     initParticleQuadVBO();
-    UtilShader::ColoredLine::init();
 }
 
 void Shaders::killShaders()
@@ -579,33 +578,23 @@ void bypassUBO(GLuint Program)
 
 namespace UtilShader
 {
-    GLuint ColoredLine::Program;
-    GLuint ColoredLine::uniform_color;
-    GLuint ColoredLine::vao;
-    GLuint ColoredLine::vbo;
-
-    void ColoredLine::init()
+    ColoredLine::ColoredLine()
     {
         Program = LoadProgram(OBJECT,
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/coloredquad.frag").c_str());
+
+        AssignUniforms("color");
+
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
         glGenBuffers(1, &vbo);
         glBindBuffer(GL_ARRAY_BUFFER, vbo);
         glBufferData(GL_ARRAY_BUFFER, 6 * 1024 * sizeof(float), 0, GL_DYNAMIC_DRAW);
-        GLuint attrib_position = glGetAttribLocation(Program, "Position");
-        glEnableVertexAttribArray(attrib_position);
-        glVertexAttribPointer(attrib_position, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
-        uniform_color = glGetUniformLocation(Program, "color");
-    }
-
-    void ColoredLine::setUniforms(const irr::video::SColor &col)
-    {
-        if (irr_driver->needUBOWorkaround())
-            bypassUBO(Program);
-        glUniform4i(uniform_color, col.getRed(), col.getGreen(), col.getBlue(), col.getAlpha());
-        glUniformMatrix4fv(glGetUniformLocation(Program, "ModelMatrix"), 1, GL_FALSE, core::IdentityMatrix.pointer());
+        glEnableVertexAttribArray(0);
+        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
+        glBindVertexArray(0);
+        glBindBuffer(GL_ARRAY_BUFFER, 0);
     }
 
     struct TexUnit
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index f7aec3593..59bb82074 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -38,15 +38,12 @@ public:
 
 namespace UtilShader
 {
-class ColoredLine
+class ColoredLine : public ShaderHelperSingleton<ColoredLine, video::SColor>
 {
 public:
-    static GLuint Program;
-    static GLuint uniform_color;
-    static GLuint vao, vbo;
+    GLuint vao, vbo;
 
-    static void init();
-    static void setUniforms(const irr::video::SColor &);
+    ColoredLine();
 };
 
 class SpecularIBLGenerator : public ShaderHelperSingleton<SpecularIBLGenerator, core::matrix4, float >, public TextureRead<Trilinear_cubemap>

From 7cc28a975531c8dd5b2a7f6dde9174d8c51e1106 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Wed, 10 Dec 2014 21:04:57 -0500
Subject: [PATCH 10/20] Revert "Friends Search bar goes off the bottom of the
 screen #1762"

This reverts commit f98a169e9c7473b56fcacdf6abcfbce95528e05d.
---
 data/gui/online/profile_friends.stkgui | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/gui/online/profile_friends.stkgui b/data/gui/online/profile_friends.stkgui
index f5514dd00..37a89864e 100644
--- a/data/gui/online/profile_friends.stkgui
+++ b/data/gui/online/profile_friends.stkgui
@@ -22,9 +22,9 @@
         <div id="search_div" height="fit" width="100%" layout="vertical-row">
             <spacer width="10" height="10"/>
             <box height="fit" width="100%" layout="vertical-row">
-                <label height="fit" text_align="left" I18N="In the profile screen" text="Look for more friends:" proportion = "1"/>
-                <spacer width="10" height="10" proportion = "1"/>
-                <div height="fit" width="100%" layout="horizontal-row" align="center" proportion = "3">
+                <label height="fit" text_align="left" I18N="In the profile screen" text="Look for more friends:"/>
+                <spacer width="10" height="10"/>
+                <div height="fit" width="100%" layout="horizontal-row" align="center">
                     <textbox id="search_box" proportion="1" height="fit"/>
                     <spacer width="10" height="100%"/>
                     <button id="search_button" height="100%" width="fit" text="Search" />

From 5f47fee897dcaea3e27e7a068742f0149cd9b60a Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Thu, 11 Dec 2014 20:42:18 +0100
Subject: [PATCH 11/20] Cleanup skybox preparation code

---
 src/graphics/irr_driver.cpp    |  6 +++---
 src/graphics/irr_driver.hpp    |  4 ++--
 src/graphics/render.cpp        |  6 +++++-
 src/graphics/render_skybox.cpp | 16 +++++++---------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 202ff660e..613589200 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -1392,7 +1392,7 @@ scene::ISceneNode *IrrDriver::addSkyBox(const std::vector<video::ITexture*> &tex
     SphericalHarmonicsTextures = sphericalHarmonics;
     SkyboxCubeMap = 0;
     SkyboxSpecularProbe = 0;
-    m_SH_dirty = true;
+    m_skybox_ready = false;
     return m_scene_manager->addSkyBoxSceneNode(texture[0], texture[1],
                                                texture[2], texture[3],
                                                texture[4], texture[5]);
@@ -1402,7 +1402,7 @@ void IrrDriver::suppressSkyBox()
 {
     SkyboxTextures.clear();
     SphericalHarmonicsTextures.clear();
-    m_SH_dirty = true;
+    m_skybox_ready = false;
     if ((SkyboxCubeMap) && (!ProfileWorld::isNoGraphics()))
     {
         glDeleteTextures(1, &SkyboxCubeMap);
@@ -1788,7 +1788,7 @@ void IrrDriver::onUnloadWorld()
 void IrrDriver::setAmbientLight(const video::SColorf &light)
 {
     m_scene_manager->setAmbientLight(light);
-    m_SH_dirty = true;
+    m_skybox_ready = false;
 }   // setAmbientLight
 
 video::SColorf IrrDriver::getAmbientLight() const
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 04c5bd8a5..35edd1d83 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -236,7 +236,7 @@ private:
 
     std::vector<video::ITexture *> SkyboxTextures;
     std::vector<video::ITexture *> SphericalHarmonicsTextures;
-    bool m_SH_dirty;
+    bool m_skybox_ready;
 
     float blueSHCoeff[9];
     float greenSHCoeff[9];
@@ -455,7 +455,7 @@ public:
     void getOpenGLData(std::string *vendor, std::string *renderer,
                        std::string *version);
 
-    void generateSkyboxCubemap();
+    void prepareSkybox();
     void generateDiffuseCoefficients();
     void renderSkybox(const scene::ICameraSceneNode *camera);
     void setPhase(STKRenderingPass);
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index b6c9bb995..41a5a6825 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -176,7 +176,11 @@ void IrrDriver::renderGLSL(float dt)
             irr_driver->getSceneManager()->setAmbientLight(SColor(0, 0, 0, 0));
 
         // TODO: put this outside of the rendering loop
-        generateDiffuseCoefficients();
+        if (!m_skybox_ready)
+        {
+            prepareSkybox();
+            m_skybox_ready = true;
+        }
         if (!UserConfigParams::m_dynamic_lights)
             glEnable(GL_FRAMEBUFFER_SRGB);
 
diff --git a/src/graphics/render_skybox.cpp b/src/graphics/render_skybox.cpp
index ef7ca122f..a83c09182 100644
--- a/src/graphics/render_skybox.cpp
+++ b/src/graphics/render_skybox.cpp
@@ -274,20 +274,20 @@ GLuint generateCubeMapFromTextures(const std::vector<video::ITexture *> &texture
     return result;
 }
 
-void IrrDriver::generateSkyboxCubemap()
+void IrrDriver::prepareSkybox()
 {
     glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
 
-    assert(SkyboxTextures.size() == 6);
-    SkyboxCubeMap = generateCubeMapFromTextures(SkyboxTextures);
-    SkyboxSpecularProbe = generateSpecularCubemap(SkyboxCubeMap);
+    generateDiffuseCoefficients();
+    if (!SkyboxTextures.empty())
+    {
+        SkyboxCubeMap = generateCubeMapFromTextures(SkyboxTextures);
+        SkyboxSpecularProbe = generateSpecularCubemap(SkyboxCubeMap);
+    }
 }
 
 void IrrDriver::generateDiffuseCoefficients()
 {
-    if (!m_SH_dirty)
-        return;
-    m_SH_dirty = false;
     const unsigned texture_permutation[] = { 2, 3, 0, 1, 5, 4 };
 
     unsigned sh_w = 0, sh_h = 0;
@@ -379,8 +379,6 @@ void IrrDriver::renderSkybox(const scene::ICameraSceneNode *camera)
 {
     if (SkyboxTextures.empty())
         return;
-    if (!SkyboxCubeMap)
-        generateSkyboxCubemap();
     glBindVertexArray(MeshShader::SkyboxShader::getInstance()->cubevao);
     glDisable(GL_CULL_FACE);
     assert(SkyboxTextures.size() == 6);

From 0aacea1c0b7d38a93d894be9452446fec301a2e8 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 11 Dec 2014 19:33:44 -0500
Subject: [PATCH 12/20] Apply math07's patch for taking padding into account in
 height="fit", fixes #1762

---
 src/guiengine/layout_manager.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/guiengine/layout_manager.cpp b/src/guiengine/layout_manager.cpp
index 887108c13..eff48b420 100644
--- a/src/guiengine/layout_manager.cpp
+++ b/src/guiengine/layout_manager.cpp
@@ -239,6 +239,18 @@ void LayoutManager::readCoords(Widget* self)
             }
         }
 
+        //Add padding to <box> elements
+        if (self->getType() == WTYPE_DIV && self->m_show_bounding_box)
+        {
+            int padding = 15;
+            if (self->m_properties[PROP_DIV_PADDING].length() > 0)
+                padding = atoi(self->m_properties[PROP_DIV_PADDING].c_str());
+            child_max_height += padding * 2;
+            total_height += padding * 2;
+            total_width += padding * 2;
+            child_max_width = padding * 2;
+        }
+
         if (self->m_properties[PROP_WIDTH] == "fit")
         {
             self->m_absolute_w = (is_horizontal_row ? total_width : child_max_width);

From 9b3b99610a99f9db27a4f6dc3006c194019aee20 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 11 Dec 2014 19:39:30 -0500
Subject: [PATCH 13/20] MInor GUI XML cleanup

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

diff --git a/data/gui/online/profile_friends.stkgui b/data/gui/online/profile_friends.stkgui
index 37a89864e..50e933392 100644
--- a/data/gui/online/profile_friends.stkgui
+++ b/data/gui/online/profile_friends.stkgui
@@ -22,10 +22,10 @@
         <div id="search_div" height="fit" width="100%" layout="vertical-row">
             <spacer width="10" height="10"/>
             <box height="fit" width="100%" layout="vertical-row">
-                <label height="fit" text_align="left" I18N="In the profile screen" text="Look for more friends:"/>
+                <label text_align="left" I18N="In the profile screen" text="Look for more friends:"/>
                 <spacer width="10" height="10"/>
                 <div height="fit" width="100%" layout="horizontal-row" align="center">
-                    <textbox id="search_box" proportion="1" height="fit"/>
+                    <textbox id="search_box" proportion="1"/>
                     <spacer width="10" height="100%"/>
                     <button id="search_button" height="100%" width="fit" text="Search" />
                 </div>

From 13360de3455c3b9bec504c6821b9670ecfb5e9b5 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 12 Dec 2014 02:04:33 +0100
Subject: [PATCH 14/20] Add a check for GS support

---
 src/graphics/irr_driver.hpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 35edd1d83..8134089e8 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -293,6 +293,11 @@ public:
         return m_support_texture_compression;
     }
 
+    bool supportGeometryShader() const
+    {
+        return getGLSLVersion() >= 330;
+    }
+
     bool usesTextureCompression() const
     {
         return UserConfigParams::m_texture_compression && m_support_texture_compression;

From 834683f414edfb3aadf8dccdd20e77aafd4d4c64 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 12 Dec 2014 02:12:14 +0100
Subject: [PATCH 15/20] Add codecheck before rendering GI/Shadow

---
 src/graphics/irr_driver.hpp      | 10 ++++++++++
 src/graphics/render.cpp          |  4 ++--
 src/graphics/render_lighting.cpp |  4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 8134089e8..767cc9b13 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -298,6 +298,16 @@ public:
         return getGLSLVersion() >= 330;
     }
 
+    bool usesShadows() const
+    {
+        return supportGeometryShader() && UserConfigParams::m_shadows;
+    }
+
+    bool usesGI() const
+    {
+        return supportGeometryShader() && UserConfigParams::m_gi && !needUBOWorkaround();
+    }
+
     bool usesTextureCompression() const
     {
         return UserConfigParams::m_texture_compression && m_support_texture_compression;
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 41a5a6825..1c7e8b13f 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -352,12 +352,12 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
         // To avoid wrong culling, use the largest view possible
         m_scene_manager->setActiveCamera(m_suncam);
         if (UserConfigParams::m_dynamic_lights &&
-            UserConfigParams::m_shadows && !irr_driver->needUBOWorkaround() && hasShadow)
+            UserConfigParams::m_shadows && irr_driver->usesShadows() && hasShadow)
         {
             PROFILER_PUSH_CPU_MARKER("- Shadow", 0x30, 0x6F, 0x90);
             renderShadows();
             PROFILER_POP_CPU_MARKER();
-            if (UserConfigParams::m_gi)
+            if (irr_driver->usesGI())
             {
                 PROFILER_PUSH_CPU_MARKER("- RSM", 0xFF, 0x0, 0xFF);
                 renderRSM();
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index ca5e45061..0aafd69ad 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -145,7 +145,7 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
     glClear(GL_COLOR_BUFFER_BIT);
 
     m_rtts->getFBO(FBO_DIFFUSE).Bind();
-    if (UserConfigParams::m_gi && UserConfigParams::m_shadows && hasShadow)
+    if (irr_driver->usesGI() && hasShadow)
     {
         ScopedGPUTimer timer(irr_driver->getGPUTimer(Q_GI));
         m_post_processing->renderGI(rh_matrix, rh_extend, m_rtts->getRH().getRTT()[0], m_rtts->getRH().getRTT()[1], m_rtts->getRH().getRTT()[2]);
@@ -162,7 +162,7 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
     if (!World::getWorld() || World::getWorld()->getTrack()->hasShadows())
     {
         ScopedGPUTimer timer(irr_driver->getGPUTimer(Q_SUN));
-        if (World::getWorld() && UserConfigParams::m_shadows && !irr_driver->needUBOWorkaround() && hasShadow)
+        if (World::getWorld() && irr_driver->usesShadows() && hasShadow)
             m_post_processing->renderShadowedSunlight(irr_driver->getSunDirection(), irr_driver->getSunColor(), sun_ortho_matrix, m_rtts->getShadowFBO().getRTT()[0]);
         else
             m_post_processing->renderSunlight(irr_driver->getSunDirection(), irr_driver->getSunColor());

From 2cf2630362b3292718271031d1867562152d7abe Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Fri, 12 Dec 2014 02:13:33 +0100
Subject: [PATCH 16/20] Forgot UBO support check in shadow

---
 src/graphics/irr_driver.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 767cc9b13..b5732f2f3 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -300,7 +300,7 @@ public:
 
     bool usesShadows() const
     {
-        return supportGeometryShader() && UserConfigParams::m_shadows;
+        return supportGeometryShader() && UserConfigParams::m_shadows && !needUBOWorkaround();
     }
 
     bool usesGI() const

From 3226189d8226db7ace1d6af07106a59ee47cdc96 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 11 Dec 2014 20:18:00 -0500
Subject: [PATCH 17/20] Force disable shadows and GI when OpenGL is not recent
 enough. Fixes #1722

---
 src/graphics/irr_driver.cpp                     |  8 ++++++++
 .../dialogs/custom_video_settings.cpp           | 17 +++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 613589200..6beb981cd 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -607,6 +607,14 @@ void IrrDriver::initDevice()
     {
         Log::info("irr_driver", "GLSL supported.");
     }
+
+    if (!supportGeometryShader())
+    {
+        // these options require geometry shaders
+        UserConfigParams::m_shadows = 0;
+        UserConfigParams::m_gi = false;
+    }
+
     // m_glsl might be reset in rtt if an error occurs.
     if(m_glsl)
     {
diff --git a/src/states_screens/dialogs/custom_video_settings.cpp b/src/states_screens/dialogs/custom_video_settings.cpp
index 3dbe33623..05c5c277e 100644
--- a/src/states_screens/dialogs/custom_video_settings.cpp
+++ b/src/states_screens/dialogs/custom_video_settings.cpp
@@ -106,6 +106,12 @@ void CustomVideoSettingsDialog::beforeAddingWidgets()
         cb_tex_cmp->setState(false);
         cb_tex_cmp->setDeactivated();
     }
+
+    if (!irr_driver->supportGeometryShader())
+    {
+        shadows->setDeactivated();
+        getWidget<CheckBoxWidget>("global_illumination")->setDeactivated();
+    }
 }
 
 // -----------------------------------------------------------------------------
@@ -123,7 +129,7 @@ GUIEngine::EventPropagation CustomVideoSettingsDialog::processEvent(const std::s
         UserConfigParams::m_motionblur      =
             advanced_pipeline && getWidget<CheckBoxWidget>("motionblur")->getState();
 
-        if (advanced_pipeline)
+        if (advanced_pipeline && irr_driver->supportGeometryShader())
         {
             UserConfigParams::m_shadows =
                 getWidget<SpinnerWidget>("shadows")->getValue();
@@ -143,7 +149,8 @@ GUIEngine::EventPropagation CustomVideoSettingsDialog::processEvent(const std::s
             advanced_pipeline && getWidget<CheckBoxWidget>("lightshaft")->getState();
 
         UserConfigParams::m_gi =
-            advanced_pipeline && getWidget<CheckBoxWidget>("global_illumination")->getState();
+            advanced_pipeline && irr_driver->supportGeometryShader() &&
+            getWidget<CheckBoxWidget>("global_illumination")->getState();
 
         UserConfigParams::m_glow =
             advanced_pipeline && getWidget<CheckBoxWidget>("glow")->getState();
@@ -236,5 +243,11 @@ void CustomVideoSettingsDialog::updateActivation()
         getWidget<CheckBoxWidget>("glow")->setDeactivated();
         getWidget<CheckBoxWidget>("bloom")->setDeactivated();
     }
+
+    if (!irr_driver->supportGeometryShader())
+    {
+        getWidget<SpinnerWidget>("shadows")->setDeactivated();
+        getWidget<CheckBoxWidget>("global_illumination")->setDeactivated();
+    }
 }   // updateActivation
 

From 72a02128de386f6208efd3985940e15b7762c9ce Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 11 Dec 2014 20:20:42 -0500
Subject: [PATCH 18/20] Fix gand prix

---
 data/grandprix/2_offthebeatentrack.grandprix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/grandprix/2_offthebeatentrack.grandprix b/data/grandprix/2_offthebeatentrack.grandprix
index 672fcf950..abb51915f 100644
--- a/data/grandprix/2_offthebeatentrack.grandprix
+++ b/data/grandprix/2_offthebeatentrack.grandprix
@@ -1,7 +1,7 @@
 
 <supertuxkart_grand_prix name="Off the beaten track">
 
-    <track id="jungle"       laps="3" reverse="false" />
+    <track id="30_chocolate" laps="3" reverse="false" />
     <track id="snowmountain" laps="3" reverse="false" />
     <track id="hacienda"     laps="3" reverse="false" />
     <track id="zengarden"    laps="4" reverse="false" />

From dff1a330ea12c8490f5666ba94bd88cf3f2147b6 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Fri, 12 Dec 2014 19:35:45 +0100
Subject: [PATCH 19/20] Fixed crash in kart selection screen

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

diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp
index fe49213aa..1c8ff4b6c 100644
--- a/src/states_screens/kart_selection.cpp
+++ b/src/states_screens/kart_selection.cpp
@@ -722,7 +722,8 @@ void KartSelectionScreen::playerConfirm(const int player_id)
         UserConfigParams::m_default_kart = selection;
     }
 
-    if (m_kart_widgets[player_id].getKartInternalName().size() == 0)
+    if (m_kart_widgets[player_id].getKartInternalName().size() == 0 ||
+        m_kart_widgets[player_id].getKartInternalName() == RibbonWidget::NO_ITEM_ID)
     {
         SFXManager::get()->quickSound( "anvil" );
         return;

From 42d2591bf8c3b26629e8ad26a3a5d23e2c748586 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Fri, 12 Dec 2014 19:54:30 +0100
Subject: [PATCH 20/20] Use default track if remembered track doesn't exist.

It avoids issues in #1776 and probably other problems with addons tracks.
---
 src/main.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index cf543c72f..624c4edb1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1112,8 +1112,11 @@ void initRest()
     race_manager->setMinorMode (RaceManager::MINOR_MODE_NORMAL_RACE);
     race_manager->setDifficulty(
                  (RaceManager::Difficulty)(int)UserConfigParams::m_difficulty);
-    if(track_manager->getTrack(UserConfigParams::m_last_track))
-        race_manager->setTrack(UserConfigParams::m_last_track);
+
+    if (!track_manager->getTrack(UserConfigParams::m_last_track))
+        UserConfigParams::m_last_track.revertToDefaults();
+        
+    race_manager->setTrack(UserConfigParams::m_last_track);
 
 }   // initRest