Only do default assignments of stk- to steam-accounts on first

start, after that use the saved settings (otherwise a user deciding to play without steam would get his setting overridden).
Removed unnecessary line.
2017-05-09 09:21:19 +10:00 · 2017-05-08 17:48:46 +10:00 · 2017-05-05 23:59:43 +10:00 · 2017-05-05 09:36:11 +10:00 · 2017-05-04 00:06:10 +10:00 · 2017-05-03 09:30:04 +10:00
1032 changed files with 169327 additions and 137000 deletions
--- a/.appveyor.yml
+++ b/.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-64bit –Recurse
+    - ps: Copy-Item "${env:DEPS_DIR}\windows_64bit\dependencies" c:\projects\stk-code\dependencies –Recurse
    - cmd: |
        md build
        cd build
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@ cmake_build*/
 dependencies*/
 CMakeFiles/
 stk-editor/
-.vscode/

 .config/
 supertuxkart-64
@@ -57,13 +56,10 @@ android/android-ndk*
 android/android-sdk*
 android/assets
 android/bin
-android/build
-android/libs
 android/obj
-android/.gradle
+android/libs
 android-*
 *.apk
-*.keystore

 lib/curl
 lib/freetype
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,20 +1,3 @@
-## SuperTuxKart 0.9.3
-* Reduced RAM and VRAM usage, reducing load times by Auria and Benau
-* New mesh format optimized for space and hardware skinning
-* Code refactoring of both render pipeline by Benau and Elderme
-* 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 powered by libopenglrecorder
-* High quality mipmap generation by Stragus
-* New smoother camera by Auria
-* New grand prix win scene
-* Gamepad configuration bugfixes
-* 3 Strikes Battles : added spare tire karts
-* Various improvements (wall driving fixes, parachutes, GP points, cannon fixes, colorization shader)
-
 ## SuperTuxKart 0.9.2
 * Ghost replay races by Benau
 * Battle mode AI by Benau
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # root CMakeLists for the SuperTuxKart project
 project(SuperTuxKart)
-set(PROJECT_VERSION "0.9.3")
+set(PROJECT_VERSION "0.9.1")

 cmake_minimum_required(VERSION 2.8.4)
 if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))
@@ -10,13 +10,6 @@ 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")
@@ -27,7 +20,7 @@ option(SERVER_ONLY "Create a server only (i.e. no graphics or sound)" OFF)
 option(USE_FRIBIDI "Support for right-to-left languages" ON)
 option(CHECK_ASSETS "Check if assets are installed in ../stk-assets" ON)
 option(USE_SYSTEM_ANGELSCRIPT "Use system angelscript instead of built-in angelscript. If you enable this option, make sure to use a compatible version." OFF)
-option(ENABLE_WAYLAND_DEVICE "Enable Wayland device for linux build" OFF)
+option(ENABLE_NETWORK_MULTIPLAYER "Enable network multiplayer. This will replace the online profile GUI in the main menu with the network multiplayer GUI" OFF)

 CMAKE_DEPENDENT_OPTION(BUILD_RECORDER "Build opengl recorder" ON
    "NOT SERVER_ONLY;NOT USE_GLES2;NOT APPLE" OFF)
@@ -36,10 +29,6 @@ if (UNIX AND NOT APPLE)
    option(USE_GLES2 "Use OpenGL ES2 renderer" OFF)
 endif()

-if(UNIX OR MINGW)
-    option(DEBUG_SYMBOLS "Compile with debug symbols" OFF)
-endif()
-
 if(MSVC AND (MSVC_VERSION LESS 1900))
    # Normally hide the option to build wiiuse on VS, since it depends
    # on the installation of the Windows DDK (Driver Developer Kit),
@@ -73,16 +62,15 @@ 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{LIB} ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib)
-    set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/${DEPENDENCIES})
+    set(ENV{PATH} "$ENV{PATH};${PROJECT_SOURCE_DIR}/dependencies/include")
+    set(ENV{LIB} ${PROJECT_SOURCE_DIR}/dependencies/lib)
+    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)
@@ -90,15 +78,12 @@ if(SERVER_ONLY)
    add_definitions(-DNO_IRR_COMPILE_WITH_X11_)
 endif()

-#if(DISABLE_VPX)
-#    add_definitions(-DNO_VPX)
-#endif()
+if(DISABLE_VPX)
+    add_definitions(-DNO_VPX)
+endif()

-if(UNIX OR MINGW)
-    if(DEBUG_SYMBOLS)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
-    endif()
+if(BUILD_RECORDER)
+    add_definitions(-DENABLE_RECORDER)
 endif()

 # Build the Bullet physics library
@@ -116,7 +101,7 @@ if(NOT USE_GLES2 AND NOT SERVER_ONLY)
    include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
 endif()

-if(MSVC OR APPLE)
+if((WIN32 AND NOT MINGW) OR APPLE)
    if (NOT APPLE)
    # Build zlib library
    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/zlib")
@@ -127,15 +112,15 @@ if(MSVC OR APPLE)
    endif()

    # Build png library
-    set(SKIP_INSTALL_ALL TRUE)
-    set(PNG_STATIC TRUE CACHE BOOL "Build static lib")
-    set(PNG_TESTS FALSE CACHE BOOL "Build libpng tests")
-    set(PNG_SHARED FALSE CACHE BOOL "Build shared lib")
+    set (SKIP_INSTALL_ALL TRUE)
+    set (PNG_STATIC TRUE)
+    set (PNG_TESTS FALSE)
+    set (PNG_SHARED FALSE)
    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
    include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")

    set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
-    set(PNG_LIBRARY png_static)
+    set(PNG_LIBRARY png15_static)
 endif()

 # Add jpeg library
@@ -150,24 +135,14 @@ else()
 endif()

 if (BUILD_RECORDER)
-    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_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")
    if (NOT OPENGLRECORDER_LIBRARY OR NOT OPENGLRECORDER_INCLUDEDIR)
-        if(PROJECT_VERSION STREQUAL "git")
-            message(WARNING "libopenglrecorder not found, disabling in-game recorder. "
-                "To use recorder, install libopenglrecorder.")
-            set(OPENGLRECORDER_LIBRARY CACHE INTERNAL "")
-            set(OPENGLRECORDER_INCLUDEDIR CACHE INTERNAL "")
-            set(BUILD_RECORDER OFF)
-        else()
-            message(FATAL_ERROR "libopenglrecorder not found. "
-            "Either install libopenglrecorder or disable in-game recorder with -DBUILD_RECORDER=0")
-        endif()
-    else()
-        include_directories(${OPENGLRECORDER_INCLUDEDIR})
-        mark_as_advanced(OPENGLRECORDER_LIBRARY OPENGLRECORDER_INCLUDEDIR)
-        add_definitions(-DENABLE_RECORDER)
+        message(FATAL_ERROR "libopenglrecorder not found. "
+            "Either install libopenglrecorder or disable ingame recorder with -DBUILD_RECORDER=0")
    endif()
+    include_directories(${OPENGLRECORDER_INCLUDEDIR})
+    mark_as_advanced(OPENGLRECORDER_LIBRARY OPENGLRECORDER_INCLUDEDIR)
 endif()

 if(NOT SERVER_ONLY AND NOT USE_GLES2)
@@ -269,14 +244,25 @@ if(NOT USE_GLES2 AND NOT SERVER_ONLY)
    include_directories(${OPENGL_INCLUDE_DIR})
 endif()

-if(USE_LIBBFD)
-    find_package(Libbfd)
-    if(LIBBFD_FOUND)
-        add_definitions(-DENABLE_LIBBFD)
-        include_directories(${LIBBFD_INCLUDE_DIRS})
-    else()
-        set(USE_LIBBFD OFF CACHE BOOL "Use libbfd for crash reporting and leak check" FORCE)
-        message(WARNING "Libbfd not found, disable integrated stack trace.")
+
+if(UNIX AND NOT APPLE AND NOT SERVER_ONLY)
+    find_package(X11 REQUIRED)
+    include_directories(${X11_INCLUDE_DIR})
+
+    find_package(Xrandr REQUIRED)
+    if(NOT XRANDR_FOUND)
+        message(FATAL_ERROR "XRANDR not found.")
+    endif()
+
+    if(USE_LIBBFD)
+        find_package(Libbfd)
+        if(LIBBFD_FOUND)
+            add_definitions(-DENABLE_LIBBFD)
+            include_directories(${LIBBFD_INCLUDE_DIRS})
+        else()
+            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()

@@ -290,6 +276,11 @@ if(MINGW AND CMAKE_BUILD_TYPE MATCHES Release)
    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--subsystem,windows")
 endif()

+# Netwowk Multiplayer
+if(ENABLE_NETWORK_MULTIPLAYER)
+  add_definitions(-DENABLE_NETWORK_MULTIPLAYER_SCREEN)
+endif()
+
 if(WIN32)
    # By default windows.h has macros defined for min and max that screw up everything
    add_definitions(-DNOMINMAX)
@@ -371,7 +362,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)
@@ -393,9 +384,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})
@@ -415,18 +406,19 @@ target_link_libraries(supertuxkart
    ${FREETYPE_LIBRARIES}
    ${JPEG_LIBRARIES}
    ${TURBOJPEG_LIBRARY}
-    #${VPX_LIBRARIES}
+    ${VPX_LIBRARIES}
    )

 if(NOT SERVER_ONLY)
    if(NOT USE_GLES2)
        target_link_libraries(supertuxkart ${OPENGL_gl_LIBRARY} glew graphics_utils)
    else()
-        target_link_libraries(supertuxkart GLESv2)
+        target_link_libraries(supertuxkart EGL GLESv2)
    endif()
 endif()

 if(UNIX AND NOT APPLE)
+    target_link_libraries(supertuxkart ${X11_LIBRARIES} ${XRANDR_LIBRARIES})
    if(USE_LIBBFD)
        target_link_libraries(supertuxkart ${LIBBFD_LIBRARIES})
    endif()
@@ -470,7 +462,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)
@@ -483,7 +475,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()
@@ -540,9 +532,9 @@ if(STK_ASSETS_DIR AND CHECK_ASSETS)
  install(DIRECTORY ${STK_ASSETS_DIR} DESTINATION ${STK_INSTALL_DATA_DIR}/data PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE)
 endif()
 install(FILES ${STK_DATA_DIR}/supertuxkart.desktop DESTINATION share/applications)
-install(FILES data/supertuxkart_48.png DESTINATION share/icons/hicolor/48x48/apps RENAME supertuxkart.png)
+install(FILES data/supertuxkart_32.png DESTINATION share/icons/hicolor/32x32/apps RENAME supertuxkart.png)
 install(FILES data/supertuxkart_128.png DESTINATION share/icons/hicolor/128x128/apps RENAME supertuxkart.png)
-install(FILES data/supertuxkart_48.png DESTINATION share/pixmaps RENAME supertuxkart.png)
+install(FILES data/supertuxkart_32.png data/supertuxkart_128.png DESTINATION share/pixmaps)
 install(FILES data/supertuxkart.appdata.xml DESTINATION share/appdata)

 if(MINGW)
--- a/2
+++ b/2
@@ -12,7 +12,7 @@ GNU GENERAL PUBLIC LICENSE

 Version 3, 29 June 2007

-Copyright (c) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+Copyright © 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.

--- a/README.md
+++ b/README.md
@@ -1,51 +1,49 @@
 # SuperTuxKart
 [![Build Status](https://travis-ci.org/supertuxkart/stk-code.svg?branch=master)](https://travis-ci.org/supertuxkart/stk-code)
-[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/supertuxkart/stk-code?svg=true&branch=master)](https://ci.appveyor.com/project/supertuxkart/stk-code)
-[![#supertuxkart on the freenode IRC network](https://img.shields.io/badge/freenode-%23supertuxkart-brightgreen.svg)](https://webchat.freenode.net/?channels=supertuxkart)
+[![AppVeyor Build Satus](https://ci.appveyor.com/api/projects/status/github/supertuxkart/stk-code?svg=true&branch=master)](https://ci.appveyor.com/project/supertuxkart/stk-code)
+[![#supertuxkart on freenode](https://img.shields.io/badge/freenode-%23supertuxkart-brightgreen.svg)](https://webchat.freenode.net/?channels=supertuxkart)

 SuperTuxKart is a free kart racing game. It focuses on fun and not on realistic kart physics. Instructions can be found on the in-game help page.

 The SuperTuxKart homepage can be found at <https://supertuxkart.net/>. There is also our [FAQ](https://supertuxkart.net/FAQ) and information on how get in touch with the [community](https://supertuxkart.net/Community)

 ## Hardware Requirements
-To run SuperTuxKart, make sure that your computer's specifications are equal or higher than the following specifications:
-
-* A graphics card capable of 3D rendering - NVIDIA GeForce 8 series and newer (GeForce 8100 or newer), AMD/ATI Radeon HD 4000 series and newer, Intel HD Graphics 3000 and newer. OpenGL >= 3.1
-* You should have a CPU that's running at 1 GHz or faster. 
+* You need a 3D graphics card. (NVIDIA GeForce 8xxx and higher, ATI Radeon HD 4xxx and higher or Intel HD 3000 and higher.)
+* You should have a CPU that's running at 1GHz or better.
 * You'll need at least 512 MB of free VRAM (video memory).
-* Minimum disk space: 800 MB 
-* Ideally, you'll want a joystick with at least 6 buttons.
+* Disk space: 400MB
+* Ideally, you want a joystick with at least 6 buttons.

 ## License
-The software is released under the GNU General Public License (GPL) which can be found in the file [`COPYING`](/COPYING) in the same directory as this file. Information about the licenses for the artwork is contained in `data/licenses`.
+This software is released under the GNU General Public License (GPL) which can be found in the file [`COPYING`](/COPYING) in the same directory as this file. Information about the licenses for artwork are contained in `data/licenses`.

 ## 3D coordinates
-A reminder for those who are looking at the code and 3D models:
+A reminder for those looking at the code and 3d models:

-SuperTuxKart: X right, Y up, Z forwards
+STK    : X right, Y up,       Z forwards

 Blender: X right, Y forwards, Z up

-The export utilities  perform the needed transformation, so in Blender you just work with the XY plane as ground, and things will appear fine in STK (using XZ as ground in the code, obviously).
+The exporters perform the needed transform, so in Blender you just work with XY plane as ground, and things will appear fine in STK (using XZ as ground in the code, obviously).

 ## Building from source

-In order to build SuperTuxKart from source, you'll need both the code and the assets (See <https://supertuxkart.net/Source_control> for more information):
+First, you need both the code and the assets (See <https://supertuxkart.net/Source_control> for more information):

-```bash
-git clone https://github.com/supertuxkart/stk-code stk-code
-svn co https://svn.code.sf.net/p/supertuxkart/code/stk-assets stk-assets
+```
+git clone https://github.com/supertuxkart/stk-code
+svn checkout https://svn.code.sf.net/p/supertuxkart/code/stk-assets stk-assets
 ```

-## Building SuperTuxKart on Linux
+## Building on Linux

 ### Dependencies

-To build SuperTuxKart from source, you'll need to install the following packages:
+Install the following packages:

  * OpenGL (mesa)
  * OpenAL (recommended: openal-soft-devel)
-  * Ogg (libogg-dev)
+  * Ogg    (libogg-dev)
  * Vorbis (libvorbis-dev)
  * Freetype (libfreetype6-dev)
  * libcurl (libcurl-devel)
@@ -56,7 +54,7 @@ To build SuperTuxKart from source, you'll need to install the following packages

 Ubuntu command:

-```bash
+```
 sudo apt-get install build-essential cmake libbluetooth-dev \
 libcurl4-gnutls-dev libfreetype6-dev libfribidi-dev libgl1-mesa-dev \
 libjpeg-dev libogg-dev libopenal-dev libpng-dev libvorbis-dev libxrandr-dev \
@@ -65,14 +63,15 @@ mesa-common-dev pkg-config zlib1g-dev
 ### In-game recorder

 In order to build the in-game recorder for STK, you have to install
-libopenglrecorder from your distribution, or compile it yourself from [here](https://github.com/Benau/libopenglrecorder).
-Compilation instruction is explained there. If you don't need this feature, pass `-DBUILD_RECORDER=off` to cmake.
+libopenglrecorder from your distribution or compile it yourself, get it [here](https://github.com/Benau/libopenglrecorder).
+Compilation instruction is explained there, if you don't need such feature,
+pass `-DBUILD_RECORDER=off` to cmake.

 ### Compiling

-Run the following commands inside `stk-code` directory to compile SuperTuxKart:
+Compile SuperTuxKart:

-```bash
+```
 mkdir cmake_build
 cd cmake_build
 cmake ..
@@ -82,15 +81,15 @@ STK can then be run from the build directory with `bin/supertuxkart`

 ### Further options

-To create a debug version of STK, run:
+To create a debug version of STK, use:

-```bash
+```
 cmake .. -DCMAKE_BUILD_TYPE=Debug
 ```

 You can install your build system-wide:

-```bash
+```
 sudo make install
 ```

@@ -101,59 +100,22 @@ location, specify `CMAKE_INSTALL_PREFIX` when running cmake, e.g.:
 `cmake .. -DCMAKE_INSTALL_PREFIX=/opt/stk`


+## Windows

-## Building SuperTuxKart on Windows
-To Build SuperTuxKart on Windows, follow these instructions:
+1. Install VS 2013 (or later). The free express versions work fine.
+2. Download and install a source package - either a released package or from our [git/svn repositories](https://supertuxkart.net/Source_control).
+3. Download the latest dependency package from [here](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/Windows/). Unzip it in the root directory, so that the dependencies directory is next to the src and data directories (if you are updating from a previous dependency package, you can delete the .dll files in the root directory, they are not needed anymore).
+4. Download cmake and install it. Then start cmake-gui and select the STK root directory as 'Where is the source code', and a new directory in the root directory (next to src, data etc) as the build directory (for now I assume that this directory is called bld).
+5. Click on configure. You will be asked to create the directory (yes), then for your VS version. Make sure you select the right version (be aware of the easy to confuse version numbers: VS 2013 = version 12). Click on configure, then generate. This will create the directory 'bld', and a VS solution in that directory.
+6. In Visual Studio open the project file generated in the 'bld' folder.
+7. Right click on the supertuxkart project in the solution explorer, and select "Set as StartUp Project".
+8. Select Build->Build Solution (or press F7) to compile.

-1. Download and install Visual Studio from here: [Visual Studio - Download](https://www.visualstudio.com/downloads/). The free Visual Studio Community edition works fine.
-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, 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` 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.
-6. Navigate to your build directory and open the `SuperTuxKart.sln` file; Visual Studio will now load the solution. 
-7. In the 'Solution Explorer', right click on the `supertuxkart` project and select "Set as StartUp project"
-8. Open the 'Build' menu and select 'Build Solution'; or, press the default keyboard shortcut: `CTRL + SHIFT + B` to build the solution.
-
-*Note: To avoid confusion between releases and versions, refer to this table:*
-
-Visual Studio Release | Version
----------------------|------------
-Visual Studio 2017| 15
-Visual Studio 2015| 14
-Visual Studio 2013| 13
-
-## Building SuperTuxKart on Windows (from PowerShell/Command line)
-1. Download and install Visual Studio from here: [Visual Studio - Download](https://www.visualstudio.com/downloads/), the free Visual Studio Community edition works fine.
-
-2. Download a source package from either [SuperTuxKart 0.9.2 download area - SourceForge.net](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/0.9.2) or [SuperTuxKart.net - Source Control](https://supertuxkart.net/Source_control)
-NOTE: the `stk-code` and `stk-assets` directories **must** be in the same directory 
-3. Download the Windows dependencies package from either [SuperTuxKart download area - SourceForge.net](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/Windows/)
-or [SuperTuxKart on GitHub - Dependencies](https://github.com/supertuxkart/dependencies)
-and unpack the archive; once unpacked, copy the `dependencies` directory from either the `windows` or the `windows_64bit` directories into the `stk-code` directory
-4. Download CMake from here: [CMake - download page](https://cmake.org/download/); and install it. Navigate to the `stk-code` directory; and create an directory called "build":
-```cmd
-mkdir build
-cd build
-```
-5. Once inside the build directory; run CMake to start the compilation process:
-```cmd
-cmake ..
-```
-6. Now that CMake finished configuring and creating the necessary files for the build, run the build command in the same directory:
-```cmd
-msbuild.exe SuperTuxKart.sln 
-``` 
-SuperTuxKart can now be run as `bin\Debug\supertuxkart.exe` or `bin\Release\supertuxkart.exe` 
-
-## Building SuperTuxKart on macOS
+## OS X

 ### Getting Started

-Install the developer tools, either from the OS X Install DVD or from Apple's website.
+Install developer tools, either from the OS X Install DVD or from Apple's website.

 If you have never built anything before, you have create `/usr/local/include/` first:

@@ -188,23 +150,23 @@ You'll have to run these commands inside your stk-code directory.

 With clang:

-```bash
+```
 mkdir cmake_build
 cd cmake_build
 cmake ..
 make
 ```

-With GCC:
-```bash
+With GCC :
+```
 mkdir cmake_build
 cd cmake_build
 cmake .. -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_C_COMPILER=/usr/bin/gcc
 make
 ```

-Building on 10.10 with 10.9 compatibility:
-```bash
+Building on 10.10 with 10.9 compat
+```
 cmake .. -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk  -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9
 ```

@@ -218,7 +180,7 @@ mkdir xcode_build && cd xcode_build
 cmake .. -GXcode
 ```

-Use Finder to navigate to your stk-code/xcode_build folder and open the newly generated Xcode project (`SuperTuxKart.xcodeproj`).
+Use Finder to navigate to your stk-code/xcode_build folder and open the newly generated Xcode project (SuperTuxKart.xcodeproj).

 You can then build the project in Xcode using Product -> Build

--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -2,8 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="org.supertuxkart.stk"
          android:versionCode="1"
-          android:versionName="1.0"
-          android:installLocation="auto">
+          android:versionName="1.0">

    <!-- This .apk has no Java code itself, so set hasCode to false. -->
    <application android:label="@string/app_name"
@@ -14,7 +13,7 @@

        <activity android:name="android.app.NativeActivity"
                  android:label="@string/app_name"
-                  android:configChanges="fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|uiMode"
+                  android:configChanges="keyboardHidden|orientation"
                  android:screenOrientation="sensorLandscape">

            <!-- Tell NativeActivity the name of or .so -->
--- a/android/README.ANDROID
+++ b/android/README.ANDROID
@@ -31,8 +31,7 @@ after some tweaks, but atm. only linux is supported.

 Dependencies list (may be incomplete):

-    autoconf, automake, make, python, gradle, ant, imagemagick, cmake, 
-    vorbis-tools
+    autoconf, automake, make, python, ant, imagemagick, cmake, vorbis-tools

 Additionally some dependencies for optimize_data script:

@@ -44,13 +43,13 @@ and extract it to stk-code/lib. It contains sources of libraries that are used
 in STK, but are not availiable in stk-code repository (curl, freetype, openal).

 You need also Android SDK for android-19 platform (the API for Android 4.4) and
-Android NDK. Note that NDK >= r15b is atm. not supported. Version r12b is
-strongly recommended, because it's known that it works without issues.
+Android NDK (versions r12b and r13b have been tested).

 You need to create proper "android-sdk" and "android-ndk" symlinks in the
 directory with Android project, so that the compilation script will have access
-to the SDK and NDK. These paths can be also set in SDK_PATH and NDK_PATH 
-environmental variables.
+to the SDK and NDK.
+
+These paths can be also set in SDK_PATH and NDK_PATH environmental variables.

 Before running the compilation, run the generate_assets script, so that
 selected assets will be copied to "assets" directory, and then included in the
@@ -75,14 +74,6 @@ You can choose build type by setting BUILD_TYPE environment variable to "debug"
 or "release". The default is debug build. Note that if you choose release build,
 you have to manually sign the apk with your key and run zipalign.

-Additionally you can choose the build tool by setting BUILD_TOOL environment
-variable to "gradle" or "ant". Note that ant has been already removed from
-Android SDK, so you have to use SDK <= 25.2.5 for building with ant. By default 
-the BUILD_TOOL is set to "gradle".
-
-You can override the SDK build-tools version by setting the BUILD_TOOLS_VER
-environment variable.
-
 Basically if all dependencies are installed in the system, it should be enough
 to just run:

@@ -167,14 +158,18 @@ and then:
    It seems to affect only Android 5.0. More information about the crash:
    https://code.google.com/p/android/issues/detail?id=160824

-4.  STK crashes on startup on some devices when aarch64 build is made using
+4.  STK crashes on Qualcomm with Adreno 305 when trying to draw menu interface.
+    Backtrace shows glDrawElements function, and internally crashed in vbo
+    allocation.
+
+5.  STK crashes on startup on some devices when aarch64 build is made using
    Android r13 NDK. The r13 version has rather big modifications (it uses clang
    instead of gcc by default). This is probably a bug in NDK/compiler/OS, but
    for this reason using NDK r12 for 64-bit arm compilation is preferred.

-5.  Angelscript doesn't have full support for aarch64 builds, so that scripting
+6.  Angelscript doesn't have full support for aarch64 builds, so that scripting
    won't work on this platform.
    
-6.  Turning left/right using accelerometer is available, but at this stage the
+7.  Turning left/right using accelerometer is available, but at this stage the
    default screen orientation is not automatically detected and user must 
    manually choose if he needs "phone" or "tablet" accelerometer.
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,31 +0,0 @@
-buildscript
-{
-    repositories
-    {
-        jcenter()
-    }
-
-    dependencies
-    {
-        classpath 'com.android.tools.build:gradle:2.2.3'
-    }
-}
-
-apply plugin: 'com.android.application'
-
-android
-{
-    compileSdkVersion sdk_version.toInteger()
-    buildToolsVersion build_tools_ver
-
-    sourceSets
-    {
-        main
-        {
-            manifest.srcFile 'AndroidManifest.xml'
-            jniLibs.srcDirs = ['libs']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-        }
-    }
-}
--- a/android/generate_assets.sh
+++ b/android/generate_assets.sh
@@ -5,26 +5,22 @@
 # A script that generates data files for Android apk


-# Below you can find some simple configuration variables.
+# Below are simple configuration variables
 # It's allowed to set "all" for KARTS and TRACKS if it's intended to create
 # package with full data.
 # The karts and tracks directories shouldn't exist in ASSETS_DIRS variable
-# because they are handled separately.
+# because they are handled separately
 # The TEXTURE_SIZE and SOUND_QUALITY take effect only if DECREASE_QUALITY has
-# value greater than 0.
-# The CONVERT_TO_JPG variable enables converting all images that are safe to 
-# convert and keeps other images untouched.
+# value greater than 0
 # The script needs imagemagick and ogg utils installed to use DECREASE_QUALITY
 # feature

 ################################################################################

-export KARTS="all"
-export TRACKS="abyss battleisland cave cornfield_crossing endcutscene        \
-               featunlocked fortmagma gplose gpwin hacienda icy_soccer_field \
-               introcutscene introcutscene2 lighthouse mines olivermath      \
-               overworld sandtrack scotland snowmountain snowtuxpeak         \
-               soccer_field stadium tutorial zengarden"
+export KARTS="tux nolok xue"
+export TRACKS="battleisland cornfield_crossing featunlocked gplose gpwin   \
+               hacienda introcutscene introcutscene2 lighthouse olivermath \
+               overworld snowmountain snowtuxpeak soccer_field tutorial"

 export ASSETS_PATHS="../data                    \
                     ../../stk-assets           \
@@ -33,19 +29,12 @@ export ASSETS_PATHS="../data                    \
 export ASSETS_DIRS="library models music sfx textures"

 export TEXTURE_SIZE=256
-export JPEG_QUALITY=85
-export PNG_QUALITY=95
 export SOUND_QUALITY=42
 export SOUND_MONO=1
 export SOUND_SAMPLE=32000

 export RUN_OPTIMIZE_SCRIPT=0
 export DECREASE_QUALITY=1
-export CONVERT_TO_JPG=1
-
-export CONVERT_TO_JPG_BLACKLIST="data/karts/hexley/hexley_kart_diffuse.png"
-
-export BLACKLIST_FILES="data/music/cocoa_river_fast.ogg2"

 ################################################################################

@@ -55,21 +44,21 @@ cd "`dirname "$0"`"

 # Find assets path
 for ASSETS_PATH in $ASSETS_PATHS; do
-    if [ -d $ASSETS_PATH ] && [ `ls $ASSETS_PATH | grep -c tracks` -gt 0 ]; then
-        echo "Assets found in $ASSETS_PATH"
-        ASSETS_PATH_FOUND=1
-        break
-    fi
+   if [ -d $ASSETS_PATH ] && [ `ls $ASSETS_PATH | grep -c tracks` -gt 0 ]; then
+      echo "Assets found in $ASSETS_PATH"
+      ASSETS_PATH_FOUND=1
+      break
+   fi
 done

 if [ -z $ASSETS_PATH_FOUND ]; then
-    echo "Couldn't find assets path"
-    exit 1
+   echo "Couldn't find assets path"
+   exit 1
 fi

 if [ ! -d "../data" ]; then
-    echo "Couldn't find data directory"
-    exit 1
+   echo "Couldn't find data directory"
+   exit 1
 fi


@@ -84,27 +73,27 @@ echo "Copy all assets"
 mkdir -p assets/data

 for DIR in `ls $ASSETS_PATH`; do
-    CAN_BE_COPIED=0
+   CAN_BE_COPIED=0

-    for ASSETS_DIR in $ASSETS_DIRS; do
-        if [ $DIR = $ASSETS_DIR ]; then
-            CAN_BE_COPIED=1
-            break
-        fi
-    done;
+   for ASSETS_DIR in $ASSETS_DIRS; do
+      if [ $DIR = $ASSETS_DIR ]; then
+         CAN_BE_COPIED=1
+         break
+      fi
+   done;

-    # Don't copy karts and tracks. It will be handled later
-    BLACKLIST_ASSETS="karts tracks"
-    for ASSETS_DIR in $BLACKLIST_ASSETS; do
-        if [ $DIR = $ASSETS_DIR ]; then
-            CAN_BE_COPIED=0
-            break
-        fi
-    done;
+   # Don't copy karts and tracks. It will be handled later
+   BLACKLIST_ASSETS="karts tracks"
+   for ASSETS_DIR in $BLACKLIST_ASSETS; do
+      if [ $DIR = $ASSETS_DIR ]; then
+         CAN_BE_COPIED=0
+         break
+      fi
+   done;

-    if [ $CAN_BE_COPIED -gt 0 ]; then
-        cp -a "$ASSETS_PATH/$DIR" assets/data/
-    fi
+   if [ $CAN_BE_COPIED -gt 0 ]; then
+      cp -a "$ASSETS_PATH/$DIR" assets/data/
+   fi
 done;


@@ -114,22 +103,22 @@ echo "Copy selected tracks"
 mkdir -p assets/data/tracks

 for DIR in `ls $ASSETS_PATH/tracks`; do
-    CAN_BE_COPIED=0
+   CAN_BE_COPIED=0

-    if [ "$TRACKS" != "all" ]; then
-        for TRACK in $TRACKS; do
-            if [ $DIR = $TRACK ]; then
-                CAN_BE_COPIED=1
-                break
-            fi
-        done;
-    else
-        CAN_BE_COPIED=1
-    fi
+   if [ "$TRACKS" != "all" ]; then
+      for TRACK in $TRACKS; do
+         if [ $DIR = $TRACK ]; then
+            CAN_BE_COPIED=1
+            break
+         fi
+      done;
+   else
+      CAN_BE_COPIED=1
+   fi

-    if [ $CAN_BE_COPIED -gt 0 ]; then
-        cp -a "$ASSETS_PATH/tracks/$DIR" assets/data/tracks/
-    fi
+   if [ $CAN_BE_COPIED -gt 0 ]; then
+      cp -a "$ASSETS_PATH/tracks/$DIR" assets/data/tracks/
+   fi
 done


@@ -139,22 +128,22 @@ echo "Copy selected karts"
 mkdir -p assets/data/karts

 for DIR in `ls $ASSETS_PATH/karts`; do
-    CAN_BE_COPIED=0
+   CAN_BE_COPIED=0

-    if [ "$KARTS" != "all" ]; then
-        for KART in $KARTS; do
-            if [ $DIR = $KART ]; then
-                CAN_BE_COPIED=1
-                break
-            fi
-        done;
-    else
-        CAN_BE_COPIED=1
-    fi
+   if [ "$KARTS" != "all" ]; then
+      for KART in $KARTS; do
+         if [ $DIR = $KART ]; then
+            CAN_BE_COPIED=1
+            break
+         fi
+      done;
+   else
+      CAN_BE_COPIED=1
+   fi

-    if [ $CAN_BE_COPIED -gt 0 ]; then
-        cp -a "$ASSETS_PATH/karts/$DIR" assets/data/karts/
-    fi
+   if [ $CAN_BE_COPIED -gt 0 ]; then
+      cp -a "$ASSETS_PATH/karts/$DIR" assets/data/karts/
+   fi
 done


@@ -163,405 +152,82 @@ echo "Decrease assets quality"

 convert_image()
 {
-    FILE="$1"
-    FILE_TYPE="$2"
-    echo "Convert file: $FILE"
+   if [ -z "$1" ]; then
+      echo "No file to convert"
+      return
+   fi

-    if [ ! -f "$FILE" ]; then
-        echo "  File doesn't exist."
-        return
-    fi
+   FILE="$1"

-    W=`identify -format "%[fx:w]" "$FILE"`
-    H=`identify -format "%[fx:h]" "$FILE"`
+   W=`identify -format "%[fx:w]" "$FILE"`
+   H=`identify -format "%[fx:h]" "$FILE"`

-    if [ -z $W ] || [ -z $H ]; then
-        echo "Couldn't convert $FILE file"
-        return
-    fi
+   if [ -z $W ] || [ -z $H ]; then
+      echo "Couldn't convert $FILE file"
+      return
+   fi

-    if [ $W -gt $TEXTURE_SIZE ] || [ $H -gt $TEXTURE_SIZE ]; then
-        if [ $W -gt $H ]; then
-            SCALED_W=$TEXTURE_SIZE
-            SCALED_H=$(($TEXTURE_SIZE * $H / $W))
-        else
-            SCALED_W=$(($TEXTURE_SIZE * $W / $H))
-            SCALED_H=$TEXTURE_SIZE
-        fi
+   if [ $W -le $TEXTURE_SIZE ] && [ $H -le $TEXTURE_SIZE ]; then
+      return
+   fi

-        SCALE_CMD="-scale ${SCALED_W}x${SCALED_H}"
-    fi
+   if [ $W -gt $H ]; then
+      SCALED_W=$TEXTURE_SIZE
+      SCALED_H=$(($TEXTURE_SIZE * $H / $W))
+   else
+      SCALED_W=$(($TEXTURE_SIZE * $W / $H))
+      SCALED_H=$TEXTURE_SIZE
+   fi

-    if [ "$FILE_TYPE" = "jpg" ]; then
-        QUALITY_CMD="-quality $JPEG_QUALITY"
-    elif [ "$FILE_TYPE" = "png" ]; then
-        QUALITY_CMD="-quality $PNG_QUALITY"
-    fi
-
-    convert $SCALE_CMD $QUALITY_CMD "$FILE" "tmp.$FILE_TYPE"
-
-    if [ -s "tmp.$FILE_TYPE" ]; then
-        SIZE_OLD=`du -k "$FILE" | cut -f1`
-        SIZE_NEW=`du -k "tmp.$FILE_TYPE" | cut -f1`
-
-        if [ $SIZE_NEW -lt $SIZE_OLD ]; then
-            mv "tmp.$FILE_TYPE" "$FILE"
-        fi
-    fi
-
-    rm -f "tmp.$FILE_TYPE"
+   convert -scale $SCALED_WE\x$SCALED_H "$FILE" "$FILE"
 }

 convert_sound()
 {
-    FILE="$1"
-    echo "Convert file: $FILE"
+   if [ -z "$1" ]; then
+      echo "No file to convert"
+      return
+   fi

-    if [ ! -f "$FILE" ]; then
-        echo "  File doesn't exist."
-        return
-    fi
+   FILE="$1"

-    oggdec "$FILE" -o tmp.wav
+   oggdec "$FILE" -o tmp.wav

-    if [ -s tmp.wav ]; then
-        OGGENC_CMD=""
-
-        if [ "$SOUND_MONO" -gt 0 ]; then
-            OGGENC_CMD="$OGGENC_CMD --downmix"
-        fi
-
-        OGG_RATE=`ogginfo "$FILE" | grep "Rate: " | cut -f 2 -d " " \
-                                                             | grep -o '[0-9]*'`
-
-        if [ ! -z "$OGG_RATE" ] && [ "$OGG_RATE" -gt "$SOUND_SAMPLE" ]; then
-            OGGENC_CMD="$OGGENC_CMD --resample $SOUND_SAMPLE"
-        fi
-
-        OGGENC_CMD="$OGGENC_CMD -b $SOUND_QUALITY"
-
-        oggenc $OGGENC_CMD tmp.wav -o tmp.ogg
-    fi
-
-    if [ -s tmp.ogg ]; then
-        SIZE_OLD=`du -k "$FILE" | cut -f1`
-        SIZE_NEW=`du -k "tmp.ogg" | cut -f1`
-
-        if [ $SIZE_NEW -lt $SIZE_OLD ]; then
-            mv tmp.ogg "$FILE"
-        fi
-    fi
-
-    rm -f tmp.wav tmp.ogg
-}
-
-convert_to_jpg()
-{
-    FILE="$1"
-    echo "Convert file: $FILE"
-
-    if [ ! -f "$FILE" ]; then
-        echo "  File doesn't exist."
-        return
-    fi
-
-    ALREADY_CONVERTED=0
-
-    if [ -s "./converted_textures" ]; then
-        while read -r CONVERTED_TEXTURE; do
-            if [ "$FILE" = "$CONVERTED_TEXTURE" ]; then
-                ALREADY_CONVERTED=1
-                break
-            fi
-        done < "./converted_textures"
-    fi
-
-    if [ $ALREADY_CONVERTED -eq 1 ]; then
-        return
-    fi
-    
-    BLACKLISTED=0
-    
-    for BLACKLIST_FILE in $CONVERT_TO_JPG_BLACKLIST; do
-        if [ "$FILE" = "assets/$BLACKLIST_FILE" ]; then
-            BLACKLISTED=1
-            break
-        fi
-    done
-    
-    if [ $BLACKLISTED -eq 1 ]; then
-        #echo "  File is blacklisted. Ignore..."
-        continue
-    fi
-
-    FILE_EXTENSION=`echo "$FILE" | tail -c 5`
-
-    if [ `echo "$FILE_EXTENSION" | head -c 1` != "." ]; then
-        #echo "  Unsupported file extension. Ignore..."
-        continue
-    fi
-
-    FILE_FORMAT=`identify -format %m "$FILE"`
-
-    if [ "$FILE_FORMAT" = "JPEG" ]; then
-        #echo "  File is already JPEG. Ignore..."
-        continue
-    fi
-
-    IS_OPAQUE=`identify -format '%[opaque]' "$FILE"`
-    #HAS_ALPHA=`identify -format '%A' "$FILE"`
-
-    if [ "$IS_OPAQUE" = "False" ] || [ "$IS_OPAQUE" = "false" ]; then
-        #echo "  File has alpha channel. Ignore..."
-        continue
-    fi
-
-    DIRNAME="`dirname "$FILE"`"
-    BASENAME="`basename "$FILE"`"     
-    IS_GLOSS_MAP=`find "$DIRNAME" -iname "*.xml" -exec cat {} \; \
-                                            | grep -c "gloss-map=\"$BASENAME\""`
-    
-    if [ $IS_GLOSS_MAP -gt 0 ]; then
-        #echo "  File is a gloss-map. Ignore..."
-        continue
-    fi
-
-    NEW_FILE="`echo $FILE | head -c -5`.jpg"
-
-    if [ -f "$NEW_FILE" ]; then
-        #echo "  There is already a file with .jpg extension. Ignore..."
-        continue
-    fi
-
-    # We can check if new file is smaller
-    convert -quality $JPEG_QUALITY "$FILE" "$NEW_FILE"
-    rm -f "$FILE"
-
-    echo "$FILE" >> "./converted_textures"
-}
-
-convert_to_jpg_extract_b3dz()
-{
-    FILE="$1"
-    echo "Convert file: $FILE"
-
-    if [ ! -f "$FILE" ]; then
-        echo "  File doesn't exist."
-        return
-    fi
-
-    DIRNAME="`dirname "$FILE"`"
-
-    unzip "$FILE" -d "$DIRNAME"
-    rm -f "$FILE"
-
-    TEXNAME="`basename "$FILE"`"
-    NEWNAME="`echo $TEXNAME | head -c -6`.b3d"
-
-    sed -i "s/\"$TEXNAME\"/\"$NEWNAME\"/g" "$DIRNAME/kart.xml"
-}
-
-convert_to_jpg_update_b3d()
-{
-    FILE="$1"
-    echo "Convert file: $FILE"
-
-    if [ ! -f "$1" ]; then
-        echo "  File doesn't exist."
-        return
-    fi
-
-    HEX_FILE=`hexdump -ve '1/1 "%.2x"' "$FILE"`
-
-    TEXS_CHUNK="54455853"
-    TEXS_CHUNK_POS=24
-
-    FOUND_CHUNK=`echo $HEX_FILE | head -c $(($TEXS_CHUNK_POS + 8)) \
-                                            | tail -c +$(($TEXS_CHUNK_POS + 1))`
-
-    if [ -z "$FOUND_CHUNK" ] || [ "$FOUND_CHUNK" != "$TEXS_CHUNK" ]; then
-        echo "  File has no textures."
-        return
-    fi
-
-    TEXS_SIZE=`echo $HEX_FILE | head -c $(($TEXS_CHUNK_POS + 16)) | tail -c 8`
-
-    TEXS_SIZE_CONVERTED=`echo $TEXS_SIZE | cut -c7-8`
-    TEXS_SIZE_CONVERTED=$TEXS_SIZE_CONVERTED`echo $TEXS_SIZE | cut -c5-6`
-    TEXS_SIZE_CONVERTED=$TEXS_SIZE_CONVERTED`echo $TEXS_SIZE | cut -c3-4`
-    TEXS_SIZE_CONVERTED=$TEXS_SIZE_CONVERTED`echo $TEXS_SIZE | cut -c1-2`
-    TEXS_SIZE_CONVERTED=`echo $((0x$TEXS_SIZE_CONVERTED))`
-
-    if [ $TEXS_SIZE_CONVERTED -le 0 ]; then
-        echo "  Invalid TEXS size value."
-        return
-    fi
-
-    TEXS_BEGIN=$(($TEXS_CHUNK_POS + 16))
-    TEXS_END=$(($TEXS_BEGIN + $TEXS_SIZE_CONVERTED * 2))
-    HEX_TEXS=`echo $HEX_FILE | head -c $TEXS_END | tail -c +$(($TEXS_BEGIN+1))`
-    CURR_POS=0
-
-    while [ $CURR_POS -lt $TEXS_END ]; do
-        NULL_POS=`echo $HEX_TEXS | tail -c +$(($CURR_POS+1)) | grep -b -o "00" \
-                                                    | head -n 1 | cut -f1 -d":"`
-
-        if [ -z $NULL_POS ]; then
-            #echo "  Done."
-            break
-        fi
-
-        if [ $NULL_POS -lt 4 ]; then
-            echo "  Something went wrong..."
-            break
-        fi
-
-        TEXNAME_BEGIN=$((($TEXS_BEGIN + $CURR_POS) / 2))
-        TEXNAME_END=$((($TEXS_BEGIN + $CURR_POS + $NULL_POS) / 2))
-        CURR_POS=$(($CURR_POS + $NULL_POS + 58))
-
-        TEXTURE_NAME=`dd if="$FILE" bs=1 skip=$TEXNAME_BEGIN \
-                          count=$(($TEXNAME_END - $TEXNAME_BEGIN)) 2> /dev/null`
-        DIRNAME="`dirname "$FILE"`"
-        TEXTURE_PATH="$DIRNAME/$TEXTURE_NAME"
-
-        IS_CONVERTED=0
-
-        while read -r CONVERTED_TEXTURE; do
-            if [ "$TEXTURE_PATH" = "$CONVERTED_TEXTURE" ]; then
-                IS_CONVERTED=1
-                break
-            fi
-        done < "./converted_textures"
-
-        if [ $IS_CONVERTED -eq 1 ]; then
-            echo -n ".jpg" | dd of="$FILE" bs=1 seek=$(($TEXNAME_END - 4)) \
-                                                       conv=notrunc 2> /dev/null
-        fi;
-    done
-}
-
-convert_to_jpg_update_spm()
-{
-    FILE="$1"
-    echo "Convert file: $FILE"
-
-    if [ ! -f "$1" ]; then
-        echo "  File doesn't exist."
-        return
-    fi
-
-    HEX_FILE=`hexdump -ve '1/1 "%.2x"' "$FILE"`
-
-    SP_HEADER="5350"
-    SP_FOUND=`echo $HEX_FILE | head -c 4`
-
-    if [ -z "$SP_FOUND" ] || [ "$SP_FOUND" != "$SP_HEADER" ]; then
-        echo "  Unsupported format."
-        return
-    fi
-
-    TEXS_BEGIN=60
-    TEXS_COUNT=`echo $HEX_FILE | head -c $TEXS_BEGIN | tail -c 4`
-
-    TEXS_COUNT_CONVERTED=`echo $TEXS_COUNT | cut -c3-4`
-    TEXS_COUNT_CONVERTED=$TEXS_COUNT_CONVERTED`echo $TEXS_COUNT | cut -c1-2`
-    TEXS_COUNT_CONVERTED=`echo $((0x$TEXS_COUNT_CONVERTED))`
-    TEXS_COUNT_CONVERTED=$(($TEXS_COUNT_CONVERTED * 2))
-
-    if [ $TEXS_COUNT_CONVERTED -le 0 ]; then
-        echo "  Invalid textures count value."
-        return
-    fi
-
-    CURR_POS=$(($TEXS_BEGIN + 2))
-
-    while [ $TEXS_COUNT_CONVERTED -gt 0 ]; do
-        TEXS_COUNT_CONVERTED=$(($TEXS_COUNT_CONVERTED - 1))
-
-        TEX_LEN=`echo $HEX_FILE | head -c $(($CURR_POS)) | tail -c 2`
-        TEX_LEN=`echo $((0x$TEX_LEN))`
-
-        TEXNAME_BEGIN=$(($CURR_POS / 2))
-        TEXNAME_END=$(($CURR_POS / 2 + $TEX_LEN))
-        CURR_POS=$(($CURR_POS + 2 + $TEX_LEN * 2))
-
-        if [ $TEX_LEN -eq 0 ]; then
-            #echo "  Empty texture name, ignore..."
-            continue
-        fi
-
-        TEXTURE_NAME=`dd if="$FILE" bs=1 skip=$TEXNAME_BEGIN \
-                          count=$(($TEXNAME_END - $TEXNAME_BEGIN)) 2> /dev/null`
+   if [ -s tmp.wav ]; then
+      OGGENC_CMD=""
      
-        DIRNAME="`dirname "$FILE"`"
-        TEXTURE_PATH="$DIRNAME/$TEXTURE_NAME"
+      if [ "$SOUND_MONO" -gt 0 ]; then
+         OGGENC_CMD="$OGGENC_CMD --downmix"
+      fi
+      
+      OGG_RATE=`ogginfo "$FILE" | grep "Rate: " | cut -f 2 -d " " \
+                                                            | grep -o '[0-9]*'`
+      
+      if [ ! -z "$OGG_RATE" ] && [ "$OGG_RATE" -gt "32000" ]; then
+         OGGENC_CMD="$OGGENC_CMD --resample 32000"
+      fi
+      
+      OGGENC_CMD="$OGGENC_CMD -b $SOUND_QUALITY"
+      
+      oggenc $OGGENC_CMD tmp.wav -o tmp.ogg
+   fi

-        IS_CONVERTED=0
+   if [ -s tmp.ogg ]; then
+      SIZE_OLD=`du -k "$FILE" | cut -f1`
+      SIZE_NEW=`du -k "tmp.ogg" | cut -f1`

-        while read -r CONVERTED_TEXTURE; do
-            if [ "$TEXTURE_PATH" = "$CONVERTED_TEXTURE" ]; then
-                IS_CONVERTED=1
-                break
-            fi
-        done < "./converted_textures"
+      if [ $SIZE_NEW -lt $SIZE_OLD ]; then
+         mv tmp.ogg "$FILE"
+      fi
+   fi

-        if [ $IS_CONVERTED -eq 1 ]; then
-            echo -n ".jpg" | dd of="$FILE" bs=1 seek=$(($TEXNAME_END - 4)) \
-                                                       conv=notrunc 2> /dev/null
-        fi
-    done
+   rm -f tmp.wav tmp.ogg
 }

-convert_to_jpg_update_xml()
-{
-    FILE="$1"
-    echo "Convert file: $FILE"
-
-    if [ ! -f "$FILE" ]; then
-        echo "  File doesn't exist."
-        return
-    fi
-
-    DIRNAME="`dirname "$FILE"`"
-
-    while read -r CONVERTED_TEXTURE; do
-        DIRNAME_TEX="`dirname "$CONVERTED_TEXTURE"`"
-
-        if [ "$DIRNAME_TEX" != "$DIRNAME" ]; then
-            continue;
-        fi
-
-        TEXNAME="`basename "$CONVERTED_TEXTURE" | head -c -5`"
-
-        sed -i "s/\"$TEXNAME.[pP][nN][gG]/\"$TEXNAME.jpg/g" "$FILE"
-        sed -i "s/ $TEXNAME.[pP][nN][gG]/ $TEXNAME.jpg/g" "$FILE"
-    done < "./converted_textures"
-}
-
-
 if [ $DECREASE_QUALITY -gt 0 ]; then
-    find assets/data -iname "*.png" | while read f; do convert_image "$f" "png"; done
-    find assets/data -iname "*.jpg" | while read f; do convert_image "$f" "jpg"; done
-    find assets/data -iname "*.ogg" | while read f; do convert_sound "$f"; done
-fi
-
-
-if [ $CONVERT_TO_JPG -gt 0 ]; then
-    rm -f "./converted_textures"
-    
-    find assets/data -not -path "assets/data/textures/*" -iname "*.png" | while read f; do convert_to_jpg "$f"; done
-
-    find assets/data -iname "*.b3dz" | while read f; do convert_to_jpg_extract_b3dz "$f"; done
-    find assets/data -iname "*.b3d" | while read f; do convert_to_jpg_update_b3d "$f"; done
-    find assets/data -iname "*.spm" | while read f; do convert_to_jpg_update_spm "$f"; done
-    find assets/data -iname "*.xml" | while read f; do convert_to_jpg_update_xml "$f"; done
-
-    if [ -s "./converted_textures" ]; then
-        echo "Converted textures:"
-        cat "./converted_textures"
-        rm -f "./converted_textures"
-    fi
+   find assets/data -iname "*.png" | while read f; do convert_image "$f"; done
+   find assets/data -iname "*.jpg" | while read f; do convert_image "$f"; done
+   find assets/data -iname "*.ogg" | while read f; do convert_sound "$f"; done
 fi


@@ -570,16 +236,10 @@ echo "Copy data directory"
 cp -a ../data/* assets/data/


-# Remove unused files
-for BLACKLIST_FILE in $BLACKLIST_FILES; do
-    rm -f "assets/$BLACKLIST_FILE"
-done
-
-
 # Run optimize_data.sh script
 if [ $RUN_OPTIMIZE_SCRIPT -gt 0 ]; then
-    echo "Run optimize_data.sh script"
-    sh -c 'cd assets/data; ../../../data/optimize_data.sh'
+   echo "Run optimize_data.sh script"
+   sh -c 'cd assets/data; ../../../data/optimize_data.sh'
 fi


--- a/android/make.sh
+++ b/android/make.sh
@@ -22,19 +22,16 @@ export NDK_ABI_ARMV7=armeabi-v7a
 export ARCH_ARMV7=arm
 export HOST_ARMV7=arm-linux-androideabi
 export NDK_PLATFORM_ARMV7=android-19
-export SDK_VERSION_ARMV7=19

 export NDK_ABI_X86=x86
 export ARCH_X86=x86
 export HOST_X86=i686-linux-android
 export NDK_PLATFORM_X86=android-19
-export SDK_VERSION_X86=19

 export NDK_ABI_AARCH64=arm64-v8a
 export ARCH_AARCH64=arm64
 export HOST_AARCH64=aarch64-linux-android
 export NDK_PLATFORM_AARCH64=android-21
-export SDK_VERSION_AARCH64=21


 # A helper function that checks if error ocurred
@@ -49,10 +46,8 @@ check_error()
 # Handle clean command
 if [ ! -z "$1" ] && [ "$1" = "clean" ]; then
    rm -rf bin
-    rm -rf build
    rm -rf libs
    rm -rf obj
-    rm -rf .gradle
    exit
 fi

@@ -80,19 +75,16 @@ if [ "$COMPILE_ARCH" = "armv7" ]; then
    export NDK_ABI=$NDK_ABI_ARMV7
    export ARCH=$ARCH_ARMV7
    export HOST=$HOST_ARMV7
-    export SDK_VERSION=$SDK_VERSION_ARMV7
 elif [ "$COMPILE_ARCH" = "x86" ]; then
    export NDK_PLATFORM=$NDK_PLATFORM_X86
    export NDK_ABI=$NDK_ABI_X86
    export ARCH=$ARCH_X86
    export HOST=$HOST_X86
-    export SDK_VERSION=$SDK_VERSION_X86
 elif [ "$COMPILE_ARCH" = "aarch64" ]; then
    export NDK_PLATFORM=$NDK_PLATFORM_AARCH64
    export NDK_ABI=$NDK_ABI_AARCH64
    export ARCH=$ARCH_AARCH64
    export HOST=$HOST_AARCH64
-    export SDK_VERSION=$SDK_VERSION_AARCH64
 else
    echo "Unknow COMPILE_ARCH: $COMPILE_ARCH. Possible values are: " \
         "armv7, aarch64, x86"
@@ -105,12 +97,10 @@ if [ -z "$BUILD_TYPE" ]; then
 fi

 if [ "$BUILD_TYPE" = "debug" ] || [ "$BUILD_TYPE" = "Debug" ]; then
-    export ANT_BUILD_TYPE="debug"
-    export GRADLE_BUILD_TYPE="assembleDebug"
+    export BUILD_TYPE="debug"
    export IS_DEBUG_BUILD=1
 elif [ "$BUILD_TYPE" = "release" ] || [ "$BUILD_TYPE" = "Release" ]; then
-    export ANT_BUILD_TYPE="release"
-    export GRADLE_BUILD_TYPE="assembleRelease"
+    export BUILD_TYPE="release"
    export IS_DEBUG_BUILD=0
 else
    echo "Unsupported BUILD_TYPE: $BUILD_TYPE. Possible values are: " \
@@ -118,17 +108,6 @@ else
    exit
 fi

-# Check selected build tool
-if [ -z "$BUILD_TOOL" ]; then
-    BUILD_TOOL="gradle"
-fi
-
-if [ "$BUILD_TOOL" != "gradle" ] && [ "$BUILD_TOOL" != "ant" ]; then
-    echo "Unsupported BUILD_TOOL: $BUILD_TOOL. Possible values are: " \
-         "gradle, ant"
-    exit
-fi
-
 # Check if we have access to the Android NDK and SDK
 if [ -z "$NDK_PATH" ]; then
    export NDK_PATH="$NDK_PATH_DEFAULT"
@@ -155,24 +134,6 @@ if [ ! -d "$SDK_PATH" ]; then
    exit
 fi

-# Find newest build-tools version
-if [ -z "$BUILD_TOOLS_VER" ]; then
-    BUILD_TOOLS_DIRS=`ls -1 "$SDK_PATH/build-tools" | sort -V -r`
-   
-    for DIR in $BUILD_TOOLS_DIRS; do
-        if [ "$DIR" = `echo $DIR | sed 's/[^0-9,.]//g'` ]; then
-            BUILD_TOOLS_VER="$DIR"
-            break
-        fi
-    done
-fi
-
-if [ -z "$BUILD_TOOLS_VER" ] || [ ! -d "$SDK_PATH/build-tools/$BUILD_TOOLS_VER" ]; then
-    echo "Error: Couldn't detect build-tools version."
-    exit
-fi
-
-
 # Standalone toolchain
 if [ ! -f "$DIRNAME/obj/make_standalone_toolchain.stamp" ]; then
    echo "Creating standalone toolchain"
@@ -341,20 +302,5 @@ 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           \
-           -Pbuild_tools_ver="$BUILD_TOOLS_VER" \
-           $GRADLE_BUILD_TYPE
-elif [ "$BUILD_TOOL" = "ant" ]; then
-    ant -Dsdk.dir="$SDK_PATH"  \
-        -Dtarget=$NDK_PLATFORM \
-        $ANT_BUILD_TYPE
-fi
-
+ant $BUILD_TYPE -Dsdk.dir="$SDK_PATH" -Dtarget=$NDK_PLATFORM
 check_error
--- a/cmake/FindEGL.cmake
+++ b/cmake/FindEGL.cmake
@@ -1,18 +0,0 @@
-# - Find EGL
-# Find the EGL includes and libraries
-#
-# Following variables are provided:
-# EGL_FOUND
-#     True if EGL has been found
-# EGL_INCLUDE_DIR
-#     The include directory of EGL
-# EGL_LIBRARY
-#     EGL library list
-
-find_path(EGL_INCLUDE_DIR EGL/egl.h)
-find_library(EGL_LIBRARY NAMES EGL)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(EGL DEFAULT_MSG EGL_LIBRARY EGL_INCLUDE_DIR)
-
-mark_as_advanced(EGL_LIBRARY EGL_INCLUDE_DIR)
--- a/cmake/FindFreetype.cmake
+++ b/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_library(FREETYPE_LIBRARY NAMES freetype PATHS "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib")
+    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")
    set(FREETYPE_FOUND 1)
    set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
 elseif(APPLE)
--- a/cmake/FindFribidi.cmake
+++ b/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_library(FRIBIDI_LIBRARY NAMES fribidi PATHS /Library/Frameworks/fribidi.framework "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib")
+    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")

    include(FindPackageHandleStandardArgs)
    find_package_handle_standard_args(Fribidi DEFAULT_MSG FRIBIDI_INCLUDE_DIR FRIBIDI_LIBRARY)
--- a/cmake/FindOggVorbis.cmake
+++ b/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_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_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_VORBISENC_LIBRARY NAMES vorbisenc libvorbisenc PATHS "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib")
+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_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_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")

 if (APPLE)
    set(OGGVORBIS_OGG_INCLUDE_DIR "/Library/Frameworks/Ogg.framework/Headers/")
--- a/cmake/FindWayland.cmake
+++ b/cmake/FindWayland.cmake
@@ -1,52 +0,0 @@
-# - Find Wayland
-# Find the Wayland includes and libraries
-#
-# Following variables are provided:
-# WAYLAND_FOUND
-#     True if Wayland has been found
-# WAYLAND_INCLUDE_DIRS
-#     The include directories of Wayland
-# WAYLAND_LIBRARIES
-#     Wayland library list
-
-find_path(WAYLAND_CLIENT_INCLUDE_DIR wayland-client.h)
-find_path(WAYLAND_CURSOR_INCLUDE_DIR wayland-cursor.h)
-find_path(WAYLAND_EGL_INCLUDE_DIR wayland-egl.h)
-find_path(XKBCOMMON_INCLUDE_DIR xkbcommon/xkbcommon.h)
-
-find_library(WAYLAND_CLIENT_LIBRARY NAMES wayland-client)
-find_library(WAYLAND_CURSOR_LIBRARY NAMES wayland-cursor)
-find_library(WAYLAND_EGL_LIBRARY NAMES wayland-egl)
-find_library(XKBCOMMON_LIBRARY NAMES xkbcommon)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Wayland DEFAULT_MSG WAYLAND_CLIENT_LIBRARY 
-                                                      WAYLAND_CURSOR_LIBRARY
-                                                      WAYLAND_EGL_LIBRARY
-                                                      XKBCOMMON_LIBRARY
-                                                      WAYLAND_CLIENT_INCLUDE_DIR
-                                                      WAYLAND_CURSOR_INCLUDE_DIR
-                                                      WAYLAND_EGL_INCLUDE_DIR
-                                                      XKBCOMMON_INCLUDE_DIR)
-
-set(WAYLAND_INCLUDE_DIRS ${WAYLAND_CLIENT_INCLUDE_DIR} 
-                         ${WAYLAND_CURSOR_INCLUDE_DIR} 
-                         ${WAYLAND_EGL_INCLUDE_DIR} 
-                         ${XKBCOMMON_INCLUDE_DIR})
-
-set(WAYLAND_LIBRARIES ${WAYLAND_CLIENT_LIBRARY} 
-                      ${WAYLAND_CURSOR_LIBRARY} 
-                      ${WAYLAND_EGL_LIBRARY} 
-                      ${XKBCOMMON_LIBRARY})
-                      
-list(REMOVE_DUPLICATES WAYLAND_INCLUDE_DIRS)
-list(REMOVE_DUPLICATES WAYLAND_LIBRARIES)
-
-mark_as_advanced(WAYLAND_CLIENT_LIBRARY 
-                 WAYLAND_CURSOR_LIBRARY
-                 WAYLAND_EGL_LIBRARY
-                 XKBCOMMON_LIBRARY
-                 WAYLAND_CLIENT_INCLUDE_DIR
-                 WAYLAND_CURSOR_INCLUDE_DIR
-                 WAYLAND_EGL_INCLUDE_DIR
-                 XKBCOMMON_INCLUDE_DIR)
--- a/cmake/FindXrandr.cmake
+++ b/cmake/FindXrandr.cmake
@@ -0,0 +1,18 @@
+find_path(XRANDR_INCLUDE_DIR NAMES X11/extensions/Xrandr.h
+          PATH_SUFFIXES X11/extensions
+          DOC "The XRANDR include directory"
+)
+
+find_library(XRANDR_LIBRARY NAMES Xrandr
+          DOC "The XRANDR library"
+)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(XRANDR DEFAULT_MSG XRANDR_LIBRARY XRANDR_INCLUDE_DIR)
+
+if(XRANDR_FOUND)
+  set( XRANDR_LIBRARIES ${XRANDR_LIBRARY} )
+  set( XRANDR_INCLUDE_DIRS ${XRANDR_INCLUDE_DIR} )
+endif()
+
+mark_as_advanced(XRANDR_INCLUDE_DIR XRANDR_LIBRARY)
--- a/cmake/Toolchain-mingw-64bit.cmake
+++ b/cmake/Toolchain-mingw-64bit.cmake
@@ -9,11 +9,8 @@ SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc-posix)
 SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++-posix)
 SET(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)

-# figure out folder to look in
-execute_process(COMMAND sh -c "ls /usr/lib/gcc/x86_64-w64-mingw32/ | grep posix | tr -d '\n'" OUTPUT_VARIABLE MINGW_DEPS_FOLDER)
-
 # 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-64bit)
+SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32 /usr/lib/gcc/x86_64-w64-mingw32/4.9-posix ${PROJECT_SOURCE_DIR}/dependencies)

 # adjust the default behaviour of the FIND_XXX() commands:
 # search headers and libraries in the target environment, search
--- a/cmake/Toolchain-mingw.cmake
+++ b/cmake/Toolchain-mingw.cmake
@@ -9,11 +9,8 @@ SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc-posix)
 SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++-posix)
 SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres)

-# figure out folder to look in
-execute_process(COMMAND sh -c "ls /usr/lib/gcc/i686-w64-mingw32/ | grep posix | tr -d '\n'" OUTPUT_VARIABLE MINGW_DEPS_FOLDER)
-
 # here is the target environment located
-SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32 /usr/lib/gcc/i686-w64-mingw32/${MINGW_DEPS_FOLDER}/ ${PROJECT_SOURCE_DIR}/dependencies)
+SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32 /usr/lib/gcc/i686-w64-mingw32/4.9-posix ${PROJECT_SOURCE_DIR}/dependencies)

 # adjust the default behaviour of the FIND_XXX() commands:
 # search headers and libraries in the target environment, search
--- a/data/CREDITS
+++ b/data/CREDITS
@@ -1,6 +1,6 @@
 = SuperTuxKart =
 A Kart Racing Game Featuring Tux & Friends
- Version 0.9.3
+- Version git
 - Visit us at supertuxkart.net
 - SuperTuxKart is released under GPL 3.0
 - Assets are released under Creative Commons and other licenses
@@ -11,25 +11,13 @@ 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) =

@@ -60,6 +48,7 @@ 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
@@ -248,54 +237,6 @@ 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
--- a/data/SuperTuxKart-Info.plist
+++ b/data/SuperTuxKart-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.3</string>
+	<string>0.8.1</string>
 	<key>CFBundleSignature</key>
 	<string>SPTK</string>
 	<key>CFBundleVersion</key>
-	<string>0.9.3</string>
+	<string>0.8.1</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSMinimumSystemVersion</key>
--- a/data/achievements.xml
+++ b/data/achievements.xml
@@ -2,7 +2,7 @@
 <achievements>
  <achievement id="1" check-type="all-at-least" reset-type="never"
               name="Christoffel Columbus" description="Play every official track at least once." >
-      <candela_city goal="1"/>
+      <city goal="1"/>
      <cocoa_temple goal="1"/>
      <cornfield_crossing goal="1"/>
      <fortmagma goal="1"/>
@@ -22,7 +22,6 @@
      <abyss goal="1"/>
      <xr591 goal="1"/>
      <zengarden goal="1"/>      
-      <volcano_island goal="1"/>
  </achievement>
  <achievement id="2" check-type="all-at-least" reset-type="never"
               name="Strike!" description="Hit 10 karts with a bowling-ball.">
--- a/data/challenges/abyss.challenge
+++ b/data/challenges/abyss.challenge
@@ -10,7 +10,7 @@
    </hard>
    <medium>
        <karts number="4"/>
-        <requirements time="197"/>
+        <requirements time="185"/>
    </medium>
    <easy>
        <karts number="4"/>
--- a/data/challenges/city.challenge
+++ b/data/challenges/city.challenge
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <challenge version="2">
-    <track id="candela_city" laps="3"/>
+    <track id="city" laps="3"/>
    <mode major="single" minor="quickrace"/>
    <requirements trophies="70"/>
    
@@ -16,6 +16,4 @@
        <karts number="3"/>
        <requirements position="1"/>
    </easy>
-
-    <unlock kart="sara_the_wizard"/>
 </challenge>
--- a/data/challenges/hacienda.challenge
+++ b/data/challenges/hacienda.challenge
@@ -10,10 +10,10 @@
    </hard>
    <medium>
        <karts number="4"/>
-        <requirements time="187"/>
+        <requirements time="185"/>
    </medium>
    <easy>
        <karts number="4"/>
-        <requirements time="260"/>
+        <requirements time="220"/>
    </easy>
 </challenge>
--- a/data/gfx/black_smoke.xml
+++ b/data/gfx/black_smoke.xml
@@ -26,4 +26,7 @@
    <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>
--- a/data/gfx/confetti.xml
+++ b/data/gfx/confetti.xml
@@ -25,7 +25,11 @@
    
    <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      flips="Y"           />
+    <wind      speed="0.16"
+               flips="Y"           />

 </particles>
--- a/data/gfx/confetti_bleu.xml
+++ b/data/gfx/confetti_bleu.xml
@@ -25,7 +25,11 @@
    
    <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      flips="Y"           />
+    <wind      speed="0.16"
+               flips="Y"           />

 </particles>
--- a/data/gfx/droplet.xml
+++ b/data/gfx/droplet.xml
@@ -26,4 +26,7 @@
    <color     min="255 255 255"
               max="255 255 255" />

+    <fadeout   time="3000" />
+
+
 </particles>
--- a/data/gfx/explosion.xml
+++ b/data/gfx/explosion.xml
@@ -18,13 +18,16 @@
               max="1200"         />
    
    <!-- Size of the particles -->
-    <size      min="0.60"
-               max="0.85"
+    <size      min="0.65"
+               max="0.95"
               x-increase-factor="0.6"
               y-increase-factor="0.6"
               />
    
    <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>
--- a/data/gfx/explosion_bomb.xml
+++ b/data/gfx/explosion_bomb.xml
@@ -18,13 +18,16 @@
               max="1200"         />
    
    <!-- Size of the particles -->
-    <size      min="0.60"
-               max="0.85"
+    <size      min="0.65"
+               max="0.95"
               x-increase-factor="0.6"
               y-increase-factor="0.6"
               />
    
    <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>
--- a/data/gfx/explosion_cake.xml
+++ b/data/gfx/explosion_cake.xml
@@ -18,13 +18,16 @@
               max="1200"         />
    
    <!-- Size of the particles -->
-    <size      min="0.60"
-               max="0.85"
+    <size      min="0.65"
+               max="0.95"
               x-increase-factor="0.6"
               y-increase-factor="0.6"
               />
    
    <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>
--- a/data/gfx/explosion_low.xml
+++ b/data/gfx/explosion_low.xml
@@ -1,30 +0,0 @@
-<?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>
--- a/data/gfx/fire.xml
+++ b/data/gfx/fire.xml
@@ -18,10 +18,12 @@
               max="500"         />
    
    <!-- Size of the particles -->
-    <size      min="0.55"
-               max="0.75"        />
+    <size      min="0.6"
+               max="0.8"        />
    
    <color     min="255 255 255"
               max="255 255 255" />

+  <fadeout time="300" />
+
 </particles>
--- a/data/gfx/gfx_blueNebula_a.xml
+++ b/data/gfx/gfx_blueNebula_a.xml
@@ -26,4 +26,7 @@
    <color     min="0 0 0"
               max="255 255 255" />

+    <fadeout   time="5000" />
+
+
 </particles>
--- a/data/gfx/gfx_bubbleFast_a.xml
+++ b/data/gfx/gfx_bubbleFast_a.xml
@@ -26,4 +26,7 @@
    <color     min="0 0 0"
               max="255 255 255" />

+    <fadeout   time="2000" />
+
+
 </particles>
--- a/data/gfx/gfx_bubble_a.xml
+++ b/data/gfx/gfx_bubble_a.xml
@@ -26,4 +26,7 @@
    <color     min="0 0 0"
               max="255 255 255" />

+    <fadeout   time="5000" />
+
+
 </particles>
--- a/data/gfx/gfx_fallingLeaf_a.xml
+++ b/data/gfx/gfx_fallingLeaf_a.xml
@@ -25,7 +25,11 @@
    
    <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      flips="Y"           />
+    <wind      speed="0.16"
+               flips="Y"           />

 </particles>
--- a/data/gfx/gfx_fireworkExplosion_a.xml
+++ b/data/gfx/gfx_fireworkExplosion_a.xml
@@ -26,5 +26,8 @@
    
    <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>
--- a/data/gfx/gfx_fireworkGreen_a.xml
+++ b/data/gfx/gfx_fireworkGreen_a.xml
@@ -26,5 +26,8 @@
    
    <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>
--- a/data/gfx/gfx_fireworkSmoke_a.xml
+++ b/data/gfx/gfx_fireworkSmoke_a.xml
@@ -27,5 +27,9 @@
    
    <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>
--- a/data/gfx/gfx_firework_a.xml
+++ b/data/gfx/gfx_firework_a.xml
@@ -25,5 +25,11 @@
    
    <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>
--- a/data/gfx/gfx_jetBlastEarth_a.xml
+++ b/data/gfx/gfx_jetBlastEarth_a.xml
@@ -26,4 +26,7 @@
    <color     min="0 0 0"
               max="255 255 255" />

+    <fadeout   time="5000" />
+
+
 </particles>
--- a/data/gfx/gfx_jetBlastSand_a.xml
+++ b/data/gfx/gfx_jetBlastSand_a.xml
@@ -26,4 +26,7 @@
    <color     min="0 0 0"
               max="255 255 255" />

+    <fadeout   time="5000" />
+
+
 </particles>
--- a/data/gfx/gfx_mudPot_a.xml
+++ b/data/gfx/gfx_mudPot_a.xml
@@ -27,5 +27,9 @@
    
    <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>
--- a/data/gfx/gfx_sandExplosion_a.xml
+++ b/data/gfx/gfx_sandExplosion_a.xml
@@ -26,4 +26,7 @@
    <color     min="0 0 0"
               max="255 255 255" />

+    <fadeout   time="500" />
+
+
 </particles>
--- a/data/gfx/gfx_smallWaterFlow.xml
+++ b/data/gfx/gfx_smallWaterFlow.xml
@@ -26,4 +26,7 @@
    <color     min="255 255 255"
               max="255 255 255" />

+    <fadeout   time="3000" />
+
+
 </particles>
--- a/data/gfx/gfx_sparkBlue_a.xml
+++ b/data/gfx/gfx_sparkBlue_a.xml
@@ -18,7 +18,7 @@
    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
    <lifetime  min="1000"
               max="1500"          />    
-
+  
    <!-- Size of the particles -->
    <size min="0.08"
         max="0.15"
@@ -27,5 +27,11 @@
    
    <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>
--- a/data/gfx/gfx_sparkFire_a.xml
+++ b/data/gfx/gfx_sparkFire_a.xml
@@ -25,5 +25,11 @@
    
    <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>
--- a/data/gfx/jump_explosion.xml
+++ b/data/gfx/jump_explosion.xml
@@ -26,5 +26,8 @@
    
    <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>
--- a/data/gfx/kart_exhaust.xml
+++ b/data/gfx/kart_exhaust.xml
@@ -26,5 +26,8 @@
    
    <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>
--- a/data/gfx/nitro-smoke.xml
+++ b/data/gfx/nitro-smoke.xml
@@ -23,5 +23,8 @@
    
    <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>
--- a/data/gfx/nitro.xml
+++ b/data/gfx/nitro.xml
@@ -26,5 +26,8 @@
    
    <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>
--- a/data/gfx/rain-ground.xml
+++ b/data/gfx/rain-ground.xml
@@ -32,4 +32,9 @@
    <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>
--- a/data/gfx/rain.xml
+++ b/data/gfx/rain.xml
@@ -25,5 +25,9 @@
    
    <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>
--- a/data/gfx/skid1.xml
+++ b/data/gfx/skid1.xml
@@ -25,5 +25,8 @@
    
    <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>
--- a/data/gfx/skid2.xml
+++ b/data/gfx/skid2.xml
@@ -25,5 +25,8 @@
    
    <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>
--- a/data/gfx/smoke.xml
+++ b/data/gfx/smoke.xml
@@ -24,4 +24,7 @@
    <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>
--- a/data/gfx/smoke_brown.xml
+++ b/data/gfx/smoke_brown.xml
@@ -24,4 +24,7 @@
    <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>
--- a/data/gfx/smoke_red.xml
+++ b/data/gfx/smoke_red.xml
@@ -24,4 +24,7 @@
    <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>
--- a/data/gfx/smoke_short_burst.xml
+++ b/data/gfx/smoke_short_burst.xml
@@ -25,4 +25,7 @@
    <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>
--- a/data/gfx/smoke_yellow.xml
+++ b/data/gfx/smoke_yellow.xml
@@ -24,4 +24,7 @@
    <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>
--- a/data/gfx/snow.xml
+++ b/data/gfx/snow.xml
@@ -23,9 +23,13 @@
    <size      min="0.10"
               max="0.30"          />
    
-    <color     min="255 255 255"
+    <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      flips="Y"           />
+    <wind      speed="0.16"
+               flips="Y"           />

 </particles>
--- a/data/gfx/sparks.xml
+++ b/data/gfx/sparks.xml
@@ -25,4 +25,7 @@
    <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>
--- a/data/gfx/splash.xml
+++ b/data/gfx/splash.xml
@@ -25,4 +25,9 @@
    <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>
--- a/data/gfx/swampDriving.xml
+++ b/data/gfx/swampDriving.xml
@@ -25,4 +25,9 @@
    <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>
--- a/data/gfx/waterfall.xml
+++ b/data/gfx/waterfall.xml
@@ -26,4 +26,7 @@
    <color     min="255 255 255"
               max="255 255 255" />

+    <fadeout   time="5000" />
+
+
 </particles>
--- a/data/gfx/zipper_fire.xml
+++ b/data/gfx/zipper_fire.xml
@@ -24,5 +24,8 @@
    
    <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>
--- a/data/graphical_restrictions.xml
+++ b/data/graphical_restrictions.xml
@@ -3,16 +3,18 @@
  <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="FramebufferSRGB"/>
+  <card is="Intel(R) HD Graphics 2000" os="windows"                disable="AdvancedPipeline"/>
+  <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="FramebufferSRGB"/>
+  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="AdvancedPipeline"/>
+  <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="FramebufferSRGBWorkaround2"/>
+  <card contains="Intel"          os="linux"                       disable="FramebufferSRGBCapable"/>
  <card contains="Intel"          os="linux"    version="<11.2"    disable="TextureCompressionS3TC"/>
  <card contains="Intel"          os="windows"                     disable="TextureCompressionS3TC"/>
  <card contains="Intel"          os="osx"                         disable="TextureCompressionS3TC"/>
@@ -35,8 +37,5 @@
  <card contains="ATI"            os="windows"  version="<=3.1.8787" disable="ForceLegacyDevice"/>
  <card                           os="android"                     disable="TextureFormatBGRA8888"/>
  <card                           os="android"                     disable="ColorBufferFloat"/>
-  <card contains="Adreno"         os="android"  version="<=19"     disable="VertexIdWorking"/>
  <card contains="Android Emulator" os="android"                   disable="ForceLegacyDevice"/>
-  <card                           os="android"                     disable="UniformBufferObject"/>
-  <card vendor="Broadcom"         os="linux"                       disable="HighDefinitionTextures256"/>
 </graphical-restrictions>
--- a/data/gui/License.txt
+++ b/data/gui/License.txt
@@ -28,10 +28,6 @@ Gauge and bar by Totoplus62, released under CC-BY-SA 3

 menu_story by tavariz91, released under CC-0

-mass.png by Auria, released under CC-0
-
-power.png by Auria, based on https://openclipart.org/detail/193925/check-engine and https://openclipart.org/detail/144799/power-icon, released under CC-0
-
 ====

 Glass Skin by Auria, under CC-BY-SA 3+
--- a/data/gui/custom_video_settings.stkgui
+++ b/data/gui/custom_video_settings.stkgui
@@ -132,6 +132,16 @@

            <spacer height="4" width="10" />

+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="anim_gfx"/>
+                <spacer width="10" height="10"/>
+                <label text="Animated Scenery" I18N="Video settings"/>
+            </div>
+        </div>
+
+        <spacer height="4" width="10" />
+
+        <div layout="horizontal-row" width="100%" proportion="1">
            <div layout="horizontal-row" proportion="1" height="fit">
                <checkbox id="texture_compression"/>
                <spacer width="10" height="10"/>
@@ -141,14 +151,6 @@

        <spacer height="20" width="10" />

-        <div layout="horizontal-row" width="100%" proportion="1">
-            <label text="Animated Scenery" I18N="Video settings" width="40%"/>
-            <spacer width="10" height="10"/>
-            <gauge id="anim_gfx" min_value="0" max_value="2" width="50%" />
-        </div>
-
-        <spacer height="4" width="10" />
-
        <div layout="horizontal-row" width="100%" proportion="1">
            <label text="Animated Characters" I18N="Video settings" width="40%"/>
            <spacer width="10" height="10"/>
--- a/data/gui/help1.stkgui
+++ b/data/gui/help1.stkgui
@@ -20,7 +20,7 @@
        <box proportion="1" width="100%" layout="vertical-row">

            <spacer width="5" height="15"/>
-            <button id="startTutorial" text="Start the tutorial" align="center"/>
+            <button id="startTutorial" text="Click here to play the tutorial" align="center"/>
            <spacer width="5" height="15"/>

            <div width="100%" proportion="2" layout="horizontal-row">
--- a/data/gui/mass.png
+++ b/data/gui/mass.png
--- a/data/gui/multitouch_settings.stkgui
+++ b/data/gui/multitouch_settings.stkgui
@@ -15,14 +15,6 @@
            </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="Inverted buttons"/>
-            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
-                <spacer width="40" height="10" />
-                <checkbox id="buttons_inverted"/>
-            </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="Buttons scale"/>
            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
@@ -31,18 +23,36 @@
            </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="Accelerometer"/>
+            <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" />
-                <spinner id="accelerometer" proportion="1"/>
+                <checkbox id="accelerometer_disabled"/>
+            </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="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"/>
+            <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"/>
@@ -50,7 +60,7 @@
        </div>

        <div width="75%" layout="horizontal-row" proportion="1">
-            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Sensitivity"/>
+            <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"/>
--- a/data/gui/online/profile_achievements_tab.stkgui
+++ b/data/gui/online/profile_achievements_tab.stkgui
@@ -9,9 +9,7 @@
        <spacer height="25" width="10"/>

        <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <!--
            <icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png"/>
-            -->
            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"
                I18N="Section in the profile screen" text="Achievements"/>
            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png"/>
--- a/data/gui/online/profile_friends.stkgui
+++ b/data/gui/online/profile_friends.stkgui
@@ -9,7 +9,7 @@
        <spacer height="25" width="10"/>

        <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <!--<icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png"/>-->
+            <icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png"/>
            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png"
                I18N="Section in the profile screen" text="Friends"/>
--- a/data/gui/online/profile_settings.stkgui
+++ b/data/gui/online/profile_settings.stkgui
@@ -8,7 +8,7 @@
        <spacer height="25" width="10"/>

        <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <!--<icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png"/>-->
+            <icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png"/>
            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
            <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"
--- a/data/gui/power.png
+++ b/data/gui/power.png
--- a/data/gui/speed.png
+++ b/data/gui/speed.png
--- a/data/gui/user_screen.stkgui
+++ b/data/gui/user_screen.stkgui
@@ -14,6 +14,12 @@

            <spacer height="15" width="10"/>
            <div width="90%" align="center" layout="vertical-row" proportion="1">
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <checkbox width="fit" id="steam" I18N="In the user screen" text_align="left"/>
+                    <spacer width="10"/>
+                    <label proportion="1" id="label-steam" height="100%" text_align="left"
+                          I18N="In the user screen" text="Is a Steam account"/>
+                </div>
                <div width="100%" height="fit" layout="horizontal-row" >
                    <checkbox width="fit" id="online" I18N="In the user screen" text_align="left"/>
                    <spacer width="10"/>
--- a/data/gui/user_screen_tab.stkgui
+++ b/data/gui/user_screen_tab.stkgui
@@ -23,6 +23,12 @@

            <spacer height="15" width="10"/>
            <div width="90%" align="center" layout="vertical-row" height="fit">
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <checkbox width="fit" id="steam" I18N="In the user screen" text_align="left"/>
+                    <spacer width="10"/>
+                    <label proportion="1" id="label-steam" height="100%" text_align="left"
+                          I18N="In the user screen" text="Is a Steam account"/>
+                </div>
                <div width="100%" height="fit" layout="horizontal-row" >
                    <checkbox width="fit" id="online" I18N="In the user screen" text_align="left"/>
                    <spacer width="10"/>
--- a/data/items.xml
+++ b/data/items.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <items>
-  <bonus-box   model="gift-box.spm"        lowmodel="gift-box-low.spm"        glow="31 202 253"/>
-  <banana      model="banana.spm"          lowmodel="banana-low.spm"          glow="197 152 37"/>
-  <nitro-big   model="nitrotank-big.spm"   lowmodel="nitrotank-big-low.spm"   glow="0 70 158"/>
-  <nitro-small model="nitrotank-small.spm" lowmodel="nitrotank-small-low.spm" glow="0 70 158"/>
+  <bonus-box   model="gift-box.b3d"        lowmodel="gift-box-low.b3d"        glow="31 202 253"/>
+  <banana      model="banana.b3d"          lowmodel="banana-low.b3d"          glow="197 152 37"/>
+  <nitro-big   model="nitrotank-big.b3d"   lowmodel="nitrotank-big-low.b3d"   glow="0 70 158"/>
+  <nitro-small model="nitrotank-small.b3d" lowmodel="nitrotank-small-low.b3d" glow="0 70 158"/>
  <!-- While a bubble gum technically 
       isn't an item, it is internally 
       handled as one, so list it here    -->
-  <bubblegum   model="bubblegum.spm"       lowmodel="bubblegum-low.spm"       glow="246 150 209"/>
-  <bubblegum-nolok   model="bubblegum-nolok.spm" lowmodel="bubblegum-nolok-low.spm"/>
-  <!-- <easter-egg  model="easter_egg.spm"  /> -->
-  <easter-egg  model="easter_egg.spm"  />
+  <bubblegum   model="bubblegum.b3d"       lowmodel="bubblegum-low.b3d"       glow="246 150 209"/>
+  <bubblegum-nolok   model="bubblegum-nolok.b3d" lowmodel="bubblegum-nolok-low.b3d"/>
+  <!-- <easter-egg  model="easter_egg.b3d"  /> -->
+  <easter-egg  model="easter_egg.b3d"  />
 </items>

--- a/data/kart_characteristics.xml
+++ b/data/kart_characteristics.xml
@@ -55,7 +55,7 @@
                   chassis-angular-damping="0"
                   downward-impulse-factor="5"
                   track-connection-accel="2"
-                   angular-factor="0.25 1.0 0.5"
+                   angular-factor="0.5 1.0 0.5"
                   smooth-flying-impulse="250" />

        <!-- Turning
--- a/data/localized_name.txt
+++ b/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,7 +123,6 @@ km_KH=0
 kn=ಕನ್ನಡ
 ko=한국어
 ko_KR=0
-krl=Karjalan kieli
 ku=Kurdî
 kw=Kernowek
 ky=кыргызча
@@ -140,7 +139,6 @@ mk=Македонски
 mk_MK=0
 ml=മലയാളം
 mn=Монгол
-mn_MN=Монгол
 mr=मराठी
 ms=Bahasa Melayu
 ms_MY=0
@@ -166,7 +164,6 @@ os=0
 pa=ਪੰਜਾਬੀ
 pl=Polski
 pl_PL=0
-pms=Piemontèis
 ps=پښتو
 pt=Português
 pt_BR=0
@@ -179,8 +176,6 @@ ru=Русский
 ru_RU=0
 rw=Kinyarwanda
 sa=0
-sc=Sardu
-sco=0
 sd=0
 se=Sámegiella
 se_NO=0
--- a/data/po/ar.po
+++ b/data/po/ar.po
--- a/data/po/be.po
+++ b/data/po/be.po
--- a/data/po/bg.po
+++ b/data/po/bg.po
--- a/data/po/bn.po
+++ b/data/po/bn.po
--- a/data/po/br.po
+++ b/data/po/br.po
--- a/data/po/bs.po
+++ b/data/po/bs.po
--- a/data/po/ca.po
+++ b/data/po/ca.po
--- a/data/po/cs.po
+++ b/data/po/cs.po
--- a/data/po/da.po
+++ b/data/po/da.po
--- a/data/po/de.po
+++ b/data/po/de.po
--- a/data/po/el.po
+++ b/data/po/el.po
--- a/data/po/en_AU.po
+++ b/data/po/en_AU.po
--- a/data/po/en_GB.po
+++ b/data/po/en_GB.po
--- a/data/po/eo.po
+++ b/data/po/eo.po
--- a/data/po/es.po
+++ b/data/po/es.po
--- a/data/po/eu.po
+++ b/data/po/eu.po
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
hiker	90f4855938	Only do default assignments of stk- to steam-accounts on first start, after that use the saved settings (otherwise a user deciding to play without steam would get his setting overridden).	2017-05-09 09:21:19 +10:00
hiker	9d350ebaa6	Removed unnecessary line.	2017-05-08 17:48:46 +10:00
hiker	059b77d34b	Allow to connect and disconnet stk and steam accounts in the login screen.	2017-05-05 23:59:43 +10:00
hiker	31f970f625	Save Steam user name for accounts connected to steam.	2017-05-05 09:36:11 +10:00
hiker	d651e0c710	Started to support steam accounts with existing STK accounts.	2017-05-04 00:06:10 +10:00
hiker	b0408d414c	Removed now unnecessary command line parameter.	2017-05-03 09:30:04 +10:00
hiker	dddd00142b	Fixed windows version.	2017-05-03 08:57:59 +10:00
Joerg Henrichs	01aeb9f2fd	First linux version now working.	2017-05-03 00:23:50 +10:00
Joerg Henrichs	29e1541b47	Fixed line ending style.	2017-05-01 08:17:15 +10:00
hiker	92709b2ada	Try to fix linux compilation.	2017-04-25 01:14:47 +10:00
hiker	ffca9b14d8	Automatically create offline account when logged into steam.	2017-04-25 01:01:03 +10:00
hiker	bff3989bfc	Implemented singleton.	2017-04-23 23:36:02 +10:00
hiker	1d7aa7a2f5	Use reference instead of copy.	2017-04-23 00:48:31 +10:00
hiker	de795b766a	Made the Steam class in STK and SSM more compatible. Improve error handling, and cache frequently used values (e.g. name and id).	2017-04-23 00:32:47 +10:00
hiker	eb4989c2ef	Renamte ssh to Steam.	2017-04-22 23:35:18 +10:00
hiker	9760826252	Very first steam test case - gets username and id, then downloads avatar.	2017-04-22 00:31:06 +10:00