Don't do the upscaling animation if already upscaled

This reverts commit e80e0555e1.

.appveyor.yml

@@ -3,7 +3,6 @@ environment:
     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
@@ -57,10 +56,3 @@ before_build:
 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}"

.gitignore

@@ -60,6 +60,7 @@ android/bin
 android/build
 android/libs
 android/obj
+android/res
 android/.gradle
 android-*
 *.apk

.travis.yml

@@ -5,6 +5,9 @@
 #
 sudo: false
 language: cpp
+os:
+  - linux
+  - osx
 compiler:
   - gcc
   - clang
@@ -40,31 +43,14 @@ addons:
     - 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
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew bundle; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo mkdir -p /usr/local/include/; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo ln -s /System/Library/Frameworks/OpenGL.framework/Versions/A/Headers/ /usr/local/include/GL; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CMAKE_PREFIX_PATH=/usr/local/opt/freetype/:/usr/local/opt/curl/:/usr/local/opt/libogg/:/usr/local/opt/libogg/:/usr/local/opt/libvorbis/:/usr/local/opt/openssl\@1.1/:/usr/local/opt/glew/:/usr/local/opt/fribidi/; fi
 
 script:
   - 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
-
-notifications:
-  irc:
-    channels:
-      - "irc.freenode.org#supertuxkart"
-    skip_join: false
-    use_notice: true
-    template:
-      #- "[%{commit}: %{author}] %{message}"
-      #- "%{build_url}"
-      - "[%{repository}#%{branch} @%{commit}] %{author}): %{message}"
-      - "Diff: %{compare_url}"
-      - "Build: %{build_url}"
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then /usr/local/opt/cmake/bin/cmake .. -DFREETYPE_INCLUDE_DIRS=/usr/local/opt/freetype/include/freetype2/ -DUSE_SYSTEM_GLEW=1 -DOPENAL_INCLUDE_DIR=/usr/local/opt/openal-soft/include/ -DOPENAL_LIBRARY=/usr/local/opt/openal-soft/lib/libopenal.dylib -DFREETYPE_LIBRARY=/usr/local/opt/freetype/lib/libfreetype.dylib -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSERVER_ONLY=$SERVER_ONLY -DCHECK_ASSETS=off -DBUILD_RECORDER=off; fi
+  - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSERVER_ONLY=$SERVER_ONLY -DCHECK_ASSETS=off -DBUILD_RECORDER=off; fi
+  - make VERBOSE=1 -j3

Brewfile

@@ -0,0 +1,8 @@
+brew "libogg"
+brew "libvorbis"
+brew "openal-soft"
+brew "freetype"
+brew "curl"
+brew "openssl@1.1"
+brew "fribidi"
+brew "glew"

CHANGELOG.md

@@ -1,10 +1,35 @@
-## SuperTuxKart 0.9.3
+# Changelog
+This file documents notable changes to SuperTuxKart across versions since its inception.
+
+It should be kept in mind that some versions have a less complete changelog than others, and that this changelog do not list the details of the many small bugfixes and improvements which together make a significant part of the progress between releases.
+
+For similar reasons, and because some features are vastly more complex than others, attributions of main changes should not be taken as a shorcut for overall contribution.
+
+## Unreleased
+* Networking game for normal race, time trial, free for all, capture the flag and soccer
+* Better random item distribution for various numbers of karts by Alayan and hiker
+* Numerous improvements to input on Android by deveee
+* Unlockable SuperTux challenges in Story Mode by Alayan
+* Race UI improvements (new speedometer, nitro gauge, bigger minimap) by Alayan
+* Improvements to ghost replays (more data saved, live time difference, replay comparison, UI improvements, egg hunt replays) by Alayan
+* Kart color customization by Benau
+* Improved powerup handling in AI by Alayan
+* Local multiplayer improvements by Fantasmos
+* New coal skin by Alayan
+* Visual improvements (new skidding particles, better rescue, bubblegum flashing before ending)
+* Audio improvements (crash sound depending on speed/direction, sound cue in nitro challenges)
+* Gameplay improvements (much better slipstreaming, GP points...)
+* Terrain slowdown works again as intended on several tracks where it was missing
+* Many bugfixes
+### Tracks and modeling
+#### Tracks
+* Many unwanted shortcuts and exploits fixed by Auria
+* Las Dunas Soccer by samuncle
+
+## SuperTuxKart 0.9.3 (28. October 2017)
 * Reduced RAM and VRAM usage, reducing load times by Auria and Benau
 * New mesh format optimized for space and hardware skinning
 * Code refactoring of both render pipeline by Benau and Elderme
-* New kart Wilber and Hexley by Jymis
-* New kart Kiki and updated Konqi by Benau
-* New tracks Candela City, Cornfield Crossing and Las Dunas Arena by samuncle
 * Physics improvements and various physics bugfixes by hiker
 * Kart GFX improvements (exhaust and headlight)
 * In-game screen recording powered by libopenglrecorder
@@ -13,92 +38,113 @@
 * New grand prix win scene
 * Gamepad configuration bugfixes
 * 3 Strikes Battles : added spare tire karts
-* Various improvements (wall driving fixes, parachutes, GP points, cannon fixes, colorization shader)
+* Visual representation of the start line in all tracks
+* Various improvements (starting boost effect, wall driving fixes, parachutes, GP points, help page for bananas, cannon fixes, colorization shader)
+### Tracks and modeling
+#### Karts
+* New kart Wilber and Hexley by Jymis
+* New kart Kiki and updated Konqi by Benau
+#### Tracks
+* All tracks drivable in reverse, with arrows pointing in the correct direction
+* Candela City by samuncle (replace Shiny Suburbs)
+* Cornfield Crossing by samuncle (replace Bovine Barnyard)
+* New battle track Las Dunas Arena by samuncle
 
-## SuperTuxKart 0.9.2
+## SuperTuxKart 0.9.2 (1. July 2016)
 * 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
+* New ruby and forest skins by Benau
 * Kart properties refactor by Flakebi
 * Scripting work under the hood
 * Work on the track editor by mhp
 * Tweak to challenges
 * New farm track song by 0zone0ne and Krobonil
 * Bugfixes
+### Tracks and modeling
+#### Tracks
+* Antediluvian Abysses by samuncle (replace Subsea)
+* Volcano Island by Ponzino
+* New icy soccer field by samuncle and Benau
 
-## SuperTuxKart 0.9.1
+## SuperTuxKart 0.9.1 (17. October 2015)
 * 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
+### Tracks and modeling
+#### Tracks
 * Better support for driving tracks in reverse
+* Smaller tweaks and improvements to several tracks including 
+    * Math class
+    * XR591
+    * Fort Magma
+    * Gran Paradiso Island
+    * Subsea
 
-## SupertTuxKart 0.9 (April 2015)
+## SupertTuxKart 0.9 (24. April 2015)
 * Fully shader-based rendering engine
-* New tracks Cocoa Temple and Gran Paradiso
-* Graphical improvements to many other tracks
-* New karts amanda and gavroche
-* New and improved tux, adiumy, sara the wizard and the racer, xue kart
 * Online login which allows to:
-** connect with friends and see when they are playing
-** vote for addons
-** collect online achievements
+    * connect with friends and see when they are playing
+    * vote for addons
+    * collect online achievements
 * Grand Prix editor, including creation of random GPs 
 * Different kart physics
-
+### Tracks and modeling
+#### Karts
+* New karts Amanda and Gavroche by XGhost
+* New and improved Tux, Adiumy, Sara the Wizard and the Racer, Xue
+#### Tracks
+* Cocoa Temple by samuncle (replace Amazonian Journey)
+* Gran Paradiso Island by samuncle (replace The Island)
+* Graphical improvements to many other tracks
 
 ## SuperTuxKart 0.8.1 (26. November 2013)
-* New track STK Enterprise
-* Updated track The old mines
-* Updated Lighthouse track
-* Updated Zen Garden track
 * New Soccer mode
 * New Egg Hunt mode
-* New karts Xue and Sara
-* Updated Beastie kart
 * Added Tutorial
 * Added new Supertux difficulty
 * New bubblegum shield weapon
 * New Speedometer and nitro meter
 * Add ability to filter addons
-* Updated nitro models
 * Add ability to save and resume Grand Prix
 * Improve skid marks and nitro effects
 * Wiimote support
-
+### Tracks and modeling
+#### Karts
+* New karts Xue and Sara
+* Updated Beastie kart
+#### Tracks
+* STK Enterprise by Rubberduck (replace Star Track)
+* Gameplay and graphical updates to several tracks :
+    * The Old Mine
+    * Lighthouse
+    * Zen Garden
+#### Miscellaneous
+* Updated nitro models
 
 ## SuperTuxKart 0.8 (11. December 2012)
 * Story mode and new challenge set
 * Improved AI
 * Skidding and better collision physics
 * Reverse mode
-* New green valley track
-* New Blackhill Mansion track
-* Updated XR591 track
-* Updated Fort Magma track
-* Updated jungle track
-* Updates Sand track
 * Updated menus
 * New music
-
+### Tracks and modeling
+#### Tracks
+* Green Valley by Wolfs (replace Tux Tollway)
+* Blackhill Mansion by samuncle (replace Crescent Crossing)
+* Gameplay and graphical updates to several tracks :
+    * XR591
+    * Fort Magma
+    * Jungle
+    * Sand
+    
 
 ## SuperTuxKart 0.7.3 (2. November 2011)
-* New Zen Garden and Subsea tracks
-* New Island battle arena
-* New Suzanne kart
 * New graphical effects
 * New weapons 'Swatter' and 'Rubber Ball'
-* Added Thunderbird as race referee
 * 3 Strikes Battles now displays lives as spare tires
 * Improved bubble gum
 * See progression during Grand Prix
@@ -107,16 +153,28 @@
 * Improved kart control at high speeds
 * Better placement of rescued karts
 * Transition track-making to blender 2.5/2.6
+### Tracks and modeling
+#### Karts
+* New Suzanne kart
+#### Tracks
+* Zen Garden by samuncle (replace Secret Garden)
+* New Subsea
+* New Island battle arena
+#### Miscellaneous
+* Added Thunderbird as race referee
 
 ## SuperTuxKart 0.7.2 (15. July 2011)
 * Added in-game addon manager
 * Fixed major memory leaks
-* New Snow Peak track by Samuncle
-* Improved star track UFO by Rudy
-* New Beastie kart.
 * Show when you get a highscore
 * Improve gamepad configuration under Windows (add ability to tell gamepads apart)
 * Various other tweaks done and glitches fixed
+### Tracks and modeling
+#### Karts
+* New Beastie kart.
+#### Tracks
+* Improved Snow Peak by samuncle
+* Improved Star Track UFO by Rudy
 
 ## SuperTuxKart 0.7.1b (21. April 2011)
 * Fix circular dependency in challenges
@@ -124,8 +182,6 @@
 
 ## SuperTuxKart 0.7.1 (15. April 2011)
 * Particle  (smoke, splash, fire) and weather effects
-* New Fort Magma by Samuncle, new Shiny Suburbs track by Horace
-* New Beagle kart by wolterh
 * Added internet news
 * Support for live language switch
 * Added optional minimal race UI
@@ -140,6 +196,12 @@
 * Fixed character names that contain non-ASCII characters
 * Full RTL (right to left) support
 * Various other tweaks done and glitches fixed
+### Tracks and modeling
+#### Karts
+* New Beagle kart by wolterh
+#### Tracks
+* New Fort Magma by samuncle
+* New Shiny Suburbs by Horace
 
 ## SuperTuxKart 0.7 (December 2010)
 Too many to list them all. Main points:
@@ -152,8 +214,12 @@ Too many to list them all. Main points:
 * Other improvements
   - Allowed alternative ways/shortcuts in tracks
   - New item 'switch'
-* New art:
-  - New tracks farm, hacienda, scotland, secret garden
+### Tracks and modeling
+#### Tracks
+- Farm
+- Hacienda by samuncle (replace Beach)
+- Scotland by Canis Lupus
+- Secret Garden
 
 ## SuperTuxKart 0.6.2a (October 2009)
 * Bugfix: STK would crash while trying to save the config file
@@ -173,7 +239,7 @@ Too many to list them all. Main points:
 * Bugfix: battle mode would not display track groups.
 
 ## SuperTuxKart 0.6.1 (February 2009)
-* Added new kart ("Puffy"), new battle map ("Cave"), and new music for Snow Mountain.
+* New music for Snow Mountain.
 * Fixed bug in track selection screen that could cause a crash when track groups were used.
 * Fixed crash in character selection that could happen if an old user config file existed.
 * Fixed incorrect rescues in Fort Magma.
@@ -181,15 +247,19 @@ Too many to list them all. Main points:
 * A plunger in the face is now removed when restarting.
 * Added slow-down for karts driving backwards.
 * Somewhat reduced 'shaking' of AI driven karts.
+### Tracks and modeling
+#### Karts
+- New Puffy kart
+#### Tracks
+- New Cave battle map
+
 
 ## SuperTuxKart 0.6 (January 2009)
 * New improved physics and kart handling
 * Added sharp turns and nitro speed boost (replacing wheelies and jump)
 * Totally rewrote powerups (plunger, bowling ball, cake, bubblegum) and new look for bananas
-* New and improved tracks  : skyline, snow mountain, race track, space track, old mine, XR591
 * New game mode : 3-Strikes Battle
 * Major improvements to AI
-* New/improved karts (and removed some old ones) : wilber, eviltux, hexley
 * Improved user interface
 * Karts now have a visible suspension effect
 * Fully positional audio with OpenAL
@@ -204,9 +274,23 @@ Too many to list them all. Main points:
 * Bug fixes and code refactor/cleanup/documentation
   - Fixed 'joystick locks' (kart would turn even if the joystick is in neutral),
     thanks to Samjam for the patch.
+    
+### Tracks and modeling
+#### Karts
+* Improved Wilber
+* Eviltux
+* Hexley
+* Some old karts have been removed
+#### Tracks
+* Skyline
+* Snow Mountain
+* Race track
+* Old Mine
+* XR591
+* Improved track :
+    * Star track
 
 ## SuperTuxKart 0.5 (May 2008)
-* Six new tracks and one improved track: Fort Magma, SnowTux Peak, Amazonian Journey, City, Canyon, Crescent Crossing and StarTrack
 * Complete Challenges to unlock game modes, new tracks and a skidding preview
 * New Follow the Leader game mode
 * New Grand Prix
@@ -217,18 +301,29 @@ Too many to list them all. Main points:
 * Many Bugfixes including:
 	- a memory leak fix (Charlie Head)
 	- an AI crash fix (Chris Morris)
-
+	
+### Tracks and modeling	
+#### Tracks
+* SnowTux Peak
+* Amazonian Journey
+* City
+* Canyon
+* BSODs Battlements renamed to Fort Magma
+* Improved Crescent Crossing, Fort Magma, and Star Track
 
 ## SuperTuxKart 0.4 (February 2008)
 * New physics handling using the bullet physics engine
-* New kart: wilber
-* Improved 'Shifting Sands' and 'Lighthouse' tracks
 * Improved AI
 * New GUI handling, including resolution switching GUI
 * Improved input handling	
 * Jump and look-back featue
 * Additional music and main theme
+### Tracks and modeling
+#### Karts
+* New kart: wilber
 	
+#### Tracks
+* Improved 'Shifting Sands' and 'Lighthouse'
 	
 ## SuperTuxKart 0.3 (May 2007)
 * Highscore lists	
@@ -260,7 +355,7 @@ Too many to list them all. Main points:
   - Fixed keyboard keys unable to work on the first key press bug
   - And others
 
-##SuperTuxKart 0.2 (22. Sep 2006)
+## SuperTuxKart 0.2 (22. Sep 2006)
   * Significant performance improvement by using display lists
   * Improved AI
   * Support for different grand prixs
@@ -278,7 +373,7 @@ Too many to list them all. Main points:
   * Added help and about screens, added credits to track designer
   * Items were added to all tracks
 
-##SuperTuxKart 0.1 (04. May 2006)  (not officially released)
+## SuperTuxKart 0.1 (04. May 2006)  (not officially released)
   * Significant speedup by using a new HOT and collision algorithm --> all tracks are now playable
   * Removed all SDL dependencies, only plib is needed
   * Single and multi-window menu can be used
@@ -286,7 +381,7 @@ Too many to list them all. Main points:
   * Some bug fixes and small improvements
   * Added profile option to support automatic profiling
 
-##SuperTuxKart 0.0.0 (22. Dec 2004)
+## SuperTuxKart 0.0.0 (22. Dec 2004)
   * new tracks
   * new characters and karts
   * new user-interface

CMakeLists.txt

@@ -1,8 +1,10 @@
+cmake_minimum_required(VERSION 2.8.4)
+
 # root CMakeLists for the SuperTuxKart project
 project(SuperTuxKart)
-set(PROJECT_VERSION "0.9.3")
+set(PROJECT_VERSION "git")
+add_definitions( -DSUPERTUXKART_VERSION="${PROJECT_VERSION}" )
 
-cmake_minimum_required(VERSION 2.8.4)
 if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))
   cmake_policy(SET CMP0043 OLD)
 endif()
@@ -10,30 +12,45 @@ endif()
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
 include(CMakeDependentOption)
 
-set(DEPENDENCIES "dependencies")
-# In case of 64-bit windows, use a different path for dependencies
-# so that both dependencies can be installed next to each other
-if ( WIN32 AND (CMAKE_SIZEOF_VOID_P EQUAL 8 ) )
-    set(DEPENDENCIES "dependencies-64bit")
-endif()
-
 include(BuildTypeSTKRelease)
-if (NOT CMAKE_BUILD_TYPE)
+if(NOT CMAKE_BUILD_TYPE)
     message(STATUS "No build type selected, default to STKRelease")
     set(CMAKE_BUILD_TYPE "STKRelease")
 endif()
 
 option(SERVER_ONLY "Create a server only (i.e. no graphics or sound)" OFF)
-option(USE_FRIBIDI "Support for right-to-left languages" ON)
 option(CHECK_ASSETS "Check if assets are installed in ../stk-assets" ON)
 option(USE_SYSTEM_ANGELSCRIPT "Use system angelscript instead of built-in angelscript. If you enable this option, make sure to use a compatible version." OFF)
-option(ENABLE_WAYLAND_DEVICE "Enable Wayland device for linux build" OFF)
+option(USE_SYSTEM_ENET "Use system ENET instead of the built-in version, when available." ON)
+option(USE_SYSTEM_GLEW "Use system GLEW instead of the built-in version, when available." ON)
 
+CMAKE_DEPENDENT_OPTION(USE_CRYPTO_OPENSSL "Use OpenSSL instead of Nettle for cryptography in STK." OFF
+    "NOT APPLE" ON)
 CMAKE_DEPENDENT_OPTION(BUILD_RECORDER "Build opengl recorder" ON
-    "NOT SERVER_ONLY;NOT USE_GLES2;NOT APPLE" OFF)
+    "NOT SERVER_ONLY;NOT APPLE" OFF)
+CMAKE_DEPENDENT_OPTION(USE_FRIBIDI "Support for right-to-left languages" ON
+    "NOT SERVER_ONLY" OFF)
+CMAKE_DEPENDENT_OPTION(USE_WIIUSE "Support for wiimote input devices" ON
+    "NOT SERVER_ONLY;NOT MINGW;NOT CYGWIN" OFF)
+
+if(APPLE)
+    list(APPEND CMAKE_PREFIX_PATH /usr/local/opt)
+    include_directories(/usr/local/opt/fribidi/include/)
+    include_directories(/usr/local/opt/openssl@1.1/include/)
+    include_directories(/usr/local/opt/openssl@1.1/include/openssl/)
+    include_directories(/usr/local/opt/freetype/include/freetype2/)
+endif()
+
+if((UNIX AND NOT APPLE) AND NOT SERVER_ONLY)
+    option(ENABLE_WAYLAND_DEVICE "Enable Wayland device for linux build" ON)
+    
+    if((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") OR 
+       (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
+        option(USE_GLES2 "Use OpenGL ES2 renderer" ON)
+    else()
+        option(USE_GLES2 "Use OpenGL ES2 renderer" OFF)
+    endif()
 
-if (UNIX AND NOT APPLE)
-    option(USE_GLES2 "Use OpenGL ES2 renderer" OFF)
 endif()
 
 if(UNIX OR MINGW)
@@ -50,12 +67,6 @@ 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)
-endif()
-
 if(UNIX AND NOT APPLE)
     option(USE_ASAN   "Build with Leak/Address sanitizer" OFF)
     option(USE_LIBBFD "Use libbfd for crash reporting and leak check" OFF)
@@ -71,6 +82,32 @@ set(STK_INSTALL_BINARY_DIR "bin" CACHE
 set(STK_INSTALL_DATA_DIR "share/supertuxkart" CACHE
     STRING "Install data folder to this directory, absolute or relative to CMAKE_INSTALL_PREFIX")
 
+# Define dependencies path
+if(MSVC)
+    set(DEPENDENCIES "dependencies-vs")
+elseif(MINGW)
+    set(DEPENDENCIES "dependencies-mingw")
+else()
+    set(DEPENDENCIES "dependencies")
+endif()
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(DEPENDENCIES "${DEPENDENCIES}-64bit")
+endif()
+
+if(WIN32)
+    if(NOT IS_DIRECTORY "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}")
+        set(DEPENDENCIES "dependencies")
+        if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+            set(DEPENDENCIES "${DEPENDENCIES}-64bit")
+        endif()
+    endif()
+
+    if(NOT IS_DIRECTORY "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}")
+        message(FATAL_ERROR "Dependencies directory not found.")
+    endif()
+endif()
+
 # These variables enable MSVC to find libraries located in "dependencies"
 if(WIN32)
     set(ENV{PATH} "$ENV{PATH};${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/include")
@@ -78,6 +115,7 @@ if(WIN32)
     set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/${DEPENDENCIES})
     add_definitions(-D_IRR_STATIC_LIB_)
     add_definitions(-DNO_IRR_COMPILE_WITH_X11_)
+    include_directories(${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/include)
 endif()
 
 if(USE_GLES2)
@@ -87,13 +125,9 @@ endif()
 
 if(SERVER_ONLY)
     add_definitions(-DSERVER_ONLY)
-    add_definitions(-DNO_IRR_COMPILE_WITH_X11_)
+    add_definitions(-DNO_IRR_COMPILE_WITH_X11_ -DNO_IRR_COMPILE_WITH_OPENGL_ -DNO_IRR_COMPILE_WITH_OSX_DEVICE_)
 endif()
 
-#if(DISABLE_VPX)
-#    add_definitions(-DNO_VPX)
-#endif()
-
 if(UNIX OR MINGW)
     if(DEBUG_SYMBOLS)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
@@ -101,52 +135,88 @@ if(UNIX OR MINGW)
     endif()
 endif()
 
+if(UNIX AND NOT APPLE)
+    find_package(PkgConfig REQUIRED)
+
+    if(NOT PKGCONFIG_FOUND)
+        message(FATAL_ERROR "Pkg-config not found.")
+    endif()
+endif()
+
 # Build the Bullet physics library
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
 include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
 
-# Build the ENet UDP network library
-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
-include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
-
-# 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")
+# Find system ENet library or build it if missing
+if((UNIX AND NOT APPLE) AND USE_SYSTEM_ENET)
+    pkg_check_modules(ENET libenet>=1.3.4)
 endif()
 
-if(MSVC OR APPLE)
-    if (NOT APPLE)
+if(ENET_FOUND)
+    include_directories(${ENET_INCLUDE_DIRS})
+else()
+    # Fallback to built-in version
+    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
+    include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
+    set(ENET_LIBRARIES "enet")
+endif()
+
+# Find system GLEW library or build it if missing
+if (APPLE)
+    find_package(glew)
+
+    if(GLEW_FOUND)
+        include_directories(${GLEW_INCLUDE_DIRS})
+    endif()
+elseif(NOT USE_GLES2 AND NOT SERVER_ONLY)
+    add_definitions(-DGLEW_NO_GLU)
+    if((UNIX AND NOT APPLE) AND USE_SYSTEM_GLEW)
+        pkg_check_modules(GLEW glew>=2.1)
+    endif()
+
+    if(GLEW_FOUND)
+        include_directories(${GLEW_INCLUDE_DIRS})
+    else()
+        # Fallback to built-in version silently
+        add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
+        include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
+        set(GLEW_LIBRARIES "glew")
+    endif()
+endif()
+
+if(MSVC)
     # Build zlib library
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/zlib")
     include_directories("${PROJECT_SOURCE_DIR}/lib/zlib")
 
     set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/zlib" "${PROJECT_BINARY_DIR}/lib/zlib/")
     set(ZLIB_LIBRARY zlibstatic)
-    endif()
-
-    # Build png library
-    set(SKIP_INSTALL_ALL TRUE)
-    set(PNG_STATIC TRUE CACHE BOOL "Build static lib")
-    set(PNG_TESTS FALSE CACHE BOOL "Build libpng tests")
-    set(PNG_SHARED FALSE CACHE BOOL "Build shared lib")
-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
-    include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")
-
-    set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
-    set(PNG_LIBRARY png_static)
 endif()
 
-# Add jpeg library
-if (APPLE)
-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
-    include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
-    set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
-    set(JPEG_LIBRARY jpeglib)
-else()
-    find_package(JPEG REQUIRED)
-    include_directories(${JPEG_INCLUDE_DIR})
+if (NOT SERVER_ONLY)
+    if(MSVC OR APPLE)
+        # Build png library
+        set(SKIP_INSTALL_ALL TRUE)
+        set(PNG_STATIC TRUE CACHE BOOL "Build static lib")
+        set(PNG_TESTS FALSE CACHE BOOL "Build libpng tests")
+        set(PNG_SHARED FALSE CACHE BOOL "Build shared lib")
+        add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
+        include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")
+
+        set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
+        set(PNG_LIBRARY png_static)
+    endif()
+
+    # Add jpeg library
+    if (APPLE)
+        add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+        include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+        set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
+        set(JPEG_LIBRARY jpeglib)
+    else()
+        find_package(JPEG REQUIRED)
+        include_directories(${JPEG_INCLUDE_DIR})
+    endif()
 endif()
 
 if (BUILD_RECORDER)
@@ -170,11 +240,24 @@ if (BUILD_RECORDER)
     endif()
 endif()
 
-if(NOT SERVER_ONLY AND NOT USE_GLES2)
+if(NOT SERVER_ONLY)
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/graphics_utils")
     include_directories("${PROJECT_SOURCE_DIR}/lib/graphics_utils")
 endif()
 
+if(NOT SERVER_ONLY)
+    find_library(SQUISH_LIBRARY NAMES squish libsquish)
+    find_path(SQUISH_INCLUDEDIR NAMES squish.h PATHS)
+    if (NOT SQUISH_LIBRARY OR NOT SQUISH_INCLUDEDIR)
+        add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libsquish")
+        include_directories("${PROJECT_SOURCE_DIR}/lib/libsquish")
+        SET(SQUISH_LIBRARY squish)
+    else()
+        include_directories("${SQUISH_INCLUDEDIR}")
+        MESSAGE(STATUS "Use system libsquish: ${SQUISH_LIBRARY}")
+    endif()
+endif()
+
 # Build the irrlicht library
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
 include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
@@ -217,38 +300,27 @@ else()
     set(Angelscript_LIBRARIES angelscript)
 endif()
 
-# OpenAL
-if(APPLE)
-    # In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has
-    # unix-style installs of Vorbis/Ogg/OpenAL/etc. they will be picked up over our frameworks. This is blocking when I make releases :
-    # the mac I use to make STK releases does have other installs of vorbis/ogg/etc. which aren't compatible with STK, so letting
-    # CMake pick the library it wants essentially means I can't build.
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -framework OpenAL")
-    set(OPENAL_LIBRARY)
-else()
+if(NOT SERVER_ONLY)
+    # OpenAL
     find_package(OpenAL REQUIRED)
     include_directories(${OPENAL_INCLUDE_DIR})
-endif()
 
-# OggVorbis
-if(APPLE)
-    # In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has
-    # unix-style installs of Vorbis/Ogg/OpenAL/etc. they will be picked up over our frameworks. This is blocking when I make releases :
-    # the mac I use to make STK releases does have other installs of vorbis/ogg/etc. which aren't compatible with STK, so letting
-    # CMake pick the library it wants essentially means I can't build.
-    set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -I/Library/Frameworks/Ogg.framework/Versions/A/Headers -I/Library/Frameworks/Vorbis.framework/Versions/A/Headers")
-else()
+    # OggVorbis
     find_package(OggVorbis REQUIRED)
     include_directories(${OGGVORBIS_INCLUDE_DIRS})
+
+    add_definitions(-DENABLE_SOUND)
 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. ")
+if (NOT SERVER_ONLY)
+    find_package(Freetype)
+    if(FREETYPE_FOUND)
+        include_directories(${FREETYPE_INCLUDE_DIRS})
+    else()
+        message(FATAL_ERROR "Freetype not found. "
+            "Freetype is required to display characters in SuperTuxKart. ")
+    endif()
 endif()
 
 # Fribidi
@@ -317,8 +389,6 @@ else()
     endif()
 endif()
 
-# TODO: remove this switch
-add_definitions(-DHAVE_OGGVORBIS)
 
 if(WIN32)
     configure_file("${STK_SOURCE_DIR}/../tools/windows_installer/icon_rc.template" "${PROJECT_BINARY_DIR}/tmp/icon.rc")
@@ -342,16 +412,10 @@ if(APPLE)
     add_executable(supertuxkart MACOSX_BUNDLE ${STK_SOURCES})
 
     find_library(IOKIT_LIBRARY IOKit)
-    find_library(QUICKTIME_LIBRARY QuickTime)
-    find_library(CARBON_LIBRARY Carbon)
-    find_library(AUDIOUNIT_LIBRARY AudioUnit)
     find_library(COCOA_LIBRARY Cocoa)
 
     target_link_libraries(supertuxkart
          ${IOKIT_LIBRARY}
-         ${QUICKTIME_LIBRARY}
-         ${CARBON_LIBRARY}
-         ${AUDIOUNIT_LIBRARY}
          ${COCOA_LIBRARY})
 
     # configure CMake to use a custom Info.plist
@@ -391,14 +455,45 @@ else()
     target_link_libraries(supertuxkart ${PTHREAD_LIBRARY})
 endif()
 
-# CURL
+# CURL and OpenSSL or Nettle
+# 1.0.1d for compatible AES GCM handling
+SET(OPENSSL_MINIMUM_VERSION "1.0.1d")
 if(MSVC)
+    set(USE_CRYPTO_OPENSSL ON)
     target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib/libcurl.lib)
+    target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib/libeay32.lib)
 elseif(MINGW)
+    set(USE_CRYPTO_OPENSSL ON)
     target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib/libcurldll.a)
+    target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib/libeay32.dll)
 else()
     find_package(CURL REQUIRED)
     include_directories(${CURL_INCLUDE_DIRS})
+
+    find_path(NETTLE_INCLUDE_DIRS nettle/gcm.h nettle/sha.h nettle/base64.h nettle/version.h nettle/yarrow.h)
+    find_library(NETTLE_LIBRARY NAMES nettle libnettle)
+
+    if (NOT NETTLE_INCLUDE_DIRS OR NOT NETTLE_LIBRARY OR USE_CRYPTO_OPENSSL)
+        set(USE_CRYPTO_OPENSSL ON)
+        find_package(OpenSSL REQUIRED)
+
+        if(${OPENSSL_VERSION} VERSION_LESS ${OPENSSL_MINIMUM_VERSION} OR
+            (${OPENSSL_VERSION} VERSION_EQUAL ${OPENSSL_MINIMUM_VERSION} AND ${OPENSSL_VERSION} STRLESS ${OPENSSL_MINIMUM_VERSION}))
+            message(FATAL_ERROR "OpenSSL version found (${OPENSSL_VERSION}) is less then the minimum required (${OPENSSL_MINIMUM_VERSION}), aborting.")
+        endif()
+        include_directories(${OpenSSL_INCLUDE_DIRS})
+    else()
+        set(USE_CRYPTO_OPENSSL OFF)
+        include_directories(${NETTLE_INCLUDE_DIRS})
+    endif()
+endif()
+
+if (USE_CRYPTO_OPENSSL)
+    message(STATUS "OpenSSL will be used for cryptography in STK.")
+    add_definitions(-DENABLE_CRYPTO_OPENSSL)
+else()
+    message(STATUS "Nettle will be used for cryptography in STK.")
+    add_definitions(-DENABLE_CRYPTO_NETTLE)
 endif()
 
 # Common library dependencies
@@ -406,24 +501,32 @@ target_link_libraries(supertuxkart
     bulletdynamics
     bulletcollision
     bulletmath
-    enet
+    ${ENET_LIBRARIES}
     stkirrlicht
     ${Angelscript_LIBRARIES}
     ${CURL_LIBRARIES}
-    ${OGGVORBIS_LIBRARIES}
-    ${OPENAL_LIBRARY}
-    ${FREETYPE_LIBRARIES}
-    ${JPEG_LIBRARIES}
-    ${TURBOJPEG_LIBRARY}
-    #${VPX_LIBRARIES}
     )
 
+if (USE_CRYPTO_OPENSSL)
+    target_link_libraries(supertuxkart ${OPENSSL_CRYPTO_LIBRARY})
+else()
+    target_link_libraries(supertuxkart ${NETTLE_LIBRARY})
+endif()
+
 if(NOT SERVER_ONLY)
     if(NOT USE_GLES2)
-        target_link_libraries(supertuxkart ${OPENGL_gl_LIBRARY} glew graphics_utils)
+        target_link_libraries(supertuxkart ${OPENGL_gl_LIBRARY} ${GLEW_LIBRARIES})
     else()
         target_link_libraries(supertuxkart GLESv2)
     endif()
+
+    target_link_libraries(supertuxkart
+        ${SQUISH_LIBRARY}
+        ${FREETYPE_LIBRARIES}
+        ${JPEG_LIBRARIES}
+        ${OGGVORBIS_LIBRARIES}
+        ${OPENAL_LIBRARY}
+        graphics_utils)
 endif()
 
 if(UNIX AND NOT APPLE)
@@ -445,15 +548,6 @@ 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(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/Library/Frameworks/OpenAL.framework/Versions/A/Headers")
-endif()
-
 if(USE_FRIBIDI)
     target_link_libraries(supertuxkart ${FRIBIDI_LIBRARIES})
     add_definitions(-DENABLE_BIDI)
@@ -543,7 +637,7 @@ install(FILES ${STK_DATA_DIR}/supertuxkart.desktop DESTINATION share/application
 install(FILES data/supertuxkart_48.png DESTINATION share/icons/hicolor/48x48/apps RENAME supertuxkart.png)
 install(FILES data/supertuxkart_128.png DESTINATION share/icons/hicolor/128x128/apps RENAME supertuxkart.png)
 install(FILES data/supertuxkart_48.png DESTINATION share/pixmaps RENAME supertuxkart.png)
-install(FILES data/supertuxkart.appdata.xml DESTINATION share/appdata)
+install(FILES data/supertuxkart.appdata.xml DESTINATION share/metainfo)
 
 if(MINGW)
     install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/ DESTINATION ${STK_INSTALL_BINARY_DIR}

INSTALL.md

@@ -0,0 +1,261 @@
+## Building from source
+
+In order to build SuperTuxKart from source, you'll need both the code and the assets (See <https://supertuxkart.net/Source_control> for more information):
+
+```bash
+git clone https://github.com/supertuxkart/stk-code stk-code
+svn co https://svn.code.sf.net/p/supertuxkart/code/stk-assets stk-assets
+```
+
+## Building SuperTuxKart on Linux
+
+### Dependencies
+
+To build SuperTuxKart from source, you'll need to 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:
+
+```bash
+sudo apt-get install build-essential cmake libbluetooth-dev \
+libcurl4-openssl-dev libenet-dev libfreetype6-dev libfribidi-dev \
+libgl1-mesa-dev libglew-dev libjpeg-dev libogg-dev libopenal-dev libpng-dev \
+libssl-dev libvorbis-dev libxrandr-dev libx11-dev pkg-config zlib1g-dev
+```
+Fedora command:
+
+```bash
+sudo dnf install @development-tools cmake bluez-libs-devel \
+openssl-devel libcurl-devel freetype-devel fribidi-devel mesa-libGL-devel \
+libjpeg-turbo-devel libogg-devel openal-soft-devel libpng-devel \
+libvorbis-devel libXrandr-devel libGLEW pkgconf zlib-devel
+```
+### In-game recorder
+
+To build the in-game recorder for STK, you have to install
+libopenglrecorder from your distribution, or compile it yourself from [here](https://github.com/Benau/libopenglrecorder).
+Compilation instruction is explained there. If you don't need this feature, pass `-DBUILD_RECORDER=off` to cmake.
+
+### Compiling
+
+To compile SuperTuxKart, run the following commands inside `stk-code` directory:
+
+```bash
+mkdir cmake_build
+cd cmake_build
+cmake ..
+make -j4
+```
+STK can then be run from the build directory with `bin/supertuxkart`
+
+#### Keeping your build up to date
+
+To recompile the latest code without redownloading the entire source, first run the ```svn up``` command inside the 'stk-assets' directory, then run the following commands inside the 'stk-code' directory:
+
+```bash
+git pull
+cd cmake_build
+cmake ..
+make -j4
+```
+
+##### Build Speed Optimization
+
+"-j4" is an example, for a faster build, use "-jx" instead, where "x" is the amount of CPU threads you have, minus one. "-j$(nproc)" usually works.
+
+### Further options
+
+To create a debug version of STK, run:
+
+```bash
+cmake .. -DCMAKE_BUILD_TYPE=Debug
+```
+
+You can install your build system-wide:
+
+```bash
+sudo make install
+```
+
+The default install location is `/usr/local`, i.e. the data files will
+be written to `/usr/local/share/games/supertuxkart`, the executable
+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 SuperTuxKart on Windows
+To Build SuperTuxKart on Windows, follow these instructions:
+
+1. Download and install Visual Studio from here: [Visual Studio - Download](https://www.visualstudio.com/downloads/). The free Visual Studio Community edition works fine. Remember to select "Desktop development with C++" in the installer.
+
+2a. If you want the stable version, download the SuperTuxKart source package from the latest stable version [SuperTuxKart download area - SourceForge.net](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/) and unpack it.
+2b. If you want the development version, you will need a Git client and a SVN client. More information can be found here: [SuperTuxKart.net - Source Control](https://supertuxkart.net/Source_control).
+Open your file browser and find somewhere you want to put the development version of SuperTuxKart. For example in C:\Users\<Your Username> as the Git and SVN clients will have write permissions there, and you should create its own directory, for example SuperTuxKart-dev. Enter that directory, and create a directory inside called stk-assets, and enter it. If you installed TortoiseSVN, right-click, select TortoiseSVN -> Checkout... and paste the correspodning URL found in [SuperTuxKart.net - Source Control](https://supertuxkart.net/Source_control). While it is downloading the game assets, go back to your file browser and one level up. Right-click again somewhere empty and select "Git clone..." and paste the corresponding link found in [SuperTuxKart.net - Source Control](https://supertuxkart.net/Source_control).
+*Note: Both `stk-code` and `stk-assets` **must** be in the same directory, otherwise the build will likely fail!*
+
+3a. If you got the stable version, download the Windows dependencies package from [SuperTuxKart download area: Dependencies - SourceForge.net](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/Windows/) and unpack it.
+3b. If you got the development version go to SuperTuxKart-dev in your file browser, right-click somewhere empty, select "Git clone..." and paste https://github.com/supertuxkart/dependencies.git in the URL field; click OK. When finished, copy the `dependencies` directory from either the `windows` or the `windows_64bit` directories into the `stk-code` directory; rename the latter to `dependencies-64bit` if you want to compile a 64-bit build.
+
+4. Download CMake from here: [CMake - download page](https://cmake.org/download/), install it; once CMake is installed, double click on the CMake icon on your desktop, and point it towards your `stk-code` directory in the 'Where is the source code' field, and point it to a new directory called `build` or `bld` inside the stk-code directory.
+
+5. Press 'Configure'; CMake will ask you if it is OK to create the aforementioned directory, press `Yes`. CMake will then ask you about your version of Visual Studio. 
+
+Confirm your selection; *Please look at the table below to avoid confusion between version numbers and releases of Visual Studio*; CMake will begin creating the required files for the build in the directory. If you want to do a 64-bit build, select the version of Visual Studio you installed with "Win64" appended.
+
+6. Navigate to your build directory and open the `SuperTuxKart.sln` file; Visual Studio will now load the solution. 
+
+7. In the 'Solution Explorer', right click on the `supertuxkart` project and select "Set as StartUp project".
+
+8. Open the 'Build' menu and select 'Build Solution'; or, press the default keyboard shortcut: `CTRL + SHIFT + B` to build the solution.
+
+*Note: To avoid confusion between releases and versions, refer to this table:*
+
+Visual Studio Release | Version
+----------------------|------------
+Visual Studio 2017| 15
+Visual Studio 2015| 14
+Visual Studio 2013| 13
+
+## Building SuperTuxKart on Windows (from PowerShell/Command line)
+1. Download and install Visual Studio from here: [Visual Studio - Download](https://www.visualstudio.com/downloads/), the free Visual Studio Community edition works fine.
+
+2. Download a source package from either [SuperTuxKart 0.9.2 download area - SourceForge.net](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/0.9.2) or [SuperTuxKart.net - Source Control](https://supertuxkart.net/Source_control)
+NOTE: the `stk-code` and `stk-assets` directories **must** be in the same directory 
+3. Download the Windows dependencies package from either [SuperTuxKart download area - SourceForge.net](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/Windows/)
+or [SuperTuxKart on GitHub - Dependencies](https://github.com/supertuxkart/dependencies)
+and unpack the archive; once unpacked, copy the `dependencies` directory from either the `windows` or the `windows_64bit` directories into the `stk-code` directory
+4. Download CMake from here: [CMake - download page](https://cmake.org/download/); and install it. Navigate to the `stk-code` directory; and create an directory called "build":
+```cmd
+mkdir build
+cd build
+```
+5. Once inside the build directory; run CMake to start the compilation process:
+```cmd
+cmake ..
+```
+6. Now that CMake finished configuring and creating the necessary files for the build, run the build command in the same directory:
+```cmd
+msbuild.exe SuperTuxKart.sln 
+``` 
+SuperTuxKart can now be run as `bin\Debug\supertuxkart.exe` or `bin\Release\supertuxkart.exe` 
+
+## Building SuperTuxKart on macOS
+
+### Getting Started
+
+Install the developer tools, either from the OS X Install DVD or from Apple's website.
+
+If you have never built anything before, you have create `/usr/local/include/` first:
+
+```bash
+sudo mkdir -p /usr/local/include/
+```
+
+Symlink the `include`-folder of OpenGL framework to `/usr/local/include/GL` (Unix programs have an easier time finding it this way):
+
+```bash
+sudo ln -s /System/Library/Frameworks/OpenGL.framework/Versions/A/Headers/ /usr/local/include/GL
+```
+
+On OS X 10.9.5, you might need the following workaround:
+
+```bash
+sudo ln -s `xcrun --show-sdk-path`/usr/include/ /usr/include
+sudo ln -s `xcrun --show-sdk-path`/System/Library/Frameworks/OpenGL.framework/Headers/ /usr/local/include/OpenGL
+```
+The first link is required in order to find libcurl, the second to find opengl.
+
+### CMake
+
+CMake is used to build STK. At this time CMake will not make a binary that is ready for distribution.
+
+You'll have to run these commands inside your stk-code directory.
+
+
+### STK 0.9.4 or later (or latest git)
+
+Install homebrew ( https://brew.sh/)
+Install all of the dependencies using homebrew :
+
+```bash
+brew install libogg
+brew install libvorbis
+brew install openal-soft
+brew install freetype
+brew install curl
+brew install openssl@1.1
+brew install fribidi
+brew install glew
+```
+
+Build STK
+```bash
+mkdir cmake_build
+cd cmake_build
+CMAKE_PREFIX_PATH=/usr/local/opt/freetype/:/usr/local/opt/curl/:/usr/local/opt/libogg/:/usr/local/opt/libogg/:/usr/local/opt/libvorbis/:/usr/local/opt/openssl\@1.1/:/usr/local/opt/glew/:/usr/local/opt/fribidi/ /usr/local/opt/cmake/bin/cmake .. -DFREETYPE_INCLUDE_DIRS=/usr/local/opt/freetype/include/freetype2/ -DUSE_SYSTEM_GLEW=1 -DOPENAL_INCLUDE_DIR=/usr/local/opt/openal-soft/include/ -DOPENAL_LIBRARY=/usr/local/opt/openal-soft/lib/libopenal.dylib -DFREETYPE_LIBRARY=/usr/local/opt/freetype/lib/libfreetype.dylib
+make
+```
+
+#### (Optional) packaging for distribution
+
+By default, the executable that is produced is not ready for distribution. Install https://github.com/auriamg/macdylibbundler and run:
+
+```bash
+dylibbundler -od -b -x ./bin/SuperTuxKart.app/Contents/MacOS/supertuxkart -d ./bin/SuperTuxKart.app/Contents/libs/ -p @executable_path/../libs/
+```
+
+Afterwards, copy the contents of `stk-assets` into `/SuperTuxKart.app/Contents/Resources/data`.
+
+### STK 0.9.3 or earlier
+
+Download pre-built dependencies from [here](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/OSX/) and put the frameworks in [hard disk root]/Library/Frameworks
+
+Building with clang:
+
+```bash
+mkdir cmake_build
+cd cmake_build
+cmake ..
+make
+```
+
+Building with GCC:
+```bash
+mkdir cmake_build
+cd cmake_build
+cmake .. -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_C_COMPILER=/usr/bin/gcc
+make
+```
+
+Building on 10.10 with 10.9 compatibility:
+```bash
+cmake .. -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk  -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9
+```
+
+#### Xcode
+
+Place an additional copy of the dependencies into `Users/<YOUR_USERNAME>/Library/Frameworks`.
+Then cd to your cloned stk-code directory and execute the following commands:
+
+```bash
+mkdir xcode_build && cd xcode_build
+cmake .. -GXcode
+```
+
+Use Finder to navigate to your stk-code/xcode_build folder and open the newly generated Xcode project (`SuperTuxKart.xcodeproj`).
+
+You can then build the project in Xcode using Product -> Build
+
+Note: Xcode is much less well tested than makefiles, so there may be issues when trying to use Xcode.

ISSUE_TEMPLATE.md

@@ -0,0 +1,49 @@
+## Description
+
+Provide a description of your issue.
+For any suggestions, please address them on the [forum](https://forum.freegamedev.net/viewforum.php?f=16).
+
+## Steps to reproduce
+
+## Configuration
+
+STK release version:
+
+STK Source (ppa, distribution package, official bin,...):
+If you did not download STK from the official website, please specify where you got it:
+
+System: 
+
+Graphics card: 
+
+CPU: 
+
+Gamepads/keyboards models if related to the issue:
+
+## Additional information
+
+Please provide stdout.log, it is located in
+
+* %appdata%\supertuxkart\0.8.2 (windows)
+* ~/Library/Application Support/supertuxkart/0.8.2 (mac)
+* $XDG_CONFIG_HOME/supertuxkart/0.8.2 or ~/.config/supertuxkart/0.8.2 (linux, and other unix based systems)
+
+stdout.log
+```
+
+```
+
+If your issue is related to the input config (gamepads, keyboards), please provide your file input.xml located in the same directory as stdout.log.
+
+input.xml
+```xml
+
+```
+
+
+If an error message was shown, please copy paste the complete error message or a screenshot of it.
+
+error
+```
+
+```

NETWORKING.md

@@ -0,0 +1,171 @@
+# Online networking games for STK
+
+## Hosting server
+First of all, you can compile STK with `-DSERVER_ONLY=ON` which will produce a GUI-less STK binary optimized for size and memory usage, useful for situation like in VPS.
+
+### Hosting WAN (public internet) server
+You are required to have an stk online account first, go [here](https://addons.supertuxkart.net/register.php) for registration.
+
+It is recommended you have a saved user in your computer to allow hosting multiple servers simultaneously with the same account, if you have a fresh STK installation, first run:
+
+`supertuxkart --init-user --login=your_registered_name --password=your_password`
+
+After that you should see `Done saving user, leaving` in terminal if it successfully logged in.
+
+Than you can just run:
+
+`supertuxkart --server-config=your_config.xml --network-console`
+
+It will create that xml configuration file if not found in current directory, you can type `quit` in terminal, than you can edit that file for further configuration as required.
+
+The current server configuration xml looks like this:
+```xml
+<?xml version="1.0"?>
+<server-config version="1" >
+
+    <!-- Name of server, encode in XML if you want to use unicode characters. -->
+    <server-name value="stk server" />
+
+    <!-- Port used in server, if you specify 0, it will use the server port specified in stk_config.xml or if random-server-port is enabled in user config, than any port. STK will auto change to random port if the port you specify failed to be bound. -->
+    <server-port value="0" />
+
+    <!-- Game mode in server, 0 is normal race (grand prix), 1 is time trial (grand prix), 3 is normal race, 4 time trial, 6 is soccer, 7 is free-for-all and 8 is capture the flag. Notice: grand prix server doesn't allow for players to join and wait for ongoing game. -->
+    <server-mode value="3" />
+
+    <!-- Difficulty in server, 0 is beginner, 1 is intermediate, 2 is expert and 3 is supertux (the most difficult). -->
+    <server-difficulty value="0" />
+
+    <!-- Number of grand prix tracks per game (If grand prix enabled). -->
+    <gp-track-count value="3" />
+
+    <!-- Use goal target in soccer. -->
+    <soccer-goal-target value="false" />
+
+    <!-- Enable wan server, which requires you to have an stk-addons account with a saved session. Check init-user command for details. -->
+    <wan-server value="true" />
+
+    <!-- Enable network console, which can do for example kickban. -->
+    <enable-console value="false" />
+
+    <!-- Maximum number of players on the server, setting it more than 8 will have performance degradation. -->
+    <server-max-players value="8" />
+
+    <!-- Password for private server, empty for a public server. -->
+    <private-server-password value="" />
+
+    <!-- Message of today shown in lobby, you can enter encoded XML words here or a file.txt and let STK load it. -->
+    <motd value="" />
+
+    <!-- Timeout in seconds for voting tracks in server. -->
+    <voting-timeout value="20" />
+
+    <!-- Timeout in seconds for validation of clients in wan, currently stk will use the stk-addons server to share AES key between client and server. -->
+    <validation-timeout value="20" />
+
+    <!-- By default WAN server will always validate player and LAN will not, disable it to allow non-validated player in WAN. -->
+    <validating-player value="true" />
+
+    <!-- Disable it to turn off all stun related code in server, it allows saving server resource if your server is not behind a firewall. -->
+    <firewalled-server value="true" />
+
+    <!-- No server owner in lobby which can control the starting of game or kick any players. -->
+    <owner-less value="false" />
+
+    <!-- Time to wait before entering kart selection screen if satisfied min-start-game-players below for owner less or ranked server. -->
+    <start-game-counter value="30" />
+
+    <!-- Only auto start kart selection when number of connected player is larger than or equals this value, for owner less or ranked server, after start-game-counter reaches 0. -->
+    <min-start-game-players value="2" />
+
+    <!-- Automatically end linear race game after 1st player finished for some time (currently his finished time * 0.25 + 15.0). -->
+    <auto-end value="false" />
+
+    <!-- Enable team choosing in lobby in team game (soccer and CTF). If owner-less is enabled, than this option is always disabled. -->
+    <team-choosing value="true" />
+
+    <!-- Server will submit ranking to stk addons server for linear race games, you require permission for that. validating-player, auto-end and owner-less will be turned on. -->
+    <ranked value="false" />
+
+    <!-- Time in seconds when a flag is dropped a by player in CTF returning to its own base. -->
+    <flag-return-timemout value="20" />
+
+    <!-- Value used to calculate hit limit in free for all, which is min(number of players * hit-limit-threshold, 40), negative value to disable hit limit. -->
+    <hit-limit-threshold value="5" />
+
+    <!-- Value used to calculate time limit in free for all, which is max(number of players * time-limit-threshold-ffa, 3.0) * 60, negative value to disable time limit. -->
+    <time-limit-threshold-ffa value="0.7" />
+
+    <!-- Value used to calculate capture limit in CTF, which is max(3.0, number of players * capture-limit-threshold), negative value to disable capture limit. -->
+    <capture-limit-threshold value="0.7" />
+
+    <!-- Value used to calculate time limit in CTF, which is max(3.0, number of players * (time-limit-threshold-ctf + flag-return-timemout / 60.0)) * 60.0, negative value to disable time limit. -->
+    <time-limit-threshold-ctf value="0.9" />
+
+    <!-- Value used by server to automatically calculate lap of each race in network game, if more than 0.0f, the number of lap of each track vote in linear race will be determined by max(1.0f, auto-lap-ratio * default lap of that track). -->
+    <auto-lap-ratio value="-1" />
+
+    <!-- Maximum ping allowed for a player (in ms). -->
+    <max-ping value="300" />
+
+    <!-- Tolerance of jitter in network allowed (in ms). -->
+    <jitter-tolerance value="100" />
+
+    <!-- Kick players whose ping is above max-ping. -->
+    <kick-high-ping-players value="false" />
+
+    <!-- ip: IP in X.X.X.X/Y (CIDR) format for banning, use Y of 32 for a specific ip, expired-time: unix timestamp to expire, if -1 (uint32_t max) than a permanent ban. -->
+    <server-ip-ban-list>
+        <ban ip="0.0.0.0/0" expired-time="0"/>
+    </server-ip-ban-list>
+
+    <!-- online-id: online id for banning, expired-time: unix timestamp to expire, if -1 (uint32_t max) than a permanent ban. -->
+    <server-online-id-ban-list>
+        <ban online-id="0" expired-time="0"/>
+    </server-online-id-ban-list>
+
+</server-config>
+
+
+```
+
+At the moment STK has a list of STUN servers for NAT penetration which allows players or servers behind a firewall or router to be able to connect to each other, but in case it doesn't work, you have to manually disable the firewall or port forward the port(s) used by the STK.
+By default STK servers use port `2759`. For example, in Ubuntu based distributions, run the following command to disable the firewall on that port:
+
+`sudo ufw allow 2759`
+
+You may also need to handle the server discovery port `2757` for connecting your WAN server in LAN / localhost.
+
+Notice: You don't need to make any firewall or router configuration changes if you connect to our official servers.
+
+### Hosting LAN (local internet) server
+Everything is basically the same as WAN one, except you don't need an stk online account, just do:
+
+`supertuxkart --server-config=your_config.xml --lan-server=your_server_name --network-console`
+
+In LAN network it is required that the server and server discovery port is connectable by clients directly, no NAT penetration will be done in LAN.
+
+------
+After the first time configuration, you can just start the server with the command:
+
+`supertuxkart --server-config=your_config.xml`, regardless of whether LAN or WAN server is chosen (of course you need to have a saved user for the WAN one), by default your server logging will be saved to the STK configuration directory with a name of `your_config.log`, given that the server configuration filename is `your_config.xml`.
+
+You can find out that directory location [here (See Where is the configuration stored?)](https://supertuxkart.net/FAQ)
+
+## Testing server
+There is a network AI tester in STK which can use AI on player controller for server hosting linear races game mode, which helps automating the testing for servers, to enable it use:
+
+`supertuxkart --connect-now=x.x.x.x:y --server-id=id --network-ai=n --auto-connect --no-graphics`
+
+x.x.x.x:y is your server ip address with its port, id is the id field of server-info in STK server xml list, omit it if you are testing LAN server, n is the number of AI you want to create.
+
+You can see STK server xml list [here](https://addons.supertuxkart.net/api/v2/server/get-all).
+
+The server you want to test must be able to be connected without NAT penetration. You can remove `--auto-connect` if you have another client which can control the starting of games in server, or you can consider enable owner-less mode on server so the games on server can keep going. Remove `--no-graphics` if you want to see the AI racing. You can also run network AI tester in server-only build of STK.
+
+With the network AI tester, it's easier to for example simulate high-loaded servers or bad (high ping with packet loss) network.
+
+Tested on a Raspberry Pi 3 Model B+, if you have 8 players connected to a server hosted on it, the usage of a single CPU core is ~60% and there are ~60MB of memory usage for game with heavy tracks like Cocoa Temple or Candela City on the server, you can use the above figures to consider number of STK servers hosting on a same computer.
+
+For bad network simulation, we recommend `network traffic control` by linux kernel, see [here](https://wiki.linuxfoundation.org/networking/netem) for details.
+
+You have the best gaming experience when choosing server less than 100ms ping with no packet loss.

README.md

@@ -10,7 +10,7 @@ The SuperTuxKart homepage can be found at <https://supertuxkart.net/>. There is
 ## Hardware Requirements
 To run SuperTuxKart, make sure that your computer's specifications are equal or higher than the following specifications:
 
-* A graphics card capable of 3D rendering - NVIDIA GeForce 8 series and newer (GeForce 8100 or newer), AMD/ATI Radeon HD 4000 series and newer, Intel HD Graphics 3000 and newer. OpenGL >= 3.1
+* A graphics card capable of 3D rendering - NVIDIA GeForce 8 series and newer (GeForce 8100 or newer), AMD/ATI Radeon HD 4000 series and newer, Intel HD Graphics 3000 and newer. OpenGL >= 3.3
 * You should have a CPU that's running at 1 GHz or faster. 
 * You'll need at least 512 MB of free VRAM (video memory).
 * Minimum disk space: 800 MB 
@@ -30,196 +30,4 @@ The export utilities  perform the needed transformation, so in Blender you just
 
 ## Building from source
 
-In order to build SuperTuxKart from source, you'll need both the code and the assets (See <https://supertuxkart.net/Source_control> for more information):
-
-```bash
-git clone https://github.com/supertuxkart/stk-code stk-code
-svn co https://svn.code.sf.net/p/supertuxkart/code/stk-assets stk-assets
-```
-
-## Building SuperTuxKart on Linux
-
-### Dependencies
-
-To build SuperTuxKart from source, you'll need to 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:
-
-```bash
-sudo apt-get install build-essential cmake libbluetooth-dev \
-libcurl4-gnutls-dev libfreetype6-dev libfribidi-dev libgl1-mesa-dev \
-libjpeg-dev libogg-dev libopenal-dev libpng-dev libvorbis-dev libxrandr-dev \
-mesa-common-dev pkg-config zlib1g-dev
-```
-### In-game recorder
-
-In order to build the in-game recorder for STK, you have to install
-libopenglrecorder from your distribution, or compile it yourself from [here](https://github.com/Benau/libopenglrecorder).
-Compilation instruction is explained there. If you don't need this feature, pass `-DBUILD_RECORDER=off` to cmake.
-
-### Compiling
-
-Run the following commands inside `stk-code` directory to compile SuperTuxKart:
-
-```bash
-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, run:
-
-```bash
-cmake .. -DCMAKE_BUILD_TYPE=Debug
-```
-
-You can install your build system-wide:
-
-```bash
-sudo make install
-```
-
-The default install location is `/usr/local`, i.e. the data files will
-be written to `/usr/local/share/games/supertuxkart`, the executable
-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 SuperTuxKart on Windows
-To Build SuperTuxKart on Windows, follow these instructions:
-
-1. Download and install Visual Studio from here: [Visual Studio - Download](https://www.visualstudio.com/downloads/). The free Visual Studio Community edition works fine.
-2. Download the SuperTuxKart source package from either [SuperTuxKart download area - SourceForge.net](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/0.9.2) or [SuperTuxKart.net - Source Control](https://supertuxkart.net/Source_control), and unpack it. 
-*Note: If you downloaded the source package from here: [SuperTuxKart.net - Source Control](https://supertuxkart.net/Source_control), then both `stk-code` and `stk-assets` **must** be in the same directory, otherwise the build can result in failure*
-3. Download the Windows dependencies package from either [SuperTuxKart download area: Dependecies - SourceForge.net](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/Windows/)
-or [SuperTuxKart on GitHub - Dependencies](https://github.com/supertuxkart/dependencies), and unpack it; then, copy the `dependencies` directory from either the `windows` or the `windows_64bit` directories into the `stk-code` directory, rename it to `dependencies-64bit` if you want to compile a 64bit build.
-4. Download CMake from here: [CMake - download page](https://cmake.org/download/), install it; once CMake is installed, double click on the CMake icon on your desktop, and point it towards your `stk-code` directory in the 'Where is the source code' field, and point it to a directory called `build` or `bld` inside the stk-code directory.
-5. Press 'Configure'; CMake will ask you if it is OK to create the aformentioned directory, press `Yes`. CMake will then ask you about your version of Visual Studio. 
-Confirm your selection; *Please look at the table below to avoid confusion between version numbers and releases of Visual Studio*;
-CMake will begin creating the required files for the build in the directory.
-6. Navigate to your build directory and open the `SuperTuxKart.sln` file; Visual Studio will now load the solution. 
-7. In the 'Solution Explorer', right click on the `supertuxkart` project and select "Set as StartUp project"
-8. Open the 'Build' menu and select 'Build Solution'; or, press the default keyboard shortcut: `CTRL + SHIFT + B` to build the solution.
-
-*Note: To avoid confusion between releases and versions, refer to this table:*
-
-Visual Studio Release | Version
-----------------------|------------
-Visual Studio 2017| 15
-Visual Studio 2015| 14
-Visual Studio 2013| 13
-
-## Building SuperTuxKart on Windows (from PowerShell/Command line)
-1. Download and install Visual Studio from here: [Visual Studio - Download](https://www.visualstudio.com/downloads/), the free Visual Studio Community edition works fine.
-
-2. Download a source package from either [SuperTuxKart 0.9.2 download area - SourceForge.net](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/0.9.2) or [SuperTuxKart.net - Source Control](https://supertuxkart.net/Source_control)
-NOTE: the `stk-code` and `stk-assets` directories **must** be in the same directory 
-3. Download the Windows dependencies package from either [SuperTuxKart download area - SourceForge.net](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/Windows/)
-or [SuperTuxKart on GitHub - Dependencies](https://github.com/supertuxkart/dependencies)
-and unpack the archive; once unpacked, copy the `dependencies` directory from either the `windows` or the `windows_64bit` directories into the `stk-code` directory
-4. Download CMake from here: [CMake - download page](https://cmake.org/download/); and install it. Navigate to the `stk-code` directory; and create an directory called "build":
-```cmd
-mkdir build
-cd build
-```
-5. Once inside the build directory; run CMake to start the compilation process:
-```cmd
-cmake ..
-```
-6. Now that CMake finished configuring and creating the necessary files for the build, run the build command in the same directory:
-```cmd
-msbuild.exe SuperTuxKart.sln 
-``` 
-SuperTuxKart can now be run as `bin\Debug\supertuxkart.exe` or `bin\Release\supertuxkart.exe` 
-
-## Building SuperTuxKart on macOS
-
-### Getting Started
-
-Install the developer tools, either from the OS X Install DVD or from Apple's website.
-
-If you have never built anything before, you have create `/usr/local/include/` first:
-
-```bash
-sudo mkdir -p /usr/local/include/
-```
-
-Symlink the `include`-folder of OpenGL framework to `/usr/local/include/GL` (Unix programs have an easier time finding it this way):
-
-```bash
-sudo ln -s /System/Library/Frameworks/OpenGL.framework/Versions/A/Headers/ /usr/local/include/GL
-```
-
-On OS X 10.9.5, you might need the following workaround:
-
-```bash
-sudo ln -s `xcrun --show-sdk-path`/usr/include/ /usr/include
-sudo ln -s `xcrun --show-sdk-path`/System/Library/Frameworks/OpenGL.framework/Headers/ /usr/local/include/OpenGL
-```
-
-The first link is required in order to find libcurl, the second to find opengl.
-
-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:
-
-```bash
-mkdir cmake_build
-cd cmake_build
-cmake ..
-make
-```
-
-With GCC:
-```bash
-mkdir cmake_build
-cd cmake_build
-cmake .. -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_C_COMPILER=/usr/bin/gcc
-make
-```
-
-Building on 10.10 with 10.9 compatibility:
-```bash
-cmake .. -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk  -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9
-```
-
-### Xcode
-
-Place an additional copy of the dependencies into `Users/<YOUR_USERNAME>/Library/Frameworks`.
-Then cd to your cloned stk-code directory and execute the following commands:
-
-```bash
-mkdir xcode_build && cd xcode_build
-cmake .. -GXcode
-```
-
-Use Finder to navigate to your stk-code/xcode_build folder and open the newly generated Xcode project (`SuperTuxKart.xcodeproj`).
-
-You can then build the project in Xcode using Product -> Build
-
-Note: Xcode is much less well tested than makefiles, so there may be issues when trying to use Xcode.
+Building instructions can be found in [`INSTALL.md`](/INSTALL.md)

android/Android.mk

@@ -124,15 +124,15 @@ include $(CLEAR_VARS)
 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_SRC_FILES    := $(wildcard ../lib/irrlicht/source/Irrlicht/*.cpp)         \
+                      $(wildcard ../lib/irrlicht/source/Irrlicht/Android/*.cpp) \
+                      ../lib/irrlicht/source/Irrlicht/stk_android_native_app_glue.c
 LOCAL_CFLAGS       := -I../lib/irrlicht/source/Irrlicht/ \
                       -I../lib/irrlicht/include/         \
                       -Iobj/jpeglib/                     \
                       -Iobj/libpng/                      \
-                      -Iobj/zlib/                        \
-                      -I$(call my-dir)/../../sources/android/native_app_glue
-                      -std=gnu++0x
+                      -Iobj/zlib/                        
+LOCAL_CPPFLAGS     := -std=gnu++0x
 LOCAL_STATIC_LIBRARIES := jpeglib png zlib
 include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
@@ -158,17 +158,19 @@ LOCAL_CFLAGS       := -I../lib/angelscript/include      \
                       -Iobj/libogg/include              \
                       -Iobj/libvorbis/include           \
                       -Iobj/openal/include              \
-                      -I$(call my-dir)/../../sources/android/native_app_glue \
+                      -Iobj/openssl/include             \
                       -DUSE_GLES2      \
-                      -DHAVE_OGGVORBIS \
+                      -DENABLE_SOUND   \
+                      -DENABLE_CRYPTO_OPENSSL           \
                       -DNDEBUG         \
-                      -std=gnu++0x
+                      -DANDROID_PACKAGE_NAME=\"$(PACKAGE_NAME)\"    \
+                      -DANDROID_APP_DIR_NAME=\"$(APP_DIR_NAME)\"    \
+                      -DSUPERTUXKART_VERSION=\"$(PROJECT_VERSION)\"
+LOCAL_CPPFLAGS     := -std=gnu++0x
 
 LOCAL_STATIC_LIBRARIES := irrlicht bullet enet freetype ifaddrs angelscript  \
                           vorbisfile vorbis ogg openal curl libssl libcrypto \
-                          gnustl_static android_native_app_glue
+                          gnustl_static
 
 include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
-
-$(call import-module,android/native_app_glue)

android/AndroidManifest.xml

@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.supertuxkart.stk"
+          package="org.supertuxkart.stk_dbg"
           android:versionCode="1"
-          android:versionName="1.0"
+          android:versionName="git"
           android:installLocation="auto">
 
     <!-- This .apk has no Java code itself, so set hasCode to false. -->
     <application android:label="@string/app_name"
                  android:icon="@drawable/icon"
+                 android:banner="@drawable/banner"
                  android:hasCode="false"
-                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                 android:hardwareAccelerated="true">
+                 android:isGame="true"
+                 android:theme="@android:style/Theme.DeviceDefault.NoActionBar.TranslucentDecor"
+                 android:hardwareAccelerated="true"
+                 android:resizeableActivity="false">
 
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"
@@ -24,15 +27,18 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
 
-    <uses-sdk android:minSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="19" 
+              android:targetSdkVersion="26" />
     <uses-feature android:glEsVersion="0x00020000" />
+    <uses-feature android:name="android.software.leanback" android:required="false" />
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+    <uses-feature android:name="android.hardware.gamepad" android:required="false"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.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>

android/README.ANDROID

@@ -32,7 +32,7 @@ after some tweaks, but atm. only linux is supported.
 Dependencies list (may be incomplete):
 
     autoconf, automake, make, python, gradle, ant, imagemagick, cmake, 
-    vorbis-tools
+    vorbis-tools, pngquant
 
 Additionally some dependencies for optimize_data script:
 
@@ -44,13 +44,12 @@ and extract it to stk-code/lib. It contains sources of libraries that are used
 in STK, but are not availiable in stk-code repository (curl, freetype, openal).
 
 You need also Android SDK for android-19 platform (the API for Android 4.4) and
-Android NDK. Note that NDK >= r15b is atm. not supported. Version r12b is
+Android NDK. Note that NDK >= r15 is atm. not supported. Version r12b is
 strongly recommended, because it's known that it works without issues.
 
 You need to create proper "android-sdk" and "android-ndk" symlinks in the
 directory with Android project, so that the compilation script will have access
-to the SDK and NDK. These paths can be also set in SDK_PATH and NDK_PATH 
-environmental variables.
+to the SDK and NDK.
 
 Before running the compilation, run the generate_assets script, so that
 selected assets will be copied to "assets" directory, and then included in the
@@ -67,22 +66,6 @@ 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.
-
-Additionally you can choose the build tool by setting BUILD_TOOL environment
-variable to "gradle" or "ant". Note that ant has been already removed from
-Android SDK, so you have to use SDK <= 25.2.5 for building with ant. By default 
-the BUILD_TOOL is set to "gradle".
-
-You can override the SDK build-tools version by setting the BUILD_TOOLS_VER
-environment variable.
-
 Basically if all dependencies are installed in the system, it should be enough
 to just run:
 
@@ -93,6 +76,41 @@ to just run:
 
 
 
+--------------------------------------------------------------------------------
+ ENVIRONMENT VARIABLES
+--------------------------------------------------------------------------------
+
+COMPILE_ARCH    - Allows to choose CPU architecture for which the package will
+                  be compiled. 
+                  Possible values: armv7, aarch64, x86, x86_64.
+                  Default is: armv7.
+
+BUILD_TYPE      - Allows to set build type.
+                  Possible values: debug, release, beta.
+                  Default is: debug.
+
+BUILD_TOOL      - Allows to choose a tool that is used for creating package. 
+                  Note that ant has been already removed from Android SDK, so 
+                  you have to use SDK <= 25.2.5 for building with ant.
+                  Possible values: ant, gradle.
+                  Default is: gradle.
+
+BUILD_TOOLS_VER - Allows to override the SDK build-tools version.
+
+SDK_PATH        - Path to SDK directory
+
+NDK_PATH        - Path to NDK directory
+
+PROJECT_VERSION - Set Supertuxkart version number, for example "0.9.3" or 
+                  "git20170409" or whatever. 
+                  Default is: git.
+
+PROJECT_CODE    - Set Supertuxkart version code that is used in the manifest 
+                  file.
+                  Default is: 1.
+
+
+
 --------------------------------------------------------------------------------
  RELEASE BUILD
 --------------------------------------------------------------------------------
@@ -100,29 +118,13 @@ to just run:
 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
+You have to set PROJECT_VERSION variable. This is important, because assets 
+manager in STK checks that value and detects if already extracted data files are
 up to date. So that when you will install new STK version, this will force new 
 data extraction automatically.
 
-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"
-
+The PROJECT_CODE variable typically should be set to a value higher than for
+previous release, so that users will receive the upgrade.
 
 Before compilation you have to set:
 
@@ -143,38 +145,3 @@ you have to run:
 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 startup on some devices when aarch64 build is made using
-    Android r13 NDK. The r13 version has rather big modifications (it uses clang
-    instead of gcc by default). This is probably a bug in NDK/compiler/OS, but
-    for this reason using NDK r12 for 64-bit arm compilation is preferred.
-
-5.  Angelscript doesn't have full support for aarch64 builds, so that scripting
-    won't work on this platform.
-    
-6.  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.

android/build.gradle

@@ -15,7 +15,7 @@ apply plugin: 'com.android.application'
 
 android
 {
-    compileSdkVersion sdk_version.toInteger()
+    compileSdkVersion compile_sdk_version.toInteger()
     buildToolsVersion build_tools_ver
 
     sourceSets

android/generate_assets.sh

@@ -14,8 +14,8 @@
 # value greater than 0.
 # The CONVERT_TO_JPG variable enables converting all images that are safe to 
 # convert and keeps other images untouched.
-# The script needs imagemagick and ogg utils installed to use DECREASE_QUALITY
-# feature
+# The script needs imagemagick, pngquant and ogg utils installed in order to 
+# use DECREASE_QUALITY feature
 
 ################################################################################
 
@@ -43,7 +43,8 @@ export RUN_OPTIMIZE_SCRIPT=0
 export DECREASE_QUALITY=1
 export CONVERT_TO_JPG=1
 
-export CONVERT_TO_JPG_BLACKLIST="data/karts/hexley/hexley_kart_diffuse.png"
+export CONVERT_TO_JPG_BLACKLIST="data/karts/hexley/hexley_kart_diffuse.png \
+                                 data/models/traffic_light.png"
 
 export BLACKLIST_FILES="data/music/cocoa_river_fast.ogg2"
 
@@ -179,6 +180,9 @@ convert_image()
         echo "Couldn't convert $FILE file"
         return
     fi
+    
+    SCALE_CMD=""
+    QUALITY_CMD=""
 
     if [ $W -gt $TEXTURE_SIZE ] || [ $H -gt $TEXTURE_SIZE ]; then
         if [ $W -gt $H ]; then
@@ -199,7 +203,7 @@ convert_image()
     fi
 
     convert $SCALE_CMD $QUALITY_CMD "$FILE" "tmp.$FILE_TYPE"
-
+    
     if [ -s "tmp.$FILE_TYPE" ]; then
         SIZE_OLD=`du -k "$FILE" | cut -f1`
         SIZE_NEW=`du -k "tmp.$FILE_TYPE" | cut -f1`
@@ -255,10 +259,23 @@ convert_sound()
     rm -f tmp.wav tmp.ogg
 }
 
+optimize_png()
+{
+    FILE="$1"
+    echo "Optimize file: $FILE"
+
+    if [ ! -f "$FILE" ]; then
+        echo "  File doesn't exist."
+        return
+    fi
+    
+    pngquant --force --skip-if-larger --output "$FILE" -- "$FILE"
+}
+
 convert_to_jpg()
 {
     FILE="$1"
-    echo "Convert file: $FILE"
+    echo "Convert file to jpg: $FILE"
 
     if [ ! -f "$FILE" ]; then
         echo "  File doesn't exist."
@@ -343,7 +360,7 @@ convert_to_jpg()
 convert_to_jpg_extract_b3dz()
 {
     FILE="$1"
-    echo "Convert file: $FILE"
+    echo "Extract b3dz file: $FILE"
 
     if [ ! -f "$FILE" ]; then
         echo "  File doesn't exist."
@@ -364,7 +381,7 @@ convert_to_jpg_extract_b3dz()
 convert_to_jpg_update_b3d()
 {
     FILE="$1"
-    echo "Convert file: $FILE"
+    echo "Update b3d file: $FILE"
 
     if [ ! -f "$1" ]; then
         echo "  File doesn't exist."
@@ -444,7 +461,7 @@ convert_to_jpg_update_b3d()
 convert_to_jpg_update_spm()
 {
     FILE="$1"
-    echo "Convert file: $FILE"
+    echo "Update spm file: $FILE"
 
     if [ ! -f "$1" ]; then
         echo "  File doesn't exist."
@@ -516,7 +533,7 @@ convert_to_jpg_update_spm()
 convert_to_jpg_update_xml()
 {
     FILE="$1"
-    echo "Convert file: $FILE"
+    echo "Update xml file: $FILE"
 
     if [ ! -f "$FILE" ]; then
         echo "  File doesn't exist."
@@ -564,6 +581,10 @@ if [ $CONVERT_TO_JPG -gt 0 ]; then
     fi
 fi
 
+if [ $DECREASE_QUALITY -gt 0 ]; then
+    find assets/data -iname "*.png" | while read f; do optimize_png "$f" "png"; done
+fi
+
 
 # Copy data directory
 echo "Copy data directory"

android/make.sh

@@ -22,19 +22,48 @@ export NDK_ABI_ARMV7=armeabi-v7a
 export ARCH_ARMV7=arm
 export HOST_ARMV7=arm-linux-androideabi
 export NDK_PLATFORM_ARMV7=android-19
-export SDK_VERSION_ARMV7=19
-
-export NDK_ABI_X86=x86
-export ARCH_X86=x86
-export HOST_X86=i686-linux-android
-export NDK_PLATFORM_X86=android-19
-export SDK_VERSION_X86=19
+export MIN_SDK_VERSION_ARMV7=19
+export TARGET_SDK_VERSION_ARMV7=26
+export COMPILE_SDK_VERSION_ARMV7=26
 
 export NDK_ABI_AARCH64=arm64-v8a
 export ARCH_AARCH64=arm64
 export HOST_AARCH64=aarch64-linux-android
 export NDK_PLATFORM_AARCH64=android-21
-export SDK_VERSION_AARCH64=21
+export MIN_SDK_VERSION_AARCH64=21
+export TARGET_SDK_VERSION_AARCH64=26
+export COMPILE_SDK_VERSION_AARCH64=26
+
+export NDK_ABI_X86=x86
+export ARCH_X86=x86
+export HOST_X86=i686-linux-android
+export NDK_PLATFORM_X86=android-19
+export MIN_SDK_VERSION_X86=19
+export TARGET_SDK_VERSION_X86=26
+export COMPILE_SDK_VERSION_X86=26
+
+export NDK_ABI_X86_64=x86_64
+export ARCH_X86_64=x86_64
+export HOST_X86_64=x86_64-linux-android
+export NDK_PLATFORM_X86_64=android-21
+export MIN_SDK_VERSION_X86_64=21
+export TARGET_SDK_VERSION_X86_64=26
+export COMPILE_SDK_VERSION_X86_64=26
+
+export APP_NAME_RELEASE="SuperTuxKart"
+export PACKAGE_NAME_RELEASE="org.supertuxkart.stk"
+export APP_DIR_NAME_RELEASE="supertuxkart"
+export APP_ICON_RELEASE="$DIRNAME/icon.png"
+
+export APP_NAME_BETA="SuperTuxKart Beta"
+export PACKAGE_NAME_BETA="org.supertuxkart.stk_beta"
+export APP_DIR_NAME_BETA="supertuxkart-beta"
+export APP_ICON_BETA="$DIRNAME/icon-dbg.png"
+
+export APP_NAME_DEBUG="SuperTuxKart Debug"
+export PACKAGE_NAME_DEBUG="org.supertuxkart.stk_dbg"
+export APP_DIR_NAME_DEBUG="supertuxkart-dbg"
+export APP_ICON_DEBUG="$DIRNAME/icon-dbg.png"
 
 
 # A helper function that checks if error ocurred
@@ -48,11 +77,12 @@ check_error()
 
 # Handle clean command
 if [ ! -z "$1" ] && [ "$1" = "clean" ]; then
-    rm -rf bin
-    rm -rf build
-    rm -rf libs
-    rm -rf obj
-    rm -rf .gradle
+    rm -rf "$DIRNAME/bin"
+    rm -rf "$DIRNAME/build"
+    rm -rf "$DIRNAME/libs"
+    rm -rf "$DIRNAME/obj"
+    rm -rf "$DIRNAME/res"
+    rm -rf "$DIRNAME/.gradle"
     exit
 fi
 
@@ -80,22 +110,36 @@ if [ "$COMPILE_ARCH" = "armv7" ]; then
     export NDK_ABI=$NDK_ABI_ARMV7
     export ARCH=$ARCH_ARMV7
     export HOST=$HOST_ARMV7
-    export SDK_VERSION=$SDK_VERSION_ARMV7
-elif [ "$COMPILE_ARCH" = "x86" ]; then
-    export NDK_PLATFORM=$NDK_PLATFORM_X86
-    export NDK_ABI=$NDK_ABI_X86
-    export ARCH=$ARCH_X86
-    export HOST=$HOST_X86
-    export SDK_VERSION=$SDK_VERSION_X86
+    export MIN_SDK_VERSION=$MIN_SDK_VERSION_ARMV7
+    export TARGET_SDK_VERSION=$TARGET_SDK_VERSION_ARMV7
+    export COMPILE_SDK_VERSION=$COMPILE_SDK_VERSION_ARMV7
 elif [ "$COMPILE_ARCH" = "aarch64" ]; then
     export NDK_PLATFORM=$NDK_PLATFORM_AARCH64
     export NDK_ABI=$NDK_ABI_AARCH64
     export ARCH=$ARCH_AARCH64
     export HOST=$HOST_AARCH64
-    export SDK_VERSION=$SDK_VERSION_AARCH64
+    export MIN_SDK_VERSION=$MIN_SDK_VERSION_AARCH64
+    export TARGET_SDK_VERSION=$TARGET_SDK_VERSION_AARCH64
+    export COMPILE_SDK_VERSION=$COMPILE_SDK_VERSION_AARCH64
+elif [ "$COMPILE_ARCH" = "x86" ]; then
+    export NDK_PLATFORM=$NDK_PLATFORM_X86
+    export NDK_ABI=$NDK_ABI_X86
+    export ARCH=$ARCH_X86
+    export HOST=$HOST_X86
+    export MIN_SDK_VERSION=$MIN_SDK_VERSION_X86
+    export TARGET_SDK_VERSION=$TARGET_SDK_VERSION_X86
+    export COMPILE_SDK_VERSION=$COMPILE_SDK_VERSION_X86
+elif [ "$COMPILE_ARCH" = "x86_64" ]; then
+    export NDK_PLATFORM=$NDK_PLATFORM_X86_64
+    export NDK_ABI=$NDK_ABI_X86_64
+    export ARCH=$ARCH_X86_64
+    export HOST=$HOST_X86_64
+    export MIN_SDK_VERSION=$MIN_SDK_VERSION_X86_64
+    export TARGET_SDK_VERSION=$TARGET_SDK_VERSION_X86_64
+    export COMPILE_SDK_VERSION=$COMPILE_SDK_VERSION_X86_64
 else
     echo "Unknow COMPILE_ARCH: $COMPILE_ARCH. Possible values are: " \
-         "armv7, aarch64, x86"
+         "armv7, aarch64, x86, x86_64"
     exit
 fi
 
@@ -108,10 +152,26 @@ if [ "$BUILD_TYPE" = "debug" ] || [ "$BUILD_TYPE" = "Debug" ]; then
     export ANT_BUILD_TYPE="debug"
     export GRADLE_BUILD_TYPE="assembleDebug"
     export IS_DEBUG_BUILD=1
+    export APP_NAME="$APP_NAME_DEBUG"
+    export PACKAGE_NAME="$PACKAGE_NAME_DEBUG"
+    export APP_DIR_NAME="$APP_DIR_NAME_DEBUG"
+    export APP_ICON="$APP_ICON_DEBUG"
 elif [ "$BUILD_TYPE" = "release" ] || [ "$BUILD_TYPE" = "Release" ]; then
     export ANT_BUILD_TYPE="release"
     export GRADLE_BUILD_TYPE="assembleRelease"
     export IS_DEBUG_BUILD=0
+    export APP_NAME="$APP_NAME_RELEASE"
+    export PACKAGE_NAME="$PACKAGE_NAME_RELEASE"
+    export APP_DIR_NAME="$APP_DIR_NAME_RELEASE"
+    export APP_ICON="$APP_ICON_RELEASE"
+elif [ "$BUILD_TYPE" = "beta" ] || [ "$BUILD_TYPE" = "Beta" ]; then
+    export ANT_BUILD_TYPE="release"
+    export GRADLE_BUILD_TYPE="assembleRelease"
+    export IS_DEBUG_BUILD=0
+    export APP_NAME="$APP_NAME_BETA"
+    export PACKAGE_NAME="$PACKAGE_NAME_BETA"
+    export APP_DIR_NAME="$APP_DIR_NAME_BETA"
+    export APP_ICON="$APP_ICON_BETA"
 else
     echo "Unsupported BUILD_TYPE: $BUILD_TYPE. Possible values are: " \
          "debug, release"
@@ -172,6 +232,44 @@ if [ -z "$BUILD_TOOLS_VER" ] || [ ! -d "$SDK_PATH/build-tools/$BUILD_TOOLS_VER"
     exit
 fi
 
+# Set project version and code
+if [ -f "$DIRNAME/obj/project_version" ]; then
+    PROJECT_VERSION_PREV=$(cat "$DIRNAME/obj/project_version") 
+    
+    if [ -z "$PROJECT_VERSION" ]; then
+        export PROJECT_VERSION="$PROJECT_VERSION_PREV"
+    elif [ "$PROJECT_VERSION" != "$PROJECT_VERSION_PREV" ]; then
+        echo "Different project version has been set. Forcing recompilation..."
+        touch -c "$DIRNAME/Android.mk"
+    fi
+fi
+
+if [ -z "$PROJECT_VERSION" ]; then
+    if [ $IS_DEBUG_BUILD -ne 0 ]; then
+        export PROJECT_VERSION="git"
+    else
+        echo "Error: Variable PROJECT_VERSION is not set. It must have unique" \
+             "value for release build."
+        exit
+    fi
+fi
+
+if [ -z "$PROJECT_CODE" ]; then
+    if [ $IS_DEBUG_BUILD -ne 0 ]; then
+        PROJECT_CODE="1"
+    else
+        echo "Error: Variable PROJECT_CODE is not set."
+        exit
+    fi
+fi
+
+if [ -d "$DIRNAME/assets/data" ]; then
+    if [ ! -f "$DIRNAME/assets/data/supertuxkart.$PROJECT_VERSION" ]; then
+        echo "Error: supertuxkart.$PROJECT_VERSION doesn't exist in" \
+             "assets/data directory."
+        exit
+    fi
+fi
 
 # Standalone toolchain
 if [ ! -f "$DIRNAME/obj/make_standalone_toolchain.stamp" ]; then
@@ -186,6 +284,8 @@ if [ ! -f "$DIRNAME/obj/make_standalone_toolchain.stamp" ]; then
     echo $COMPILE_ARCH > "$DIRNAME/obj/compile_arch"
 fi
 
+echo "$PROJECT_VERSION" > "$DIRNAME/obj/project_version"
+
 # Freetype
 if [ ! -f "$DIRNAME/obj/freetype.stamp" ]; then
     echo "Compiling freetype"
@@ -272,8 +372,8 @@ if [ ! -f "$DIRNAME/obj/curl.stamp" ]; then
     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"          \
+    CPPFLAGS="-I$DIRNAME/obj/openssl/include -I$DIRNAME/obj/zlib $CPPFLAGS" \
+    LDFLAGS="-L$DIRNAME/obj/openssl/ -L$DIRNAME/obj/zlib $LDFLAGS"          \
     ./configure --host=$HOST                            \
                 --with-ssl                              \
                 --disable-shared                        \
@@ -342,18 +442,55 @@ check_error
 # Build apk
 echo "Building APK"
 
-sed -i "s/minSdkVersion=\".*\"/minSdkVersion=\"$SDK_VERSION\"/g" \
-       "$DIRNAME/AndroidManifest.xml"
+mkdir -p "$DIRNAME/res/drawable/"
+mkdir -p "$DIRNAME/res/drawable-hdpi/"
+mkdir -p "$DIRNAME/res/drawable-mdpi/"
+mkdir -p "$DIRNAME/res/drawable-xhdpi/"
+mkdir -p "$DIRNAME/res/drawable-xxhdpi/"
+mkdir -p "$DIRNAME/res/values/"
 
+STRINGS_FILE="$DIRNAME/res/values/strings.xml"
+
+echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>"       >  "$STRINGS_FILE"
+echo "<resources>"                                      >> "$STRINGS_FILE"
+echo "    <string name=\"app_name\">$APP_NAME</string>" >> "$STRINGS_FILE"
+echo "</resources>"                                     >> "$STRINGS_FILE"
+
+sed -i "s/minSdkVersion=\".*\"/minSdkVersion=\"$MIN_SDK_VERSION\"/g" \
+       "$DIRNAME/AndroidManifest.xml"
+       
+sed -i "s/targetSdkVersion=\".*\"/targetSdkVersion=\"$TARGET_SDK_VERSION\"/g" \
+       "$DIRNAME/AndroidManifest.xml"
+       
+sed -i "s/package=\".*\"/package=\"$PACKAGE_NAME\"/g" \
+       "$DIRNAME/AndroidManifest.xml"
+       
+sed -i "s/versionName=\".*\"/versionName=\"$PROJECT_VERSION\"/g" \
+       "$DIRNAME/AndroidManifest.xml"
+       
+sed -i "s/versionCode=\".*\"/versionCode=\"$PROJECT_CODE\"/g" \
+       "$DIRNAME/AndroidManifest.xml"
+       
+cp "banner.png" "$DIRNAME/res/drawable/banner.png"
+cp "$APP_ICON" "$DIRNAME/res/drawable/icon.png"
+convert -scale 72x72 "$APP_ICON" "$DIRNAME/res/drawable-hdpi/icon.png"
+convert -scale 48x48 "$APP_ICON" "$DIRNAME/res/drawable-mdpi/icon.png"
+convert -scale 96x96 "$APP_ICON" "$DIRNAME/res/drawable-xhdpi/icon.png"
+convert -scale 144x144 "$APP_ICON" "$DIRNAME/res/drawable-xxhdpi/icon.png"
+
+if [ -f "/usr/lib/jvm/java-8-openjdk-amd64/bin/java" ]; then
+    export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64"
+    export PATH=$JAVA_HOME/bin:$PATH
+fi
 
 if [ "$BUILD_TOOL" = "gradle" ]; then
     export ANDROID_HOME="$SDK_PATH"
-    gradle -Psdk_version=$SDK_VERSION           \
-           -Pbuild_tools_ver="$BUILD_TOOLS_VER" \
+    gradle -Pcompile_sdk_version=$COMPILE_SDK_VERSION \
+           -Pbuild_tools_ver="$BUILD_TOOLS_VER"       \
            $GRADLE_BUILD_TYPE
 elif [ "$BUILD_TOOL" = "ant" ]; then
     ant -Dsdk.dir="$SDK_PATH"  \
-        -Dtarget=$NDK_PLATFORM \
+        -Dtarget="android-$TARGET_SDK_VERSION" \
         $ANT_BUILD_TYPE
 fi
 

android/res/values/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">SuperTuxKart</string>
-</resources>

cmake/FindFribidi.cmake

@@ -9,14 +9,7 @@
 # FRIBIDI_LIBRARIES
 #     Fribidi library list
 
-if(APPLE)
-    set(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h PATHS /Library/Frameworks/fribidi.framework/Headers)
-    find_library(FRIBIDI_LIBRARY NAMES fribidi PATHS /Library/Frameworks/fribidi.framework)
-    set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
-    include_directories(/Library/Frameworks/fribidi.framework/Headers)
-    #add_definitions(-framework fribidi)
-    set(FRIBIDI_FOUND 1)
-elseif(UNIX)
+if(UNIX AND NOT APPLE)
     include(FindPkgConfig)
     pkg_check_modules(FRIBIDI fribidi)
 else()

cmake/FindOggVorbis.cmake

@@ -17,20 +17,6 @@ find_library(OGGVORBIS_VORBIS_LIBRARY NAMES vorbis Vorbis libvorbis PATHS "${PRO
 find_library(OGGVORBIS_VORBISFILE_LIBRARY NAMES vorbisfile libvorbisfile PATHS "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib")
 find_library(OGGVORBIS_VORBISENC_LIBRARY NAMES vorbisenc libvorbisenc PATHS "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/lib")
 
-if (APPLE)
-    set(OGGVORBIS_OGG_INCLUDE_DIR "/Library/Frameworks/Ogg.framework/Headers/")
-    set(OGGVORBIS_VORBIS_INCLUDE_DIR "/Library/Frameworks/Vorbis.framework/Headers/")
-endif()
-
-if(APPLE AND NOT OGGVORBIS_VORBISFILE_LIBRARY)
-    # Seems to be the same on Apple systems
-    set(OGGVORBIS_VORBISFILE_LIBRARY ${OGGVORBIS_VORBIS_LIBRARY})
-endif()
-
-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

cmake/Toolchain-mingw-64bit.cmake

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

cmake/Toolchain-mingw.cmake

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

data/CREDITS

@@ -1,6 +1,6 @@
 = SuperTuxKart =
 A Kart Racing Game Featuring Tux & Friends
-- Version 0.9.3
+- Version $STKVERSION$
 - Visit us at supertuxkart.net
 - SuperTuxKart is released under GPL 3.0
 - Assets are released under Creative Commons and other licenses
@@ -41,7 +41,11 @@ Lead graphical artist
 - Thanks to my family and especially my father
 - Jean Claude Clemençon
 
+= Alayan =
 
+Developer
+- Improved item distribution 
+- AI improvements
 
 = Magne Djupvik (Arthur) =
 
@@ -60,7 +64,6 @@ Add-ons website
 = Additional Programming =
 
 Main Contributors
-- Dawid Gan (deveee) : general improvements and many many bugfixes
 - Marc Coll : Grand Prix editor
 - Flakebi
 - Konstin
@@ -87,7 +90,8 @@ Bug fixes & misc contributions
 - Stephen Dunn (Work on audio)
 - Patrick Ammann
 - Ward Muylaert
-
+- Fantasmos
+- QwertyChouskie
 
 = Visual art =
 

data/SuperTuxKart-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.3</string>
+	<string>0.8.1</string>
 	<key>CFBundleSignature</key>
 	<string>SPTK</string>
 	<key>CFBundleVersion</key>
-	<string>0.9.3</string>
+	<string>0.8.1</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSMinimumSystemVersion</key>

data/challenges/abyss.challenge

@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="abyss" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="abyss" laps="3" reverse="false"/>
     <mode major="single" minor="quickrace"/>
     <requirements trophies="0"/>
     
+    <best>
+        <karts number="7"/>
+        <requirements position="1" time="140"/>
+    </best>
     <hard>
-        <karts number="5"/>
-        <requirements position="1" time="160"/>
+        <karts number="6"/>
+        <requirements position="1" time="165"/>
     </hard>
     <medium>
-        <karts number="4"/>
-        <requirements time="197"/>
+        <karts number="5"/>
+        <requirements position="1"/>
     </medium>
     <easy>
         <karts number="4"/>
-        <requirements time="270"/>
+        <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/candela_city.challenge

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="candela_city" laps="3" reverse="false"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="75"/>
+    
+    <best>
+        <karts number="9"/>
+        <requirements position="1" time="120"/>
+    </best>
+    <hard>
+        <karts number="8"/>
+        <requirements position="1"/>
+    </hard>
+    <medium>
+        <karts number="7"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="6"/>
+        <requirements position="1"/>
+    </easy>
+
+    <unlock kart="sara_the_racer"/>
+</challenge>

data/challenges/city.challenge

@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<challenge version="2">
-    <track id="candela_city" laps="3"/>
-    <mode major="single" minor="quickrace"/>
-    <requirements trophies="70"/>
-    
-    <hard>
-        <karts number="5"/>
-        <requirements position="1"/>
-    </hard>
-    <medium>
-        <karts number="4"/>
-        <requirements position="1"/>
-    </medium>
-    <easy>
-        <karts number="3"/>
-        <requirements position="1"/>
-    </easy>
-
-    <unlock kart="sara_the_wizard"/>
-</challenge>

data/challenges/cocoa_temple.challenge

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="cocoa_temple" laps="3" reverse="false"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="5"/>
+
+    <best>
+        <karts number="8"/>
+        <requirements position="1" time="125"/>
+    </best>
+    <hard>
+        <karts number="7"/>
+        <requirements position="1" time="160"/>
+    </hard>
+    <medium>
+        <karts number="6"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="5"/>
+        <requirements position="1"/>
+    </easy>
+</challenge>

data/challenges/cornfield_crossing.challenge

@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="cornfield_crossing" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="cornfield_crossing" laps="3" reverse="false"/>
     <mode major="single" minor="quickrace"/>
     <requirements trophies="0"/>
     
+    <best>
+        <karts number="7"/>
+        <requirements position="1" time="140"/>
+    </best>
     <hard>
-        <karts number="5"/>
+        <karts number="6"/>
         <requirements position="1" time="165"/>
     </hard>
     <medium>
-        <karts number="4"/>
-        <requirements time="195"/>
+        <karts number="5"/>
+        <requirements position="1"/>
     </medium>
     <easy>
         <karts number="4"/>
-        <requirements time="290"/>
+        <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/fortmagma.challenge

@@ -1,9 +1,14 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="fortmagma" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="fortmagma" laps="3" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="180"/>
+    <requirements trophies="190"/>
     
+    <best>
+        <karts number="2" aiIdent="nolok" superPower="nolokBoss"/>
+        <requirements position="1"/>
+    </best>
     <hard>
         <karts number="2" aiIdent="nolok" superPower="nolokBoss"/>
         <requirements position="1"/>
@@ -19,6 +24,5 @@
 
     <unlock kart="gnu"/>
     <unlock kart="nolok"/>
-    <unlock difficulty="difficulty_best"/>
     <unlock track="fortmagma"/>
 </challenge>

data/challenges/gp1.challenge

@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
+<challenge version="3">
+    <unlock_list list="false"/>
     <grandprix id="1_penguinplayground"/>
     <mode major="grandprix" minor="quickrace"/>
-    <requirements trophies="40"/>
+    <requirements trophies="30"/>
     
+    <best>
+        <karts number="7"/>
+        <requirements position="1"/>
+    </best>
     <hard>
-        <karts number="5"/>
+        <karts number="6"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="4"/>
+        <karts number="5"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="3"/>
+        <karts number="4"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/gp2.challenge

@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
+<challenge version="3">
+    <unlock_list list="false"/>
     <grandprix id="2_offthebeatentrack"/>
     <mode major="grandprix" minor="quickrace"/>
-    <requirements trophies="85"/>
+    <requirements trophies="70"/>
     
+    <best>
+        <karts number="8"/>
+        <requirements position="1"/>
+    </best>
     <hard>
-        <karts number="5"/>
+        <karts number="7"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="4"/>
+        <karts number="6"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="3"/>
+        <karts number="5"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/gp3.challenge

@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
+<challenge version="3">
+    <unlock_list list="false"/>
     <grandprix id="3_tothemoonandback"/>
     <mode major="grandprix" minor="quickrace"/>
-    <requirements trophies="125"/>
+    <requirements trophies="120"/>
     
+    <best>
+        <karts number="9"/>
+        <requirements position="1"/>
+    </best>
     <hard>
-        <karts number="5"/>
+        <karts number="8"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="4"/>
+        <karts number="7"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="3"/>
+        <karts number="6"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/gp4.challenge

@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
+<challenge version="3">
+    <unlock_list list="false"/>
     <grandprix id="4_atworldsend"/>
     <mode major="grandprix" minor="quickrace"/>
     <requirements trophies="165"/>
     
+    <best>
+        <karts number="10"/>
+        <requirements position="1"/>
+    </best>
     <hard>
-        <karts number="5"/>
+        <karts number="9"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="4"/>
+        <karts number="8"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="3"/>
+        <karts number="7"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/granparadiso_island.challenge

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="gran_paradiso_island" laps="3" reverse="false"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="80"/>
+    
+    <best>
+        <karts number="9"/>
+        <requirements position="1" time="145"/>
+    </best>
+    <hard>
+        <karts number="8"/>
+        <requirements position="1"/>
+    </hard>
+    <medium>
+        <karts number="7"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="6"/>
+        <requirements position="1"/>
+    </easy>
+</challenge>

data/challenges/green_valley.challenge

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="greenvalley" laps="3" reverse="false"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="90"/>
+    
+    <best>
+        <karts number="9"/>
+        <requirements position="1"/>
+    </best>
+    <hard>
+        <karts number="8"/>
+        <requirements position="1"/>
+    </hard>
+    <medium>
+        <karts number="7"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="6"/>
+        <requirements position="1"/>
+    </easy>
+</challenge>

data/challenges/hacienda.challenge

@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="hacienda" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="hacienda" laps="3" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="45"/>
+    <requirements trophies="25"/>
     
+    <best>
+        <karts number="8"/>
+        <requirements position="1" time="130"/>
+    </best>
     <hard>
-        <karts number="5"/>
-        <requirements position="2" time="170"/>
+        <karts number="7"/>
+        <requirements position="1" time="160"/>
     </hard>
     <medium>
-        <karts number="4"/>
-        <requirements time="187"/>
+        <karts number="6"/>
+        <requirements position="2" time="187"/>
     </medium>
     <easy>
-        <karts number="4"/>
-        <requirements time="260"/>
+        <karts number="5"/>
+        <requirements position="2"/>
     </easy>
 </challenge>

data/challenges/islandtrack.challenge

@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<challenge version="2">
-    <track id="gran_paradiso_island" laps="3"/>
-    <mode major="single" minor="quickrace"/>
-    <requirements trophies="95"/>
-    
-    <hard>
-        <karts number="5"/>
-        <requirements position="1"/>
-    </hard>
-    <medium>
-        <karts number="4"/>
-        <requirements position="1"/>
-    </medium>
-    <easy>
-        <karts number="3"/>
-        <requirements position="1"/>
-    </easy>
-</challenge>
-

data/challenges/jungle.challenge

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<challenge version="2">
-    <track id="cocoa_temple" laps="3"/>
-    <mode major="single" minor="quickrace"/>
-    <requirements trophies="5"/>
-    
-    <hard>
-        <karts number="5"/>
-        <requirements position="1" time="170"/>
-    </hard>
-    <medium>
-        <karts number="4"/>
-        <requirements time="210"/>
-    </medium>
-    <easy>
-        <karts number="4"/>
-        <requirements time="300"/>
-    </easy>
-</challenge>

data/challenges/lighthouse.challenge

@@ -1,20 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="lighthouse" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="lighthouse" laps="4" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="135"/>
+    <requirements trophies="125"/>
     
+    <best>
+        <karts number="10"/>
+        <requirements position="1" time="120"/>
+    </best>
     <hard>
-        <karts number="5"/>
-        <requirements time="110" position="1"/>
+        <karts number="9"/>
+        <requirements position="1"  time="145"/>
     </hard>
     <medium>
-        <karts number="4"/>
-        <requirements time="145" position="1"/>
+        <karts number="8"/>
+        <requirements position="1" time="190"/>
     </medium>
     <easy>
-        <karts number="3"/>
-        <requirements time="185"/>
+        <karts number="7"/>
+        <requirements position="1"/>
     </easy>
 </challenge>
-

data/challenges/mansion.challenge

@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="mansion" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="mansion" laps="3" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-		<requirements trophies="110"/>
-     
+		<requirements trophies="100"/>
+
+    <best>
+        <karts number="9"/>
+        <requirements position="1" time="100"/>
+    </best>
     <hard>
-        <karts number="5"/>
-        <requirements time="130"/>
+        <karts number="8"/>
+        <requirements position="1" time="115"/>
     </hard>
     <medium>
-        <karts number="4"/>
-        <requirements time="130"/>
+        <karts number="7"/>
+        <requirements time="140"/>
     </medium>
     <easy>
-        <karts number="4"/>
-        <requirements time="160"/>
+        <karts number="6"/>
+        <requirements time="180"/>
     </easy>
 </challenge>

data/challenges/mines.challenge

@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="mines" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="mines" laps="3" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="150"/>
+    <requirements trophies="140"/>
      
+    <best>
+        <karts number="10"/>
+        <requirements position="1" time="135"/>
+    </best>
     <hard>
-        <karts number="4"/>
-        <requirements time="170"/>
+        <karts number="9"/>
+        <requirements position="1" time="160"/>
     </hard>
     <medium>
-        <karts number="4"/>
-        <requirements time="190"/>
+        <karts number="8"/>
+        <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="4"/>
-        <requirements time="255"/>
+        <karts number="7"/>
+        <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/minigolf.challenge

@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="minigolf" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="minigolf" laps="4" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="150"/>
+    <requirements trophies="130"/>
     
+    <best>
+        <karts number="10"/>
+        <requirements position="1" time="135"/>
+    </best>
     <hard>
-        <karts number="5"/>
+        <karts number="9"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="4"/>
+        <karts number="8"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="3"/>
+        <karts number="7"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/olivermath.challenge

@@ -1,20 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="olivermath" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="olivermath" laps="5" reverse="false"/>
     <mode major="single" minor="quickrace"/>
     <requirements trophies="0"/>
-    
+
+    <best>
+        <karts number="7"/>
+        <requirements position="1" time="95"/>
+    </best>
     <hard>
-        <karts number="5"/>
-        <requirements position="1" time="65"/>
+        <karts number="6"/>
+        <requirements position="1" time="110"/>
     </hard>
     <medium>
         <karts number="5"/>
-        <requirements position="1" time="85"/>
+        <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="5"/>
-        <requirements position="1" time="130"/>
+        <karts number="4"/>
+        <requirements position="1"/>
     </easy>
 </challenge>
-

data/challenges/sandtrack.challenge

@@ -1,12 +1,17 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="sandtrack" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="sandtrack" laps="3" reverse="false"/>
     <mode major="single" minor="quickrace"/>
     <requirements trophies="0"/>
     
+    <best>
+        <karts number="1"/>
+        <requirements energy="20" time="135"/>
+    </best>
     <hard>
         <karts number="1"/>
-        <requirements energy="18" time="167"/>
+        <requirements energy="18" time="165"/>
     </hard>
     <medium>
         <karts number="1"/>

data/challenges/scotland.challenge

@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="scotland" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="scotland" laps="3" reverse="false"/>
     <mode major="single" minor="quickrace"/>
     <requirements trophies="0"/>
     
+    <best>
+        <karts number="7"/>
+        <requirements position="1" time="125"/>
+    </best>
     <hard>
-        <karts number="5"/>
-        <requirements position="1" time="165"/>
+        <karts number="6"/>
+        <requirements position="1" time="150"/>
     </hard>
     <medium>
-        <karts number="4"/>
-        <requirements time="185"/>
+        <karts number="5"/>
+        <requirements position="1"/>
     </medium>
     <easy>
         <karts number="4"/>
-        <requirements time="270"/>
+        <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/snowmountain.challenge

@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="snowmountain" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="snowmountain" laps="3" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="60"/>
-    
+    <requirements trophies="115"/>
+
+    <best>
+        <karts number="10"/>
+        <requirements position="1" time="120"/>
+    </best>
     <hard>
-        <karts number="5"/>
-        <requirements time="160"/>
+        <karts number="9"/>
+        <requirements position="2" time="145"/>
     </hard>
     <medium>
-        <karts number="4"/>
-        <requirements time="187"/>
+        <karts number="8"/>
+        <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="4"/>
-        <requirements time="250"/>
+        <karts number="7"/>
+        <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/snowpeak.challenge

@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="snowtuxpeak" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="snowtuxpeak" laps="3" reverse="false"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="60"/>
+    <requirements trophies="45"/>
     
+    <best>
+        <karts number="8"/>
+        <requirements position="1" time="115"/>
+    </best>
     <hard>
-        <karts number="5"/>
-        <requirements position="1" time="145"/>
+        <karts number="7"/>
+        <requirements position="1" time="140"/>
     </hard>
     <medium>
-        <karts number="4"/>
-        <requirements time="170"/>
+        <karts number="6"/>
+        <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="4"/>
-        <requirements time="195"/>
+        <karts number="5"/>
+        <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/startrack.challenge

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<challenge version="2">
-    <track id="stk_enterprise" laps="3"/>
-    <mode major="single" minor="followtheleader"/>
-    <requirements trophies="110"/>
-    
-    <hard>
-        <karts number="6"/>
-        <requirements position="2"/>
-    </hard>
-    <medium>
-        <karts number="6"/>
-        <requirements position="2"/>
-    </medium>
-    <easy>
-        <karts number="5"/>
-        <requirements position="2"/>
-    </easy>
-</challenge>

data/challenges/stk_enterprise.challenge

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="stk_enterprise" laps="3" reverse="false"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="105"/>
+    
+    <best>
+        <karts number="9"/>
+        <requirements position="1" time="155"/>
+    </best>
+    <hard>
+        <karts number="8"/>
+        <requirements position="1"/>
+    </hard>
+    <medium>
+        <karts number="7"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="6"/>
+        <requirements position="1"/>
+    </easy>
+</challenge>

data/challenges/tuxtollway.challenge

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<challenge version="2">
-    <track id="greenvalley" laps="3"/>
-    <mode major="single" minor="quickrace"/>
-    <requirements trophies="95"/>
-    
-    <hard>
-        <karts number="5"/>
-        <requirements position="1"/>
-    </hard>
-    <medium>
-        <karts number="4"/>
-        <requirements position="1"/>
-    </medium>
-    <easy>
-        <karts number="4"/>
-        <requirements position="1"/>
-    </easy>
-</challenge>

data/challenges/unlock_bonus_kart1.challenge

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="true"/>
+    <!-- This is the (rounded) point equivalent of finishing all challenges
+         in easy, except the final challenge   -->
+    <requirements trophies="190"/>
+    <unlock kart="amanda"/>
+</challenge>

data/challenges/unlock_bonus_kart2.challenge

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="true"/>
+    <!-- This is the point equivalent of finishing the
+         story mode with 8 supertux challenges and the rest in gold  -->
+    <requirements trophies="280"/>
+    <unlock kart="sara_the_wizard"/>
+</challenge>

data/challenges/unlock_supertux.challenge

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<challenge version="3">
+    <unlock_list list="true"/>
+    <!-- This is the  point equivalent of finishing the
+         story mode with all gold except 14 silver challenges -->
+    <requirements trophies="250"/>
+    <unlock difficulty="difficulty_best"/>
+</challenge>

data/challenges/volcano_island.challenge

@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="volcano_island" laps="2"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="volcano_island" laps="2" reverse="false"/>
     <mode major="single" minor="quickrace"/>
     <requirements trophies="15"/>
     
+    <best>
+        <karts number="8"/>
+        <requirements position="1" time="165"/>
+    </best>
     <hard>
-        <karts number="5"/>
+        <karts number="7"/>
         <requirements position="1"/>
     </hard>
     <medium>
-        <karts number="4"/>
+        <karts number="6"/>
         <requirements position="1"/>
     </medium>
     <easy>
-        <karts number="4"/>
+        <karts number="5"/>
         <requirements position="1"/>
     </easy>
 </challenge>

data/challenges/xr591.challenge

@@ -1,12 +1,17 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="xr591" laps="2"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="xr591" laps="2" reverse="false"/>
     <mode major="single" minor="quickrace"/>
     <requirements trophies="135"/>
     
+    <best>
+        <karts number="1"/>
+        <requirements energy="20" time="95"/>
+    </best>
     <hard>
         <karts number="1"/>
-        <requirements energy="18" time="120"/>
+        <requirements energy="18" time="115"/>
     </hard>
     <medium>
         <karts number="1"/>
@@ -17,5 +22,3 @@
         <requirements energy="12" time="180"/>
     </easy>
 </challenge>
-
-

data/challenges/zengarden.challenge

@@ -1,9 +1,14 @@
 <?xml version="1.0"?>
-<challenge version="2">
-    <track id="zengarden" laps="3"/>
+<challenge version="3">
+    <unlock_list list="false"/>
+    <track id="zengarden" laps="4" reverse="false"/>
     <mode major="single" minor="timetrial"/>
-    <requirements trophies="45"/>
+    <requirements trophies="35"/>
     
+    <best>
+        <karts number="3"/>
+        <requirements position="1"/>
+    </best>
     <hard>
         <karts number="2"/>
         <requirements position="1"/>

data/gfx/nitro.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<particles emitter="box" box_x="0.05" box_y="0.05" box_z="0.60">
+<particles emitter="box" box_x="0.05" box_y="0.05" box_z="0.05">
 
     <spreading angle="2"         />
     

data/gfx/skid0.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<particles emitter="sphere" radius="0.03">
+
+    <spreading angle="25"          />
+    
+    <velocity  x="0.0"
+               y="0.008"
+               z="-0.015"         />
+    
+    <material  file="skid-particle1.png"  />
+    
+    <!-- Amount of particles emitted per second. The minimum rate
+         is used to show that the skidding bonus is now available,
+         the maximum is used when the skid bonus is applied to the kart -->
+    <rate      min="200"
+               max="200"          />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="60"
+               max="70"          />
+    
+    <!-- Size of the particles -->
+    <size      min="0.20"
+               max="0.20"         />
+    
+    <color     min="253 253 253"
+               max="254 254 254"  />
+
+</particles>

data/gfx/skid1.xml

@@ -1,29 +1,29 @@
 <?xml version="1.0"?>
-<particles emitter="box" box_x="0.023" box_y="0.023" box_z="-0.5">
+<particles emitter="sphere" radius="0.03">
 
-    <spreading angle="5"          />
+    <spreading angle="15"          />
     
     <velocity  x="0.0"
-               y="0.0"
-               z="-0.003"         />
+               y="0.008"
+               z="-0.015"         />
     
     <material  file="skid-particle1.png"  />
     
     <!-- Amount of particles emitted per second. The minimum rate
          is used to show that the skidding bonus is now available,
          the maximum is used when the skid bonus is applied to the kart -->
-    <rate      min="1400"
-               max="1500"          />
+    <rate      min="2000"
+               max="2000"          />
     
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="15"
-               max="25"          />
+    <lifetime  min="60"
+               max="70"          />
     
     <!-- Size of the particles -->
-    <size      min="0.35"
-               max="0.45"         />
+    <size      min="0.18"
+               max="0.18"         />
     
-    <color     min="255 255 255"
+    <color     min="254 254 254"
                max="255 255 255"  />
 
 </particles>

data/gfx/skid2.xml

@@ -1,29 +1,29 @@
 <?xml version="1.0"?>
-<particles emitter="box" box_x="0.023" box_y="0.023" box_z="-0.5">
+<particles emitter="sphere" radius="0.03">
 
-    <spreading angle="5"          />
+    <spreading angle="15"          />
     
     <velocity  x="0.0"
-               y="0.0"
-               z="-0.003"         />
+               y="0.008"
+               z="-0.015"         />
     
     <material  file="skid-particle2.png"  />
     
     <!-- Amount of particles emitted per second. The minimum rate
          is used to show that the skidding bonus is now available,
          the maximum is used when the skid bonus is applied to the kart -->
-    <rate      min="1400"
-               max="1500"          />
+    <rate      min="2500"
+               max="2500"          />
     
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="15"
-               max="25"          />
+    <lifetime  min="65"
+               max="75"          />
     
     <!-- Size of the particles -->
-    <size      min="0.35"
-               max="0.45"         />
+    <size      min="0.20"
+               max="0.20"         />
     
-    <color     min="255 255 255"
-               max="255 255 255"  />
+    <color     min="255 0 255"
+               max="255 100 255"  />
 
 </particles>

data/grandprix/1_penguinplayground.grandprix

@@ -3,7 +3,7 @@
 
     <track id="sandtrack"          laps="3" reverse="false" />
     <track id="cornfield_crossing" laps="3" reverse="false" />
-    <track id="olivermath"         laps="4" reverse="false" />
+    <track id="olivermath"         laps="5" reverse="false" />
     <track id="abyss"              laps="3" reverse="false" />
     <track id="scotland"           laps="3" reverse="false" /> 
  

data/grandprix/2_offthebeatentrack.grandprix

@@ -1,10 +1,10 @@
 
-<supertuxkart_grand_prix name="Off the beaten track">
+<supertuxkart_grand_prix name="Off the Beaten Track">
 
-    <track id="cocoa_temple" laps="3" reverse="false" />
-    <track id="snowmountain" laps="3" reverse="false" />
-    <track id="hacienda"     laps="3" reverse="false" />
-    <track id="zengarden"    laps="4" reverse="false" />
-    <track id="snowtuxpeak"  laps="3" reverse="false" />
+    <track id="cocoa_temple"   laps="3" reverse="false" />
+    <track id="hacienda"       laps="3" reverse="false" />
+    <track id="zengarden"      laps="4" reverse="false" />
+    <track id="volcano_island" laps="2" reverse="false" />
+    <track id="snowtuxpeak"    laps="3" reverse="false" />
     
 </supertuxkart_grand_prix>

data/grandprix/3_tothemoonandback.grandprix

@@ -1,11 +1,10 @@
 
-<supertuxkart_grand_prix name="To the moon and back">
+<supertuxkart_grand_prix name="To the Moon and Back">
 
     <track id="gran_paradiso_island" laps="3" reverse="false" />
-    <track id="greenvalley"          laps="2" reverse="false" />
+    <track id="greenvalley"          laps="3" 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="candela_city"         laps="3" reverse="false" />
     
 </supertuxkart_grand_prix>
-

data/grandprix/4_atworldsend.grandprix

@@ -1,11 +1,10 @@
 
 <supertuxkart_grand_prix name="At World's End">
 
-    <track id="fortmagma"    laps="3" reverse="false" />
-    <track id="minigolf"     laps="3" reverse="false" />
+    <track id="lighthouse"   laps="4" reverse="false" />
+    <track id="snowmountain" laps="3" reverse="false" />
+    <track id="minigolf"     laps="4" reverse="false" />
     <track id="xr591"        laps="3" reverse="false" />
     <track id="mines"        laps="3" reverse="false" />
-    <track id="lighthouse"   laps="4" reverse="false" />
     
 </supertuxkart_grand_prix>
-

data/graphical_restrictions.xml

@@ -1,20 +1,18 @@
 <?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="FramebufferSRGB"/>
+  <card is="Intel(R) HD Graphics"      os="windows" version="<10.0" disable="ForceLegacyDevice"/>
+  <card is="Intel(R) HD Graphics"      os="windows" version="<10.0" disable="HighDefinitionTextures"/>
+  <card is="Intel(R) HD Graphics 2000" os="windows"                disable="ForceLegacyDevice"/>
   <card is="Intel(R) HD Graphics 2000" os="windows"                disable="HighDefinitionTextures"/>
-  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="UniformBufferObject"/>
-  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="FramebufferSRGB"/>
+  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="ForceLegacyDevice"/>
   <card is="Intel(R) HD Graphics 3000" os="windows"                disable="HighDefinitionTextures"/>
   <card is="Intel(R) HD Graphics 4600" os="windows"                disable="ComputeShader"/>
   <card contains="Intel"          os="osx"                         disable="GI"/>
   <card contains="Intel"          os="linux"    version="<11.2"    disable="ComputeShader"/>
   <card contains="Intel"          os="linux"    version="<11.2"    disable="GeometryShader"/>
-  <card contains="Intel"          os="linux"                       disable="FramebufferSRGBWorkaround2"/>
+  <card contains="Ivybridge"      os="linux"    version="<17.4"    disable="Correct10bitNormalization"/>
+  <card contains="Sandybridge"    os="linux"    version="<17.4"    disable="Correct10bitNormalization"/>
   <card contains="Intel"          os="linux"    version="<11.2"    disable="TextureCompressionS3TC"/>
-  <card contains="Intel"          os="windows"                     disable="TextureCompressionS3TC"/>
   <card contains="Intel"          os="osx"                         disable="TextureCompressionS3TC"/>
   <card contains="NVIDIA"         os="windows"  version="<344.65"  disable="BufferStorage"/>
   <card contains="NVIDIA"         os="linux"    version="<343.22"  disable="BufferStorage"/>
@@ -27,6 +25,7 @@
   <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 vendor="nouveau"          os="linux"    version=">=17.2"   disable="TextureBufferObject"/>
   <!-- On osx radeon appears to have different version numbers, e.g.
        1.32.20 -->
   <card contains="Radeon"         os="linux"    version="<14.300"  disable="DriverRecentEnough"/>
@@ -35,8 +34,9 @@
   <card contains="ATI"            os="windows"  version="<=3.1.8787" disable="ForceLegacyDevice"/>
   <card                           os="android"                     disable="TextureFormatBGRA8888"/>
   <card                           os="android"                     disable="ColorBufferFloat"/>
+  <card                           os="android"                     disable="TextureCompressionS3TC"/>
   <card contains="Adreno"         os="android"  version="<=19"     disable="VertexIdWorking"/>
   <card contains="Android Emulator" os="android"                   disable="ForceLegacyDevice"/>
-  <card                           os="android"                     disable="UniformBufferObject"/>
+  <card contains="Android Emulator" os="android"                   disable="NpotTextures"/>
   <card vendor="Broadcom"         os="linux"                       disable="HighDefinitionTextures256"/>
 </graphical-restrictions>

data/gui/credits.stkgui

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
-    <div x="2%" y="2%" width="98%" height="96%" layout="vertical-row" >
-
-        <icon id="logo" align="center" proportion="4" width="100%" icon="gui/logo_slim.png"/>
-
-        <header I18N="Title in credits screen" text="Credits" width="100%" />
-
-        <box id="animated_area" width="100%" proportion="10" padding="0">
-        </box>
-    </div>
-</stkgui>

data/gui/dialogs/addons_loading.stkgui

@@ -3,7 +3,7 @@
     <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" proportion="8" width="100%" icon="gui/loading.png" />
+                <icon id="icon" align="center" proportion="8" width="100%" icon="gui/icons/loading.png" />
                 <spacer proportion="1" />
             </div>
             <spacer proportion="1" />
@@ -27,13 +27,13 @@
         <div width="80%" proportion="5" align="center">
             <buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
                 <icon-button id="install" width="128" height="128"
-                             icon="gui/package-update.png"
+                             icon="gui/icons/package-update.png"
                              I18N="Add-on screen action"  text="Install" />
                 <icon-button id="uninstall" width="128" height="128"
-                             icon="gui/package-uninstall.png"
+                             icon="gui/icons/package-uninstall.png"
                              I18N="Add-on screen action" text="Uninstall" />
                 <icon-button id="back" width="128" height="128"
-                             icon="gui/back.png"
+                             icon="gui/icons/back.png"
                              I18N="Add-on screen action" text="Back" />
             </buttonbar>
             <progressbar id="progress" x="0" y="20%" width="100%" height="30%" />

data/gui/dialogs/android/init_android.stkgui

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
+
+        <box width="100%" height="80%" padding="10" layout="vertical-row">
+            <bright width="100%" text="Select a type of control that you prefer" align="center" text_align="left" word_wrap="true"/>
+
+            <spacer height="7%" width="10"/>
+
+            <ribbon id="control_type" proportion="1" width="100%" align="center">
+                <icon-button id="accelerometer" width="fit" height="fit" icon="gui/icons/difficulty_medium.png"
+                        I18N="Control type" text="Accelerometer"/>
+                <icon-button id="steering_wheel" width="fit" height="fit" icon="gui/icons/difficulty_hard.png"
+                        I18N="Control type"  text="Steering wheel"/>
+            </ribbon>
+
+            <spacer height="12%" width="10"/>
+
+            <label width="100%" text="You can change it later in touch device settings." text_align="left" word_wrap="true"/>
+        </box>
+
+        <spacer height="7%" width="10"/>
+
+        <div width="25%" height="10%" layout="horizontal-row" align="center">
+            <button id="close" text="Apply" width="100%" height="100%" align="center"/>
+        </div>
+
+    </div>
+</stkgui>

data/gui/dialogs/android/multitouch_settings.stkgui

@@ -35,7 +35,7 @@
             <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Accelerometer"/>
             <div proportion="1" align="center" height="fit" layout="horizontal-row" >
                 <spacer width="40" height="10" />
-                <spinner id="accelerometer" proportion="1"/>
+                <checkbox id="accelerometer"/>
             </div>
         </div>
 

data/gui/dialogs/confirm_dialog.stkgui

@@ -7,10 +7,10 @@
 
         <buttonbar id="buttons" height="30%" width="30%" align="center">
 
-            <icon-button id="confirm" icon="gui/green_check.png" I18N="In a 'are you sure?' dialog"
+            <icon-button id="confirm" icon="gui/icons/green_check.png" I18N="In a 'are you sure?' dialog"
                 text="Yes" align="center"/>
 
-            <icon-button id="cancel" icon="gui/remove.png" I18N="In a 'are you sure?' dialog"
+            <icon-button id="cancel" icon="gui/icons/remove.png" I18N="In a 'are you sure?' dialog"
                 text="Cancel" align="center"/>
 
         </buttonbar>

data/gui/dialogs/custom_video_settings.stkgui

@@ -9,7 +9,7 @@
         <div layout="horizontal-row" width="100%" height="fit">
             <checkbox id="pixelshaders"/>
             <spacer width="10" height="10"/>
-            <label text="Pixel Shaders" I18N="Video settings"/>
+            <label text="Pixel shaders" I18N="Video settings"/>
         </div>
 
         <spacer height="4" width="10" />
@@ -23,7 +23,7 @@
 
         <spacer height="4" width="10" />
 
-        <div layout="horizontal-row" width="100%" proportion="1">
+        <div layout="horizontal-row" width="50%" proportion="1">
             <spacer width="70" height="10" />
             
             <div layout="horizontal-row" proportion="1" height="fit">
@@ -31,14 +31,6 @@
                 <spacer width="10" height="10"/>
                 <gauge id="shadows" min_value="0" max_value="2" proportion="1"/>
             </div>
-            
-            <spacer height="4" width="10" />
-            
-            <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="ibl"/>
-                <spacer width="10" height="10"/>
-                <label text="Image-based lighting" I18N="Video settings"/>
-            </div>
         </div>
 
         <spacer height="4" width="10" />
@@ -69,15 +61,15 @@
             <div layout="horizontal-row" proportion="1" height="fit">
                 <checkbox id="ssao"/>
                 <spacer width="10" height="10"/>
-                <label text="Ambient Occlusion" I18N="Video settings"/>
+                <label text="Ambient occlusion" I18N="Video settings"/>
             </div>
 
             <spacer height="4" width="10" />
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="global_illumination"/>
+                <checkbox id="dof"/>
                 <spacer width="10" height="10"/>
-                <label text="Global illumination" I18N="Video settings"/>
+                <label text="Depth of field" I18N="Video settings"/>
             </div>
         </div>
 
@@ -89,7 +81,7 @@
             <div layout="horizontal-row" proportion="1" height="fit">
                 <checkbox id="glow"/>
                 <spacer width="10" height="10"/>
-                <label text="Glow (outlines)" I18N="Video settings"/>
+                <label text="Glow (Outlines)" I18N="Video settings"/>
             </div>
 
             <spacer height="4" width="10" />
@@ -115,9 +107,9 @@
             <spacer height="4" width="10" />
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="dof"/>
+                <checkbox id="ibl"/>
                 <spacer width="10" height="10"/>
-                <label text="Depth of field" I18N="Video settings"/>
+                <label text="Image-based lighting" I18N="Video settings"/>
             </div>
         </div>
         
@@ -125,9 +117,9 @@
 
         <div layout="horizontal-row" width="100%" proportion="1">
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="weather_gfx"/>
+                <checkbox id="animated_characters"/>
                 <spacer width="10" height="10"/>
-                <label text="Weather Effects" I18N="Video settings"/>
+                <label text="Animated characters" I18N="Video settings"/>
             </div>
 
             <spacer height="4" width="10" />
@@ -142,17 +134,9 @@
         <spacer height="20" width="10" />
 
         <div layout="horizontal-row" width="100%" proportion="1">
-            <label text="Animated Scenery" I18N="Video settings" width="40%"/>
+            <label text="Particle effects" I18N="Video settings" width="40%"/>
             <spacer width="10" height="10"/>
-            <gauge id="anim_gfx" min_value="0" max_value="2" width="50%" />
-        </div>
-
-        <spacer height="4" width="10" />
-
-        <div layout="horizontal-row" width="100%" proportion="1">
-            <label text="Animated Characters" I18N="Video settings" width="40%"/>
-            <spacer width="10" height="10"/>
-            <gauge id="steering_animations" min_value="0" max_value="2" width="50%" />
+            <gauge id="particles_effects" min_value="1" max_value="2" width="50%" />
         </div>
 
         <spacer height="4" width="10" />
@@ -160,7 +144,7 @@
         <div layout="horizontal-row" width="100%" proportion="1">
             <label text="Rendered image quality" I18N="Video settings" width="40%"/>
             <spacer width="10" height="10"/>
-            <gauge id="image_quality" min_value="0" max_value="3" width="50%" />
+            <gauge id="image_quality" min_value="0" max_value="2" width="50%" />
         </div>
 
         <spacer height="4" width="10" />

data/gui/dialogs/general_text_field_dialog.stkgui

@@ -3,13 +3,13 @@
     <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" />
+        <spacer height="7%" width="10" />
         <textbox id="textfield" width="75%"  align="center"/>
 
-        <spacer height="20" width="20" />
+        <spacer height="7%" width="20" />
         <button id="ok" I18N="In the general textfield dialog" text="OK" align="center" proportion="1"/>
 
-        <spacer height="15" width="20" />
+        <spacer height="5%" width="20" />
         <button id="cancel" I18N="In the general textfield dialog" text="Cancel" align="center" proportion="1"/>
     </div>
 </stkgui>

data/gui/dialogs/ghost_replay_info_dialog.stkgui

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div y="2%" width="100%" height="96%" layout="vertical-row">
+
+        <div width="100%" height="40%" layout="vertical-row">
+            <div width="100%" height="25%" layout="vertical-row" >
+                <label id="name" width="100%" text_align="center"/>
+            </div>
+            <!-- This is filled in programmatically -->
+            <box width="98%" height="75%" align="center" layout="vertical-row" padding="1">
+                <list id="current_replay_info" x="0" y="0" width="100%" height="100%"/>
+            </box>
+        </div>
+
+        <div width="100%" height="60%" layout="horizontal-row">
+            <div width="36%" height="100%" layout="vertical-row">
+                <icon-button proportion="1" width="100%" height="100%" id="track_screenshot" custom_ratio="1.33333"/>
+            </div>
+
+            <div width="64%" height="100%" layout="vertical-row">
+                <div width="95%" align="center" layout="vertical-row" height="fit">
+                    <div width="100%" height="40" 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 width="100%" height="fit" layout="horizontal-row" >
+                        <checkbox width="fit" id="compare-ghost" I18N="Ghost replay info action" text_align="left"/>
+                        <spacer width="10"/>
+                        <label proportion="1" id="compare-ghost-text" height="100%" text_align="left" I18N="Ghost replay info action" text="Compare to another ghost"/>
+                    </div>
+                </div>
+
+                <div width="95%" height="50%" 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/icons/green_check.png"
+                                     I18N="Ghost replay info screen action" text="Start Race" word_wrap="true" />
+                        <icon-button id="add-ghost-to-compare" width="128" height="128"
+                                     icon="gui/icons/ghost_plus.png"
+                                     I18N="Ghost replay info screen action" text="Compare ghost" word_wrap="true" />
+                        <icon-button id="remove" width="128" height="128"
+                                     icon="gui/icons/remove.png"
+                                     I18N="Ghost replay info action" text="Remove" word_wrap="true" />
+                        <icon-button id="back" width="128" height="128"
+                                     icon="gui/icons/back.png"
+                                     I18N="Ghost replay info action" text="Back" word_wrap="true" />
+                    </buttonbar>
+                </div>
+                <spacer width="10" height="10%"/>
+            </div>
+        </div>
+
+    </div>
+</stkgui>

data/gui/dialogs/kart_color_slider.stkgui

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div x="2%" y="0%" width="96%" height="95%" layout="vertical-row">
+        <div id="kart-screen" layout="horizontal-row" width="100%" proportion="1" align="center">
+            <model id="model" width="100%" layout="horizontal-row" height="100%">
+            </model>
+        </div>
+        <div width="20%" height="fit" text-align="left" layout="horizontal-row" >
+            <checkbox id="toggle-slider" />
+            <spacer width="40"/>
+            <label id="toggle-text"/>
+        </div>
+        <spacer height="30" width="10"/>
+        <div height="fit" width="100%" layout="horizontal-row">
+            <gauge id="color-slider" min_value="1" max_value="100" proportion="1"/>
+        </div>
+        <spacer height="30" width="10"/>
+        <button id="close" text="Apply" align="center"/>
+    </div>
+</stkgui>