Merge remote-tracking branch 'origin/threaded_tex_loader' into avi_writer

2017-03-17 16:31:32 +08:00 · 2017-03-17 16:31:32 +08:00 · 65da13fc52
commit 65da13fc52
parent 5d6a233da2 09e2f96ba8
1044 changed files with 118959 additions and 41280 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -0,0 +1,57 @@
+environment:
+    DEPS_DIR: c:\\projects\dependencies
+    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 master --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\dependencies" c:\projects\stk-code\dependencies –Recurse
+    - cmd: |
+        md build
+        cd build
+        if "%platform%"=="x86" set CMAKE_GENERATOR_NAME="Visual Studio 14 2015"
+        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,14 @@
 bld*/
 build*/
-cmake_build/
 cmake_build*/
-dependencies/
+dependencies*/
 CMakeFiles/
 stk-editor/

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

 data/editor
 data/karts
@ -51,3 +51,20 @@ packets_log.txt
 history.dat
 README.dependencies
 xx
+
+android/android-ndk*
+android/android-sdk*
+android/assets
+android/bin
+android/obj
+android/libs
+android-*
+*.apk
+
+lib/curl
+lib/freetype
+lib/ifaddrs
+lib/libogg
+lib/libvorbis
+lib/openal
+lib/openssl
--- a/.travis.yml
+++ b/.travis.yml
@ -1,52 +1,65 @@
-# 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
 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:
-  - export THREADS=`nproc`
  # Unfortunately using all threads crashes g++: "g++: internal compiler error: Killed (program cc1plus)"
-  - export THREADS=4
+  # Use half of the available threads, gcc is memory hungry
+  - 'if [ ${CC} = "gcc" ]; then
+        export THREADS=$((`nproc` / 2));
+    else
+        export THREADS=$((`nproc` + 1));
+    fi'
  - echo "THREADS = $THREADS"
+  - free -mt

 script:
-  
-  # First a debug build: 
-  - mkdir build-debug
-  - cd build-debug
-  - cmake .. -DCMAKE_BUILD_TYPE=Debug -DCHECK_ASSETS=off
-  - make VERBOSE=1 -j $THREADS
-
-  # Then a release build: 
-  - cd ..
-  - mkdir build-release
-  - cd build-release
-  - cmake .. -DCMAKE_BUILD_TYPE=Release -DCHECK_ASSETS=off
+  - mkdir "build"
+  - cd "build"
+  - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSERVER_ONLY=$SERVER_ONLY -DCHECK_ASSETS=off
  - make VERBOSE=1 -j $THREADS

 notifications:
  irc:
    channels:
-      - "irc.freenode.org#stk"
+      - "irc.freenode.org#supertuxkart"
    skip_join: false
    use_notice: true
    template:
--- a/1
+++ b/1
@ -1 +0,0 @@
-See the file data/CREDITS .
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,4 +1,19 @@
-## SupertTuxKart 0.9.1
+## SuperTuxKart 0.9.2
+* Ghost replay races by Benau
+* Battle mode AI by Benau
+* Soccer mode AI by Benau
+* New icy soccer field by samuncle and Benau
+* New subsea track by samuncle
+* New volcano track by Ponzino
+* TTF font rendering 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
+
+## SuperTuxKart 0.9.1
 * Many bug fixes
 * Started to use scripting in tracks
 * Significant audio performance improvements
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,6 +1,6 @@
 # root CMakeLists for the SuperTuxKart project
 project(SuperTuxKart)
-set(PROJECT_VERSION "0.8.1")
+set(PROJECT_VERSION "0.9.1")

 cmake_minimum_required(VERSION 2.8.4)
 if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))
@ -15,12 +15,16 @@ if (NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE "STKRelease")
 endif()

-option(USE_WIIUSE "Support for wiimote input devices" ON)
+option(SERVER_ONLY "Create a server only (i.e. no graphics or sound)" OFF)
 option(USE_FRIBIDI "Support for right-to-left languages" ON)
 option(CHECK_ASSETS "Check if assets are installed in ../stk-assets" ON)
 option(USE_SYSTEM_ANGELSCRIPT "Use system angelscript instead of built-in angelscript. If you enable this option, make sure to use a compatible version." OFF)
 option(ENABLE_NETWORK_MULTIPLAYER "Enable network multiplayer. This will replace the online profile GUI in the main menu with the network multiplayer GUI" OFF)

+if (UNIX AND NOT APPLE)
+    option(USE_GLES2 "Use OpenGL ES2 renderer" OFF)
+endif()
+
 if(MSVC AND (MSVC_VERSION LESS 1900))
    # Normally hide the option to build wiiuse on VS, since it depends
    # on the installation of the Windows DDK (Driver Developer Kit),
@ -31,13 +35,15 @@ else()
    set(WIIUSE_BUILD ON)
 endif()

-if(MINGW OR CYGWIN)
-    set(USE_WIIUSE OFF)
+if(MINGW OR CYGWIN OR SERVER_ONLY)
+    option(USE_WIIUSE "Support for wiimote input devices" OFF)
+else()
+    option(USE_WIIUSE "Support for wiimote input devices" ON)
 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")
@ -56,6 +62,16 @@ if(WIN32)
    set(ENV{LIB} ${PROJECT_SOURCE_DIR}/dependencies/lib)
    set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/dependencies)
    add_definitions(-D_IRR_STATIC_LIB_)
+    add_definitions(-DNO_IRR_COMPILE_WITH_X11_)
+endif()
+
+if(USE_GLES2)
+    add_definitions(-DUSE_GLES2)
+endif()
+
+if(SERVER_ONLY)
+    add_definitions(-DSERVER_ONLY)
+    add_definitions(-DNO_IRR_COMPILE_WITH_X11_)
 endif()

 # Build the Bullet physics library
@ -67,8 +83,11 @@ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
 include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")

 # Build glew library
-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
-include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
+if(NOT USE_GLES2 AND NOT SERVER_ONLY)
+    add_definitions(-DGLEW_NO_GLU)
+    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
+    include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
+endif()

 if((WIN32 AND NOT MINGW) OR APPLE)
    if (NOT APPLE)
@ -97,6 +116,12 @@ if((WIN32 AND NOT MINGW) OR APPLE)
    set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
    set(JPEG_LIBRARY jpeglib)
 endif()
+
+if(NOT SERVER_ONLY AND NOT USE_GLES2)
+    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/graphics_utils")
+    include_directories("${PROJECT_SOURCE_DIR}/lib/graphics_utils")
+endif()
+
 # Build the irrlicht library
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
 include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
@ -116,8 +141,8 @@ 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()
@ -185,36 +210,38 @@ 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}")
+# OpenGL
+if(NOT USE_GLES2 AND NOT SERVER_ONLY)
+    find_package(OpenGL REQUIRED)
+    include_directories(${OPENGL_INCLUDE_DIR})
 endif()

-# OpenGL
-find_package(OpenGL REQUIRED)
-include_directories(${OPENGL_INCLUDE_DIR})

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

 # Set some compiler options
 if(UNIX OR MINGW)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-function")
 endif()

 if(MINGW AND CMAKE_BUILD_TYPE MATCHES Release)
@ -257,7 +284,7 @@ endif()
 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)
@ -341,22 +368,26 @@ target_link_libraries(supertuxkart
    bulletcollision
    bulletmath
    enet
-    glew
    stkirrlicht
    ${Angelscript_LIBRARIES}
    ${CURL_LIBRARIES}
    ${OGGVORBIS_LIBRARIES}
    ${OPENAL_LIBRARY}
-    ${OPENGL_LIBRARIES}
    ${FREETYPE_LIBRARIES}
    )

-if(UNIX AND NOT APPLE)
-    target_link_libraries(supertuxkart ${X11_LIBRARIES})
-    if(USE_XRANDR)
-        target_link_libraries(supertuxkart ${XRANDR_LIBRARIES})
+if(NOT SERVER_ONLY)
+    if(NOT USE_GLES2)
+        target_link_libraries(supertuxkart ${OPENGL_LIBRARIES} glew graphics_utils)
    else()
-        target_link_libraries(supertuxkart ${IRRLICHT_XF86VM_LIBRARY})
+        target_link_libraries(supertuxkart EGL GLESv2)
+    endif()
+endif()
+
+if(UNIX AND NOT APPLE)
+    target_link_libraries(supertuxkart ${X11_LIBRARIES} ${XRANDR_LIBRARIES})
+    if(USE_LIBBFD)
+        target_link_libraries(supertuxkart ${LIBBFD_LIBRARIES})
    endif()
    if(USE_ASAN)
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
@ -364,12 +395,17 @@ if(UNIX AND NOT APPLE)
    endif()
 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(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_target_properties(supertuxkart PROPERTIES LINK_FLAGS "-arch x86_64 -F/Library/Frameworks -framework OpenAL -framework Ogg -framework Vorbis")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/Library/Frameworks/OpenAL.framework/Versions/A/Headers")
 endif()

@ -416,10 +452,6 @@ 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/)
--- a/INSTALL.md
+++ b/INSTALL.md
@ -1,78 +0,0 @@
-# SuperTuxKart Installation Instructions
-
-Note: If you obtained this source code from Github, you also need to download the game assets from Sourceforge using SVN.
-
-`svn checkout 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 STK on Linux
-
-First, make sure that you have the following packages installed:
-
-  * OpenGL (mesa)
-  * OpenAL (recommended: openal-soft-devel)
-  * Ogg    (libogg-dev)
-  * Vorbis (libvorbis-dev)
-  * libcurl (libcurl-devel)
-  * libbluetooth (bluez-devel)
-  * libpng (libpng-devel)
-  * zlib (zlib-devel)
-  * jpeg (libjpeg-turbo-devel)
-
-Ubuntu command:
-
-```
-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
-```
-  
-Unpack the files from the tarball like this:
-
-```
-tar xzf supertuxkart-*.tar.gz
-cd supertuxkart-*
-```
-
-where `*` is the version of SuperTuxkart you downloaded - eg `0.8.0`. Then:
-
-
-Compile SuperTuxKart:
-
-```
-mkdir cmake_build
-cd cmake_build
-cmake ..
-make VERBOSE=1 -j2
-```
-
-To create a debug version of STK, use:
-
-```
-cmake .. -DCMAKE_BUILD_TYPE=Debug
-```
-
-To test the compilation, supertuxkart can be run from the build
-directory by ./bin/supertuxkart 
-
-To install the file, as root execute:
-
-```
-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
-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>
--- a/README.md
+++ b/README.md
@ -1,59 +1,19 @@
 # SuperTuxKart
 [![Build Status](https://travis-ci.org/supertuxkart/stk-code.png?branch=master)](https://travis-ci.org/supertuxkart/stk-code)

-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.
-
-The SuperTuxKart homepage can be found at: <http://supertuxkart.sourceforge.net>
-
-The official SuperTuxKart forum is at <http://supertuxkart.sourceforge.net/forum>. If you need support,
-this would be the best place to start.
-
-Hope you enjoy the game.
-
-- The SuperTuxKart development team.
+SuperTuxKart is a free kart racing game. It focuses on fun and not on realistic kart physics. Instructions can be found on the in-game help page.

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

 ## Hardware Requirements
-* You need a 3D graphics card. (NVIDIA GeForce 8xxx and higher, ATI Radeon HD 4xxx and higher or Intel HD 3000 and higher)
+* You need a 3D graphics card. (NVIDIA GeForce 8xxx and higher, ATI Radeon HD 4xxx and higher or Intel HD 3000 and higher.)
 * You should have a CPU that's running at 1GHz or better.
 * You'll need at least 512 MB of free VRAM (video memory).
 * Disk space: 400MB
 * Ideally, you want a joystick with at least 6 buttons.

-
-## Compiling SuperTuxKart
-
-### 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.md`](INSTALL.md) for details.
-
-
 ## License
-This software is released under the GNU General Public License (GPL) which
-can be found in the file [`COPYING`](/COPYING) in the same directory as this file.
-Information about the licenses for artwork are contained in 
-`data/licenses`.
-
+This software is released under the GNU General Public License (GPL) which can be found in the file [`COPYING`](/COPYING) in the same directory as this file. Information about the licenses for artwork are contained in `data/licenses`.

 ## 3D coordinates
 A reminder for those looking at the code and 3d models:
@ -62,6 +22,158 @@ STK    : 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 exporters perform the needed transform, so in Blender you just work with XY plane as ground, and things will appear fine in STK (using XZ as ground in the code, obviously).
+
+## Building from source
+
+First, you need both the code and the assets (See <https://supertuxkart.net/Source_control> for more information):
+
+```
+git clone https://github.com/supertuxkart/stk-code
+svn checkout https://svn.code.sf.net/p/supertuxkart/code/stk-assets stk-assets
+```
+
+## Building on Linux
+
+### Dependencies
+
+Install the following packages:
+
+  * OpenGL (mesa)
+  * OpenAL (recommended: openal-soft-devel)
+  * Ogg    (libogg-dev)
+  * Vorbis (libvorbis-dev)
+  * Freetype (libfreetype6-dev)
+  * libcurl (libcurl-devel)
+  * libbluetooth (bluez-devel)
+  * libpng (libpng-devel)
+  * zlib (zlib-devel)
+  * jpeg (libjpeg-turbo-devel)
+
+Ubuntu command:
+
+```
+sudo apt-get install build-essential cmake libbluetooth-dev \
+libcurl4-gnutls-dev libfreetype6-dev libfribidi-dev libgl1-mesa-dev \
+libjpeg-dev libogg-dev libopenal-dev libpng-dev libvorbis-dev libxrandr-dev \
+mesa-common-dev pkg-config zlib1g-dev
+```
+
+### Compiling
+
+Compile SuperTuxKart:
+
+```
+mkdir cmake_build
+cd cmake_build
+cmake ..
+make -j4
+```
+STK can then be run from the build directory with `bin/supertuxkart`
+
+### Further options
+
+To create a debug version of STK, use:
+
+```
+cmake .. -DCMAKE_BUILD_TYPE=Debug
+```
+
+You can install your build system-wide:
+
+```
+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
+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`
+
+
+## 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](https://supertuxkart.net/Source_control).
+3. Download the latest dependency package from [here](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/Windows/). Unzip it in the root directory, so that the dependencies directory is next to the src and data directories (if you are updating from a previous dependency package, you can delete the .dll files in the root directory, they are not needed anymore).
+4. Download cmake and install it. Then start cmake-gui and select the STK root directory as 'Where is the source code', and a new directory in the root directory (next to src, data etc) as the build directory (for now I assume that this directory is called bld).
+5. Click on configure. You will be asked to create the directory (yes), then for your VS version. Make sure you select the right version (be aware of the easy to confuse version numbers: VS 2013 = version 12). Click on configure, then generate. This will create the directory 'bld', and a VS solution in that directory.
+6. In Visual Studio open the project file generated in the 'bld' folder.
+7. Right click on the supertuxkart project in the solution explorer, and select "Set as StartUp Project".
+8. Select Build->Build Solution (or press F7) to compile.
+
+## OS X
+
+### Getting Started
+
+Install developer tools, either from the OS X Install DVD or from Apple's website.
+
+If you have never built anything before, you have create `/usr/local/include/` first:
+
+```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.
+
+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
+
+### 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.
+
+### Building
+
+With clang:
+
+```
+mkdir cmake_build
+cd cmake_build
+cmake ..
+make
+```
+
+With GCC :
+```
+mkdir cmake_build
+cd cmake_build
+cmake .. -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_C_COMPILER=/usr/bin/gcc
+make
+```
+
+Building on 10.10 with 10.9 compat
+```
+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/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,174 @@
+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)
+LOCAL_CFLAGS       := -I../lib/irrlicht/source/Irrlicht/ \
+                      -I../lib/irrlicht/include/         \
+                      -Iobj/jpeglib/                     \
+                      -Iobj/libpng/                      \
+                      -Iobj/zlib/                        \
+                      -I$(call my-dir)/../../sources/android/native_app_glue
+                      -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              \
+                      -I$(call my-dir)/../../sources/android/native_app_glue \
+                      -DUSE_GLES2      \
+                      -DHAVE_OGGVORBIS \
+                      -DNDEBUG         \
+                      -std=gnu++0x
+
+LOCAL_STATIC_LIBRARIES := irrlicht bullet enet freetype ifaddrs angelscript  \
+                          vorbisfile vorbis ogg openal curl libssl libcrypto \
+                          gnustl_static android_native_app_glue
+
+include $(BUILD_SHARED_LIBRARY)
+include $(CLEAR_VARS)
+
+$(call import-module,android/native_app_glue)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="org.supertuxkart.stk"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <!-- This .apk has no Java code itself, so set hasCode to false. -->
+    <application android:label="@string/app_name"
+                 android:icon="@drawable/icon"
+                 android:hasCode="false"
+                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+                 android:hardwareAccelerated="true">
+
+        <activity android:name="android.app.NativeActivity"
+                  android:label="@string/app_name"
+                  android:configChanges="keyboardHidden|orientation"
+                  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" />
+            </intent-filter>
+        </activity>
+    </application>
+
+    <uses-sdk android:minSdkVersion="19" />
+    <uses-feature android:glEsVersion="0x00020000" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+</manifest>
--- a/android/README.ANDROID
+++ b/android/README.ANDROID
@ -0,0 +1,122 @@
+================================================================================
+
+ 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, ant, imagemagick, cmake, vorbis-tools
+
+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 (versions r12b and r13b have been tested).
+
+You need to create proper "android-sdk" and "android-ndk" symlinks in the
+directory with Android project, so that the compilation script will have access
+to the SDK and NDK.
+
+These paths can be also set in SDK_PATH and NDK_PATH environmental variables.
+
+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.
+
+If you want to prepare a package for particular architecture, you can choose it
+by setting the COMPILE_ARCH environmental variable. At this stage, supported
+architectures are "armv7", "x86" and "aarch64". The default is "armv7".
+
+You can choose build type by setting BUILD_TYPE environment variable to "debug"
+or "release". The default is debug build. Note that if you choose release build,
+you have to manually sign the apk with your key and run zipalign.
+
+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
+
+
+
+--------------------------------------------------------------------------------
+ KNOWN ISSUES
+--------------------------------------------------------------------------------
+
+1.  It's not possible to compile STK for Android < 4.4 due to missing GLES 3.0
+    functions. It is technically possible to do - check GLES context version, 
+    load OpenGL functions dynamically using EGL, and if they are not loaded 
+    properly, then fallback to GLES 2.0.
+
+2.  It never ocurred for me, but it's possible that EGL context is lost in some
+    cases. SuperTuxKart is not designed to re-create all textures at any moment,
+    so this is a "Wontfix", at least for now.
+
+3.  We use "exit(0)" at the end of main function. We shouldn't do it and we
+    should just return from the main function. But STK uses some global
+    variables and their values are remembered when the game is restarted. We
+    should properly clear them or re-initialize on startup. Using the "exit(0)"
+    is not-that-bad workaround, but it may cause a crash on exit sometimes.
+    It seems to affect only Android 5.0. More information about the crash:
+    https://code.google.com/p/android/issues/detail?id=160824
+
+4.  STK crashes on Qualcomm with Adreno 305 when trying to draw menu interface.
+    Backtrace shows glDrawElements function, and internally crashed in vbo
+    allocation.
+
+5.  STK crashes on startup on some devices when aarch64 build is made using
+    Android r13 NDK. The r13 version has rather big modifications (it uses clang
+    instead of gcc by default). This is probably a bug in NDK/compiler/OS, but
+    for this reason using NDK r12 for 64-bit arm compilation is preferred.
+
+6.  Angelscript doesn't have full support for aarch64 builds, so that scripting
+    won't work on this platform.
+    
+7.  Turning left/right using accelerometer is available, but at this stage the
+    default screen orientation is not automatically detected and user must 
+    manually choose if he needs "phone" or "tablet" accelerometer.
--- a/android/build.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,240 @@
+#!/bin/sh
+#
+# (C) 2016-2017 Dawid Gan, under the GPLv3
+#
+# A script that generates data files for Android apk
+
+
+# Below are simple configuration variables
+# It's allowed to set "all" for KARTS and TRACKS if it's intended to create
+# package with full data.
+# The karts and tracks directories shouldn't exist in ASSETS_DIRS variable
+# because they are handled separately
+# The TEXTURE_SIZE and SOUND_QUALITY take effect only if DECREASE_QUALITY has
+# value greater than 0
+# The script needs imagemagick and ogg utils installed to use DECREASE_QUALITY
+# feature
+
+################################################################################
+
+export KARTS="tux nolok xue"
+export TRACKS="battleisland cornfield_crossing featunlocked gplose gpwin   \
+               hacienda introcutscene introcutscene2 lighthouse olivermath \
+               overworld snowmountain snowtuxpeak soccer_field tutorial"
+
+export ASSETS_PATHS="../data                    \
+                     ../../stk-assets           \
+                     ../../supertuxkart-assets"
+
+export ASSETS_DIRS="library models music sfx textures"
+
+export TEXTURE_SIZE=256
+export SOUND_QUALITY=64
+
+export RUN_OPTIMIZE_SCRIPT=0
+export DECREASE_QUALITY=1
+
+################################################################################
+
+
+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()
+{
+   if [ -z "$1" ]; then
+      echo "No file to convert"
+      return
+   fi
+
+   FILE="$1"
+
+   W=`identify -format "%[fx:w]" "$FILE"`
+   H=`identify -format "%[fx:h]" "$FILE"`
+
+   if [ -z $W ] || [ -z $H ]; then
+      echo "Couldn't convert $FILE file"
+      return
+   fi
+
+   if [ $W -le $TEXTURE_SIZE ] && [ $H -le $TEXTURE_SIZE ]; then
+      return
+   fi
+
+   if [ $W -gt $H ]; then
+      SCALED_W=$TEXTURE_SIZE
+      SCALED_H=$(($TEXTURE_SIZE * $H / $W))
+   else
+      SCALED_W=$(($TEXTURE_SIZE * $W / $H))
+      SCALED_H=$TEXTURE_SIZE
+   fi
+
+   convert -scale $SCALED_WE\x$SCALED_H "$FILE" "$FILE"
+}
+
+convert_sound()
+{
+   if [ -z "$1" ]; then
+      echo "No file to convert"
+      return
+   fi
+
+   FILE="$1"
+
+   oggdec "$FILE" -o tmp.wav
+
+   if [ -s tmp.wav ]; then
+      oggenc --downmix -b $SOUND_QUALITY 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
+}
+
+if [ $DECREASE_QUALITY -gt 0 ]; then
+   find assets/data -iname "*.png" | while read f; do convert_image "$f"; done
+   find assets/data -iname "*.jpg" | while read f; do convert_image "$f"; done
+   find assets/data -iname "*.ogg" | while read f; do convert_sound "$f"; done
+fi
+
+
+# Copy data directory
+echo "Copy data directory"
+cp -a ../data/* assets/data/
+
+
+# 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/make.sh
+++ b/android/make.sh
@ -0,0 +1,306 @@
+#!/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 NDK_ABI_X86=x86
+export ARCH_X86=x86
+export HOST_X86=i686-linux-android
+export NDK_PLATFORM_X86=android-19
+
+export NDK_ABI_AARCH64=arm64-v8a
+export ARCH_AARCH64=arm64
+export HOST_AARCH64=aarch64-linux-android
+export NDK_PLATFORM_AARCH64=android-21
+
+
+# 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 bin
+    rm -rf libs
+    rm -rf obj
+    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
+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
+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
+else
+    echo "Unknow COMPILE_ARCH: $COMPILE_ARCH. Possible values are: " \
+         "armv7, aarch64, x86"
+    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 BUILD_TYPE="debug"
+    export IS_DEBUG_BUILD=1
+elif [ "$BUILD_TYPE" = "release" ] || [ "$BUILD_TYPE" = "Release" ]; then
+    export BUILD_TYPE="release"
+    export IS_DEBUG_BUILD=0
+else
+    echo "Unsupported BUILD_TYPE: $BUILD_TYPE. Possible values are: " \
+         "debug, release"
+    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
+
+# 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
+
+# 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 $CPPFLAGS" \
+    LDFLAGS="-L$DIRNAME/obj/openssl/ $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"
+ant $BUILD_TYPE -Dsdk.dir="$SDK_PATH" -Dtarget=$NDK_PLATFORM
+check_error
--- a/android/res/drawable-hdpi/icon.png
+++ b/android/res/drawable-hdpi/icon.png
--- a/android/res/drawable-mdpi/icon.png
+++ b/android/res/drawable-mdpi/icon.png
--- a/android/res/drawable-xhdpi/icon.png
+++ b/android/res/drawable-xhdpi/icon.png
--- a/android/res/drawable-xxhdpi/icon.png
+++ b/android/res/drawable-xxhdpi/icon.png
--- a/android/res/drawable/icon.png
+++ b/android/res/drawable/icon.png
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">SuperTuxKart</string>
+</resources>
--- 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/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/data/CREDITS
+++ b/data/CREDITS
--- a/data/achievements.xml
+++ b/data/achievements.xml
@ -4,7 +4,7 @@
               name="Christoffel Columbus" description="Play every official track at least once." >
      <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,7 +19,7 @@
      <snowmountain goal="1"/>
      <snowtuxpeak goal="1"/>
      <stk_enterprise goal="1"/>
-      <subsea goal="1"/>
+      <abyss goal="1"/>
      <xr591 goal="1"/>
      <zengarden goal="1"/>      
  </achievement>
--- a/data/challenges/abyss.challenge
+++ b/data/challenges/abyss.challenge
@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <challenge version="2">
-    <track id="farm" laps="3"/>
+    <track id="abyss" laps="3"/>
    <mode major="single" minor="quickrace"/>
    <requirements trophies="0"/>
    
    <hard>
        <karts number="5"/>
-        <requirements position="1" time="110"/>
+        <requirements position="1" time="160"/>
    </hard>
    <medium>
        <karts number="4"/>
-        <requirements time="125"/>
+        <requirements time="185"/>
    </medium>
    <easy>
        <karts number="4"/>
-        <requirements time="155"/>
+        <requirements time="270"/>
    </easy>
 </challenge>
--- a/data/challenges/cornfield_crossing.challenge
+++ b/data/challenges/cornfield_crossing.challenge
@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <challenge version="2">
-    <track id="subsea" laps="2"/>
+    <track id="cornfield_crossing" laps="3"/>
    <mode major="single" minor="quickrace"/>
    <requirements trophies="0"/>
    
    <hard>
        <karts number="5"/>
-        <requirements position="1" time="205"/>
+        <requirements position="1" time="165"/>
    </hard>
    <medium>
        <karts number="4"/>
-        <requirements time="225"/>
+        <requirements time="195"/>
    </medium>
    <easy>
        <karts number="4"/>
--- a/data/challenges/jungle.challenge
+++ b/data/challenges/jungle.challenge
@ -2,7 +2,7 @@
 <challenge version="2">
    <track id="cocoa_temple" laps="3"/>
    <mode major="single" minor="quickrace"/>
-    <requirements trophies="15"/>
+    <requirements trophies="5"/>
    
    <hard>
        <karts number="5"/>
--- a/data/challenges/olivermath.challenge
+++ b/data/challenges/olivermath.challenge
@ -14,7 +14,7 @@
    </medium>
    <easy>
        <karts number="5"/>
-        <requirements position="1" time="105"/>
+        <requirements position="1" time="130"/>
    </easy>
 </challenge>

--- a/data/challenges/volcano_island.challenge
+++ b/data/challenges/volcano_island.challenge
@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<challenge version="2">
+    <track id="volcano_island" laps="2"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="15"/>
+    
+    <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/gfx/explosion.xml
+++ b/data/gfx/explosion.xml
@ -10,8 +10,8 @@
    <material  file="explode.png"  />
    
    <!-- Amount of particles emitted per second -->
-    <rate      min="500"
-               max="800" />
+    <rate      min="400"
+               max="600" />
    
    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
    <lifetime  min="1000"
--- a/data/gfx/explosion_bomb.xml
+++ b/data/gfx/explosion_bomb.xml
@ -10,8 +10,8 @@
    <material  file="explode.png"  />
    
    <!-- Amount of particles emitted per second -->
-    <rate      min="500"
-               max="800" />
+    <rate      min="400"
+               max="600" />
    
    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
    <lifetime  min="1000"
--- a/data/gfx/explosion_cake.xml
+++ b/data/gfx/explosion_cake.xml
@ -10,8 +10,8 @@
    <material  file="explode.png"  />
    
    <!-- Amount of particles emitted per second -->
-    <rate      min="500"
-               max="800" />
+    <rate      min="400"
+               max="600" />
    
    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
    <lifetime  min="1000"
--- a/data/gfx/kart_exhaust.xml
+++ b/data/gfx/kart_exhaust.xml
@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<particles emitter="box" box_x="0.05" box_y="0.05" box_z="0.10">
+
+    <spreading angle="2"         />
+    
+    <velocity  x="0.0"
+               y="0.005"
+               z="-0.01"         />
+    
+    <material  file="smoke.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="200"
+               max="300"          />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="10"
+               max="40"           />
+    
+    <!-- Size of the particles -->
+    <size      min="0.05"
+               max="0.1"         
+               x-increase-factor="5"
+               y-increase-factor="5"
+               />
+    
+    <color     min="255 255 255"
+               max="0 0 0"  />
+    
+    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <fadeout   time="500"         />
+
+</particles>
--- a/data/grandprix/1_penguinplayground.grandprix
+++ b/data/grandprix/1_penguinplayground.grandprix
@ -1,10 +1,10 @@

 <supertuxkart_grand_prix name="Penguin Playground">

-    <track id="sandtrack"    laps="3" reverse="false" />
-    <track id="farm"         laps="3" reverse="false" />
-    <track id="olivermath"   laps="4" reverse="false" />
-    <track id="subsea"       laps="2" reverse="false" />
-    <track id="scotland"     laps="3" reverse="false" /> 
+    <track id="sandtrack"          laps="3" reverse="false" />
+    <track id="cornfield_crossing" laps="3" reverse="false" />
+    <track id="olivermath"         laps="4" reverse="false" />
+    <track id="abyss"              laps="3" reverse="false" />
+    <track id="scotland"           laps="3" reverse="false" /> 
 
 </supertuxkart_grand_prix>
--- a/data/grandprix/3_tothemoonandback.grandprix
+++ b/data/grandprix/3_tothemoonandback.grandprix
@ -5,7 +5,7 @@
    <track id="greenvalley"          laps="2" reverse="false" />
    <track id="mansion"              laps="3" reverse="false" />
    <track id="stk_enterprise"       laps="3" reverse="false" />
-    <track id="city"                 laps="2" reverse="false" />
+    <track id="volcano_island"       laps="2" reverse="false" />
    
 </supertuxkart_grand_prix>

--- a/data/graphical_restrictions.xml
+++ b/data/graphical_restrictions.xml
@ -1,25 +1,41 @@
 <?xml version="1.0"?>
 <graphical-restrictions>
+  <card is="Intel(R) HD Graphics"      os="windows" version="<9.0" disable="ForceLegacyDevice"/>
+  <card is="Intel(R) HD Graphics"      os="windows" version="<9.0" disable="HighDefinitionTextures"/>
+  <card is="Intel(R) HD Graphics 2000" os="windows"                disable="UniformBufferObject"/>
+  <card is="Intel(R) HD Graphics 2000" os="windows"                disable="AdvancedPipeline"/>
+  <card is="Intel(R) HD Graphics 2000" os="windows"                disable="FramebufferSRGBWorking"/>
+  <card is="Intel(R) HD Graphics 2000" os="windows"                disable="HighDefinitionTextures"/>
  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="UniformBufferObject"/>
  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="AdvancedPipeline"/>
  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="FramebufferSRGBWorking"/>
+  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="HighDefinitionTextures"/>
+  <card is="Intel(R) HD Graphics 4600" os="windows"                disable="ComputeShader"/>
  <card contains="Intel"          os="osx"                         disable="GI"/>
-  <card contains="Intel"                                           disable="TextureCompressionS3TC"/>
-  <card contains="Intel"          os="windows"                     disable="HighDefinitionTextures"/>
+  <card contains="Intel"          os="linux"    version="<11.2"    disable="ComputeShader"/>
+  <card contains="Intel"          os="linux"    version="<11.2"    disable="GeometryShader"/>
+  <card contains="Intel"          os="linux"                       disable="FramebufferSRGBCapable"/>
+  <card contains="Intel"          os="linux"    version="<11.2"    disable="TextureCompressionS3TC"/>
+  <card contains="Intel"          os="windows"                     disable="TextureCompressionS3TC"/>
+  <card contains="Intel"          os="osx"                         disable="TextureCompressionS3TC"/>
  <card contains="NVIDIA"         os="windows"  version="<344.65"  disable="BufferStorage"/>
  <card contains="NVIDIA"         os="linux"    version="<343.22"  disable="BufferStorage"/>
  <card contains="NVIDIA"                                          disable="ShaderAtomicCounters"/>
  <card contains="Mesa"           os="linux"    version="<10.3"    disable="BufferStorage"/>
  <card contains="Mesa"           os="linux"    version="<10.3"    disable="DriverRecentEnough"/>
-  <card contains="Mesa"           os="linux"    version="<10.6"    disable="GeometryShader4"/>
-  <card contains="Mesa"           os="linux"                       disable="TextureCompressionS3TC"/>
+  <card contains="Mesa"           os="linux"    version="<11.2"    disable="GeometryShader"/>
+  <card contains="Mesa"           os="linux"    version="<11.2"    disable="TextureCompressionS3TC"/>
  <card contains="Gallium"        os="linux"    version="<10.3"    disable="BufferStorage"/>
  <card contains="Gallium"        os="linux"    version="<10.3"    disable="DriverRecentEnough"/>
-  <card contains="Gallium"        os="linux"    version="<10.6"    disable="GeometryShader4"/>
-  <card contains="Gallium"        os="linux"                       disable="TextureCompressionS3TC"/>
+  <card contains="Gallium"        os="linux"    version="<11.2"    disable="GeometryShader"/>
+  <card contains="Gallium"        os="linux"    version="<11.2"    disable="TextureCompressionS3TC"/>
  <!-- On osx radeon appears to have different version numbers, e.g.
       1.32.20 -->
  <card contains="Radeon"         os="linux"    version="<14.300"  disable="DriverRecentEnough"/>
  <card contains="Radeon"         os="windows"  version="<14.300"  disable="DriverRecentEnough"/>
+  <card contains="ATI"            os="windows"  version="<14.300"  disable="DriverRecentEnough"/>
+  <card contains="ATI"            os="windows"  version="<=3.1.8787" disable="ForceLegacyDevice"/>
+  <card                           os="android"                     disable="TextureFormatBGRA8888"/>
+  <card                           os="android"                     disable="ColorBufferFloat"/>
+  <card contains="Android Emulator" os="android"                   disable="ForceLegacyDevice"/>
 </graphical-restrictions>
-
--- a/data/gui/License.txt
+++ b/data/gui/License.txt
@ -12,6 +12,8 @@ mode_tt, released under Creative-Commons BY-SA 3, incorporatings artwork from ye

 mode_easter, mode_ftl, mode_soccer, mode_normal, race_giveup: by Totoplus62, released under CC-BY-SA 3.0

+soccer balls released under CC-BY-SA 3.0 by Néd J. Édoire
+
 tutorial.png    by Totoplus62, released under CC-BY-SA 3.0

 Logo and Logo_slim : under CC-BY-SA 3.0+ by 'rastapax'
--- a/data/gui/addons_screen.stkgui
+++ b/data/gui/addons_screen.stkgui
@ -33,5 +33,8 @@
        <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
            <list id="list_addons" x="0" y="0" width="100%" height="100%"/>
        </box>
+
+        <bright width="97%" id="tips_label" text="" align="center"/>
+
    </div>
 </stkgui>
--- a/data/gui/android/blur_bg_button.png
+++ b/data/gui/android/blur_bg_button.png
--- a/data/gui/android/blur_bg_button_focus.png
+++ b/data/gui/android/blur_bg_button_focus.png
--- a/data/gui/android/directionnal_wheel.png
+++ b/data/gui/android/directionnal_wheel.png
--- a/data/gui/android/drift.png
+++ b/data/gui/android/drift.png
--- a/data/gui/android/license.txt
+++ b/data/gui/android/license.txt
@ -0,0 +1,12 @@
+# Licensing work
+
+Icons firstly made for SuperTuxKart UI on Android.
+
+Files: blur_bg_button ; blur_bg_button_focus ; directionnal_wheel ; drift ; nitro ; nitro_empty ; pause ; thunderbird_reset ; wing_mirror
+	- CC BY-SA 4.0 / author: Néd J. Édoire
+
+# License information:
+
+- Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
+	Visit the following link for detailed informations:
+	https://creativecommons.org/licenses/by-sa/4.0/
--- a/data/gui/android/nitro.png
+++ b/data/gui/android/nitro.png
--- a/data/gui/android/nitro_empty.png
+++ b/data/gui/android/nitro_empty.png
--- a/data/gui/android/pause.png
+++ b/data/gui/android/pause.png
--- a/data/gui/android/thunderbird_reset.png
+++ b/data/gui/android/thunderbird_reset.png
--- a/data/gui/android/wing_mirror.png
+++ b/data/gui/android/wing_mirror.png
--- a/data/gui/confirm_dialog.stkgui
+++ b/data/gui/confirm_dialog.stkgui
@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
    <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
-        <label id="title" width="100%" text_align="center" word_wrap="true" proportion="1" />
+        <label id="title" width="100%" text_align="top" word_wrap="true" proportion="1" />

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

-        <button id="confirm" I18N="In a 'are you sure?' dialog" text="Yes" align="center"/>
+        <buttonbar id="buttons" height="30%" width="30%" align="center">

-        <spacer height="15" width="10" />
+            <icon-button id="confirm" icon="gui/green_check.png" I18N="In a 'are you sure?' dialog"
+                text="Yes" align="center"/>

-        <button id="cancel" I18N="In a 'are you sure?' dialog" text="Cancel" align="center"/>
+            <icon-button id="cancel" icon="gui/remove.png" I18N="In a 'are you sure?' dialog"
+                text="Cancel" align="center"/>
+
+        </buttonbar>

        <spacer height="10" width="10" />
    </div>
--- a/data/gui/custom_video_settings.stkgui
+++ b/data/gui/custom_video_settings.stkgui
@ -147,16 +147,8 @@
                <spacer width="10" height="10"/>
                <label text="Texture compression" I18N="Video settings"/>
            </div>
-            
-            <spacer height="4" width="10" />
-            
-            <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="hd-textures"/>
-                <spacer width="10" height="10"/>
-                <label text="Use high definition textures" I18N="Video settings"/>
-            </div>
        </div>
-        
+
        <spacer height="20" width="10" />

        <div layout="horizontal-row" width="100%" proportion="1">
@ -168,9 +160,17 @@
        <spacer height="4" width="10" />

        <div layout="horizontal-row" width="100%" proportion="1">
-            <label text="Texture filtering" I18N="Video settings" width="40%"/>
+            <label text="Rendered image quality" I18N="Video settings" width="40%"/>
            <spacer width="10" height="10"/>
-            <gauge id="filtering" min_value="0" max_value="5" width="50%" />
+            <gauge id="image_quality" min_value="0" max_value="3" width="50%" />
+        </div>
+
+        <spacer height="4" width="10" />
+
+        <div layout="horizontal-row" width="100%" proportion="1">
+            <label text="Geometry detail" I18N="Video settings" width="40%"/>
+            <spacer width="10" height="10"/>
+            <gauge id="geometry_detail" min_value="0" max_value="2" width="50%" />
        </div>

        <spacer height="10" width="10" />
--- a/data/gui/enter_gp_name_dialog.stkgui
+++ b/data/gui/enter_gp_name_dialog.stkgui
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<stkgui>
-    <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
-
-        <label id="title" width="100%" text_align="center" word_wrap="true"
-               I18N="In the 'add new grand prix' dialog"
-               text="Please enter the name of the grand prix" proportion="1" />
-
-        <spacer height="25" width="10" />
-
-        <textbox id="textfield" width="75%" I18N="In the 'add new grand prix' dialog" align="center"/>
-
-        <spacer height="20" width="20" />
-        
-        <button id="accept" I18N="In the 'add new grand prix' dialog" text="OK" align="center" proportion="1"/>
-        <spacer height="15" width="20" />
-        <button id="cancel" I18N="In the 'add new grand prix' dialog" text="Cancel" align="center" proportion="1"/>
-        
-    </div>
-</stkgui>
--- a/data/gui/general_text_field_dialog.stkgui
+++ b/data/gui/general_text_field_dialog.stkgui
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
+        <label id="title" raw_text="Text" proportion="1"/>
+
+        <spacer height="25" width="10" />
+        <textbox id="textfield" width="75%"  align="center"/>
+
+        <spacer height="20" width="20" />
+        <button id="ok" I18N="In the general textfield dialog" text="OK" align="center" proportion="1"/>
+
+        <spacer height="15" width="20" />
+        <button id="cancel" I18N="In the general textfield dialog" text="Cancel" align="center" proportion="1"/>
+    </div>
+</stkgui>
--- a/data/gui/ghost_replay_info_dialog.stkgui
+++ b/data/gui/ghost_replay_info_dialog.stkgui
@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div x="5%" y="5%" width="90%" height="90%" layout="vertical-row">
+        <div x="5%" y="0%" width="90%" proportion="6" layout="horizontal-row">
+            <div width="40%" height="100%" layout="vertical-row">
+                <icon id="icon" align="center" width="100%" icon="gui/loading.png" />
+            </div>
+            <div width="60%" height="50%" layout="vertical-row">
+                <label id="name" width="100%" text_align="left"/>
+            </div>
+        </div>
+
+        <div width="90%" align="center" layout="vertical-row" height="fit">
+            <div width="100%" height="fit" layout="horizontal-row" >
+                <checkbox width="fit" id="record-race" I18N="Ghost replay info action" text_align="left"/>
+                <spacer width="10"/>
+                <label proportion="1" id="record-race-text" height="100%" text_align="left" I18N="Ghost replay info action" text="Record the race for ghost replay"/>
+            </div>
+            <div width="100%" height="fit" layout="horizontal-row" >
+                <checkbox width="fit" id="watch-only" I18N="Ghost replay info action" text_align="left"/>
+                <spacer width="10"/>
+                <label proportion="1" id="watch-only-text" height="100%" text_align="left" I18N="Ghost replay info action" text="Watch replay only"/>
+            </div>
+        </div>
+
+        <div width="80%" proportion="5" align="center">
+            <buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
+                <icon-button id="start" width="128" height="128"
+                             icon="gui/green_check.png"
+                             I18N="Ghost replay info screen action" text="Start Race" />
+                <icon-button id="remove" width="128" height="128"
+                             icon="gui/remove.png"
+                             I18N="Ghost replay info action" text="Remove" />
+                <icon-button id="back" width="128" height="128"
+                             icon="gui/back.png"
+                             I18N="Ghost replay info action" text="Back" />
+            </buttonbar>
+        </div>
+    </div>
+</stkgui>
--- a/data/gui/ghost_replay_selection.stkgui
+++ b/data/gui/ghost_replay_selection.stkgui
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div x="0%" y="1%" width="100%" height="98%" layout="vertical-row" >
+
+        <div x="0" y="0" width="100%" layout="horizontal-row" height="8%">
+            <icon-button id="back" height="100%" icon="gui/back.png"/>
+            <header text_align="center" proportion="1" I18N="In the ghost replay selection screen" text="Ghost Replay Selection" align="center"/>
+            <icon-button id="reload" height="90%" icon="gui/restart.png"/>
+        </div>
+
+        <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
+            <list id="replay_list" x="0" y="0" width="100%" height="100%"/>
+        </box>
+
+        <div width="99%" align="center" layout="vertical-row" height="fit">
+            <div width="100%" height="fit" layout="horizontal-row" >
+                <checkbox width="fit" id="replay_difficulty_toggle" text_align="left"/>
+                <spacer width="10"/>
+                <label proportion="1" height="100%" text_align="left" I18N="In the ghost replay selection screen" text="Only show replays matching the current difficulty"/>
+            </div>
+        </div>
+        <spacer width="100%" height="1%" />
+        <button x="1%" id="record-ghost" I18N="In the ghost replay selection screen" text="Record ghost replay"/>
+
+    </div>
+</stkgui>
--- a/data/gui/grand_prix_lose.stkgui
+++ b/data/gui/grand_prix_lose.stkgui
@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="2%" width="96%" height="96%" layout="horizontal-row">
-        <button id="continue" width="250" align="bottom" text="Continue"/>
-        <spacer width="20"/>
-        <button id="save"     width="250" align="bottom" text="Save Grand Prix"/>
+    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
+        <spacer proportion="1"/>
+        <button id="save"     width="450" align="center" text="Save Grand Prix"/>
+        <spacer height="20"/>
+        <button id="continue" width="450" align="center" text="Continue"/>
    </div>
 </stkgui>
--- a/data/gui/grand_prix_win.stkgui
+++ b/data/gui/grand_prix_win.stkgui
@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="2%" width="96%" height="96%" layout="horizontal-row">
-        <button id="continue" width="250" align="bottom" text="Continue"/>
-        <spacer width="20"/>
-        <button id="save"     width="250" align="bottom" text="Save Grand Prix"/>
+    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
+        <spacer proportion="1"/>
+        <button id="save"     width="450" align="center" text="Save Grand Prix"/>
+        <spacer height="20"/>
+        <button id="continue" width="450" align="center" text="Continue"/>
    </div>
 </stkgui>

--- a/data/gui/heart.png
+++ b/data/gui/heart.png
--- a/data/gui/help1.stkgui
+++ b/data/gui/help1.stkgui
--- a/data/gui/help2.stkgui
+++ b/data/gui/help2.stkgui
--- a/data/gui/help3.stkgui
+++ b/data/gui/help3.stkgui
--- a/data/gui/help4.stkgui
+++ b/data/gui/help4.stkgui
--- a/data/gui/help5.stkgui
+++ b/data/gui/help5.stkgui
@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header align="center" width="80%" text="SuperTuxKart Help" text_align="center"/>
+        <spacer height="15" width="10"/>
+
+        <tabs id="category" height="10%" max_height="110" x="2%" width="98%" align="center">
+            <icon-button id="page1" width="100" height="128" icon="gui/track_random.png"
+                    I18N="Tab in help menu" text="General"/>
+            <icon-button id="page2" width="100" height="128" icon="gui/weapons.png"
+                    I18N="Tab in help menu" text="Weapons"/>
+            <icon-button id="page3" width="100" height="128" icon="gui/mode_ftl.png"
+                    I18N="Tab in help menu" text="Game Modes"/>
+            <icon-button id="page4" width="100" height="128" icon="gui/options_input.png"
+                    I18N="Tab in help menu" text="Multi-player"/>
+            <icon-button id="page5" width="100" height="128" icon="gui/banana.png"
+                    I18N="Tab in help menu" text="Bananas"/>
+        </tabs>
+
+        <box proportion="1" width="100%" layout="vertical-row">
+            <label align="center" text="Hitting a banana can result in one of the following being attached to the kart:"/>
+            
+            <div width="100%" proportion="2" layout="horizontal-row">
+                <icon align="center" width="64" height="64" icon="models/anchor-icon.png"/>
+                <spacer width="64" height="64"/>
+                <bubble proportion="1" height="100%"
+                        I18N="In the help menu"
+                        text="Anchor - slows down the kart."/>
+            </div>
+            
+            <div width="100%" proportion="2" layout="horizontal-row">
+                <icon align="center" width="64" height="64" icon="models/parachute-icon.png"/>
+                <spacer width="64" height="64"/>
+                <bubble proportion="1" height="100%"
+                        I18N="In the help menu"
+                        text="Parachute - slows down the kart less than the anchor."/>
+            </div>
+            
+            <div width="100%" proportion="2" layout="horizontal-row">
+                <icon align="center" width="128" height="128" icon="models/bomb-attach-icon.png"/>
+                <bubble proportion="1" height="100%"
+                        I18N="In the help menu"
+                        text="Bomb - detonates after a short amount of time to throw the kart up in the air. Bump into another kart to transfer the bomb to another player."/>
+            </div>
+        </box>
+    </div>
+
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+</stkgui>
--- a/data/gui/mode_ghost.png
+++ b/data/gui/mode_ghost.png
--- a/data/gui/multitouch_settings.stkgui
+++ b/data/gui/multitouch_settings.stkgui
@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row" >
+        <header id="title" width="100%" height="fit" text_align="center" word_wrap="true" text="Touch Device Settings" />
+
+        <spacer height="35" width="10" />
+
+        <label width="100%" I18N="In the multitouch settings screen" text="General"/>
+
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Device enabled"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <checkbox id="buttons_enabled"/>
+            </div>
+        </div>
+
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Buttons scale"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <gauge id="scale" proportion="1" min_value="50" max_value="150"/>
+            </div>
+        </div>
+
+        <label width="100%" I18N="In the multitouch settings screen" text="Accelerometer"/>
+
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Disabled"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <checkbox id="accelerometer_disabled"/>
+            </div>
+        </div>
+
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Phone"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <checkbox id="accelerometer_phone"/>
+            </div>
+        </div>
+
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Tablet"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <checkbox id="accelerometer_tablet"/>
+            </div>
+        </div>
+
+        <label width="100%" I18N="In the multitouch settings screen" text="Advanced"/>
+
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Deadzone center"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <gauge id="deadzone_center" proportion="1" min_value="0" max_value="50"/>
+            </div>
+        </div>
+
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Deadzone edge"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <gauge id="deadzone_edge" proportion="1" min_value="0" max_value="50"/>
+            </div>
+        </div>
+
+        <spacer height="35" width="10"/>
+
+        <div width="fit" height="fit" layout="horizontal-row" align="center" proportion="1">
+            <button id="restore" text="Restore defaults"/>
+            <spacer width="40" height="10" />
+            <button id="close" text="Apply"/>
+        </div>
+    </div>
+</stkgui>
--- a/data/gui/online/create_server.stkgui
+++ b/data/gui/online/create_server.stkgui
@ -17,6 +17,42 @@
                        <label proportion="1" text_align="left" I18N="In the server creation screen" text="Max. number of players"/>
                        <gauge id="max_players" proportion="1" min_value="2" max_value="12"/>
                    </div>
+                    
+                    <spacer height="20" width="20"/>
+
+                    <div width="100%" height="fit" layout="horizontal-row" >
+                        <label proportion="1" text_align="left" I18N="In the server creation screen" text="Password (optional)"/>
+                        <textbox proportion="1" id="password" I18N="In the server creation screen"/>
+                    </div>
+                    
+                    <spacer height="20" width="20"/>
+                    
+                    <label width="100%" height="fit" text_align="left" I18N="In the server creation screen" text="Difficulty"/>
+                        <!--<gauge id="difficulty" proportion="1" min_value="1" max_value="4"/>-->
+                    <ribbon id="difficulty" height="135" width="90%" align="center">
+                        <icon-button id="novice" width="128" height="128" icon="gui/difficulty_easy.png"
+                                I18N="Difficulty" text="Novice"/>
+                        <icon-button id="intermediate" width="128" height="128" icon="gui/difficulty_medium.png"
+                                I18N="Difficulty" text="Intermediate"/>
+                        <icon-button id="expert" width="128" height="128" icon="gui/difficulty_hard.png"
+                                I18N="Difficulty"  text="Expert"/>
+                        <icon-button id="best" width="128" height="128" icon="gui/difficulty_best.png"
+                                I18N="Difficulty"  text="SuperTux"/>
+                    </ribbon>
+                    
+                    <spacer height="20" width="20"/>
+                    
+                    <label width="100%" height="fit" text_align="left" I18N="In the server creation screen" text="Game mode"/>
+                    <ribbon id="gamemode" height="135" width="50%" align="center">
+                        <icon-button id="normal" width="128" height="128" icon="gui/mode_normal.png"
+                                I18N="Multiplayer game mode" text="Normal Race"/>
+                        <icon-button id="timetrial" width="128" height="128" icon="gui/mode_tt.png"
+                                I18N="Multiplayer game mode" text="Time Trial"/>
+                    </ribbon>
+                    <!--
+                    <scrollable_toolbar id="gamemode" height="135" width="90%" label_location="bottom" align="center"
+                            child_width="135" child_height="135" />
+                    -->
                </div>

                <label id="info" proportion="1" width="100%" align="center" text_align="center" word_wrap="true" text=""/>
--- a/data/gui/online/networking_lobby.stkgui
+++ b/data/gui/online/networking_lobby.stkgui
@ -10,6 +10,14 @@
                        <label proportion="1" text_align="left" I18N="In the networking lobby" text="Server name:"/>
                        <label proportion="2" text_align="left" id="server_name" text=""/>
                    </div>
+                    <div width="100%" height="fit" layout="horizontal-row" >
+                        <label proportion="1" text_align="left" I18N="In the networking lobby" text="Difficulty:"/>
+                        <label proportion="2" text_align="left" id="server_difficulty" text=""/>
+                    </div>
+                    <div width="100%" height="fit" layout="horizontal-row" >
+                        <label proportion="1" text_align="left" I18N="In the networking lobby" text="Game mode:"/>
+                        <label proportion="2" text_align="left" id="server_game_mode" text=""/>
+                    </div>
                </box>
                <spacer width="20" height="20"/>
                <box proportion="1" height="100%" layout="vertical-row">
@ -25,7 +33,11 @@
                </box>
                <spacer width="20" height="20"/>
                <box id="actions" proportion="1" height="100%" layout="vertical-row">
-                    <label I18N="In networking lobby" word_wrap="true" text="actions" align="center" text-align="center"/>
+<!--                    <label I18N="In networking lobby" word_wrap="true" text="actions" align="center" text-align="center"/>
+-->
+                  <icon-button id="start" width="64" height="64" icon="gui/green_check.png" align="center"
+                      I18N="In the network lobby" text="Start Race"/>
+
                </box>
            </div>
        </div>
--- a/data/gui/online/online_screen.stkgui
+++ b/data/gui/online/online_screen.stkgui
@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<stkgui>
-    <div x="0" y="0" width="100%" height="fit" layout="vertical-row">
-        <button id="user-id" width="20%" height="fit" align="right"/>
-    </div>
-    
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
-
-        <header text_align="center" width="80%" align="center" I18N="In the online multiplayer screen" text="Online Multiplayer"/>
-
-        <spacer height="5%" width="25"/>
-        <box width="100%" height="38%" padding="10" layout="vertical-row">
-            <bright width="100%" text="Local Networking" align="center" text_align="left" />
-
-            <buttonbar  id="lan" proportion="2" width="90%" align="center">
-                <icon-button id="find_lan_server" width="128" height="128"
-                             icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
-                             I18N="In the online multiplayer screen" text="Find Server"/>
-                <icon-button id="create_lan_server" width="128" height="128"
-                             icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
-                             I18N="In the online multiplayer screen" text="Create Server"/>
-                <icon-button id="manage_user" width="128" height="128"
-                             icon="gui/options_players.png"
-                             I18N="In the online multiplayer screen" text="Users"/>
-            </buttonbar>
-        </box>
-
-        <spacer height="5%" width="25"/>
-
-        <box width="100%" height="38%" padding="10" layout="vertical-row">
-            <bright width="100%" text="Global Networking" align="center" text_align="left" />
-
-            <buttonbar id="menu_top_row" proportion="2" width="90%" align="center">
-                <icon-button id="find_wan_server" width="128" height="128"
-                             icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
-                             I18N="In the online multiplayer screen" text="Find Server"/>
-                <icon-button id="create_wan_server" width="128" height="128"
-                             icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
-                             I18N="In the online multiplayer screen" text="Create Server"/>
-                <icon-button id="quick_wan_play" width="128" height="128"
-                             icon="gui/online/menu_quick_play.png" focus_icon="gui/online/menu_quick_play_hover.png"
-                             I18N="In the online multiplayer screen" text="Quick Play"/>
-            </buttonbar>
-        </box>
-
-        <bottombar x="2%" width="96%" height="10%" layout="horizontal-row">
-            <label text_align="left" align="center" height="100%" id="online_status" proportion="1" text=""/>
-
-            <spacer width="10" height="10" />
-
-            <buttonbar id="menu_bottomrow" x="0" y="0" width="12%" height="100%" align="center">
-                <icon-button id="profile" width="64" height="64" icon="gui/green_check.png"  extend_label="50"
-                             I18N="In the online multiplayer screen" text="Profile" label_location="hover"/>
-                <icon-button id="sign_out" width="64" height="64" icon="gui/main_quit.png"  extend_label="70"
-                             I18N="In the online multiplayer screen" text="Log Out" label_location="hover"/>
-            </buttonbar>
-
-        </bottombar>
-
-    </div>
-
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-</stkgui>
--- a/data/gui/online/profile_achievements_tab.stkgui
+++ b/data/gui/online/profile_achievements_tab.stkgui
@ -9,6 +9,7 @@
        <spacer height="25" width="10"/>

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

        <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
+            <icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png"/>
            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png"
                I18N="Section in the profile screen" text="Friends"/>
--- a/data/gui/online/profile_servers.stkgui
+++ b/data/gui/online/profile_servers.stkgui
@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header id="title" text_align="center" width="80%" align="center" text="..."/>
+
+        <spacer height="25" width="10"/>
+
+        <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
+            <icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png" I18N="Section in the profile screen" text="Servers"/>
+            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
+            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
+            <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png" />
+        </tabs>
+
+        <box proportion="1" width="100%" layout="vertical-row">
+            <div x="1%" y="2%" width="98%" height="96%" layout="vertical-row" >
+                
+                <spacer height="5%" width="25"/>
+                
+                <box width="100%" proportion="1" padding="10" layout="vertical-row">
+                    <bright width="100%" text="Local Networking" align="center" text_align="left" />
+
+                    <buttonbar id="lan" proportion="2" width="90%" align="center">
+                        <icon-button id="find_lan_server" width="128" height="128"
+                                     icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
+                                     I18N="In the online multiplayer screen" text="Find Server"/>
+                        <icon-button id="create_lan_server" width="128" height="128"
+                                     icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
+                                     I18N="In the online multiplayer screen" text="Create Server"/>
+                                     <!--
+                        <icon-button id="manage_user" width="128" height="128"
+                                     icon="gui/options_players.png"
+                                     I18N="In the online multiplayer screen" text="Users"/>
+                                     -->
+                    </buttonbar>
+                </box>
+
+                <spacer height="5%" width="25"/>
+
+                <box width="100%" proportion="1" padding="10" layout="vertical-row">
+                    <bright width="100%" text="Global Networking" align="center" text_align="left" />
+
+                    <buttonbar id="wan" proportion="2" width="90%" align="center">
+                        <icon-button id="find_wan_server" width="128" height="128"
+                                     icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
+                                     I18N="In the online multiplayer screen" text="Find Server"/>
+                        <icon-button id="create_wan_server" width="128" height="128"
+                                     icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
+                                     I18N="In the online multiplayer screen" text="Create Server"/>
+                        <icon-button id="quick_wan_play" width="128" height="128"
+                                     icon="gui/online/menu_quick_play.png" focus_icon="gui/online/menu_quick_play_hover.png"
+                                     I18N="In the online multiplayer screen" text="Quick Play"/>
+                    </buttonbar>
+                </box>
+
+            </div>
+        </box>
+    </div>
+</stkgui>
--- a/data/gui/online/profile_settings.stkgui
+++ b/data/gui/online/profile_settings.stkgui
@ -8,6 +8,7 @@
        <spacer height="25" width="10"/>

        <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
+            <icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png"/>
            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
            <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"
--- a/data/gui/online/server_info_dialog.stkgui
+++ b/data/gui/online/server_info_dialog.stkgui
@ -8,10 +8,24 @@
       <spacer height="20" width="50"/>

        <div width="80%" align="center" layout="vertical-row" height="fit" >
+            <!--
            <div width="100%" height="fit" layout="horizontal-row" >
                <label proportion="1" text_align="left" I18N="In the server info dialog" text="Name"/>
                <label id="name" proportion="2" text_align="left" text=""/>
            </div>
+            -->
+            <div width="100%" height="fit" layout="horizontal-row" >
+                <label proportion="1" text_align="left" I18N="In the networking lobby" text="Server name:"/>
+                <label proportion="2" text_align="left" id="server_name" text=""/>
+            </div>
+            <div width="100%" height="fit" layout="horizontal-row" >
+                <label proportion="1" text_align="left" I18N="In the networking lobby" text="Difficulty:"/>
+                <label proportion="2" text_align="left" id="server_difficulty" text=""/>
+            </div>
+            <div width="100%" height="fit" layout="horizontal-row" >
+                <label proportion="1" text_align="left" I18N="In the networking lobby" text="Game mode:"/>
+                <label proportion="2" text_align="left" id="server_game_mode" text=""/>
+            </div>
        </div>

        <spacer height="20" width="50"/>
--- a/data/gui/online/waiting_for_others.stkgui
+++ b/data/gui/online/waiting_for_others.stkgui
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
+
+        <header id="title" width="96%" height="fit" text_align="center" I18N="Networking screen" text="Waiting for the others..."/>
+
+        <spacer height="40" width="50"/>
+
+        <label proportion="1" width="100%" text_align="left" id="lblDetails"/>
+    </div>
+</stkgui>
--- a/data/gui/options_players.stkgui
+++ b/data/gui/options_players.stkgui
@ -30,7 +30,7 @@

            <label width="100%"
                I18N="In the player configuration screen"
-                text="Press enter or double-click on a player to edit him/her"
+                text="Press enter or double-click on a player to edit their settings"
                text_align="center" />

            <spacer width="5" height="20"/>
--- a/data/gui/scripting_console.stkgui
+++ b/data/gui/scripting_console.stkgui
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<stkgui>
-    <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
-        
-        <label raw_text="Run script"/>
-        
-        <textbox id="textfield" width="75%" I18N="In the 'add new grand prix' dialog" align="center"/>
-
-        <spacer height="20" width="20" />
-        
-        <div align="center" height="fit" width="100%" layout="horizontal-row">
-            <button id="run" raw_text="Run" align="center" proportion="1"/>
-            <spacer height="20" width="20" />
-            <button id="close" raw_text="Close" align="center" proportion="1"/>
-        </div>
-    </div>
-</stkgui>
--- a/data/gui/soccer_ball_blue.png
+++ b/data/gui/soccer_ball_blue.png
--- a/data/gui/soccer_ball_empty.png
+++ b/data/gui/soccer_ball_empty.png
--- a/data/gui/soccer_ball_normal.png
+++ b/data/gui/soccer_ball_normal.png
--- a/data/gui/soccer_ball_red.png
+++ b/data/gui/soccer_ball_red.png
--- a/data/gui/soccer_setup.stkgui
+++ b/data/gui/soccer_setup.stkgui
@ -6,38 +6,39 @@

        <header width="80%" text="Race Setup" align="center" text_align="center" />

-        <spacer height="25" width="25"/>
+        <spacer height="10" width="25"/>

        <div layout="horizontal-row" width="fit" height="35" align="left">
            <bright proportion="1" height="100%"
                    I18N="In soccer setup screen" text="Number of goals to win" text_align="left" />
-            <spacer width="50" height="25"/>
+            <spacer width="10" height="25"/>
            <spinner id="goalamount" width="200" height="90%" min_value="1" max_value="10"/>
        </div>

        <div layout="horizontal-row" width="fit" height="35" align="left">
            <bright proportion="1" height="100%"
                    I18N="In soccer setup screen" text="Maximum time (min.)" text_align="left" />
-            <spacer width="50" height ="25"/>
+            <spacer width="10" height ="25"/>
            <spinner id="timeamount" width="200" height="90%" min_value="1" max_value="15"/>
        </div>

        <div layout="horizontal-row" width="fit" height="35" align="left">
            <bright proportion="1" height="100%"
                    I18N="In soccer setup screen" text="Game type (Goals limit / Time limit)" text_align="left" />
-            <spacer width="50" height="25"/>
+            <spacer width="10" height="25"/>
            <checkbox id="time_enabled"/>
        </div>

-        <spacer height="40" width="25"/>
+        <spacer height="10" width="25"/>

-        <bright height="15" width="25" I18N="In soccer setup screen" text="Use left/right to choose your team and press fire" text_align="center" align="center" />
+        <bubble height="fit" width="100%" id="lblLeftRight" I18N="In soccer setup screen" text="Use left/right to choose your team and press fire" word_wrap="true" text_align="center"/>

        <div id="central_div" layout="horizontal-row" width="100%" proportion="1" align="center">
-            <roundedbox y="5%" width="100%" layout="horizontal-row" height="100%">
+            <roundedbox y="5%" width="100%" layout="horizontal-row" height="95%">
                <!-- Content is added programmatically -->
            </roundedbox>
-            <header id="vs" text="VS"/>     <!-- Layout is done programmatically -->
+            <icon id="red_team" I18N="In soccer setup screen" text="Red Team" icon="gui/soccer_ball_red.png" width="font" height="font"/>  <!-- Layout is done programmatically -->
+            <icon id="blue_team" I18N="In soccer setup screen" text="Blue Team" icon="gui/soccer_ball_blue.png" width="font" height="font"/>
        </div>

        <button id="continue" I18N="In soccer setup screen" text="Continue" align="center" width="60%"/>
--- a/data/gui/track_info.stkgui
+++ b/data/gui/track_info.stkgui
@ -3,9 +3,9 @@
    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>

    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-        <header id="name" height="5%" width="80%" align="center" text_align="center"/>
+        <header id="name" height="7%" width="80%" align="center" text_align="center"/>

-        <spacer width="1" height="5%"/>
+        <spacer width="1" height="1%"/>

        <box width="100%" height="40%" padding="10" layout="horizontal-row">
            <!-- Left pane -->
@ -40,14 +40,17 @@
                    <label id="highscore3" proportion="1" text="(Empty)"/>
                </div>

-                <spacer width="1" height="10%"/>
+                <spacer width="1" height="2%"/>

                <label id="author" width="100%" text_align="center" word_wrap="true"/>
+
+                <spacer width="1" height="10%"/>
+                <label id="max-arena-players" width="100%" text_align="center" word_wrap="true"/>
            </div>

        </box>
-        <spacer width="1" height="5%"/>
-        <box width="100%" height="25%" padding="15" layout="vertical-row">
+        <spacer width="1" height="1%"/>
+        <box width="100%" height="33%" padding="15" layout="vertical-row">
            <div width="100%" height="fit" layout="horizontal-row" >
                <label id="lap-text" proportion="1" I18N="In the track info screen" text="Number of laps" text_align="right"/>
                <spacer width="40"/>
@ -67,17 +70,26 @@
            </div>
            <spacer height="10"/>
            <div width="100%" height="fit" layout="horizontal-row" >
-                <label id="reverse-text" proportion="1" I18N="In the track info screen" text="Drive in reverse" text_align="right"/>
+                <label id="option-text" proportion="1" I18N="In the track info screen" text_align="right"/>
                <spacer width="40"/>
                <div proportion="1" height="fit" layout="horizontal-row">
                    <div width="50%" height="fit" text-align="center" layout="vertical-row" >
-                        <checkbox id="reverse" align="center"/>
+                        <checkbox id="option" align="center"/>
                    </div>
                </div>
            </div>
-            <spacer width="1" height="2%"/>
+            <div width="100%" height="fit" layout="horizontal-row" >
+                <label id="record-race-text" proportion="1" I18N="In the track info screen" text="Record the race for ghost replay" text_align="right"/>
+                <spacer width="40"/>
+                <div proportion="1" height="fit" layout="horizontal-row">
+                    <div width="50%" height="fit" text-align="center" layout="vertical-row" >
+                        <checkbox id="record" align="center"/>
+                    </div>
+                </div>
+            </div>
+            <spacer width="1" height="1%"/>
        </box>
-        <spacer width="1" height="5%"/>
+        <spacer width="1" height="1%"/>
        <buttonbar id="buttons" height="15%" width="100%" align="center">
            <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
                    I18N="In the track info screen" text="Start Race"/>
--- a/data/gui/track_random.png
+++ b/data/gui/track_random.png
--- a/data/gui/tracks.stkgui
+++ b/data/gui/tracks.stkgui
@ -3,16 +3,7 @@
    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>

    <div x="1%" y="1%" width="98%" height="96%" layout="vertical-row" >
-
-        <header width="80%" I18N="In the track selection screen" text="Grand Prix"
-                align="center" text_align="center" />
-
-        <box width="100%" height="195" padding="0">
-            <scrollable_toolbar id="gps" height="175" y="10" x="10" width="98%" align="center" label_location="each"
-                                square_items="true" child_width="175" child_height="120" />
-        </box>
-
-        <header width="100%" I18N="In the track selection screen" text="All Tracks"
+        <header width="80%" I18N="In the track selection screen" text="All Tracks"
                align="center" text_align="center" />

        <box proportion="1" width="100%" layout="vertical-row" padding="1">
--- a/data/gui/tracks_and_gp.stkgui
+++ b/data/gui/tracks_and_gp.stkgui
@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+
+    <div x="1%" y="1%" width="98%" height="96%" layout="vertical-row" >
+
+        <header width="80%" I18N="In the track and grand prix selection screen" text="Grand Prix"
+                align="center" text_align="center" />
+
+        <box width="100%" height="195" padding="0">
+            <scrollable_toolbar id="gps" height="175" y="10" x="10" width="98%" align="center" label_location="each"
+                                square_items="true" child_width="175" child_height="120" />
+        </box>
+
+        <header width="100%" I18N="In the track and grand prix selection screen" text="All Tracks"
+                align="center" text_align="center" />
+
+        <box proportion="1" width="100%" layout="vertical-row" padding="1">
+            <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
+                label_location="bottom" align="center" max_rows="4"
+                child_width="160" child_height="120" />
+            <spacer width="20" height="13" />
+        </box>
+
+        <!-- Populated dynamically at runtime -->
+        <tabs width="100%" height="25" id="trackgroups"> </tabs>
+
+        <spacer width="100%" height="2%" />
+    </div>
+</stkgui>
--- a/data/gui/user_screen.stkgui
+++ b/data/gui/user_screen.stkgui
@ -13,7 +13,7 @@
                               square_items="true" child_width="128" child_height="128" />

            <spacer height="15" width="10"/>
-            <div width="90%" align="center" layout="vertical-row" height="fit">
+            <div width="90%" align="center" layout="vertical-row" proportion="1">
                <div width="100%" height="fit" layout="horizontal-row" >
                    <checkbox width="fit" id="online" I18N="In the user screen" text_align="left"/>
                    <spacer width="10"/>
@ -44,23 +44,29 @@
                           I18N="In the user screen" text="Password"/>
                    <textbox id="password" proportion="2" height="fit" I18N="In the user screen"/>
                </div>
+                
+                <spacer height="20" width="20"/>
+                
+                <label id="message" width="100%" text_align="center"/>
            </div>
-            <div width="80%" align="center" layout="vertical-row" height="fit">
-                <label id="message" width="80%" align="center" text_align="left"/>
-            </div>
-            <spacer width="20" height="25"/>
-            <buttonbar id="options" width="90%" height="13%" align="bottom">
-                <icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
-                             I18N="In the user screen" text="OK" label_location="bottom"/>
-                <icon-button id="new_user" width="64" height="64" icon="gui/blue_plus.png"
-                             I18N="In the user screen" text="Add user" label_location="bottom"/>
-                <icon-button id="delete" width="64" height="64" icon="gui/remove.png"
-                             I18N="In the user screen" text="Delete" label_location="bottom"/>
-                <icon-button id="rename" width="64" height="64" icon="gui/rename.png"
-                             I18N="In the user screen" text="Rename" label_location="bottom"/>
-                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-                             I18N="In the user screen" text="Cancel" label_location="bottom"/>
-            </buttonbar>
+            
+			<spacer width="20" proportion="1"/>
+			
+			<div width="90%" align="center" layout="vertical-row" height="fit">
+				<buttonbar id="options" width="100%" height="80" align="center">
+					<icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
+								 I18N="In the user screen" text="OK" label_location="bottom"/>
+					<icon-button id="new_user" width="64" height="64" icon="gui/blue_plus.png"
+								 I18N="In the user screen" text="Add user" label_location="bottom"/>
+					<icon-button id="delete" width="64" height="64" icon="gui/remove.png"
+								 I18N="In the user screen" text="Delete" label_location="bottom"/>
+					<icon-button id="rename" width="64" height="64" icon="gui/rename.png"
+								 I18N="In the user screen" text="Rename" label_location="bottom"/>
+					<icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+								 I18N="In the user screen" text="Cancel" label_location="bottom"/>
+				</buttonbar>
+			</div>
+			<spacer width="20" height="25"/>
        </box>
        <spacer width="20" height="15"/>
    </div>
--- a/data/kart_characteristics.xml
+++ b/data/kart_characteristics.xml
@ -0,0 +1,409 @@
+<?xml version="1.0"?>
+<!-- Format
+    It is possible to give relative values (factors and more) for each property.
+
+    The format as a regex is: ([+-*/](%d+|x))*
+    An empty value means no change, a value without sign or with a '-' replaces
+    the previous value. If an operator prefixes the string, e.g. *1.5 (- doesn't
+    work because it's a sign). x will get replaced by the previous value which
+    means *1.5 is equal to x*1.5. It's also possible to combine operations:
+    +1.5*20 means "add 1.5 to the previous value and then multiply by 20".
+    Note that it's computed sequentially from left to right and there is no
+    operator precedence. Also whitespaces aren't allowed because they are used
+    to split arrays.
+    If you want to return the square of something use x*x or only *x.
+
+    ATTENTION: '-' is a special case if it is the first character of a number-
+    string. It means that the number is negative and NOT that the following
+    float will be substracted from the base value. So if x = 10 and the string
+    "-5" is processed, the result will be -5 and not the same as "x-5", which
+    would result in 10 - 5 = 5.
+-->
+<characteristics>
+    <!-- The default values that can be modified by the difficulty, karts, etc.
+        The values here should also be the values of the maximum difficulty. -->
+    <characteristic name="base">
+        <!-- ********** Physics ********** -->
+
+        <!-- Suspension
+            stiffness: kart's suspension stiffness.
+            rest: Length of suspension when at rest.
+            travel-cm: maximum movement of suspension - in cm!!
+            exp-string-response: dampen the suspension spring reaction
+                exponentially. See
+                http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?f=9&t=7369\&p=25236&hilit=vehicle#p25236
+                for details.
+            max-force: Maximum suspension force -->
+        <suspension stiffness="140" rest="0.3" travel="0.29"
+            exp-spring-response="false" max-force="12000" />
+
+        <!-- Values related to stability of the chassis: damping, and reduced
+                impact of roll.
+            downward-impulse-factor: A speed proportional impulse applied each
+                frame that pushes the vehicle onto the ground.
+            track-connection-accel: An artificial force that pulls a wheel to
+                the ground if its off ground. Reduces the affect if a kart loses
+                contact with the ground (i.e. it then can't steer or accelerate
+                anymore).
+            smooth-flying-impulse: apply a torque impulse to flying kart to keep
+                them parallel to the ground. -->
+        <stability roll-influence="0.3"
+                   chassis-linear-damping="0.2"
+                   chassis-angular-damping="0"
+                   downward-impulse-factor="5"
+                   track-connection-accel="2"
+                   smooth-flying-impulse="250" />
+
+        <!-- Turning
+            radius: The turn radius of the kart at
+                a given speed. The actual steering angle is dependent on the
+                wheel base of the kart: radius = wheel_base/sin(steering_angle).
+                The values below define that at speed 0 the turn radius is 2, at
+                speed 10 the radius is 7.5 etc.
+                The actual turn radius is piece-wise linearly interpolated. This
+                allows for tighter turning at lower speeds, and also avoids that
+                the kart becomes too hard to control at high speed (speeds of
+                higher than 23 can only be reached with powerups).
+            time-full-steer: This is the amount of change in steering depending
+                on current steering. So if the steering is between 0 and 0.5,
+                the time-for-steering-change is 0.15. If the current steering is
+                between 0.5 and 1.0, the time-for-steering-change is 0.25.
+                The speed is used as dt/time-for-steering-change.
+                In short: steering at less than halfway is somewhat faster,
+                which should avoid oversteering (by pressing the key for too long),
+                but slower when you want to steer more. Overwall with the current
+                settings the expected time-to-full-steer is:
+                0.5 * 0.25 + 0.5 * 0.15 = 0.2 ... which is overall the same
+                time we had previously. -->
+        <turn radius="0:2.0 10:7.5 25:15 45:30"
+              time-full-steer="0:0.17 0.5:0.17 0.5:0.28 1.0:0.28"
+              time-reset-steer="0.1" />
+
+        <!-- Speed and acceleration
+            power: The power of the kart
+            max-speed: The base maximum speed of the kart in m/s
+            brake-factor: Value used when braking.
+            brake-time-increase: The brake force is multiplied by
+                (1 + brake_time) * brake_time_increase - i.e. the longer the
+                brake was pressed, the harder the kart will brake.
+            max-speed-reverse-ratio is the percentage of max speed for reverse
+                gear.
+          -->
+        <engine power="875" max-speed="25" brake-factor="15"
+                brake-time-increase="6" max-speed-reverse-ratio="0.65" />
+
+        <!-- Simulated gears
+            switch-ratio defines at what ratio of the maximum
+                speed what gear is selected, e.g. 0.25 means that if the speed is
+                bigger or equal to 0.25 * maxSpeed then use gear 1, 0.5 means if
+                the speed is bigger or equal to 0.5 x maxSpeed then gear 2.
+                gear-power-increase contains the increase in max power (to simulate
+                different gears), e.g. 2.5 as first entry means: 2.5 * maxPower in gear 1
+                | first  | second |  third | . -->
+        <gear switch-ratio="0.25 0.7 1.0" power-increase="2.2 1.7 1.3" />
+
+        <!-- Mass of a kart -->
+        <mass value="350" />
+
+        <!-- Wheels
+            damping-relaxation/compression: for bullet
+            damping parameters
+            Radius and width of wheel
+            front-right, front-left, rear-right and rear-left give the
+                position of the physics raycast wheels relative to the center of
+                gravity. Default is to use the corners of the chassis to attach
+                the wheels to. -->
+        <wheels damping-relaxation="35"  damping-compression="5">
+            <front-right position="0.38 0 0.6"   />
+            <front-left  position="-0.38 0 0.6"  />
+            <rear-right  position="0.38 0 -0.6"  />
+            <rear-left   position="-0.38 0 -0.6" />
+        </wheels>
+
+
+        <!-- ********** Visuals ********** -->
+
+        <!-- Skidding
+            increase: multiplicative increase of skidding factor in each frame.
+            decrease: multiplicative decrease of skidding factor in each frame.
+            max: maximum skidding factor = maximum increase of steering angle.
+            time-till-max: Time till maximum skidding is reached.
+            visual: Additional graphical rotation of kart. The graphical rotation
+                of the kart also determines the direction the kart is driving to
+                when skidding is stopped.
+            visual-time: How long it takes for the visual skid to reach maximum.
+            revert-visual-time: how long it takes when stopping a skid to revert
+                the visual skid and bring visuals and physics in sync again.
+            angular-velocity: Angular velocity to be used for the kart when skidding.
+            min-speed: Minimum speed a kart must have before it can skid. Must be
+                >0, otherwise the kart can skid at the start of the race.
+            time-till-bonus: How long a kart needs to skid in order to get a bonus.
+            bonus-force: A speedup applied to the kart whick skidded for a while.
+            bonus-time: How long the bonus-force is applied.
+            bonus-force: Additional engine force (this is used to offset the fact
+                that turning after skidding (e.g. to correct direction) often uses
+                up the skid bonus).
+            post-skid-rotate-factor: a factor to be used to determine how much
+                the chassis of a kart should rotate to match the graphical view.
+                A factor of 1 is identical, a smaller factor will rotate the kart
+                less (which might  feel better).
+            physical-jump-time: Time for a physical jump at the beginning of a skid.
+                graphical-jump-time: Time for a graphics-only jump at the beginning
+                of a skid.
+            reduce-turn-min/max: The steering done by the controller (which is in
+                [-1,1]) is mapped to [reduce-turn-min, reduce-turn-max] when skidding
+                is active (for left turn, right turn will use [-max, -min]). The
+                effect is that while you skid (say left) you can adjust the direction
+                of the turn the kart is doing somewhat by steering to the left and right,
+                but you will always keep on doing a left turn, just more or less. -->
+        <skid increase="1.05" decrease="0.95" max="2.5" time-till-max="0.5"
+              visual="1.25" visual-time="0.7" revert-visual-time="0.7"
+              min-speed="10"  time-till-bonus="1.0 3.0"
+              bonus-speed="4.5 6.5" bonus-time="3.0 4.0"
+              bonus-force="250 350"
+              physical-jump-time="0" graphical-jump-time="0.4"
+              post-skid-rotate-factor="1"
+              reduce-turn-min="0.2" reduce-turn-max="0.8" enabled="true" />
+
+        <!-- Camera
+            Distance between kart and camera.
+            forward-up-angle: Angle between camera and plane of kart (pitch)
+                when the camera is pointing forward
+            backward-up-angle: Angle between camera and plane of kart (pitch)
+                when the camera is pointing backwards. This is usually
+                larger than the forward-up-angle, since the kart itself
+                otherwise obstricts too much of the view. -->
+        <camera distance="1.0" forward-up-angle="15"
+                backward-up-angle="5" />
+
+        <!-- Jump animation
+            animation-time: only if the estimated time for a jump is larger
+                than this value will the jump animation being
+                shown. -->
+       <jump animation-time="0.5" />
+
+        <!-- Leaning related parameters, i.e. slightly leaning the karts when
+             driving a fast curve.
+            max: maximum leaning (i.e. when steering as much as possible at highest
+                speed), in degrees.
+            speed: Speed with which the leaning changes (in degree/second). -->
+        <lean max="6.6" speed="15.0" />
+
+
+        <!-- ********** Items ********** -->
+
+        <!-- Anvil
+            weight: The additional weight an anvil adds to a kart.
+            speed-factor: The additional slowdown caused by the anvil.
+            duration: The time an anvil is active. -->
+        <anvil duration="2.0" weight="150"  speed-factor="0.2" />
+
+        <!-- Parachute
+            friction: The friction increase when a parachute is attached.
+            duration: The time an attached parachute is active
+            duration-other: The time a parachute attached from other kart works
+            duration-rank-mult: The multiplier applied to the duration of the
+            parachute on the 1st kart when affected by the item. Scale for
+            intermediary ranks to 1.0 for the last affected.
+            duration-speed-mult: Applied in all cases, multitplier to duration
+            of the parachute at max-speed. Scale to 1.0 at 0 speed.
+            lbound-fraction: The lower bound fraction of speed when lost will
+                detach parachute. E.g. at nearly 0 speed, only 20% of speed
+                need to be lost.
+            ubound-fraction: The upper bound fraction of speed when lost will
+                detach parachute. E.g. at max-speed 50% of speed must be lost.
+            max-speed: A factor that decides the impact of rate of speed
+                (distance between bounds) -->
+        <parachute friction="2.0" duration="2.0" duration-other="2.6"
+                   duration-rank-mult="1.35" duration-speed-mult="2.0"
+                   lbound-fraction="0.8" ubound-fraction="0.5" max-speed="23" />
+        <!-- Bubblegum
+            duration: How long the bubblegum lasts.
+            speed-fraction: To what fraction of top-speed the speed is reduced.
+            torque: To rotate the kart somewhat.
+            fade-in-time: How quick the slowdown takes effect.
+            shield-duration: How long the bubblegum shield lasts -->
+        <bubblegum duration="1" speed-fraction="0.3" torque="500" fade-in-time="0.01"
+                   shield-duration="10.0" />
+
+        <!-- Zipper
+            duration: Time a zipper is active.
+            force: Additional zipper force.
+            speed-gain: One time additional speed.
+            max-speed-increase: Additional speed allowed on top of the
+                kart-specific maximum kart speed.
+            fade-out-time: determines how long it takes for a zipper
+                to fade out (after 'time'). -->
+        <zipper duration="3.5" force="250.0" speed-gain="4.5" max-speed-increase="15"
+                fade-out-time="1.0" />
+
+        <!-- Swatter
+            duration: How long can the swatter be active.
+            distance: How close a kart or an item must be before it can be hit.
+                      This is the square of the real distance to accelerate the
+                      compution.
+            squash-duration: How long a kart will remain squashed.
+            squash-slowdown: Percentage of max speed that a kart is
+                restricted to. -->
+        <swatter duration="10" distance="9" squash-duration="5"
+                 squash-slowdown="0.5" />
+
+        <!-- Plunger and rubber band handling
+            band-max-length: The maximum length of rubber band before it snaps.
+            band-force: The force a plunger/rubber band applies to the kart(s).
+            band-duration: The duration a rubber band acts.
+            in-face-time determines how long it takes before a plunger
+                in your face is removed. -->
+        <plunger band-max-length="50" band-force="1500" band-duration="1"
+                 band-speed-increase="7" band-fade-out-time="3"
+                 in-face-time="4.5" />
+
+
+        <!-- ********** Miscellaneous ********** -->
+
+        <!-- Startup
+            If a kart starts within the specified time after 'go',
+            it receives the corresponding bonus from 'boost'. Those
+            fields must have the same size, and must be sorted by
+            increasing times. -->
+        <startup time="0.3 0.5"
+                 boost="6 3" />
+
+        <!-- Rescue
+            duration: How long it takes the kart to be raised.
+            height: how height the kart will be raised before it is
+                dropped back onto the track.
+            vert rescue offset: used to raise karts a bit higher before
+                releasing them on the ground after a rescue. Used to avoid
+                resetting karts into the track. Not sure if this is still
+                necessary. -->
+        <rescue vert-offset="0.0" duration="1.2" height="2" />
+
+        <!-- Explosion
+            duration: how long it takes before the kart can drive again (this
+                determines how height the kart is being thrown).
+            invulnerability-time: how long a kart will be invulnerable
+                after being hit by an explosion.
+            radius: Kart closer to this value will be affected by
+                an explosion as well.  -->
+        <explosion duration="2" radius="5"
+                   invulnerability-time="6" />
+
+        <!-- Nitro
+            engine-force: additional engine power
+            consumption: nitro consumption - heavier characters can be set
+                to need more nitro than lighter character.
+            small-container: how much energy a small container gives.
+            big-container: how much energy a big container gives.
+            max-speed-increase: How much the speed of a kart might exceed
+                its maximum speed (in m/s).
+            duration: How long the increased speed will be valid after
+                the kart stops using nitro (and the fade-out-time starts).
+            fade-out-time: Duration during which the increased maximum
+                speed due to nitro fades out.
+            max: How much nitro a kart can store. -->
+        <nitro engine-force="600" consumption="1" small-container="1" big-container="3"
+               max-speed-increase="5" duration="1" fade-out-time="2" max="20" />
+
+        <!-- Slipstream
+            length: How far behind a kart slipstream works
+            width: how wide slipstream works furthest away from the kart.
+            collect-time: How many seconds of sstream give  maximum benefit
+            use-time: How long the benefit will last.
+            add-power: Additional power due to sstreaming. 1 = +100%
+            min-speed: Minimum speed necessary for slipstream to take effect.
+            max-speed-increase: How much the speed of the kart might exceed
+                its normal maximum speed.
+            duration: How long the higher speed lasts after slipstream stopped
+                working.
+            fade-out-time: How long the slip stream speed increase will
+                gradually be reduced.  -->
+        <slipstream length="10" width="2" collect-time="2" use-time="5"
+                    add-power="3" min-speed="10" max-speed-increase="5"
+                    duration="1" fade-out-time="2" />
+    </characteristic>
+
+    <!-- The different difficulties (like easy, medium, hard) -->
+    <difficulties>
+        <characteristic name="easy">
+            <engine power="*0.66" max-speed="*0.6" />
+            <plunger in-face-time="3" />
+        </characteristic>
+        <characteristic name="medium">
+            <engine power="*0.77" max-speed="*0.8" />
+            <plunger in-face-time="4" />
+        </characteristic>
+        <characteristic name="hard">
+            <engine power="*0.89" max-speed="*0.92" />
+        </characteristic>
+        <!-- This doesn't need to be changed because the most fast/heavy/extreme
+            values should also be the default ones. -->
+        <characteristic name="best" />
+    </difficulties>
+
+    <!-- The different kart types, that can be specified in the kart.xml file -->
+    <kart-types>
+        <characteristic name="light">
+            <engine power="*0.46" max-speed="*0.92" brake-factor="*1"
+                 max-speed-reverse-ratio="*0.77" />
+            <gear switch-ratio="0.20 0.55 1" power-increase="5 4 3" />
+            <mass value="*0.56" />
+            <startup time="0.3 0.5"
+                     boost="8.5 4.5" />
+            <explosion time="2.1" radius="5.5"
+                       invulnerability-time="7" />
+            <nitro engine-force="350" max-speed-increase="4.5" duration="1.5"
+                   fade-out-time="2.5" />
+            <slipstream length="11" collect-time="1.5" use-time="2.5" add-power="3.2"
+                        min-speed="9" max-speed-increase="4" duration="1.2"
+                        fade-out-time="2.3" />
+        </characteristic>
+        <characteristic name="medium">
+            <engine power="*0.63" max-speed="*1" brake-factor="*0.73"
+                    max-speed-reverse-ratio="*0.62" />
+            <gear switch-ratio="0.30 0.7 1.0" power-increase="2.2 2.2 2.5" />
+            <mass value="*0.71" />
+            <startup time="0.3 0.5"
+                     boost="4.2 2.6" />
+            <explosion time="1.8" radius="5"
+                       invulnerability-time="6" />
+            <nitro engine-force="425" consumption="1.4" duration="1" />
+            <slipstream use-time="3.3" add-power="2.8" duration="0.9"
+                        fade-out-time="1.6" />
+        </characteristic>
+        <characteristic name="heavy">
+            <engine power="*1" max-speed="*1" brake-factor="*0.66"
+                    max-speed-reverse-ratio="*1" />
+            <gear switch-ratio="0.45 0.70 1" power-increase="1.5 1.7 2.5" />
+            <mass value="*1" />
+            <swatter duration="10" distance="3" squash-duration="5"
+                     squash-slowdown="0.5" />
+            <startup time="0.3 0.5"
+                     boost="3.8 2" />
+            <explosion time="1.5" radius="4"
+                       invulnerability-time="6" />
+            <nitro engine-force="600" consumption="2" max-speed-increase="8"
+                   duration="0.7" fade-out-time="1.3" />
+            <slipstream length="8.5" use-time="4" add-power="2.7" min-speed="10.5"
+                   max-speed-increase="8" duration="0.7" fade-out-time="1" />
+        </characteristic>
+    </kart-types>
+
+    <!-- Per-player settings/handicaps (or boosts) -->
+    <player-characteristics>
+        <characteristic name="normal" />
+        <characteristic name="handicap">
+            <engine brake-factor="*0.8" brake-time-increase="*0.85" max-speed-reverse-ratio="*0.8" />
+            <bubblegum duration="*1.5" speed-fraction="*1.5" torque="*1.5" />
+            <zipper duration="*0.8" force="*0.8" speed-gain="*0.8" max-speed-increase="*0.8" />
+            <swatter duration="*0.8" squash-duration="*1.5" squash-slowdown="*1.8" />
+            <plunger band-max-length="*0.8" band-speed-increase="*0.8" in-face-time="*1.3" />
+            <startup time="*0.8 0.8" boost="*0.8 0.8" />
+            <rescue duration="*1.5" />
+            <explosion duration="*1.3" invulnerability-time="*0.7" />
+            <nitro engine-force="*0.8" consumption="*1.1" max-speed-increase="*0.9" max="*0.8" />
+            <slipstream length="*0.8" width="*0.8" collect-time="*1.5" use-time="*0.8"
+                add-power="*0.8" min-speed="*0.8" max-speed-increase="*0.9" duration="*0.8" />
+        </characteristic>
+    </player-characteristics>
+</characteristics>
--- a/data/localized_name.txt
+++ b/data/localized_name.txt
@ -0,0 +1,231 @@
+aa=ʿAfár af
+af=Afrikaans
+af_ZA=0
+am=ኣማርኛ
+ar=العربية
+ar_AR=0
+ar_OM=0
+ar_SA=0
+ar_SY=0
+ar_TN=0
+as=অসমীয়া
+ast=Asturianu
+ay=aymar aru
+az=Azərbaycanca
+az_IR=0
+be=Беларуская мова
+bg=български
+bg_BG=0
+bn=বাংলা
+bn_BD=0
+bn_IN=0
+bo=བོད་སྐད་
+br=brezhoneg
+bs=Bosanski
+bs_BA=0
+bs_BS=0
+ca_ES=0
+ca=0
+cmn=0
+co=corsu
+cs=Čeština
+cs_CZ=Čeština (Česká Republika)
+cy=Welsh
+cy_GB=Welsh (Great Britain)
+cz=Unknown language
+da=Dansk
+da_DK=Dansk (Danmark)
+de=Deutsch
+de_AT=Deutsch (Österreich)
+de_CH=Deutsch (Schweiz)
+de_DE=Deutsch (Deutschland)
+dk=Unknown language
+dz=རྫོང་ཁ
+el=ελληνικά
+el_GR=0
+en=English
+en_AU=English (Australia)
+en_CA=English (Canada)
+en_GB=English (Great Britain)
+en_US=English (United States)
+en_ZA=English (South Africa)
+en_US=English
+eo=Esperanto
+es=Español
+es_AR=0
+es_CL=0
+es_CO=0
+es_CR=0
+es_DO=0
+es_EC=0
+es_ES=0
+es_GT=0
+es_HN=0
+es_LA=0
+es_MX=0
+es_NI=0
+es_PA=0
+es_PE=0
+es_PR=0
+es_SV=0
+es_UY=0
+es_VE=0
+et=eesti keel
+et_EE=0
+et_ET=0
+eu=euskara
+eu_ES=0
+fa=فارسى
+fa_AF=0
+fa_IR=0
+fi=suomi
+fi_FI=0
+fo=Føroyskt
+fo_FO=0
+fr=Français
+fr_CA=Français (Canada)
+fr_CH=Français (Suisse)
+fr_FR=Français (France)
+fr_LU=Français (Luxembourg)
+fy=Frysk
+ga=Gaeilge
+gd=Gàidhlig
+gl=Galego
+gl_ES=0
+gn=Avañe'ẽ
+gu=ગુજરાતી
+gv=Gaelg
+ha=حَوْسَ
+he=עברית
+he_IL=0
+hi=हिन्दी
+hr=Hrvatski
+hr_HR=0
+hu=magyar
+hu_HU=0
+hy=Հայերեն
+ia=Interlingua
+id=Bahasa Indonesia
+id_ID=0
+is=Íslenska
+is_IS=0
+it=Italiano
+it_CH=0
+it_IT=0
+iu=ᐃᓄᒃᑎᑐᑦ/inuktitut
+ja=日本語
+ja_JP=0
+ka=ქართული
+kk=Қазақша
+kl=Kalaallisut
+km=ភាសាខ្មែរ
+km_KH=0
+kn=ಕನ್ನಡ
+ko=한국어
+ko_KR=0
+ku=Kurdî
+kw=Kernowek
+ky=кыргызча
+la=Latina
+lo=ລາວ
+lt=Lietuvių
+lt=0
+lv=Latviešu
+lv_LV=0
+jbo=La .lojban.
+mg=Malagasy
+mi=Māori
+mk=Македонски
+mk_MK=0
+ml=മലയാളം
+mn=Монгол
+mr=मराठी
+ms=Bahasa Melayu
+ms_MY=0
+mt=Malti
+my=မြန်မာဘာသာ
+my_MM=0
+nb=0
+nb_NO=0
+ne=0
+nl=Nederlands
+nl_BE=0
+nl_NL=0
+nn=Norsk nynorsk
+nn_NO=0
+no=Norsk bokmål
+no_NO=0
+no_NY=0
+nr=0
+oc=Occitan
+om=Oromoo
+or=ଓଡ଼ିଆ
+os=0
+pa=ਪੰਜਾਬੀ
+pl=Polski
+pl_PL=0
+ps=پښتو
+pt=Português
+pt_BR=0
+pt_PT=0
+qu=Runa Simi
+rm=Rumantsch
+ro=Română
+ro_RO=0
+ru=Русский
+ru_RU=0
+rw=Kinyarwanda
+sa=0
+sd=0
+se=Sámegiella
+se_NO=0
+si=0
+sk=Slovenčina
+sk_SK=0
+sl=Slovenščina
+sl_SI=0
+sl_SL=0
+sm=0
+so=0
+sp=0
+sq=Shqip
+sq_AL=0
+sr=Српски
+sr_YU=0
+ss=0
+st=0
+sv=Svenska
+sv_SE=0
+sv_SV=0
+sw=0
+ta=தமிழ்
+te=0
+tg=0
+th=ไทย
+th_TH=0
+ti=0
+tk=0
+tl=0
+to=0
+tr=Türkçe
+tr_TR=0
+ts=0
+tt=Татарча
+ug=0
+uk=Українська
+uk_UA=0
+ur=اردو
+ur_PK=0
+uz=0
+vi=Tiếng Việt
+vi_VN=0
+wa=0
+wo=0
+xh=0
+yi=ייִדיש
+yo=0
+zh=中文
+zh_CN=中文（简体）
+zh_HK=中文（香港）
+zh_TW=中文（繁體）
+zu=0
--- a/data/po/da_DK.po
+++ b/data/po/da_DK.po
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot
--- a/data/po/update_po_authors.py
+++ b/data/po/update_po_authors.py
@ -1,5 +1,5 @@
 #!/usr/bin/env python
-
+# -*- coding: utf-8 -*-
 # A simple script that adds all authors from transifex, which are
 # listed in comments at the beginning of the file, to the 
 # 'translator-credits' translations - where launchpad added them
@ -19,75 +19,79 @@ import re
 import sys

 if __name__ == "__main__":
-    if len(sys.argv)!=2:
+    if len(sys.argv) < 2:
        print "Usage: getpo_authors.py PATH_TO_PO_FILE"
        sys.exit(-1)

-    f = open(sys.argv[1], "r")
-    if not f:
-        print "Can not find", sys.argv[1]
-        exit
-    lines = f.readlines()
+    for filename in sys.argv[1:]:
+        print("Processing file ", filename)
+        f = open(filename, "r")
+        if not f:
+            print "Can not find", filename
+            exit
+        lines = f.readlines()

-    f.close()
+        f.close()

-    new_authors = []
-    found        = 0
+        new_authors = []
+        found        = 0

-    # Find all authors with a simple finite state machine:
-    contributions = -1
-    line_count    =  0
-    for i in lines:
-        line = i[:-1]   # remove \n
-        if line=="# Translators:":
-            found = 1
-        elif found and line[:2]=="# " and line [:14]!="# FIRST AUTHOR":
-            new_authors.append(line[2:])
-        elif line[:5]=="msgid":
-            found = 0
-        elif line[:31]== "msgstr \"Launchpad Contributions":
-            contributions = line_count
-        line_count = line_count + 1
+        # Find all authors with a simple finite state machine:
+        contributions = -1
+        line_count    =  0
+        for i in lines:
+            line = i[:-1]   # remove \n
+            if line=="# Translators:":
+                found = 1
+            elif found and line[:2]=="# " and line [:14]!="# FIRST AUTHOR":
+                new_authors.append(line[2:])
+            elif line[:5]=="msgid":
+                found = 0
+            elif line[:31]== "msgstr \"Launchpad Contributions":
+                contributions = line_count
+            line_count = line_count + 1


-    # Delete all email addresses - not sure if the authors
-    # would want them to be published
-    email=re.compile(" *<.*@.*\..*> *")   # one @ and one dot at least
-    for i in range(len(new_authors)):
-        g = email.search(new_authors[i])
-        if g:
-            new_authors[i] = new_authors[i][:g.start()] \
-                           + new_authors[i][g.end():]
+        # Delete all email addresses - not sure if the authors
+        # would want them to be published
+        email=re.compile(" *<.*@.*\..*> *")   # one @ and one dot at least
+        for i in range(len(new_authors)):
+            g = email.search(new_authors[i])
+            if g:
+                new_authors[i] = new_authors[i][:g.start()] \
+                               + new_authors[i][g.end():]

-    # Get the old authors from the translator-credits string:
-    if contributions>0:
-        # Ignore the first entry, which is "msgstr ...", and the
-        # last two characters, which are the '"\n'.
-        old_authors = lines[contributions][:-2].split("\\n")[1:]
-        for i in range(len(old_authors)):
-            old_authors[i] = old_authors[i].strip()
-    else:
-        old_authors=[]
-    
-    all_authors = old_authors + new_authors;
-    all_authors = sorted(all_authors, key=lambda x: x.lower())
-    all_authors_string = reduce(lambda x,y: x+"\\n"+y, all_authors, "")
+        # Get the old authors from the translator-credits string:
+        if contributions>0:
+            # Ignore the first entry, which is "msgstr ...", and the
+            # last two characters, which are the '"\n'.
+            old_authors = lines[contributions][:-2].split("\\n")[1:]
+            for i in range(len(old_authors)):
+                old_authors[i] = old_authors[i].strip()
+        else:
+            old_authors=[]
+        
+        all_authors = old_authors + new_authors;
+        all_authors = sorted(all_authors, key=lambda x: x.lower())
+        all_authors_string = reduce(lambda x,y: x+"\\n"+y, all_authors, "")

-    credits_line = "msgstr \"Launchpad Contributions:%s\"\n"%all_authors_string
-    # If no old authors exists, write a new entry:
-    if contributions==-1:
-        lines.append("\n")
-        lines.append("#: src/states_screens/credits.cpp:209\n")
-        lines.append("msgid \"translator-credits\"\n")
-        lines.append(credits_line)
-    else:
-        # Otherwise just replace the old contribution string
-        lines[contributions] = credits_line
+        credits_line = "msgstr \"Launchpad Contributions:%s\"\n"%all_authors_string
+        # If no old authors exists, write a new entry:
+        if contributions==-1:
+            lines.append("\n")
+            lines.append("#: src/states_screens/credits.cpp:209\n")
+            lines.append("msgid \"translator-credits\"\n")
+            lines.append(credits_line)
+        else:
+            # Otherwise just replace the old contribution string
+            lines[contributions] = credits_line


-    # Overwrite old file
-    f = open(sys.argv[1], "w")
-    for i in lines:
-        f.write(i)
-    f.close()
+        # Overwrite old file
+        f = open(filename, "w")
+        for i in lines:
+            f.write(i)
+        f.close()
+        
+        print("Done with ", filename)
            
--- a/data/powerup.xml
+++ b/data/powerup.xml
@ -101,6 +101,8 @@
    w-multi=" 0      30    30   100      60        0       0     0     0     0"    />
  <battle w="10      30    60     0       0       10      30     0     0     0"
    w-multi=" 0       0     5     0       0        0       0     0     0     0"    />
+  <soccer w=" 0      30    60     0       0       10      30     0     0     0"
+    w-multi=" 0       0     5     0       0        0       0     0     0     0"    />
  <tuto   w=" 0       0     0     0       0        0       0     0     0     0"
    w-multi=" 0       0   100     0       0        0       0     0     0     0"    />

--- a/data/replay/standard_expert_abyss.replay
+++ b/data/replay/standard_expert_abyss.replay
--- a/data/replay/standard_expert_scotland.replay
+++ b/data/replay/standard_expert_scotland.replay
--- a/data/replay/standard_expert_snowmountain.replay
+++ b/data/replay/standard_expert_snowmountain.replay
--- a/data/replay/standard_intermediate_lighthouse.replay
+++ b/data/replay/standard_intermediate_lighthouse.replay
--- a/data/replay/standard_intermediate_snowpeak.replay
+++ b/data/replay/standard_intermediate_snowpeak.replay
--- a/data/replay/standard_intermediate_volcano_island.replay
+++ b/data/replay/standard_intermediate_volcano_island.replay
--- a/data/replay/standard_novice_hacienda.replay
+++ b/data/replay/standard_novice_hacienda.replay
--- a/Show More
+++ b/Show More