From 875d5d8ef91260998c68c6fa3751ac2292754b7d Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 20 Feb 2017 21:19:00 +0100
Subject: [PATCH 01/11] Some tweaks to the arrows size in dynamic ribbon
 widget.

- arrow size now depends on screen size, so that it's now easier to click it on high resolutions
- it's additionally scaled on Android for easier usage
---
 src/guiengine/widgets/dynamic_ribbon_widget.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/guiengine/widgets/dynamic_ribbon_widget.cpp b/src/guiengine/widgets/dynamic_ribbon_widget.cpp
index 548a1ab14..ae7cec447 100644
--- a/src/guiengine/widgets/dynamic_ribbon_widget.cpp
+++ b/src/guiengine/widgets/dynamic_ribbon_widget.cpp
@@ -17,6 +17,7 @@
 
 #include "font/font_manager.hpp"
 #include "font/regular_face.hpp"
+#include "graphics/irr_driver.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/widgets/dynamic_ribbon_widget.hpp"
@@ -146,8 +147,14 @@ void DynamicRibbonWidget::add()
     m_right_widget = new IconButtonWidget(IconButtonWidget::SCALE_MODE_KEEP_TEXTURE_ASPECT_RATIO, false);
 
     const int average_y = m_y + (m_h - m_label_height)/2;
-    m_arrows_w = 40;
-    const int button_h = 50;
+
+    unsigned int screen_height = irr_driver->getActualScreenSize().Height;
+    m_arrows_w = (int)(screen_height / 15);
+    m_arrows_w = std::max(m_arrows_w, 40);
+#ifdef ANDROID
+    m_arrows_w *= 1.5f;
+#endif
+    const int button_h = m_arrows_w;
 
     // right arrow
     rect<s32> right_arrow_location = rect<s32>(m_x + m_w - m_arrows_w,

From ef2cba0f8552916d39ce80387d3f9cd6402a3292 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 20 Feb 2017 21:21:37 +0100
Subject: [PATCH 02/11] Display multitouch settings properly on low resolutions

---
 data/gui/multitouch_settings.stkgui | 131 ++++++++++++++--------------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/data/gui/multitouch_settings.stkgui b/data/gui/multitouch_settings.stkgui
index 1cf3857bf..4ea7bd71d 100644
--- a/data/gui/multitouch_settings.stkgui
+++ b/data/gui/multitouch_settings.stkgui
@@ -4,76 +4,75 @@
         <header id="title" width="100%" height="fit" text_align="center" word_wrap="true" text="Touch Device Settings" />
 
         <spacer height="35" width="10" />
-	
-	<label width="100%" I18N="In the multitouch settings screen" text="General"/>
 
-	<div width="75%" height="fit" layout="horizontal-row" >
-	    <label proportion="1" height="100%" text_align="right" I18N="In the multitouch settings screen" text="Device enabled"/>
-	    <div proportion="1" height="fit" layout="horizontal-row" >
-		<spacer width="40" height="100%" />
+        <label width="100%" I18N="In the multitouch settings screen" text="General"/>
+
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Device enabled"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
                 <checkbox id="buttons_enabled"/>
-	    </div>
-	</div>
+            </div>
+        </div>
 
-	<div width="75%" height="fit" layout="horizontal-row" >
-	    <label proportion="1" height="100%" text_align="right" I18N="In the multitouch settings screen" text="Buttons scale"/>
-	    <div proportion="1" height="fit" layout="horizontal-row" >
-		<spacer width="40" height="100%" />
-		<gauge id="scale" proportion="1" min_value="50" max_value="150"/>
-	    </div>
-	</div>
-	
-	<label width="100%" I18N="In the multitouch settings screen" text="Accelerometer"/>
-    
-	<div width="75%" height="fit" layout="horizontal-row" >
-	    <label proportion="1" height="100%" text_align="right" I18N="In the multitouch settings screen" text="Disabled"/>
-	    <div proportion="1" height="fit" layout="horizontal-row" >
-		<spacer width="40" height="100%" />
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Buttons scale"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <gauge id="scale" proportion="1" min_value="50" max_value="150"/>
+            </div>
+        </div>
+
+        <label width="100%" I18N="In the multitouch settings screen" text="Accelerometer"/>
+
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Disabled"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
                 <checkbox id="accelerometer_disabled"/>
-	    </div>
-	</div>
-	
-	<div width="75%" height="fit" layout="horizontal-row" >
-	    <label proportion="1" height="100%" text_align="right" I18N="In the multitouch settings screen" text="Phone"/>
-	    <div proportion="1" height="fit" layout="horizontal-row" >
-		<spacer width="40" height="100%" />
-                <checkbox id="accelerometer_phone"/>
-	    </div>
-	</div>
-	
-	<div width="75%" height="fit" layout="horizontal-row" >
-	    <label proportion="1" height="100%" text_align="right" I18N="In the multitouch settings screen" text="Tablet"/>
-	    <div proportion="1" height="fit" layout="horizontal-row" >
-		<spacer width="40" height="100%" />
-                <checkbox id="accelerometer_tablet"/>
-	    </div>
-	</div>
-	
-	<label width="100%" I18N="In the multitouch settings screen" text="Advanced"/>
-	
-	<div width="75%" height="fit" layout="horizontal-row" >
-	    <label proportion="1" height="100%" text_align="right" I18N="In the multitouch settings screen" text="Deadzone center"/>
-	    <div proportion="1" height="fit" layout="horizontal-row" >
-		<spacer width="40" height="100%" />
-		<gauge id="deadzone_center" proportion="1" min_value="0" max_value="50"/>
-	    </div>
-	</div>
-    
-	<div width="75%" height="fit" layout="horizontal-row" >
-	    <label proportion="1" height="100%" text_align="right" I18N="In the multitouch settings screen" text="Deadzone edge"/>
-	    <div proportion="1" height="fit" layout="horizontal-row" >
-		<spacer width="40" height="100%" />
-		<gauge id="deadzone_edge" proportion="1" min_value="0" max_value="50"/>
-	    </div>
-	</div>
-    
-	<spacer height="35" width="10"/>
+            </div>
+        </div>
 
-	<div width="fit" height="fit" layout="horizontal-row" align="center">
-	    <button id="restore" text="Restore defaults"/>
-	    <spacer width="40" height="100%" />
-	    <button id="close" text="Apply"/>
-	</div>
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Phone"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <checkbox id="accelerometer_phone"/>
+            </div>
+        </div>
+
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Tablet"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <checkbox id="accelerometer_tablet"/>
+            </div>
+        </div>
+
+        <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"/>
+            <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"/>
+            </div>
+        </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"/>
+            <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"/>
+            </div>
+        </div>
+
+        <spacer height="35" width="10"/>
+
+        <div width="fit" height="fit" layout="horizontal-row" align="center" proportion="1">
+            <button id="restore" text="Restore defaults"/>
+            <spacer width="40" height="10" />
+            <button id="close" text="Apply"/>
+        </div>
     </div>
-    
 </stkgui>

From 668e10d8ca5baadb0e7c652e67f7ee2b0b6b48a6 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 20 Feb 2017 21:52:47 +0100
Subject: [PATCH 03/11] Don't use srgb format in gles

---
 src/graphics/rtts.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/graphics/rtts.cpp b/src/graphics/rtts.cpp
index f247379b2..76cfc85e4 100644
--- a/src/graphics/rtts.cpp
+++ b/src/graphics/rtts.cpp
@@ -88,6 +88,7 @@ RTT::RTT(size_t width, size_t height)
     GLint rgb_format = GL_BGR;
     GLint diffuse_specular_internal_format = GL_R11F_G11F_B10F;
     GLint type = GL_FLOAT;
+    GLint srgb_internal_format = GL_SRGB8_ALPHA8;
     
 #if defined(USE_GLES2)
     if (!CVS->isEXTColorBufferFloatUsable())
@@ -101,6 +102,8 @@ RTT::RTT(size_t width, size_t height)
         diffuse_specular_internal_format = GL_RGBA8;
         type = GL_UNSIGNED_BYTE;
     }
+    
+    srgb_internal_format = GL_RGBA8;
 #endif
 
     RenderTargetTextures[RTT_TMP1] = generateRTT(res, rgba_internal_format, rgba_format, type);
@@ -110,9 +113,9 @@ RTT::RTT(size_t width, size_t height)
     RenderTargetTextures[RTT_LINEAR_DEPTH] = generateRTT(res, red32_internal_format, red_format, type, linear_depth_mip_levels);
     RenderTargetTextures[RTT_NORMAL_AND_DEPTH] = generateRTT(res, rgba_internal_format, GL_RGBA, type);
     RenderTargetTextures[RTT_COLOR] = generateRTT(res, rgba_internal_format, rgba_format, type);
-    RenderTargetTextures[RTT_MLAA_COLORS] = generateRTT(res, GL_SRGB8_ALPHA8, rgb_format, GL_UNSIGNED_BYTE);
-    RenderTargetTextures[RTT_MLAA_TMP] = generateRTT(res, GL_SRGB8_ALPHA8, rgb_format, GL_UNSIGNED_BYTE);
-    RenderTargetTextures[RTT_MLAA_BLEND] = generateRTT(res, GL_SRGB8_ALPHA8, rgb_format, GL_UNSIGNED_BYTE);
+    RenderTargetTextures[RTT_MLAA_COLORS] = generateRTT(res, srgb_internal_format, rgb_format, GL_UNSIGNED_BYTE);
+    RenderTargetTextures[RTT_MLAA_TMP] = generateRTT(res, srgb_internal_format, rgb_format, GL_UNSIGNED_BYTE);
+    RenderTargetTextures[RTT_MLAA_BLEND] = generateRTT(res, srgb_internal_format, rgb_format, GL_UNSIGNED_BYTE);
     RenderTargetTextures[RTT_SSAO] = generateRTT(res, red_internal_format, red_format, type);
     RenderTargetTextures[RTT_DISPLACE] = generateRTT(res, rgba_internal_format, rgba_format, type);
     RenderTargetTextures[RTT_DIFFUSE] = generateRTT(res, diffuse_specular_internal_format, rgb_format, type);

From eb9f656b449bf563baaea547c265aa9cde1069c5 Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Mon, 20 Feb 2017 19:14:33 -0500
Subject: [PATCH 04/11] Add config flag to persist GUI visibility state at
 samuncle's request

---
 src/config/user_config.hpp                | 4 ++++
 src/states_screens/race_gui.cpp           | 3 +++
 src/states_screens/race_gui_overworld.cpp | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index d91ca73f6..6bdfa1ae8 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -926,6 +926,10 @@ namespace UserConfigParams
             PARAM_DEFAULT( BoolUserConfigParam(false, "artist_debug_mode",
                                "Whether to enable track debugging features") );
 
+    PARAM_PREFIX BoolUserConfigParam        m_hide_gui
+        PARAM_DEFAULT(BoolUserConfigParam(false, "debug_hide_gui",
+            "Whether to hide the GUI (artist debug mode)"));
+
     PARAM_PREFIX BoolUserConfigParam        m_everything_unlocked
             PARAM_DEFAULT( BoolUserConfigParam(false, "everything_unlocked",
                                "Enable all karts and tracks") );
diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp
index 0fb540275..7ee8e0715 100644
--- a/src/states_screens/race_gui.cpp
+++ b/src/states_screens/race_gui.cpp
@@ -65,6 +65,9 @@ RaceGUI::RaceGUI()
 {
     m_enabled = true;
     
+    if (UserConfigParams::m_artist_debug_mode && UserConfigParams::m_hide_gui)
+        m_enabled = false;
+
     // Determine maximum length of the rank/lap text, in order to
     // align those texts properly on the right side of the viewport.
     gui::ScalableFont* font = GUIEngine::getHighresDigitFont();
diff --git a/src/states_screens/race_gui_overworld.cpp b/src/states_screens/race_gui_overworld.cpp
index d809806c3..f8cbaba05 100644
--- a/src/states_screens/race_gui_overworld.cpp
+++ b/src/states_screens/race_gui_overworld.cpp
@@ -73,6 +73,10 @@ const int COMPLETED_HARD = 4;
 RaceGUIOverworld::RaceGUIOverworld()
 {
     m_enabled = true;
+
+    if (UserConfigParams::m_artist_debug_mode && UserConfigParams::m_hide_gui)
+        m_enabled = false;
+
     m_is_first_render_call = true;
     m_close_to_a_challenge = false;
     m_current_challenge = NULL;

From 0cf0002c08859618817e4c92b294dc26627b7fc6 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Tue, 21 Feb 2017 12:09:22 +0800
Subject: [PATCH 05/11] Header clean up

---
 src/items/item.hpp                   | 2 +-
 src/karts/controller/skidding_ai.hpp | 2 ++
 src/karts/controller/test_ai.hpp     | 2 ++
 src/tracks/arena_node.hpp            | 1 +
 src/tracks/drive_node.cpp            | 1 -
 src/tracks/drive_node_3d.hpp         | 2 ++
 src/utils/vec3.hpp                   | 7 +------
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/items/item.hpp b/src/items/item.hpp
index 60f66f823..19152bee9 100644
--- a/src/items/item.hpp
+++ b/src/items/item.hpp
@@ -30,7 +30,7 @@
 #include "utils/no_copy.hpp"
 #include "utils/vec3.hpp"
 
-#include <line2d.h>
+#include <line3d.h>
 
 class AbstractKart;
 class Item;
diff --git a/src/karts/controller/skidding_ai.hpp b/src/karts/controller/skidding_ai.hpp
index 68c0bc050..1eff42935 100644
--- a/src/karts/controller/skidding_ai.hpp
+++ b/src/karts/controller/skidding_ai.hpp
@@ -48,6 +48,8 @@
 #include "tracks/drive_node.hpp"
 #include "utils/random_generator.hpp"
 
+#include <line3d.h>
+
 class LinearWorld;
 class DriveGraph;
 class ShowCurve;
diff --git a/src/karts/controller/test_ai.hpp b/src/karts/controller/test_ai.hpp
index 97f6d90da..61d10d14e 100644
--- a/src/karts/controller/test_ai.hpp
+++ b/src/karts/controller/test_ai.hpp
@@ -49,6 +49,8 @@
 #include "tracks/drive_node.hpp"
 #include "utils/random_generator.hpp"
 
+#include <line3d.h>
+
 #ifdef AI_DEBUG
   class ShowCurve;
 
diff --git a/src/tracks/arena_node.hpp b/src/tracks/arena_node.hpp
index c62d55520..0d696eeca 100644
--- a/src/tracks/arena_node.hpp
+++ b/src/tracks/arena_node.hpp
@@ -22,6 +22,7 @@
 #include "tracks/quad.hpp"
 #include "utils/cpp2011.hpp"
 
+#include <line3d.h>
 #include <vector>
 
 /**
diff --git a/src/tracks/drive_node.cpp b/src/tracks/drive_node.cpp
index 57d7749cf..a3b6b624a 100644
--- a/src/tracks/drive_node.cpp
+++ b/src/tracks/drive_node.cpp
@@ -20,7 +20,6 @@
 
 #include "io/file_manager.hpp"
 #include "io/xml_node.hpp"
-#include "matrix4.h"
 #include "tracks/drive_graph.hpp"
 #include "utils/log.hpp"
 
diff --git a/src/tracks/drive_node_3d.hpp b/src/tracks/drive_node_3d.hpp
index 162498a10..07f77947f 100644
--- a/src/tracks/drive_node_3d.hpp
+++ b/src/tracks/drive_node_3d.hpp
@@ -23,6 +23,8 @@
 #include "tracks/drive_node.hpp"
 #include "utils/cpp2011.hpp"
 
+#include <line3d.h>
+
 /**
   * \ingroup tracks
   */
diff --git a/src/utils/vec3.hpp b/src/utils/vec3.hpp
index ee60a2a20..78057a08c 100644
--- a/src/utils/vec3.hpp
+++ b/src/utils/vec3.hpp
@@ -20,7 +20,6 @@
 #ifndef HEADER_VEC3_HPP
 #define HEADER_VEC3_HPP
 
-#include <triangle3d.h>
 #include <vector3d.h>
 #include <vector2d.h>
 using namespace irr;
@@ -216,12 +215,8 @@ public:
 
     float sideofPlane(const Vec3& x1, const Vec3& x2, const Vec3& x3) const
     {
-        core::triangle3df triangle(x1.toIrrVector(), x2.toIrrVector(), x3.toIrrVector());
-        core::vector3df normal = triangle.getNormal();
-        return normal.dotProduct((*this - x1).toIrrVector());
-
+        return ((x2 - x1).cross(x3 - x1)).dot(*this - x1);
     } // sideOfPlane
 };    // Vec3
 
-
 #endif

From 3898678e76f20bfc1ed64a82c1952111c0502335 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Tue, 21 Feb 2017 13:36:00 +0800
Subject: [PATCH 06/11] Use raycasted position for point 2

Fix #2796, #2774
---
 src/karts/controller/skidding_ai.cpp | 16 +++++++++-------
 src/karts/controller/test_ai.cpp     | 16 +++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/karts/controller/skidding_ai.cpp b/src/karts/controller/skidding_ai.cpp
index 092e3393f..c3ee4fafa 100644
--- a/src/karts/controller/skidding_ai.cpp
+++ b/src/karts/controller/skidding_ai.cpp
@@ -40,6 +40,7 @@
 #include "karts/skidding.hpp"
 #include "modes/linear_world.hpp"
 #include "modes/profile_world.hpp"
+#include "physics/triangle_mesh.hpp"
 #include "race/race_manager.hpp"
 #include "tracks/drive_graph.hpp"
 #include "tracks/track.hpp"
@@ -911,8 +912,15 @@ bool SkiddingAI::steerToAvoid(const std::vector<const Item *> &items_to_avoid,
     const Vec3& left = items_to_avoid[index_left_most]->getXYZ();
     int node_index = items_to_avoid[index_left_most]->getGraphNode();
     const Vec3& normal = DriveGraph::get()->getNode(node_index)->getNormal();
+    Vec3 hit;
+    Vec3 hit_nor(0, 1, 0);
+    const Material* m;
+    m_track->getPtrTriangleMesh()->castRay(
+        Vec3(line_to_target.getMiddle()) + normal,
+        Vec3(line_to_target.getMiddle()) + normal * -10000, &hit, &m,
+        &hit_nor);
     Vec3 p1 = line_to_target.start,
-         p2 = line_to_target.getMiddle() + normal.toIrrVector(),
+         p2 = line_to_target.getMiddle() + hit_nor.toIrrVector(),
          p3 = line_to_target.end;
 
     int item_index = -1;
@@ -929,12 +937,6 @@ bool SkiddingAI::steerToAvoid(const std::vector<const Item *> &items_to_avoid,
     else
     {
         const Vec3& right = items_to_avoid[index_right_most]->getXYZ();
-        int node_index = items_to_avoid[index_right_most]->getGraphNode();
-        const Vec3& normal = DriveGraph::get()->getNode(node_index)->getNormal();
-        Vec3 p1 = line_to_target.start,
-            p2 = line_to_target.getMiddle() + normal.toIrrVector(),
-            p3 = line_to_target.end;
-
         if (right.sideofPlane(p1, p2, p3) >= 0)
         {
             // Right of rightmost point
diff --git a/src/karts/controller/test_ai.cpp b/src/karts/controller/test_ai.cpp
index 915b18772..95313d8a8 100644
--- a/src/karts/controller/test_ai.cpp
+++ b/src/karts/controller/test_ai.cpp
@@ -40,6 +40,7 @@
 #include "karts/skidding.hpp"
 #include "modes/linear_world.hpp"
 #include "modes/profile_world.hpp"
+#include "physics/triangle_mesh.hpp"
 #include "race/race_manager.hpp"
 #include "tracks/drive_graph.hpp"
 #include "tracks/track.hpp"
@@ -917,8 +918,15 @@ bool SkiddingAI::steerToAvoid(const std::vector<const Item *> &items_to_avoid,
     const Vec3& left = items_to_avoid[index_left_most]->getXYZ();
     int node_index = items_to_avoid[index_left_most]->getGraphNode();
     const Vec3& normal = DriveGraph::get()->getNode(node_index)->getNormal();
+    Vec3 hit;
+    Vec3 hit_nor(0, 1, 0);
+    const Material* m;
+    m_track->getPtrTriangleMesh()->castRay(
+        Vec3(line_to_target.getMiddle()) + normal,
+        Vec3(line_to_target.getMiddle()) + normal * -10000, &hit, &m,
+        &hit_nor);
     Vec3 p1 = line_to_target.start,
-         p2 = line_to_target.getMiddle() + normal.toIrrVector(),
+         p2 = line_to_target.getMiddle() + hit_nor.toIrrVector(),
          p3 = line_to_target.end;
 
     int item_index = -1;
@@ -935,12 +943,6 @@ bool SkiddingAI::steerToAvoid(const std::vector<const Item *> &items_to_avoid,
     else
     {
         const Vec3& right = items_to_avoid[index_right_most]->getXYZ();
-        int node_index = items_to_avoid[index_right_most]->getGraphNode();
-        const Vec3& normal = DriveGraph::get()->getNode(node_index)->getNormal();
-        Vec3 p1 = line_to_target.start,
-            p2 = line_to_target.getMiddle() + normal.toIrrVector(),
-            p3 = line_to_target.end;
-
         if (right.sideofPlane(p1, p2, p3) >= 0)
         {
             // Right of rightmost point

From 02d3bd2c2bbc3695031daddb322b3d7322e9340f Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Tue, 21 Feb 2017 15:06:26 +0800
Subject: [PATCH 07/11] Take item on walldriving tracks into account

---
 src/items/item.hpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/items/item.hpp b/src/items/item.hpp
index 19152bee9..9ed3962d3 100644
--- a/src/items/item.hpp
+++ b/src/items/item.hpp
@@ -194,10 +194,12 @@ public:
      */
     bool hitKart(const Vec3 &xyz, const AbstractKart *kart=NULL) const
     {
-		Vec3 diff = (xyz - m_xyz);
-		diff.setY(diff.getY() / 2.0f); // don't be too strict if the kart is a bit above the item
-        return (m_event_handler!=kart || m_deactive_time <=0) &&
-               diff.length2()<m_distance_2;
+        if (m_event_handler == kart && m_deactive_time > 0)
+            return false;
+        Vec3 lc = quatRotate(m_original_rotation, xyz - m_xyz);
+        // Don't be too strict if the kart is a bit above the item
+        lc.setY(lc.getY() / 2.0f);
+        return lc.length2() < m_distance_2;
     }   // hitKart
 
 protected:
@@ -214,7 +216,7 @@ protected:
                   const AbstractKart *kart=NULL) const
     {
         if(m_event_handler==kart && m_deactive_time >0) return false;
-        
+
         Vec3 closest = line.getClosestPoint(m_xyz.toIrrVector());
         return hitKart(closest, kart);
     }   // hitLine

From 2ef66521831b95507a80fbfb1ddb4dffa2048aa8 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 22 Feb 2017 20:47:08 +0100
Subject: [PATCH 08/11] Create a kart shadow only of shadow texture exists.

If the image doesn't exist, in some cases it can draw non-transparent square below the kart, which is unwanted.
---
 src/karts/kart.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 43f54ae84..13b820485 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -2557,7 +2557,8 @@ void Kart::loadData(RaceManager::KartType type, bool is_animated_model)
                          ->isFogEnabled() );
     }
 #ifndef SERVER_ONLY
-    if (!CVS->supportsShadows())
+    if (!CVS->supportsShadows() && 
+        m_kart_properties->getShadowTexture() != NULL)
     {
         m_shadow = new Shadow(m_kart_properties.get(), m_node,
                               -m_kart_model->getLowestPoint());

From db4d11a0c5c71ecb0b8440651bacdf67a4462256 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 22 Feb 2017 20:56:17 +0100
Subject: [PATCH 09/11] Disable kart shadow for legacy pipeline in GLES
 renderer because it's broken

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

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 13b820485..dc5ae15c7 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -2557,8 +2557,16 @@ void Kart::loadData(RaceManager::KartType type, bool is_animated_model)
                          ->isFogEnabled() );
     }
 #ifndef SERVER_ONLY
-    if (!CVS->supportsShadows() && 
-        m_kart_properties->getShadowTexture() != NULL)
+    bool create_shadow = m_kart_properties->getShadowTexture() != NULL &&
+                         !CVS->supportsShadows();
+                         
+#ifdef USE_GLES2
+    // Disable kart shadow for legacy pipeline in GLES renderer because it's 
+    // broken
+    create_shadow = create_shadow && CVS->isGLSL();
+#endif
+
+    if (create_shadow)
     {
         m_shadow = new Shadow(m_kart_properties.get(), m_node,
                               -m_kart_model->getLowestPoint());

From 0767abe2bc945eb6d0cab6eb0468275f5ee40c04 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 22 Feb 2017 21:43:36 +0100
Subject: [PATCH 10/11] Draw a touch steering button that allows to run
 challenges.

It was broken because the fire button uses now the icon of collected weapon, so that it's not displayed at all when there is no weapon.
---
 src/states_screens/race_gui_multitouch.cpp | 13 ++++++++++---
 src/states_screens/race_gui_multitouch.hpp |  3 +++
 src/states_screens/race_gui_overworld.cpp  |  5 +++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/states_screens/race_gui_multitouch.cpp b/src/states_screens/race_gui_multitouch.cpp
index c2ef0a777..db027b284 100644
--- a/src/states_screens/race_gui_multitouch.cpp
+++ b/src/states_screens/race_gui_multitouch.cpp
@@ -41,6 +41,7 @@ RaceGUIMultitouch::RaceGUIMultitouch(RaceGUIBase* race_gui)
 {
     m_race_gui = race_gui;
     m_minimap_bottom = 0;
+    m_gui_action = false;
     m_directionnal_wheel_tex = NULL;
     m_pause_tex = NULL;
     m_nitro_tex = NULL;
@@ -147,6 +148,7 @@ void RaceGUIMultitouch::initMultitouchSteering()
                                                   "android/blur_bg_button.png");
     m_bg_button_focus_tex = irr_driver->getTexture(FileManager::GUI, 
                                             "android/blur_bg_button_focus.png");
+    m_gui_action_tex = irr_driver->getTexture(FileManager::GUI,"challenge.png");
 
 } // initMultitouchSteering
 
@@ -209,8 +211,12 @@ void RaceGUIMultitouch::drawMultitouchSteering(const AbstractKart* kart,
             case MultitouchButtonType::BUTTON_FIRE:
             {
                 const Powerup* powerup = kart->getPowerup();
-                if (powerup->getType() != PowerupManager::POWERUP_NOTHING &&
-                    !kart->hasFinishedRace())
+                if (m_gui_action == true)
+                {
+                    btn_texture = m_gui_action_tex;
+                }
+                else if (powerup->getType() != PowerupManager::POWERUP_NOTHING
+                         && !kart->hasFinishedRace())
                 {
                     btn_texture = powerup->getIcon()->getTexture();
                 }
@@ -271,7 +277,8 @@ void RaceGUIMultitouch::drawMultitouchSteering(const AbstractKart* kart,
                                             core::vector2df(scale, scale));
             }
             else if (button->type == MultitouchButtonType::BUTTON_FIRE &&
-                     kart->getPowerup()->getNum() > 1)
+                     kart->getPowerup()->getNum() > 1 && 
+                     m_gui_action == false)
             {
                 gui::ScalableFont* font = GUIEngine::getHighresDigitFont();
                 core::rect<s32> pos((int)(button->x),
diff --git a/src/states_screens/race_gui_multitouch.hpp b/src/states_screens/race_gui_multitouch.hpp
index 71b003fc4..876551a94 100644
--- a/src/states_screens/race_gui_multitouch.hpp
+++ b/src/states_screens/race_gui_multitouch.hpp
@@ -35,6 +35,7 @@ private:
     RaceGUIBase* m_race_gui;
     MultitouchDevice* m_device;
     
+    bool m_gui_action;
     unsigned int m_minimap_bottom;
     
     video::ITexture* m_directionnal_wheel_tex;
@@ -46,6 +47,7 @@ private:
     video::ITexture* m_drift_tex;
     video::ITexture* m_bg_button_tex;
     video::ITexture* m_bg_button_focus_tex;
+    video::ITexture* m_gui_action_tex;
 
     void initMultitouchSteering();
     void closeMultitouchSteering();
@@ -59,6 +61,7 @@ public:
                                 const core::vector2df &scaling);
                                 
     unsigned int getMinimapBottom() {return m_minimap_bottom;}
+    void setGuiAction(bool enabled = true) {m_gui_action = enabled;}
                                  
 };   // RaceGUIMultitouch
 
diff --git a/src/states_screens/race_gui_overworld.cpp b/src/states_screens/race_gui_overworld.cpp
index f8cbaba05..e385aaf72 100644
--- a/src/states_screens/race_gui_overworld.cpp
+++ b/src/states_screens/race_gui_overworld.cpp
@@ -590,6 +590,11 @@ void RaceGUIOverworld::drawGlobalMiniMap()
                                        true, true /* vcenter */, NULL);
         }
     }
+    
+    if (m_multitouch_gui != NULL)
+    {
+        m_multitouch_gui->setGuiAction(m_close_to_a_challenge);
+    }
 #endif   // SERVER_ONLY
 }   // drawGlobalMiniMap
 

From b34e74919847179466ecbf9c0a4ffcc71f9e0cf0 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 22 Feb 2017 23:33:11 +0100
Subject: [PATCH 11/11] Fixed nitro bar in multiplayer game when uniform buffer
 object is not available

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

diff --git a/src/graphics/shader_based_renderer.cpp b/src/graphics/shader_based_renderer.cpp
index c9352a9ba..b0cd78b38 100644
--- a/src/graphics/shader_based_renderer.cpp
+++ b/src/graphics/shader_based_renderer.cpp
@@ -863,6 +863,10 @@ void ShaderBasedRenderer::render(float dt)
     irr_driver->getVideoDriver()->setViewPort(core::recti(0, 0,
         irr_driver->getActualScreenSize().Width,
         irr_driver->getActualScreenSize().Height));
+        
+    m_current_screen_size = core::vector2df(
+                                    irr_driver->getActualScreenSize().Width, 
+                                    irr_driver->getActualScreenSize().Height);
     
     for(unsigned int i=0; i<Camera::getNumCameras(); i++)
     {