Fixed compilation ... again :P

Fixed non-debug compilation.
Added a very rough logging feature for SFXs to debug bug #2169 .
2015-06-25 23:03:55 +10:00 · 2015-06-25 22:11:52 +10:00 · 2015-06-25 16:54:47 +10:00
1380 changed files with 227411 additions and 361739 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,66 +0,0 @@
-environment:
-    DEPS_DIR: c:\\projects\dependencies
-    DEPS_BRANCH: master
-    ASSETS_DIR: c:\\projects\stk-assets
-    APPVEYOR_CACHE_ENTRY_ZIP_ARGS: -t7z -m0=lzma2 -mx=9
-    IRC_NOTIFY_SCRIPT: c:\\projects\stk-code\tools\appveyor-irc-notify.py
-
-os: Visual Studio 2015
-clone_depth: 1
-shallow_clone: true
-
-platform:
-    # - x86
-    - x64
-
-configuration:
-    - Debug
-    - Release
-
-matrix:
-    fast_finish: true
-
-#cache:
-#    - '%DEPS_DIR%'
-    #- '%ASSETS_DIR%'
-
-install:
-    - ps: >-
-        If(!(Test-Path "$env:DEPS_DIR")) {
-            Write-Host "Downloading dependencies";
-            Start-Process -FilePath "git" -ArgumentList "clone --branch $env:DEPS_BRANCH --single-branch --depth 1 https://github.com/supertuxkart/dependencies.git $env:DEPS_DIR" -Wait;
-        }
-        Else {
-            Write-Host "Updating dependencies";
-            Start-Process -FilePath "git" -ArgumentList "fetch --depth 1" -WorkingDirectory "$env:DEPS_DIR" -Wait;
-        }
-        Get-ChildItem $env:DEPS_DIR | Measure-Object -property length -sum
-        #- ps: >-
-        #If(!(Test-Path "$env:ASSETS_DIR")) {
-        #    Write-Host "Downloading assets";
-        #    Start-Process -FilePath "svn" -ArgumentList "checkout https://svn.code.sf.net/p/supertuxkart/code/stk-assets $env:ASSETS_DIR" -Wait;
-        #}
-        #Else {
-        #    Write-Host "Updating assets";
-        #    Start-Process -FilePath "svn" -ArgumentList "update" -WorkingDirectory "$env:ASSETS_DIR" -Wait;
-        #}
-        #Get-ChildItem $env:ASSETS_DIR | Measure-Object -property length -sum
-
-before_build:
-    - ps: Copy-Item "${env:DEPS_DIR}\windows_64bit\dependencies" c:\projects\stk-code\dependencies –Recurse
-    - cmd: |
-        md build
-        cd build
-        if "%platform%"=="x64" set CMAKE_GENERATOR_NAME="Visual Studio 14 2015 Win64"
-        cmake -G %CMAKE_GENERATOR_NAME% -DCMAKE_BUILD_TYPE="%configuration%" .. -DCHECK_ASSETS=OFF
-
-build:
-    parallel: true
-    project: build\ALL_BUILD.vcxproj
-
-
-on_success:
-    - "python %IRC_NOTIFY_SCRIPT% supertuxkart [{author}:{branch}] {short_commit}: {message} {color_green}Succeeded,Details: {build_url},Commit: {commit_url}"
-
-on_failure:
-    - "python %IRC_NOTIFY_SCRIPT% supertuxkart [{author}:{branch}] {short_commit}: {message} {color_red}Failed,Details: {build_url},Commit: {commit_url}"
--- 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,20 +51,3 @@ 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,65 +1,44 @@
-# 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
-
-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:
-  # Unfortunately using all threads crashes g++: "g++: internal compiler error: Killed (program cc1plus)"
-  # 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
-
+# - 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
 script:
-  - mkdir "build"
-  - cd "build"
-  - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSERVER_ONLY=$SERVER_ONLY -DCHECK_ASSETS=off -DBUILD_RECORDER=off
-  - make VERBOSE=1 -j $THREADS
+  # First a debug build: 
+  - mkdir build-debug
+  - cd build-debug
+  - cmake .. -DCMAKE_BUILD_TYPE=Debug -DCHECK_ASSETS=off
+  - make VERBOSE=1 -j 4 
+
+  # Then a release build: 
+  - cd ..
+  - mkdir build-release
+  - cd build-release
+  - cmake .. -DCMAKE_BUILD_TYPE=Release -DCHECK_ASSETS=off
+  - make VERBOSE=1 -j 4 

 notifications:
  irc:
    channels:
-      - "irc.freenode.org#supertuxkart"
+      - "irc.freenode.org#stk"
    skip_join: false
    use_notice: true
    template:
--- a/1
+++ b/1
@@ -0,0 +1 @@
+See the file data/CREDITS .
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,31 +1,3 @@
-## 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
-* Smaller tweaks and improvements to several tracks including 
-** Math class
-** XR591
-** Fort Magma
-** Gran Paradiso
-** Subsea
-* Tweak to challenges
-* Better support for driving tracks in reverse
-
 ## SupertTuxKart 0.9 (April 2015)
 * Fully shader-based rendering engine
 * New tracks Cocoa Temple and Gran Paradiso
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # root CMakeLists for the SuperTuxKart project
 project(SuperTuxKart)
-set(PROJECT_VERSION "0.9.1")
+set(PROJECT_VERSION "0.8.1")

 cmake_minimum_required(VERSION 2.8.4)
 if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))
@@ -8,7 +8,6 @@ if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))
 endif()

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

 include(BuildTypeSTKRelease)
 if (NOT CMAKE_BUILD_TYPE)
@@ -16,20 +15,12 @@ if (NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE "STKRelease")
 endif()

-option(SERVER_ONLY "Create a server only (i.e. no graphics or sound)" OFF)
+option(USE_WIIUSE "Support for wiimote input devices" ON)
 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)

-CMAKE_DEPENDENT_OPTION(BUILD_RECORDER "Build opengl recorder" ON
-    "NOT SERVER_ONLY;NOT USE_GLES2;NOT APPLE" OFF)
-
-if (UNIX AND NOT APPLE)
-    option(USE_GLES2 "Use OpenGL ES2 renderer" OFF)
-endif()
-
-if(MSVC AND (MSVC_VERSION LESS 1900))
+if(MSVC)
    # Normally hide the option to build wiiuse on VS, since it depends
    # on the installation of the Windows DDK (Driver Developer Kit),
    # which also needs an absolute path :(
@@ -39,15 +30,13 @@ else()
    set(WIIUSE_BUILD ON)
 endif()

-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)
+if(MINGW OR CYGWIN)
+    set(USE_WIIUSE OFF)
 endif()

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

 set(STK_SOURCE_DIR "src")
@@ -66,24 +55,6 @@ 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()
-
-if(DISABLE_VPX)
-    add_definitions(-DNO_VPX)
-endif()
-
-if(BUILD_RECORDER)
-    add_definitions(-DENABLE_RECORDER)
 endif()

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

 # Build glew library
-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()
+add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
+include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")

 if((WIN32 AND NOT MINGW) OR APPLE)
    if (NOT APPLE)
@@ -119,37 +87,15 @@ if((WIN32 AND NOT MINGW) OR APPLE)
    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
    include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")

-    set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
-    set(PNG_LIBRARY png15_static)
-endif()
-
-# Add jpeg library
-if (APPLE)
+    #build jpeg library
    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
    include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+
+    set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
+    set(PNG_LIBRARY png15_static)
    set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
    set(JPEG_LIBRARY jpeglib)
-else()
-    find_package(JPEG REQUIRED)
-    include_directories(${JPEG_INCLUDE_DIR})
 endif()
-
-if (BUILD_RECORDER)
-    find_library(OPENGLRECORDER_LIBRARY NAMES openglrecorder libopenglrecorder PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
-    find_path(OPENGLRECORDER_INCLUDEDIR NAMES openglrecorder.h PATHS "${PROJECT_SOURCE_DIR}/dependencies/include")
-    if (NOT OPENGLRECORDER_LIBRARY OR NOT OPENGLRECORDER_INCLUDEDIR)
-        message(FATAL_ERROR "libopenglrecorder not found. "
-            "Either install libopenglrecorder or disable ingame recorder with -DBUILD_RECORDER=0")
-    endif()
-    include_directories(${OPENGLRECORDER_INCLUDEDIR})
-    mark_as_advanced(OPENGLRECORDER_LIBRARY OPENGLRECORDER_INCLUDEDIR)
-endif()
-
-if(NOT SERVER_ONLY AND NOT USE_GLES2)
-    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")
@@ -169,23 +115,17 @@ endif()
 include_directories(${STK_SOURCE_DIR})

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


 # Build the angelscript library if not in system
-if(USE_SYSTEM_ANGELSCRIPT)
-    find_package(Angelscript)
-    if(ANGELSCRIPT_FOUND)
-        include_directories(${Angelscript_INCLUDE_DIRS})
-    else()
-        message(FATAL_ERROR "Angelscript not found. "
-            "Either install angelscript or use built-in version using "
-            "-DUSE_SYSTEM_ANGELSCRIPT=0")
-    endif()
+find_package(Angelscript)
+if(USE_SYSTEM_ANGELSCRIPT AND ANGELSCRIPT_FOUND)
+    include_directories(${Angelscript_INCLUDE_DIRS})
 else()
    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")
    include_directories("${PROJECT_SOURCE_DIR}/lib/angelscript/include")
@@ -217,15 +157,6 @@ else()
    include_directories(${OGGVORBIS_INCLUDE_DIRS})
 endif()

-# Freetype
-find_package(Freetype)
-if(FREETYPE_FOUND)
-    include_directories(${FREETYPE_INCLUDE_DIRS})
-else()
-    message(FATAL_ERROR "Freetype not found. "
-        "Freetype is required to display characters in SuperTuxKart. ")
-endif()
-
 # Fribidi
 if(USE_FRIBIDI)
    find_package(Fribidi)
@@ -238,60 +169,48 @@ if(USE_FRIBIDI)
    endif()
 endif()

-# OpenGL
-if(NOT USE_GLES2 AND NOT SERVER_ONLY)
-    find_package(OpenGL REQUIRED)
-    include_directories(${OPENGL_INCLUDE_DIR})
+# OpenMP
+find_package(OpenMP)
+if (OPENMP_FOUND)
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
 endif()

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

-if(UNIX AND NOT APPLE AND NOT SERVER_ONLY)
+if(UNIX AND NOT APPLE)
    find_package(X11 REQUIRED)
    include_directories(${X11_INCLUDE_DIR})

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

 if(MINGW AND CMAKE_BUILD_TYPE MATCHES Release)
    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--subsystem,windows")
 endif()

-# Netwowk Multiplayer
-if(ENABLE_NETWORK_MULTIPLAYER)
-  add_definitions(-DENABLE_NETWORK_MULTIPLAYER_SCREEN)
-endif()
-
 if(WIN32)
    # By default windows.h has macros defined for min and max that screw up everything
    add_definitions(-DNOMINMAX)

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

 if(MSVC)
@@ -312,7 +231,7 @@ endif()
 add_definitions(-DHAVE_OGGVORBIS)

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

 # Provides list of source and header files (STK_SOURCES and STK_HEADERS)
@@ -383,9 +302,7 @@ else()
 endif()

 # CURL
-if(MSVC)
-    target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/dependencies/lib/libcurl.lib)
-elseif(MINGW)
+if(WIN32)
    target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/dependencies/lib/libcurldll.a)
 else()
    find_package(CURL REQUIRED)
@@ -398,29 +315,21 @@ target_link_libraries(supertuxkart
    bulletcollision
    bulletmath
    enet
+    glew
    stkirrlicht
    ${Angelscript_LIBRARIES}
    ${CURL_LIBRARIES}
    ${OGGVORBIS_LIBRARIES}
    ${OPENAL_LIBRARY}
-    ${FREETYPE_LIBRARIES}
-    ${JPEG_LIBRARIES}
-    ${TURBOJPEG_LIBRARY}
-    ${VPX_LIBRARIES}
+    ${OPENGL_LIBRARIES}
    )

-if(NOT SERVER_ONLY)
-    if(NOT USE_GLES2)
-        target_link_libraries(supertuxkart ${OPENGL_gl_LIBRARY} glew graphics_utils)
-    else()
-        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})
+    target_link_libraries(supertuxkart ${X11_LIBRARIES})
+    if(USE_XRANDR)
+        target_link_libraries(supertuxkart ${XRANDR_LIBRARIES})
+    else()
+        target_link_libraries(supertuxkart ${IRRLICHT_XF86VM_LIBRARY})
    endif()
    if(USE_ASAN)
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
@@ -428,21 +337,12 @@ if(UNIX AND NOT APPLE)
    endif()
 endif()

-if(BUILD_RECORDER)
-    target_link_libraries(supertuxkart ${OPENGLRECORDER_LIBRARY})
-endif()
-
-# FreeBSD does not search in /usr/local/lib, but at least Freetype is installed there :(
-if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib")
-endif()
-
 if(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 x86_64 -F/Library/Frameworks -framework OpenAL -framework Ogg -framework Vorbis")
+    set_target_properties(supertuxkart PROPERTIES LINK_FLAGS "-arch i386 -F/Library/Frameworks -framework OpenAL -framework Ogg -framework Vorbis")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/Library/Frameworks/OpenAL.framework/Versions/A/Headers")
 endif()

@@ -481,7 +381,7 @@ if(MSVC OR MINGW)
 endif()

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

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

 # ==== Checking if data folder exists ====
 if(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data)
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -0,0 +1,74 @@
+#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,187 +1,67 @@
-# SuperTuxKart
-[![Build Status](https://travis-ci.org/supertuxkart/stk-code.svg?branch=master)](https://travis-ci.org/supertuxkart/stk-code)
-[![AppVeyor Build Satus](https://ci.appveyor.com/api/projects/status/github/supertuxkart/stk-code?svg=true&branch=master)](https://ci.appveyor.com/project/supertuxkart/stk-code)
-[![#supertuxkart on freenode](https://img.shields.io/badge/freenode-%23supertuxkart-brightgreen.svg)](https://webchat.freenode.net/?channels=supertuxkart)
+#SuperTuxKart
+[![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 focuses on fun and not on realistic kart physics. Instructions can be found on the in-game help page.
+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 <https://supertuxkart.net/>. There is also our [FAQ](https://supertuxkart.net/FAQ) and information on how get in touch with the [community](https://supertuxkart.net/Community)
+The SuperTuxKart homepage can be found at: <http://supertuxkart.sourceforge.net>

-## 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.)
+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.
+
+
+##Hardware Requirements
+* You need a 3D graphics card. (NVIDIA GeForce 8xxx and higher, ATI Radeon HD 4xxx and higher or Intel HD 3000 and higher)
 * You should have a CPU that's running at 1GHz or better.
 * 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.

-## 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`.

-## 3D coordinates
+##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` for details.
+
+
+##License
+This software is released under the GNU General Public License (GPL) which
+can be found in the file `LICENSE` in the same directory as this file.
+Information about the licenses for artwork are contained in 
+`data/licenses`.
+
+
+##3D coordinates
 A reminder for those looking at the code and 3d models:

 STK    : X right, Y up,       Z forwards

 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).
-
-## 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
-```
-### In-game recorder
-
-In order to build the in-game recorder for STK, you have to install
-libopenglrecorder from your distribution or compile it yourself, get it [here](https://github.com/Benau/libopenglrecorder).
-Compilation instruction is explained there, if you don't need such feature,
-pass `-DBUILD_RECORDER=off` to cmake.
-
-### Compiling
-
-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.
+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).
--- a/34
+++ b/34
@@ -0,0 +1,34 @@
+# 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
@@ -0,0 +1,33 @@
+##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
@@ -1,174 +0,0 @@
-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
@@ -1,37 +0,0 @@
-<?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
@@ -1,175 +0,0 @@
-================================================================================
-
- 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
-
-
-
--------------------------------------------------------------------------------
- RELEASE BUILD
--------------------------------------------------------------------------------
-
-Making a release build is similar to typical compilation, but there are few
-additional things to do. 
-
-You have to change version numbers. This is important, because assets manager
-in STK checks these numbers and detects if already extracted data files are
-up to date. So that when you will install new STK version, this will force new 
-data extraction automatically.
-
-So that you have to:
-
-1. Change "data/supertuxkart.git" to "data/supertuxkart.VERSION_NUMBER"
-
-2. Open "src/utils/constants.cpp" and change:
-
-    const char STK_VERSION[] = "git";
-      
-   to
-    
-    const char STK_VERSION[] = "VERSION_NUMBER";
-      
-   where "VERSION_NUMBER" is for example "0.9.3" or "git20170409" or whatever.
-    
-3. You can also update these lines in "android/AndroidManifest.xml":
-    android:versionCode="1"
-    android:versionName="1.0"
-
-
-Before compilation you have to set:
-
-    export BUILD_TYPE=release
-
-and then you make standard compilation with:
-
-    ./generate_assets.sh
-    ./make.sh -j5
-    
-
-The compiled apk is unsigned, so you have to sign it with your key. To sign it,
-you have to run:
-
-    jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore \
-        my-release-key.keystore SuperTuxKart-release-unsigned.apk alias_name
-        
-and then:
-
-    zipalign -v 4 SuperTuxKart-release-unsigned.apk SuperTuxKart-release.apk
-
-
-
--------------------------------------------------------------------------------
- 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
@@ -1,6 +0,0 @@
-<?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
@@ -1,258 +0,0 @@
-#!/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=42
-export SOUND_MONO=1
-export SOUND_SAMPLE=32000
-
-export RUN_OPTIMIZE_SCRIPT=0
-export DECREASE_QUALITY=1
-
-################################################################################
-
-export LANG=C
-
-cd "`dirname "$0"`"
-
-# Find assets path
-for ASSETS_PATH in $ASSETS_PATHS; do
-   if [ -d $ASSETS_PATH ] && [ `ls $ASSETS_PATH | grep -c tracks` -gt 0 ]; then
-      echo "Assets found in $ASSETS_PATH"
-      ASSETS_PATH_FOUND=1
-      break
-   fi
-done
-
-if [ -z $ASSETS_PATH_FOUND ]; then
-   echo "Couldn't find assets path"
-   exit 1
-fi
-
-if [ ! -d "../data" ]; then
-   echo "Couldn't find data directory"
-   exit 1
-fi
-
-
-# Clear previous assets directory
-echo "Clear previous assets directory"
-rm -rf assets
-
-
-# Copy all assets
-echo "Copy all assets"
-
-mkdir -p assets/data
-
-for DIR in `ls $ASSETS_PATH`; do
-   CAN_BE_COPIED=0
-
-   for ASSETS_DIR in $ASSETS_DIRS; do
-      if [ $DIR = $ASSETS_DIR ]; then
-         CAN_BE_COPIED=1
-         break
-      fi
-   done;
-
-   # Don't copy karts and tracks. It will be handled later
-   BLACKLIST_ASSETS="karts tracks"
-   for ASSETS_DIR in $BLACKLIST_ASSETS; do
-      if [ $DIR = $ASSETS_DIR ]; then
-         CAN_BE_COPIED=0
-         break
-      fi
-   done;
-
-   if [ $CAN_BE_COPIED -gt 0 ]; then
-      cp -a "$ASSETS_PATH/$DIR" assets/data/
-   fi
-done;
-
-
-# Copy selected tracks
-echo "Copy selected tracks"
-
-mkdir -p assets/data/tracks
-
-for DIR in `ls $ASSETS_PATH/tracks`; do
-   CAN_BE_COPIED=0
-
-   if [ "$TRACKS" != "all" ]; then
-      for TRACK in $TRACKS; do
-         if [ $DIR = $TRACK ]; then
-            CAN_BE_COPIED=1
-            break
-         fi
-      done;
-   else
-      CAN_BE_COPIED=1
-   fi
-
-   if [ $CAN_BE_COPIED -gt 0 ]; then
-      cp -a "$ASSETS_PATH/tracks/$DIR" assets/data/tracks/
-   fi
-done
-
-
-# Copy selected karts
-echo "Copy selected karts"
-
-mkdir -p assets/data/karts
-
-for DIR in `ls $ASSETS_PATH/karts`; do
-   CAN_BE_COPIED=0
-
-   if [ "$KARTS" != "all" ]; then
-      for KART in $KARTS; do
-         if [ $DIR = $KART ]; then
-            CAN_BE_COPIED=1
-            break
-         fi
-      done;
-   else
-      CAN_BE_COPIED=1
-   fi
-
-   if [ $CAN_BE_COPIED -gt 0 ]; then
-      cp -a "$ASSETS_PATH/karts/$DIR" assets/data/karts/
-   fi
-done
-
-
-# Decrease assets quality in order to save some disk space and RAM
-echo "Decrease assets quality"
-
-convert_image()
-{
-   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_CMD=""
-      
-      if [ "$SOUND_MONO" -gt 0 ]; then
-         OGGENC_CMD="$OGGENC_CMD --downmix"
-      fi
-      
-      OGG_RATE=`ogginfo "$FILE" | grep "Rate: " | cut -f 2 -d " " \
-                                                            | grep -o '[0-9]*'`
-      
-      if [ ! -z "$OGG_RATE" ] && [ "$OGG_RATE" -gt "32000" ]; then
-         OGGENC_CMD="$OGGENC_CMD --resample 32000"
-      fi
-      
-      OGGENC_CMD="$OGGENC_CMD -b $SOUND_QUALITY"
-      
-      oggenc $OGGENC_CMD tmp.wav -o tmp.ogg
-   fi
-
-   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
@@ -1,306 +0,0 @@
-#!/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
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">SuperTuxKart</string>
-</resources>
--- a/cmake/FindAngelscript.cmake
+++ b/cmake/FindAngelscript.cmake
@@ -14,11 +14,11 @@ FIND_PATH(Angelscript_INCLUDE_DIRS angelscript.h
    )

 FIND_LIBRARY(Angelscript_LIBRARY
-    NAMES angelscript angelscript_s
+    NAMES angelscript
    PATHS
    /usr/local
    /usr
-    PATH_SUFFIXES lib lib64 lib32
+    PATH_SUFFIXES lib
    )

 # handle the QUIETLY and REQUIRED arguments and set ANGELSCRIPT_FOUND to TRUE if
--- a/cmake/FindFreetype.cmake
+++ b/cmake/FindFreetype.cmake
@@ -1,29 +0,0 @@
-# - Find Freetype
-# Find the Freetype includes and libraries
-#
-# Following variables are provided:
-# FREETYPE_FOUND
-#     True if Freetype has been found
-# FREETYPE_INCLUDE_DIRS
-#     The include directories of Freetype
-# FREETYPE_LIBRARIES
-#     Freetype library list
-
-if(WIN32)
-    find_path(FREETYPE_INCLUDE_DIRS NAMES freetype/freetype.h PATHS "${PROJECT_SOURCE_DIR}/dependencies/include")
-    find_library(FREETYPE_LIBRARY NAMES freetype PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
-    set(FREETYPE_FOUND 1)
-    set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
-elseif(APPLE)
-    find_path(FREETYPE_INCLUDE_DIRS NAMES freetype/freetype.h PATHS "/Library/Frameworks/FreeType.Framework/Versions/2.4/unix/include")
-    find_library(FREETYPE_LIBRARY NAMES freetype PATHS "/Library/Frameworks/FreeType.Framework/Versions/2.4/")
-    include_directories(/Library/Frameworks/FreeType.Framework/Versions/2.4/unix/include)
-    set(FREETYPE_FOUND 1)
-    set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
-elseif(UNIX)
-    include(FindPkgConfig)
-    pkg_check_modules(FREETYPE freetype2)
-else()
-    set(FREETYPE_FOUND 0)
-endif()
-
--- a/cmake/FindLibbfd.cmake
+++ b/cmake/FindLibbfd.cmake
@@ -1,89 +0,0 @@
-# - Try to find libbfd
-# Once done this will define
-#
-#  LIBBFD_FOUND - system has libbfd
-#  LIBBFD_INCLUDE_DIRS - the libbfd include directory
-#  LIBBFD_LIBRARIES - Link these to use libbfd
-#  LIBBFD_DEFINITIONS - Compiler switches required for using libbfd
-#
-# Based on:
-#
-#  Copyright (c) 2008 Bernhard Walle <bernhard.walle@gmx.de>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-if (LIBBFD_LIBRARIES AND LIBBFD_INCLUDE_DIRS)
-  set (LIBBFD_FIND_QUIETLY TRUE)
-endif ()
-
-find_path (LIBBFD_INCLUDE_DIRS
-    NAMES
-      bfd.h
-      dis-asm.h
-    PATHS
-      /usr/include
-      /usr/local/include
-      /opt/local/include
-      /opt/include
-      ENV CPATH)
-
-# Ugly, yes ugly...
-find_library (LIBBFD_BFD_LIBRARY
-    NAMES
-      bfd
-    PATHS
-      /usr/lib
-      /usr/lib64
-      /usr/local/lib
-      /usr/local/lib64
-      /usr/include
-      /opt/local/lib
-      /opt/usr/lib64
-      ENV LIBRARY_PATH
-      ENV LD_LIBRARY_PATH)
-
-#find_library (LIBBFD_IBERTY_LIBRARY
-#    NAMES
-#      iberty
-#    PATHS
-#      /usr/lib
-#      /usr/lib64
-#      /usr/local/lib
-#      /usr/local/lib64
-#      /usr/include
-#      /opt/local/lib
-#      /opt/usr/lib64
-#      ENV LIBRARY_PATH
-#      ENV LD_LIBRARY_PATH)
-
-#find_library (LIBBFD_OPCODES_LIBRARY
-#    NAMES
-#      opcodes
-#    PATHS
-#      /usr/lib
-#      /usr/lib64
-#      /usr/local/lib
-#      /usr/local/lib64
-#      /usr/include
-#      /opt/local/lib
-#      /opt/usr/lib64
-#      ENV LIBRARY_PATH
-#      ENV LD_LIBRARY_PATH)
-
-
-include (FindPackageHandleStandardArgs)
-
-
-# handle the QUIETLY and REQUIRED arguments and set LIBBFD_FOUND to TRUE if all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBBFD DEFAULT_MSG
-    LIBBFD_BFD_LIBRARY
-#    LIBBFD_IBERTY_LIBRARY
-#    LIBBFD_OPCODES_LIBRARY
-    LIBBFD_INCLUDE_DIRS)
-
-set(LIBBFD_LIBRARIES "${LIBBFD_BFD_LIBRARY}")
-mark_as_advanced(LIBBFD_INCLUDE_DIRS LIBBFD_LIBRARIES LIBBFD_BFD_LIBRARY)
--- a/cmake/FindOggVorbis.cmake
+++ b/cmake/FindOggVorbis.cmake
@@ -15,7 +15,6 @@ find_path(OGGVORBIS_VORBIS_INCLUDE_DIR NAMES vorbis/vorbisfile.h PATHS "${PROJEC
 find_library(OGGVORBIS_OGG_LIBRARY NAMES ogg Ogg libogg PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
 find_library(OGGVORBIS_VORBIS_LIBRARY NAMES vorbis Vorbis libvorbis PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
 find_library(OGGVORBIS_VORBISFILE_LIBRARY NAMES vorbisfile libvorbisfile PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
-find_library(OGGVORBIS_VORBISENC_LIBRARY NAMES vorbisenc libvorbisenc PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")

 if (APPLE)
    set(OGGVORBIS_OGG_INCLUDE_DIR "/Library/Frameworks/Ogg.framework/Headers/")
@@ -27,11 +26,6 @@ if(APPLE AND NOT OGGVORBIS_VORBISFILE_LIBRARY)
    set(OGGVORBIS_VORBISFILE_LIBRARY ${OGGVORBIS_VORBIS_LIBRARY})
 endif()

-if(APPLE AND NOT OGGVORBIS_VORBISENC_LIBRARY)
-    # Seems to be the same on Apple systems
-    set(OGGVORBIS_VORBISENC_LIBRARY ${OGGVORBIS_VORBIS_LIBRARY})
-endif()
-
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(OggVorbis DEFAULT_MSG
    OGGVORBIS_OGG_INCLUDE_DIR OGGVORBIS_VORBIS_INCLUDE_DIR
@@ -39,8 +33,8 @@ find_package_handle_standard_args(OggVorbis DEFAULT_MSG

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

--- 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"/>
-      <cornfield_crossing goal="1"/>
+      <farm 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"/>
-      <abyss goal="1"/>
+      <subsea 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="abyss" laps="3"/>
+    <track id="farm" laps="3"/>
    <mode major="single" minor="quickrace"/>
    <requirements trophies="0"/>
    
    <hard>
        <karts number="5"/>
-        <requirements position="1" time="160"/>
+        <requirements position="1" time="110"/>
    </hard>
    <medium>
        <karts number="4"/>
-        <requirements time="185"/>
+        <requirements time="125"/>
    </medium>
    <easy>
        <karts number="4"/>
-        <requirements time="270"/>
+        <requirements time="155"/>
    </easy>
 </challenge>
--- a/data/challenges/islandtrack.challenge
+++ b/data/challenges/islandtrack.challenge
@@ -10,11 +10,11 @@
    </hard>
    <medium>
        <karts number="4"/>
-        <requirements position="1"/>
+        <requirements position="2"/>
    </medium>
    <easy>
        <karts number="3"/>
-        <requirements position="1"/>
+        <requirements position="3"/>
    </easy>
 </challenge>

--- 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="5"/>
+    <requirements trophies="15"/>
    
    <hard>
        <karts number="5"/>
--- a/data/challenges/olivermath.challenge
+++ b/data/challenges/olivermath.challenge
@@ -6,15 +6,15 @@
    
    <hard>
        <karts number="5"/>
-        <requirements position="1" time="65"/>
+        <requirements position="1" time="50"/>
    </hard>
    <medium>
        <karts number="5"/>
-        <requirements position="1" time="85"/>
+        <requirements position="1" time="65"/>
    </medium>
    <easy>
        <karts number="5"/>
-        <requirements position="1" time="130"/>
+        <requirements position="1" time="80"/>
    </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="cornfield_crossing" laps="3"/>
+    <track id="subsea" laps="2"/>
    <mode major="single" minor="quickrace"/>
    <requirements trophies="0"/>
    
    <hard>
        <karts number="5"/>
-        <requirements position="1" time="165"/>
+        <requirements position="1" time="200"/>
    </hard>
    <medium>
        <karts number="4"/>
-        <requirements time="195"/>
+        <requirements time="225"/>
    </medium>
    <easy>
        <karts number="4"/>
--- a/data/challenges/volcano_island.challenge
+++ b/data/challenges/volcano_island.challenge
@@ -1,19 +0,0 @@
-<?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/fonts/AR_PL_SungtiL_GB0.png
+++ b/data/fonts/AR_PL_SungtiL_GB0.png
--- a/data/fonts/BigDigitFont.xml
+++ b/data/fonts/BigDigitFont.xml
--- a/data/fonts/LayneHansom0.png
+++ b/data/fonts/LayneHansom0.png
--- a/data/fonts/LayneHansomBigDigits.png
+++ b/data/fonts/LayneHansomBigDigits.png
--- a/data/fonts/Mplus2p_JP0.png
+++ b/data/fonts/Mplus2p_JP0.png
--- a/data/fonts/StkChineseFont.xml
+++ b/data/fonts/StkChineseFont.xml
--- a/data/fonts/StkFont.xml
+++ b/data/fonts/StkFont.xml
--- a/data/fonts/StkJapaneseFont.xml
+++ b/data/fonts/StkJapaneseFont.xml
--- a/data/fonts/comix.png
+++ b/data/fonts/comix.png
--- a/data/fonts/materials.xml
+++ b/data/fonts/materials.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<materials>
+  <!-- Fonts -->
+  <material name="title_font.png"           shader="unlit" lazy-load="Y"/>
+  <material name="title_font_2.png"         shader="unlit" lazy-load="Y"/>
+  <material name="sigmar0.png"              shader="unlit" lazy-load="Y"/>
+  <material name="comix.png"                shader="unlit" lazy-load="Y"/>
+  <material name="LayneHansom0.png"         shader="unlit" lazy-load="Y"/>
+  <material name="Mplus2p_JP0.png"          shader="unlit" lazy-load="Y"/>
+  <material name="rasheeq0.png"             shader="unlit" lazy-load="Y"/>
+  <material name="rasheeq3.png"             shader="unlit" lazy-load="Y"/>
+  <material name="rasheeq4.png"             shader="unlit" lazy-load="Y"/>
+  <material name="wqyMicroHei0.png"         shader="unlit" lazy-load="Y"/>
+  <material name="wqyMicroHei1.png"         shader="unlit" lazy-load="Y"/>
+  <material name="wqyMicroHei2.png"         shader="unlit" lazy-load="Y"/>
+  <material name="wqyMicroHei3.png"         shader="unlit" lazy-load="Y"/>
+  <material name="wqyMicroHei4.png"         shader="unlit" lazy-load="Y"/>
+  <material name="wqyMicroHei5.png"         shader="unlit" lazy-load="Y"/>
+  <material name="AR_PL_SungtiL_GB0.png"    shader="unlit" lazy-load="Y"/>
+  <material name="LayneHansomBigDigits.png" shader="unlit" lazy-load="Y"/>
+
+</materials>
--- a/data/fonts/rasheeq.xml
+++ b/data/fonts/rasheeq.xml
--- a/data/fonts/rasheeq0.png
+++ b/data/fonts/rasheeq0.png
--- a/data/fonts/rasheeq1.png
+++ b/data/fonts/rasheeq1.png
--- a/data/fonts/rasheeq3.png
+++ b/data/fonts/rasheeq3.png
--- a/data/fonts/rasheeq4.png
+++ b/data/fonts/rasheeq4.png
--- a/data/fonts/sigmar0.png
+++ b/data/fonts/sigmar0.png
--- a/data/fonts/title_font.png
+++ b/data/fonts/title_font.png
--- a/data/fonts/title_font.xml
+++ b/data/fonts/title_font.xml
--- a/data/fonts/title_font_2.png
+++ b/data/fonts/title_font_2.png
--- a/data/fonts/wqyMicroHei0.png
+++ b/data/fonts/wqyMicroHei0.png
--- a/data/fonts/wqyMicroHei1.png
+++ b/data/fonts/wqyMicroHei1.png
--- a/data/fonts/wqyMicroHei2.png
+++ b/data/fonts/wqyMicroHei2.png
--- a/data/fonts/wqyMicroHei3.png
+++ b/data/fonts/wqyMicroHei3.png
--- a/data/fonts/wqyMicroHei4.png
+++ b/data/fonts/wqyMicroHei4.png
--- a/data/fonts/wqyMicroHei5.png
+++ b/data/fonts/wqyMicroHei5.png
--- a/data/fonts/wqyMicroHei6.png
+++ b/data/fonts/wqyMicroHei6.png
--- a/data/gfx/black_smoke.xml
+++ b/data/gfx/black_smoke.xml
@@ -4,27 +4,25 @@
    <spreading angle="10"        />
    
    <velocity  x="0.0"
-               y="0.003"
+               y="0.002"
               z="0.0"           />
    
    <material  file="smoke_black.png"  />
    
    <!-- Amount of particles emitted per second -->
-    <rate      min="7"
-               max="12"          />
+    <rate      min="25"
+               max="50"          />
    
    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
    <lifetime  min="2500"
               max="5000"        />
    
    <!-- Size of the particles -->
-    <size      min="1.6"
-               max="2.5"
-               x-increase-factor="2.6"
-               y-increase-factor="2.6"         />
+    <size      min="0.6"
+               max="1.5"         />

-    <color     min="50 50 50"
-               max="100 100 100" />
+    <color     min="255 255 255"
+               max="255 255 255" />

    <!-- How much time in milliseconds before the particle is fully faded out  -->
    <fadeout   time="1000"       />
--- a/data/gfx/confetti.xml
+++ b/data/gfx/confetti.xml
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- For sky particles, the size of the box is ignored -->
-<particles emitter="box" randomize-initial-y="true" box_x="100.0" box_y="100" box_z="120.0">
-
-    <spreading angle="3"           />
-    
-    <velocity  x="-0.00"
-               y="-0.005"
-               z="-0.00"             />
-    
-    <material  file="confetti.png" clampu="Y" clampv="Y" />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="500"
-               max="1000"           />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="8500"
-               max="9500"          />
-    
-    <!-- Size of the particles -->
-    <size      min="0.10"
-               max="0.30"          />
-    
-    <color     min="40 40 255"
-               max="255 255 255"   />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
-
-    <wind      speed="0.16"
-               flips="Y"           />
-
-</particles>
--- a/data/gfx/confetti_bleu.xml
+++ b/data/gfx/confetti_bleu.xml
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- For sky particles, the size of the box is ignored -->
-<particles emitter="box" randomize-initial-y="true" box_x="100.0" box_y="100" box_z="120.0">
-
-    <spreading angle="3"           />
-    
-    <velocity  x="-0.00"
-               y="-0.005"
-               z="-0.00"             />
-    
-    <material  file="snowflake.png" clampu="Y" clampv="Y" />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="500"
-               max="1000"           />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="8500"
-               max="9500"          />
-    
-    <!-- Size of the particles -->
-    <size      min="0.10"
-               max="0.30"          />
-    
-    <color     min="40 40 255"
-               max="255 255 255"   />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
-
-    <wind      speed="0.16"
-               flips="Y"           />
-
-</particles>
--- a/data/gfx/explosion.xml
+++ b/data/gfx/explosion.xml
@@ -10,8 +10,8 @@
    <material  file="explode.png"  />
    
    <!-- Amount of particles emitted per second -->
-    <rate      min="400"
-               max="600" />
+    <rate      min="500"
+               max="800" />
    
    <!-- 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="400"
-               max="600" />
+    <rate      min="500"
+               max="800" />
    
    <!-- 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="400"
-               max="600" />
+    <rate      min="500"
+               max="800" />
    
    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
    <lifetime  min="1000"
--- a/data/gfx/gfx_blueNebula_a.xml
+++ b/data/gfx/gfx_blueNebula_a.xml
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="sphere" radius="20.5">
-
-    <spreading angle="120"      />
-    
-    <velocity  x="0.002"
-               y="0.000"
-               z="0.000"         />
-    
-    <material  file="stktex_nebulaCloud_a.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="1"
-               max="2"         />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="20000"
-               max="30000"         />
-    
-    <!-- Size of the particles -->
-   <size min="20.5"
-         max="45.0"
-         x-increase-factor="1.6"
-         y-increase-factor="1.6" />    
-    
-    <color     min="0 0 0"
-               max="255 255 255" />
-
-    <fadeout   time="5000" />
-
-
-</particles>
--- a/data/gfx/gfx_bubbleFast_a.xml
+++ b/data/gfx/gfx_bubbleFast_a.xml
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="box" box_x="0.5" box_y="0.5" box_z="0.5">
-
-    <spreading angle="45"      />
-    
-    <velocity  x="0.000"
-               y="0.005"
-               z="0.000"         />
-    
-    <material  file="gfx_bubble_a.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="8"
-               max="15"         />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="2000"
-               max="3000"         />
-    
-    <!-- Size of the particles -->
-   <size min="0.5"
-         max="0.8"
-         x-increase-factor="1.6"
-         y-increase-factor="1.6" />    
-    
-    <color     min="0 0 0"
-               max="255 255 255" />
-
-    <fadeout   time="2000" />
-
-
-</particles>
--- a/data/gfx/gfx_fireworkExplosion_a.xml
+++ b/data/gfx/gfx_fireworkExplosion_a.xml
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="sphere" radius="0.5">
-
-    <spreading angle="180"         />
-    
-    <velocity  x="0.003"
-               y="0.0003"
-               z="0.003"           />
-    
-    <material  file="gfx_sparkFire_a.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="65"
-               max="100" />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="1700"
-               max="1700"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.7"
-               max="1.1"
-               x-increase-factor="1.3"
-               y-increase-factor="1.3"
-               />
-    
-    <color     min="255 255 255"
-               max="255 0 0"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="50"         />
-
-</particles>
--- a/data/gfx/gfx_fireworkGreen_a.xml
+++ b/data/gfx/gfx_fireworkGreen_a.xml
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="sphere" radius="0.5">
-
-    <spreading angle="180"         />
-    
-    <velocity  x="0.03"
-               y="0.003"
-               z="0.03"           />
-    
-    <material  file="gfx_sparkGreen_a.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="65"
-               max="100" />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="2700"
-               max="2700"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.5"
-               max="0.8"
-               x-increase-factor="1.1"
-               y-increase-factor="1.3"
-               />
-    
-    <color     min="255 255 255"
-               max="255 0 0"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="50"         />
-
-</particles>
--- a/data/gfx/gfx_sandExplosion_a.xml
+++ b/data/gfx/gfx_sandExplosion_a.xml
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="sphere" radius="0.5">
-
-    <spreading angle="90"      />
-    
-    <velocity  x="0.000"
-               y="0.003"
-               z="0.000"        />
-    
-    <material  file="gfx_earthJetblast_a.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="900"
-               max="1000"         />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="300"
-               max="1000"         />
-    
-    <!-- Size of the particles -->
-   <size min="0.3"
-         max="0.7"
-         x-increase-factor="1.2"
-         y-increase-factor="1.2" />    
-    
-    <color     min="0 0 0"
-               max="255 255 255" />
-
-    <fadeout   time="500" />
-
-
-</particles>
--- a/data/gfx/gfx_smallWaterFlow.xml
+++ b/data/gfx/gfx_smallWaterFlow.xml
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="sphere" radius="0.1">
-
-    <spreading angle="12"      />
-    
-    <velocity  x="0.000"
-               y="0.000"
-               z="0.005"         />
-    
-    <material  file="particle_water.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="30"
-               max="50"         />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="500"
-               max="1000"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.1"
-               max="0.2"       
-               x-increase-factor="1.3"
-               y-increase-factor="1.3" />
-    
-    <color     min="255 255 255"
-               max="255 255 255" />
-
-    <fadeout   time="3000" />
-
-
-</particles>
--- a/data/gfx/kart_exhaust.xml
+++ b/data/gfx/kart_exhaust.xml
@@ -1,33 +0,0 @@
-<?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="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" /> 
+    <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" /> 
 
 </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="volcano_island"       laps="2" reverse="false" />
+    <track id="city"                 laps="2" reverse="false" />
    
 </supertuxkart_grand_prix>

--- a/data/graphical_restrictions.xml
+++ b/data/graphical_restrictions.xml
@@ -1,41 +1,25 @@
 <?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"          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="Intel"                                           disable="TextureCompressionS3TC"/>
+  <card contains="Intel"          os="windows"                     disable="HighDefinitionTextures"/>
  <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="<11.2"    disable="GeometryShader"/>
-  <card contains="Mesa"           os="linux"    version="<11.2"    disable="TextureCompressionS3TC"/>
+  <card contains="Mesa"           os="linux"    version="<10.6"    disable="GeometryShader4"/>
+  <card contains="Mesa"           os="linux"                       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="<11.2"    disable="GeometryShader"/>
-  <card contains="Gallium"        os="linux"    version="<11.2"    disable="TextureCompressionS3TC"/>
+  <card contains="Gallium"        os="linux"    version="<10.6"    disable="GeometryShader4"/>
+  <card contains="Gallium"        os="linux"                       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,8 +12,6 @@ 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,8 +33,5 @@
        <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
@@ -1,12 +0,0 @@
-# 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/challenges.stkgui
+++ b/data/gui/challenges.stkgui
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+
+    <div x="5%" y="2%" width="90%" height="96%" layout="vertical-row" >
+
+        <header I18N="Title for challenges screen" text="Challenges - Trophy Room" text_align="center" align="center" width="80%" />
+
+        <spacer height="5" width="100%"/>
+
+        <box width="100%" proportion="5" layout="vertical-row">
+
+            <ribbon_grid id="challenges" proportion="8" width="100%"
+                label_location="bottom" align="center" child_width="128" child_height="128" />
+
+
+            <spacer proportion="1" width="100%"/>
+        </box>
+    </div>
+</stkgui>
--- a/data/gui/confirm_dialog.stkgui
+++ b/data/gui/confirm_dialog.stkgui
@@ -1,19 +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" width="100%" text_align="top" word_wrap="true" proportion="1" />
+        <label id="title" width="100%" text_align="center" word_wrap="true" proportion="1" />

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

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

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

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

        <spacer height="10" width="10" />
    </div>
--- a/data/gui/custom_video_settings.stkgui
+++ b/data/gui/custom_video_settings.stkgui
@@ -147,8 +147,16 @@
                <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">
@@ -160,17 +168,9 @@
        <spacer height="4" width="10" />

        <div layout="horizontal-row" width="100%" proportion="1">
-            <label text="Rendered image quality" I18N="Video settings" width="40%"/>
+            <label text="Texture filtering" I18N="Video settings" width="40%"/>
            <spacer width="10" height="10"/>
-            <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%" />
+            <gauge id="filtering" min_value="0" max_value="5" width="50%" />
        </div>

        <spacer height="10" width="10" />
--- a/data/gui/enter_gp_name_dialog.stkgui
+++ b/data/gui/enter_gp_name_dialog.stkgui
@@ -0,0 +1,20 @@
+<?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/enter_player_name_dialog.stkgui
+++ b/data/gui/enter_player_name_dialog.stkgui
@@ -0,0 +1,21 @@
+<?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 player' dialog" text="Enter the new player's name" proportion="1" />
+
+        <spacer height="25" width="10" />
+
+        <textbox id="textfield" width="75%" I18N="In the 'add new player' dialog" align="center"/>
+
+        <spacer height="20" width="20" />
+
+        <buttonbar proportion="1" id="options" width="100%" height="100%">
+            <button id="ok"     I18N="In the 'add new player' dialog" text="OK" align="center"/>
+            <button id="cancel" I18N="In the 'add new player' dialog" text="Cancel" align="center"/>
+        </buttonbar>
+        <spacer height="15" width="20" />
+
+    </div>
+</stkgui>
--- a/data/gui/general_text_field_dialog.stkgui
+++ b/data/gui/general_text_field_dialog.stkgui
@@ -1,15 +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" 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
@@ -1,40 +0,0 @@
-<?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
@@ -1,26 +0,0 @@
-<?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/edit_gp.stkgui
+++ b/data/gui/edit_gp.stkgui
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
hiker	9ef1b65eba	Fixed compilation ... again :P	2015-06-25 23:03:55 +10:00
hiker	4d10a680c1	Fixed non-debug compilation.	2015-06-25 22:11:52 +10:00
hiker	b8e4aa589d	Added a very rough logging feature for SFXs to debug bug #2169 .	2015-06-25 16:54:47 +10:00