Merge remote-tracking branch 'origin/master' into game_protocol

.appveyor.yml

@@ -47,7 +47,7 @@ install:
         #Get-ChildItem $env:ASSETS_DIR | Measure-Object -property length -sum
 
 before_build:
-    - ps: Copy-Item "${env:DEPS_DIR}\windows_64bit\dependencies" c:\projects\stk-code\dependencies –Recurse
+    - ps: Copy-Item "${env:DEPS_DIR}\windows_64bit\dependencies" c:\projects\stk-code\dependencies-64bit –Recurse
     - cmd: |
         md build
         cd build

CHANGELOG.md

@@ -1,13 +1,14 @@
 ## SuperTuxKart 0.9.3
 * Reduced RAM and VRAM usage, reducing load times by Auria and Benau
-* New kart Wilbert by Jymis
+* New mesh format optimized for space and hardware skinning
-* New kart Hexley by Jymis
+* Code refactoring of both render pipeline by Benau and Elderme
-* New tracks Cornfield Crossing and Candela City by samuncle
+* New kart Wilber and Hexley by Jymis
+* New kart Kiki and updated Konqi by Benau
+* New tracks Candela City, Cornfield Crossing and Las Dunas Arena 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
+* In-game screen recording powered by libopenglrecorder
-* Bug fixes on the old render pipeline by Benau and Stragus
+* High quality mipmap generation by Stragus
-* Hardware skinning
 * New smoother camera by Auria
 * New grand prix win scene
 * Gamepad configuration bugfixes

CMakeLists.txt

@@ -10,6 +10,13 @@ endif()
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
 include(CMakeDependentOption)
 
+set(DEPENDENCIES "dependencies")
+# In case of 64-bit windows, use a different path for dependencies
+# so that both dependencies can be installed next to each other
+if ( WIN32 AND (CMAKE_SIZEOF_VOID_P EQUAL 8 ) )
+    set(DEPENDENCIES "dependencies-64bit")
+endif()
+
 include(BuildTypeSTKRelease)
 if (NOT CMAKE_BUILD_TYPE)
     message(STATUS "No build type selected, default to STKRelease")
@@ -62,15 +69,16 @@ set(STK_INSTALL_DATA_DIR "share/supertuxkart" CACHE
 
 # These variables enable MSVC to find libraries located in "dependencies"
 if(WIN32)
-    set(ENV{PATH} "$ENV{PATH};${PROJECT_SOURCE_DIR}/dependencies/include")
+    set(ENV{PATH} "$ENV{PATH};${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/include")
-    set(ENV{LIB} ${PROJECT_SOURCE_DIR}/dependencies/lib)
+    set(ENV{LIB} ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib)
-    set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/dependencies)
+    set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/${DEPENDENCIES})
     add_definitions(-D_IRR_STATIC_LIB_)
     add_definitions(-DNO_IRR_COMPILE_WITH_X11_)
 endif()
 
 if(USE_GLES2)
     add_definitions(-DUSE_GLES2)
+    add_definitions(-D_IRR_COMPILE_WITH_OGLES2_ -DNO_IRR_COMPILE_WITH_OPENGL_)
 endif()
 
 if(SERVER_ONLY)
@@ -78,9 +86,9 @@ if(SERVER_ONLY)
     add_definitions(-DNO_IRR_COMPILE_WITH_X11_)
 endif()
 
-if(DISABLE_VPX)
+#if(DISABLE_VPX)
-    add_definitions(-DNO_VPX)
+#    add_definitions(-DNO_VPX)
-endif()
+#endif()
 
 # Build the Bullet physics library
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
@@ -131,8 +139,8 @@ else()
 endif()
 
 if (BUILD_RECORDER)
-    find_library(OPENGLRECORDER_LIBRARY NAMES openglrecorder libopenglrecorder PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
+    find_library(OPENGLRECORDER_LIBRARY NAMES openglrecorder libopenglrecorder PATHS "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib")
-    find_path(OPENGLRECORDER_INCLUDEDIR NAMES openglrecorder.h PATHS "${PROJECT_SOURCE_DIR}/dependencies/include")
+    find_path(OPENGLRECORDER_INCLUDEDIR NAMES openglrecorder.h PATHS "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/include")
     if (NOT OPENGLRECORDER_LIBRARY OR NOT OPENGLRECORDER_INCLUDEDIR)
         if(PROJECT_VERSION STREQUAL "git")
             message(WARNING "libopenglrecorder not found, disabling in-game recorder. "
@@ -250,12 +258,7 @@ if(NOT USE_GLES2 AND NOT SERVER_ONLY)
     include_directories(${OPENGL_INCLUDE_DIR})
 endif()
 
-
+if(USE_LIBBFD)
-if(UNIX AND NOT APPLE AND NOT SERVER_ONLY)
-    find_package(X11 REQUIRED)
-    include_directories(${X11_INCLUDE_DIR})
-
-    if(USE_LIBBFD)
     find_package(Libbfd)
     if(LIBBFD_FOUND)
         add_definitions(-DENABLE_LIBBFD)
@@ -264,7 +267,6 @@ if(UNIX AND NOT APPLE AND NOT SERVER_ONLY)
         set(USE_LIBBFD OFF CACHE BOOL "Use libbfd for crash reporting and leak check" FORCE)
         message(WARNING "Libbfd not found, disable integrated stack trace.")
     endif()
-    endif()
 endif()
 
 # Set some compiler options
@@ -358,7 +360,7 @@ else()
     elseif(MINGW)
         set(PTHREAD_NAMES "winpthread-1" "libwinpthread-1" "pthreadGC2")
     endif()
-    find_library(PTHREAD_LIBRARY NAMES pthread ${PTHREAD_NAMES} PATHS ${PROJECT_SOURCE_DIR}/dependencies/lib)
+    find_library(PTHREAD_LIBRARY NAMES pthread ${PTHREAD_NAMES} PATHS ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib)
     mark_as_advanced(PTHREAD_LIBRARY)
 
     # Set data dir (absolute or relative to CMAKE_INSTALL_PREFIX)
@@ -380,9 +382,9 @@ endif()
 
 # CURL
 if(MSVC)
-    target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/dependencies/lib/libcurl.lib)
+    target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib/libcurl.lib)
 elseif(MINGW)
-    target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/dependencies/lib/libcurldll.a)
+    target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib/libcurldll.a)
 else()
     find_package(CURL REQUIRED)
     include_directories(${CURL_INCLUDE_DIRS})
@@ -402,7 +404,7 @@ target_link_libraries(supertuxkart
     ${FREETYPE_LIBRARIES}
     ${JPEG_LIBRARIES}
     ${TURBOJPEG_LIBRARY}
-    ${VPX_LIBRARIES}
+    #${VPX_LIBRARIES}
     )
 
 if(NOT SERVER_ONLY)
@@ -414,7 +416,6 @@ if(NOT SERVER_ONLY)
 endif()
 
 if(UNIX AND NOT APPLE)
-    target_link_libraries(supertuxkart ${X11_X11_LIB})
     if(USE_LIBBFD)
         target_link_libraries(supertuxkart ${LIBBFD_LIBRARIES})
     endif()
@@ -458,7 +459,7 @@ if(USE_WIIUSE)
         if(WIIUSE_BUILD)
             target_link_libraries(supertuxkart wiiuse)
         else()
-            target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/dependencies/lib/wiiuse.lib)
+            target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib/wiiuse.lib)
         endif()
     else()
         target_link_libraries(supertuxkart wiiuse bluetooth)
@@ -471,7 +472,7 @@ if(MSVC OR MINGW)
   target_link_libraries(supertuxkart iphlpapi.lib)
   add_custom_command(TARGET supertuxkart POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory
-        "${PROJECT_SOURCE_DIR}/dependencies/dll"
+        "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/dll"
         $<TARGET_FILE_DIR:supertuxkart>)
   add_custom_target(stkshaders SOURCES ${STK_SHADERS})
 endif()

COPYING

@@ -12,7 +12,7 @@ GNU GENERAL PUBLIC LICENSE
 
 Version 3, 29 June 2007
 
-Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
+Copyright (c) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
 

README.md

@@ -70,7 +70,7 @@ Compilation instruction is explained there. If you don't need this feature, pass
 
 ### Compiling
 
-Run the following commands to compile SuperTuxKart:
+Run the following commands inside `stk-code` directory to compile SuperTuxKart:
 
 ```bash
 mkdir cmake_build
@@ -109,8 +109,8 @@ To Build SuperTuxKart on Windows, follow these instructions:
 2. Download the SuperTuxKart source package from either [SuperTuxKart download area - SourceForge.net](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/0.9.2) or [SuperTuxKart.net - Source Control](https://supertuxkart.net/Source_control), and unpack it. 
 *Note: If you downloaded the source package from here: [SuperTuxKart.net - Source Control](https://supertuxkart.net/Source_control), then both `stk-code` and `stk-assets` **must** be in the same directory, otherwise the build can result in failure*
 3. Download the Windows dependencies package from either [SuperTuxKart download area: Dependecies - SourceForge.net](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/Windows/)
-or [SuperTuxKart on GitHub - Dependencies](https://github.com/supertuxkart/dependencies), and unpack it; then, copy the `dependencies` directory from either the `windows` or the `windows_64bit` directories into the `stk-code` directory
+or [SuperTuxKart on GitHub - Dependencies](https://github.com/supertuxkart/dependencies), and unpack it; then, copy the `dependencies` directory from either the `windows` or the `windows_64bit` directories into the `stk-code` directory, rename it to `dependencies-64bit` if you want to compile a 64bit build.
-4. Download CMake from here: [CMake - download page](https://cmake.org/download/), install it; once CMake is installed, double click on the CMake icon on your desktop, and point it towards your `stk-code` directory in the 'Where is the source code' field, and point it to a directory called `build` or `bld`
+4. Download CMake from here: [CMake - download page](https://cmake.org/download/), install it; once CMake is installed, double click on the CMake icon on your desktop, and point it towards your `stk-code` directory in the 'Where is the source code' field, and point it to a directory called `build` or `bld` inside the stk-code directory.
 5. Press 'Configure'; CMake will ask you if it is OK to create the aformentioned directory, press `Yes`. CMake will then ask you about your version of Visual Studio. 
 Confirm your selection; *Please look at the table below to avoid confusion between version numbers and releases of Visual Studio*;
 CMake will begin creating the required files for the build in the directory.

android/AndroidManifest.xml

@@ -13,7 +13,7 @@
 
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"
-                  android:configChanges="keyboardHidden|orientation"
+                  android:configChanges="fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|uiMode"
                   android:screenOrientation="sensorLandscape">
 
             <!-- Tell NativeActivity the name of or .so -->

android/generate_assets.sh

@@ -20,10 +20,11 @@
 ################################################################################
 
 export KARTS="all"
-export TRACKS="battleisland cornfield_crossing featunlocked gplose gpwin   \
+export TRACKS="abyss battleisland cave cornfield_crossing endcutscene        \
-               hacienda introcutscene introcutscene2 lighthouse olivermath \
+               featunlocked fortmagma gplose gpwin hacienda icy_soccer_field \
+               introcutscene introcutscene2 lighthouse mines olivermath      \
                overworld sandtrack scotland snowmountain snowtuxpeak         \
-               soccer_field tutorial"
+               soccer_field stadium tutorial zengarden"
 
 export ASSETS_PATHS="../data                    \
                      ../../stk-assets           \

android/make.sh

@@ -342,6 +342,10 @@ check_error
 # Build apk
 echo "Building APK"
 
+sed -i "s/minSdkVersion=\".*\"/minSdkVersion=\"$SDK_VERSION\"/g" \
+       "$DIRNAME/AndroidManifest.xml"
+
+
 if [ "$BUILD_TOOL" = "gradle" ]; then
     export ANDROID_HOME="$SDK_PATH"
     gradle -Psdk_version=$SDK_VERSION           \

cmake/FindFreetype.cmake

@@ -10,8 +10,8 @@
 #     Freetype library list
 
 if(WIN32)
-    find_path(FREETYPE_INCLUDE_DIRS NAMES freetype/freetype.h PATHS "${PROJECT_SOURCE_DIR}/dependencies/include")
+    find_path(FREETYPE_INCLUDE_DIRS NAMES freetype/freetype.h PATHS "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/include")
-    find_library(FREETYPE_LIBRARY NAMES freetype PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
+    find_library(FREETYPE_LIBRARY NAMES freetype PATHS "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib")
     set(FREETYPE_FOUND 1)
     set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
 elseif(APPLE)

cmake/FindFribidi.cmake

@@ -24,8 +24,8 @@ else()
 endif()
 
 if(NOT FRIBIDI_FOUND)
-    find_path(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h PATHS /Library/Frameworks/fribidi.framework/Headers "${PROJECT_SOURCE_DIR}/dependencies/include")
+    find_path(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h PATHS /Library/Frameworks/fribidi.framework/Headers "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/include")
-    find_library(FRIBIDI_LIBRARY NAMES fribidi PATHS /Library/Frameworks/fribidi.framework "${PROJECT_SOURCE_DIR}/dependencies/lib")
+    find_library(FRIBIDI_LIBRARY NAMES fribidi PATHS /Library/Frameworks/fribidi.framework "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib")
 
     include(FindPackageHandleStandardArgs)
     find_package_handle_standard_args(Fribidi DEFAULT_MSG FRIBIDI_INCLUDE_DIR FRIBIDI_LIBRARY)

cmake/FindOggVorbis.cmake

@@ -10,12 +10,12 @@
 #     OggVorbis library list
 
 
-find_path(OGGVORBIS_OGG_INCLUDE_DIR NAMES ogg/ogg.h PATHS "${PROJECT_SOURCE_DIR}/dependencies/include")
+find_path(OGGVORBIS_OGG_INCLUDE_DIR NAMES ogg/ogg.h PATHS "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/include")
-find_path(OGGVORBIS_VORBIS_INCLUDE_DIR NAMES vorbis/vorbisfile.h PATHS "${PROJECT_SOURCE_DIR}/dependencies/include")
+find_path(OGGVORBIS_VORBIS_INCLUDE_DIR NAMES vorbis/vorbisfile.h PATHS "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/include")
-find_library(OGGVORBIS_OGG_LIBRARY NAMES ogg Ogg libogg PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
+find_library(OGGVORBIS_OGG_LIBRARY NAMES ogg Ogg libogg PATHS "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib")
-find_library(OGGVORBIS_VORBIS_LIBRARY NAMES vorbis Vorbis libvorbis PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
+find_library(OGGVORBIS_VORBIS_LIBRARY NAMES vorbis Vorbis libvorbis PATHS "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib")
-find_library(OGGVORBIS_VORBISFILE_LIBRARY NAMES vorbisfile libvorbisfile PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
+find_library(OGGVORBIS_VORBISFILE_LIBRARY NAMES vorbisfile libvorbisfile PATHS "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib")
-find_library(OGGVORBIS_VORBISENC_LIBRARY NAMES vorbisenc libvorbisenc PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
+find_library(OGGVORBIS_VORBISENC_LIBRARY NAMES vorbisenc libvorbisenc PATHS "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib")
 
 if (APPLE)
     set(OGGVORBIS_OGG_INCLUDE_DIR "/Library/Frameworks/Ogg.framework/Headers/")

cmake/Toolchain-mingw-64bit.cmake

@@ -13,7 +13,7 @@ SET(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
 execute_process(COMMAND sh -c "ls /usr/lib/gcc/x86_64-w64-mingw32/ | grep posix | tr -d '\n'" OUTPUT_VARIABLE MINGW_DEPS_FOLDER)
 
 # here is the target environment located
-SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32 /usr/lib/gcc/x86_64-w64-mingw32/${MINGW_DEPS_FOLDER}/ ${PROJECT_SOURCE_DIR}/dependencies)
+SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32 /usr/lib/gcc/x86_64-w64-mingw32/${MINGW_DEPS_FOLDER}/ ${PROJECT_SOURCE_DIR}/dependencies-64bit)
 
 # adjust the default behaviour of the FIND_XXX() commands:
 # search headers and libraries in the target environment, search

data/CREDITS

@@ -11,13 +11,25 @@ Developer and project leader
 - Lead programming
 - Windows Packaging
 
-
 = Marianne Gagnon (Auria) =
 
 Developer
 - Lead Programming
 - Mac OS X Packager
 
+= Benau =
+
+Developer, modeller & animator
+- Soccer and battle mode AI, Shader, graphics
+- SPM file format definition, importer and exporter
+- Kiki
+- Other graphical improvements to karts and tracks
+
+= Dawid Gan (deveee) =
+
+Developer
+- Android port
+- General improvements and many many bugfixes
 
 = Jean-Manuel Clémençon (Samuncle) =
 
@@ -48,7 +60,6 @@ Add-ons website
 = Additional Programming =
 
 Main Contributors
-- Benau : font rendering, battle AI, ghost replay
 - Dawid Gan (deveee) : general improvements and many many bugfixes
 - Marc Coll : Grand Prix editor
 - Flakebi
@@ -237,6 +248,54 @@ Software used
 
 = Donations =
 
+Donations
+- Georgi Stoychev, Nuno Ferreira, Steven Anderson, Charalabos Frouzakis
+- Richard Qian, William Nakamura, Maree Glynn, David Carlier
+- Alistair Findlay, James Tobin, Ursula Belting, Stephan van den Akker
+- Ken McCall, Arnaud Maurin, James Tobin, Stefan Kiehne, David Efflandt
+- Gary Shearer, Stuart Gibb, Fran Casal, Piotr Karczemski, Florian Lehébel
+- Dominik Müller, Saverio Brancaccio, Florian Lehébel
+
+Donations
+- Alvaro Castañeda Mendoza, Simón Llinares Riestra, Radu Sofian
+- Yevgeny Slusorenko, Joshua Dye, Chris Lukas, Gary Shearer, Gary Shearer
+- Martin Lankes, Muchlis Polin, Peter Estes, Nuno Ferreira, Duncan Steele
+- Michael Kleinhans, Atomic Monks, Aleksandar Sokolovski, Brandon Hoeksema
+- Victor Gabillon, Tristan Reitter, Lupe Aguilar, Florian Pelz
+- Tanja Wiege, Gabriele Casetti, Andrea De Angelis, Saul Gutierrez
+- Csongor Ballay, Csongor Ballay, William Youstra, Peter Estes
+- Régis Hamann, Régis Hamann, Yuri Sucupira, Lucien Greefkes, Frank Sapone
+
+Donations
+- Peter Cundall, Michael Richards, Franz Ernst, Florian Lehébel
+- Jörg Orlowski, Lukasz Szczekocki, Bjarni Kristinsson, David Carlier
+- Kamensky Mikhail, Roland Schoof, Trevor Robertson, Patrik Pomichal
+- Guillaume Pointet, Dennis Holierhoek, Daniel Nelson, David Hibshman
+- Thomas Belvin, Erik Jahn, Susen Skotnik, Dennis McLaughlin, Bert De Mets
+- Jean-Gabriel Kammerer, Stefan Lukits, Martin Steigerwald
+- Adam Williamson, A Anton, Ville Kauppila, Gary Shearer
+- Peter Hausleitner, Philip Pfeifer, Christoph Baldauf, Jane Middlebrooke
+
+Donations
+- roundof.org, Roman Marschall, Gary Shearer, Jonathan Banks
+- Nicolas Affolter, Mahendra Tallur, David Behnke, Mark Supper
+- Eric Cheminot, Jason Speechley, Michael Martin, Andrew Gilbert
+- Fabian Schach, michael orosov, Wendell Glick, Eugene Lemaitre
+- Gerald Angus, Andrea De Angelis, Antonio Sala, Joshua Dye, roundof.org
+- Andreas Müller, Jose Miguel Bolorino Manzano, Troy Smith, Bernhard Motel
+- Bernhard Motel, Alexandre Bouhier, Thomas Preissler, Lubomír Saji
+- Eric Pedersen, Fabrice SAILLY-SIRGUE, Simon Dalsgaard, Joshua Dye
+
+Donations
+- Detlef Olp, João Pedro de Lima, Christopher Sweeney, Ryan Gervais
+- Laszlo Ast, Robert Yerke, Nuno Ferreira, Lachand Valentin, Arne Bernin
+- Carsten Carulli, Jeremy Kenny, Francisco Monteagudo, Marlow Marlow
+- Kong Chun Ho, Jonathan Lee, Dominik Rösner, Andreas Frankl
+- Didier Delhaye, Gianluca Bonato, Ferdinand Ihringer, Mark Dougherty
+- Топоров Константин, Georges-Mickael Seguin, Jason Grindlay
+- Gordon Macleod, Anders Jonsson, Peter Estes, Marius Gripsgård,
+- FoosterNET, Daniel Sandman, David Ault, Matt DeVillier, Chris Leutwyler
+
 Donations
 - Anthony Waxman, Rémi Verschelde, Alessandro Vitali, Katherine Freeman
 - Roy Akselsen, Ingrid Becke, Jonathan Lee, Christoph Baldauf

data/challenges/abyss.challenge

@@ -10,7 +10,7 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="185"/>
+        <requirements time="197"/>
     </medium>
     <easy>
         <karts number="4"/>

data/challenges/city.challenge

@@ -16,4 +16,6 @@
         <karts number="3"/>
         <requirements position="1"/>
     </easy>
+
+    <unlock kart="sara_the_wizard"/>
 </challenge>

data/challenges/hacienda.challenge

@@ -10,10 +10,10 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="185"/>
+        <requirements time="187"/>
     </medium>
     <easy>
         <karts number="4"/>
-        <requirements time="220"/>
+        <requirements time="260"/>
     </easy>
 </challenge>

data/gfx/black_smoke.xml

@@ -26,7 +26,4 @@
     <color     min="50 50 50"
                max="100 100 100" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="1000"       />
-
 </particles>

data/gfx/confetti.xml

@@ -26,10 +26,6 @@
     <color     min="40 40 255"
                max="255 255 255"   />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <wind      flips="Y"           />
-    <fadeout   time="100"          />
-
-    <wind      speed="0.16"
-               flips="Y"           />
 
 </particles>

data/gfx/confetti_bleu.xml

@@ -26,10 +26,6 @@
     <color     min="40 40 255"
                max="255 255 255"   />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <wind      flips="Y"           />
-    <fadeout   time="100"          />
-
-    <wind      speed="0.16"
-               flips="Y"           />
 
 </particles>

data/gfx/droplet.xml

@@ -26,7 +26,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <fadeout   time="3000" />
-
-
 </particles>

data/gfx/explosion.xml

@@ -27,7 +27,4 @@
     <color     min="255 255 255"
                max="255 255 255"  />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="800"         />
-
 </particles>

data/gfx/explosion_bomb.xml

@@ -27,7 +27,4 @@
     <color     min="255 255 255"
                max="255 255 255"  />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="800"         />
-
 </particles>

data/gfx/explosion_cake.xml

@@ -27,7 +27,4 @@
     <color     min="255 255 255"
                max="255 255 255"  />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="800"         />
-
 </particles>

data/gfx/explosion_low.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<particles emitter="sphere" radius="0.1">
+
+    <spreading angle="180"         />
+    
+    <velocity  x="0.000"
+               y="0.0035"
+               z="0.000"           />
+    
+    <material  file="explode.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="100"
+               max="150" />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="700"
+               max="900"         />
+    
+    <!-- Size of the particles -->
+    <size      min="0.8"
+               max="1.0"
+               x-increase-factor="0.6"
+               y-increase-factor="0.6"
+               />
+    
+    <color     min="255 255 255"
+               max="255 255 255"  />
+
+</particles>

data/gfx/fire.xml

@@ -24,6 +24,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-  <fadeout time="300" />
-
 </particles>

data/gfx/gfx_blueNebula_a.xml

@@ -26,7 +26,4 @@
     <color     min="0 0 0"
                max="255 255 255" />
 
-    <fadeout   time="5000" />
-
-
 </particles>

data/gfx/gfx_bubbleFast_a.xml

@@ -26,7 +26,4 @@
     <color     min="0 0 0"
                max="255 255 255" />
 
-    <fadeout   time="2000" />
-
-
 </particles>

data/gfx/gfx_bubble_a.xml

@@ -26,7 +26,4 @@
     <color     min="0 0 0"
                max="255 255 255" />
 
-    <fadeout   time="5000" />
-
-
 </particles>

data/gfx/gfx_fallingLeaf_a.xml

@@ -26,10 +26,6 @@
     <color     min="40 40 255"
                max="255 255 255"   />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <wind      flips="Y"           />
-    <fadeout   time="100"          />
-
-    <wind      speed="0.16"
-               flips="Y"           />
 
 </particles>

data/gfx/gfx_fireworkExplosion_a.xml

@@ -27,7 +27,4 @@
     <color     min="255 255 255"
                max="255 0 0"  />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="50"         />
-
 </particles>

data/gfx/gfx_fireworkGreen_a.xml

@@ -27,7 +27,4 @@
     <color     min="255 255 255"
                max="255 0 0"  />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="50"         />
-
 </particles>

data/gfx/gfx_fireworkSmoke_a.xml

@@ -28,8 +28,4 @@
     <color     min="40 40 255"
                max="255 255 255"   />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
-
-
 </particles>

data/gfx/gfx_firework_a.xml

@@ -26,10 +26,4 @@
     <color     min="40 40 255"
                max="255 255 255"   />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
-
-    <wind      speed="0.16"
-               flips="Y"           />
-
 </particles>

data/gfx/gfx_jetBlastEarth_a.xml

@@ -26,7 +26,4 @@
     <color     min="0 0 0"
                max="255 255 255" />
 
-    <fadeout   time="5000" />
-
-
 </particles>

data/gfx/gfx_jetBlastSand_a.xml

@@ -26,7 +26,4 @@
     <color     min="0 0 0"
                max="255 255 255" />
 
-    <fadeout   time="5000" />
-
-
 </particles>

data/gfx/gfx_mudPot_a.xml

@@ -28,8 +28,4 @@
     <color     min="40 40 255"
                max="255 255 255"   />
  
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="1000"          />
-
-
 </particles>

data/gfx/gfx_sandExplosion_a.xml

@@ -26,7 +26,4 @@
     <color     min="0 0 0"
                max="255 255 255" />
 
-    <fadeout   time="500" />
-
-
 </particles>

data/gfx/gfx_smallWaterFlow.xml

@@ -26,7 +26,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <fadeout   time="3000" />
-
-
 </particles>

data/gfx/gfx_sparkBlue_a.xml

@@ -28,10 +28,4 @@
     <color     min="40 40 255"
                max="255 255 255"   />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
-
-    <wind      speed="0.16"
-               flips="Y"           />
-
 </particles>

data/gfx/gfx_sparkFire_a.xml

@@ -26,10 +26,4 @@
     <color     min="40 40 255"
                max="255 255 255"   />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
-
-    <wind      speed="0.16"
-               flips="Y"           />
-
 </particles>

data/gfx/jump_explosion.xml

@@ -27,7 +27,4 @@
     <color     min="255 255 255"
                max="255 255 255"  />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="1000"         />
-
 </particles>

data/gfx/kart_exhaust.xml

@@ -27,7 +27,4 @@
     <color     min="255 255 255"
                max="0 0 0"  />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"         />
-
 </particles>

data/gfx/nitro-smoke.xml

@@ -24,7 +24,4 @@
     <color     min="255 255 255"
                max="255 255 255"  />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="75"         />
-
 </particles>

data/gfx/nitro.xml

@@ -27,7 +27,4 @@
     <color     min="255 255 255"
                max="255 255 255"  />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="50"         />
-
 </particles>

data/gfx/rain-ground.xml

@@ -32,9 +32,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="750"        />
-
-    <gravity   strength="-0.01"
-               only-force-time="500" />
 </particles>

data/gfx/rain.xml

@@ -26,8 +26,4 @@
     <color     min="255 255 255"
                max="255 255 255"   />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
-
-
 </particles>

data/gfx/skid1.xml

@@ -26,7 +26,4 @@
     <color     min="255 255 255"
                max="255 255 255"  />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="5"         />
-
 </particles>

data/gfx/skid2.xml

@@ -26,7 +26,4 @@
     <color     min="255 255 255"
                max="255 255 255"  />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="5"         />
-
 </particles>

data/gfx/smoke.xml

@@ -24,7 +24,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
 </particles>

data/gfx/smoke_brown.xml

@@ -24,7 +24,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
 </particles>

data/gfx/smoke_red.xml

@@ -24,7 +24,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
 </particles>

data/gfx/smoke_short_burst.xml

@@ -25,7 +25,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
 </particles>

data/gfx/smoke_yellow.xml

@@ -24,7 +24,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
 </particles>

data/gfx/snow.xml

@@ -23,13 +23,9 @@
     <size      min="0.10"
                max="0.30"          />
     
-    <color     min="40 40 255"
+    <color     min="255 255 255"
                max="255 255 255"   />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <wind      flips="Y"           />
-    <fadeout   time="100"          />
-
-    <wind      speed="0.16"
-               flips="Y"           />
 
 </particles>

data/gfx/sparks.xml

@@ -25,7 +25,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
 </particles>

data/gfx/splash.xml

@@ -25,9 +25,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
-    <gravity   strength="-0.01"
-               only-force-time="1000" />
 </particles>

data/gfx/swampDriving.xml

@@ -25,9 +25,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
-    <gravity   strength="-0.01"
-               only-force-time="1000" />
 </particles>

data/gfx/waterfall.xml

@@ -26,7 +26,4 @@
     <color     min="255 255 255"
                max="255 255 255" />
 
-    <fadeout   time="5000" />
-
-
 </particles>

data/gfx/zipper_fire.xml

@@ -25,7 +25,4 @@
     <color     min="255 255 255"
                max="255 255 255"  />
 
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"         />
-
 </particles>

data/graphical_restrictions.xml

@@ -3,18 +3,16 @@
   <card is="Intel(R) HD Graphics"      os="windows" version="<9.0" disable="ForceLegacyDevice"/>
   <card is="Intel(R) HD Graphics"      os="windows" version="<9.0" disable="HighDefinitionTextures"/>
   <card is="Intel(R) HD Graphics 2000" os="windows"                disable="UniformBufferObject"/>
-  <card is="Intel(R) HD Graphics 2000" os="windows"                disable="AdvancedPipeline"/>
+  <card is="Intel(R) HD Graphics 2000" os="windows"                disable="FramebufferSRGB"/>
-  <card is="Intel(R) HD Graphics 2000" os="windows"                disable="FramebufferSRGBWorking"/>
   <card is="Intel(R) HD Graphics 2000" os="windows"                disable="HighDefinitionTextures"/>
   <card is="Intel(R) HD Graphics 3000" os="windows"                disable="UniformBufferObject"/>
-  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="AdvancedPipeline"/>
+  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="FramebufferSRGB"/>
-  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="FramebufferSRGBWorking"/>
   <card is="Intel(R) HD Graphics 3000" os="windows"                disable="HighDefinitionTextures"/>
   <card is="Intel(R) HD Graphics 4600" os="windows"                disable="ComputeShader"/>
   <card contains="Intel"          os="osx"                         disable="GI"/>
   <card contains="Intel"          os="linux"    version="<11.2"    disable="ComputeShader"/>
   <card contains="Intel"          os="linux"    version="<11.2"    disable="GeometryShader"/>
-  <card contains="Intel"          os="linux"                       disable="FramebufferSRGBCapable"/>
+  <card contains="Intel"          os="linux"                       disable="FramebufferSRGBWorkaround2"/>
   <card contains="Intel"          os="linux"    version="<11.2"    disable="TextureCompressionS3TC"/>
   <card contains="Intel"          os="windows"                     disable="TextureCompressionS3TC"/>
   <card contains="Intel"          os="osx"                         disable="TextureCompressionS3TC"/>
@@ -40,4 +38,5 @@
   <card contains="Adreno"         os="android"  version="<=19"     disable="VertexIdWorking"/>
   <card contains="Android Emulator" os="android"                   disable="ForceLegacyDevice"/>
   <card                           os="android"                     disable="UniformBufferObject"/>
+  <card vendor="Broadcom"         os="linux"                       disable="HighDefinitionTextures256"/>
 </graphical-restrictions>

data/localized_name.txt

@@ -10,7 +10,7 @@ ar_SY=0
 ar_TN=0
 as=অসমীয়া
 ast=Asturianu
-ay=aymar aru
+ay=Aymar aru
 az=Azərbaycanca
 az_IR=0
 be=Беларуская мова
@@ -20,14 +20,14 @@ bn=বাংলা
 bn_BD=0
 bn_IN=0
 bo=བོད་སྐད་
-br=brezhoneg
+br=Brezhoneg
 bs=Bosanski
 bs_BA=0
 bs_BS=0
 ca_ES=0
 ca=0
 cmn=0
-co=corsu
+co=Corsu
 cs=Čeština
 cs_CZ=Čeština (Česká Republika)
 cy=Welsh
@@ -70,15 +70,15 @@ es_PR=0
 es_SV=0
 es_UY=0
 es_VE=0
-et=eesti keel
+et=Eesti keel
 et_EE=0
 et_ET=0
-eu=euskara
+eu=Euskara
 eu_ES=0
 fa=فارسى
 fa_AF=0
 fa_IR=0
-fi=suomi
+fi=Suomi
 fi_FI=0
 fo=Føroyskt
 fo_FO=0
@@ -101,7 +101,7 @@ he_IL=0
 hi=हिन्दी
 hr=Hrvatski
 hr_HR=0
-hu=magyar
+hu=Magyar
 hu_HU=0
 hy=Հայերեն
 ia=Interlingua
@@ -123,6 +123,7 @@ km_KH=0
 kn=ಕನ್ನಡ
 ko=한국어
 ko_KR=0
+krl=Karjalan kieli
 ku=Kurdî
 kw=Kernowek
 ky=кыргызча
@@ -139,6 +140,7 @@ mk=Македонски
 mk_MK=0
 ml=മലയാളം
 mn=Монгол
+mn_MN=Монгол
 mr=मराठी
 ms=Bahasa Melayu
 ms_MY=0
@@ -164,6 +166,7 @@ os=0
 pa=ਪੰਜਾਬੀ
 pl=Polski
 pl_PL=0
+pms=Piemontèis
 ps=پښتو
 pt=Português
 pt_BR=0
@@ -176,6 +179,8 @@ ru=Русский
 ru_RU=0
 rw=Kinyarwanda
 sa=0
+sc=Sardu
+sco=0
 sd=0
 se=Sámegiella
 se_NO=0