Merge with latest master

Add the possibility to exclude owned projectiles from the nearby projectiles count
Split DrawGlobalPlayerIcons
2018-10-05 17:55:02 +02:00 · 2018-10-05 17:50:43 +02:00 · 2018-10-05 17:42:54 +02:00 · 2018-10-04 21:55:00 +02:00 · 2018-10-04 20:48:42 +02:00 · 2018-10-05 00:58:46 +08:00
2836 changed files with 619508 additions and 338873 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -0,0 +1,58 @@
+environment:
+    DEPS_DIR: c:\\projects\dependencies
+    DEPS_BRANCH: master
+    ASSETS_DIR: c:\\projects\stk-assets
+    APPVEYOR_CACHE_ENTRY_ZIP_ARGS: -t7z -m0=lzma2 -mx=9
+
+os: Visual Studio 2015
+clone_depth: 1
+shallow_clone: true
+
+platform:
+    # - x86
+    - x64
+
+configuration:
+    - Debug
+    - Release
+
+matrix:
+    fast_finish: true
+
+#cache:
+#    - '%DEPS_DIR%'
+    #- '%ASSETS_DIR%'
+
+install:
+    - ps: >-
+        If(!(Test-Path "$env:DEPS_DIR")) {
+            Write-Host "Downloading dependencies";
+            Start-Process -FilePath "git" -ArgumentList "clone --branch $env:DEPS_BRANCH --single-branch --depth 1 https://github.com/supertuxkart/dependencies.git $env:DEPS_DIR" -Wait;
+        }
+        Else {
+            Write-Host "Updating dependencies";
+            Start-Process -FilePath "git" -ArgumentList "fetch --depth 1" -WorkingDirectory "$env:DEPS_DIR" -Wait;
+        }
+        Get-ChildItem $env:DEPS_DIR | Measure-Object -property length -sum
+        #- ps: >-
+        #If(!(Test-Path "$env:ASSETS_DIR")) {
+        #    Write-Host "Downloading assets";
+        #    Start-Process -FilePath "svn" -ArgumentList "checkout https://svn.code.sf.net/p/supertuxkart/code/stk-assets $env:ASSETS_DIR" -Wait;
+        #}
+        #Else {
+        #    Write-Host "Updating assets";
+        #    Start-Process -FilePath "svn" -ArgumentList "update" -WorkingDirectory "$env:ASSETS_DIR" -Wait;
+        #}
+        #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
+    - cmd: |
+        md build
+        cd build
+        if "%platform%"=="x64" set CMAKE_GENERATOR_NAME="Visual Studio 14 2015 Win64"
+        cmake -G %CMAKE_GENERATOR_NAME% -DCMAKE_BUILD_TYPE="%configuration%" .. -DCHECK_ASSETS=OFF
+
+build:
+    parallel: true
+    project: build\ALL_BUILD.vcxproj
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,15 @@
 bld*/
 build*/
-cmake_build/
 cmake_build*/
-dependencies/
+dependencies*/
 CMakeFiles/
 stk-editor/
+.vscode/

 .config/
 supertuxkart-64
 make*.bat
+__pycache__

 data/editor
 data/karts
@@ -51,3 +52,24 @@ packets_log.txt
 history.dat
 README.dependencies
 xx
+
+android/android-ndk*
+android/android-sdk*
+android/assets
+android/bin
+android/build
+android/libs
+android/obj
+android/res
+android/.gradle
+android-*
+*.apk
+*.keystore
+
+lib/curl
+lib/freetype
+lib/ifaddrs
+lib/libogg
+lib/libvorbis
+lib/openal
+lib/openssl
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,49 +1,56 @@
-# Travis-CI configuration file for SuperTuxKart
+# Travis-CI configuration file for SuperTuxKart 
 #
 # Configuration manual:
 # http://docs.travis-ci.com/user/build-configuration/
 #
+sudo: false
 language: cpp
+os:
+  - linux
+  - osx
 compiler:
  - gcc
-# - clang
-#branches:
-#  only:
-#    - master
-before_install:
-  # Update repos
-  - sudo apt-get update -qq
-  # Install dependencies
-  - sudo apt-get install build-essential libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev
-  # Install mesa from an other repo (a newer version is required). Quantal is not supported anymore, saucy is only supported till July 2014,
-  # so we try to use trusty (precise which is what traiv uses a too old mesa version which doesn't link)
-  - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted"
-  - sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32
-  - sudo apt-get update -qq
-  - sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev libglew-dev cmake
+  - clang
+
+matrix:
+  fast_finish: true
+
+env:
+  matrix:
+    - BUILD_TYPE="Debug" SERVER_ONLY="OFF"
+    - BUILD_TYPE="Debug" SERVER_ONLY="ON"
+    - BUILD_TYPE="Release" SERVER_ONLY="OFF"
+    - BUILD_TYPE="Release" SERVER_ONLY="ON"
+
+addons:
+  apt:
+    packages:
+    - 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
+    - mesa-common-dev
+    - pkg-config
+    - zlib1g-dev
+
+before_script:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew bundle; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo mkdir -p /usr/local/include/; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo ln -s /System/Library/Frameworks/OpenGL.framework/Versions/A/Headers/ /usr/local/include/GL; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CMAKE_PREFIX_PATH=/usr/local/opt/freetype/:/usr/local/opt/curl/:/usr/local/opt/libogg/:/usr/local/opt/libogg/:/usr/local/opt/libvorbis/:/usr/local/opt/openssl\@1.1/:/usr/local/opt/glew/:/usr/local/opt/fribidi/; fi
+
 script:
-  # First a debug build: 
-  - mkdir build-debug
-  - cd build-debug
-  - cmake .. -DCMAKE_BUILD_TYPE=Debug -DCHECK_ASSETS=off
-  - make VERBOSE=1 -j 4 
-
-  # Then a release build: 
-  - cd ..
-  - mkdir build-release
-  - cd build-release
-  - cmake .. -DCMAKE_BUILD_TYPE=Release -DCHECK_ASSETS=off
-  - make VERBOSE=1 -j 4 
-
-notifications:
-  irc:
-    channels:
-      - "irc.freenode.org#stk"
-    skip_join: false
-    use_notice: true
-    template:
-      #- "[%{commit}: %{author}] %{message}"
-      #- "%{build_url}"
-      - "[%{repository}#%{branch} @%{commit}] %{author}): %{message}"
-      - "Diff: %{compare_url}"
-      - "Build: %{build_url}"
+  - mkdir "build"
+  - cd "build"
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then /usr/local/opt/cmake/bin/cmake .. -DFREETYPE_INCLUDE_DIRS=/usr/local/opt/freetype/include/freetype2/ -DUSE_SYSTEM_GLEW=1 -DOPENAL_INCLUDE_DIR=/usr/local/opt/openal-soft/include/ -DOPENAL_LIBRARY=/usr/local/opt/openal-soft/lib/libopenal.dylib -DFREETYPE_LIBRARY=/usr/local/opt/freetype/lib/libfreetype.dylib -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSERVER_ONLY=$SERVER_ONLY -DCHECK_ASSETS=off -DBUILD_RECORDER=off; fi
+  - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSERVER_ONLY=$SERVER_ONLY -DCHECK_ASSETS=off -DBUILD_RECORDER=off; fi
+  - make VERBOSE=1 -j3
--- a/1
+++ b/1
@@ -1 +0,0 @@
-See the file data/CREDITS .
--- a/8
+++ b/8
@@ -0,0 +1,8 @@
+brew "libogg"
+brew "libvorbis"
+brew "openal-soft"
+brew "freetype"
+brew "curl"
+brew "openssl@1.1"
+brew "fribidi"
+brew "glew"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,59 +1,150 @@
-## SupertTuxKart 0.9 (April 2015)
+# Changelog
+This file documents notable changes to SuperTuxKart across versions since its inception.
+
+It should be kept in mind that some versions have a less complete changelog than others, and that this changelog do not list the details of the many small bugfixes and improvements which together make a significant part of the progress between releases.
+
+For similar reasons, and because some features are vastly more complex than others, attributions of main changes should not be taken as a shorcut for overall contribution.
+
+## Unreleased
+* Networking game for normal race, time trial, free for all, capture the flag and soccer
+* Better random item distribution for various numbers of karts by Alayan and hiker
+* Numerous improvements to input on Android by deveee
+* Unlockable SuperTux challenges in Story Mode by Alayan
+* Race UI improvements (new speedometer, nitro gauge, bigger minimap) by Alayan
+* Improvements to ghost replays (more data saved, live time difference, replay comparison, UI improvements, egg hunt replays) by Alayan
+* Kart color customization by Benau
+* Improved powerup handling in AI by Alayan
+* Local multiplayer improvements by Fantasmos
+* New coal skin by Alayan
+* Visual improvements (new skidding particles, better rescue, bubblegum flashing before ending)
+* Audio improvements (crash sound depending on speed/direction, sound cue in nitro challenges)
+* Gameplay improvements (much better slipstreaming, GP points...)
+* Terrain slowdown works again as intended on several tracks where it was missing
+* Many bugfixes
+### Tracks and modeling
+#### Tracks
+* Many unwanted shortcuts and exploits fixed by Auria
+* Las Dunas Soccer by samuncle
+
+## SuperTuxKart 0.9.3 (28. October 2017)
+* 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
+* 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
+* Visual representation of the start line in all tracks
+* Various improvements (starting boost effect, wall driving fixes, parachutes, GP points, help page for bananas, cannon fixes, colorization shader)
+### Tracks and modeling
+#### Karts
+* New kart Wilber and Hexley by Jymis
+* New kart Kiki and updated Konqi by Benau
+#### Tracks
+* All tracks drivable in reverse, with arrows pointing in the correct direction
+* Candela City by samuncle (replace Shiny Suburbs)
+* Cornfield Crossing by samuncle (replace Bovine Barnyard)
+* New battle track Las Dunas Arena by samuncle
+
+## SuperTuxKart 0.9.2 (1. July 2016)
+* Ghost replay races by Benau
+* Battle mode AI by Benau
+* Soccer mode AI by Benau
+* TTF font rendering by Benau
+* New ruby and forest skins by Benau
+* Kart properties refactor by Flakebi
+* Scripting work under the hood
+* Work on the track editor by mhp
+* Tweak to challenges
+* New farm track song by 0zone0ne and Krobonil
+* Bugfixes
+### Tracks and modeling
+#### Tracks
+* Antediluvian Abysses by samuncle (replace Subsea)
+* Volcano Island by Ponzino
+* New icy soccer field by samuncle and Benau
+
+## SuperTuxKart 0.9.1 (17. October 2015)
+* Many bug fixes
+* Started to use scripting in tracks
+* Significant audio performance improvements
+* Tweak to challenges
+### Tracks and modeling
+#### Tracks
+* Better support for driving tracks in reverse
+* Smaller tweaks and improvements to several tracks including 
+    * Math class
+    * XR591
+    * Fort Magma
+    * Gran Paradiso Island
+    * Subsea
+
+## SupertTuxKart 0.9 (24. April 2015)
 * Fully shader-based rendering engine
-* New tracks Cocoa Temple and Gran Paradiso
-* Graphical improvements to many other tracks
-* New karts amanda and gavroche
-* New and improved tux, adiumy, sara the wizard and the racer, xue kart
 * Online login which allows to:
-** connect with friends and see when they are playing
-** vote for addons
-** collect online achievements
+    * connect with friends and see when they are playing
+    * vote for addons
+    * collect online achievements
 * Grand Prix editor, including creation of random GPs 
 * Different kart physics
-
+### Tracks and modeling
+#### Karts
+* New karts Amanda and Gavroche by XGhost
+* New and improved Tux, Adiumy, Sara the Wizard and the Racer, Xue
+#### Tracks
+* Cocoa Temple by samuncle (replace Amazonian Journey)
+* Gran Paradiso Island by samuncle (replace The Island)
+* Graphical improvements to many other tracks

 ## SuperTuxKart 0.8.1 (26. November 2013)
-* New track STK Enterprise
-* Updated track The old mines
-* Updated Lighthouse track
-* Updated Zen Garden track
 * New Soccer mode
 * New Egg Hunt mode
-* New karts Xue and Sara
-* Updated Beastie kart
 * Added Tutorial
 * Added new Supertux difficulty
 * New bubblegum shield weapon
 * New Speedometer and nitro meter
 * Add ability to filter addons
-* Updated nitro models
 * Add ability to save and resume Grand Prix
 * Improve skid marks and nitro effects
 * Wiimote support
-
+### Tracks and modeling
+#### Karts
+* New karts Xue and Sara
+* Updated Beastie kart
+#### Tracks
+* STK Enterprise by Rubberduck (replace Star Track)
+* Gameplay and graphical updates to several tracks :
+    * The Old Mine
+    * Lighthouse
+    * Zen Garden
+#### Miscellaneous
+* Updated nitro models

 ## SuperTuxKart 0.8 (11. December 2012)
 * Story mode and new challenge set
 * Improved AI
 * Skidding and better collision physics
 * Reverse mode
-* New green valley track
-* New Blackhill Mansion track
-* Updated XR591 track
-* Updated Fort Magma track
-* Updated jungle track
-* Updates Sand track
 * Updated menus
 * New music
-
+### Tracks and modeling
+#### Tracks
+* Green Valley by Wolfs (replace Tux Tollway)
+* Blackhill Mansion by samuncle (replace Crescent Crossing)
+* Gameplay and graphical updates to several tracks :
+    * XR591
+    * Fort Magma
+    * Jungle
+    * Sand
+    

 ## SuperTuxKart 0.7.3 (2. November 2011)
-* New Zen Garden and Subsea tracks
-* New Island battle arena
-* New Suzanne kart
 * New graphical effects
 * New weapons 'Swatter' and 'Rubber Ball'
-* Added Thunderbird as race referee
 * 3 Strikes Battles now displays lives as spare tires
 * Improved bubble gum
 * See progression during Grand Prix
@@ -62,16 +153,28 @@
 * Improved kart control at high speeds
 * Better placement of rescued karts
 * Transition track-making to blender 2.5/2.6
+### Tracks and modeling
+#### Karts
+* New Suzanne kart
+#### Tracks
+* Zen Garden by samuncle (replace Secret Garden)
+* New Subsea
+* New Island battle arena
+#### Miscellaneous
+* Added Thunderbird as race referee

 ## SuperTuxKart 0.7.2 (15. July 2011)
 * Added in-game addon manager
 * Fixed major memory leaks
-* New Snow Peak track by Samuncle
-* Improved star track UFO by Rudy
-* New Beastie kart.
 * Show when you get a highscore
 * Improve gamepad configuration under Windows (add ability to tell gamepads apart)
 * Various other tweaks done and glitches fixed
+### Tracks and modeling
+#### Karts
+* New Beastie kart.
+#### Tracks
+* Improved Snow Peak by samuncle
+* Improved Star Track UFO by Rudy

 ## SuperTuxKart 0.7.1b (21. April 2011)
 * Fix circular dependency in challenges
@@ -79,8 +182,6 @@

 ## SuperTuxKart 0.7.1 (15. April 2011)
 * Particle  (smoke, splash, fire) and weather effects
-* New Fort Magma by Samuncle, new Shiny Suburbs track by Horace
-* New Beagle kart by wolterh
 * Added internet news
 * Support for live language switch
 * Added optional minimal race UI
@@ -95,6 +196,12 @@
 * Fixed character names that contain non-ASCII characters
 * Full RTL (right to left) support
 * Various other tweaks done and glitches fixed
+### Tracks and modeling
+#### Karts
+* New Beagle kart by wolterh
+#### Tracks
+* New Fort Magma by samuncle
+* New Shiny Suburbs by Horace

 ## SuperTuxKart 0.7 (December 2010)
 Too many to list them all. Main points:
@@ -107,8 +214,12 @@ Too many to list them all. Main points:
 * Other improvements
  - Allowed alternative ways/shortcuts in tracks
  - New item 'switch'
-* New art:
-  - New tracks farm, hacienda, scotland, secret garden
+### Tracks and modeling
+#### Tracks
+- Farm
+- Hacienda by samuncle (replace Beach)
+- Scotland by Canis Lupus
+- Secret Garden

 ## SuperTuxKart 0.6.2a (October 2009)
 * Bugfix: STK would crash while trying to save the config file
@@ -128,7 +239,7 @@ Too many to list them all. Main points:
 * Bugfix: battle mode would not display track groups.

 ## SuperTuxKart 0.6.1 (February 2009)
-* Added new kart ("Puffy"), new battle map ("Cave"), and new music for Snow Mountain.
+* New music for Snow Mountain.
 * Fixed bug in track selection screen that could cause a crash when track groups were used.
 * Fixed crash in character selection that could happen if an old user config file existed.
 * Fixed incorrect rescues in Fort Magma.
@@ -136,15 +247,19 @@ Too many to list them all. Main points:
 * A plunger in the face is now removed when restarting.
 * Added slow-down for karts driving backwards.
 * Somewhat reduced 'shaking' of AI driven karts.
+### Tracks and modeling
+#### Karts
+- New Puffy kart
+#### Tracks
+- New Cave battle map
+

 ## SuperTuxKart 0.6 (January 2009)
 * New improved physics and kart handling
 * Added sharp turns and nitro speed boost (replacing wheelies and jump)
 * Totally rewrote powerups (plunger, bowling ball, cake, bubblegum) and new look for bananas
-* New and improved tracks  : skyline, snow mountain, race track, space track, old mine, XR591
 * New game mode : 3-Strikes Battle
 * Major improvements to AI
-* New/improved karts (and removed some old ones) : wilber, eviltux, hexley
 * Improved user interface
 * Karts now have a visible suspension effect
 * Fully positional audio with OpenAL
@@ -159,9 +274,23 @@ Too many to list them all. Main points:
 * Bug fixes and code refactor/cleanup/documentation
  - Fixed 'joystick locks' (kart would turn even if the joystick is in neutral),
    thanks to Samjam for the patch.
+    
+### Tracks and modeling
+#### Karts
+* Improved Wilber
+* Eviltux
+* Hexley
+* Some old karts have been removed
+#### Tracks
+* Skyline
+* Snow Mountain
+* Race track
+* Old Mine
+* XR591
+* Improved track :
+    * Star track

 ## SuperTuxKart 0.5 (May 2008)
-* Six new tracks and one improved track: Fort Magma, SnowTux Peak, Amazonian Journey, City, Canyon, Crescent Crossing and StarTrack
 * Complete Challenges to unlock game modes, new tracks and a skidding preview
 * New Follow the Leader game mode
 * New Grand Prix
@@ -172,18 +301,29 @@ Too many to list them all. Main points:
 * Many Bugfixes including:
 	- a memory leak fix (Charlie Head)
 	- an AI crash fix (Chris Morris)
-
+	
+### Tracks and modeling	
+#### Tracks
+* SnowTux Peak
+* Amazonian Journey
+* City
+* Canyon
+* BSODs Battlements renamed to Fort Magma
+* Improved Crescent Crossing, Fort Magma, and Star Track

 ## SuperTuxKart 0.4 (February 2008)
 * New physics handling using the bullet physics engine
-* New kart: wilber
-* Improved 'Shifting Sands' and 'Lighthouse' tracks
 * Improved AI
 * New GUI handling, including resolution switching GUI
 * Improved input handling	
 * Jump and look-back featue
 * Additional music and main theme
+### Tracks and modeling
+#### Karts
+* New kart: wilber
 	
+#### Tracks
+* Improved 'Shifting Sands' and 'Lighthouse'
 	
 ## SuperTuxKart 0.3 (May 2007)
 * Highscore lists	
@@ -215,7 +355,7 @@ Too many to list them all. Main points:
  - Fixed keyboard keys unable to work on the first key press bug
  - And others

-##SuperTuxKart 0.2 (22. Sep 2006)
+## SuperTuxKart 0.2 (22. Sep 2006)
  * Significant performance improvement by using display lists
  * Improved AI
  * Support for different grand prixs
@@ -233,7 +373,7 @@ Too many to list them all. Main points:
  * Added help and about screens, added credits to track designer
  * Items were added to all tracks

-##SuperTuxKart 0.1 (04. May 2006)  (not officially released)
+## SuperTuxKart 0.1 (04. May 2006)  (not officially released)
  * Significant speedup by using a new HOT and collision algorithm --> all tracks are now playable
  * Removed all SDL dependencies, only plib is needed
  * Single and multi-window menu can be used
@@ -241,7 +381,7 @@ Too many to list them all. Main points:
  * Some bug fixes and small improvements
  * Added profile option to support automatic profiling

-##SuperTuxKart 0.0.0 (22. Dec 2004)
+## SuperTuxKart 0.0.0 (22. Dec 2004)
  * new tracks
  * new characters and karts
  * new user-interface
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,28 +1,63 @@
+cmake_minimum_required(VERSION 2.8.4)
+
 # root CMakeLists for the SuperTuxKart project
 project(SuperTuxKart)
-set(PROJECT_VERSION "0.8.1")
+set(PROJECT_VERSION "git")
+add_definitions( -DSUPERTUXKART_VERSION="${PROJECT_VERSION}" )

-cmake_minimum_required(VERSION 2.8.4)
 if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))
  cmake_policy(SET CMP0043 OLD)
 endif()

 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
+include(CMakeDependentOption)

 include(BuildTypeSTKRelease)
-if (NOT CMAKE_BUILD_TYPE)
+if(NOT CMAKE_BUILD_TYPE)
    message(STATUS "No build type selected, default to STKRelease")
    set(CMAKE_BUILD_TYPE "STKRelease")
 endif()

-option(USE_WIIUSE "Support for wiimote input devices" ON)
-option(USE_FRIBIDI "Support for right-to-left languages" ON)
+option(SERVER_ONLY "Create a server only (i.e. no graphics or sound)" OFF)
 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(USE_SYSTEM_ENET "Use system ENET instead of the built-in version, when available." ON)
+option(USE_SYSTEM_GLEW "Use system GLEW instead of the built-in version, when available." ON)
+
+CMAKE_DEPENDENT_OPTION(USE_CRYPTO_OPENSSL "Use OpenSSL instead of Nettle for cryptography in STK." OFF
+    "NOT APPLE" ON)
+CMAKE_DEPENDENT_OPTION(BUILD_RECORDER "Build opengl recorder" ON
+    "NOT SERVER_ONLY;NOT APPLE" OFF)
+CMAKE_DEPENDENT_OPTION(USE_FRIBIDI "Support for right-to-left languages" ON
+    "NOT SERVER_ONLY" OFF)
+CMAKE_DEPENDENT_OPTION(USE_WIIUSE "Support for wiimote input devices" ON
+    "NOT SERVER_ONLY;NOT MINGW;NOT CYGWIN" OFF)
+
+if(APPLE)
+    list(APPEND CMAKE_PREFIX_PATH /usr/local/opt)
+    include_directories(/usr/local/opt/fribidi/include/)
+    include_directories(/usr/local/opt/openssl@1.1/include/)
+    include_directories(/usr/local/opt/openssl@1.1/include/openssl/)
+    include_directories(/usr/local/opt/freetype/include/freetype2/)
+endif()
+
+if((UNIX AND NOT APPLE) AND NOT SERVER_ONLY)
+    option(ENABLE_WAYLAND_DEVICE "Enable Wayland device for linux build" ON)
+    
+    if((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") OR 
+       (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
+        option(USE_GLES2 "Use OpenGL ES2 renderer" ON)
+    else()
+        option(USE_GLES2 "Use OpenGL ES2 renderer" OFF)
+    endif()
+
+endif()

 if(UNIX OR MINGW)
-    option(USE_CPP2011 "Activate C++ 2011 mode (GCC only)" OFF)
+    option(DEBUG_SYMBOLS "Compile with debug symbols" OFF)
 endif()
-if(MSVC OR MINGW)
+
+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),
    # which also needs an absolute path :(
@@ -32,13 +67,9 @@ else()
    set(WIIUSE_BUILD ON)
 endif()

-if(MINGW OR CYGWIN)
-    set(USE_WIIUSE OFF)
-endif()
-
 if(UNIX AND NOT APPLE)
-    option(USE_XRANDR "Use xrandr instead of vidmode" ON)
    option(USE_ASAN   "Build with Leak/Address sanitizer" OFF)
+    option(USE_LIBBFD "Use libbfd for crash reporting and leak check" OFF)
 endif()

 set(STK_SOURCE_DIR "src")
@@ -51,53 +82,182 @@ set(STK_INSTALL_BINARY_DIR "bin" CACHE
 set(STK_INSTALL_DATA_DIR "share/supertuxkart" CACHE
    STRING "Install data folder to this directory, absolute or relative to CMAKE_INSTALL_PREFIX")

+# Define dependencies path
+if(MSVC)
+    set(DEPENDENCIES "dependencies-vs")
+elseif(MINGW)
+    set(DEPENDENCIES "dependencies-mingw")
+else()
+    set(DEPENDENCIES "dependencies")
+endif()
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(DEPENDENCIES "${DEPENDENCIES}-64bit")
+endif()
+
+if(WIN32)
+    if(NOT IS_DIRECTORY "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}")
+        set(DEPENDENCIES "dependencies")
+        if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+            set(DEPENDENCIES "${DEPENDENCIES}-64bit")
+        endif()
+    endif()
+
+    if(NOT IS_DIRECTORY "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}")
+        message(FATAL_ERROR "Dependencies directory not found.")
+    endif()
+endif()
+
 # 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_)
+    include_directories(${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/include)
+endif()
+
+if(USE_GLES2)
+    add_definitions(-DUSE_GLES2)
+    add_definitions(-D_IRR_COMPILE_WITH_OGLES2_ -DNO_IRR_COMPILE_WITH_OPENGL_)
+endif()
+
+if(SERVER_ONLY)
+    add_definitions(-DSERVER_ONLY)
+    add_definitions(-DNO_IRR_COMPILE_WITH_X11_ -DNO_IRR_COMPILE_WITH_OPENGL_ -DNO_IRR_COMPILE_WITH_OSX_DEVICE_)
+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()
+endif()
+
+if(UNIX AND NOT APPLE)
+    find_package(PkgConfig REQUIRED)
+
+    if(NOT PKGCONFIG_FOUND)
+        message(FATAL_ERROR "Pkg-config not found.")
+    endif()
 endif()

 # Build the Bullet physics library
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
 include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")

-# Build the ENet UDP network library
-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
-include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
+# Find system ENet library or build it if missing
+if((UNIX AND NOT APPLE) AND USE_SYSTEM_ENET)
+    pkg_check_modules(ENET libenet>=1.3.4)
+endif()

-# Build glew library
-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
-include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
+if(ENET_FOUND)
+    include_directories(${ENET_INCLUDE_DIRS})
+else()
+    # Fallback to built-in version
+    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
+    include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
+    set(ENET_LIBRARIES "enet")
+endif()

-if((WIN32 AND NOT MINGW) OR APPLE)
-    if (NOT APPLE)
+# Find system GLEW library or build it if missing
+if (APPLE)
+    find_package(glew)
+
+    if(GLEW_FOUND)
+        include_directories(${GLEW_INCLUDE_DIRS})
+    endif()
+elseif(NOT USE_GLES2 AND NOT SERVER_ONLY)
+    add_definitions(-DGLEW_NO_GLU)
+    if((UNIX AND NOT APPLE) AND USE_SYSTEM_GLEW)
+        pkg_check_modules(GLEW glew>=2.1)
+    endif()
+
+    if(GLEW_FOUND)
+        include_directories(${GLEW_INCLUDE_DIRS})
+    else()
+        # Fallback to built-in version silently
+        add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
+        include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
+        set(GLEW_LIBRARIES "glew")
+    endif()
+endif()
+
+if(MSVC)
    # Build zlib library
    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/zlib")
    include_directories("${PROJECT_SOURCE_DIR}/lib/zlib")

    set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/zlib" "${PROJECT_BINARY_DIR}/lib/zlib/")
    set(ZLIB_LIBRARY zlibstatic)
+endif()
+
+if (NOT SERVER_ONLY)
+    if(MSVC OR APPLE)
+        # 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")
+        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)
    endif()

-    # Build png library
-    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")
-
-    #build jpeg library
-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
-    include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
-
-    set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
-    set(PNG_LIBRARY png15_static)
-    set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
-    set(JPEG_LIBRARY jpeglib)
+    # Add jpeg library
+    if (APPLE)
+        add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+        include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+        set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
+        set(JPEG_LIBRARY jpeglib)
+    else()
+        find_package(JPEG REQUIRED)
+        include_directories(${JPEG_INCLUDE_DIR})
+    endif()
 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")
+    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)
+    endif()
+endif()
+
+if(NOT SERVER_ONLY)
+    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/graphics_utils")
+    include_directories("${PROJECT_SOURCE_DIR}/lib/graphics_utils")
+endif()
+
+if(NOT SERVER_ONLY)
+    find_library(SQUISH_LIBRARY NAMES squish libsquish)
+    find_path(SQUISH_INCLUDEDIR NAMES squish.h PATHS)
+    if (NOT SQUISH_LIBRARY OR NOT SQUISH_INCLUDEDIR)
+        add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libsquish")
+        include_directories("${PROJECT_SOURCE_DIR}/lib/libsquish")
+        SET(SQUISH_LIBRARY squish)
+    else()
+        include_directories("${SQUISH_INCLUDEDIR}")
+        MESSAGE(STATUS "Use system libsquish: ${SQUISH_LIBRARY}")
+    endif()
+endif()
+
 # Build the irrlicht library
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
 include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
@@ -117,40 +277,50 @@ endif()
 include_directories(${STK_SOURCE_DIR})

 if(APPLE)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch i386")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch i386 -F/Library/Frameworks")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch x86_64")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -F/Library/Frameworks")
 elseif(MSVC)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")   # Enable multi-processor compilation (faster)
 endif()


-# Build the angelscript library
-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")
-include_directories("${PROJECT_SOURCE_DIR}/lib/angelscript/include")
-
-# OpenAL
-if(APPLE)
-    # In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has
-    # unix-style installs of Vorbis/Ogg/OpenAL/etc. they will be picked up over our frameworks. This is blocking when I make releases :
-    # the mac I use to make STK releases does have other installs of vorbis/ogg/etc. which aren't compatible with STK, so letting
-    # CMake pick the library it wants essentially means I can't build.
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -framework OpenAL")
-    set(OPENAL_LIBRARY)
+# Build the angelscript library if not in system
+if(USE_SYSTEM_ANGELSCRIPT)
+    find_package(Angelscript)
+    if(ANGELSCRIPT_FOUND)
+        include_directories(${Angelscript_INCLUDE_DIRS})
+    else()
+        message(FATAL_ERROR "Angelscript not found. "
+            "Either install angelscript or use built-in version using "
+            "-DUSE_SYSTEM_ANGELSCRIPT=0")
+    endif()
 else()
-    find_package(OpenAL REQUIRED)
-    include_directories(${OPENAL_INCLUDE_DIR})
+    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")
+    include_directories("${PROJECT_SOURCE_DIR}/lib/angelscript/include")
+    set(Angelscript_LIBRARIES angelscript)
 endif()

-# OggVorbis
-if(APPLE)
-    # In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has
-    # unix-style installs of Vorbis/Ogg/OpenAL/etc. they will be picked up over our frameworks. This is blocking when I make releases :
-    # the mac I use to make STK releases does have other installs of vorbis/ogg/etc. which aren't compatible with STK, so letting
-    # CMake pick the library it wants essentially means I can't build.
-    set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -I/Library/Frameworks/Ogg.framework/Versions/A/Headers -I/Library/Frameworks/Vorbis.framework/Versions/A/Headers")
-else()
+if(NOT SERVER_ONLY)
+    # OpenAL
+    find_package(OpenAL REQUIRED)
+    include_directories(${OPENAL_INCLUDE_DIR})
+
+    # OggVorbis
    find_package(OggVorbis REQUIRED)
    include_directories(${OGGVORBIS_INCLUDE_DIRS})
+
+    add_definitions(-DENABLE_SOUND)
+endif()
+
+# Freetype
+if (NOT SERVER_ONLY)
+    find_package(Freetype)
+    if(FREETYPE_FOUND)
+        include_directories(${FREETYPE_INCLUDE_DIRS})
+    else()
+        message(FATAL_ERROR "Freetype not found. "
+            "Freetype is required to display characters in SuperTuxKart. ")
+    endif()
 endif()

 # Fribidi
@@ -165,43 +335,31 @@ if(USE_FRIBIDI)
    endif()
 endif()

-# OpenMP
-find_package(OpenMP)
-if (OPENMP_FOUND)
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-endif()
-
-
-if(UNIX OR MINGW)
-#    if(USE_CPP2011)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
-#    endif()
-endif()
-
 # OpenGL
-find_package(OpenGL REQUIRED)
-include_directories(${OPENGL_INCLUDE_DIR})
+if(NOT USE_GLES2 AND NOT SERVER_ONLY)
+    find_package(OpenGL REQUIRED)
+    include_directories(${OPENGL_INCLUDE_DIR})
+endif()

-if(UNIX AND NOT APPLE)
-    find_package(X11 REQUIRED)
-    include_directories(${X11_INCLUDE_DIR})
-
-    if(USE_XRANDR)
-        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()
-        find_library(IRRLICHT_XF86VM_LIBRARY Xxf86vm)
-        mark_as_advanced(IRRLICHT_XF86VM_LIBRARY)
+        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()

-
 # Set some compiler options
 if(UNIX OR MINGW)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-function")
+endif()
+
+if(MINGW AND CMAKE_BUILD_TYPE MATCHES Release)
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--subsystem,windows")
 endif()

 if(WIN32)
@@ -210,6 +368,11 @@ if(WIN32)

    # And shut up about unsafe stuff
    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+
+    # Avoid timespec structure redeclaration on Visual Studio 2015
+    if (NOT (MSVC_VERSION LESS 1900))
+        add_definitions(-DHAVE_STRUCT_TIMESPEC)
+    endif()
 endif()

 if(MSVC)
@@ -226,11 +389,9 @@ else()
    endif()
 endif()

-# TODO: remove this switch
-add_definitions(-DHAVE_OGGVORBIS)

 if(WIN32)
-    configure_file("${STK_SOURCE_DIR}/windows_installer/icon_rc.template" "${PROJECT_BINARY_DIR}/tmp/icon.rc")
+    configure_file("${STK_SOURCE_DIR}/../tools/windows_installer/icon_rc.template" "${PROJECT_BINARY_DIR}/tmp/icon.rc")
 endif()

 # Provides list of source and header files (STK_SOURCES and STK_HEADERS)
@@ -251,16 +412,10 @@ if(APPLE)
    add_executable(supertuxkart MACOSX_BUNDLE ${STK_SOURCES})

    find_library(IOKIT_LIBRARY IOKit)
-    find_library(QUICKTIME_LIBRARY QuickTime)
-    find_library(CARBON_LIBRARY Carbon)
-    find_library(AUDIOUNIT_LIBRARY AudioUnit)
    find_library(COCOA_LIBRARY Cocoa)

    target_link_libraries(supertuxkart
         ${IOKIT_LIBRARY}
-         ${QUICKTIME_LIBRARY}
-         ${CARBON_LIBRARY}
-         ${AUDIOUNIT_LIBRARY}
         ${COCOA_LIBRARY})

    # configure CMake to use a custom Info.plist
@@ -280,7 +435,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)
@@ -300,12 +455,45 @@ else()
    target_link_libraries(supertuxkart ${PTHREAD_LIBRARY})
 endif()

-# CURL
-if(WIN32)
-    target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/dependencies/lib/libcurldll.a)
+# CURL and OpenSSL or Nettle
+# 1.0.1d for compatible AES GCM handling
+SET(OPENSSL_MINIMUM_VERSION "1.0.1d")
+if(MSVC)
+    set(USE_CRYPTO_OPENSSL ON)
+    target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib/libcurl.lib)
+    target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib/libeay32.lib)
+elseif(MINGW)
+    set(USE_CRYPTO_OPENSSL ON)
+    target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib/libcurldll.a)
+    target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib/libeay32.dll)
 else()
    find_package(CURL REQUIRED)
    include_directories(${CURL_INCLUDE_DIRS})
+
+    find_path(NETTLE_INCLUDE_DIRS nettle/gcm.h nettle/sha.h nettle/base64.h nettle/version.h nettle/yarrow.h)
+    find_library(NETTLE_LIBRARY NAMES nettle libnettle)
+
+    if (NOT NETTLE_INCLUDE_DIRS OR NOT NETTLE_LIBRARY OR USE_CRYPTO_OPENSSL)
+        set(USE_CRYPTO_OPENSSL ON)
+        find_package(OpenSSL REQUIRED)
+
+        if(${OPENSSL_VERSION} VERSION_LESS ${OPENSSL_MINIMUM_VERSION} OR
+            (${OPENSSL_VERSION} VERSION_EQUAL ${OPENSSL_MINIMUM_VERSION} AND ${OPENSSL_VERSION} STRLESS ${OPENSSL_MINIMUM_VERSION}))
+            message(FATAL_ERROR "OpenSSL version found (${OPENSSL_VERSION}) is less then the minimum required (${OPENSSL_MINIMUM_VERSION}), aborting.")
+        endif()
+        include_directories(${OpenSSL_INCLUDE_DIRS})
+    else()
+        set(USE_CRYPTO_OPENSSL OFF)
+        include_directories(${NETTLE_INCLUDE_DIRS})
+    endif()
+endif()
+
+if (USE_CRYPTO_OPENSSL)
+    message(STATUS "OpenSSL will be used for cryptography in STK.")
+    add_definitions(-DENABLE_CRYPTO_OPENSSL)
+else()
+    message(STATUS "Nettle will be used for cryptography in STK.")
+    add_definitions(-DENABLE_CRYPTO_NETTLE)
 endif()

 # Common library dependencies
@@ -313,22 +501,37 @@ target_link_libraries(supertuxkart
    bulletdynamics
    bulletcollision
    bulletmath
-    enet
-    glew
+    ${ENET_LIBRARIES}
    stkirrlicht
-    angelscript
+    ${Angelscript_LIBRARIES}
    ${CURL_LIBRARIES}
-    ${OGGVORBIS_LIBRARIES}
-    ${OPENAL_LIBRARY}
-    ${OPENGL_LIBRARIES}
    )

-if(UNIX AND NOT APPLE)
-    target_link_libraries(supertuxkart ${X11_LIBRARIES})
-    if(USE_XRANDR)
-        target_link_libraries(supertuxkart ${XRANDR_LIBRARIES})
+if (USE_CRYPTO_OPENSSL)
+    target_link_libraries(supertuxkart ${OPENSSL_CRYPTO_LIBRARY})
+else()
+    target_link_libraries(supertuxkart ${NETTLE_LIBRARY})
+endif()
+
+if(NOT SERVER_ONLY)
+    if(NOT USE_GLES2)
+        target_link_libraries(supertuxkart ${OPENGL_gl_LIBRARY} ${GLEW_LIBRARIES})
    else()
-        target_link_libraries(supertuxkart ${IRRLICHT_XF86VM_LIBRARY})
+        target_link_libraries(supertuxkart GLESv2)
+    endif()
+
+    target_link_libraries(supertuxkart
+        ${SQUISH_LIBRARY}
+        ${FREETYPE_LIBRARIES}
+        ${JPEG_LIBRARIES}
+        ${OGGVORBIS_LIBRARIES}
+        ${OPENAL_LIBRARY}
+        graphics_utils)
+endif()
+
+if(UNIX AND NOT APPLE)
+    if(USE_LIBBFD)
+        target_link_libraries(supertuxkart ${LIBBFD_LIBRARIES})
    endif()
    if(USE_ASAN)
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
@@ -336,13 +539,13 @@ if(UNIX AND NOT APPLE)
    endif()
 endif()

-if(APPLE)
-    # In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has
-    # unix-style installs of Vorbis/Ogg/OpenAL/etc. they will be picked up over our frameworks. This is blocking when I make releases :
-    # the mac I use to make STK releases does have other installs of vorbis/ogg/etc. which aren't compatible with STK, so letting
-    # CMake pick the library it wants essentially means I can't build.
-    set_target_properties(supertuxkart PROPERTIES LINK_FLAGS "-arch i386 -F/Library/Frameworks -framework OpenAL -framework Ogg -framework Vorbis")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/Library/Frameworks/OpenAL.framework/Versions/A/Headers")
+if(BUILD_RECORDER)
+    target_link_libraries(supertuxkart ${OPENGLRECORDER_LIBRARY})
+endif()
+
+# FreeBSD does not search in /usr/local/lib, but at least Freetype is installed there :(
+if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib")
 endif()

 if(USE_FRIBIDI)
@@ -361,7 +564,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)
@@ -374,13 +577,13 @@ 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()

 if(MINGW)
-    find_library(LIBGCC NAMES "libgcc_s_dw2-1.dll" "libgcc_s_sjlj-1.dll" PATHS ${CMAKE_FIND_ROOT_PATH})
+    find_library(LIBGCC NAMES "libgcc_s_dw2-1.dll" "libgcc_s_sjlj-1.dll" "libgcc_s_seh-1.dll" PATHS ${CMAKE_FIND_ROOT_PATH})
    if(LIBGCC)
        file(COPY ${LIBGCC} DESTINATION ${CMAKE_BINARY_DIR}/bin/)
    endif()
@@ -388,37 +591,12 @@ if(MINGW)
    if(LIBSTDCPP)
        file(COPY ${LIBSTDCPP} DESTINATION ${CMAKE_BINARY_DIR}/bin/)
    endif()
-    find_library(LIBOPENMP NAMES "libgomp-1.dll" PATHS ${CMAKE_FIND_ROOT_PATH})
-    if(LIBOPENMP)
-        file(COPY ${LIBOPENMP} DESTINATION ${CMAKE_BINARY_DIR}/bin/)
-    endif()
    find_library(LIBPTHREAD NAMES "winpthread-1.dll" "libwinpthread-1.dll" "pthreadGC2.dll" PATHS ${CMAKE_FIND_ROOT_PATH})
    if(LIBPTHREAD)
        file(COPY ${LIBPTHREAD} DESTINATION ${CMAKE_BINARY_DIR}/bin/)
    endif()
 endif()

-# Optional tools
-add_subdirectory(tools/font_tool)
-
-
-# ==== Make dist target ====
-if(MSVC OR MINGW)
-  # Don't create a dist target for VS
-else()
-  add_custom_target(dist
-    COMMAND rm -rf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION} && rm -f ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}.tar.bz2
-            && echo "Exporting..."
-            && svn export ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}
-            && echo "Compressing..."
-            && cd ${CMAKE_BINARY_DIR}
-            && tar -cjf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}.tar.bz2 ./SuperTuxKart-${PROJECT_VERSION}
-            && echo "Done, cleaning up"
-            && rm -rf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  )
-endif()
-

 # ==== Checking if data folder exists ====
 if(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data)
@@ -456,10 +634,10 @@ 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_32.png DESTINATION share/icons/hicolor/32x32/apps RENAME supertuxkart.png)
+install(FILES data/supertuxkart_48.png DESTINATION share/icons/hicolor/48x48/apps RENAME supertuxkart.png)
 install(FILES data/supertuxkart_128.png DESTINATION share/icons/hicolor/128x128/apps 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)
+install(FILES data/supertuxkart_48.png DESTINATION share/pixmaps RENAME supertuxkart.png)
+install(FILES data/supertuxkart.appdata.xml DESTINATION share/metainfo)

 if(MINGW)
    install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/ DESTINATION ${STK_INSTALL_BINARY_DIR}
--- a/2
+++ b/2
@@ -12,7 +12,7 @@ GNU GENERAL PUBLIC LICENSE

 Version 3, 29 June 2007

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

 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.

--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,21 +1,23 @@
-#SuperTuxKart Installation Instructions
+## Building from source

-Note : If you obtained this source code from github, you also need to download the game assets from sourceforge using SVN.
+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):

-`svn checkout https://svn.code.sf.net/p/supertuxkart/code/stk-assets stk-assets`
+```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
+```

-Place the `stk-assets` folder next to the source root `stk-code` folder.
-See <http://supertuxkart.sourceforge.net/Source_control> for more information
+## Building SuperTuxKart on Linux

+### Dependencies

-##Building STK on Linux
-
-First, make sure that you have the following packages installed:
+To build SuperTuxKart from source, you'll need to 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)
  * libbluetooth (bluez-devel)
  * libpng (libpng-devel)
@@ -24,40 +26,66 @@ First, make sure that you have the following packages installed:

 Ubuntu command:

+```bash
+sudo apt-get install build-essential cmake libbluetooth-dev \
+libcurl4-openssl-dev libenet-dev libfreetype6-dev libfribidi-dev \
+libgl1-mesa-dev libglew-dev libjpeg-dev libogg-dev libopenal-dev libpng-dev \
+libssl-dev libvorbis-dev libxrandr-dev libx11-dev pkg-config zlib1g-dev
 ```
-sudo apt-get install autoconf automake build-essential cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev \
-libgl1-mesa-dev libglu1-mesa-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev libxrandr-dev
+Fedora command:
+
+```bash
+sudo dnf install @development-tools cmake bluez-libs-devel \
+openssl-devel libcurl-devel freetype-devel fribidi-devel mesa-libGL-devel \
+libjpeg-turbo-devel libogg-devel openal-soft-devel libpng-devel \
+libvorbis-devel libXrandr-devel libGLEW pkgconf zlib-devel
 ```
-  
-Unpack the files from the tarball like this:
+### In-game recorder

-```
-tar xzf supertuxkart-*.tar.gz
-cd supertuxkart-*
-```
+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.

-where `*` is the version of SuperTuxkart you downloaded - eg `0.8.0`. Then:
+### Compiling

+To compile SuperTuxKart, run the following commands inside `stk-code` directory:

-Compile SuperTuxKart:
-
-```
+```bash
 mkdir cmake_build
 cd cmake_build
 cmake ..
-make VERBOSE=1 -j2
+make -j4
+```
+STK can then be run from the build directory with `bin/supertuxkart`
+
+#### Keeping your build up to date
+
+To recompile the latest code without redownloading the entire source, first run the ```svn up``` command inside the 'stk-assets' directory, then run the following commands inside the 'stk-code' directory:
+
+```bash
+git pull
+cd cmake_build
+cmake ..
+make -j4
 ```

-To create a debug version of STK, use:
+##### Build Speed Optimization

-`cmake .. -DCMAKE_BUILD_TYPE=Debug`
+"-j4" is an example, for a faster build, use "-jx" instead, where "x" is the amount of CPU threads you have, minus one. "-j$(nproc)" usually works.

-To test the compilation, supertuxkart can be run from the build
-directory by ./bin/supertuxkart 
+### Further options

-To install the file, as root execute:
+To create a debug version of STK, run:

-`make install`
+```bash
+cmake .. -DCMAKE_BUILD_TYPE=Debug
+```
+
+You can install your build system-wide:
+
+```bash
+sudo make install
+```

 The default install location is `/usr/local`, i.e. the data files will
 be written to `/usr/local/share/games/supertuxkart`, the executable
@@ -65,10 +93,169 @@ will be copied to `/usr/local/bin`. To change the default installation
 location, specify `CMAKE_INSTALL_PREFIX` when running cmake, e.g.:
 `cmake .. -DCMAKE_INSTALL_PREFIX=/opt/stk`

-  
-##Building STK on OS X
-See <http://supertuxkart.sourceforge.net/Building_and_packaging_on_OSX>


-##Building STK on Windows
-See <http://supertuxkart.sourceforge.net/How_to_build_the_Windows_version>
+## Building SuperTuxKart on Windows
+To Build SuperTuxKart on Windows, follow these instructions:
+
+1. Download and install Visual Studio from here: [Visual Studio - Download](https://www.visualstudio.com/downloads/). The free Visual Studio Community edition works fine. Remember to select "Desktop development with C++" in the installer.
+
+2a. If you want the stable version, download the SuperTuxKart source package from the latest stable version [SuperTuxKart download area - SourceForge.net](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/) and unpack it.
+2b. If you want the development version, you will need a Git client and a SVN client. More information can be found here: [SuperTuxKart.net - Source Control](https://supertuxkart.net/Source_control).
+Open your file browser and find somewhere you want to put the development version of SuperTuxKart. For example in C:\Users\<Your Username> as the Git and SVN clients will have write permissions there, and you should create its own directory, for example SuperTuxKart-dev. Enter that directory, and create a directory inside called stk-assets, and enter it. If you installed TortoiseSVN, right-click, select TortoiseSVN -> Checkout... and paste the correspodning URL found in [SuperTuxKart.net - Source Control](https://supertuxkart.net/Source_control). While it is downloading the game assets, go back to your file browser and one level up. Right-click again somewhere empty and select "Git clone..." and paste the corresponding link found in [SuperTuxKart.net - Source Control](https://supertuxkart.net/Source_control).
+*Note: Both `stk-code` and `stk-assets` **must** be in the same directory, otherwise the build will likely fail!*
+
+3a. If you got the stable version, download the Windows dependencies package from [SuperTuxKart download area: Dependencies - SourceForge.net](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/Windows/) and unpack it.
+3b. If you got the development version go to SuperTuxKart-dev in your file browser, right-click somewhere empty, select "Git clone..." and paste https://github.com/supertuxkart/dependencies.git in the URL field; click OK. When finished, copy the `dependencies` directory from either the `windows` or the `windows_64bit` directories into the `stk-code` directory; rename the latter to `dependencies-64bit` if you want to compile a 64-bit 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 new directory called `build` or `bld` inside the stk-code directory.
+
+5. Press 'Configure'; CMake will ask you if it is OK to create the aforementioned 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. If you want to do a 64-bit build, select the version of Visual Studio you installed with "Win64" appended.
+
+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
+
+### Getting Started
+
+Install the 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:
+
+```bash
+sudo mkdir -p /usr/local/include/
+```
+
+Symlink the `include`-folder of OpenGL framework to `/usr/local/include/GL` (Unix programs have an easier time finding it this way):
+
+```bash
+sudo ln -s /System/Library/Frameworks/OpenGL.framework/Versions/A/Headers/ /usr/local/include/GL
+```
+
+On OS X 10.9.5, you might need the following workaround:
+
+```bash
+sudo ln -s `xcrun --show-sdk-path`/usr/include/ /usr/include
+sudo ln -s `xcrun --show-sdk-path`/System/Library/Frameworks/OpenGL.framework/Headers/ /usr/local/include/OpenGL
+```
+The first link is required in order to find libcurl, the second to find opengl.
+
+### CMake
+
+CMake is used to build STK. At this time CMake will not make a binary that is ready for distribution.
+
+You'll have to run these commands inside your stk-code directory.
+
+
+### STK 0.9.4 or later (or latest git)
+
+Install homebrew ( https://brew.sh/)
+Install all of the dependencies using homebrew :
+
+```bash
+brew install libogg
+brew install libvorbis
+brew install openal-soft
+brew install freetype
+brew install curl
+brew install openssl@1.1
+brew install fribidi
+brew install glew
+```
+
+Build STK
+```bash
+mkdir cmake_build
+cd cmake_build
+CMAKE_PREFIX_PATH=/usr/local/opt/freetype/:/usr/local/opt/curl/:/usr/local/opt/libogg/:/usr/local/opt/libogg/:/usr/local/opt/libvorbis/:/usr/local/opt/openssl\@1.1/:/usr/local/opt/glew/:/usr/local/opt/fribidi/ /usr/local/opt/cmake/bin/cmake .. -DFREETYPE_INCLUDE_DIRS=/usr/local/opt/freetype/include/freetype2/ -DUSE_SYSTEM_GLEW=1 -DOPENAL_INCLUDE_DIR=/usr/local/opt/openal-soft/include/ -DOPENAL_LIBRARY=/usr/local/opt/openal-soft/lib/libopenal.dylib -DFREETYPE_LIBRARY=/usr/local/opt/freetype/lib/libfreetype.dylib
+make
+```
+
+#### (Optional) packaging for distribution
+
+By default, the executable that is produced is not ready for distribution. Install https://github.com/auriamg/macdylibbundler and run:
+
+```bash
+dylibbundler -od -b -x ./bin/SuperTuxKart.app/Contents/MacOS/supertuxkart -d ./bin/SuperTuxKart.app/Contents/libs/ -p @executable_path/../libs/
+```
+
+Afterwards, copy the contents of `stk-assets` into `/SuperTuxKart.app/Contents/Resources/data`.
+
+### STK 0.9.3 or earlier
+
+Download pre-built dependencies from [here](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/OSX/) and put the frameworks in [hard disk root]/Library/Frameworks
+
+Building with clang:
+
+```bash
+mkdir cmake_build
+cd cmake_build
+cmake ..
+make
+```
+
+Building with GCC:
+```bash
+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
+cmake .. -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk  -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9
+```
+
+#### Xcode
+
+Place an additional copy of the dependencies into `Users/<YOUR_USERNAME>/Library/Frameworks`.
+Then cd to your cloned stk-code directory and execute the following commands:
+
+```bash
+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`).
+
+You can then build the project in Xcode using Product -> Build
+
+Note: Xcode is much less well tested than makefiles, so there may be issues when trying to use Xcode.
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,49 @@
+## Description
+
+Provide a description of your issue.
+For any suggestions, please address them on the [forum](https://forum.freegamedev.net/viewforum.php?f=16).
+
+## Steps to reproduce
+
+## Configuration
+
+STK release version:
+
+STK Source (ppa, distribution package, official bin,...):
+If you did not download STK from the official website, please specify where you got it:
+
+System: 
+
+Graphics card: 
+
+CPU: 
+
+Gamepads/keyboards models if related to the issue:
+
+## Additional information
+
+Please provide stdout.log, it is located in
+
+* %appdata%\supertuxkart\0.8.2 (windows)
+* ~/Library/Application Support/supertuxkart/0.8.2 (mac)
+* $XDG_CONFIG_HOME/supertuxkart/0.8.2 or ~/.config/supertuxkart/0.8.2 (linux, and other unix based systems)
+
+stdout.log
+```
+
+```
+
+If your issue is related to the input config (gamepads, keyboards), please provide your file input.xml located in the same directory as stdout.log.
+
+input.xml
+```xml
+
+```
+
+
+If an error message was shown, please copy paste the complete error message or a screenshot of it.
+
+error
+```
+
+```
--- a/NETWORKING.md
+++ b/NETWORKING.md
@@ -0,0 +1,171 @@
+# Online networking games for STK
+
+## Hosting server
+First of all, you can compile STK with `-DSERVER_ONLY=ON` which will produce a GUI-less STK binary optimized for size and memory usage, useful for situation like in VPS.
+
+### Hosting WAN (public internet) server
+You are required to have an stk online account first, go [here](https://addons.supertuxkart.net/register.php) for registration.
+
+It is recommended you have a saved user in your computer to allow hosting multiple servers simultaneously with the same account, if you have a fresh STK installation, first run:
+
+`supertuxkart --init-user --login=your_registered_name --password=your_password`
+
+After that you should see `Done saving user, leaving` in terminal if it successfully logged in.
+
+Than you can just run:
+
+`supertuxkart --server-config=your_config.xml --network-console`
+
+It will create that xml configuration file if not found in current directory, you can type `quit` in terminal, than you can edit that file for further configuration as required.
+
+The current server configuration xml looks like this:
+```xml
+<?xml version="1.0"?>
+<server-config version="1" >
+
+    <!-- Name of server, encode in XML if you want to use unicode characters. -->
+    <server-name value="stk server" />
+
+    <!-- Port used in server, if you specify 0, it will use the server port specified in stk_config.xml or if random-server-port is enabled in user config, than any port. STK will auto change to random port if the port you specify failed to be bound. -->
+    <server-port value="0" />
+
+    <!-- Game mode in server, 0 is normal race (grand prix), 1 is time trial (grand prix), 3 is normal race, 4 time trial, 6 is soccer, 7 is free-for-all and 8 is capture the flag. Notice: grand prix server doesn't allow for players to join and wait for ongoing game. -->
+    <server-mode value="3" />
+
+    <!-- Difficulty in server, 0 is beginner, 1 is intermediate, 2 is expert and 3 is supertux (the most difficult). -->
+    <server-difficulty value="0" />
+
+    <!-- Number of grand prix tracks per game (If grand prix enabled). -->
+    <gp-track-count value="3" />
+
+    <!-- Use goal target in soccer. -->
+    <soccer-goal-target value="false" />
+
+    <!-- Enable wan server, which requires you to have an stk-addons account with a saved session. Check init-user command for details. -->
+    <wan-server value="true" />
+
+    <!-- Enable network console, which can do for example kickban. -->
+    <enable-console value="false" />
+
+    <!-- Maximum number of players on the server, setting it more than 8 will have performance degradation. -->
+    <server-max-players value="8" />
+
+    <!-- Password for private server, empty for a public server. -->
+    <private-server-password value="" />
+
+    <!-- Message of today shown in lobby, you can enter encoded XML words here or a file.txt and let STK load it. -->
+    <motd value="" />
+
+    <!-- Timeout in seconds for voting tracks in server. -->
+    <voting-timeout value="20" />
+
+    <!-- Timeout in seconds for validation of clients in wan, currently stk will use the stk-addons server to share AES key between client and server. -->
+    <validation-timeout value="20" />
+
+    <!-- By default WAN server will always validate player and LAN will not, disable it to allow non-validated player in WAN. -->
+    <validating-player value="true" />
+
+    <!-- Disable it to turn off all stun related code in server, it allows saving server resource if your server is not behind a firewall. -->
+    <firewalled-server value="true" />
+
+    <!-- No server owner in lobby which can control the starting of game or kick any players. -->
+    <owner-less value="false" />
+
+    <!-- Time to wait before entering kart selection screen if satisfied min-start-game-players below for owner less or ranked server. -->
+    <start-game-counter value="30" />
+
+    <!-- Only auto start kart selection when number of connected player is larger than or equals this value, for owner less or ranked server, after start-game-counter reaches 0. -->
+    <min-start-game-players value="2" />
+
+    <!-- Automatically end linear race game after 1st player finished for some time (currently his finished time * 0.25 + 15.0). -->
+    <auto-end value="false" />
+
+    <!-- Enable team choosing in lobby in team game (soccer and CTF). If owner-less is enabled, than this option is always disabled. -->
+    <team-choosing value="true" />
+
+    <!-- Server will submit ranking to stk addons server for linear race games, you require permission for that. validating-player, auto-end and owner-less will be turned on. -->
+    <ranked value="false" />
+
+    <!-- Time in seconds when a flag is dropped a by player in CTF returning to its own base. -->
+    <flag-return-timemout value="20" />
+
+    <!-- Value used to calculate hit limit in free for all, which is min(number of players * hit-limit-threshold, 40), negative value to disable hit limit. -->
+    <hit-limit-threshold value="5" />
+
+    <!-- Value used to calculate time limit in free for all, which is max(number of players * time-limit-threshold-ffa, 3.0) * 60, negative value to disable time limit. -->
+    <time-limit-threshold-ffa value="0.7" />
+
+    <!-- Value used to calculate capture limit in CTF, which is max(3.0, number of players * capture-limit-threshold), negative value to disable capture limit. -->
+    <capture-limit-threshold value="0.7" />
+
+    <!-- Value used to calculate time limit in CTF, which is max(3.0, number of players * (time-limit-threshold-ctf + flag-return-timemout / 60.0)) * 60.0, negative value to disable time limit. -->
+    <time-limit-threshold-ctf value="0.9" />
+
+    <!-- Value used by server to automatically calculate lap of each race in network game, if more than 0.0f, the number of lap of each track vote in linear race will be determined by max(1.0f, auto-lap-ratio * default lap of that track). -->
+    <auto-lap-ratio value="-1" />
+
+    <!-- Maximum ping allowed for a player (in ms). -->
+    <max-ping value="300" />
+
+    <!-- Tolerance of jitter in network allowed (in ms). -->
+    <jitter-tolerance value="100" />
+
+    <!-- Kick players whose ping is above max-ping. -->
+    <kick-high-ping-players value="false" />
+
+    <!-- ip: IP in X.X.X.X/Y (CIDR) format for banning, use Y of 32 for a specific ip, expired-time: unix timestamp to expire, if -1 (uint32_t max) than a permanent ban. -->
+    <server-ip-ban-list>
+        <ban ip="0.0.0.0/0" expired-time="0"/>
+    </server-ip-ban-list>
+
+    <!-- online-id: online id for banning, expired-time: unix timestamp to expire, if -1 (uint32_t max) than a permanent ban. -->
+    <server-online-id-ban-list>
+        <ban online-id="0" expired-time="0"/>
+    </server-online-id-ban-list>
+
+</server-config>
+
+
+```
+
+At the moment STK has a list of STUN servers for NAT penetration which allows players or servers behind a firewall or router to be able to connect to each other, but in case it doesn't work, you have to manually disable the firewall or port forward the port(s) used by the STK.
+By default STK servers use port `2759`. For example, in Ubuntu based distributions, run the following command to disable the firewall on that port:
+
+`sudo ufw allow 2759`
+
+You may also need to handle the server discovery port `2757` for connecting your WAN server in LAN / localhost.
+
+Notice: You don't need to make any firewall or router configuration changes if you connect to our official servers.
+
+### Hosting LAN (local internet) server
+Everything is basically the same as WAN one, except you don't need an stk online account, just do:
+
+`supertuxkart --server-config=your_config.xml --lan-server=your_server_name --network-console`
+
+In LAN network it is required that the server and server discovery port is connectable by clients directly, no NAT penetration will be done in LAN.
+
+------
+After the first time configuration, you can just start the server with the command:
+
+`supertuxkart --server-config=your_config.xml`, regardless of whether LAN or WAN server is chosen (of course you need to have a saved user for the WAN one), by default your server logging will be saved to the STK configuration directory with a name of `your_config.log`, given that the server configuration filename is `your_config.xml`.
+
+You can find out that directory location [here (See Where is the configuration stored?)](https://supertuxkart.net/FAQ)
+
+## Testing server
+There is a network AI tester in STK which can use AI on player controller for server hosting linear races game mode, which helps automating the testing for servers, to enable it use:
+
+`supertuxkart --connect-now=x.x.x.x:y --server-id=id --network-ai=n --auto-connect --no-graphics`
+
+x.x.x.x:y is your server ip address with its port, id is the id field of server-info in STK server xml list, omit it if you are testing LAN server, n is the number of AI you want to create.
+
+You can see STK server xml list [here](https://addons.supertuxkart.net/api/v2/server/get-all).
+
+The server you want to test must be able to be connected without NAT penetration. You can remove `--auto-connect` if you have another client which can control the starting of games in server, or you can consider enable owner-less mode on server so the games on server can keep going. Remove `--no-graphics` if you want to see the AI racing. You can also run network AI tester in server-only build of STK.
+
+With the network AI tester, it's easier to for example simulate high-loaded servers or bad (high ping with packet loss) network.
+
+Tested on a Raspberry Pi 3 Model B+, if you have 8 players connected to a server hosted on it, the usage of a single CPU core is ~60% and there are ~60MB of memory usage for game with heavy tracks like Cocoa Temple or Candela City on the server, you can use the above figures to consider number of STK servers hosting on a same computer.
+
+For bad network simulation, we recommend `network traffic control` by linux kernel, see [here](https://wiki.linuxfoundation.org/networking/netem) for details.
+
+You have the best gaming experience when choosing server less than 100ms ping with no packet loss.
--- a/README.md
+++ b/README.md
@@ -1,67 +1,33 @@
-#SuperTuxKart
-[![Build Status](https://travis-ci.org/supertuxkart/stk-code.png?branch=master)](https://travis-ci.org/supertuxkart/stk-code)
+# 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)

-SuperTuxKart is a free kart racing game. It is focusing on fun and
-not on realistic kart physics. Instruction can be found on the
-in-game help page.
+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: <http://supertuxkart.sourceforge.net>
+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)

-The official SuperTuxKart forum is at <http://supertuxkart.sourceforge.net/forum>. If you need support,
-this would be the best place to start.
+## Hardware Requirements
+To run SuperTuxKart, make sure that your computer's specifications are equal or higher than the following specifications:

-Hope you enjoy the game.
-
-- The SuperTuxKart development team.
-
-
-##Hardware Requirements
-* 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.
+* 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.3
+* You should have a CPU that's running at 1 GHz or faster. 
 * You'll need at least 512 MB of free VRAM (video memory).
-* Disk space: 400MB
-* Ideally, you want a joystick with at least 6 buttons.
+* Minimum disk space: 800 MB 
+* Ideally, you'll 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`.

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

-###Windows
-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](http://supertuxkart.sourceforge.net/Source_control)
-3. Download the latest dependency package depdendencies_for_0.8.2.zip 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 directory (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 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 to 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.
-
-Compilation with cygwin is not officially supported, but
-this has been done (check with the forum for details).
-
-###Mac OS X
-The latest information about compilation on Mac are on our wiki:
-<http://supertuxkart.sourceforge.net/Building_and_packaging_on_OSX>
-The Xcode project file is in `/src/ide/Xcode/`, but it still 
-requires that all dependencies are installed as explained on the wiki.
-
-###UNIX
-See `INSTALL` for details.
-
-
-##License
-This software is released under the GNU General Public License (GPL) which
-can be found in the file `LICENSE` in the same directory as this file.
-Information about the licenses for artwork are contained in 
-`data/licenses`.
-
-
-##3D coordinates
-A reminder for those looking at the code and 3d models:
-
-STK    : X right, Y up,       Z forwards
+SuperTuxKart: X right, Y up, Z forwards

 Blender: X right, Y forwards, Z up

-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).
+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).
+
+## Building from source
+
+Building instructions can be found in [`INSTALL.md`](/INSTALL.md)
--- a/34
+++ b/34
@@ -1,34 +0,0 @@
-# Please, make sure your SVN client uses something that matches the
-# following config. Specially the autoprops part, that way new files
-# will be added with the right settings. Default config for command line
-# svn is in ~/.subversion/config. If you use SVN for multiple projects
-# simultaneously, remember you can use different configs, at least in
-# cmd line (via --config-dir and for example ~/.subversion/supertuxkart/
-# with a new config file inside).
-
-[miscellany]
-global-ignores = *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* ._* .DS_Store *.blend1 *.blend2
-enable-auto-props = yes
-
-[auto-props]
-*.c = svn:eol-style=native;svn:keywords=Author Date Id Revision
-*.cpp = svn:eol-style=native;svn:keywords=Author Date Id Revision
-*.h = svn:eol-style=native;svn:keywords=Author Date Id Revision
-*.hpp = svn:eol-style=native;svn:keywords=Author Date Id Revision
-*.dsp = svn:eol-style=CRLF
-*.dsw = svn:eol-style=CRLF
-*.sh = svn:eol-style=native;svn:executable;svn:keywords=Author Date Id Revision
-*.txt = svn:eol-style=native
-*.png = svn:mime-type=image/png
-*.jpg = svn:mime-type=image/jpeg
-Makefile = svn:eol-style=native;svn:keywords=Author Date Id Revision
-*.jpeg = svn:mime-type=image/jpeg
-*.gif = svn:mime-type=image/gif
-*.svg = svn:mime-type=image/svg+xml
-*.htm = svn:mime-type=text/html
-*.html = svn:mime-type=text/html
-*.css = svn:mime-type=text/css
-*.pdf = svn:mime-type=application/pdf
-SConstruct = svn:eol-style=native;svn:keywords=Author Date Id Revision
-*.xml = svn:eol-style=LF;svn:mime-type=text/xml
-*.py = svn:eol-style=native;svn:keywords=Author Date Id Revision
--- a/TODO.md
+++ b/TODO.md
@@ -1,33 +0,0 @@
-##TODO
-
-SuperTuxKart is looking for additional man power to make this
-one of the best free linux games out there :) We need (in 
-no particular order):
-
-1. Musicians/sound engineers
-   - Create additional background soundtrack
-   - Create sound effects
-2. Artists and track designer
-   - Create additional tracks
-   - Create additional art work for tracks,
-     background images
-3. Developers
-   - Check our bug and enhancement request tracker on
-     https://github.com/supertuxkart/stk-code/issues
-   - Extend the current web page, keep it up to date
-4. Tester
-   - For just about everything
-   - Esp. different platforms and graphics cards
-5. Writers
-   - Write documentation, ranging from man page, to
-     a description for the web, to a design document, ...
-
-If you want to help the SuperTuxKart - Project, please
-contact us on the email list: [supertuxkart-devel@lists.sourceforge.net](mailto:supertuxkart-devel@lists.sourceforge.net)
-
-Thanks in advance!
-
-- The SuperTuxKart-Team
-
-
-For details, see <http://supertuxkart.sourceforge.net/Get_involved>
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -0,0 +1,176 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+
+# OpenAL
+LOCAL_MODULE := openal
+LOCAL_SRC_FILES := obj/openal/libopenal.a
+include $(PREBUILT_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# OGG
+LOCAL_MODULE := ogg
+LOCAL_SRC_FILES := obj/libogg/src/.libs/libogg.a
+include $(PREBUILT_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# Vorbis
+LOCAL_MODULE := vorbis
+LOCAL_SRC_FILES := obj/libvorbis/lib/.libs/libvorbis.a
+include $(PREBUILT_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# Vorbisfile
+LOCAL_MODULE := vorbisfile
+LOCAL_SRC_FILES := obj/libvorbis/lib/.libs/libvorbisfile.a
+include $(PREBUILT_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# CURL
+LOCAL_MODULE := curl
+LOCAL_SRC_FILES := obj/curl/lib/.libs/libcurl.a
+include $(PREBUILT_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# libcrypto
+LOCAL_MODULE := libcrypto
+LOCAL_SRC_FILES := obj/openssl/libcrypto.a
+include $(PREBUILT_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# libssl
+LOCAL_MODULE := libssl
+LOCAL_SRC_FILES := obj/openssl/libssl.a
+include $(PREBUILT_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# JPEG
+LOCAL_MODULE := jpeglib
+LOCAL_SRC_FILES := obj/jpeglib/libjpeglib.a
+include $(PREBUILT_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# Freetype
+LOCAL_MODULE := freetype
+LOCAL_SRC_FILES := obj/freetype/objs/.libs/libfreetype.a
+include $(PREBUILT_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# zlib
+LOCAL_MODULE := zlib
+LOCAL_SRC_FILES := obj/zlib/libz.a
+include $(PREBUILT_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# PNG
+LOCAL_MODULE := png
+LOCAL_SRC_FILES := obj/libpng/libpng.a
+include $(PREBUILT_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# ifaddrs
+LOCAL_MODULE    := ifaddrs
+LOCAL_PATH      := .
+LOCAL_SRC_FILES := ../lib/ifaddrs/ifaddrs.c
+LOCAL_CFLAGS    := -I../lib/ifaddrs
+include $(BUILD_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# AngelScript
+LOCAL_MODULE       := angelscript
+LOCAL_PATH         := .
+LOCAL_CPP_FEATURES += rtti exceptions
+LOCAL_SRC_FILES    := $(wildcard ../lib/angelscript/source/*.S)   \
+                      $(wildcard ../lib/angelscript/source/*.cpp)
+LOCAL_CFLAGS       := -I../lib/angelscript/source/
+include $(BUILD_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# ENET
+LOCAL_MODULE       := enet
+LOCAL_PATH         := .
+LOCAL_CPP_FEATURES += rtti
+LOCAL_SRC_FILES    := $(wildcard ../lib/enet/*.c)
+LOCAL_CFLAGS       := -I../lib/enet/include/ -DHAS_SOCKLEN_T
+include $(BUILD_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# Bullet
+LOCAL_MODULE       := bullet
+LOCAL_PATH         := .
+LOCAL_CPP_FEATURES += rtti
+LOCAL_SRC_FILES    := $(wildcard ../lib/bullet/src/*/*.cpp)   \
+                      $(wildcard ../lib/bullet/src/*/*/*.cpp)
+LOCAL_CFLAGS       := -I../lib/bullet/src/
+include $(BUILD_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# Irrlicht
+LOCAL_MODULE       := irrlicht
+LOCAL_PATH         := .
+LOCAL_CPP_FEATURES += rtti
+LOCAL_SRC_FILES    := $(wildcard ../lib/irrlicht/source/Irrlicht/*.cpp)         \
+                      $(wildcard ../lib/irrlicht/source/Irrlicht/Android/*.cpp) \
+                      ../lib/irrlicht/source/Irrlicht/stk_android_native_app_glue.c
+LOCAL_CFLAGS       := -I../lib/irrlicht/source/Irrlicht/ \
+                      -I../lib/irrlicht/include/         \
+                      -Iobj/jpeglib/                     \
+                      -Iobj/libpng/                      \
+                      -Iobj/zlib/                        
+LOCAL_CPPFLAGS     := -std=gnu++0x
+LOCAL_STATIC_LIBRARIES := jpeglib png zlib
+include $(BUILD_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+
+# STK
+LOCAL_MODULE       := main
+LOCAL_PATH         := .
+LOCAL_CPP_FEATURES += rtti exceptions
+LOCAL_SRC_FILES    := $(wildcard ../src/*.cpp)     \
+                      $(wildcard ../src/*/*.cpp)   \
+                      $(wildcard ../src/*/*/*.cpp)
+LOCAL_LDLIBS       := -llog -landroid -lEGL -lGLESv3 -lOpenSLES
+LOCAL_CFLAGS       := -I../lib/angelscript/include      \
+                      -I../lib/bullet/src               \
+                      -I../lib/enet/include             \
+                      -I../lib/ifaddrs                  \
+                      -I../lib/irrlicht/include         \
+                      -I../lib/irrlicht/source/Irrlicht \
+                      -I../src                          \
+                      -Iobj/curl/include                \
+                      -Iobj/freetype/include            \
+                      -Iobj/libogg/include              \
+                      -Iobj/libvorbis/include           \
+                      -Iobj/openal/include              \
+                      -Iobj/openssl/include             \
+                      -DUSE_GLES2      \
+                      -DENABLE_SOUND   \
+                      -DENABLE_CRYPTO_OPENSSL           \
+                      -DNDEBUG         \
+                      -DANDROID_PACKAGE_NAME=\"$(PACKAGE_NAME)\"    \
+                      -DANDROID_APP_DIR_NAME=\"$(APP_DIR_NAME)\"    \
+                      -DSUPERTUXKART_VERSION=\"$(PROJECT_VERSION)\"
+LOCAL_CPPFLAGS     := -std=gnu++0x
+
+LOCAL_STATIC_LIBRARIES := irrlicht bullet enet freetype ifaddrs angelscript  \
+                          vorbisfile vorbis ogg openal curl libssl libcrypto \
+                          gnustl_static
+
+include $(BUILD_SHARED_LIBRARY)
+include $(CLEAR_VARS)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="org.supertuxkart.stk_dbg"
+          android:versionCode="1"
+          android:versionName="git"
+          android:installLocation="auto">
+
+    <!-- This .apk has no Java code itself, so set hasCode to false. -->
+    <application android:label="@string/app_name"
+                 android:icon="@drawable/icon"
+                 android:banner="@drawable/banner"
+                 android:hasCode="false"
+                 android:isGame="true"
+                 android:theme="@android:style/Theme.DeviceDefault.NoActionBar.TranslucentDecor"
+                 android:hardwareAccelerated="true"
+                 android:resizeableActivity="false">
+
+        <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:screenOrientation="sensorLandscape">
+
+            <!-- Tell NativeActivity the name of or .so -->
+            <meta-data android:name="android.app.lib_name"
+                       android:value="main" />
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+    <uses-sdk android:minSdkVersion="19" 
+              android:targetSdkVersion="26" />
+    <uses-feature android:glEsVersion="0x00020000" />
+    <uses-feature android:name="android.software.leanback" android:required="false" />
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+    <uses-feature android:name="android.hardware.gamepad" android:required="false"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+</manifest>
--- a/android/README.ANDROID
+++ b/android/README.ANDROID
@@ -0,0 +1,147 @@
+================================================================================
+
+ SUPERTUXKART
+
+================================================================================
+
+
+
+--------------------------------------------------------------------------------
+ SYSTEM REQUIREMENTS
+--------------------------------------------------------------------------------
+
+To run SuperTuxKart on Android, you need a device that meets following
+requirements:
+
+- Android 4.4 or later
+- Processor compatible with armv7 or x86
+- GPU that supports OpenGL ES 3.0
+- 1 GB RAM (STK uses ~150 MB in minimal configuration)
+- 300 MB of free space on internal storage
+- Touch screen or external keyboard
+
+
+
+--------------------------------------------------------------------------------
+ COMPILATION
+--------------------------------------------------------------------------------
+
+The build scripts are designed to run under linux. They may work under cygwin
+after some tweaks, but atm. only linux is supported.
+
+Dependencies list (may be incomplete):
+
+    autoconf, automake, make, python, gradle, ant, imagemagick, cmake, 
+    vorbis-tools, pngquant
+
+Additionally some dependencies for optimize_data script:
+
+    advancecomp, libjpeg-progs, optipng
+
+Before compilation you must download the package with dependencies from:
+https://github.com/supertuxkart/dependencies
+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 >= r15 is atm. not supported. Version r12b is
+strongly recommended, because it's known that it works without issues.
+
+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.
+
+Before running the compilation, run the generate_assets script, so that
+selected assets will be copied to "assets" directory, and then included in the
+apk file.
+
+You can select different karts and tracks by setting KARTS and TRACKS variables
+in the generate_assets.sh script at the beginning of file.
+
+When you are creating the assets directory manually, note that the
+directories.txt file is urgently needed and it is used by the application for
+extracting assets.
+
+If the assets directory is already prepared, you can run "./make.sh" command to
+build the project and create an apk file. Note that all arguments are passed to
+the make command, so that you can run "./make.sh -j5" for multi-threaded build.
+
+Basically if all dependencies are installed in the system, it should be enough
+to just run:
+
+    export SDK_PATH=/path/to/your/android/sdk
+    export NDK_PATH=/path/to/your/android/ndk
+    ./generate_assets.sh
+    ./make.sh -j5
+
+
+
+--------------------------------------------------------------------------------
+ ENVIRONMENT VARIABLES
+--------------------------------------------------------------------------------
+
+COMPILE_ARCH    - Allows to choose CPU architecture for which the package will
+                  be compiled. 
+                  Possible values: armv7, aarch64, x86, x86_64.
+                  Default is: armv7.
+
+BUILD_TYPE      - Allows to set build type.
+                  Possible values: debug, release, beta.
+                  Default is: debug.
+
+BUILD_TOOL      - Allows to choose a tool that is used for creating package. 
+                  Note that ant has been already removed from Android SDK, so 
+                  you have to use SDK <= 25.2.5 for building with ant.
+                  Possible values: ant, gradle.
+                  Default is: gradle.
+
+BUILD_TOOLS_VER - Allows to override the SDK build-tools version.
+
+SDK_PATH        - Path to SDK directory
+
+NDK_PATH        - Path to NDK directory
+
+PROJECT_VERSION - Set Supertuxkart version number, for example "0.9.3" or 
+                  "git20170409" or whatever. 
+                  Default is: git.
+
+PROJECT_CODE    - Set Supertuxkart version code that is used in the manifest 
+                  file.
+                  Default is: 1.
+
+
+
+--------------------------------------------------------------------------------
+ RELEASE BUILD
+--------------------------------------------------------------------------------
+
+Making a release build is similar to typical compilation, but there are few
+additional things to do. 
+
+You have to set PROJECT_VERSION variable. This is important, because assets 
+manager in STK checks that value and detects if already extracted data files are
+up to date. So that when you will install new STK version, this will force new 
+data extraction automatically.
+
+The PROJECT_CODE variable typically should be set to a value higher than for
+previous release, so that users will receive the upgrade.
+
+Before compilation you have to set:
+
+    export BUILD_TYPE=release
+
+and then you make standard compilation with:
+
+    ./generate_assets.sh
+    ./make.sh -j5
+    
+
+The compiled apk is unsigned, so you have to sign it with your key. To sign it,
+you have to run:
+
+    jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore \
+        my-release-key.keystore SuperTuxKart-release-unsigned.apk alias_name
+        
+and then:
+
+    zipalign -v 4 SuperTuxKart-release-unsigned.apk SuperTuxKart-release.apk
--- a/android/banner.png
+++ b/android/banner.png
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -0,0 +1,31 @@
+buildscript
+{
+    repositories
+    {
+        jcenter()
+    }
+
+    dependencies
+    {
+        classpath 'com.android.tools.build:gradle:2.2.3'
+    }
+}
+
+apply plugin: 'com.android.application'
+
+android
+{
+    compileSdkVersion compile_sdk_version.toInteger()
+    buildToolsVersion build_tools_ver
+
+    sourceSets
+    {
+        main
+        {
+            manifest.srcFile 'AndroidManifest.xml'
+            jniLibs.srcDirs = ['libs']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+    }
+}
--- a/android/build.xml
+++ b/android/build.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="SuperTuxKart" default="help">
+
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
--- a/android/generate_assets.sh
+++ b/android/generate_assets.sh
@@ -0,0 +1,619 @@
+#!/bin/sh
+#
+# (C) 2016-2017 Dawid Gan, under the GPLv3
+#
+# A script that generates data files for Android apk
+
+
+# Below you can find some 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.
+# 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.
+# The script needs imagemagick, pngquant and ogg utils installed in order 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 ASSETS_PATHS="../data                    \
+                     ../../stk-assets           \
+                     ../../supertuxkart-assets"
+
+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 \
+                                 data/models/traffic_light.png"
+
+export BLACKLIST_FILES="data/music/cocoa_river_fast.ogg2"
+
+################################################################################
+
+export LANG=C
+
+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
+done
+
+if [ -z $ASSETS_PATH_FOUND ]; then
+    echo "Couldn't find assets path"
+    exit 1
+fi
+
+if [ ! -d "../data" ]; then
+    echo "Couldn't find data directory"
+    exit 1
+fi
+
+
+# Clear previous assets directory
+echo "Clear previous assets directory"
+rm -rf assets
+
+
+# Copy all assets
+echo "Copy all assets"
+
+mkdir -p assets/data
+
+for DIR in `ls $ASSETS_PATH`; do
+    CAN_BE_COPIED=0
+
+    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;
+
+    if [ $CAN_BE_COPIED -gt 0 ]; then
+        cp -a "$ASSETS_PATH/$DIR" assets/data/
+    fi
+done;
+
+
+# Copy selected tracks
+echo "Copy selected tracks"
+
+mkdir -p assets/data/tracks
+
+for DIR in `ls $ASSETS_PATH/tracks`; do
+    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 [ $CAN_BE_COPIED -gt 0 ]; then
+        cp -a "$ASSETS_PATH/tracks/$DIR" assets/data/tracks/
+    fi
+done
+
+
+# Copy selected karts
+echo "Copy selected karts"
+
+mkdir -p assets/data/karts
+
+for DIR in `ls $ASSETS_PATH/karts`; do
+    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 [ $CAN_BE_COPIED -gt 0 ]; then
+        cp -a "$ASSETS_PATH/karts/$DIR" assets/data/karts/
+    fi
+done
+
+
+# Decrease assets quality in order to save some disk space and RAM
+echo "Decrease assets quality"
+
+convert_image()
+{
+    FILE="$1"
+    FILE_TYPE="$2"
+    echo "Convert file: $FILE"
+
+    if [ ! -f "$FILE" ]; then
+        echo "  File doesn't exist."
+        return
+    fi
+
+    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
+    
+    SCALE_CMD=""
+    QUALITY_CMD=""
+
+    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
+
+        SCALE_CMD="-scale ${SCALED_W}x${SCALED_H}"
+    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_sound()
+{
+    FILE="$1"
+    echo "Convert file: $FILE"
+
+    if [ ! -f "$FILE" ]; then
+        echo "  File doesn't exist."
+        return
+    fi
+
+    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
+}
+
+optimize_png()
+{
+    FILE="$1"
+    echo "Optimize file: $FILE"
+
+    if [ ! -f "$FILE" ]; then
+        echo "  File doesn't exist."
+        return
+    fi
+    
+    pngquant --force --skip-if-larger --output "$FILE" -- "$FILE"
+}
+
+convert_to_jpg()
+{
+    FILE="$1"
+    echo "Convert file to jpg: $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 "Extract b3dz 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 "Update b3d 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 "Update spm 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`
+      
+        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_xml()
+{
+    FILE="$1"
+    echo "Update xml 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
+fi
+
+if [ $DECREASE_QUALITY -gt 0 ]; then
+    find assets/data -iname "*.png" | while read f; do optimize_png "$f" "png"; done
+fi
+
+
+# Copy data directory
+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'
+fi
+
+
+# Generate directories list
+echo "Generate directories list"
+find assets/* -type d > assets/directories.txt
+sed -i s/'.\/assets\/'// assets/directories.txt
+sed -i s/'assets\/'// assets/directories.txt
+
+
+# It will be probably ignored by ant, but create it anyway...
+touch assets/.nomedia
+
+
+echo "Done."
+exit 0
--- a/android/icon-dbg.png
+++ b/android/icon-dbg.png
--- a/data/gui/karts.png
+++ b/data/gui/karts.png
--- a/android/make.sh
+++ b/android/make.sh
@@ -0,0 +1,497 @@
+#!/bin/sh
+#
+# (C) 2016-2017 Dawid Gan, under the GPLv3
+#
+# A script that creates the apk build
+
+
+export DIRNAME=$(realpath "$(dirname "$0")")
+
+export NDK_PATH_DEFAULT="$DIRNAME/android-ndk"
+export SDK_PATH_DEFAULT="$DIRNAME/android-sdk"
+
+export NDK_TOOLCHAIN_PATH="$DIRNAME/obj/bin"
+export NDK_BUILD_SCRIPT="$DIRNAME/Android.mk"
+export PATH="$DIRNAME/obj/bin:$PATH"
+export CROSS_SYSROOT="$DIRNAME/obj/sysroot"
+
+#export NDK_CCACHE=ccache
+export NDK_CPPFLAGS="-O3 -g"
+
+export NDK_ABI_ARMV7=armeabi-v7a
+export ARCH_ARMV7=arm
+export HOST_ARMV7=arm-linux-androideabi
+export NDK_PLATFORM_ARMV7=android-19
+export MIN_SDK_VERSION_ARMV7=19
+export TARGET_SDK_VERSION_ARMV7=26
+export COMPILE_SDK_VERSION_ARMV7=26
+
+export NDK_ABI_AARCH64=arm64-v8a
+export ARCH_AARCH64=arm64
+export HOST_AARCH64=aarch64-linux-android
+export NDK_PLATFORM_AARCH64=android-21
+export MIN_SDK_VERSION_AARCH64=21
+export TARGET_SDK_VERSION_AARCH64=26
+export COMPILE_SDK_VERSION_AARCH64=26
+
+export NDK_ABI_X86=x86
+export ARCH_X86=x86
+export HOST_X86=i686-linux-android
+export NDK_PLATFORM_X86=android-19
+export MIN_SDK_VERSION_X86=19
+export TARGET_SDK_VERSION_X86=26
+export COMPILE_SDK_VERSION_X86=26
+
+export NDK_ABI_X86_64=x86_64
+export ARCH_X86_64=x86_64
+export HOST_X86_64=x86_64-linux-android
+export NDK_PLATFORM_X86_64=android-21
+export MIN_SDK_VERSION_X86_64=21
+export TARGET_SDK_VERSION_X86_64=26
+export COMPILE_SDK_VERSION_X86_64=26
+
+export APP_NAME_RELEASE="SuperTuxKart"
+export PACKAGE_NAME_RELEASE="org.supertuxkart.stk"
+export APP_DIR_NAME_RELEASE="supertuxkart"
+export APP_ICON_RELEASE="$DIRNAME/icon.png"
+
+export APP_NAME_BETA="SuperTuxKart Beta"
+export PACKAGE_NAME_BETA="org.supertuxkart.stk_beta"
+export APP_DIR_NAME_BETA="supertuxkart-beta"
+export APP_ICON_BETA="$DIRNAME/icon-dbg.png"
+
+export APP_NAME_DEBUG="SuperTuxKart Debug"
+export PACKAGE_NAME_DEBUG="org.supertuxkart.stk_dbg"
+export APP_DIR_NAME_DEBUG="supertuxkart-dbg"
+export APP_ICON_DEBUG="$DIRNAME/icon-dbg.png"
+
+
+# A helper function that checks if error ocurred
+check_error()
+{
+    if [ $? -gt 0 ]; then
+        echo "Error ocurred."
+        exit
+    fi
+}
+
+# Handle clean command
+if [ ! -z "$1" ] && [ "$1" = "clean" ]; then
+    rm -rf "$DIRNAME/bin"
+    rm -rf "$DIRNAME/build"
+    rm -rf "$DIRNAME/libs"
+    rm -rf "$DIRNAME/obj"
+    rm -rf "$DIRNAME/res"
+    rm -rf "$DIRNAME/.gradle"
+    exit
+fi
+
+# Check if compilation for different platform has been started before
+if [ -f "$DIRNAME/obj/compile_arch" ]; then
+    PROJECT_ARCH=$(cat "$DIRNAME/obj/compile_arch") 
+    
+    if [ -z "$COMPILE_ARCH" ]; then
+        COMPILE_ARCH="$PROJECT_ARCH"
+    elif [ "$PROJECT_ARCH" != "$COMPILE_ARCH" ]; then
+        echo "Error: Compilation for different platform has been already made."
+        echo "Run './make.sh clean' first or set COMPILE_ARCH variable" \
+             "to '$PROJECT_ARCH.'"
+        exit
+    fi
+fi
+
+# Update variables for selected architecture
+if [ -z "$COMPILE_ARCH" ]; then
+    COMPILE_ARCH="armv7"
+fi
+
+if [ "$COMPILE_ARCH" = "armv7" ]; then
+    export NDK_PLATFORM=$NDK_PLATFORM_ARMV7
+    export NDK_ABI=$NDK_ABI_ARMV7
+    export ARCH=$ARCH_ARMV7
+    export HOST=$HOST_ARMV7
+    export MIN_SDK_VERSION=$MIN_SDK_VERSION_ARMV7
+    export TARGET_SDK_VERSION=$TARGET_SDK_VERSION_ARMV7
+    export COMPILE_SDK_VERSION=$COMPILE_SDK_VERSION_ARMV7
+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 MIN_SDK_VERSION=$MIN_SDK_VERSION_AARCH64
+    export TARGET_SDK_VERSION=$TARGET_SDK_VERSION_AARCH64
+    export COMPILE_SDK_VERSION=$COMPILE_SDK_VERSION_AARCH64
+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 MIN_SDK_VERSION=$MIN_SDK_VERSION_X86
+    export TARGET_SDK_VERSION=$TARGET_SDK_VERSION_X86
+    export COMPILE_SDK_VERSION=$COMPILE_SDK_VERSION_X86
+elif [ "$COMPILE_ARCH" = "x86_64" ]; then
+    export NDK_PLATFORM=$NDK_PLATFORM_X86_64
+    export NDK_ABI=$NDK_ABI_X86_64
+    export ARCH=$ARCH_X86_64
+    export HOST=$HOST_X86_64
+    export MIN_SDK_VERSION=$MIN_SDK_VERSION_X86_64
+    export TARGET_SDK_VERSION=$TARGET_SDK_VERSION_X86_64
+    export COMPILE_SDK_VERSION=$COMPILE_SDK_VERSION_X86_64
+else
+    echo "Unknow COMPILE_ARCH: $COMPILE_ARCH. Possible values are: " \
+         "armv7, aarch64, x86, x86_64"
+    exit
+fi
+
+# Update variables for selected build type
+if [ -z "$BUILD_TYPE" ]; then
+    BUILD_TYPE="debug"
+fi
+
+if [ "$BUILD_TYPE" = "debug" ] || [ "$BUILD_TYPE" = "Debug" ]; then
+    export ANT_BUILD_TYPE="debug"
+    export GRADLE_BUILD_TYPE="assembleDebug"
+    export IS_DEBUG_BUILD=1
+    export APP_NAME="$APP_NAME_DEBUG"
+    export PACKAGE_NAME="$PACKAGE_NAME_DEBUG"
+    export APP_DIR_NAME="$APP_DIR_NAME_DEBUG"
+    export APP_ICON="$APP_ICON_DEBUG"
+elif [ "$BUILD_TYPE" = "release" ] || [ "$BUILD_TYPE" = "Release" ]; then
+    export ANT_BUILD_TYPE="release"
+    export GRADLE_BUILD_TYPE="assembleRelease"
+    export IS_DEBUG_BUILD=0
+    export APP_NAME="$APP_NAME_RELEASE"
+    export PACKAGE_NAME="$PACKAGE_NAME_RELEASE"
+    export APP_DIR_NAME="$APP_DIR_NAME_RELEASE"
+    export APP_ICON="$APP_ICON_RELEASE"
+elif [ "$BUILD_TYPE" = "beta" ] || [ "$BUILD_TYPE" = "Beta" ]; then
+    export ANT_BUILD_TYPE="release"
+    export GRADLE_BUILD_TYPE="assembleRelease"
+    export IS_DEBUG_BUILD=0
+    export APP_NAME="$APP_NAME_BETA"
+    export PACKAGE_NAME="$PACKAGE_NAME_BETA"
+    export APP_DIR_NAME="$APP_DIR_NAME_BETA"
+    export APP_ICON="$APP_ICON_BETA"
+else
+    echo "Unsupported BUILD_TYPE: $BUILD_TYPE. Possible values are: " \
+         "debug, release"
+    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"
+fi
+
+if [ -z "$SDK_PATH" ]; then
+    export SDK_PATH="$SDK_PATH_DEFAULT"
+fi
+
+NDK_PATH=$(realpath "$NDK_PATH")
+SDK_PATH=$(realpath "$SDK_PATH")
+
+if [ ! -d "$NDK_PATH" ]; then
+    echo "Error: Couldn't find $NDK_PATH directory. Please create a symlink" \
+         "to your Android NDK installation in the $NDK_PATH_DEFAULT or set"  \
+         "proper path in the NDK_PATH variable"
+    exit
+fi
+
+if [ ! -d "$SDK_PATH" ]; then
+    echo "Error: Couldn't find $SDK_PATH directory. Please create a symlink" \
+         "to your Android SDK installation in the $SDK_PATH_DEFAULT or set"  \
+         "proper path in the SDK_PATH variable"
+    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
+
+# Set project version and code
+if [ -f "$DIRNAME/obj/project_version" ]; then
+    PROJECT_VERSION_PREV=$(cat "$DIRNAME/obj/project_version") 
+    
+    if [ -z "$PROJECT_VERSION" ]; then
+        export PROJECT_VERSION="$PROJECT_VERSION_PREV"
+    elif [ "$PROJECT_VERSION" != "$PROJECT_VERSION_PREV" ]; then
+        echo "Different project version has been set. Forcing recompilation..."
+        touch -c "$DIRNAME/Android.mk"
+    fi
+fi
+
+if [ -z "$PROJECT_VERSION" ]; then
+    if [ $IS_DEBUG_BUILD -ne 0 ]; then
+        export PROJECT_VERSION="git"
+    else
+        echo "Error: Variable PROJECT_VERSION is not set. It must have unique" \
+             "value for release build."
+        exit
+    fi
+fi
+
+if [ -z "$PROJECT_CODE" ]; then
+    if [ $IS_DEBUG_BUILD -ne 0 ]; then
+        PROJECT_CODE="1"
+    else
+        echo "Error: Variable PROJECT_CODE is not set."
+        exit
+    fi
+fi
+
+if [ -d "$DIRNAME/assets/data" ]; then
+    if [ ! -f "$DIRNAME/assets/data/supertuxkart.$PROJECT_VERSION" ]; then
+        echo "Error: supertuxkart.$PROJECT_VERSION doesn't exist in" \
+             "assets/data directory."
+        exit
+    fi
+fi
+
+# Standalone toolchain
+if [ ! -f "$DIRNAME/obj/make_standalone_toolchain.stamp" ]; then
+    echo "Creating standalone toolchain"
+    rm -rf "$DIRNAME/obj"
+    ${NDK_PATH}/build/tools/make-standalone-toolchain.sh \
+        --platform=$NDK_PLATFORM                         \
+        --install-dir="$DIRNAME/obj/"                    \
+        --arch=$ARCH
+    check_error
+    touch "$DIRNAME/obj/make_standalone_toolchain.stamp"
+    echo $COMPILE_ARCH > "$DIRNAME/obj/compile_arch"
+fi
+
+echo "$PROJECT_VERSION" > "$DIRNAME/obj/project_version"
+
+# Freetype
+if [ ! -f "$DIRNAME/obj/freetype.stamp" ]; then
+    echo "Compiling freetype"
+    mkdir -p "$DIRNAME/obj/freetype"
+    cp -a -f "$DIRNAME/../lib/freetype/"* "$DIRNAME/obj/freetype"
+
+    cd "$DIRNAME/obj/freetype"
+    ./configure --host=$HOST          \
+                --without-zlib        \
+                --without-png         \
+                --without-harfbuzz &&
+    make $@
+    check_error
+    touch "$DIRNAME/obj/freetype.stamp"
+fi
+
+# Zlib
+if [ ! -f "$DIRNAME/obj/zlib.stamp" ]; then
+    echo "Compiling zlib"
+    mkdir -p "$DIRNAME/obj/zlib"
+    cp -a -f "$DIRNAME/../lib/zlib/"* "$DIRNAME/obj/zlib"
+
+    cd "$DIRNAME/obj/zlib"
+    cmake . -DCMAKE_TOOLCHAIN_FILE=../../../cmake/Toolchain-android.cmake \
+            -DHOST=$HOST &&
+    make $@
+    check_error
+    touch "$DIRNAME/obj/zlib.stamp"
+fi
+
+# Libpng
+if [ ! -f "$DIRNAME/obj/libpng.stamp" ]; then
+    echo "Compiling libpng"
+    mkdir -p "$DIRNAME/obj/libpng"
+    mkdir -p "$DIRNAME/obj/libpng/lib"
+    cp -a -f "$DIRNAME/../lib/libpng/"* "$DIRNAME/obj/libpng"
+
+    cd "$DIRNAME/obj/libpng"
+    cmake . -DCMAKE_TOOLCHAIN_FILE=../../../cmake/Toolchain-android.cmake \
+            -DHOST=$HOST                                                  \
+            -DZLIB_LIBRARY="$DIRNAME/obj/zlib/libz.a"                     \
+            -DZLIB_INCLUDE_DIR="$DIRNAME/obj/zlib/"                       \
+            -DPNG_TESTS=0 &&
+    make $@
+    check_error
+    touch "$DIRNAME/obj/libpng.stamp"
+fi
+
+# Openal
+if [ ! -f "$DIRNAME/obj/openal.stamp" ]; then
+    echo "Compiling openal"
+    mkdir -p "$DIRNAME/obj/openal"
+    cp -a -f "$DIRNAME/../lib/openal/"* "$DIRNAME/obj/openal"
+
+    cd "$DIRNAME/obj/openal"
+    cmake . -DCMAKE_TOOLCHAIN_FILE=../../../cmake/Toolchain-android.cmake \
+            -DHOST=$HOST                                                  \
+            -DALSOFT_UTILS=0                                              \
+            -DALSOFT_EXAMPLES=0                                           \
+            -DALSOFT_TESTS=0                                              \
+            -DLIBTYPE=STATIC &&
+    make $@
+    check_error
+    touch "$DIRNAME/obj/openal.stamp"
+fi
+
+# OpenSSL
+if [ ! -f "$DIRNAME/obj/openssl.stamp" ]; then
+    echo "Compiling openssl"
+    mkdir -p "$DIRNAME/obj/openssl"
+    cp -a -f "$DIRNAME/../lib/openssl/"* "$DIRNAME/obj/openssl"
+
+    cd "$DIRNAME/obj/openssl"
+    ./Configure android --cross-compile-prefix="$HOST-"
+    make $@
+    check_error
+    touch "$DIRNAME/obj/openssl.stamp"
+fi
+
+# Curl
+if [ ! -f "$DIRNAME/obj/curl.stamp" ]; then
+    echo "Compiling curl"
+    mkdir -p "$DIRNAME/obj/curl"
+    cp -a -f "$DIRNAME/../lib/curl/"* "$DIRNAME/obj/curl"
+
+    cd "$DIRNAME/obj/curl"
+    CPPFLAGS="-I$DIRNAME/obj/openssl/include -I$DIRNAME/obj/zlib $CPPFLAGS" \
+    LDFLAGS="-L$DIRNAME/obj/openssl/ -L$DIRNAME/obj/zlib $LDFLAGS"          \
+    ./configure --host=$HOST                            \
+                --with-ssl                              \
+                --disable-shared                        \
+                --enable-static                         \
+                --enable-threaded-resolver &&
+    make $@
+    check_error
+    touch "$DIRNAME/obj/curl.stamp"
+fi
+
+# Jpeglib
+if [ ! -f "$DIRNAME/obj/jpeglib.stamp" ]; then
+    echo "Compiling jpeglib"
+    mkdir -p "$DIRNAME/obj/jpeglib"
+    cp -a -f "$DIRNAME/../lib/jpeglib/"* "$DIRNAME/obj/jpeglib"
+
+    cd "$DIRNAME/obj/jpeglib"
+    cmake . -DCMAKE_TOOLCHAIN_FILE=../../../cmake/Toolchain-android.cmake \
+            -DHOST=$HOST &&
+    make $@
+    check_error
+    touch "$DIRNAME/obj/jpeglib.stamp"
+fi
+
+# Libogg
+if [ ! -f "$DIRNAME/obj/libogg.stamp" ]; then
+    echo "Compiling libogg"
+    mkdir -p "$DIRNAME/obj/libogg"
+    cp -a -f "$DIRNAME/../lib/libogg/"* "$DIRNAME/obj/libogg"
+
+    cd "$DIRNAME/obj/libogg"
+    ./configure --host=$HOST &&
+    make $@
+    check_error
+    touch "$DIRNAME/obj/libogg.stamp"
+fi
+
+# Libvorbis
+if [ ! -f "$DIRNAME/obj/libvorbis.stamp" ]; then
+    echo "Compiling libvorbis"
+    mkdir -p "$DIRNAME/obj/libvorbis"
+    cp -a -f "$DIRNAME/../lib/libvorbis/"* "$DIRNAME/obj/libvorbis"
+
+    cd "$DIRNAME/obj/libvorbis"
+    CPPFLAGS="-I$DIRNAME/obj/libogg/include $CPPFLAGS" \
+    LDFLAGS="-L$DIRNAME/obj/libogg/src/.libs $LDFLAGS" \
+    ./configure --host=$HOST &&
+    make $@
+    check_error
+    touch "$DIRNAME/obj/libvorbis.stamp"
+fi
+
+# STK
+echo "Compiling STK"
+cd "$DIRNAME"
+${NDK_PATH}/ndk-build $@                 \
+    APP_BUILD_SCRIPT="$NDK_BUILD_SCRIPT" \
+    APP_ABI="$NDK_ABI"                   \
+    APP_PLATFORM="$NDK_PLATFORM"         \
+    APP_CPPFLAGS="$NDK_CPPFLAGS"         \
+    APP_STL=gnustl_static                \
+    NDK_DEBUG=$IS_DEBUG_BUILD
+
+check_error
+
+# Build apk
+echo "Building APK"
+
+mkdir -p "$DIRNAME/res/drawable/"
+mkdir -p "$DIRNAME/res/drawable-hdpi/"
+mkdir -p "$DIRNAME/res/drawable-mdpi/"
+mkdir -p "$DIRNAME/res/drawable-xhdpi/"
+mkdir -p "$DIRNAME/res/drawable-xxhdpi/"
+mkdir -p "$DIRNAME/res/values/"
+
+STRINGS_FILE="$DIRNAME/res/values/strings.xml"
+
+echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>"       >  "$STRINGS_FILE"
+echo "<resources>"                                      >> "$STRINGS_FILE"
+echo "    <string name=\"app_name\">$APP_NAME</string>" >> "$STRINGS_FILE"
+echo "</resources>"                                     >> "$STRINGS_FILE"
+
+sed -i "s/minSdkVersion=\".*\"/minSdkVersion=\"$MIN_SDK_VERSION\"/g" \
+       "$DIRNAME/AndroidManifest.xml"
+       
+sed -i "s/targetSdkVersion=\".*\"/targetSdkVersion=\"$TARGET_SDK_VERSION\"/g" \
+       "$DIRNAME/AndroidManifest.xml"
+       
+sed -i "s/package=\".*\"/package=\"$PACKAGE_NAME\"/g" \
+       "$DIRNAME/AndroidManifest.xml"
+       
+sed -i "s/versionName=\".*\"/versionName=\"$PROJECT_VERSION\"/g" \
+       "$DIRNAME/AndroidManifest.xml"
+       
+sed -i "s/versionCode=\".*\"/versionCode=\"$PROJECT_CODE\"/g" \
+       "$DIRNAME/AndroidManifest.xml"
+       
+cp "banner.png" "$DIRNAME/res/drawable/banner.png"
+cp "$APP_ICON" "$DIRNAME/res/drawable/icon.png"
+convert -scale 72x72 "$APP_ICON" "$DIRNAME/res/drawable-hdpi/icon.png"
+convert -scale 48x48 "$APP_ICON" "$DIRNAME/res/drawable-mdpi/icon.png"
+convert -scale 96x96 "$APP_ICON" "$DIRNAME/res/drawable-xhdpi/icon.png"
+convert -scale 144x144 "$APP_ICON" "$DIRNAME/res/drawable-xxhdpi/icon.png"
+
+if [ -f "/usr/lib/jvm/java-8-openjdk-amd64/bin/java" ]; then
+    export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64"
+    export PATH=$JAVA_HOME/bin:$PATH
+fi
+
+if [ "$BUILD_TOOL" = "gradle" ]; then
+    export ANDROID_HOME="$SDK_PATH"
+    gradle -Pcompile_sdk_version=$COMPILE_SDK_VERSION \
+           -Pbuild_tools_ver="$BUILD_TOOLS_VER"       \
+           $GRADLE_BUILD_TYPE
+elif [ "$BUILD_TOOL" = "ant" ]; then
+    ant -Dsdk.dir="$SDK_PATH"  \
+        -Dtarget="android-$TARGET_SDK_VERSION" \
+        $ANT_BUILD_TYPE
+fi
+
+check_error
--- a/cmake/FindAngelscript.cmake
+++ b/cmake/FindAngelscript.cmake
@@ -0,0 +1,33 @@
+# - Try to find angelscript
+# Once done this will define
+#
+#  ANGELSCRIPT_FOUND - system has angelscript
+#  Angelscript_INCLUDE_DIRS - the angelscript include directory
+#  Angelscript_LIBRARIES - the libraries needed to use angelscript
+#
+
+FIND_PATH(Angelscript_INCLUDE_DIRS angelscript.h
+    PATHS
+    /usr/local
+    /usr
+    PATH_SUFFIXES include
+    )
+
+FIND_LIBRARY(Angelscript_LIBRARY
+    NAMES angelscript angelscript_s
+    PATHS
+    /usr/local
+    /usr
+    PATH_SUFFIXES lib lib64 lib32
+    )
+
+# handle the QUIETLY and REQUIRED arguments and set ANGELSCRIPT_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Angelscript DEFAULT_MSG Angelscript_LIBRARY Angelscript_INCLUDE_DIRS)
+
+IF (ANGELSCRIPT_FOUND)
+    SET(Angelscript_LIBRARIES ${Angelscript_LIBRARY})
+ENDIF (ANGELSCRIPT_FOUND)
+
+MARK_AS_ADVANCED(Angelscript_LIBRARY Angelscript_LIBRARIES Angelscript_INCLUDE_DIRS)
--- a/cmake/FindEGL.cmake
+++ b/cmake/FindEGL.cmake
@@ -0,0 +1,18 @@
+# - 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
@@ -0,0 +1,29 @@
+# - Find Freetype
+# Find the Freetype includes and libraries
+#
+# Following variables are provided:
+# FREETYPE_FOUND
+#     True if Freetype has been found
+# FREETYPE_INCLUDE_DIRS
+#     The include directories of Freetype
+# FREETYPE_LIBRARIES
+#     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")
+    set(FREETYPE_FOUND 1)
+    set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
+elseif(APPLE)
+    find_path(FREETYPE_INCLUDE_DIRS NAMES freetype/freetype.h PATHS "/Library/Frameworks/FreeType.Framework/Versions/2.4/unix/include")
+    find_library(FREETYPE_LIBRARY NAMES freetype PATHS "/Library/Frameworks/FreeType.Framework/Versions/2.4/")
+    include_directories(/Library/Frameworks/FreeType.Framework/Versions/2.4/unix/include)
+    set(FREETYPE_FOUND 1)
+    set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
+elseif(UNIX)
+    include(FindPkgConfig)
+    pkg_check_modules(FREETYPE freetype2)
+else()
+    set(FREETYPE_FOUND 0)
+endif()
+
--- a/cmake/FindFribidi.cmake
+++ b/cmake/FindFribidi.cmake
@@ -9,14 +9,7 @@
 # FRIBIDI_LIBRARIES
 #     Fribidi library list

-if(APPLE)
-    set(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h PATHS /Library/Frameworks/fribidi.framework/Headers)
-    find_library(FRIBIDI_LIBRARY NAMES fribidi PATHS /Library/Frameworks/fribidi.framework)
-    set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
-    include_directories(/Library/Frameworks/fribidi.framework/Headers)
-    #add_definitions(-framework fribidi)
-    set(FRIBIDI_FOUND 1)
-elseif(UNIX)
+if(UNIX AND NOT APPLE)
    include(FindPkgConfig)
    pkg_check_modules(FRIBIDI fribidi)
 else()
@@ -24,8 +17,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/FindLibbfd.cmake
+++ b/cmake/FindLibbfd.cmake
@@ -0,0 +1,89 @@
+# - Try to find libbfd
+# Once done this will define
+#
+#  LIBBFD_FOUND - system has libbfd
+#  LIBBFD_INCLUDE_DIRS - the libbfd include directory
+#  LIBBFD_LIBRARIES - Link these to use libbfd
+#  LIBBFD_DEFINITIONS - Compiler switches required for using libbfd
+#
+# Based on:
+#
+#  Copyright (c) 2008 Bernhard Walle <bernhard.walle@gmx.de>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (LIBBFD_LIBRARIES AND LIBBFD_INCLUDE_DIRS)
+  set (LIBBFD_FIND_QUIETLY TRUE)
+endif ()
+
+find_path (LIBBFD_INCLUDE_DIRS
+    NAMES
+      bfd.h
+      dis-asm.h
+    PATHS
+      /usr/include
+      /usr/local/include
+      /opt/local/include
+      /opt/include
+      ENV CPATH)
+
+# Ugly, yes ugly...
+find_library (LIBBFD_BFD_LIBRARY
+    NAMES
+      bfd
+    PATHS
+      /usr/lib
+      /usr/lib64
+      /usr/local/lib
+      /usr/local/lib64
+      /usr/include
+      /opt/local/lib
+      /opt/usr/lib64
+      ENV LIBRARY_PATH
+      ENV LD_LIBRARY_PATH)
+
+#find_library (LIBBFD_IBERTY_LIBRARY
+#    NAMES
+#      iberty
+#    PATHS
+#      /usr/lib
+#      /usr/lib64
+#      /usr/local/lib
+#      /usr/local/lib64
+#      /usr/include
+#      /opt/local/lib
+#      /opt/usr/lib64
+#      ENV LIBRARY_PATH
+#      ENV LD_LIBRARY_PATH)
+
+#find_library (LIBBFD_OPCODES_LIBRARY
+#    NAMES
+#      opcodes
+#    PATHS
+#      /usr/lib
+#      /usr/lib64
+#      /usr/local/lib
+#      /usr/local/lib64
+#      /usr/include
+#      /opt/local/lib
+#      /opt/usr/lib64
+#      ENV LIBRARY_PATH
+#      ENV LD_LIBRARY_PATH)
+
+
+include (FindPackageHandleStandardArgs)
+
+
+# handle the QUIETLY and REQUIRED arguments and set LIBBFD_FOUND to TRUE if all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBBFD DEFAULT_MSG
+    LIBBFD_BFD_LIBRARY
+#    LIBBFD_IBERTY_LIBRARY
+#    LIBBFD_OPCODES_LIBRARY
+    LIBBFD_INCLUDE_DIRS)
+
+set(LIBBFD_LIBRARIES "${LIBBFD_BFD_LIBRARY}")
+mark_as_advanced(LIBBFD_INCLUDE_DIRS LIBBFD_LIBRARIES LIBBFD_BFD_LIBRARY)
--- a/cmake/FindOggVorbis.cmake
+++ b/cmake/FindOggVorbis.cmake
@@ -10,21 +10,13 @@
 #     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_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/")
-    set(OGGVORBIS_VORBIS_INCLUDE_DIR "/Library/Frameworks/Vorbis.framework/Headers/")
-endif()
-
-if(APPLE AND NOT OGGVORBIS_VORBISFILE_LIBRARY)
-    # Seems to be the same on Apple systems
-    set(OGGVORBIS_VORBISFILE_LIBRARY ${OGGVORBIS_VORBIS_LIBRARY})
-endif()

 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(OggVorbis DEFAULT_MSG
@@ -33,8 +25,8 @@ find_package_handle_standard_args(OggVorbis DEFAULT_MSG

 # Publish variables
 set(OGGVORBIS_INCLUDE_DIRS ${OGGVORBIS_OGG_INCLUDE_DIR} ${OGGVORBIS_VORBIS_INCLUDE_DIR})
-set(OGGVORBIS_LIBRARIES ${OGGVORBIS_OGG_LIBRARY} ${OGGVORBIS_VORBIS_LIBRARY} ${OGGVORBIS_VORBISFILE_LIBRARY})
+set(OGGVORBIS_LIBRARIES ${OGGVORBIS_OGG_LIBRARY} ${OGGVORBIS_VORBIS_LIBRARY} ${OGGVORBIS_VORBISFILE_LIBRARY} ${OGGVORBIS_VORBISENC_LIBRARY})
 list(REMOVE_DUPLICATES OGGVORBIS_INCLUDE_DIRS)
 list(REMOVE_DUPLICATES OGGVORBIS_LIBRARIES)
 mark_as_advanced(OGGVORBIS_OGG_INCLUDE_DIR OGGVORBIS_VORBIS_INCLUDE_DIR)
-mark_as_advanced(OGGVORBIS_OGG_LIBRARY OGGVORBIS_VORBIS_LIBRARY OGGVORBIS_VORBISFILE_LIBRARY)
+mark_as_advanced(OGGVORBIS_OGG_LIBRARY OGGVORBIS_VORBIS_LIBRARY OGGVORBIS_VORBISFILE_LIBRARY OGGVORBIS_VORBISENC_LIBRARY)
--- a/cmake/FindWayland.cmake
+++ b/cmake/FindWayland.cmake
@@ -0,0 +1,52 @@
+# - 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
@@ -1,18 +0,0 @@
-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-android.cmake
+++ b/cmake/Toolchain-android.cmake
@@ -0,0 +1,32 @@
+# Cross-compiling requires CMake 2.6 or newer. Example:
+# cmake .. -DCMAKE_TOOLCHAIN_FILE=../XCompile-Android.txt -DHOST=arm-linux-androideabi
+# Where 'arm-linux-androideabi' is the host prefix for the cross-compiler. If
+# you already have a toolchain file setup, you may use that instead of this
+# file. Make sure to set CMAKE_FIND_ROOT_PATH to where the NDK toolchain was
+# installed (e.g. "$ENV{HOME}/toolchains/arm-linux-androideabi-r10c-21").
+
+# the name of the target operating system
+SET(CMAKE_SYSTEM_NAME Linux)
+
+# which compilers to use for C and C++
+SET(CMAKE_C_COMPILER "${HOST}-gcc")
+SET(CMAKE_CXX_COMPILER "${HOST}-g++")
+SET(CMAKE_RC_COMPILER "${HOST}-windres")
+
+# here is the target environment located
+SET(CMAKE_FIND_ROOT_PATH $ENV{NDK_TOOLCHAIN_PATH})
+
+# here is where stuff gets installed to
+SET(CMAKE_INSTALL_PREFIX "${CMAKE_FIND_ROOT_PATH}" CACHE STRING "Install path prefix, prepended onto install directories." FORCE)
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search 
+# programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+# set env vars so that pkg-config will look in the appropriate directory for
+# .pc files (as there seems to be no way to force using ${HOST}-pkg-config)
+set(ENV{PKG_CONFIG_LIBDIR} "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
+set(ENV{PKG_CONFIG_PATH} "")
--- a/cmake/Toolchain-mingw-64bit.cmake
+++ b/cmake/Toolchain-mingw-64bit.cmake
@@ -0,0 +1,23 @@
+# Usage:
+# cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw-64bit.cmake 
+
+# the name of the target operating system
+SET(CMAKE_SYSTEM_NAME Windows)
+
+# which compilers to use for C and C++
+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-mingw-64bit ${PROJECT_SOURCE_DIR}/dependencies-64bit)
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search
+# programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ALWAYS)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
--- a/cmake/Toolchain-mingw.cmake
+++ b/cmake/Toolchain-mingw.cmake
@@ -1,3 +1,6 @@
+# Usage:
+# cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw.cmake 
+
 # the name of the target operating system
 SET(CMAKE_SYSTEM_NAME Windows)

@@ -6,8 +9,11 @@ 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/4.9-posix ${PROJECT_SOURCE_DIR}/dependencies)
+SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32 /usr/lib/gcc/i686-w64-mingw32/${MINGW_DEPS_FOLDER}/ ${PROJECT_SOURCE_DIR}/dependencies-mingw ${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
--- a/data/achievements.xml
+++ b/data/achievements.xml
@@ -2,9 +2,9 @@
 <achievements>
  <achievement id="1" check-type="all-at-least" reset-type="never"
               name="Christoffel Columbus" description="Play every official track at least once." >
-      <city goal="1"/>
+      <candela_city goal="1"/>
      <cocoa_temple goal="1"/>
-      <farm goal="1"/>
+      <cornfield_crossing goal="1"/>
      <fortmagma goal="1"/>
      <gran_paradiso_island goal="1"/>
      <greenvalley goal="1"/>
@@ -19,9 +19,10 @@
      <snowmountain goal="1"/>
      <snowtuxpeak goal="1"/>
      <stk_enterprise goal="1"/>
-      <subsea goal="1"/>
+      <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.">
@@ -40,7 +41,7 @@
    <skidding goal="5"/>
  </achievement>
  <achievement id="6" check-type="all-at-least" reset-type="never"
-               name="Gold driver" description="Win in all single player modes, against at least 3 opponents.">
+               name="Gold driver" description="Win against at least 3 opponents in all single player modes.">
    <standard goal="1"/>
    <std_timetrial goal="1"/>
    <follow_leader goal="1"/>
--- a/data/challenges/abyss.challenge
+++ b/data/challenges/abyss.challenge
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="abyss" laps="3" reverse="false"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="0"/>
+    
+    <best>
+        <karts number="7"/>
+        <requirements position="1" time="140"/>
+    </best>
+    <hard>
+        <karts number="6"/>
+        <requirements position="1" time="165"/>
+    </hard>
+    <medium>
+        <karts number="5"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="4"/>
+        <requirements position="1"/>
+    </easy>
+</challenge>
--- a/data/challenges/candela_city.challenge
+++ b/data/challenges/candela_city.challenge
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="candela_city" laps="3" reverse="false"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="75"/>
+    
+    <best>
+        <karts number="9"/>
+        <requirements position="1" time="120"/>
+    </best>
+    <hard>
+        <karts number="8"/>
+        <requirements position="1"/>
+    </hard>
+    <medium>
+        <karts number="7"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="6"/>
+        <requirements position="1"/>
+    </easy>
+
+    <unlock kart="sara_the_racer"/>
+</challenge>
--- a/data/challenges/city.challenge
+++ b/data/challenges/city.challenge
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<challenge version="2">
-    <track id="city" laps="3"/>
-    <mode major="single" minor="quickrace"/>
-    <requirements trophies="70"/>
-    
-    <hard>
-        <karts number="5"/>
-        <requirements position="1"/>
-    </hard>
-    <medium>
-        <karts number="4"/>
-        <requirements position="1"/>
-    </medium>
-    <easy>
-        <karts number="3"/>
-        <requirements position="1"/>
-    </easy>
-</challenge>
--- a/data/challenges/cocoa_temple.challenge
+++ b/data/challenges/cocoa_temple.challenge
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="cocoa_temple" laps="3" reverse="false"/>
+    <mode major="single" minor="timetrial"/>
+    <requirements trophies="0"/>
+
+    <best>
+        <karts number="1"
+               replay_file="challenge_cocoa_temple_supertux.replay"/>
+        <requirements position="1"/>
+    </best>
+    <hard>
+        <karts number="1"
+               replay_file="challenge_cocoa_temple_expert.replay"/>
+        <requirements position="1"/>
+    </hard>
+    <medium>
+        <karts number="1"
+               replay_file="challenge_cocoa_temple_intermediate.replay"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="1"
+               replay_file="challenge_cocoa_temple_novice.replay"/>
+        <karts number="1"/>
+        <requirements position="1"/>
+    </easy>
+
+    <unlock kart="suzanne"/>
+</challenge>
--- a/data/challenges/cornfield_crossing.challenge
+++ b/data/challenges/cornfield_crossing.challenge
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="cornfield_crossing" laps="3" reverse="false"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="0"/>
+    
+    <best>
+        <karts number="7"/>
+        <requirements position="1" time="140"/>
+    </best>
+    <hard>
+        <karts number="6"/>
+        <requirements position="1" time="165"/>
+    </hard>
+    <medium>
+        <karts number="5"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="4"/>
+        <requirements position="1"/>
+    </easy>
+</challenge>
--- a/data/challenges/farm.challenge
+++ b/data/challenges/farm.challenge
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<challenge version="2">
-    <track id="farm" laps="3"/>
-    <mode major="single" minor="quickrace"/>
-    <requirements trophies="0"/>
-    
-    <hard>
-        <karts number="5"/>
-        <requirements position="1" time="110"/>
-    </hard>
-    <medium>
-        <karts number="4"/>
-        <requirements time="125"/>
-    </medium>
-    <easy>
-        <karts number="4"/>
-        <requirements time="155"/>
-    </easy>
-</challenge>
--- a/data/challenges/fortmagma.challenge
+++ b/data/challenges/fortmagma.challenge
@@ -1,9 +1,14 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="fortmagma" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="fortmagma" laps="3" reverse="false"/>
    <mode major="single" minor="quickrace"/>
-    <requirements trophies="180"/>
+    <requirements trophies="190"/>
    
+    <best>
+        <karts number="2" aiIdent="nolok" superPower="nolokBoss"/>
+        <requirements position="1"/>
+    </best>
    <hard>
        <karts number="2" aiIdent="nolok" superPower="nolokBoss"/>
        <requirements position="1"/>
@@ -19,6 +24,5 @@

    <unlock kart="gnu"/>
    <unlock kart="nolok"/>
-    <unlock difficulty="difficulty_best"/>
    <unlock track="fortmagma"/>
 </challenge>
--- a/data/challenges/gp1.challenge
+++ b/data/challenges/gp1.challenge
@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
+<challenge version="3">
+    <unlock_list list="false"/>
    <grandprix id="1_penguinplayground"/>
    <mode major="grandprix" minor="quickrace"/>
-    <requirements trophies="40"/>
+    <requirements trophies="30"/>
    
+    <best>
+        <karts number="7"/>
+        <requirements position="1"/>
+    </best>
    <hard>
-        <karts number="5"/>
+        <karts number="6"/>
        <requirements position="1"/>
    </hard>
    <medium>
-        <karts number="4"/>
+        <karts number="5"/>
        <requirements position="1"/>
    </medium>
    <easy>
-        <karts number="3"/>
+        <karts number="4"/>
        <requirements position="1"/>
    </easy>
 </challenge>
--- a/data/challenges/gp2.challenge
+++ b/data/challenges/gp2.challenge
@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
+<challenge version="3">
+    <unlock_list list="false"/>
    <grandprix id="2_offthebeatentrack"/>
    <mode major="grandprix" minor="quickrace"/>
-    <requirements trophies="85"/>
+    <requirements trophies="70"/>
    
+    <best>
+        <karts number="8"/>
+        <requirements position="1"/>
+    </best>
    <hard>
-        <karts number="5"/>
+        <karts number="7"/>
        <requirements position="1"/>
    </hard>
    <medium>
-        <karts number="4"/>
+        <karts number="6"/>
        <requirements position="1"/>
    </medium>
    <easy>
-        <karts number="3"/>
+        <karts number="5"/>
        <requirements position="1"/>
    </easy>
 </challenge>
--- a/data/challenges/gp3.challenge
+++ b/data/challenges/gp3.challenge
@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
+<challenge version="3">
+    <unlock_list list="false"/>
    <grandprix id="3_tothemoonandback"/>
    <mode major="grandprix" minor="quickrace"/>
-    <requirements trophies="125"/>
+    <requirements trophies="120"/>
    
+    <best>
+        <karts number="9"/>
+        <requirements position="1"/>
+    </best>
    <hard>
-        <karts number="5"/>
+        <karts number="8"/>
        <requirements position="1"/>
    </hard>
    <medium>
-        <karts number="4"/>
+        <karts number="7"/>
        <requirements position="1"/>
    </medium>
    <easy>
-        <karts number="3"/>
+        <karts number="6"/>
        <requirements position="1"/>
    </easy>
 </challenge>
--- a/data/challenges/gp4.challenge
+++ b/data/challenges/gp4.challenge
@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
+<challenge version="3">
+    <unlock_list list="false"/>
    <grandprix id="4_atworldsend"/>
    <mode major="grandprix" minor="quickrace"/>
    <requirements trophies="165"/>
    
+    <best>
+        <karts number="10"/>
+        <requirements position="1"/>
+    </best>
    <hard>
-        <karts number="5"/>
+        <karts number="9"/>
        <requirements position="1"/>
    </hard>
    <medium>
-        <karts number="4"/>
+        <karts number="8"/>
        <requirements position="1"/>
    </medium>
    <easy>
-        <karts number="3"/>
+        <karts number="7"/>
        <requirements position="1"/>
    </easy>
 </challenge>
--- a/data/challenges/granparadiso_island.challenge
+++ b/data/challenges/granparadiso_island.challenge
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="gran_paradiso_island" laps="3" reverse="false"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="80"/>
+    
+    <best>
+        <karts number="9"/>
+        <requirements position="1" time="145"/>
+    </best>
+    <hard>
+        <karts number="8"/>
+        <requirements position="1"/>
+    </hard>
+    <medium>
+        <karts number="7"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="6"/>
+        <requirements position="1"/>
+    </easy>
+</challenge>
--- a/data/challenges/green_valley.challenge
+++ b/data/challenges/green_valley.challenge
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="greenvalley" laps="3" reverse="false"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="90"/>
+    
+    <best>
+        <karts number="9"/>
+        <requirements position="1"/>
+    </best>
+    <hard>
+        <karts number="8"/>
+        <requirements position="1"/>
+    </hard>
+    <medium>
+        <karts number="7"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="6"/>
+        <requirements position="1"/>
+    </easy>
+</challenge>
--- a/data/challenges/hacienda.challenge
+++ b/data/challenges/hacienda.challenge
@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="hacienda" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="hacienda" laps="3" reverse="false"/>
    <mode major="single" minor="quickrace"/>
-    <requirements trophies="45"/>
+    <requirements trophies="25"/>
    
+    <best>
+        <karts number="8"/>
+        <requirements position="1" time="130"/>
+    </best>
    <hard>
-        <karts number="5"/>
-        <requirements position="2" time="170"/>
+        <karts number="7"/>
+        <requirements position="1" time="160"/>
    </hard>
    <medium>
-        <karts number="4"/>
-        <requirements time="190"/>
+        <karts number="6"/>
+        <requirements position="2" time="187"/>
    </medium>
    <easy>
-        <karts number="4"/>
-        <requirements time="220"/>
+        <karts number="5"/>
+        <requirements position="2"/>
    </easy>
 </challenge>
--- a/data/challenges/islandtrack.challenge
+++ b/data/challenges/islandtrack.challenge
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<challenge version="2">
-    <track id="gran_paradiso_island" laps="3"/>
-    <mode major="single" minor="quickrace"/>
-    <requirements trophies="95"/>
-    
-    <hard>
-        <karts number="5"/>
-        <requirements position="1"/>
-    </hard>
-    <medium>
-        <karts number="4"/>
-        <requirements position="2"/>
-    </medium>
-    <easy>
-        <karts number="3"/>
-        <requirements position="3"/>
-    </easy>
-</challenge>
-
--- a/data/challenges/jungle.challenge
+++ b/data/challenges/jungle.challenge
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<challenge version="2">
-    <track id="cocoa_temple" laps="3"/>
-    <mode major="single" minor="quickrace"/>
-    <requirements trophies="15"/>
-    
-    <hard>
-        <karts number="5"/>
-        <requirements position="1" time="161"/>
-    </hard>
-    <medium>
-        <karts number="4"/>
-        <requirements time="177"/>
-    </medium>
-    <easy>
-        <karts number="4"/>
-        <requirements time="240"/>
-    </easy>
-</challenge>
--- a/data/challenges/lighthouse.challenge
+++ b/data/challenges/lighthouse.challenge
@@ -1,20 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="lighthouse" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="lighthouse" laps="4" reverse="false"/>
    <mode major="single" minor="quickrace"/>
-    <requirements trophies="135"/>
+    <requirements trophies="125"/>
    
+    <best>
+        <karts number="10"/>
+        <requirements position="1" time="120"/>
+    </best>
    <hard>
-        <karts number="5"/>
-        <requirements time="110" position="1"/>
+        <karts number="9"/>
+        <requirements position="1"  time="145"/>
    </hard>
    <medium>
-        <karts number="4"/>
-        <requirements time="125"/>
+        <karts number="8"/>
+        <requirements position="1" time="190"/>
    </medium>
    <easy>
-        <karts number="3"/>
-        <requirements time="145"/>
+        <karts number="7"/>
+        <requirements position="1"/>
    </easy>
 </challenge>
-
--- a/data/challenges/mansion.challenge
+++ b/data/challenges/mansion.challenge
@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="mansion" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="mansion" laps="3" reverse="false"/>
    <mode major="single" minor="quickrace"/>
-		<requirements trophies="110"/>
-     
+		<requirements trophies="100"/>
+
+    <best>
+        <karts number="9"/>
+        <requirements position="1" time="100"/>
+    </best>
    <hard>
-        <karts number="5"/>
-        <requirements time="130"/>
+        <karts number="8"/>
+        <requirements position="1" time="115"/>
    </hard>
    <medium>
-        <karts number="4"/>
-        <requirements time="145"/>
+        <karts number="7"/>
+        <requirements time="140"/>
    </medium>
    <easy>
-        <karts number="4"/>
-        <requirements time="160"/>
+        <karts number="6"/>
+        <requirements time="180"/>
    </easy>
 </challenge>
--- a/data/challenges/mines.challenge
+++ b/data/challenges/mines.challenge
@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="mines" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="mines" laps="3" reverse="false"/>
    <mode major="single" minor="quickrace"/>
-    <requirements trophies="150"/>
+    <requirements trophies="140"/>
     
+    <best>
+        <karts number="10"/>
+        <requirements position="1" time="135"/>
+    </best>
    <hard>
-        <karts number="4"/>
-        <requirements time="170"/>
+        <karts number="9"/>
+        <requirements position="1" time="160"/>
    </hard>
    <medium>
-        <karts number="4"/>
-        <requirements time="190"/>
+        <karts number="8"/>
+        <requirements position="1"/>
    </medium>
    <easy>
-        <karts number="4"/>
-        <requirements time="215"/>
+        <karts number="7"/>
+        <requirements position="1"/>
    </easy>
 </challenge>
--- a/data/challenges/minigolf.challenge
+++ b/data/challenges/minigolf.challenge
@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="minigolf" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="minigolf" laps="4" reverse="false"/>
    <mode major="single" minor="quickrace"/>
-    <requirements trophies="150"/>
+    <requirements trophies="130"/>
    
+    <best>
+        <karts number="10"/>
+        <requirements position="1" time="135"/>
+    </best>
    <hard>
-        <karts number="5"/>
+        <karts number="9"/>
        <requirements position="1"/>
    </hard>
    <medium>
-        <karts number="4"/>
+        <karts number="8"/>
        <requirements position="1"/>
    </medium>
    <easy>
-        <karts number="3"/>
+        <karts number="7"/>
        <requirements position="1"/>
    </easy>
 </challenge>
--- a/data/challenges/olivermath.challenge
+++ b/data/challenges/olivermath.challenge
@@ -1,20 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="olivermath" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="olivermath" laps="5" reverse="false"/>
    <mode major="single" minor="quickrace"/>
    <requirements trophies="0"/>
-    
+
+    <best>
+        <karts number="7"/>
+        <requirements position="1" time="95"/>
+    </best>
    <hard>
-        <karts number="5"/>
-        <requirements position="1" time="50"/>
+        <karts number="6"/>
+        <requirements position="1" time="110"/>
    </hard>
    <medium>
        <karts number="5"/>
-        <requirements position="1" time="65"/>
+        <requirements position="1"/>
    </medium>
    <easy>
-        <karts number="5"/>
-        <requirements position="1" time="80"/>
+        <karts number="4"/>
+        <requirements position="1"/>
    </easy>
 </challenge>
-
--- a/data/challenges/sandtrack.challenge
+++ b/data/challenges/sandtrack.challenge
@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="sandtrack" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="sandtrack" laps="3" reverse="false"/>
    <mode major="single" minor="quickrace"/>
    <requirements trophies="0"/>
    
+    <best>
+        <karts number="1"/>
+        <requirements energy="20" time="135"/>
+    </best>
    <hard>
        <karts number="1"/>
-        <requirements energy="18" time="167"/>
+        <requirements energy="18" time="165"/>
    </hard>
    <medium>
        <karts number="1"/>
-        <requirements energy="15" time="185"/>
+        <requirements energy="15" time="195"/>
    </medium>
    <easy>
        <karts number="1"/>
-        <requirements energy="10" time="220"/>
+        <requirements energy="10" time="260"/>
    </easy>
 </challenge>
--- a/data/challenges/scotland.challenge
+++ b/data/challenges/scotland.challenge
@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="scotland" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="scotland" laps="3" reverse="false"/>
    <mode major="single" minor="quickrace"/>
    <requirements trophies="0"/>
    
+    <best>
+        <karts number="7"/>
+        <requirements position="1" time="125"/>
+    </best>
    <hard>
-        <karts number="5"/>
-        <requirements position="1" time="165"/>
+        <karts number="6"/>
+        <requirements position="1" time="150"/>
    </hard>
    <medium>
-        <karts number="4"/>
-        <requirements time="175"/>
+        <karts number="5"/>
+        <requirements position="1"/>
    </medium>
    <easy>
        <karts number="4"/>
-        <requirements time="225"/>
+        <requirements position="1"/>
    </easy>
 </challenge>
--- a/data/challenges/snowmountain.challenge
+++ b/data/challenges/snowmountain.challenge
@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="snowmountain" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="snowmountain" laps="3" reverse="false"/>
    <mode major="single" minor="quickrace"/>
-    <requirements trophies="60"/>
-    
+    <requirements trophies="115"/>
+
+    <best>
+        <karts number="10"/>
+        <requirements position="1" time="120"/>
+    </best>
    <hard>
-        <karts number="5"/>
-        <requirements time="160"/>
+        <karts number="9"/>
+        <requirements position="2" time="145"/>
    </hard>
    <medium>
-        <karts number="4"/>
-        <requirements time="175"/>
+        <karts number="8"/>
+        <requirements position="1"/>
    </medium>
    <easy>
-        <karts number="4"/>
-        <requirements time="220"/>
+        <karts number="7"/>
+        <requirements position="1"/>
    </easy>
 </challenge>
--- a/data/challenges/snowpeak.challenge
+++ b/data/challenges/snowpeak.challenge
@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="snowtuxpeak" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="snowtuxpeak" laps="3" reverse="false"/>
    <mode major="single" minor="quickrace"/>
-    <requirements trophies="60"/>
+    <requirements trophies="45"/>
    
+    <best>
+        <karts number="8"/>
+        <requirements position="1" time="115"/>
+    </best>
    <hard>
-        <karts number="5"/>
-        <requirements position="1" time="145"/>
+        <karts number="7"/>
+        <requirements position="1" time="140"/>
    </hard>
    <medium>
-        <karts number="4"/>
-        <requirements time="175"/>
+        <karts number="6"/>
+        <requirements position="1"/>
    </medium>
    <easy>
-        <karts number="4"/>
-        <requirements time="195"/>
+        <karts number="5"/>
+        <requirements position="1"/>
    </easy>
 </challenge>
--- a/data/challenges/startrack.challenge
+++ b/data/challenges/startrack.challenge
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<challenge version="2">
-    <track id="stk_enterprise" laps="3"/>
-    <mode major="single" minor="followtheleader"/>
-    <requirements trophies="110"/>
-    
-    <hard>
-        <karts number="6"/>
-        <requirements position="2"/>
-    </hard>
-    <medium>
-        <karts number="6"/>
-        <requirements position="2"/>
-    </medium>
-    <easy>
-        <karts number="5"/>
-        <requirements position="2"/>
-    </easy>
-</challenge>
--- a/data/challenges/stk_enterprise.challenge
+++ b/data/challenges/stk_enterprise.challenge
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="stk_enterprise" laps="3" reverse="false"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="105"/>
+    
+    <best>
+        <karts number="9"/>
+        <requirements position="1" time="155"/>
+    </best>
+    <hard>
+        <karts number="8"/>
+        <requirements position="1"/>
+    </hard>
+    <medium>
+        <karts number="7"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="6"/>
+        <requirements position="1"/>
+    </easy>
+</challenge>
--- a/data/challenges/subsea.challenge
+++ b/data/challenges/subsea.challenge
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<challenge version="2">
-    <track id="subsea" laps="2"/>
-    <mode major="single" minor="quickrace"/>
-    <requirements trophies="0"/>
-    
-    <hard>
-        <karts number="5"/>
-        <requirements position="1" time="200"/>
-    </hard>
-    <medium>
-        <karts number="4"/>
-        <requirements time="225"/>
-    </medium>
-    <easy>
-        <karts number="4"/>
-        <requirements time="290"/>
-    </easy>
-</challenge>
--- a/data/challenges/tuxtollway.challenge
+++ b/data/challenges/tuxtollway.challenge
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<challenge version="2">
-    <track id="greenvalley" laps="3"/>
-    <mode major="single" minor="quickrace"/>
-    <requirements trophies="95"/>
-    
-    <hard>
-        <karts number="5"/>
-        <requirements position="1"/>
-    </hard>
-    <medium>
-        <karts number="4"/>
-        <requirements position="1"/>
-    </medium>
-    <easy>
-        <karts number="4"/>
-        <requirements position="1"/>
-    </easy>
-</challenge>
--- a/data/challenges/unlock_bonus_kart1.challenge
+++ b/data/challenges/unlock_bonus_kart1.challenge
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="true"/>
+    <!-- This is the (rounded) point equivalent of finishing all challenges
+         in easy, except the final challenge   -->
+    <requirements trophies="190"/>
+    <unlock kart="amanda"/>
+</challenge>
--- a/data/challenges/unlock_bonus_kart2.challenge
+++ b/data/challenges/unlock_bonus_kart2.challenge
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="true"/>
+    <!-- This is the point equivalent of finishing the
+         story mode with 8 supertux challenges and the rest in gold  -->
+    <requirements trophies="280"/>
+    <unlock kart="sara_the_wizard"/>
+</challenge>
--- a/data/challenges/unlock_supertux.challenge
+++ b/data/challenges/unlock_supertux.challenge
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="true"/>
+    <!-- This is the  point equivalent of finishing the
+         story mode with all gold except 14 silver challenges -->
+    <requirements trophies="250"/>
+    <unlock difficulty="difficulty_best"/>
+</challenge>
--- a/data/challenges/volcano_island.challenge
+++ b/data/challenges/volcano_island.challenge
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="volcano_island" laps="2" reverse="false"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="15"/>
+    
+    <best>
+        <karts number="8"/>
+        <requirements position="1" time="165"/>
+    </best>
+    <hard>
+        <karts number="7"/>
+        <requirements position="1"/>
+    </hard>
+    <medium>
+        <karts number="6"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="5"/>
+        <requirements position="1"/>
+    </easy>
+</challenge>
--- a/data/challenges/xr591.challenge
+++ b/data/challenges/xr591.challenge
@@ -1,21 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="xr591" laps="2"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="xr591" laps="2" reverse="false"/>
    <mode major="single" minor="quickrace"/>
    <requirements trophies="135"/>
    
+    <best>
+        <karts number="1"/>
+        <requirements energy="20" time="95"/>
+    </best>
    <hard>
        <karts number="1"/>
-        <requirements energy="18" time="135"/>
+        <requirements energy="18" time="115"/>
    </hard>
    <medium>
        <karts number="1"/>
-        <requirements energy="15" time="155"/>
+        <requirements energy="15" time="135"/>
    </medium>
    <easy>
        <karts number="1"/>
-        <requirements energy="12" time="170"/>
+        <requirements energy="12" time="180"/>
    </easy>
 </challenge>
-
-
--- a/data/challenges/zengarden.challenge
+++ b/data/challenges/zengarden.challenge
@@ -1,9 +1,14 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="zengarden" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="zengarden" laps="4" reverse="false"/>
    <mode major="single" minor="timetrial"/>
-    <requirements trophies="45"/>
+    <requirements trophies="35"/>
    
+    <best>
+        <karts number="3"/>
+        <requirements position="1"/>
+    </best>
    <hard>
        <karts number="2"/>
        <requirements position="1"/>
--- a/data/fonts/AR_PL_SungtiL_GB0.png
+++ b/data/fonts/AR_PL_SungtiL_GB0.png
--- a/data/fonts/BigDigitFont.xml
+++ b/data/fonts/BigDigitFont.xml
--- a/data/fonts/LayneHansom0.png
+++ b/data/fonts/LayneHansom0.png
--- a/data/fonts/LayneHansomBigDigits.png
+++ b/data/fonts/LayneHansomBigDigits.png
--- a/data/fonts/Mplus2p_JP0.png
+++ b/data/fonts/Mplus2p_JP0.png
--- a/data/fonts/StkChineseFont.xml
+++ b/data/fonts/StkChineseFont.xml
--- a/data/fonts/StkFont.xml
+++ b/data/fonts/StkFont.xml
--- a/data/fonts/StkJapaneseFont.xml
+++ b/data/fonts/StkJapaneseFont.xml
--- a/data/fonts/comix.png
+++ b/data/fonts/comix.png
--- a/data/fonts/materials.xml
+++ b/data/fonts/materials.xml
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-  <!-- Fonts -->
-  <material name="title_font.png"           shader="unlit" lazy-load="Y"/>
-  <material name="title_font_2.png"         shader="unlit" lazy-load="Y"/>
-  <material name="sigmar0.png"              shader="unlit" lazy-load="Y"/>
-  <material name="comix.png"                shader="unlit" lazy-load="Y"/>
-  <material name="LayneHansom0.png"         shader="unlit" lazy-load="Y"/>
-  <material name="Mplus2p_JP0.png"          shader="unlit" lazy-load="Y"/>
-  <material name="rasheeq0.png"             shader="unlit" lazy-load="Y"/>
-  <material name="rasheeq3.png"             shader="unlit" lazy-load="Y"/>
-  <material name="rasheeq4.png"             shader="unlit" lazy-load="Y"/>
-  <material name="wqyMicroHei0.png"         shader="unlit" lazy-load="Y"/>
-  <material name="wqyMicroHei1.png"         shader="unlit" lazy-load="Y"/>
-  <material name="wqyMicroHei2.png"         shader="unlit" lazy-load="Y"/>
-  <material name="wqyMicroHei3.png"         shader="unlit" lazy-load="Y"/>
-  <material name="wqyMicroHei4.png"         shader="unlit" lazy-load="Y"/>
-  <material name="wqyMicroHei5.png"         shader="unlit" lazy-load="Y"/>
-  <material name="AR_PL_SungtiL_GB0.png"    shader="unlit" lazy-load="Y"/>
-  <material name="LayneHansomBigDigits.png" shader="unlit" lazy-load="Y"/>
-
-</materials>
--- a/data/fonts/rasheeq.xml
+++ b/data/fonts/rasheeq.xml
--- a/data/fonts/rasheeq0.png
+++ b/data/fonts/rasheeq0.png
--- a/data/fonts/rasheeq1.png
+++ b/data/fonts/rasheeq1.png
--- a/data/fonts/rasheeq3.png
+++ b/data/fonts/rasheeq3.png
--- a/data/fonts/rasheeq4.png
+++ b/data/fonts/rasheeq4.png
--- a/data/fonts/sigmar0.png
+++ b/data/fonts/sigmar0.png
--- a/data/fonts/title_font.png
+++ b/data/fonts/title_font.png
--- a/data/fonts/title_font.xml
+++ b/data/fonts/title_font.xml
--- a/data/fonts/title_font_2.png
+++ b/data/fonts/title_font_2.png
--- a/data/fonts/wqyMicroHei0.png
+++ b/data/fonts/wqyMicroHei0.png
--- a/data/fonts/wqyMicroHei1.png
+++ b/data/fonts/wqyMicroHei1.png
--- a/data/fonts/wqyMicroHei2.png
+++ b/data/fonts/wqyMicroHei2.png
--- a/data/fonts/wqyMicroHei3.png
+++ b/data/fonts/wqyMicroHei3.png
--- a/data/fonts/wqyMicroHei4.png
+++ b/data/fonts/wqyMicroHei4.png
--- a/data/fonts/wqyMicroHei5.png
+++ b/data/fonts/wqyMicroHei5.png
--- a/data/fonts/wqyMicroHei6.png
+++ b/data/fonts/wqyMicroHei6.png
--- a/data/gfx/black_smoke.xml
+++ b/data/gfx/black_smoke.xml
@@ -4,27 +4,26 @@
    <spreading angle="10"        />
    
    <velocity  x="0.0"
-               y="0.002"
+               y="0.003"
               z="0.0"           />
    
    <material  file="smoke_black.png"  />
    
    <!-- Amount of particles emitted per second -->
-    <rate      min="25"
-               max="50"          />
+    <rate      min="7"
+               max="12"          />
    
    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
    <lifetime  min="2500"
               max="5000"        />
    
    <!-- Size of the particles -->
-    <size      min="0.6"
-               max="1.5"         />
+    <size      min="1.6"
+               max="2.5"
+               x-increase-factor="2.6"
+               y-increase-factor="2.6"         />

-    <color     min="255 255 255"
-               max="255 255 255" />
-
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="1000"       />
+    <color     min="50 50 50"
+               max="100 100 100" />

 </particles>
--- a/data/gfx/confetti.xml
+++ b/data/gfx/confetti.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+
+<!-- For sky particles, the size of the box is ignored -->
+<particles emitter="box" randomize-initial-y="true" box_x="100.0" box_y="100" box_z="120.0">
+
+    <spreading angle="3"           />
+    
+    <velocity  x="-0.00"
+               y="-0.005"
+               z="-0.00"             />
+    
+    <material  file="confetti.png" clampu="Y" clampv="Y" />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="500"
+               max="1000"           />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="8500"
+               max="9500"          />
+    
+    <!-- Size of the particles -->
+    <size      min="0.10"
+               max="0.30"          />
+    
+    <color     min="40 40 255"
+               max="255 255 255"   />
+
+    <wind      flips="Y"           />
+
+</particles>
--- a/Show More
+++ b/Show More