Merge branch 'master' of https://github.com/supertuxkart/stk-code

cmake/FindAngelscript.cmake

@@ -14,11 +14,11 @@ FIND_PATH(Angelscript_INCLUDE_DIRS angelscript.h
     )
 
 FIND_LIBRARY(Angelscript_LIBRARY
-    NAMES angelscript
+    NAMES angelscript angelscript_s
     PATHS
     /usr/local
     /usr
-    PATH_SUFFIXES lib
+    PATH_SUFFIXES lib lib64 lib32
     )
 
 # handle the QUIETLY and REQUIRED arguments and set ANGELSCRIPT_FOUND to TRUE if

src/config/saved_grand_prix.cpp

@@ -181,5 +181,7 @@ void SavedGrandPrix::loadKarts(std::vector<RaceManager::KartStatus> & kart_list)
         }   // if m_local_player_id == -1
     }   // for i
 
-    std::sort(kart_list.begin(), kart_list.end(), cmp__l);
+    // The line below causes issues in follow the leader race. The leader
+    // is not at first place anymore.
+    // std::sort(kart_list.begin(), kart_list.end(), cmp__l);
 }   // loadKarts